From nobody Sun Oct 15 12:09:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7fFJ3tPQz4wrv3; Sun, 15 Oct 2023 12:09: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7fFJ3LVwz3NFw; Sun, 15 Oct 2023 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697371796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMi5KUh3o3n71xKVa0x/V3hcNbh4wubtTREwkaGdmTc=; b=ItnGYY97UHD66xTjZmk2b7QUC01Y/nYslMi1vXJMRkvLou7yapf5Ep5wPuYyKK+Q6g81V5 3Y14gLlX7m/btP6cq6k0MndcSU+YASLRBS9f8PdI0mF+Gb3Fj3fQlf+ng2qJU+gkizhQJw 0GOfhRn1rQ6wh3/NABDN3Yqscr0yQwTNHZ4lwlO/PGYDH7CK5wAT5GH4JLArI3sR8hMb4T 7dx9QKQeVICAR2Q2kH8zCsMA5pKw3hPymuBDli2Oqk6TXBAWHYVfLP3VbyK6/XFh9RnULy zzcE2xIcl/yzbFKLn1kXGuduV0SAsztkpRLpx0zw8s7hm96FWCW9amDcqIV/tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697371796; a=rsa-sha256; cv=none; b=tsIHl4fB7F6VTMu3Sk3gMNrjgwie85MV1YngEGM27WqmkJdKi11TnYmqWJkQNOrFr3HNrQ wEnrWF2CF7n/U1gZIDc3u9+MoERZ7+zQIaM1ZggDkyixM/sBB/lpQK/8ygEs2ugTwHvQaH 5hHyEfvA4y+LoFB2c2W6zM0GLDPyoE8Qt38/ZQyMNyhs47q0A5UBfeWG8VZo+Hye0hX4OW d8DpxUBbA60oW0/PsVlHWuTylzpWPjNbwwr1yxhtzisyjI5V0Tge3Niqv4W+ebv8nOWJZ2 UqFDPoV3/MbnQ8+uuSrHLBYOkx0LzJyAYgJDwuDEwbi73CfH6fOSXSQnce5mAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697371796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMi5KUh3o3n71xKVa0x/V3hcNbh4wubtTREwkaGdmTc=; b=iFYTkfNX6bF3NgcQi8657dN90G/Uw6AdnK2GaKb2CJS0gcPn9bsCWsnpCrMJBXGBGxDbol GjhadhSyqnEDNDm4MGyt5Rt9T1+gGz2+PqNALvVBPy8UmXTBOvq8n8SE3jTSr3jkf30Dqz 6PfLFVduhHCkeuvkLuRTDR7Ozo6BMjEtIQh3B+jnlAG0RuANI+u3IlaheWRy/NYNAjO5Wb AiJAwL+5rOW3IkdK+sWaYOXM5j/Pb/zIAQRo4AwpvrHpBC0UMVbC4oj+zMX3TIhwiAuOAn 3rkn93IxdR4cB4k1I2aWzHZPUm0KkfFKQHtpgjtIxOcRmaYl+a/ILnU4IK0hUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7fFJ2DVNz1BQS; Sun, 15 Oct 2023 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FC9utW043614; Sun, 15 Oct 2023 12:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FC9uoF043611; Sun, 15 Oct 2023 12:09:56 GMT (envelope-from git) Date: Sun, 15 Oct 2023 12:09:56 GMT Message-Id: <202310151209.39FC9uoF043611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fc9f1d2c6391 - main - uma.h: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc9f1d2c6391b1a4b133aab56ace625b72c9ea85 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fc9f1d2c6391b1a4b133aab56ace625b72c9ea85 commit fc9f1d2c6391b1a4b133aab56ace625b72c9ea85 Author: Gordon Bergling AuthorDate: 2023-10-15 12:09:21 +0000 Commit: Gordon Bergling CommitDate: 2023-10-15 12:09:21 +0000 uma.h: Fix a typo in a source code comment - s/setable/settable/ MFC after: 3 days --- sys/vm/uma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 31f8dba33081..76f30efc94d1 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -637,7 +637,7 @@ void uma_zone_set_smr(uma_zone_t zone, smr_t smr); smr_t uma_zone_get_smr(uma_zone_t zone); /* - * These flags are setable in the allocf and visible in the freef. + * These flags are settable in the allocf and visible in the freef. */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kmem */ From nobody Sun Oct 15 14:30:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7jMp1gBXz4x1Zp; Sun, 15 Oct 2023 14:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7jMp1BBFz3crW; Sun, 15 Oct 2023 14:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697380246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty7EEuJrXmuXoay3DZ6nFORgQDp0oFmU7CVZ4Hqqa28=; b=hYXlw0yqS5yq4z4ApclzdgCSOe51sPaMHqa0pYQi6YrE1Lz72NgHLZJqfGU4mOdMWVUoYa Z2FGO0WpkyWWqIAxS4hhmqLeBPE59MzZIgCvneZtw+8tthd6HUBExAGtLLfvz/pJ8JUWd9 RmrvAQjKYqF7Q4VoVC4otbqiOLM8OXXTtSvNNfNfkt/7OPxIJSbvwSi6xi/JC0JvZM8+EQ n1dUjWqt5jyhOCJ+nKbr8uysyFozgUD5y8ata1eTcuIwxXarRheQXBsTcoFDw9w4I4mnJX aM4utNI84AJgu35OtG4K9WOLM0wZayn3b/MVRRqBtsXux0otSrqcLez2HyNL9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697380246; a=rsa-sha256; cv=none; b=x+Ef3f181qLa/RyfnQZ/AOIiBs85Lg+FrqOydOlGjylrn84BfLrGJS5UOruurBrA/fJ1qG SzokIkeViJhHCDp443h0IoIHRLsK0RRRXtOZNm0vCs3qQq5zTorwyzp4sjEc+xCbG0nG6V 3QswgHAKJy8QWIJrvXivavznDdkDqA34k97/8/vfIDIyaaMap47XroIISUlcncvdLOta2y haufNjr/WhqFm3O+knYIllge9FqA6g9pSO+9IToWNR+Ec8NteHy/YAItOi/FWSoxSU4e1y wZJUMIYWxL4Bi0oK80O5kSxXdJnoXH2uo5Vrklbxa9XM7P+sIrZ7jM0ftz2nOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697380246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty7EEuJrXmuXoay3DZ6nFORgQDp0oFmU7CVZ4Hqqa28=; b=KC2bONXwPjjwDlXbGbh9kloges8i7NrtUnSC5k5QcOHMPPrOnMxpoF6qvc5wkGT6Gkv61+ sJ9/i2Ug+f/HgLxtKAFm15L8DcQUbSJwl9ahirvNbP/1D31tJfDvH5EorVuZ3yByjyjQz/ LyjHpS1DLdouZMuMoi73Em6eC3NZHfjJlpK1jzZaM0IQheG68hKA/T04Ig4VdBTYeEWyST zwiEMA4/ZEdZaWpxgZ1FstCZ0xk/9hzGdSMBLGrbq3ggTZt4JA4GtesNdtftfDLIjonVhi E7QtbwvIs71lHnbs7RSYIRYbxexYMFc6ScgaP/2Sy1j5XOvqCsEWYLR1CVFF+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 4S7jMp0F43z1Fpl; Sun, 15 Oct 2023 14:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FEUjZD086685; Sun, 15 Oct 2023 14:30:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FEUjx5086682; Sun, 15 Oct 2023 14:30:45 GMT (envelope-from git) Date: Sun, 15 Oct 2023 14:30:45 GMT Message-Id: <202310151430.39FEUjx5086682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f34c9c4e3bdc - main - veriexec: Correctly export symbols List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f commit f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f Author: Zhenlei Huang AuthorDate: 2023-10-15 14:29:18 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-15 14:29:18 +0000 veriexec: Correctly export symbols There's no symbol named 'mac_veriexec_get_executable_flags', the right one should be the function 'mac_veriexec_metadata_get_executable_flags()'. Reviewed by: stevek MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42133 --- sys/modules/mac_veriexec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/mac_veriexec/Makefile b/sys/modules/mac_veriexec/Makefile index a165daeec043..82cf468fec50 100644 --- a/sys/modules/mac_veriexec/Makefile +++ b/sys/modules/mac_veriexec/Makefile @@ -18,7 +18,7 @@ SRCS += \ EXPORT_SYMS+= ve_mutex \ mac_veriexec_in_state \ - mac_veriexec_get_executable_flags + mac_veriexec_metadata_get_executable_flags .if defined(KERNBUILDDIR) MKDEP= -include ${KERNBUILDDIR}/opt_global.h From nobody Sun Oct 15 16:23:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7lsj2bsJz4x7cl; Sun, 15 Oct 2023 16:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7lsj1bT7z4QG7; Sun, 15 Oct 2023 16:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697387001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o1L9BcWkE+wzs7q/A1yC53dFmSiurA8LN6MtNu6Fx7Q=; b=TYtEKFSAA0UaEDwR/Wm1/O12dq0V4wm09eCs49fMFanmX9gyGxa6UjmWIJ/fDR4I6Wk3lJ vwBkHB3+YBZVLfAVTSfIWCK9bSI8+o8gKnMIWTcZ7ZKhtX20SE+fGO4e3AHBsuB66VfUCs q/c1tlPS5LA7EmMnjFDFLyGtF6IG0gl83v5CDaYXjN/fX+tsU2GVEi+7F8N1ApSuiythfD ivn5G1DZZgPdPXlDYkCJ5szEoGE/fBVjghOa6dqAAu4EXpg5xH+MTuE2S5F2DNaIclyHAZ 5+u7Qn+ASYlwieIAmH+uCCZR2tTHsJDgC0ePAy7T4W7SzwLgNVz4ucTxsRrEBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697387001; a=rsa-sha256; cv=none; b=rZFPV5/WTO+MqGJDgJumnUlRucK89w/VlohTVrGytLVFyeqKdFpHWW4cIEExs4tiXw+mPm BO8sTwh0ubrwS245guzKHeO4QS4BaluMQyoVMoBKt65BXDLlLYEM+FGBYIs56vyMjkD0FY niLkwdRGxepJskioyYWi2QlF2OfNxd0liV9YvKtQbfC57utuymyyGyG4HN/TEdI5LM+q2Q o9r/Ht9IdgJe7gdiD/s7dm8ZaMGwHLEAeOyARxbnfkfbLWYfxaBVYM0LJlkXm/Ph5Luu27 8NHT4KVNTfm0OXid5lXlYgQUZ+cI5CXamiL8Wxlbf9pdnmGCDdUorUHuWCr4Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697387001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o1L9BcWkE+wzs7q/A1yC53dFmSiurA8LN6MtNu6Fx7Q=; b=uAXRoJtMhr4+a0M61bhXzfKsEikFKg3gTBJn4xqp0gqV0T1oby2qmThHM8FhVSuy8QN+Jr FLtgmybsiZb/hgSO9ugzURbTwTSadVEcUMPuzd3uV0jiEfgssb8W1UozGC0LkUpidXYaxC by1XPYvDshV0PeBPprH3G6ofcMQYbI/znTQ5cInJHlpSjhqr5R2dTpWybMviCyWuPiTlOa kLa28J9L1LMigAvPXFJYGvfUj+FAYz77RkU/9WROFwuKQPwk1HkkWuUQzWj7qv/KgmTCCL aqQ1jUUW1EBt7ryhKjlXBW197uS5HAbzU9pgGPsym94ynqUowgK5vuvGdRBSyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7lsj0fCfz1J1D; Sun, 15 Oct 2023 16:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FGNKvo075822; Sun, 15 Oct 2023 16:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FGNKhO075819; Sun, 15 Oct 2023 16:23:20 GMT (envelope-from git) Date: Sun, 15 Oct 2023 16:23:20 GMT Message-Id: <202310151623.39FGNKhO075819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6ace92326f3c - main - ifconfig: add static bridge addresses for vlan 0, not 1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6ace92326f3cc4bbee9b74f6b656cb13699a78a2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ace92326f3cc4bbee9b74f6b656cb13699a78a2 commit 6ace92326f3cc4bbee9b74f6b656cb13699a78a2 Author: Kristof Provost AuthorDate: 2023-10-13 10:34:06 +0000 Commit: Kristof Provost CommitDate: 2023-10-15 14:21:53 +0000 ifconfig: add static bridge addresses for vlan 0, not 1 Since fd7edfcdc3 ("bridge: fix lookup for untagged packets in bridge_transmit()") and b0e38a1373 ("bridge: distinguish no vlan and vlan 1") we do a better job of distinguishing between untagged and VLAN 1 traffic. However, ifconfig still defaulted to adding addresses for VLAN 1, rather than for untagged traffic. Change this to be the most common (i.e. untagged) option. Reviewed by: zlei, philip MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42188 --- sbin/ifconfig/ifbridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 9b499b404946..2d0af1255a73 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -402,7 +402,7 @@ setbridge_static(if_ctx *ctx, const char *val, const char *mac) memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); req.ifba_flags = IFBAF_STATIC; - req.ifba_vlan = 1; /* XXX allow user to specify */ + req.ifba_vlan = 0; /* XXX allow user to specify */ if (do_cmd(ctx, BRDGSADDR, &req, sizeof(req), 1) < 0) err(1, "BRDGSADDR %s", val); From nobody Sun Oct 15 18:32:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7pl53LPgz4xGCY; Sun, 15 Oct 2023 18:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7pl52spSz4fpC; Sun, 15 Oct 2023 18:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697394769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0i79WigNih31uKQHOcfaFS07IYUnuS8cEisZgrVIq9w=; b=Lrd1RYX4VhYZhh5qCXIDmQXj+EHjJHqD4HS2hfRhAEfD1/PJByyMPc0r+k9wVeFQ2GY8Sx WVu6DoEVXaL4MeqvhHMj2+vnhHtN1In2TPYlV5WiS0AzetegZO1x8AhohKVP1gs7/Hp9vE c8XKXWkIu8DwNpj/mFG6ImUiqRS6C5ziI35M7EY2iygVZ4lIPdOdngcjnFnnmjt7DB8bFQ NEJqh+TwlQ/B3fubl5c5T/qCOtEktfEjBOBBkTeNyQVJ9iP56QNnuvJ6NKpH/Z1KpFEtgz e4sfQJY/HRreWJMCbgyu+dtqLNItuAhbxs9VbNk5u7xyIcQpxQ283lmmLYn6kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697394769; a=rsa-sha256; cv=none; b=LDnrmeePFR+RcjiIz/Y4NgSvrFqu811O7Btf7U/2Bsufv/jVa+KpEGZBOftB818QXH476V CqsH4tAli68F1+8RoLsSmj6bduAyq4l4Na6IJylymKOHHMgchkT0YfLv2q52iza4cbTQ/y j8eX1WrVOPAhh4nA+V7At5s/cpkRBPRxzoWMXY+VK1qc84c9e2NlI+qdXimCoWn/0g0o9n Cc1IOUbehRrINRxl4QaL6nvXu9NSszM2vYZTyd7l/EM77rwkR35H/puebaoJnRQ3ZAUsy4 SmvliIwADGEYSMghzoxq11bew3S+n0/Vtjc6s4TDfl4tWCJaJ68h1Egm9JT27Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697394769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0i79WigNih31uKQHOcfaFS07IYUnuS8cEisZgrVIq9w=; b=krFN67ZNMfNunDleNRsFRdT6gMp2GWU6R8LuD7ixWYtJzBB2OvVQ1uQ2U8xeGmnXvk2dh0 t7W0d4/0LmIFV4Ah+FVsDj1yqsnuVIzrxK7GD1VYZWgDD0pnnlw4AxiF+ga/7YySGqk2mO FSSIhsOfM6bwN3ca29U0fKDL8kCcS7aWlOZDGFVxlnRrWHPdW1DxDJ23K5kUN4ZJa8+XCV CfczguK0wxfZ4E5jhyeF8QQNtnl0WHMFLyN68w/YEdJE/rypaavT7vysmvC+w+s4vzTfGE RJrIZKVzu2WnHVw/AvPrZwXsuW3Z3Urm+uFdbRMKBisaB1WleZFNxuZZBDUO1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7pl51xRNz1MLS; Sun, 15 Oct 2023 18:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FIWnqG092552; Sun, 15 Oct 2023 18:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FIWnb5092549; Sun, 15 Oct 2023 18:32:49 GMT (envelope-from git) Date: Sun, 15 Oct 2023 18:32:49 GMT Message-Id: <202310151832.39FIWnb5092549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c08ba4a588d5 - main - efibootmgr: provide explicit error message if run as non-root List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: c08ba4a588d517e3c5fe00cee0927294d2490993 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c08ba4a588d517e3c5fe00cee0927294d2490993 commit c08ba4a588d517e3c5fe00cee0927294d2490993 Author: Ed Maste AuthorDate: 2023-10-15 17:21:52 +0000 Commit: Ed Maste CommitDate: 2023-10-15 18:31:51 +0000 efibootmgr: provide explicit error message if run as non-root This should be less confusing for new users. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42213 --- usr.sbin/efibootmgr/efibootmgr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index b0d023e3539c..8dcf9876486d 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -1101,8 +1101,11 @@ main(int argc, char *argv[]) /* * find_dev can operate without any efi variables */ - if (!efi_variables_supported() && !opts.find_dev) - errx(1, "efi variables not supported on this system. root? kldload efirt?"); + if (!efi_variables_supported() && !opts.find_dev) { + if (errno == EACCES && geteuid() != 0) + errx(1, "must be run as root"); + errx(1, "efi variables not supported on this system. kldload efirt?"); + } read_vars(); From nobody Sun Oct 15 19:31:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2b3k4qz4xJY3; Sun, 15 Oct 2023 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7r2Z55Rdz4km9; Sun, 15 Oct 2023 19:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nc7aOsMfbu3EjzfsI7ZbVs/E1hoYj/Saalf5oaG4C6E=; b=CTen2TnEdfAqNemKylLvD24RouxxX3xdeoQCEDUGCRTIe6AluVblICOrW41Eu2kTf9rfaQ Kc7/JsDMKeC4dcFrznlm7gfcad6m1GYH5kYDZfMHrmmB073ABWGkxRuc7amYtcoP7L8XVd int3bhCTunF/teKi9eh+ieAwGfMzvG83qUa4O0yJCfUzTCTreHv9Mth5hUYSlWC+R3/IVh 70q7q0ZNBKy7b0RBtYquxBg8aCDQWG6ro9OWqp3mpk6AUyrKERHIcIYuy3X8Uu6Cen5Ic+ XhTENqnm2MjplXwxz65r351sdi8C48IydpQyJ3djuTG4mxtBYUja/NCXVQG3Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398278; a=rsa-sha256; cv=none; b=kHidAvyzZQ0aP0M/xJC/sHsjXs7GWhsUfJMlGAxlq4oTPPdLMTbucBKOQNXtw1uFj5ea9D B5oCwaQeD0TDK02rqOmBhIgM3rZywspJdTpCgc7E+SNW5NLqh5NnATVmb8/aKkk2QmEYpS BGiVAxuXIzD5sUyXq+9OrQJTIk0yTFGHQRbEBP28RufRPtrch4Y26YDAHkzB5OvDSg95S6 05E3fpWBGWgrRYpT3ec91rjDZHNhuJUg4vhjPgv4tr1vjEgvKtrobCEHroEsMEMJChUX2n 4zml94eF1fVjefwniCOiRAYm48CxLl+Eiaq/iArzzUMGd72ka+XKNqLSD3g90A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nc7aOsMfbu3EjzfsI7ZbVs/E1hoYj/Saalf5oaG4C6E=; b=ZHwhjpdFa1eeecDwzbSfT0qrd0I+ZX/YsWCRCNAKyaCd6aV6UeW7Tp5N0pKxDXgbWQVM5Y pSHs3ov+Ynf2NVLcLyWFztbey6Z1QQOuw0z6bQVkairO3EQ5rJsaySoat9r/9ZETxVdyeE /rak1O8LF0uuiR7LkujZxcUC2WsWcgHJLPTcfgXqiTiVfHw0XAWlFWmSFp1+uz71kVNIgV Q9o772X9PlUJzw04l0OZ0V2D48NtxQdf1fm/KQHd7tr9PblbouLW3/Em0b0tpRCMbwWy68 BBrUkoRdBmtusm1TmspJCkZuxPiHsfHZfeOmN5Fw9s4ZzAFazJUhhNjMjeVLjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2Z48mZz1PWv; Sun, 15 Oct 2023 19:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FJVIBt088764; Sun, 15 Oct 2023 19:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVIpF088761; Sun, 15 Oct 2023 19:31:18 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:18 GMT Message-Id: <202310151931.39FJVIpF088761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 76c2b331bcd9 - main - lib/libc/amd64/string: add timingsafe_bcmp(3) scalar, baseline implementations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76c2b331bcd9f73c5c8c43a06e328fa0c7b8c39a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=76c2b331bcd9f73c5c8c43a06e328fa0c7b8c39a commit 76c2b331bcd9f73c5c8c43a06e328fa0c7b8c39a Author: Robert Clausecker AuthorDate: 2023-08-30 15:37:26 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:19:04 +0000 lib/libc/amd64/string: add timingsafe_bcmp(3) scalar, baseline implementations Very straightforward and similar to memcmp(3). The code has been written to use only instructions specified as having data operand independent timing by Intel. Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Differential Revision: https://reviews.freebsd.org/D41673 --- lib/libc/amd64/string/Makefile.inc | 3 +- lib/libc/amd64/string/timingsafe_bcmp.S | 232 ++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 1 deletion(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 73973a6d69de..fc420de0450e 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -15,4 +15,5 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strnlen.c \ - strspn.S + strspn.S \ + timingsafe_bcmp.S diff --git a/lib/libc/amd64/string/timingsafe_bcmp.S b/lib/libc/amd64/string/timingsafe_bcmp.S new file mode 100644 index 000000000000..c003da2ea9a7 --- /dev/null +++ b/lib/libc/amd64/string/timingsafe_bcmp.S @@ -0,0 +1,232 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + +ARCHFUNCS(timingsafe_bcmp) + ARCHFUNC(timingsafe_bcmp, scalar) + ARCHFUNC(timingsafe_bcmp, baseline) +ENDARCHFUNCS(timingsafe_bcmp) + +ARCHENTRY(timingsafe_bcmp, scalar) + cmp $16, %rdx # at least 17 bytes to process? + ja .Lgt16 + + cmp $8, %edx # at least 9 bytes to process? + ja .L0916 + + cmp $4, %edx # at least 5 bytes to process? + ja .L0508 + + cmp $2, %edx # at least 3 bytes to process? + ja .L0304 + + test %edx, %edx # buffer empty? + jnz .L0102 + + xor %eax, %eax # empty buffer always matches + ret + +.L0102: movzbl (%rdi), %eax # load 1--2 bytes from first buffer + movzbl -1(%rdi, %rdx, 1), %ecx + xor (%rsi), %al # xor in second buffer + xor -1(%rsi, %rdx, 1), %cl + or %ecx, %eax # mismatch in any of the two? + ret + +.L0304: movzwl (%rdi), %eax + movzwl -2(%rdi, %rdx, 1), %ecx + xor (%rsi), %ax + xor -2(%rsi, %rdx, 1), %cx + or %ecx, %eax + ret + +.L0508: mov (%rdi), %eax + mov -4(%rdi, %rdx, 1), %ecx + xor (%rsi), %eax + xor -4(%rsi, %rdx, 1), %ecx + or %ecx, %eax + ret + +.L0916: mov (%rdi), %rax + mov -8(%rdi, %rdx, 1), %rcx + xor (%rsi), %rax + xor -8(%rsi, %rdx, 1), %rcx + or %rcx, %rax + setnz %al # ensure EAX nonzero even if only + ret # high bits of RAX were set + + /* more than 16 bytes: process buffer in a loop */ +.Lgt16: mov (%rdi), %rax # process first 16 bytes + mov 8(%rdi), %r9 + mov $32, %ecx + xor (%rsi), %rax + xor 8(%rsi), %r9 + or %r9, %rax + + cmp %rdx, %rcx # enough left for a full iteration? + jae .Ltail + + /* main loop processing 16 bytes per iteration */ + ALIGN_TEXT +0: mov -16(%rdi, %rcx, 1), %r8 + mov -8(%rdi, %rcx, 1), %r9 + xor -16(%rsi, %rcx, 1), %r8 + xor -8(%rsi, %rcx, 1), %r9 + add $16, %rcx + or %r9, %r8 + or %r8, %rax + + cmp %rdx, %rcx + jb 0b + + /* process last 16 bytes */ +.Ltail: mov -16(%rdi, %rdx, 1), %r8 + mov -8(%rdi, %rdx, 1), %r9 + xor -16(%rsi, %rdx, 1), %r8 + xor -8(%rsi, %rdx, 1), %r9 + or %r9, %r8 + or %r8, %rax + setnz %al + ret +ARCHEND(timingsafe_bcmp, scalar) + +ARCHENTRY(timingsafe_bcmp, baseline) + cmp $32, %rdx # at least 33 bytes to process? + ja .Lgt32b + + cmp $16, %edx # at least 17 bytes to process? + ja .L1732b + + cmp $8, %edx # at least 9 bytes to process? + ja .L0916b + + cmp $4, %edx # at least 5 bytes to process? + ja .L0508b + + cmp $2, %edx # at least 3 bytes to process? + ja .L0304b + + test %edx, %edx # buffer empty? + jnz .L0102b + + xor %eax, %eax # empty buffer always matches + ret + +.L0102b: + movzbl (%rdi), %eax # load 1--2 bytes from first buffer + movzbl -1(%rdi, %rdx, 1), %ecx + xor (%rsi), %al # xor in second buffer + xor -1(%rsi, %rdx, 1), %cl + or %ecx, %eax # mismatch in any of the two? + ret + +.L0304b: + movzwl (%rdi), %eax + movzwl -2(%rdi, %rdx, 1), %ecx + xor (%rsi), %ax + xor -2(%rsi, %rdx, 1), %cx + or %ecx, %eax + ret + +.L0508b: + mov (%rdi), %eax + mov -4(%rdi, %rdx, 1), %ecx + xor (%rsi), %eax + xor -4(%rsi, %rdx, 1), %ecx + or %ecx, %eax + ret + +.L0916b: + mov (%rdi), %rax + mov -8(%rdi, %rdx, 1), %rcx + xor (%rsi), %rax + xor -8(%rsi, %rdx, 1), %rcx + or %rcx, %rax + setnz %al # ensure EAX nonzero even if only + ret # high bits of RAX were set + +.L1732b: + movdqu (%rdi), %xmm0 + movdqu (%rsi), %xmm2 + movdqu -16(%rdi, %rdx, 1), %xmm1 + movdqu -16(%rsi, %rdx, 1), %xmm3 + pcmpeqb %xmm2, %xmm0 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm0 + pmovmskb %xmm0, %eax # 1 where equal + xor $0xffff, %eax # 1 where not equal + ret + + /* more than 32 bytes: process buffer in a loop */ +.Lgt32b: + movdqu (%rdi), %xmm4 + movdqu (%rsi), %xmm2 + movdqu 16(%rdi), %xmm1 + movdqu 16(%rsi), %xmm3 + mov $64, %ecx + pcmpeqb %xmm2, %xmm4 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm4 + cmp %rdx, %rcx # enough left for a full iteration? + jae .Ltailb + + /* main loop processing 32 bytes per iteration */ + ALIGN_TEXT +0: movdqu -32(%rdi, %rcx, 1), %xmm0 + movdqu -32(%rsi, %rcx, 1), %xmm2 + movdqu -16(%rdi, %rcx, 1), %xmm1 + movdqu -16(%rsi, %rcx, 1), %xmm3 + add $32, %rcx + pcmpeqb %xmm2, %xmm0 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm0 + pand %xmm0, %xmm4 + cmp %rdx, %rcx + jb 0b + + /* process last 32 bytes */ +.Ltailb: + movdqu -32(%rdi, %rdx, 1), %xmm0 + movdqu -32(%rsi, %rdx, 1), %xmm2 + movdqu -16(%rdi, %rdx, 1), %xmm1 + movdqu -16(%rsi, %rdx, 1), %xmm3 + pcmpeqb %xmm2, %xmm0 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm0 + pand %xmm4, %xmm0 + pmovmskb %xmm0, %eax + xor $0xffff, %eax + ret +ARCHEND(timingsafe_bcmp, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Sun Oct 15 19:31:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2c3Ms8z4xJdj; Sun, 15 Oct 2023 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7r2b5mVtz4kmD; Sun, 15 Oct 2023 19:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mX7SEmOI9rJktSKZrSxmNxQ6Y9sHLz5GX68KRAzQaQg=; b=RW2QLwRQnylTPkzS9qU+2EfZzBbYYdXA9Tf7b5F0j44k9CkQtaFrtxiVuLM1AbkxSE55Gi xkBvhQlfQppwFZybkxpepANk4VQBvAQ4f+Aeh0YirHs/3t8vU/PaMcYJzJ3i9H/riFWEwB oLHAOyG+ughgwIc/Lo0LsFZY0hzlpYjUGu6UWM8zUn2uBTY02juZl+YAEDQNrEj+ueGMJ5 uGkasYTDFQuKgyo4t6DlFzN/j47nA8njsAfMBefLn6rTM01Cdd0ACB6DM3DNrxgHUy6I82 Nw18wwyEgtOsV78VchhAzNxre+bm6nqrE0cPqur8CA1eXz9T1jJoKBIqziMcAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398279; a=rsa-sha256; cv=none; b=pc+NsmCQ0E26XdBiCPgqOjn/E4GIs06CtG61PmaIhatoR0Ryv3Y8NIMd49GesGuGbPAKny LV6nJ4hstA0LQPQntSRqCUSkEJ+F3PtM0IHP5h5RnlbVoGtIdDMxEdf1g/Uhnl7pDnxuQM MzUs03VkzrvVrCAQ+rL4VgASDTrD8blynxFKyRK4MhYWRu2cKgTiN9ySBq8QQv9oE5RHHN MWR/vkK8GSA30n2dn/F2w58osYwaBay5zA5JQjlTa0E9bsMTr2HLGTS54CHOBN7gxcPLBs d+3zMYEWL/zi8i944NAlLwBnV49rHZTjKQwvHvafTwL7aeMb2p4SB7RwFvaKsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mX7SEmOI9rJktSKZrSxmNxQ6Y9sHLz5GX68KRAzQaQg=; b=SF0c9ta2q9cLD0hpQyBosyjg/3vn8665R5VbvMre+VfNsB2rk1cfuTN2/2NX69dZyJJfCW p8h8LKroqXf4Mh4RBjH3vaBzm7eGhmZK3ymtg0WH4y2rA2BF3x/QTaqvX2kwuC0rr/lKhH T4FhijKSco2Of/3MoIWqbQ7O1cn1VDfLaErPCJ1YyBd2NIvnprfAxwr+E3HHIGQDDEAmXA cdba+OU/khkTj6xglNal/13apcCukvPizGmfEL7Ez8VVmD/MMVnSPLWyHHXomo+FF62Pt3 cfF5+hXvw7fxAk1UNQUJ8m+MwKG18/OMkZ1lVpzmZqtlgagHD+SluD1NIt1BVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2b4sP1z1P3B; Sun, 15 Oct 2023 19:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FJVJXJ088813; Sun, 15 Oct 2023 19:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVJmf088810; Sun, 15 Oct 2023 19:31:19 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:19 GMT Message-Id: <202310151931.39FJVJmf088810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a78879dfaa8c - main - share/man/man7/simd.7: document new timingsafe_bcmp(3) scalar, baseline implementations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a78879dfaa8cae5384fefc0f03f10e15dc28d994 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a78879dfaa8cae5384fefc0f03f10e15dc28d994 commit a78879dfaa8cae5384fefc0f03f10e15dc28d994 Author: Robert Clausecker AuthorDate: 2023-08-31 15:34:44 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:21:26 +0000 share/man/man7/simd.7: document new timingsafe_bcmp(3) scalar, baseline implementations Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Differential Revision: https://reviews.freebsd.org/D41673 --- share/man/man7/simd.7 | 69 ++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index e5823f463ffb..057d74b944bc 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 25, 2023 +.Dd August 31, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -49,39 +49,40 @@ the environment variable can be used to override this mechanism. .Pp Enhanced functions are present in the following architectures: -.Bl -column FUNCTION__ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent -.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 -.It bcmp Ta Ta Ta S1 Ta S -.It bcopy Ta Ta S Ta S Ta S Ta SV -.It bzero Ta Ta S Ta S Ta S -.It div Ta Ta Ta S Ta S -.It index Ta S Ta Ta S1 -.It ldiv Ta Ta Ta S Ta S -.It lldiv Ta Ta Ta S -.It memchr Ta Ta Ta S1 -.It memcmp Ta Ta S Ta S1 Ta S -.It memcpy Ta S Ta S Ta S Ta S Ta SV -.It memmove Ta S Ta S Ta S Ta S Ta SV -.It memset Ta Ta S Ta S Ta S -.It rindex Ta S -.It stpcpy Ta Ta Ta S1 -.It strcat Ta Ta Ta S Ta S -.It strchr Ta S Ta Ta S1 Ta S -.It strchrnul Ta Ta Ta S1 -.It strcmp Ta Ta S Ta S Ta S -.It strcpy Ta Ta Ta S1 Ta S Ta S2 -.It strcspn Ta Ta Ta S2 -.It strlen Ta Ta S Ta S1 -.It strncmp Ta Ta S Ta Ta S -.It strncpy Ta Ta Ta Ta Ta S2 -.It strnlen Ta Ta Ta S1 -.It strrchr Ta S Ta Ta Ta S -.It strspn Ta Ta Ta S2 -.It swab Ta Ta Ta Ta S -.It wcschr Ta Ta Ta Ta S -.It wcscmp Ta Ta Ta Ta S -.It wcslen Ta Ta Ta Ta S -.It wmemchr Ta Ta Ta Ta S +.Bl -column FUNCTION________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent +.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 +.It bcmp Ta Ta Ta S1 Ta S +.It bcopy Ta Ta S Ta S Ta S Ta SV +.It bzero Ta Ta S Ta S Ta S +.It div Ta Ta Ta S Ta S +.It index Ta S Ta Ta S1 +.It ldiv Ta Ta Ta S Ta S +.It lldiv Ta Ta Ta S +.It memchr Ta Ta Ta S1 +.It memcmp Ta Ta S Ta S1 Ta S +.It memcpy Ta S Ta S Ta S Ta S Ta SV +.It memmove Ta S Ta S Ta S Ta S Ta SV +.It memset Ta Ta S Ta S Ta S +.It rindex Ta S +.It stpcpy Ta Ta Ta S1 +.It strcat Ta Ta Ta S Ta S +.It strchr Ta S Ta Ta S1 Ta S +.It strchrnul Ta Ta Ta S1 +.It strcmp Ta Ta S Ta S Ta S +.It strcpy Ta Ta Ta S1 Ta S Ta S2 +.It strcspn Ta Ta Ta S2 +.It strlen Ta Ta S Ta S1 +.It strncmp Ta Ta S Ta Ta S +.It strncpy Ta Ta Ta Ta Ta S2 +.It strnlen Ta Ta Ta S1 +.It strrchr Ta S Ta Ta Ta S +.It strspn Ta Ta Ta S2 +.It swab Ta Ta Ta Ta S +.It timingsafe_bcmp Ta Ta Ta S1 +.It wcschr Ta Ta Ta Ta S +.It wcscmp Ta Ta Ta Ta S +.It wcslen Ta Ta Ta Ta S +.It wmemchr Ta Ta Ta Ta S .El .Pp .Sy S Ns :\ scalar (non-SIMD), From nobody Sun Oct 15 19:31:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2d3HLPz4xJbj; Sun, 15 Oct 2023 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7r2d02Hrz4l4H; Sun, 15 Oct 2023 19:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWzBzF9PTdHjDbwBPVNoxP92z03bXQM2l14ygW+BStM=; b=szcwZfY1yEumRus/F4tcnThael43GpjdA0nH6tYzw5M36MADwVlwNUdDvR7VEMzg7NhazQ DzOUbLw7xIpplPlq4eIC3hQSM4D2Y2/zxVexbN1PUAGvLCmia0YWV+ZTdL0qbIa5/gXdWj xBn2KNFdPkFz+r6SO4lu7aNP7Q002WU0FM2tCv5D+4DWF5ABmc6Wi/+qyrJj9SZtY5++ra oXQGQjuRmQeY8pjBWfbOKRVzlTsYqLKuJiowF4pJG6zri8pDbxk8wKQbVdmUyWN37gP0az m2V4QnPl1ieSNKZ+e1rGqFgeadeskzFAPqopLBIGTNQNwxpMJ1c4vWyJYqgd9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398281; a=rsa-sha256; cv=none; b=Fdvu01t+T0OS9+aPScluGPz+64Fi6P0pRNVywqVlVs7VQcNJQj78BnU+YYBbgESZJAeDYn 6VdzxOEjuD/U2ImUPH6/RR00TjxsrzeTYyNTiJ3zPsHwzEnU2TIdeJsWKO5LtH/ecz4l0i gkUjBihV0CxpKXTa8/QrDuWOwSApyC8w/PhFhrx0ayLZmPVGuoXCof36YX5AWQvPY52SzR EbMXvO7MhqcggOevvSJniZFIugNXZkNlzSuga2xd4GtFc/I1wY+QJGwBLWmp5zDdFgCEZm e0fIwsrpQGsUu0Ja75XFUwiYIszQaMSEh5jG/pQtJbpW1VVmPzWd3hcdAQ/4+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=1697398281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWzBzF9PTdHjDbwBPVNoxP92z03bXQM2l14ygW+BStM=; b=wIPb7G1aUuK8VLO4mYgYxz4TRhKpK3XLXgpLk0x7xBcBe5LPrRw5MM1Yq3ssTNBKsX/PBY EMniVPt5lvUjS1G+Iz/9mFPL+G9ri7r60Jr9KqzEnE9LRF4sjw314qNYnJNOQWz4faxHdN F0dc6qUdYZuPWqGJ4yAke2Kmu7hjaOLUHkP8dTcln/HCntwBwvniKb8EKfMC1f6Vdd8VIx oy1o5uS1q3V29IAe3qg3ncam141cXfEvpgFC/bIGIL8m/cszBgH+/NWlQEoQ1DqaxQ+Ztf 3NpTLasajp9ih69fpUNfzGI4F5Er66rHAYI20U1zEPYlS0UtyE81BZP5VfE63A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2c64RCz1PKG; Sun, 15 Oct 2023 19:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FJVKFO088862; Sun, 15 Oct 2023 19:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVKNf088859; Sun, 15 Oct 2023 19:31:20 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:20 GMT Message-Id: <202310151931.39FJVKNf088859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 5048c1b85506 - main - lib/libc/amd64/string: add timingsafe_memcmp() assembly implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5048c1b85506c5e0f441ee7dd98dd8d96d0a4a24 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5048c1b85506c5e0f441ee7dd98dd8d96d0a4a24 commit 5048c1b85506c5e0f441ee7dd98dd8d96d0a4a24 Author: Robert Clausecker AuthorDate: 2023-10-15 19:25:53 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:25:53 +0000 lib/libc/amd64/string: add timingsafe_memcmp() assembly implementation Conceptually very similar to timingsafe_bcmp(), but with comparison logic inspired by Elijah Stone's fancy memcmp. A baseline (SSE) implementation was omitted this time as I was not able to get it to perform adequately. Best I got was 8% over the scalar version for long inputs, but slower for short inputs. Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Inspired by: https://github.com/moon-chilled/fancy-memcmp Differential Revision: https://reviews.freebsd.org/D41696 --- lib/libc/amd64/string/Makefile.inc | 4 +- lib/libc/amd64/string/timingsafe_memcmp.S | 145 ++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 2 deletions(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index fc420de0450e..09bf7c8f251e 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ amd64_archlevel.c \ bcmp.S \ @@ -16,4 +15,5 @@ MDSRCS+= \ strlen.S \ strnlen.c \ strspn.S \ - timingsafe_bcmp.S + timingsafe_bcmp.S \ + timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/timingsafe_memcmp.S b/lib/libc/amd64/string/timingsafe_memcmp.S new file mode 100644 index 000000000000..3f1eccdbd640 --- /dev/null +++ b/lib/libc/amd64/string/timingsafe_memcmp.S @@ -0,0 +1,145 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + +/* int timingsafe_memcmp(const void *rdi, const void *rsi, size_t rdx) */ +ENTRY(timingsafe_memcmp) + cmp $16, %rdx # at least 17 bytes to process? + ja .Lgt16 + + cmp $8, %edx # at least 9 bytes to process? + ja .L0916 + + cmp $4, %edx # at least 5 bytes to process? + ja .L0508 + + cmp $2, %edx # at least 3 bytes to process? + ja .L0304 + + test %edx, %edx # buffer empty? + jnz .L0102 + + xor %eax, %eax # empty buffer always matches + ret + +.L0102: movzbl -1(%rdi, %rdx, 1), %eax # load 1--2 bytes from first buffer + movzbl -1(%rsi, %rdx, 1), %ecx + mov (%rdi), %ah # in big endian + mov (%rsi), %ch + sub %ecx, %eax + ret + +.L0304: movzwl -2(%rdi, %rdx, 1), %ecx + movzwl -2(%rsi, %rdx, 1), %edx + movzwl (%rdi), %eax + movzwl (%rsi), %esi + bswap %ecx # convert to big endian + bswap %edx # dito for edx, (e)ax, and (e)si + rol $8, %ax # ROLW is used here so the upper two + rol $8, %si # bytes stay clear, allowing us to + sub %edx, %ecx # save a SBB compared to .L0508 + sbb %esi, %eax + or %eax, %ecx # nonzero if not equal + setnz %al + ret + +.L0508: mov -4(%rdi, %rdx, 1), %ecx + mov -4(%rsi, %rdx, 1), %edx + mov (%rdi), %edi + mov (%rsi), %esi + bswap %ecx # compare in big endian + bswap %edx + bswap %edi + bswap %esi + sub %edx, %ecx + sbb %esi, %edi + sbb %eax, %eax # -1 if less, 0 if greater or equal + or %edi, %ecx # nonzero if not equal + setnz %al # negative if <, 0 if =, 1 if > + ret + +.L0916: mov -8(%rdi, %rdx, 1), %rcx + mov -8(%rsi, %rdx, 1), %rdx + mov (%rdi), %rdi + mov (%rsi), %rsi + bswap %rcx # compare in big endian + bswap %rdx + bswap %rdi + bswap %rsi + sub %rdx, %rcx + sbb %rsi, %rdi + sbb %eax, %eax # -1 if less, 0 if greater or equal + or %rdi, %rcx # nonzero if not equal + setnz %al # negative if <, 0 if =, 1 if > + ret + + /* compare 17+ bytes */ +.Lgt16: mov (%rdi), %r8 # process first 16 bytes + mov (%rsi), %r9 + mov $32, %ecx + cmp %r8, %r9 # mismatch in head? + cmove 8(%rdi), %r8 # if not, try second pair + cmove 8(%rsi), %r9 + cmp %rdx, %rcx + jae .Ltail + + /* main loop processing 16 bytes per iteration */ + ALIGN_TEXT +0: mov -16(%rdi, %rcx, 1), %r10 + mov -16(%rsi, %rcx, 1), %r11 + cmp %r10, %r11 # mismatch in first pair? + cmove -8(%rdi, %rcx, 1), %r10 # if not, try second pair + cmove -8(%rsi, %rcx, 1), %r11 + cmp %r8, %r9 # was there a mismatch previously? + cmove %r10, %r8 # apply new pair if there was not + cmove %r11, %r9 + add $16, %rcx + cmp %rdx, %rcx + jb 0b + +.Ltail: mov -8(%rdi, %rdx, 1), %r10 + mov -8(%rsi, %rdx, 1), %r11 + cmp %r8, %r9 + cmove -16(%rdi, %rdx, 1), %r8 + cmove -16(%rsi, %rdx, 1), %r9 + bswap %r10 # compare in big endian + bswap %r11 + bswap %r8 + bswap %r9 + sub %r11, %r10 + sbb %r9, %r8 + sbb %eax, %eax # -1 if less, 0 if greater or equal + or %r10, %r8 # nonzero if not equal + setnz %al # negative if <, 0 if =, 1 if > + ret +END(timingsafe_memcmp) + + .section .note.GNU-stack,"",%progbits From nobody Sun Oct 15 19:31:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2f50kNz4xJbm; Sun, 15 Oct 2023 19:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7r2f0qlyz4kdY; Sun, 15 Oct 2023 19:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBpICiX2Yj56PsuKHzdPYA36sCgdTSwPrrgEdl18NqE=; b=mTPi1F9Fy3CoVUZ91VehF98vkdTeG+SJzkJk7MsAfdd6zHnMKzIc7+FieEfO87fTHA5Ehx cpTD5cHCph/H2mtreNV3WXOuNu68Bz/6HEGrvEvkcretAOPnXQ3xfVBve4bkXg6j0uw460 cd8WJFVGLX91DrvWan8jAAuqBjwHScYGbkmhApRS9LWG44HKq7fdkxGyNIz8JLvs3Co+7z c/9+dksU/fR/FIYyeO/l+uZvwz0pp3a+jRNsjnnAOQdA5qvIiy7jGRhVept5e5OaLfEmUD ztVKPRL3CM4hxh+J+6LRs5Bmp4l7zpnQ702JPR4bj/MXcuTgR3INsmbBuSfp/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398282; a=rsa-sha256; cv=none; b=cjB6e2L/eUkoLBOfH19UuaRRMyfX1+TBoRitRUqGraA5vgl5NnYdqtFE6kjUR0/NngJ8Pw 4IELJaks7xQYfvq8Eb5mwXYKNvDu6nct/fhtK5qg7+LUys95HByZK9/R7e+SUsbnjNtQK9 DiKbBV+1Liax8M8zuqtvk9Bh/UIiWXlXjpradUDr36NAhqrYlrno60xKFaMiKTkl712Dow sKvH1IN2mXY09v2JV32GU6HnufOGhXu/saE5KkMXfU0YKGKlr9AMVoQm4ZZ7jWLtspBASG 8dDxRexpfkS0pU2Lam3lqXXXwT/usiY2d0wE8ACkVGq82T/QAD5UI+neIOT7Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBpICiX2Yj56PsuKHzdPYA36sCgdTSwPrrgEdl18NqE=; b=b3Fbfp8m4CxNza0JktNixp5ncARCi3Cy0TWhn1+ZnGOIN01/weICKDIWLxVTmHQLtWW/7R bxTFUsFD8Gp5gxPA0B0xva6kgAcLf2yvE8mlb47PK3mPBV8cegKKIU4wUp6tlitU7wYWme 1kE0hLjgSNJt32+EEA2iKi1WupbI+mMFbO6azpLS5vsvkg7L+XtviiT4i8xnM+cBVApulF GuWbXbS96KGLN+Dit/hU3bXgse2CX/DzWwbdWKJs2pWiOEw9bXZ5b+hsjjB5mYmlgBdWdv tObrUc3GRvKVnk2cojqP8ZsAIK7Bm4H1ytDOe9YefbpcrLoB8iixXHCLzUfWWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2d738bz1PKH; Sun, 15 Oct 2023 19:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FJVL0G088904; Sun, 15 Oct 2023 19:31:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVLdN088901; Sun, 15 Oct 2023 19:31:21 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:21 GMT Message-Id: <202310151931.39FJVLdN088901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a8cc4671c06a - main - share/man/man7/simd.7: document new amd64 timingsafe_memcmp() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8cc4671c06ab77d5551a74cdebced8d859cac76 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a8cc4671c06ab77d5551a74cdebced8d859cac76 commit a8cc4671c06ab77d5551a74cdebced8d859cac76 Author: Robert Clausecker AuthorDate: 2023-10-15 19:29:20 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:29:20 +0000 share/man/man7/simd.7: document new amd64 timingsafe_memcmp() Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Differential Revision: https://reviews.freebsd.org/D41696 --- share/man/man7/simd.7 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 057d74b944bc..3fd8890c4f53 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 31, 2023 +.Dd September 2, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -49,7 +49,7 @@ the environment variable can be used to override this mechanism. .Pp Enhanced functions are present in the following architectures: -.Bl -column FUNCTION________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent +.Bl -column FUNCTION_________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent .It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 .It bcmp Ta Ta Ta S1 Ta S .It bcopy Ta Ta S Ta S Ta S Ta SV @@ -79,6 +79,7 @@ Enhanced functions are present in the following architectures: .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 +.It timingsafe_memcmp Ta Ta Ta S .It wcschr Ta Ta Ta Ta S .It wcscmp Ta Ta Ta Ta S .It wcslen Ta Ta Ta Ta S From nobody Sun Oct 15 20:11:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7rxD2B50z4xLl1 for ; Sun, 15 Oct 2023 20:11:44 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7rxC3lYjz4p14 for ; Sun, 15 Oct 2023 20:11:43 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=DBkufF9d; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::d30 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org; dmarc=none Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7a5a746e355so89298839f.0 for ; Sun, 15 Oct 2023 13:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1697400702; x=1698005502; 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=gv30Sx75bBnrEyNg5W6Gc410dxaQstu6Fb8/WMBiG+s=; b=DBkufF9di0VRonSINYtlgLHVJPsaOVK9NLYL99CTOsJMxnhBISWoDZiEtF7rpHO1AL QMXX4imTJ8SXsvLt/CcNDvwilwxqwuMgIEWGQ++rQOotaI2CLHB1vz1KYIm11acnfvQL j9XN7mAnDeNh6T0MsMdpMay3/s1byk5uuoVyvTfEnAzAX3dvwVffa3b9Q4wNLx9Jtsfv fE3caeLWsIr3l0raew1nRijv6dBJjY+bGr9T/mvOYPsEAHsel1KgyAu4kbXBuv1dulNl PLF8NhCVI0f7PzNNi3KrN3Rv6IL1QnLYvHA4ge0cbK/htPGE7V88HAJdBsc1TRDd/7j7 gNGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697400702; x=1698005502; 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=gv30Sx75bBnrEyNg5W6Gc410dxaQstu6Fb8/WMBiG+s=; b=D/trLrj437HlJ1uT53vyMIX67M5BF0jl8wAD7deIK3yPmF/EkZgx4T6JjGBQt6tPO1 WWQCJukHmKjcnkICW0NaLvV+qnr2SXTqJwAGODPkkOx25RscUNQD2H5ODyHf1rUWLEPC NDWgmmpTqyYgiHFTGHYf6pgK5+NGdXPqY4stEDu4ciMgC2qoMhsxorBL2bukxbpfTQo0 zw80A09k+756zAzLEl3G2+Cib8KUuMHtULO9j3CQNIo6JylfEC4VkC4spEgCDkSrf5Dd 4q2oIrhu1P1nw4c0vJREjyC7jUWeHAVnjRwJa9p8ndkiKY+TOIGTov/vGq9930+90WpO rEeA== X-Gm-Message-State: AOJu0YwQHrLB7tFnX0fckLZJqhaaYfl53zz5AGZFDEg/AkIOoN1OkNQ2 OfWzI+CA5jszCiojApfxWmCVUA== X-Google-Smtp-Source: AGHT+IE14Tr0NbC4aJq9p/c/8SQoRZ1eCP53syIYLzgWghG/6Vjj+q+05oHWLO14AfdQajzzdQaq/Q== X-Received: by 2002:a05:6602:154:b0:795:d33:861f with SMTP id v20-20020a056602015400b007950d33861fmr3817747iot.6.1697400702093; Sun, 15 Oct 2023 13:11:42 -0700 (PDT) Received: from mutt-hbsd (c-73-153-118-59.hsd1.co.comcast.net. [73.153.118.59]) by smtp.gmail.com with ESMTPSA id u8-20020a02cb88000000b004564b193674sm890663jap.160.2023.10.15.13.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 13:11:39 -0700 (PDT) Date: Sun, 15 Oct 2023 16:11:39 -0400 From: Shawn Webb To: Kristof Provost Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2cef62886dc7 - main - pf: convert state retrieval to netlink Message-ID: <20231015201139.zt7mfyss4ua2bkn3@mutt-hbsd> 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: <202310100950.39A9oYuc029996@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ri7nrzjoeqv4izka" Content-Disposition: inline In-Reply-To: <202310100950.39A9oYuc029996@gitrepo.freebsd.org> X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.10 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::d30:from]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[hardenedbsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 4S7rxC3lYjz4p14 --ri7nrzjoeqv4izka Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 10, 2023 at 09:50:34AM +0000, Kristof Provost wrote: > The branch main has been updated by kp: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D2cef62886dc7c33ca01f70ca71= 2845da1e55b470 >=20 > commit 2cef62886dc7c33ca01f70ca712845da1e55b470 > Author: Alexander V. Chernikov > AuthorDate: 2023-09-15 10:06:59 +0000 > Commit: Kristof Provost > CommitDate: 2023-10-10 09:48:21 +0000 >=20 > pf: convert state retrieval to netlink > =20 > Use netlink to export pf's state table. > =20 > The primary motivation is to improve how we deal with very large state > stables. With the previous implementation we had to build the entire > list (both in the kernel and in userspace) before we could start > processing. With netlink we start to get data in userspace while the > kernel is still generating more. This reduces peak memory consumption > (which can get to the GB range once we hit millions of states). > =20 > Netlink also makes future extension easier, in that we can easily add > fields to the state export without breaking userspace. In that regard > it's similar to an nvlist-based approach, except that it also deals > with transport to userspace and that it performs significantly better > than nvlists. Testing has failed to measure a performance difference > between the previous struct-copy based ioctl and the netlink approach. > =20 > Differential Revision: https://reviews.freebsd.org/D38888 > --- > include/Makefile | 3 +- > lib/libpfctl/libpfctl.c | 214 +++++++++++++++++---------------- > sys/conf/files | 1 + > sys/modules/pf/Makefile | 2 +- > sys/netpfil/pf/pf_ioctl.c | 5 + > sys/netpfil/pf/pf_nl.c | 292 ++++++++++++++++++++++++++++++++++++++++= ++++++ > sys/netpfil/pf/pf_nl.h | 105 +++++++++++++++++ > 7 files changed, 522 insertions(+), 100 deletions(-) > diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c > index db8f481a1567..42c2aa9bfb01 100644 > --- a/sys/netpfil/pf/pf_ioctl.c > +++ b/sys/netpfil/pf/pf_ioctl.c > @@ -83,6 +83,7 @@ > #include > #include > #include > +#include > #include > =20 > #ifdef INET6 > @@ -6648,6 +6649,8 @@ pf_unload(void) > } > sx_xunlock(&pf_end_lock); > =20 > + pf_nl_unregister(); > + > if (pf_dev !=3D NULL) > destroy_dev(pf_dev); > =20 > @@ -6683,6 +6686,7 @@ pf_modevent(module_t mod, int type, void *data) > switch(type) { > case MOD_LOAD: > error =3D pf_load(); > + pf_nl_register(); > break; > case MOD_UNLOAD: > /* Handled in SYSUNINIT(pf_unload) to ensure it's done after > @@ -6703,4 +6707,5 @@ static moduledata_t pf_mod =3D { > }; > =20 > DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_FIREWALL, SI_ORDER_SECOND); > +MODULE_DEPEND(pf, netlink, 1, 1, 1); > MODULE_VERSION(pf, PF_MODVER); Hey Kristof, This causes a hard dependency on the netlink kernel module, which may not be available in some configurations. For safety reasons, HardenedBSD prevents loading of netlink.ko by default. The code is too new and too complex, with already a not-so-nice security history, to be trusted. A lot (all?) of the other netlink integration code respects the potential unavailability of netlink (or netlink.ko). Would it be possible to do the same in pf? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --ri7nrzjoeqv4izka Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmUsR3UACgkQ/y5nonf4 4fq7yA/+IZAb8B02qAvO/oPfGMk4UO67EjXnpA5y3Qp67K37NTQ/ZIKroZR1OSp0 8GHCVeXC552hxv62JQV097NICKBxEWel9FKOFTGbyv+JlIp4hJR+3O6mMC68E5TU i20PqCuZp1E9dixsQxd7mEvJgFld8MahuqZDh424799M5J1mdgprdIvp3taS7S5R yhaJZ9buJ1iwFBSJDo4QoDI0tQcxEqMbaHEf5ZPyZV4ReRtV7BmG1SMotZ4QwTgy GVAslKnCVfVuiX+pJdfrr1QfV5s0njCbHSgGaN5tQDkS+/dBCSi9DcwfW30OJIOP yITioPPnw/5xBnbft6tHAYFSYaXHhG29JPUzCy4WHSBZQ3PnxnTxhjGMvYiL8/Jl oklvRG2JJ1x1gtYmQmGm+UkCb6lt6JBBAxD7nG988Fxp5pu/tzYk2WTdGr9Pag7Z NwfVRkqVcOuvBjR+Zj6NoktLxAiHF4hg2oLBVvHZInhfZtKe+FiIFyfJXSSeniXg 0x0+xU3dmkLFCiWe+hdP7MNBPxn08Nnq3JAwleBw/ZqXID+IE+LZXIYveJM5yTKK OQs99jPYkpsbCy9AVdnk7YKjC5fxIQvmEKCwLXOTz2xHWUXg0u8qF+ykSHVlCyD6 +uv/+IetAlVBTB3OurPbo67B/3h9oPnxYnx+7RBz1VTa/XMPWQI= =eoPf -----END PGP SIGNATURE----- --ri7nrzjoeqv4izka-- From nobody Mon Oct 16 07:37:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S888y3DC8z4x2tC; Mon, 16 Oct 2023 07:37:54 +0000 (UTC) (envelope-from kp@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S888y2jcWz4YHq; Mon, 16 Oct 2023 07:37:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697441874; 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=l91kvURmSb9nHaSCNfegLEjxhfZcC+MMGZHOR2F6+6g=; b=w8sGGekJ86z/UreVMtGdWE4GC6sf1KupKNRSQhAG+9AERnFoqyzYIJ5U1IqWl74esYu9Rx ovnby7Bsbpaj6SSqmaB9EjsjqlQ6eXEL3PE7Mo/rF1mCCBbFryTyN0FlIrnTx4KTfZ+cex qpCauq4vbjHCbqC1qxcsnGMSHuYTobTOhNyiEMp/vQnx1Ppec2x4ng3YaIN7uMOtrC5jlO 33d4cjecaFcWrsgmcYWRKVtvkCdjr7NBSp58uJ6hXjaYCO5LYR2z/BmiSkQhxOuA1gUPLs 1WVsU2ReC8S+M7eih3cfV6SRMHSHBhR7Ruvisj3a78utcLMzUXiFf4DHWYaBZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697441874; a=rsa-sha256; cv=none; b=XIp6lFuMFFrQ/WX68irHc5TbRFhCLkQaabjC/6by8SVIeejlvVeiBeQ79bZ++h6tL8qcWI VbvD29qfttZDusP6OOCp7b0d5hvo+k4kYl+Vlaxfl0o3E7wluS7hVCAzF1NfTZfAXexTqX vRWq/xa9NX89CX+9x+n7cENqQW/n01KYBnZke81pY38TzAYrREkWYEMDn3SPSki0wPelLY XCfyr/t+/FIvvjb/Q+lcEMBZVDpy+pkH9owtrsTlVsaln2vEwX0IGAmKVfE7dHMEWdyUO/ wtSvLDiVoy9it4IKp1uCohjJ2zN2TkFBNTwlPxM1A7OUqT7WTRMSQ8toCxfQYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697441874; 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=l91kvURmSb9nHaSCNfegLEjxhfZcC+MMGZHOR2F6+6g=; b=Z1oBI9uVIF/mCG0YTEIpSredzbq+F8p3WVOSdeKMHBGdvVkfRuE1yShiJNhu0wpQRuye6n f6hqTLiOkuwOxj2trtMoNKjghZQn1BJqPsDTlTG8lAZbABHl7p3ViPDDm68u3Pc4+Yq4Xq ucTeHulWajGuBL1PIlgJK+k3sI4ctWRYoA4tOskKiynx8OQZIf+Gtih79A+C2asCrOcRhK RxYR71GpeLkRvP1AXBHf+udEe0GsZfeSn5GsPJ9UysS8br9JIsdwLgquR6aWE1u3S7I4oj 7y3+di35eMgiLVkK6mERJNbtSIyyX5pI39OCys/cGluJUJdWxweH6hr/y7rEaQ== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S888y11mMz5Hd; Mon, 16 Oct 2023 07:37:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 3AAE94B26E; Mon, 16 Oct 2023 09:37:52 +0200 (CEST) From: Kristof Provost To: Shawn Webb Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2cef62886dc7 - main - pf: convert state retrieval to netlink Date: Mon, 16 Oct 2023 09:37:51 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <92D6FE8C-50FF-4DC2-B0BF-29CBC7A4075C@FreeBSD.org> In-Reply-To: <20231015201139.zt7mfyss4ua2bkn3@mutt-hbsd> References: <202310100950.39A9oYuc029996@gitrepo.freebsd.org> <20231015201139.zt7mfyss4ua2bkn3@mutt-hbsd> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 15 Oct 2023, at 22:11, Shawn Webb wrote: > On Tue, Oct 10, 2023 at 09:50:34AM +0000, Kristof Provost wrote: >> The branch main has been updated by kp: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D2cef62886dc7c33ca01f70c= a712845da1e55b470 >> >> commit 2cef62886dc7c33ca01f70ca712845da1e55b470 >> Author: Alexander V. Chernikov >> AuthorDate: 2023-09-15 10:06:59 +0000 >> Commit: Kristof Provost >> CommitDate: 2023-10-10 09:48:21 +0000 >> >> pf: convert state retrieval to netlink >> >> Use netlink to export pf's state table. >> >> The primary motivation is to improve how we deal with very large s= tate >> stables. With the previous implementation we had to build the enti= re >> list (both in the kernel and in userspace) before we could start >> processing. With netlink we start to get data in userspace while t= he >> kernel is still generating more. This reduces peak memory consumpt= ion >> (which can get to the GB range once we hit millions of states). >> >> Netlink also makes future extension easier, in that we can easily = add >> fields to the state export without breaking userspace. In that reg= ard >> it's similar to an nvlist-based approach, except that it also deal= s >> with transport to userspace and that it performs significantly bet= ter >> than nvlists. Testing has failed to measure a performance differen= ce >> between the previous struct-copy based ioctl and the netlink appro= ach. >> >> Differential Revision: https://reviews.freebsd.org/D38888 >> --- >> include/Makefile | 3 +- >> lib/libpfctl/libpfctl.c | 214 +++++++++++++++++---------------- >> sys/conf/files | 1 + >> sys/modules/pf/Makefile | 2 +- >> sys/netpfil/pf/pf_ioctl.c | 5 + >> sys/netpfil/pf/pf_nl.c | 292 +++++++++++++++++++++++++++++++++++++= +++++++++ >> sys/netpfil/pf/pf_nl.h | 105 +++++++++++++++++ >> 7 files changed, 522 insertions(+), 100 deletions(-) > >> diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c >> index db8f481a1567..42c2aa9bfb01 100644 >> --- a/sys/netpfil/pf/pf_ioctl.c >> +++ b/sys/netpfil/pf/pf_ioctl.c >> @@ -83,6 +83,7 @@ >> #include >> #include >> #include >> +#include >> #include >> >> #ifdef INET6 >> @@ -6648,6 +6649,8 @@ pf_unload(void) >> } >> sx_xunlock(&pf_end_lock); >> >> + pf_nl_unregister(); >> + >> if (pf_dev !=3D NULL) >> destroy_dev(pf_dev); >> >> @@ -6683,6 +6686,7 @@ pf_modevent(module_t mod, int type, void *data) >> switch(type) { >> case MOD_LOAD: >> error =3D pf_load(); >> + pf_nl_register(); >> break; >> case MOD_UNLOAD: >> /* Handled in SYSUNINIT(pf_unload) to ensure it's done after >> @@ -6703,4 +6707,5 @@ static moduledata_t pf_mod =3D { >> }; >> >> DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_FIREWALL, SI_ORDER_SECOND); >> +MODULE_DEPEND(pf, netlink, 1, 1, 1); >> MODULE_VERSION(pf, PF_MODVER); > > Hey Kristof, > > This causes a hard dependency on the netlink kernel module, which may > not be available in some configurations. > > For safety reasons, HardenedBSD prevents loading of netlink.ko by > default. The code is too new and too complex, with already a > not-so-nice security history, to be trusted. > > A lot (all?) of the other netlink integration code respects the > potential unavailability of netlink (or netlink.ko). Would it be > possible to do the same in pf? > No. I=E2=80=99m not maintaining multiple configuration paths for pf. There=E2= =80=99s currently fallback paths to support old binaries, but I intend to= remove that code as soon as possible. Having configuration paths that ar= e untested, practically untestable and unmaintained is not a situation we= want to maintain either. Kristof From nobody Mon Oct 16 10:47:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8DMg4Ws2z4xDD3; Mon, 16 Oct 2023 10:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8DMg3rSqz3MHT; Mon, 16 Oct 2023 10:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ1l897Ns3+xBWUzMMznfYAGwKlzUaktuDvPAA+WCOo=; b=f7ZvZG5flNU7ni2FOmhkXjxWnKs0vEjxw/kA0t8mWrMMKQLd5kTyByw8hG4GeHPI4YokBy XKXqnWRYMWXly7SVH9g8gRk4ee9r3KcoFhdn01rmx+pHZlfeh6vT7T8yRKeW8qQRTJD2aB osJ/FKCyty2+meBEJJLJLtlw+VyYhIdEO5DoyaaFA8DgQzV9RQWahBskY2X0uOYHnYonQi ePOpWTzBI5OZccz9iwe4o2JGHBnJ/58s+O6G1FRocaWjx5e+oCa8r50ACtQmmcB1cYpAUI D35yZVyMLfPaCniTcJUWPVRMDEfV/eS+IwwsdMRiCAw8Hf3bEdUTVLAsneO/bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697453247; a=rsa-sha256; cv=none; b=hyxV0Rq51og4VG2pe6iFsNK58w+7TEvNL9PCaQLsIjoyJEs4cygOQtxVenxYR+BaHZROa6 L4EgXW5+GKnxkekwpniq+G7mrbKLguN84f/w9SOMfCaIjf5SjbvT13uLto+Npz7rQ6lXLL AnaMiBPY518Oh6XpKQ+rWZJiXnmPxFG6Jz1vkbjSFbXiq+JwCdMcoVA7eNKPwzymXxevFk /lzszS4X6qT96JVCE7GAcMX45NXs4BiQHReOqkKXJ3BNlfEdf7YQgkgnEqLSafb9Zgc1an JTn0DVJ6omCxo7XiVOrsT6u3BsHOf7pLOyIM2ECWx7cmeET20T526Ek4J7eXFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ1l897Ns3+xBWUzMMznfYAGwKlzUaktuDvPAA+WCOo=; b=dHVJjSsymWmhLOP83KoGkjbz/DYkCjeVa2GXvMF/Qj9unSOkxFu2XMmk6NayQa95VMNZBh P/g32WDPXEdYyZbE/C0MfGCT6Q22z2IDvm0/tAahx0mzfW5k3MhSHNcAsnN65JTWLzLWDG kkzVrfk7Q6Z1ghwHIlobhEhXrpLXjreC0IqeMw5rHoBWaPWEAw6si4adqTqYLnUa5f+Tx6 HWY9ApjUiFNadrdVg10s4e11xFBf8J2SjjLEGWg7iEDmUIAHBulZeb/m2tCraV+pziElnb 6/mYxS5jCed3SWT5OSzKeMdqvX94eHw61MDzAX2XUrGIVb+HmJUnmutiOzbEtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8DMg2w7szcSL; Mon, 16 Oct 2023 10:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GAlRus003695; Mon, 16 Oct 2023 10:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GAlR8c003692; Mon, 16 Oct 2023 10:47:27 GMT (envelope-from git) Date: Mon, 16 Oct 2023 10:47:27 GMT Message-Id: <202310161047.39GAlR8c003692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7098f3c7569c - main - pci: Set the domain in the pci_generic driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 7098f3c7569c21ecdfc990772e96a416f1a94eee Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7098f3c7569c21ecdfc990772e96a416f1a94eee commit 7098f3c7569c21ecdfc990772e96a416f1a94eee Author: Andrew Turner AuthorDate: 2023-10-13 10:08:21 +0000 Commit: Andrew Turner CommitDate: 2023-10-16 09:36:39 +0000 pci: Set the domain in the pci_generic driver Tell bus_dma(9) which NUMA domain the PCI driver is closest to so it can allocate memory from there when possible. Reviewed by: markj, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42186 --- sys/dev/pci/pci_host_generic.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index cef83069c371..90361a7258ed 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -83,7 +83,7 @@ pci_host_generic_core_attach(device_t dev) uint64_t phys_base; uint64_t pci_base; uint64_t size; - int error; + int domain, error; int rid, tuple; sc = device_get_softc(dev); @@ -104,6 +104,13 @@ pci_host_generic_core_attach(device_t dev) if (error != 0) return (error); + /* + * Attempt to set the domain. If it's missing, or we are unable to + * set it then memory allocations may be placed in the wrong domain. + */ + if (bus_get_domain(dev, &domain) == 0) + (void)bus_dma_tag_set_domain(sc->dmat, domain); + if ((sc->quirks & PCIE_CUSTOM_CONFIG_SPACE_QUIRK) == 0) { rid = 0; sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, From nobody Mon Oct 16 10:47:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8DMh5Nkwz4xDL7; Mon, 16 Oct 2023 10:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8DMh4sbxz3MFN; Mon, 16 Oct 2023 10:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IqrHDY788YzmIKpLZHvzn7QzeTz5l7c3Abx60TyXqc=; b=IaleBtwDMA36WsdAbk2iqc8x9u/OOqlMV/6N4kieuv2wpr+Cumr1a0XH6nlUK+3O1XVgiZ 9rGSvSria+3gYSARgAWcoWq2/d8UZr44n7jCJ4IaNlqzNNDvkUnXnwtu3HSwtuXPSn8g2r EwojRsTJI7jvhbEULghol3AfJBynScDGhyVfkzva4fR6+nyduwRtiuA9X6j/pxlpF2+fLh zxv3AfTFmtzfiWePw/Vs0bnUvJmZmzhEpyor3xmIH1tuquH4ZpWJr6fVqKfW3ntpYs180j l2gyDZupqH1IgRe+dYJNRi83CS+K7LvfOu389pFzNlHOmfVtxoGPo6/bIXJVaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697453248; a=rsa-sha256; cv=none; b=niZNrM95iQq1ES18PXkxgo5fZlNVIor4jEV6EmMuq6CbaGcynwHuhR8o7TlfQWZytt8S5m F+CTdL2jbQCSjFp2YOL5cC5RH1D3I/jaHPobpdb7E5uoIih1EzLBBq9ao5AkGCNN6JOcx1 OI2fl6qVosMJNatLLjGAg9GMOROVkWeyFimDOZYjp9zz/1DWW+irAJeeH43PvkDizfhbrZ mm1T0bKbIsP8oMLYd25c4u9vQGjzQ4+s9CKSLGraENhsVclpTti6qU9lvGTaBLyAwIuGJI s/behBQmDWHtj0r/eanyX7OrTHrydTj1rEbTEG6r07oVMpiIcpNaFHTQ7x2NHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IqrHDY788YzmIKpLZHvzn7QzeTz5l7c3Abx60TyXqc=; b=c62MO/1mwGLM74LR59kT3xc9jaGhV0TdNSvNh5nn7TK5DGPRcosaYgfpf1KTmey4b6ZAWP uA9fLjoTBq3v7EtL4Ih87v4IqDH/5Rgl48JnrXbsCIW0mfLQUVY1XCNNdmfjijUPJ4NQre Ff/eR+dRVaWbOR7sno+Biq0VwvbBIFAa48qQ9czIMAzwkl0wMr9zZ0DV0brkDY76CJ+BUJ BKQh6XA1bJnuNpVb7K1Kh9Ab99gHUio43M1a0qW38t3TBH4O5kvyASBDF9QeGzQEGdFDCZ azVGuOxerE7/fhu3uWjKzJnRdVnYmd6bUBlVpH9oQ0RpXhXruyw4OVy/ehz+hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8DMh3xKrzcC3; Mon, 16 Oct 2023 10:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GAlSf5003756; Mon, 16 Oct 2023 10:47:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GAlS4A003753; Mon, 16 Oct 2023 10:47:28 GMT (envelope-from git) Date: Mon, 16 Oct 2023 10:47:28 GMT Message-Id: <202310161047.39GAlS4A003753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a69450102ff1 - main - arm64: Raise a SIGBUS on a user external abort List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a69450102ff1fe1466077a021a16bb265274d3a2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a69450102ff1fe1466077a021a16bb265274d3a2 commit a69450102ff1fe1466077a021a16bb265274d3a2 Author: Andrew Turner AuthorDate: 2023-09-29 13:55:48 +0000 Commit: Andrew Turner CommitDate: 2023-10-16 10:38:14 +0000 arm64: Raise a SIGBUS on a user external abort When userspace triggers an external abort allow it to handle the abort by raising a SIGBUS. Reviewed by: markj, kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42018 --- sys/arm64/arm64/trap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 2dda8cfc4c20..6534fd2283a1 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -225,19 +225,25 @@ static void external_abort(struct thread *td, struct trapframe *frame, uint64_t esr, uint64_t far, int lower) { + if (lower) { + call_trapsignal(td, SIGBUS, BUS_OBJERR, (void *)far, + ESR_ELx_EXCEPTION(frame->tf_esr)); + userret(td, frame); + return; + } /* * Try to handle synchronous external aborts caused by * bus_space_peek() and/or bus_space_poke() functions. */ - if (!lower && test_bs_fault((void *)frame->tf_elr)) { + if (test_bs_fault((void *)frame->tf_elr)) { frame->tf_elr = (uint64_t)generic_bs_fault; return; } print_registers(frame); print_gp_register("far", far); - panic("Unhandled EL%d external data abort", lower ? 0: 1); + panic("Unhandled external data abort"); } /* From nobody Mon Oct 16 12:09:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8GBs05k4z4xHlv; Mon, 16 Oct 2023 12:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8GBr6clVz3ZYy; Mon, 16 Oct 2023 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697458196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JyR63E6fkVw7imjczn+TZAZC3beIqxZalAtlaW3G3Do=; b=KzYLcAPB0imcU5uMn1mz2qSyvZKuY9495naxo+QBc+qUv6YsZZ0XpInocrXtiSHaoY/iv1 QEARTIBb7owm36zQ14pLZONgPAFZs9TPOMna2XMR2jQf2HCoRwtWhC+SyGodsE5ucrKVeo W1sA53Vu3yVTokg91OeiDHNFifywIs9ltlV/k6c1WPvX0dMtZ492/8sVKDzflX0hNzOynh 3UHyh+eV3UlbS3Ne5B+KvZ2BhuPA1XK7YOyLwXSdXJTLTKeMnqWVJDVk261GfGHUYNBjIe J5GBJjQs6CUSCoVCvqR/yuwT/9hb8m7iWNwMQTiVssPOq8djNrnyxwx7uUzIIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697458196; a=rsa-sha256; cv=none; b=dYuF+QQgWhXsoGiasUrPdlp4KHM6fvaEK4wqRJ5Fnx7/9l+L6OfhpKWMDHKpWHFvCbop6z 6O/eCgQ7+K3JHpy/kQ6qwRhndajZEH7SamVm4qriUrRUjNLZsLPGsx0OiybSMuQJysYT9O MTJ5L6U9PWLGnfvDJk3DmTHpVwi72RWEsNFV+xZPbQ80HB79n5RSFY0090QwhyQNK3J3he fKo8VFTFd98RVwDS2/2E+MXNpoMCfFyq+7s/MIxnTjocUuc2XImdhGK7Hx5JpshM0Wohpf aNQEv1ni6em7vlXtIeJefwsjYxbN5rXCMrudjuHFXIQ6USNyDhZ4T3OA8GHo5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697458196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JyR63E6fkVw7imjczn+TZAZC3beIqxZalAtlaW3G3Do=; b=WRlcS6jcnYPXjUtlGeYFWF3JWcAqvFTEdGubtxyQ8VEAP5mV4zbPvF4WUKtSoCT/r93MnE 0uWzBczd8mS5o6d9Q2MXAgh00TX63YfNY8fTu5GftMRpkUv86bD57jg787aUClbFWNyI3j a8lUQ7KTkyCz2TAnO/8hKXFAKYDVE1B9Yo/CoZmvyUfOTeDIvKaVtw9aHAHdxQnSBH1g8R amPN5kAF/bkKHGeWnW0gt8hVuDfNsuCPmySX8lcOv5dkqw17z+BnifAh5amIr73rmDu546 TqAE1I47DK5h2A+tM65G0ShcMYrTSTrXPmuFt5RS7uddqA6HjSNqyUYKqwQ9AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8GBr5frmzfYP; Mon, 16 Oct 2023 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GC9u6X038065; Mon, 16 Oct 2023 12:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GC9uSf038062; Mon, 16 Oct 2023 12:09:56 GMT (envelope-from git) Date: Mon, 16 Oct 2023 12:09:56 GMT Message-Id: <202310161209.39GC9uSf038062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 7ef6e99752db - main - sade: Restore UI behavior like dialog(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ef6e99752db3c0fc7953a039050881c068b43fe Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=7ef6e99752db3c0fc7953a039050881c068b43fe commit 7ef6e99752db3c0fc7953a039050881c068b43fe Author: Alfonso S. Siciliano AuthorDate: 2023-10-16 12:06:06 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-10-16 12:06:06 +0000 sade: Restore UI behavior like dialog(3) Restore UI behavior like previous disk menu implementation built on dialog(3): * Buttons of Create and Modify forms always active to close the dialogs just pressing Enter. * Disk menu indentation. --- usr.sbin/bsdinstall/partedit/diskmenu.c | 8 ++++---- usr.sbin/bsdinstall/partedit/gpart_ops.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/diskmenu.c b/usr.sbin/bsdinstall/partedit/diskmenu.c index f87c7714e5a7..55ef5a200658 100644 --- a/usr.sbin/bsdinstall/partedit/diskmenu.c +++ b/usr.sbin/bsdinstall/partedit/diskmenu.c @@ -48,14 +48,14 @@ diskmenu_show(const char *title, const char *text, struct partedit_item *items, for (i = 0; i < nitems; i++) { bsditems[i].prefix = ""; bsditems[i].on = false; - bsditems[i].depth = items[i].indentation; + bsditems[i].depth = 2 * items[i].indentation; /* old menu sets max namelen to 10 */ bsditems[i].name = items[i].name; humanize_number(size, 7, items[i].size, "B", HN_AUTOSCALE, HN_DECIMAL); mp = items[i].mountpoint != NULL ? items[i].mountpoint : ""; - asprintf(__DECONST(char**, &bsditems[i].desc), "%s %-15s %-10s", - size, items[i].type, mp); + asprintf(__DECONST(char**, &bsditems[i].desc), + " %-9s %-15s %s", size, items[i].type, mp); bsditems[i].bottomdesc = ""; } @@ -86,5 +86,5 @@ diskmenu_show(const char *title, const char *text, struct partedit_item *items, free((char *)bsditems[i].desc); free(bsditems); - return output; + return (output); } diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 92d1a367890c..b1d4d0f23315 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -639,8 +639,10 @@ gpart_edit(struct gprovider *pp) items[1].init = sizestr; editpart: + conf.button.always_active = true; conf.title = "Edit Partition"; choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items, NULL); + conf.button.always_active = false; if (choice == BSDDIALOG_CANCEL) goto endedit; @@ -1128,10 +1130,12 @@ addpartform: if (interactive) { conf.button.with_extra = true; conf.button.extra_label = "Options"; + conf.button.always_active = true; conf.title = "Add Partition"; choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items, NULL); conf.button.with_extra = false; conf.button.extra_label = NULL; + conf.button.always_active = false; switch (choice) { case BSDDIALOG_OK: break; From nobody Mon Oct 16 13:12:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8HZz6cfSz4xLsJ; Mon, 16 Oct 2023 13:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8HZz67djz4Fhq; Mon, 16 Oct 2023 13:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697461947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywSDb+P1nryLc5v2UGXDIthmG9cJKONuW7ppuviY2/s=; b=xxFEZEND/4kZeiCrNBqeB6Ez0P3LuFZ4kQXM90X8iuFYOLNOw5UF2Tm2/aC8mLWvnjMlhL LKIaJwrmiwaay+1LXFdFKu9SVGPu1W0Ma5L2qIk2m+sNhtWXFfrGmYpyH/92Oe28ThOX1x bAMfWd3edrOfSho3O9TteP7u2PouQfFwIS6d/wbzHf7Mxp2zoCW2p3rEqzemJ2Tfj/SGL4 R7LN77TK4wZvIAOec4xHfmKYMhGsMcHsxJRUcIBV3hSy4qDzdZ8T6IsDUe+172VGsvtq/u FM2COUOyV9XY/uCzX5LEoWGCxmVwFR4mL1zM+AO+0KOCfy3kh0gVsSMv5Ln6AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697461947; a=rsa-sha256; cv=none; b=NUNf0HGD+eWJUt4xz4xfCo8WIN+YZkScqircSkOZA90OxqRA+oaNEjktvJM04/hZz+XjWH hIxOnqYQGb9YTEyqXOMKxCzH2TVuIoFwDAih7S9Hp1iSVkNTroNMOjJEv/v4hrzuzjAfmL yq6QosmRQeg3FuwjeGzZf8O6/u7pJ6XgUforDP9jury3oVstTVHtvm9P+7KP8groAv9j9i RkOQU7Poi6yZAhRJ64KGgFnjksHUCng1kkQxrX/wO1ddomwf+RrGHEODm9Q3PF8i/tSeiK ngnHXNztG6yHP54JkRwKpaymc44MGQ90q+25RL8SdMWoaWzqd/4y86Qp2Fgg4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697461947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywSDb+P1nryLc5v2UGXDIthmG9cJKONuW7ppuviY2/s=; b=uyylfTP0tJK+2Ga2qVyNba5KgKnen2zJL0qVrR6EMqIToEchR7aN7v5Rlg/NHvQ1a/3MDD +wuXJsxIZx70l8sHxKRazunFJ083Ts+guHMIY3aHaW+ZddlrnCmmJu/dfr/C60y4bpIf2e 8ZXFcRvSQv+yiLWV/Qkpa8ThixcxbPdAO6m8pSHDpe8+7B/YzazsOg3LosbN4WCR5omxLT jHjltJxLGgCw7TrmYbjwpY550ZVVL0ay7YYzBTJgkWFe24ZfbWLTT+MmvrI5ArcvR/bxru M+r0l/JSQZ8RQcXNbkqkNFV5nCUsRb1CoA+wBK/L+L/zrfEcAZJi76ukO3xuBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8HZz5BCQzhkB; Mon, 16 Oct 2023 13:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GDCRPx052630; Mon, 16 Oct 2023 13:12:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GDCRna052628; Mon, 16 Oct 2023 13:12:27 GMT (envelope-from git) Date: Mon, 16 Oct 2023 13:12:27 GMT Message-Id: <202310161312.39GDCRna052628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d556719e15d6 - main - syslogd: Keep console and tty descriptors open List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: d556719e15d643ba9619bbbeab550eed87614525 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d556719e15d643ba9619bbbeab550eed87614525 commit d556719e15d643ba9619bbbeab550eed87614525 Author: Jake Freeland AuthorDate: 2023-10-15 20:34:06 +0000 Commit: Mark Johnston CommitDate: 2023-10-16 13:11:58 +0000 syslogd: Keep console and tty descriptors open Console and tty descriptors are initially opened in parse_action() to determine whether they are valid using isatty(). That descriptor is then closed because it is never accessed by syslogd again; ttymsg() will reopen the tty/console under a new descriptor when needed. If the user attempts to log to a tty that is inactive outside of syslogd, then syslogd must keep that descriptor open so the tty remains accessible. For example, logging to `/dev/ttyvb` requires the initial `/dev/ttyvb` descriptor to stay open so the user can view its buffer at any time via CTRL+ALT+F12. As a result, console and tty descriptors must remain open until a potential configuration reload or a system shutdown. The given descriptor will be closed in close_filed() in such circumstances. PR: 274454 Fixes: c3175a6e1c5a ("syslogd: Do not open console descriptor") Reported by: Trond Endrestøl Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42215 --- usr.sbin/syslogd/syslogd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 7db5bab11008..11d1033651a8 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -3053,9 +3053,6 @@ parse_action(const char *p, struct filed *f) f->f_type = F_TTY; (void)strlcpy(f->fu_fname, p + sizeof(_PATH_DEV) - 1, sizeof(f->fu_fname)); - /* This will be reopened by ttymsg(). */ - close(f->f_file); - f->f_file = -1; } else { (void)strlcpy(f->fu_fname, p, sizeof(f->fu_fname)); f->f_type = F_FILE; From nobody Mon Oct 16 15:03:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8L2d0lNWz4xSwK; Mon, 16 Oct 2023 15:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8L2c6vSSz4W32; Mon, 16 Oct 2023 15:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697468585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GmOL/n9yL2SqsT3UoYhPSeEL5QOpx+PBTgizZy38KyI=; b=ol0YxTUMCh5FYzFU5w7LcWU3twswFLXtM/BJhqdx1BU6GE4enu3ztM4KElz7SyOi6yVX4O jC9Xx1sEZDVP2kESTlCHLHjbGXC4OdO2wkJ82jbERglVSzzCyiPawYrLywQdJy0z9hRmMP TXQlh/P2St70s8BajfwBHVQZzzyzl3A6gIvvYptGmkONICnMERVg8JXujrYIuJtE9jqeej LwwrtZvlcwy/ayDfLXbnHo9etlJCxAGabQpSUfEBIPx6fUW+zRDYjvbjjcLizONo2OFikn uYGUvc/0BTFV5SFdXuOW47IXtZyxoTHTDzQVdP9mapqKXCAKZ381nxejT5ichw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697468585; a=rsa-sha256; cv=none; b=JRRgI1bchO9Pw98HH9+f3ZrEWiCyQI65ZidfUANNOPSpz8FeYBRkA/qDPVP+EICFwI7bGx iTn3EzOkHLQpwNvvhRpGZn4B96Z+ipt9/EE9/XKvSnJK324D69yUWyEc8ByZFhiFxw4oWH CxjTiYYkcs+e1gMjR0A3ERehqcYZpAKTKdLilvWhmZxozeQzq9RY3sKi7Y6XEsBe+7GVft HH+90x6JrG4PZ8ui6Etu5WWGkFRLh3SJFR0p56d3IM8CYhHkeJeGSnyIQJMLGURB/pSkXh A/h8kdzN9yoT8QL0MpFHlni74zaPDFnpM6dxVKGg+V46PTeoYxZNFNUetsANzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697468585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GmOL/n9yL2SqsT3UoYhPSeEL5QOpx+PBTgizZy38KyI=; b=B/Lnzdz/Ih7TChZYQpBGiKepJzq6sgr4MYUUFYPLH0DUbPSshKIaoO7JXk7ncKnuIaH5U3 63ExMCH75lyMsrhRfowrKK7PvjoMaCG7vlHYRQislN12gJU2N7RB5x8rtYkkndLGJqsJ6d EvPVopy56bktuPuevGM8sb9HTBVeZmer/qyKokLasTg7YlBJJpmwRroMqiB/cxwqYF5Xa3 A9hw6BvOnCAbVcNxyzruKLZl8BMpaV1nA7FdxT6SppGoTJtnqlVHFhqXqrkhybFHkTXn15 vvetCjhVWOTaoutS1Hu+MIqZjwAhtOPrJGLxfC74AAAcVGg6vwklDcfuwM03/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8L2c5yy5zlHy; Mon, 16 Oct 2023 15:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GF34Vl036714; Mon, 16 Oct 2023 15:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GF34QM036711; Mon, 16 Oct 2023 15:03:04 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:03:04 GMT Message-Id: <202310161503.39GF34QM036711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: d62e01996e7c - main - pmap_kextract(9): tweaks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d62e01996e7cb54f16272219e6ccd334b4822126 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d62e01996e7cb54f16272219e6ccd334b4822126 commit d62e01996e7cb54f16272219e6ccd334b4822126 Author: Mitchell Horne AuthorDate: 2023-10-16 14:59:04 +0000 Commit: Mitchell Horne CommitDate: 2023-10-16 15:02:18 +0000 pmap_kextract(9): tweaks Improve the clarity of some descriptions. Fix a long line. Suggested by: kib Fixes: 74e4a8d208f0 ("pmap: add pmap_kextract(9) man page") --- share/man/man9/pmap_kextract.9 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/man/man9/pmap_kextract.9 b/share/man/man9/pmap_kextract.9 index dd73446648f2..40008a1bc96c 100644 --- a/share/man/man9/pmap_kextract.9 +++ b/share/man/man9/pmap_kextract.9 @@ -6,7 +6,7 @@ .\" This manual page was written by Mina Galić under .\" sponsorship from the FreeBSD Foundation. .\" -.Dd August 24, 2023 +.Dd October 16, 2023 .Dt PMAP_KEXTRACT 9 .Os .Sh NAME @@ -28,11 +28,12 @@ .Sh DESCRIPTION The .Fn pmap_kextract -function retrieves the underlying physical memory address corresponding to the given kernel virtual address +function retrieves the underlying physical memory address corresponding to the +given kernel virtual address .Fa va . The value of .Fa va -must correlate to an active mapping in the kernel address space. +must belong to a valid mapping in the kernel address space. .Pp .Fn vtophys is an alias for @@ -41,9 +42,8 @@ and behaves identically. .Sh RETURN VALUES The .Fn pmap_kextract -function will return the physical address -.Pq Vt vm_paddr_t -associated with the kernel virtual address +function returns the address of physical memory mapped at the kernel +virtual address .Fa va . .Pp .Fn pmap_kextract From nobody Mon Oct 16 16:59:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Nck2Twbz4xZrK; Mon, 16 Oct 2023 16:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8Nck21RQz3Sdc; Mon, 16 Oct 2023 16:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/qiLYrEGZE5FytGjOR1bHIfxr4lA13YTqU6RTQl7mE=; b=y1I4l86Tp5k9th9m/FEtSUletb2aoCVw3d3emZ/syTqmP2d541Sd6QS3XWLpt/cdoXpNJY SU52E4bm4f322AA0x34vpnVzCxelVeq+bd3nZZR4FacthV35ODAeqRxR7MZsURdXG1XVc1 NGUZSDMaM/TrSseFE/URorFOgDVoIVj/JcjCsQtd2gkHyTV9xsOSZgcV9bbgNuRc4lLKXO r3syHL6rUQYWrXHLzXMldBCEbjh7mIIXbgBMr0sD1D/j13AQwdZh0RMXPsxRrgmUQIop2S By3AcH4WPJ4EfOvkArfPjJHshpi3KMZb1dhnRg2GhFL0kDI22KD/3Uy+VGM+tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475558; a=rsa-sha256; cv=none; b=Eqjj8UVsaT9KYPHhGAPFgqJtnag/9E+SMtMYAq1XJL3/emSxJC4TgETdJXzI0H0lRXp1Xr 5psM6IBmQ1ivYPhahLzY5818SJZ06/abjGegKDEl4zZ6l9Eb5KH5WrXDhq+s6D6fcjo9Ml FPCkeiOfVNm8wkaAJ+E4vUWRKlL5EcVZizUPTcg/JFNRxZ/TpCfcZN3ytpPu46nauGA69r rbEqiO+gZN3oI8GRujhu8O2IlrEEL9ST17NigJAmt3beLfaVih+JBtaXCj6WIdvTvbmlCv 66Rz7LXphN2LXpevE2vM10JnkC5+b8lCjFtcNmcvRmce2dQ07/W8CPmJNXCJzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/qiLYrEGZE5FytGjOR1bHIfxr4lA13YTqU6RTQl7mE=; b=mWydd8nffve1u6y7kfjXBHypOkMX4oUCHIBz18UainFOaG8jjRYMuuVm98D//dfVNs4L1B vK8O3Gm8OyRi9Z6B6JrxqOZip98JNVXu9nlyWOKwA1yebEWMRun0DJXZIIW4HTI/E2wZ4+ bKAiiwjI7gqJj1s5phBiq6Wi3qf5U8ZIDJCaTXct4obkFN5VAOSQM9leHWpVkrJA7ETUI2 AxupJjeRxuFIwrxwsr7Nn+4jwPIiDRbIp41sZga9w4obd6aRo7nAi7qpFkiN0h70HPShnU lJ5cafxHt3upLeV/MhMoxOPLUZvoGvXiVymEcEb2ceQ7kUp+yoWT3NE5d4CDbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Nck16nrznXv; Mon, 16 Oct 2023 16:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GGxIvJ028819; Mon, 16 Oct 2023 16:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxIc6028816; Mon, 16 Oct 2023 16:59:18 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:18 GMT Message-Id: <202310161659.39GGxIc6028816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 9735cc0e4182 - main - libprocstat: simplify auxv value conversion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9735cc0e41825bb9e95d16433d381ffe4c190f38 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9735cc0e41825bb9e95d16433d381ffe4c190f38 commit 9735cc0e41825bb9e95d16433d381ffe4c190f38 Author: Brooks Davis AuthorDate: 2023-10-16 16:52:57 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:27 +0000 libprocstat: simplify auxv value conversion Avoid a weird dance through the union and treat all 32-bit values as unsigned integers. This avoids sign extension of flags and userspace pointers. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42198 --- lib/libprocstat/libprocstat.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index a302310dfb9a..e5481c53eea1 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2414,7 +2414,6 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) { Elf_Auxinfo *auxv; Elf32_Auxinfo *auxv32; - void *ptr; size_t len; unsigned int i, count; int name[4]; @@ -2448,8 +2447,17 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) * necessarily true. */ auxv[i].a_type = auxv32[i].a_type; - ptr = &auxv32[i].a_un; - auxv[i].a_un.a_val = *((uint32_t *)ptr); + /* + * Don't sign extend values. Existing entries are positive + * integers or pointers. Under freebsd32, programs typically + * have a full [0, 2^32) address space (perhaps minus the last + * page) and treating this as a signed integer would be + * confusing since these are not kernel pointers. + * + * XXX: A more complete translation would be ABI and + * type-aware. + */ + auxv[i].a_un.a_val = (uint32_t)auxv32[i].a_un.a_val; } *cntp = count; out: From nobody Mon Oct 16 16:59:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncl31dPz4xZmS; Mon, 16 Oct 2023 16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8Ncl2YGHz3SNj; Mon, 16 Oct 2023 16: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=1697475559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UBguKUVsU2i9xSRL/qoZYLKdPcptxDkXnwqjP56CbE=; b=LBJfPeE6ydU/TG0h09sFJYagkZrSB/khulNGn7t681qK9xdb65on5QIWPYSGnvxDXZ3ze5 XE0I2DIYB0LWXs+mRjziMGXNW6EFFKrg7Dxh+CggMx5j8Ieg/85F2Y7jCSgzeUMtlUIeC9 TZJLGuF0XVk9WoO11K3zLimVtjqt+QAZ/xlp8babJDn1fEpxddt1884Zw7Mo4iTClDlb2f QEPKjgVE4mWGOnQsqFGZLAYCnjeIxXuCaCjOiuMgAbJtm1ElN2FQcNJyipDXih4WahLQS7 q/lVoV5Ez5BWHUnuHG26a/e+dRohdRGekr7pFdmymJwBRRMK9pSB2NdDoNJKNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475559; a=rsa-sha256; cv=none; b=UlUTIZn9MuGE5oQDEzGbGvFsOPAU/mG0UuVGTk0jOUiPlRLSSzUXbbLTAC/MqDHphm4GAs QSCeS1b7CcJ9gjvL5fmfl/JagEnDnr4oSJKKDj8dnckDysAo1C1HawDhRs38031OntEMc7 qy3XdX7QYcRPDJk59q5CgJ7oU2EIht+p86eInLLfeI6COzhIjrbvLoFXVxYbqEZrGcYk5K VEg4X2ivN/3K89CbPYymV67nx9+1dK1OdU8H1EtzA8b5oogk8YYvULRRgtMKh87epqJJfS BqF22ZYWfXOadm3lzYYq/c4BapC2scg6s7DLxJF5VJLLRiapKAG9hNiuB6hd3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UBguKUVsU2i9xSRL/qoZYLKdPcptxDkXnwqjP56CbE=; b=Lp3iWhicnvQbWyRW48UAbly/h6JXWPZC4WOb5LlVbYAA88WzuQPOtz9T7f1qNBpvhSJdYI nmnDNkU8dNlvjs/Q9vW3Ii60CcmBoU+OyU/AqlNgT+yr8FadhKus16aHytRG62kPCRC9Eb TJzimC4PUxgKTKGsJmDgIOH+XQrTIRV+8CLNlYyA3/BPATYiWtVVcviyDNIp6KvhD/aTDs 4daMPDVB/joE0gYsnHaslTehEf+TLiftFiOGXEdQwy0VMx7G3KFNtq5MHEtxZh3m7PblXy RJgbaH/ECY0WE3j+iDadTPjUbhl/jL6RDuiJwnqxce43lVbm4bMCyxoaPcdsSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Ncl1c4hznSd; Mon, 16 Oct 2023 16:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GGxJGu028863; Mon, 16 Oct 2023 16:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxJTc028860; Mon, 16 Oct 2023 16:59:19 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:19 GMT Message-Id: <202310161659.39GGxJTc028860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 72a4ee26a7c6 - main - libprocstat: make sv_name not static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140 commit 72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140 Author: Brooks Davis AuthorDate: 2023-10-16 16:53:11 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:37 +0000 libprocstat: make sv_name not static Making this variable static makes is_elf32_sysctl() and callers thread unsafe. Use a less absurd length for sv_name. The longest name in the system is "FreeBSD ELF64 V2" which tips the scales at 16+1 bytes. We'll almost certainly have other problems if we exceed 32 characters. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42199 --- lib/libprocstat/libprocstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index e5481c53eea1..84502bb895b7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2392,7 +2392,7 @@ is_elf32_sysctl(pid_t pid) { int error, name[4]; size_t len, i; - static char sv_name[256]; + char sv_name[32]; name[0] = CTL_KERN; name[1] = KERN_PROC; From nobody Mon Oct 16 16:59:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncm5zXtz4xZZ7; Mon, 16 Oct 2023 16:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8Ncm3mQfz3Sc9; Mon, 16 Oct 2023 16:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOeIGQYARU0c5dofrUVzVzob7CvSosjmHvBgtnsA0c0=; b=Ay//xu9whsmfWaIq7NHE4vWp62xNbZnfVlRHyv1JKfR1eZ6HertoZ/uOrSjXn9mshaDW2s zkq2HvLqHTG2rCc5Z7JjeB0nwGcSXuN4bJyZvmebE9P3GKzLBJtQIu5/5+2yhIj0odZmZx iqcr0K9qxlmUZkQljvmSfua633zPT1wnzN36lvFXDcOwxcEcn4WFv21A2mX3AuUo1qHvYL uAzYDmyrsKrHi0mo9Z8XT7iqxeGC9fqMlIp1+JIg5vd5Qi2csS9rZqinR/ff/scH9JGZPr X81VBS3IC+Z6RAjmRwv4EcTV3N36Rq6atXCwNwKHhgVtA7z8MK1uVglt+fPdIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475560; a=rsa-sha256; cv=none; b=leDk9KbCjf0z1gfVBgvB1jhBk/3XLCLGDA1dwmWRlFLhe+yLqwV6O4PaVZouqmGf5b1ieF +RMJ3noU7Xs0dveQs74pMRK31BZfo5Fut8ysmBsRIASK4Fb7mksRxVjP+fTjSCehrJFNCz UW9GRDzRM0M+1KoqF1VCpx4tD+FZplVrpBQ7SqaF9wUldNhAXRmf2rZS4bTk2CRBR+hCfY M9ijeKaFyDVKF+aB5PdkM9TGTqRNswj+Qv8xYv60V8PiPyO6QApBFIlUqfQoOywAJnPZP5 3bE6zjQPaKkMAyQq1VSj5DM+jTu4PgN677ZLXSElEti97tGMLdpT77Wyj1QlTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOeIGQYARU0c5dofrUVzVzob7CvSosjmHvBgtnsA0c0=; b=mc8FX9162IfUkNTGFK+1uOEKmKLOZgslMMphk7frRlUfk4EFxyYLFCmYKSJ66L/ufLSLJy 6YE+Zf5mAN4aNouhoLZAKxZk+tltGgTy7NVtnkwkUgnZRG1C62mSCzMhr3m5nILr+QmkFE RGlYbONJLrB/b/NafkX7UOQleNfKozKjNoX2j4n+EPCZxcnhH56VM5BTLvi2+AVdeRCKK0 XfPX06uj97AfVMS/W8j97mOiclZo3dRSA5rY60xcWbBcgPSXnhNMJ5coDfiJaSznIeqyA+ XGfluNO3ghZ3EIpWyVCaz4wvQYr+Gvb2jIDWGMh9dFeKFG4wzzJfVSRvRKwixQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Ncm2tNVzpDD; Mon, 16 Oct 2023 16:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GGxKOn028914; Mon, 16 Oct 2023 16:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxK01028911; Mon, 16 Oct 2023 16:59:20 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:20 GMT Message-Id: <202310161659.39GGxK01028911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8f06fabe39ac - main - libprocstat: copy all the 32-bit auxv entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f06fabe39ac3ebca4ab448a456945008305a23f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8f06fabe39ac3ebca4ab448a456945008305a23f commit 8f06fabe39ac3ebca4ab448a456945008305a23f Author: Brooks Davis AuthorDate: 2023-10-16 16:53:22 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:43 +0000 libprocstat: copy all the 32-bit auxv entries Use source struct size not the destination struct size so we copy all the auxv entries, not just the first half of them. Fix a style issue on an adjacent line. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42200 --- lib/libprocstat/libprocstat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 84502bb895b7..031294387ca7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2434,8 +2434,8 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) warn("sysctl: kern.proc.auxv: %d: %d", pid, errno); goto out; } - count = len / sizeof(Elf_Auxinfo); - auxv = malloc(count * sizeof(Elf_Auxinfo)); + count = len / sizeof(Elf32_Auxinfo); + auxv = malloc(count * sizeof(Elf_Auxinfo)); if (auxv == NULL) { warn("malloc(%zu)", count * sizeof(Elf_Auxinfo)); goto out; From nobody Mon Oct 16 16:59:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncn5WQCz4xZp7; Mon, 16 Oct 2023 16:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8Ncn4shvz3SZN; Mon, 16 Oct 2023 16:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7xSUG2Fdxw3waXyVFOXzf/e3eOcg7id+0Y0RUkm/Ic=; b=ANj9vEOnDw3Sj8gZjOaLX5UWIXiRPFa01dvCqeLhgptUb6cu0bnSADCctwR7q8KcIxOX0n vFccuKpCL0LSegyLNSf/imja99+vDq+aGwtprH/C99IoQckJF2DGYSi4gZFzPk6Pklmagl /e8YEr8eaXgQ0s8KwAlYLWnoUpDEiYVcEPO+0X+2HapNPnPlsLM64Or2GML51IK9FXUX6H XgRJ1RpQsGOEGp9w/a17P0xr1vkqTW8vcaIPOwyUautbrxjwyaSbTooxEQ4yu7OUz39lVO as0+jctPhZEMd691Qli9rkwuKvHQTRjanwMhUtBBQD2EP2lAS+VFytOjGtsJoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475561; a=rsa-sha256; cv=none; b=eVQGxzafJDy1glJHCmYwaU8gtIzQRyzNdNKakryM7Mw42IQ1mjJ4TSy/cFEyaAiRCs++ax otG/lHK+5U2X1VwAVOMY/bupVWA0SEKZXhE7WV0pBrFoMsJuyWydYXOG1pkb6nsVW7cnjH yzZAY8WYD3SmBPKcx4zV3WdfySYJT1kdnHK7rRRqbjRY4poHUILAt9v+eovt3YsbyhHEdN 7j/dmGmYRHqKx/AQwsMvohbGQQEoiLNkL5Mm3V6bMIGsUNbWZz9TChJUBH+XwSPd8AUgzY B08/QG2BbegxercsIkvmu3xpeLxg0+818Kmh/6SMDYt+uuWNyFXa4gpS2XCj5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7xSUG2Fdxw3waXyVFOXzf/e3eOcg7id+0Y0RUkm/Ic=; b=UWMPqerC90qX3+6T6u8ueVc0cHSfmCd3UIm5SOezdnqiWVNrZAE3WcurO8xV4ayDyhZb8D W+cYjugE4VKbgAynYbI1UYrCv+xydcY6qNu5AdL7sPyNeXcshwoBajV/lrmpQcoWPEozv8 ChXKmQ94taUE+YFgWkpzLW13bMMkJy/3/8M46xj2ygn6tjaj3MorZpbJsv9R8J6E1nRn8A wtYD1ADYMAlU1RNfCQxcQDIaL+W0cn1gwCOhG0vTAeyeoGOFPLGvz5ibdKs6JPnicFcy0U YurYrW3ooqvm1hN3XhG2zNA4/II0kFkfTZ3ij1cs+rRQsBswHmlp7FOy7Pb6/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 4S8Ncn3tgrznlc; Mon, 16 Oct 2023 16:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GGxLqW028963; Mon, 16 Oct 2023 16:59:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxLAY028960; Mon, 16 Oct 2023 16:59:21 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:21 GMT Message-Id: <202310161659.39GGxLAY028960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 248fe3d3483c - main - libprocstat: improve conditional for 32-bit compat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 248fe3d3483cb3ec2c78dd31dc02a467060a6577 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=248fe3d3483cb3ec2c78dd31dc02a467060a6577 commit 248fe3d3483cb3ec2c78dd31dc02a467060a6577 Author: Brooks Davis AuthorDate: 2023-10-16 16:53:29 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:49 +0000 libprocstat: improve conditional for 32-bit compat Include support for translating 32-bit auxv vectors on non-64-bit platforms that aren't riscv (which has no 32-bit ABI support and probably never will). Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42201 --- lib/libprocstat/libprocstat.c | 6 +++--- lib/libprocstat/libprocstat.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 031294387ca7..c6a225a021a7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2381,7 +2381,7 @@ procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp) #define PROC_AUXV_MAX 256 -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 static const char *elf32_sv_names[] = { "Linux ELF32", "FreeBSD ELF32", @@ -2464,7 +2464,7 @@ out: free(auxv32); return (auxv); } -#endif /* __ELF_WORD_SIZE == 64 */ +#endif /* PS_ARCH_HAS_FREEBSD32 */ static Elf_Auxinfo * procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) @@ -2473,7 +2473,7 @@ procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) int name[4]; size_t len; -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 if (is_elf32_sysctl(pid)) return (procstat_getauxv32_sysctl(pid, cntp)); #endif diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h index 0df01817663e..3d30b4db4018 100644 --- a/lib/libprocstat/libprocstat.h +++ b/lib/libprocstat/libprocstat.h @@ -102,6 +102,11 @@ #define PS_FST_FFLAG_EXEC 0x2000 #define PS_FST_FFLAG_HASLOCK 0x4000 +#if !defined(__ILP32__) && !defined(__riscv) +/* Target architecture supports 32-bit compat */ +#define PS_ARCH_HAS_FREEBSD32 1 +#endif + struct kinfo_kstack; struct kinfo_proc; struct kinfo_vmentry; From nobody Mon Oct 16 16:59:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncp6NZQz4xZZC; Mon, 16 Oct 2023 16:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8Ncp5glfz3Sld; Mon, 16 Oct 2023 16:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dB13Obsz5aewrBNqr7WPN8xjPbQucBBV+dILOJm6oHU=; b=H/jYuHY++O7ZOt9YKlDsYCJNZ4YOaoG+0K8+4h2x7sHGMsZXILE0vTG00nD44irMXUV/Q1 nc02VNnooPIUvwCqwc1brmZ597YKAi5Lh5VDPBQn0fby3xPhRB3xlkOzmFXavegNJo7H8z DW+/f7CzuAMna41n5kx2oECHrOdiSVE6mUc2mprwcuDXWcNNzkabMRdK6oT1DvoHXqSMm9 /KLFTon26xBK3GYPJyL7VgSDjej5upy8jogJpZQZI7/SFwvVz3tf/QfEyKwWZf9wgsonkk 6ZBAsqn5PPgrnDNdPhUvJwNh8D6jgK1zYn/Vp25pboGdj0FK7mO5v5dRNEcspQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475562; a=rsa-sha256; cv=none; b=STXIQrg9PXZkCbQPafxw5kPNLpyVa177uqDWksYcmxkp638Xo+j+qyPa7SlaWnIiC0urNR ORerqU1NZNhcoFP0VHhJCaz7U5i7oXqwGIeBv1hrHBPEnEt0u8EwQ0owrCWpn+1Ig1Y1KI oyjAp6stgorY/MTdGTw5/KkeBarhHUDc6O28WPKTGHE/8xiBD+eb4mIj8Y/C+4epvWgqgG 6eeotZiCqcGd+a443x3zkYLK8llaW04tMgCrpKApldvitoMqj4EiIzlxdyrZB37koEhgO2 /a8VdsyuA3BcQInlZlQW/H3yRUeaGP60O5qroXJI9szt/31Jx6W+ljA+uDn7MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dB13Obsz5aewrBNqr7WPN8xjPbQucBBV+dILOJm6oHU=; b=Dmm7aPm1ZW7LVnOkBhPpzP7PbEFfstPFBRbOXLkMDe7IzepsXe5ozdKBezF0pXzEJxvJu3 bJe+C/N2jT43c9mcdasIXRU+pC8tp/3fY58as1I4rk52b9T2CD/aRRI/4aG3MXpQobVUKQ b+K/SlnV60JpbRQvudGQFWghKFLFWMHXjWq+GPkDVKkxxChfTxUdYVMBPNPonA67tYyMJL KW243gV/oHBkMM+vO+2Cq8YkCt/yndTBdbiSQiGTm98uR0yXdEC/jXrx4xYW7TycI2HUbL B+G6Y7ZJRg2ZFPBw5VOKGUzuNQXfOs7KzOtk6VwygDF0ZSEBQ1rJYUuuCGA8FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Ncp4h2Pzp05; Mon, 16 Oct 2023 16:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GGxMAM029013; Mon, 16 Oct 2023 16:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxMdV029010; Mon, 16 Oct 2023 16:59:22 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:22 GMT Message-Id: <202310161659.39GGxMdV029010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8f9f7b4a427f - main - procstat auxv: widen COMM column to MAXCOMLEN List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f9f7b4a427f2518e978600794f013cb711dfb86 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8f9f7b4a427f2518e978600794f013cb711dfb86 commit 8f9f7b4a427f2518e978600794f013cb711dfb86 Author: Brooks Davis AuthorDate: 2023-10-16 16:53:53 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:54 +0000 procstat auxv: widen COMM column to MAXCOMLEN For reasons unknown, procstat subcommands typically display the command in a 16+overflow column format. However, the command may be up to MAXCOMLEN (19) characters long causing the column to spill into the next one. Since there's plenty of room in the auxv case, bump the column width up to 19 to avoid this issue. While this is a format change 1) users who want to parse the data should use libxo output and 2) this makes it possible to parse reliably with cut. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42202 --- usr.bin/procstat/procstat_auxv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c index 9c37c511d190..7b68ac72f724 100644 --- a/usr.bin/procstat/procstat_auxv.c +++ b/usr.bin/procstat/procstat_auxv.c @@ -53,16 +53,16 @@ procstat_auxv(struct procstat *procstat, struct kinfo_proc *kipp) static char prefix[256]; if ((procstat_opts & PS_OPT_NOHEADER) == 0) - xo_emit("{T:/%5s %-16s %-16s %-16s}\n", "PID", "COMM", "AUXV", + xo_emit("{T:/%5s %-19s %-16s %-16s}\n", "PID", "COMM", "AUXV", "VALUE"); auxv = procstat_getauxv(procstat, kipp, &count); if (auxv == NULL) return; - snprintf(prefix, sizeof(prefix), "%5d %-16s", kipp->ki_pid, - kipp->ki_comm); + snprintf(prefix, sizeof(prefix), "%5d %-19s", kipp->ki_pid, + kipp->ki_comm); - xo_emit("{e:process_id/%5d/%d}{e:command/%-16s/%s}", kipp->ki_pid, + xo_emit("{e:process_id/%5d/%d}{e:command/%-19s/%s}", kipp->ki_pid, kipp->ki_comm); for (i = 0; i < count; i++) { From nobody Mon Oct 16 19:48:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8SN71CXLz4xkTm; Mon, 16 Oct 2023 19:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8SN70kplz4GJJ; Mon, 16 Oct 2023 19:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697485719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fPA0+hp/D2q8wz4PlMyvfhPTFelK9ZlNgEx/BlF2zE=; b=WY9h+xXTbmvf+y5iZATY7kId/BjAl1aBRrqo2IYqQmHf6TAxegfGOMJ9KrvrLJMFJYCN0W fem4w/SEOL/lXkpGbk9EOOttVhXlUQNBMa2T+XgKO70oEsD5o3yWY/Nncwxd7J+1sz7Tkt dYc/wQb3yQO6+/w4/f9DWXVkwQMzoBVoiYByZQMJcyBVreLGoMikmLyGa/bG/xIeI2o9Hm 7RhIr8sS+LRkOk6Wh4Ih5iJXBq7pnW/g2xyRaWmz6pKKe2uA1gsE4bfUp51KmbLg6NMja3 24DzoXvez/v/ndJuGTwPKz5ux4xSNr5c0JkSNZtGWuvWklMhs4nSth3K8EtUMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697485719; a=rsa-sha256; cv=none; b=Hw0vkjwrrZ/0ZX137esrrzVacYSoUnywneJE6mqwvjJF8Z0geP/lnCeuksfTsjCLRYBgpo S2l98HSqWLNsUO0eLzMXjZuMkUWzyYI0lofnqfYdh1kII1yVPehwahVytjnjbgEu5tkhjM lDefYuRzXr0LETVg9WEPrM1d4sorRVa3pVzusIiMuuHHPj+swlVA6Nd5YPetPyzMvyoH+I SHoeYZu3xGsou4wYwJu7c5wzVawYd+fXTlp2+w+hazkuQDeNdWmj3qyJpkSZcAOg8BwL7O jUk/DBpa+7Gh3RZJI2QcE2Vn4aHcv0k5OaTWCNEJ3nFvitOKbtesDdWxlY04Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697485719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fPA0+hp/D2q8wz4PlMyvfhPTFelK9ZlNgEx/BlF2zE=; b=pbu+FigULnZs1JTgBZJmdKJCWdbaHrErWGRVuoiTg9v1dEitD+ckVDMAKN09gT0I2WUmZr xDXyTTyGTSpVWNgl4hwwqKJwFFUyzY0e1h50i1cTfcgVdLbRZ75AiedITMdGOslw6oVBwp qyWGMsAKV4DA9eSuLUCya6UlG4Fjo89fFOOq7z/RK9CX+Qmbhc1KB1SkOy1lI2dsppn4ue rpEboeaycK4SzDKTN+VXM2GrsjuF8J7dclIu8mHE3QLM39nuY/w84CqonQnBIh1XS98B87 xELgxuz2Ey4kzTSaq7wLI4+yiQT4J8xFwZCpvADnd1h3A5lKqNy6NbanWDD73Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8SN66n5szt4P; Mon, 16 Oct 2023 19:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GJmcsA012423; Mon, 16 Oct 2023 19:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GJmcU7012420; Mon, 16 Oct 2023 19:48:38 GMT (envelope-from git) Date: Mon, 16 Oct 2023 19:48:38 GMT Message-Id: <202310161948.39GJmcU7012420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0cb63dcac446 - main - Revert "dwc: re-rewrite barrier part" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cb63dcac446df85787cc0a77d4d38d01ff92913 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0cb63dcac446df85787cc0a77d4d38d01ff92913 commit 0cb63dcac446df85787cc0a77d4d38d01ff92913 Author: Emmanuel Vadot AuthorDate: 2023-10-16 19:43:36 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-16 19:48:19 +0000 Revert "dwc: re-rewrite barrier part" Turns out we need all the barrier. The one before writing the OWN bit is needed so the DMA engine have coherent data, the second one (after the OWN bit is set) is also needed because the DMA buffers are allocated with VM_MEMATTR_DEFAULT whic equals to being cached. This reverts commit 2b4f615e7d4720b16007cfa8aaedf720f572067a. This reverts commit 4870346488051b9c4a1dc8b11cab55d4e5b7c230. Reported by: mmel --- sys/dev/dwc/dwc1000_dma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index c91036f5a714..f6baa0bd3e45 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -218,6 +218,7 @@ txdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr, sc->txdesc_ring[idx].desc1 = desc1; wmb(); sc->txdesc_ring[idx].desc0 |= TDESC0_OWN; + wmb(); } inline static uint32_t @@ -238,6 +239,7 @@ rxdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr) wmb(); sc->rxdesc_ring[idx].desc0 = RDESC0_OWN; + wmb(); return (nidx); } @@ -524,6 +526,7 @@ dma1000_rxfinish_locked(struct dwc_softc *sc) if (m == NULL) { wmb(); desc->desc0 = RDESC0_OWN; + wmb(); } else { /* We cannot create hole in RX ring */ error = dma1000_setup_rxbuf(sc, idx, m); From nobody Mon Oct 16 19:56:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8SYM6skKz4xknx; Mon, 16 Oct 2023 19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8SYM624Dz4HGy; Mon, 16 Oct 2023 19: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=1697486199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcW5UMg+quXNQd8vkb2p8lKrGJuHhw9SmxuciTk2VrI=; b=IWGlb5ark4uMH0xSnL6MpZMigGlqx6Ts610CjrHCbSs+xKRx9WVFD0yeRZu4Ca1eatISOW NxQwEn+AtxATnz40bQXSBJ8Mpo/89gWtd3jlDXXARfQlKPHdxQ3+YxW0cbAmkSKrZn0wWO NdWjgDY5qSso4nvGKiYFoCILXEO7CRGBqN6HDO53xBZY9R1OhgLA2q09Q05yRvmHyW+mBH VyN9bFn4lsLCAJuhrUwqY30Ao9V2bOqdMuI+Uwtl7WAs9qxdDjHM/bXRYUwvFSXmk1Rlzx eLGExE09ZuToqYgD4TcpwN8nWKwH/SbMrXl/9yDewaXqemrrdCkglmjDP0E5Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697486199; a=rsa-sha256; cv=none; b=SwLxNNZrrwOQ9yaoKTbohU2jJTcNyx2ihMnB3oGOWa8f1ZWrSlJND/NbNu0B0EZivxoMnk c4dOulTQfiYEhJKFq+ZJ+GplsxKyrehgEk53O1B/mgJlaHMWZt0SmkJ/n8V5asjl5O5/1O g2WKToa0U3pqQgB+jDR0QgR3qW+Q2P1ezLifbjgXQj/QbQgGw1BX2bkt84ez1XLni0SoWg E75EvmmmuRa+t+AXMkmfDsRRvz5UmBZkHNVOZjEqnxc2Y4mG0vyvkDOIRp4s+5NXzeMPBE 1f/rcAsWN5G/Woe87p1NKxNBQLogSK/yhgRYr6W/4diEkD+x0ajLgVdeq67iIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697486199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcW5UMg+quXNQd8vkb2p8lKrGJuHhw9SmxuciTk2VrI=; b=d+qMJCvHDztmH5Qyzi90wqZZQOtyMMXCufbd1glwHFkd+FrjtPTdEQQ86nK4tgIz4GuhjS FuaZtWd70pRYIkyjfb+RERDI6+SXmA4IB6AofUgJMvenFX7Y9rGe2SvvGLyDHE8VVwLGkw /1zV6p0/37FI658MxfHX7Ms3Pa+6khx4yI/mjzpiYJKeKyUI7bS2Vhxal2fEImplQNMWmP QoGkH3Kahfx9OouDgGOoU7wDSjDF50DOaPnG3eYKIpY4w+bzD9SDdxYSunEgL19FsVGYdl XS90R3dMS72lQ/SmpFniDB/cdsc+FHT2YDKsO2R3X3wopI2VT3w04M0Xq4RItQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8SYM53d8ztMx; Mon, 16 Oct 2023 19:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GJudQE028513; Mon, 16 Oct 2023 19:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GJudQ9028510; Mon, 16 Oct 2023 19:56:39 GMT (envelope-from git) Date: Mon, 16 Oct 2023 19:56:39 GMT Message-Id: <202310161956.39GJudQ9028510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e1fe34707a60 - main - arm64: Save an instruction in locore.S List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: e1fe34707a60b0f6cf47397c6eea0a39d675e3ac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e1fe34707a60b0f6cf47397c6eea0a39d675e3ac commit e1fe34707a60b0f6cf47397c6eea0a39d675e3ac Author: Alfonso Gregory AuthorDate: 2023-07-04 19:10:19 +0000 Commit: Ed Maste CommitDate: 2023-10-16 19:54:41 +0000 arm64: Save an instruction in locore.S We can move and sub at the same time, so let's do that. Reviewed by: andrew, kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/794 --- sys/arm64/arm64/locore.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index b592c753aa50..d55a21e9c55e 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -112,8 +112,7 @@ virtdone: /* Set up the stack */ adrp x25, initstack_end add x25, x25, :lo12:initstack_end - mov sp, x25 - sub sp, sp, #PCB_SIZE + sub sp, x25, #PCB_SIZE /* Zero the BSS */ ldr x15, .Lbss From nobody Mon Oct 16 20:19:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8T426bsWz4xls4; Mon, 16 Oct 2023 20:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8T425SYDz4Kpr; Mon, 16 Oct 2023 20:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697487586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxGYesAN5Cpi9auOwAm6u87fNCwACwJJyD9SQtuC3oE=; b=L95GjVoR0SC7TNgoYv/DY/B15Vdctx4cRsVpKu+M2EdJo+bQ3HAvnS4+j4qgrAeAOCiiB4 SX07WtYLnCDsUS/020K8dD6yfNkQjmJFTPlpQYOuPquCvhZ39OlH1KbVnhvKNlAY8OcyPz cwH6VqebmIERcoybNxtD1j0UGYxxMYJFXUNvOlPaRz2AA1VIzv0GFs60i2H9oBAMj5exBE GQr9BrRRO7sGWhaFqMOc3uHeczMSVTkvor/VFbJAYrTCfwZFd6TqiRbKIbuUZZMeh0ReLj Ni1xXbIXgqtQ0a22gMWV75nAkFox2G7hZ+DvZ2Pvu6iKM9LeSrRVO/Ohd/sUJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697487586; a=rsa-sha256; cv=none; b=GtBfvbmQqUEZpL4JTN9pKNiVZanBBZEdGdTe8cNElrqrI8/549jGP8DjHkI7qLIXkrAzfl YBhYW62j3X87Zs1pUuElI+Yv+NCzQid3PfJWN29VOzsja6vVzJzkgxt3lqNxQV5uTK+fBJ LvZymJlxSE5DDHv0e+ecE5Fek3b/c5gTc2EjUdYK8NP3PNqG39QM6subEEf3BYElX7RKsz fD56f7/wNNrb7c6Vav6GJvVhqhpK/UMgt1ID5JCyW6meKvPaUlY9nkKKBGlaBHpvdOehRR bkb7Pvm/1V9rZ0dF37D4Sv/iciYSE2EhISyR8xxiMcb8qmncqLvcQfH+0Vnrww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697487586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxGYesAN5Cpi9auOwAm6u87fNCwACwJJyD9SQtuC3oE=; b=RJVz/DZQkr1nv1BrPyDmzW3w6u4muT6GO4zmfBV3fERJGcpxckoRYjN5QLQ/f0o96v8QAy YLWvHK7473ljAyHGCZ0Q9mesQMzcu5tYSySaQEe6nbDEWzM1SnuI/VC1j2gce+DmhzwvEy kLCQLd8PE8ReliSNplqs9AKl16lcHFxzwtg687LraiGi2fpM4sHBmOdzY0sIOmLY/SCoP3 dGW5zSQNC+yrak2HcNZQus+ZuRLKRRLx+bvEdg48l9ZNfQIpibKsH6CcGJZJjyIceApV1r m1D9IDDTMyDrx/Y6gffOLatLlRx6GaaOizt/uKUHr8HmuAh0Mi+/dWMr11sjqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8T424LPhzvFC; Mon, 16 Oct 2023 20:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GKJkqR062729; Mon, 16 Oct 2023 20:19:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GKJkgr062726; Mon, 16 Oct 2023 20:19:46 GMT (envelope-from git) Date: Mon, 16 Oct 2023 20:19:46 GMT Message-Id: <202310162019.39GKJkgr062726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 8c630381b43c - main - bsd-family-tree: add OpenBSD 7.4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c630381b43cc4d83c99305df3f732b0583ff8f2 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=8c630381b43cc4d83c99305df3f732b0583ff8f2 commit 8c630381b43cc4d83c99305df3f732b0583ff8f2 Author: Sergey A. Osokin AuthorDate: 2023-10-16 20:19:12 +0000 Commit: Sergey A. Osokin CommitDate: 2023-10-16 20:19:12 +0000 bsd-family-tree: add OpenBSD 7.4 MFC after: 3 days --- share/misc/bsd-family-tree | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 1a99910e1297..65719513e49b 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -448,6 +448,7 @@ FreeBSD 5.2 | | | | | 13.2 | | | | | macOS | | | | 14 | | | + | | | OpenBSD 7.4 | | | | | | FreeBSD 14 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -875,6 +876,7 @@ DragonFly 6.4 2022-12-30 [DFB] OpenBSD 7.3 2023-04-10 [OBD] FreeBSD 13.2 2023-04-11 [FBD] macOS 14 2023-09-26 [APL] +OpenBSD 7.4 2023-10-16 [OBD] Bibliography ------------------------ From nobody Mon Oct 16 20:29:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8TGy1GWGz4xmCp; Mon, 16 Oct 2023 20:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8TGy0nzJz4Lrs; Mon, 16 Oct 2023 20: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=1697488154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG2nvCiqbD/J9HmeeuVBB6z6uBFMsvB5Tga2wijmEzM=; b=tHz1M6XmbW/yw3j3TltMWGSGbg3gPyjsM8YkrwcuWDh02/g5WGAtCQsRk2GCZ9C3/XnC0F apdFrsWln0SinQLFzQbjrUtsS9zPXIhLn3AO33jQ5xUueZdmgZCvZ2V2w14IadymtzvSAC 22L2LCQd3nKLAn0Pe8fTGpbxIA/A6kJHH2ebqzu93S2PzV5iG4ioP0jNYDDIqZ8lYTu3WD BaujOmarjeIaym3P8IqAM8lKl/VKUt+PFpixrzy3M1mBlV+EVUUCh3f+d3dzrmP9G0McGs AcCrWYTeWuQVenPzZjXftfphZ2bW8cG1vGLp420l9b3XsUrv+UbtcQH3v1WNGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697488154; a=rsa-sha256; cv=none; b=rbdD2U/wdwDOfp5+OJP4qudILwaP+8I5VCHx9IFHXbH+I7Ug7SU69/eATrFVUeINGxjEbD wHlTMh9L/x1evlgT5wb76zXBW75XOr6P1isPMGyfaRekrxLHHVBZrquN0CBPoZvN6G914H HPikNaqi4Ei/p3Bj8j93qo4zsgbHr1zHOT+eVyLuzde8IgxYZ361I8ioDDRqoLkviO/FG2 fJmxsvi0QD/irEIZwCTNonhJSj7JpZhtmONyohs6O1r7AVHX+ZqopGpUIJH1elNVeRJoBB sSQglZ7LPYwQ08W1LSTH5rtJZAX0YHG5lBEi5ledGuluKEQvxrPsI4YbQONzCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697488154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG2nvCiqbD/J9HmeeuVBB6z6uBFMsvB5Tga2wijmEzM=; b=OBqrhUzx7290q5nfwwil+Y/j+k/WRAnai1sr8xND49k2d9osPjlII+wx7u7oyxPffqOHTI tzVANJsgUkAZiHzVMMiK/FMkIt8BXmluqne/MA3ll3B1+Y9R29+EDO5BZMktsjiCHvd2lG hogIyj74JTfUV92mI+UtgbK1xE/m464nOKDL01iNOf8K3rCgALW9W264NXh+y0L8JTRpUB VAun3n/HKCSc5Odc3wDNTF6EyQNiyCBBg8i+fzjLoXGHf2cSWf1+6q6EVDcsgygYX3U3Dj V/s7lEL8CxZ67vWwn3CC84p1p8Z08utDKjm5vCrFvLh19y6RIy+2xeqNt15Twg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8TGx6yR6zvLb; Mon, 16 Oct 2023 20:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GKTDAI079456; Mon, 16 Oct 2023 20:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GKTDRa079453; Mon, 16 Oct 2023 20:29:13 GMT (envelope-from git) Date: Mon, 16 Oct 2023 20:29:13 GMT Message-Id: <202310162029.39GKTDRa079453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Houchard Subject: git: ccd0f34d8585 - main - arm64/compat32: Fix handling of 32bits FP registers. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cognet X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccd0f34d8585cba727dd17a381309855af655b82 Auto-Submitted: auto-generated The branch main has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd0f34d8585cba727dd17a381309855af655b82 commit ccd0f34d8585cba727dd17a381309855af655b82 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Olivier Houchard CommitDate: 2023-10-16 20:29:06 +0000 arm64/compat32: Fix handling of 32bits FP registers. We must consider the aarch32 FP registers as 16 128bits registers, and store that as the first 16 aarch64 FP registers. PR: 267788 MFC After: 1 week --- sys/arm64/arm64/freebsd32_machdep.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index e19d845ca66e..1cf8403e0a0e 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -151,8 +151,12 @@ get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) ("Called get_fpcontext32 while the kernel is using the VFP")); KASSERT((pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, ("Non-userspace FPU flags set in get_fpcontext32")); - for (i = 0; i < 32; i++) - mcp->mcv_reg[i] = (uint64_t)pcb->pcb_fpustate.vfp_regs[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + mcp->mcv_reg[i * 2] = tmpreg[0]; + mcp->mcv_reg[i * 2 + 1] = tmpreg[1]; + } mcp->mcv_fpscr = VFP_FPSCR_FROM_SRCR(pcb->pcb_fpustate.vfp_fpcr, pcb->pcb_fpustate.vfp_fpsr); } @@ -168,8 +172,12 @@ set_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) pcb = td->td_pcb; if (td == curthread) vfp_discard(td); - for (i = 0; i < 32; i++) - pcb->pcb_fpustate.vfp_regs[i] = mcp->mcv_reg[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + tmpreg[0] = mcp->mcv_reg[i * 2]; + tmpreg[1] = mcp->mcv_reg[i * 2 + 1]; + } pcb->pcb_fpustate.vfp_fpsr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); pcb->pcb_fpustate.vfp_fpcr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); critical_exit(); From nobody Mon Oct 16 22:14:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8WcT678Hz4xsBF; Mon, 16 Oct 2023 22:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8WcT5bVMz4V0M; Mon, 16 Oct 2023 22:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFQy/JRtLwkQ5/oYe6Iq2BlYCMPfRwAU6JOLLX8PVuc=; b=v0Cdpbi6CMNt1yaAfQysuCt1wNuqagqBtXLcgYwEu8Q8eue9Ajv8O5IvwwkfB9h5CIGPR/ u/wlcOahfbi4weSXsGvwmFAPApYO0uuig11yyvwnn3QUS2qgjYH08TpobS/p92kp15JNmQ Pz1VD2M19v5YfJYL2A9tzuxpktxyZg5ic9h0W+DVjfLckA4TF1SQmpPIrtCbIEd+mLNx7j yuVEFQSkmkbd0aHB9eVZ8pLF5JajtFN03pb0PH4rJS1jkuxjh9jSVS6+JgTGr+IwgO9S1K 19Zv3IwLImby9As3jfFNnhmODWGt6SnUQBLDUNq28AI89WxLQY10x23k0QwtvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697494473; a=rsa-sha256; cv=none; b=aT5IcjcumPefPie+9dVtfYpRnbklTaoI8zDPvbXwVMsOXVRGulVi5WjZMD69g2HpXhvy1v pCHTPzrv2TxJtjypLYKma2folPhfg7r2D893gmF5412M6fbKd76aCbmqrqJNTW2HbmZVUL dtG4Pl5YkD396qnNA1LbYl0Y46ROnIDSs+V0S2IVjITcdh4V3v+r/Ry9QvW+QSQ5mw/YvN ID63r6s148Q68X/UX5ZthH+562mxDZOzl/ZEI5VXOBDn4GEOvqNgzZnt0yCo7Yyh0DxzOS 6+ABXvRS9iJ4SMSD1j4HjwTUHRxx10Yrd/Re4U0pJ2/435wtQetTjVwcQDfcrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFQy/JRtLwkQ5/oYe6Iq2BlYCMPfRwAU6JOLLX8PVuc=; b=fTLdCnoDc2fXMNC6AZAbgfZvNs7ULVuPjC4TqUIxmOlVWjMYeRNtOspIM5tb3IzW2cVUbx FDwVz1sZituo2dd249vECo4B02oved3PYmnvxo8orgvirEj2MnLDS8qorh9rtr5chcUnAc YOqPZWMI5fLXmeVpndEykZtZMj3MVvsQ6Ux1EwuUBYUYzl7lSxV3+hBD2wRVBgiQ135yeG pSRXyT+WWKoa7JADoj5iMaGaSvTUit+4ESKH/c7KpVzfYYf01YsBcQVDr8HUT2Pgb8H5IW eusQwM3DCA8ZiJJ70Vc1fBFgvS6G4SkNeVNiPzeZ98atdkx+0uXb5af5LwWBfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8WcT4dXnzy6s; Mon, 16 Oct 2023 22:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMEXko062641; Mon, 16 Oct 2023 22:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMEXtg062639; Mon, 16 Oct 2023 22:14:33 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:14:33 GMT Message-Id: <202310162214.39GMEXtg062639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5307bbcc038f - main - bsdinstall partedit: Apply changes from scripted installs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 5307bbcc038f878b4b3714f03a2c824a0caeba4f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5307bbcc038f878b4b3714f03a2c824a0caeba4f commit 5307bbcc038f878b4b3714f03a2c824a0caeba4f Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:13:31 +0000 bsdinstall partedit: Apply changes from scripted installs I got a check inverted in a previous cleanup commit and as a result partedit was only applying GEOM changes (and generating an /etc/fstab) if it got an error reading the current GEOM mesh. Instead, it needed to do those actions if it succeeded in reading the mesh. The lack of /etc/fstab meant that bsdinstall mount didn't mount anything in a scripted install. PR: 273723 Reported by: Andrey Fesenko Reported by: Michal Nowak Reviewed by: cognet, brooks Fixes: 230990991965 bsdinstall: Handle errors from geom_gettree. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42236 --- usr.sbin/bsdinstall/partedit/partedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 668824725ac8..bb2580789fe8 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -215,7 +215,7 @@ main(int argc, const char **argv) if (prompt == NULL) { error = geom_gettree(&mesh); - if (error != 0) { + if (error == 0) { if (validate_setup()) { error = apply_changes(&mesh); } else { From nobody Mon Oct 16 22:17:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8WhP5yBnz4xrlV; Mon, 16 Oct 2023 22:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8WhP5dvdz4Vdv; Mon, 16 Oct 2023 22:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSYRPu1xZwfo8gR5ar0XPKvMOOvUJbBdaO+ZqrZncas=; b=moNym1SqKHqhr+zOO0K6dL6xs27ggEAvSMcLSlewVoUve8wiwD4HqvqwGDg6Ksnh+giGRd 3CrSEDOVDg3BpAYFFblm3amYgA6dOXyEncR2BXsxkSvPlMd6VXP70aS70AF83H9LFzu0EK Iuj2OFtxs86VEbBC0DQ6amDbmDEOmi2UUN/fpBc/saWcn0GPepQ+k7JawAQ/by6OWT8mEA w1fj4TZ3XotYdsXhSMISQ4H+tIukcHKokpvHuIP+D83t5mjBCDMIyWKgWCR3eAgHfPUWVi prq050UT+95lx7+oZNXsYrb5RJofQtOSfAvRcTJqih9jboC0XIQxfcG4eQjw6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697494677; a=rsa-sha256; cv=none; b=TzYoWa50WLM81bBsESKYksOZ23dRGkjsILpu9aYhPwo1OCL1fA7+wNsvYB+u9pRwqrSLV3 1K1Tn7+KQK3ZuUd7c1lkxmvGpy/bSavpgL11RhB4535Sgaj1olmcvp4BI8ipEos15pqwNC Z1TjpsX84Z6WYQCWwQsqdlGjLdqAPlRleEBnV3tY6U2FrFyeyCmbqBTV4IznBE6XdRo0EI 9qjT1QTu1r3AQxTF9Cv4cwmMVdVwK4nXhfd0E98IKX/gC65qWEdk8fe77IhgZi5GXdeFgG HcfbWOQLECyf8ZDWwQx5yw0wHmVDsHejT3IUOb1iDWNhJoDwSqgA9o9ZqyBczg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSYRPu1xZwfo8gR5ar0XPKvMOOvUJbBdaO+ZqrZncas=; b=K4E5V1o8dLG3+Kj997edMd97c7YQVG5XqdeU1tVrkuhdk7YiQoI7Cl62QGzihkSiNLmgiJ xRgAiYqBtus/ODBgJdTs0kigsDxGCAYe13g9elsqxmZ2yO5rnJW/82heQnaP4QmSXVnC9f Yvg4dd9391/dwCL7igj+dlqW0sRTikBQnLH+JgVwV47VBTx38nrg7dk9J6wjjAdwjWuUOo jVkijjHxzKg7T1s382Fu6gFowefB4cL6jowJw74EJZr4dk5FmxAr5veWG0XOUyrOnUv2xs OTd2JDVHhavWOtdu0vS071IOfHmK1X4HhfMCMg7GBakDRsAKp1KY3i0m367STg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8WhP4ffwzy84; Mon, 16 Oct 2023 22:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMHv6x063225; Mon, 16 Oct 2023 22:17:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMHvT1063222; Mon, 16 Oct 2023 22:17:57 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:17:57 GMT Message-Id: <202310162217.39GMHvT1063222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b0936440b8fc - main - bhyve: Replace many fprintf(stderr, ...) calls with EPRINTLN List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b0936440b8fcee523c0b26fdbbef7c3b2b5098bf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b0936440b8fcee523c0b26fdbbef7c3b2b5098bf commit b0936440b8fcee523c0b26fdbbef7c3b2b5098bf Author: John Baldwin AuthorDate: 2023-10-16 22:17:48 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:17:48 +0000 bhyve: Replace many fprintf(stderr, ...) calls with EPRINTLN EPRINTLN handles newlines appropriately when stdout/stderr have been reused as the backend for a serial port. For bhyverun.c itself, the rule this attempts to follow is to use regular fprintf/perror/warn/err prior to init_pci() (which is when serial ports are configured) and to switch to EPRINTLN afterwards. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D42182 --- usr.sbin/bhyve/amd64/bhyverun_machdep.c | 8 +++--- usr.sbin/bhyve/amd64/e820.c | 5 ++-- usr.sbin/bhyve/amd64/vmexit.c | 46 ++++++++++++++++----------------- usr.sbin/bhyve/bhyverun.c | 33 +++++++++++------------ usr.sbin/bhyve/block_if.c | 2 +- usr.sbin/bhyve/bootrom.c | 14 +++++----- usr.sbin/bhyve/gdb.c | 3 ++- usr.sbin/bhyve/pci_ahci.c | 7 +++-- usr.sbin/bhyve/pci_xhci.c | 10 +++---- usr.sbin/bhyve/snapshot.c | 6 ++--- usr.sbin/bhyve/snapshot.h | 3 +-- 11 files changed, 69 insertions(+), 68 deletions(-) diff --git a/usr.sbin/bhyve/amd64/bhyverun_machdep.c b/usr.sbin/bhyve/amd64/bhyverun_machdep.c index 40325a7f52c9..4f482586f900 100644 --- a/usr.sbin/bhyve/amd64/bhyverun_machdep.c +++ b/usr.sbin/bhyve/amd64/bhyverun_machdep.c @@ -37,6 +37,7 @@ #include "atkbdc.h" #include "bhyverun.h" #include "config.h" +#include "debug.h" #include "e820.h" #include "fwctl.h" #include "ioapic.h" @@ -70,7 +71,7 @@ bhyve_init_vcpu(struct vcpu *vcpu) if (get_config_bool_default("x86.vmexit_on_hlt", false)) { err = vm_get_capability(vcpu, VM_CAP_HALT_EXIT, &tmp); if (err < 0) { - fprintf(stderr, "VM exit on HLT not supported\n"); + EPRINTLN("VM exit on HLT not supported"); exit(4); } vm_set_capability(vcpu, VM_CAP_HALT_EXIT, 1); @@ -82,8 +83,7 @@ bhyve_init_vcpu(struct vcpu *vcpu) */ err = vm_get_capability(vcpu, VM_CAP_PAUSE_EXIT, &tmp); if (err < 0) { - fprintf(stderr, - "SMP mux requested, no pause support\n"); + EPRINTLN("SMP mux requested, no pause support"); exit(4); } vm_set_capability(vcpu, VM_CAP_PAUSE_EXIT, 1); @@ -95,7 +95,7 @@ bhyve_init_vcpu(struct vcpu *vcpu) err = vm_set_x2apic_state(vcpu, X2APIC_DISABLED); if (err) { - fprintf(stderr, "Unable to set x2apic state (%d)\n", err); + EPRINTLN("Unable to set x2apic state (%d)", err); exit(4); } diff --git a/usr.sbin/bhyve/amd64/e820.c b/usr.sbin/bhyve/amd64/e820.c index 545878aad39f..456ce0330b50 100644 --- a/usr.sbin/bhyve/amd64/e820.c +++ b/usr.sbin/bhyve/amd64/e820.c @@ -17,6 +17,7 @@ #include #include +#include "debug.h" #include "e820.h" #include "qemu_fwcfg.h" @@ -93,11 +94,11 @@ e820_dump_table(void) struct e820_element *element; uint64_t i; - fprintf(stderr, "E820 map:\n"); + EPRINTLN("E820 map:"); i = 0; TAILQ_FOREACH(element, &e820_table, chain) { - fprintf(stderr, " (%4lu) [%16lx, %16lx] %s\n", i, + EPRINTLN(" (%4lu) [%16lx, %16lx] %s", i, element->base, element->end, e820_get_type_name(element->type)); diff --git a/usr.sbin/bhyve/amd64/vmexit.c b/usr.sbin/bhyve/amd64/vmexit.c index 5d903d98f277..2c01c63f6454 100644 --- a/usr.sbin/bhyve/amd64/vmexit.c +++ b/usr.sbin/bhyve/amd64/vmexit.c @@ -83,7 +83,7 @@ vmexit_inout(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) error = emulate_inout(ctx, vcpu, vme); if (error) { - fprintf(stderr, "Unhandled %s%c 0x%04x at 0x%lx\n", + EPRINTLN("Unhandled %s%c 0x%04x at 0x%lx", in ? "in" : "out", bytes == 1 ? 'b' : (bytes == 2 ? 'w' : 'l'), port, vme->rip); @@ -107,7 +107,7 @@ vmexit_rdmsr(struct vmctx *ctx __unused, struct vcpu *vcpu, val = 0; error = emulate_rdmsr(vcpu, vme->u.msr.code, &val); if (error != 0) { - fprintf(stderr, "rdmsr to register %#x on vcpu %d\n", + EPRINTLN("rdmsr to register %#x on vcpu %d", vme->u.msr.code, vcpu_id(vcpu)); if (get_config_bool("x86.strictmsr")) { vm_inject_gp(vcpu); @@ -137,7 +137,7 @@ vmexit_wrmsr(struct vmctx *ctx __unused, struct vcpu *vcpu, error = emulate_wrmsr(vcpu, vme->u.msr.code, vme->u.msr.wval); if (error != 0) { - fprintf(stderr, "wrmsr to register %#x(%#lx) on vcpu %d\n", + EPRINTLN("wrmsr to register %#x(%#lx) on vcpu %d", vme->u.msr.code, vme->u.msr.wval, vcpu_id(vcpu)); if (get_config_bool("x86.strictmsr")) { vm_inject_gp(vcpu); @@ -239,17 +239,17 @@ vmexit_vmx(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) vme = vmrun->vm_exit; - fprintf(stderr, "vm exit[%d]\n", vcpu_id(vcpu)); - fprintf(stderr, "\treason\t\tVMX\n"); - fprintf(stderr, "\trip\t\t0x%016lx\n", vme->rip); - fprintf(stderr, "\tinst_length\t%d\n", vme->inst_length); - fprintf(stderr, "\tstatus\t\t%d\n", vme->u.vmx.status); - fprintf(stderr, "\texit_reason\t%u (%s)\n", vme->u.vmx.exit_reason, + EPRINTLN("vm exit[%d]", vcpu_id(vcpu)); + EPRINTLN("\treason\t\tVMX"); + EPRINTLN("\trip\t\t0x%016lx", vme->rip); + EPRINTLN("\tinst_length\t%d", vme->inst_length); + EPRINTLN("\tstatus\t\t%d", vme->u.vmx.status); + EPRINTLN("\texit_reason\t%u (%s)", vme->u.vmx.exit_reason, vmexit_vmx_desc(vme->u.vmx.exit_reason)); - fprintf(stderr, "\tqualification\t0x%016lx\n", + EPRINTLN("\tqualification\t0x%016lx", vme->u.vmx.exit_qualification); - fprintf(stderr, "\tinst_type\t\t%d\n", vme->u.vmx.inst_type); - fprintf(stderr, "\tinst_error\t\t%d\n", vme->u.vmx.inst_error); + EPRINTLN("\tinst_type\t\t%d", vme->u.vmx.inst_type); + EPRINTLN("\tinst_error\t\t%d", vme->u.vmx.inst_error); #ifdef DEBUG_EPT_MISCONFIG if (vme->u.vmx.exit_reason == EXIT_REASON_EPT_MISCONFIG) { vm_get_register(vcpu, @@ -257,9 +257,9 @@ vmexit_vmx(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) &ept_misconfig_gpa); vm_get_gpa_pmap(ctx, ept_misconfig_gpa, ept_misconfig_pte, &ept_misconfig_ptenum); - fprintf(stderr, "\tEPT misconfiguration:\n"); - fprintf(stderr, "\t\tGPA: %#lx\n", ept_misconfig_gpa); - fprintf(stderr, "\t\tPTE(%d): %#lx %#lx %#lx %#lx\n", + EPRINTLN("\tEPT misconfiguration:"); + EPRINTLN("\t\tGPA: %#lx", ept_misconfig_gpa); + EPRINTLN("\t\tPTE(%d): %#lx %#lx %#lx %#lx", ept_misconfig_ptenum, ept_misconfig_pte[0], ept_misconfig_pte[1], ept_misconfig_pte[2], ept_misconfig_pte[3]); @@ -275,13 +275,13 @@ vmexit_svm(struct vmctx *ctx __unused, struct vcpu *vcpu, struct vm_run *vmrun) vme = vmrun->vm_exit; - fprintf(stderr, "vm exit[%d]\n", vcpu_id(vcpu)); - fprintf(stderr, "\treason\t\tSVM\n"); - fprintf(stderr, "\trip\t\t0x%016lx\n", vme->rip); - fprintf(stderr, "\tinst_length\t%d\n", vme->inst_length); - fprintf(stderr, "\texitcode\t%#lx\n", vme->u.svm.exitcode); - fprintf(stderr, "\texitinfo1\t%#lx\n", vme->u.svm.exitinfo1); - fprintf(stderr, "\texitinfo2\t%#lx\n", vme->u.svm.exitinfo2); + EPRINTLN("vm exit[%d]", vcpu_id(vcpu)); + EPRINTLN("\treason\t\tSVM"); + EPRINTLN("\trip\t\t0x%016lx", vme->rip); + EPRINTLN("\tinst_length\t%d", vme->inst_length); + EPRINTLN("\texitcode\t%#lx", vme->u.svm.exitcode); + EPRINTLN("\texitinfo1\t%#lx", vme->u.svm.exitinfo1); + EPRINTLN("\texitinfo2\t%#lx", vme->u.svm.exitinfo2); return (VMEXIT_ABORT); } @@ -413,7 +413,7 @@ vmexit_suspend(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) case VM_SUSPEND_TRIPLEFAULT: exit(3); default: - fprintf(stderr, "vmexit_suspend: invalid reason %d\n", how); + EPRINTLN("vmexit_suspend: invalid reason %d", how); exit(100); } return (0); /* NOTREACHED */ diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 027042cf0c14..0d7f58509244 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -467,7 +467,7 @@ fbsdrun_deletecpu(int vcpu) pthread_mutex_lock(&resetcpu_mtx); if (!CPU_ISSET(vcpu, &cpumask)) { - fprintf(stderr, "Attempting to delete unknown cpu %d\n", vcpu); + EPRINTLN("Attempting to delete unknown cpu %d", vcpu); exit(4); } @@ -531,7 +531,7 @@ vm_loop(struct vmctx *ctx, struct vcpu *vcpu) exit(4); } } - fprintf(stderr, "vm_run error %d, errno %d\n", error, errno); + EPRINTLN("vm_run error %d, errno %d", error, errno); } static int @@ -938,13 +938,13 @@ main(int argc, char *argv[]) exit(4); if (qemu_fwcfg_init(ctx) != 0) { - fprintf(stderr, "qemu fwcfg initialization error"); + fprintf(stderr, "qemu fwcfg initialization error\n"); exit(4); } if (qemu_fwcfg_add_file("opt/bhyve/hw.ncpu", sizeof(guest_ncpus), &guest_ncpus) != 0) { - fprintf(stderr, "Could not add qemu fwcfg opt/bhyve/hw.ncpu"); + fprintf(stderr, "Could not add qemu fwcfg opt/bhyve/hw.ncpu\n"); exit(4); } @@ -952,11 +952,12 @@ main(int argc, char *argv[]) * Exit if a device emulation finds an error in its initialization */ if (init_pci(ctx) != 0) { - perror("device emulation initialization error"); + EPRINTLN("Device emulation initialization error: %s", + strerror(errno)); exit(4); } if (init_tpm(ctx) != 0) { - fprintf(stderr, "Failed to init TPM device"); + EPRINTLN("Failed to init TPM device"); exit(4); } @@ -979,33 +980,33 @@ main(int argc, char *argv[]) #ifdef BHYVE_SNAPSHOT if (restore_file != NULL) { - fprintf(stdout, "Pausing pci devs...\r\n"); + FPRINTLN(stdout, "Pausing pci devs..."); if (vm_pause_devices() != 0) { - fprintf(stderr, "Failed to pause PCI device state.\n"); + EPRINTLN("Failed to pause PCI device state."); exit(1); } - fprintf(stdout, "Restoring vm mem...\r\n"); + FPRINTLN(stdout, "Restoring vm mem..."); if (restore_vm_mem(ctx, &rstate) != 0) { - fprintf(stderr, "Failed to restore VM memory.\n"); + EPRINTLN("Failed to restore VM memory."); exit(1); } - fprintf(stdout, "Restoring pci devs...\r\n"); + FPRINTLN(stdout, "Restoring pci devs..."); if (vm_restore_devices(&rstate) != 0) { - fprintf(stderr, "Failed to restore PCI device state.\n"); + EPRINTLN("Failed to restore PCI device state."); exit(1); } - fprintf(stdout, "Restoring kernel structs...\r\n"); + FPRINTLN(stdout, "Restoring kernel structs..."); if (vm_restore_kern_structs(ctx, &rstate) != 0) { - fprintf(stderr, "Failed to restore kernel structs.\n"); + EPRINTLN("Failed to restore kernel structs."); exit(1); } - fprintf(stdout, "Resuming pci devs...\r\n"); + FPRINTLN(stdout, "Resuming pci devs..."); if (vm_resume_devices() != 0) { - fprintf(stderr, "Failed to resume PCI device state.\n"); + EPRINTLN("Failed to resume PCI device state."); exit(1); } } diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 93ddf6d8e0c6..29b8910101f6 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -1025,7 +1025,7 @@ blockif_pause(struct blockif_ctxt *bc) pthread_mutex_unlock(&bc->bc_mtx); if (!bc->bc_rdonly && blockif_flush_bc(bc)) - fprintf(stderr, "%s: [WARN] failed to flush backing file.\r\n", + EPRINTLN("%s: [WARN] failed to flush backing file.", __func__); } diff --git a/usr.sbin/bhyve/bootrom.c b/usr.sbin/bhyve/bootrom.c index cf527b98af89..64f1921f901e 100644 --- a/usr.sbin/bhyve/bootrom.c +++ b/usr.sbin/bhyve/bootrom.c @@ -237,14 +237,14 @@ bootrom_loadrom(struct vmctx *ctx, const nvlist_t *nvl) if (varfile != NULL) { varfd = open(varfile, O_RDWR); if (varfd < 0) { - fprintf(stderr, "Error opening bootrom variable file " - "\"%s\": %s\n", varfile, strerror(errno)); + EPRINTLN("Error opening bootrom variable file " + "\"%s\": %s", varfile, strerror(errno)); goto done; } if (fstat(varfd, &sbuf) < 0) { - fprintf(stderr, - "Could not fstat bootrom variable file \"%s\": %s\n", + EPRINTLN( + "Could not fstat bootrom variable file \"%s\": %s", varfile, strerror(errno)); goto done; } @@ -254,7 +254,7 @@ bootrom_loadrom(struct vmctx *ctx, const nvlist_t *nvl) if (var_size > BOOTROM_SIZE || (var_size != 0 && var_size < PAGE_SIZE)) { - fprintf(stderr, "Invalid bootrom variable size %ld\n", + EPRINTLN("Invalid bootrom variable size %ld", var_size); goto done; } @@ -262,8 +262,8 @@ bootrom_loadrom(struct vmctx *ctx, const nvlist_t *nvl) total_size = rom_size + var_size; if (total_size > BOOTROM_SIZE) { - fprintf(stderr, "Invalid bootrom and variable aggregate size " - "%ld\n", total_size); + EPRINTLN("Invalid bootrom and variable aggregate size %ld", + total_size); goto done; } diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index dcd733c484ca..55178677f837 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -59,6 +59,7 @@ #include "bhyverun.h" #include "config.h" +#include "debug.h" #include "gdb.h" #include "mem.h" #include "mevent.h" @@ -890,7 +891,7 @@ gdb_cpu_breakpoint(struct vcpu *vcpu, struct vm_exit *vmexit) int error, vcpuid; if (!gdb_active) { - fprintf(stderr, "vm_loop: unexpected VMEXIT_DEBUG\n"); + EPRINTLN("vm_loop: unexpected VMEXIT_DEBUG"); exit(4); } vcpuid = vcpu_id(vcpu); diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index b69c099225db..1eef285a871c 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -2610,7 +2610,7 @@ pci_ahci_snapshot(struct vm_snapshot_meta *meta) /* Mostly for restore; save is ensured by the lines above. */ if (((bctx == NULL) && (port->bctx != NULL)) || ((bctx != NULL) && (port->bctx == NULL))) { - fprintf(stderr, "%s: ports not matching\r\n", __func__); + EPRINTLN("%s: ports not matching", __func__); ret = EINVAL; goto done; } @@ -2619,9 +2619,8 @@ pci_ahci_snapshot(struct vm_snapshot_meta *meta) continue; if (port->port != i) { - fprintf(stderr, "%s: ports not matching: " - "actual: %d expected: %d\r\n", - __func__, port->port, i); + EPRINTLN("%s: ports not matching: " + "actual: %d expected: %d", __func__, port->port, i); ret = EINVAL; goto done; } diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 2d37cb0f08fc..99c1d20b3378 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -3102,8 +3102,8 @@ pci_xhci_snapshot(struct vm_snapshot_meta *meta) /* check if the restored device (when restoring) is sane */ if (restore_idx != i) { - fprintf(stderr, "%s: idx not matching: actual: %d, " - "expected: %d\r\n", __func__, restore_idx, i); + EPRINTLN("%s: idx not matching: actual: %d, " + "expected: %d", __func__, restore_idx, i); ret = EINVAL; goto done; } @@ -3118,9 +3118,9 @@ pci_xhci_snapshot(struct vm_snapshot_meta *meta) if (meta->op == VM_SNAPSHOT_RESTORE) { dname[sizeof(dname) - 1] = '\0'; if (strcmp(dev->dev_ue->ue_emu, dname)) { - fprintf(stderr, "%s: device names mismatch: " - "actual: %s, expected: %s\r\n", - __func__, dname, dev->dev_ue->ue_emu); + EPRINTLN("%s: device names mismatch: " + "actual: %s, expected: %s", + __func__, dname, dev->dev_ue->ue_emu); ret = EINVAL; goto done; diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 86c76e679e53..5f643c9ceb50 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -155,13 +155,13 @@ strcat_extension(const char *base_str, const char *ext) ext_len = strnlen(ext, NAME_MAX); if (base_len + ext_len > NAME_MAX) { - fprintf(stderr, "Filename exceeds maximum length.\n"); + EPRINTLN("Filename exceeds maximum length."); return (NULL); } res = malloc(base_len + ext_len + 1); if (res == NULL) { - perror("Failed to allocate memory."); + EPRINTLN("Failed to allocate memory: %s", strerror(errno)); return (NULL); } @@ -176,7 +176,7 @@ void destroy_restore_state(struct restore_state *rstate) { if (rstate == NULL) { - fprintf(stderr, "Attempting to destroy NULL restore struct.\n"); + EPRINTLN("Attempting to destroy NULL restore struct."); return; } diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index fdfbbcbe0cb8..179aafb6471d 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -119,8 +119,7 @@ do { \ (RNULL), (META)); \ if ((RES) != 0) { \ if ((RES) == EFAULT) \ - fprintf(stderr, "%s: invalid address: %s\r\n", \ - __func__, #ADDR); \ + EPRINTLN("%s: invalid address: %s", __func__, #ADDR); \ goto LABEL; \ } \ } while (0) From nobody Mon Oct 16 22:43:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XFh3C7hz4xtH6; Mon, 16 Oct 2023 22:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XFh2P3Xz4XQS; Mon, 16 Oct 2023 22:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xpky8ZRrFi1ScpjAhYGJLg6HnStd91/KU2XrwxrKNY=; b=avIIaudaP7Tx0ACMdcGoVdz1x5+pfWFiDxHT4AmKvTvL9ykHMQji1GnwZQek3qq1UbuDRN PiovUwi6gSmAbofeeNb6aXW/PPex8JhLjjmOHzwc2GkWuMFnDlNNHTRyB6Uume4kauDObE YOjopaIlOaei9C3/lRq0DjoSqhE/BFiWMCy+lnoeb2ii6h3ouIDWiRz9rPKyI/RNwefLTl +prNkg2pqfWgubgWUuJKLjUfDktiiRkW/UQPIrZ7ulG7nXj6DtDqMtlJJ/ZZw+RpSkLa1S hDZOCuJPx0tpqSbU11kBvMEJ30keTfelrAiiMemuuzMqYlwKOXU1mp8dlziV9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496200; a=rsa-sha256; cv=none; b=LBuPB33vpsTKPBIG7TkQziTg95mH9+TW/GfF1cY6vT41X+kA7Cz0oiagy2OGDWRJRqWSDA 5eIMxTYn7TRmiHmTyQzfkurSc+VR1BMkLyIaSzmqHpfkqxyqmKpGDt8RG8u90ejX8V+WNS Ed8tyi8ThrwGFzo5sgaHyvY6V6FzvGWy+c6auCE/khWQvezz/+mGYDeDNl7ikfvoSQGy6P GcDVHzEUifW/HtZFQJvT5GKaxz3cBry42GcDA83an/ytgepSgHejHJPXz/2t/57mqKJ8bt SeBCCm1SbQBJOdeYsYkUr7nvTdaZhNk641dLXRvzIRrbXcf3hn0G27qwo33dPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xpky8ZRrFi1ScpjAhYGJLg6HnStd91/KU2XrwxrKNY=; b=fjzudjX9SUJPeAKEveeTsM6Skb/fxoWpT1booFbHN57PvHhyyC4CeJ/MrYK7aI/c6Zznde gApVGC3fxhN34a/QIjSqJHu6JXgs9li4vYNu7TbcNNhPSjPGU/yX3NN9eDvWjLLYsH/i+h EFK0sMilMvKbcUsBlOFVNo5wgwELeaoyzaPtp7Rp8P/WcjLPCC2X/bNjGxY4VNo3fCpTTI I3B8zRdnelHpRGAdz9LwjRUpCljG8De6ahbIbNTKh4yIO8KX6XBGi/yRQrkGNDsRsiX6J7 4OaCPbM+NAF6gsaKVKTLsR+It0jAoHhEHv0aIKyB1cAEZgw8gFOUUP8scz0YWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XFh1Rn6zyG8; Mon, 16 Oct 2023 22:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMhKSb011763; Mon, 16 Oct 2023 22:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMhKmn011760; Mon, 16 Oct 2023 22:43:20 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:43:20 GMT Message-Id: <202310162243.39GMhKmn011760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 22a6678b627b - main - acpi_pcib: Trust decoded bus range from _CRS over _BBN List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 22a6678b627b39ceb94f7323be1010e928d92494 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=22a6678b627b39ceb94f7323be1010e928d92494 commit 22a6678b627b39ceb94f7323be1010e928d92494 Author: John Baldwin AuthorDate: 2023-10-16 22:19:07 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:33:10 +0000 acpi_pcib: Trust decoded bus range from _CRS over _BBN Currently if _BBN doesn't match the first bus in the decoded bus range from _CRS for a Host to PCI bridge, the driver fails to attach as a defensive measure. There is now firmware in the field where these do not match, and the _BBN values are clearly wrong, so rather than failing attach, trust the range from _CRS over _BBN. Co-authored-by: Justin Gibbs Reported by: gibbs Reviewed by: imp (earlier version) Differential Revision: https://reviews.freebsd.org/D42231 --- sys/dev/acpica/acpi_pcib_acpi.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 0575b1d83bb1..02e3a0be5956 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -289,7 +289,8 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) #if defined(NEW_PCIB) && defined(PCI_RES_BUS) static int -first_decoded_bus(struct acpi_hpcib_softc *sc, rman_res_t *startp) +decoded_bus_range(struct acpi_hpcib_softc *sc, rman_res_t *startp, + rman_res_t *endp) { struct resource_list_entry *rle; @@ -297,6 +298,7 @@ first_decoded_bus(struct acpi_hpcib_softc *sc, rman_res_t *startp) if (rle == NULL) return (ENXIO); *startp = rle->start; + *endp = rle->end; return (0); } #endif @@ -366,7 +368,7 @@ acpi_pcib_acpi_attach(device_t dev) u_int slot, func, busok; #if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct resource *bus_res; - rman_res_t start; + rman_res_t end, start; int rid; #endif int error, domain; @@ -495,7 +497,7 @@ acpi_pcib_acpi_attach(device_t dev) * If we have a region of bus numbers, use the first * number for our bus. */ - if (first_decoded_bus(sc, &start) == 0) + if (decoded_bus_range(sc, &start, &end) == 0) sc->ap_bus = start; else { rid = 0; @@ -512,15 +514,21 @@ acpi_pcib_acpi_attach(device_t dev) } } else { /* - * Require the bus number from _BBN to match the start of any - * decoded range. + * If there is a decoded bus range, assume the bus number is + * the first value in the range. Warn if _BBN doesn't match. */ - if (first_decoded_bus(sc, &start) == 0 && sc->ap_bus != start) { - device_printf(dev, - "bus number %d does not match start of decoded range %ju\n", - sc->ap_bus, (uintmax_t)start); - pcib_host_res_free(dev, &sc->ap_host_res); - return (ENXIO); + if (decoded_bus_range(sc, &start, &end) == 0) { + if (sc->ap_bus != start) { + device_printf(dev, + "WARNING: BIOS configured bus number (%d) is " + "not within decoded bus number range " + "(%ju - %ju).\n", + sc->ap_bus, (uintmax_t)start, (uintmax_t)end); + device_printf(dev, + "Using range start (%ju) as bus number.\n", + (uintmax_t)start); + sc->ap_bus = start; + } } } #else From nobody Mon Oct 16 22:47:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM3583mz4xtHY; Mon, 16 Oct 2023 22:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XM34ZnVz4XsD; Mon, 16 Oct 2023 22:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1amYf8ZNR1aieQH6Rr5740T1/jLe5GmfZXMHhm21YjQ=; b=HbaCfyQeU7saCvyrFNSDZQf2Gh5014BldBGn1twYMF5A4T1g3+KORyK1pN+eAkN9w9axzD cGLTEd/cSn47DX4zQrhzoHB09KOmhRhvNeSZb03ad1ugHS5orPL7sF6z9D03OgwV2Mjn6s eLxPN9gdfrl0AU7iSKyRFpv1IolHAsb7K1sgMvOKs8erCkwSW4skYKI6CyeT5j2dTJeTKy kPv1tcCCx7f+0MhPqWDcNhw9lr+qzLTfRLNPQU6GozZVyPk7dpxBF8XoiOSwyQos5aara0 xmIeJybYHq6zZSCNRoM563qZCsddEi9U0J4G77feJZN41bWeh+dc2clIEZjokQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496479; a=rsa-sha256; cv=none; b=yltuKoFuzDk8zaKg3AQ0sGChuKGojI3XHa4kXFqgu8vZZoMsUMRbnBRzJ7DJslmrxLjJjU 3cD/2iK7U+myxEEZqto9s+edpX81udbunYasho971ygahPsatqhbYx43OfyesKfdRJdrBs nZ0Vx1KDEY3NDDbG+YRrpsCv7b5/HFxL+etWOLkmVbyn7YdbqcMyAD43PL6olBE+aXkPsG Ca7gBmWPATs+0zzjplDCnVID4mEIhRT5S1tplFdmpVILxDHoFaHxevEV++i9AXwK6bbQqU xtsoazw+OUGuBmBOFJXz6nV+pZZNdIKfJBuy00epu+du2RG85ZIqXF6NffZ0Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1amYf8ZNR1aieQH6Rr5740T1/jLe5GmfZXMHhm21YjQ=; b=I0uqxEbFfyBp/Ry1pRDmMRcX4rSZzWtbEAK2yVf4bfEHWz5wfEllzle7lfR1lIQvAX2Whe Vj87sbl9pbjlMn5Has60XVUQWnatMPg2zGnyi56OkM/fPx6IIxXxTLFUJDF2HSkP8Lr3wR bZTARQdRek8ZCtxESJlMUjEPuAiND9v77l0Ghc1cGn9wD2DyNnf2DUvhZJL40G32K1YYUX OLWvHaewkpGH3Z+esXCsOcHvy3hl/Sgv2vwZSbPbhZBIofAkEPZgAZr2pq/EutLe2RJ13i QmIcctvoo6Tn6+zbay8NQOgwHmvS/Q2ZdHexUk2xGz/o2gJd1wSAHmExHG2qng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM33cVJzydk; Mon, 16 Oct 2023 22:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMlx40012592; Mon, 16 Oct 2023 22:47:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMlxWg012589; Mon, 16 Oct 2023 22:47:59 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:47:59 GMT Message-Id: <202310162247.39GMlxWg012589@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2e539c6f5aba - main - cam: Make more self-contained List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2e539c6f5aba657c69790d91130ceceeb0b8c38e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2e539c6f5aba657c69790d91130ceceeb0b8c38e commit 2e539c6f5aba657c69790d91130ceceeb0b8c38e Author: John Baldwin AuthorDate: 2023-10-16 22:44:46 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:44:46 +0000 cam: Make more self-contained Include in the kernel for struct malloc_type. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42205 --- sys/cam/scsi/scsi_all.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index 937a6632d3be..4842732c8169 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -24,6 +24,7 @@ #include #ifdef _KERNEL +#include #include #else #include From nobody Mon Oct 16 22:48:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM469D1z4xtL2; Mon, 16 Oct 2023 22:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XM45kCcz4Xsx; Mon, 16 Oct 2023 22:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6oegKRbJEmDiq9TfI4iMZWGdj++AxMH2jjbJrNGujnU=; b=IRoEqbtZ/Wy7x4aAmQrC6GmERtXwGeFkAgJ1GKVqQfkhwzNpLcW9fG4UjbSZFZLGMvQLgL pjkZgptv+erbQHdcr/J8QrnWaO1aPly9XHg5CbxoH2XTlUitWs9eMtz5UkFmPDSbOM92o/ Nr+sc74lWgIuv4tZhZutmldvWiPsYZDnRHiB4izV3iat635xsjEtp9JFg/qQvI9F8mjzSV 3/HOPNDvy9VIjgHfsd0x3HM5fn41AWp0+oP0WZ/VmAk3a6S/EhfjGUs8Oz8wi/IYaXgyGA KjCH3etpyUYBodfcYUacgywz6sGV50nMbtteba9wqQaR2f+kQP4G8u14y4QW6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496480; a=rsa-sha256; cv=none; b=aJ0w4+kmNRC41+n56HnymAapDzeDXB2AUNxmP0ubjI4929qcppz6sqfxOB9O6ZTE/Kf46G Q5fnZAAcyKJI4UDJjpK7cSaJDSN1Pobsi/hMUVALBpZGZmydaHp/SgIsc6FR7BNhQG+fFL 7qG8GQAZ9taRq8E7lmoWfKVyKGwNzfx89qvaOLifOYe3PvPNakS5LVAYWcW1ln/rR2wOtf TC1lIqCES9gj/SLo9rCDOFKsgBB1/y0GQVQk9cVZyushbgLmxp5i6NjVsPdCJJ7oUxLY9+ M7yfz+Ar34n2jQCghSZAg4ZVCRUOSOOzxCj+6puWH1yl22jF4FBNz3oFmaSSsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6oegKRbJEmDiq9TfI4iMZWGdj++AxMH2jjbJrNGujnU=; b=MVES/rkNIcm1Cib3IX1TpU4lYAH9h+PtKECLmrMjdHlMwwps/5QNW54jqQdCAClr29wUIT WuKbqZZG1wJE0xEGIduIqs4gUtSOHX+drCBi6OjWSY8CWBAoCLP+5bhfJV89Jqeu6Xqykt jz8yBgMv6wguWF8BAxQQBWXZnM5X05Db+y93XdO80NjrXOwRXPrC8bw+/sN1Mx88vYJ6tN PFaL5KoHqKHmsYCtw7iajj0sjPSAOyPlgNIMvA3vHBCQw3FXwjD2Mz8MbiVbEjVDSPOf6d /EaAlLi1OXAf88epSeOlG08gHM2dpF3snY+fbzoA7L3yTkQnKWU6w2BiglKNxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM44YtCzygj; Mon, 16 Oct 2023 22:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMm0OF012640; Mon, 16 Oct 2023 22:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm0nO012637; Mon, 16 Oct 2023 22:48:00 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:00 GMT Message-Id: <202310162248.39GMm0nO012637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 55231cd18069 - main - ctl: Make ctl.h more self-contained List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 55231cd180692c7299bff65e608dba20013ec0f7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=55231cd180692c7299bff65e608dba20013ec0f7 commit 55231cd180692c7299bff65e608dba20013ec0f7 Author: John Baldwin AuthorDate: 2023-10-16 22:45:15 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:45:15 +0000 ctl: Make ctl.h more self-contained Make MALLOC_DECLARE conditional on and forward declare several types. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42206 --- sys/cam/ctl/ctl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h index 1b7d7ad4ec38..a211e249b2dc 100644 --- a/sys/cam/ctl/ctl.h +++ b/sys/cam/ctl/ctl.h @@ -129,7 +129,9 @@ typedef enum { #ifdef _KERNEL +#ifdef MALLOC_DECLARE /* from malloc.h */ MALLOC_DECLARE(M_CTL); +#endif struct ctl_page_index; @@ -137,9 +139,13 @@ struct ctl_page_index; SYSCTL_DECL(_kern_cam_ctl); #endif +struct cdev; struct ctl_lun; struct ctl_port; struct ctl_softc; +struct ctl_scsiio; +struct sbuf; +union ctl_io; /* * Put a string into an sbuf, escaping characters that are illegal or not From nobody Mon Oct 16 22:48:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM572dlz4xtdp; Mon, 16 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XM56RJ0z4Xr6; Mon, 16 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGygcT7qstbk+Q+LES2DF8KLlyz9ZlbMihfcJV0Qhsg=; b=wEqrdaUVNmjL6XIYLsdmehy9fwmIlnxyRSy8MxAAXM7NjG0ImNNDckm1tcdIjIqrqHFnhM BBHeiR9zrUbcGUol/88kLzfbp2ccRq6/o3sf4p+zrORgaiGsj961ZXjsxR9EqOuhznkUZp ZJi8FJhsih9wg5gib9ksupiGFhHeM9bYh3s4IZLqV0oF+WgXaYPCSDCeQY6Y5aO7Yx5Vme m/pPd3vczBOR6Y2GKXkQtISxFr2LF3vrOmWXXB1nSZMehOuVtot8j0Ne73xpnnjsaTFP+Y OGTd+nsGv1Gf8HsBZ12IpVfpjeMBp60Ogp2/jI2VxLNqAMEnmpRvb3eF72Eu2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496481; a=rsa-sha256; cv=none; b=dHANk1IELf+j8F9v8+JfiFQqazH5OiYHvaGizL7KLqQr6t4Hsf3j/IOM3n0VjUvfeWSk1M gaNlCR1Mq1BThzSivxAMyxS0skgGIOxoqJC90Zhtww6hfS3md0k0zTYyfndUQbqRFtdpVT mmK+17NCWaNAZiMiFSFkkFRXSohVDNkkdOcSuOiLSEaN2dOzOE5Lw+V0cBfBzal6UCtDMY 0hXmMNEukZ7lanN5Xosd57UmPEecn55idECvS07pbDNAGeQm6h4IE8klfmsIW9puB9+W8x 9vbfYJhbDUHC/rOcb1TB/LKnYHALOeg0PIxDw8T40rXxoGmDuUAEmkGlSobEPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGygcT7qstbk+Q+LES2DF8KLlyz9ZlbMihfcJV0Qhsg=; b=WZoXhTp4WrcFdqu61vPm9GsrS5jleW7GuphLcNjYGttDkv0lB39oviY1Xy1YCgjbH26eNp Ij4bwsevPhGjqQ5suMNN6YBCqdB1oq3RXENW+U+PS6XvU9HsGHpOHHU+Oav0tHlfaN5wC1 nulO8q3dn2zvc08/1oTu3p5TV1y9BurtjN1Ra3h9kcMa8rhWOENencQen9NePScq5rITxM n54iBbpXNbUACp+HtSbZ/PRb/Z2qNTkNxkVVuK8AISJWwjflhtJ30ZwnujuUXFrhP2pgnp 26xA399Cd89aQCvXWOiO3kCmSMlgiFVX0cz2Uhw4o1pbfojAz8wHYScLgAWZBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM55Xt5zybf; Mon, 16 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMm1rn012682; Mon, 16 Oct 2023 22:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm1Ej012679; Mon, 16 Oct 2023 22:48:01 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:01 GMT Message-Id: <202310162248.39GMm1Ej012679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4efebb3de39a - main - ctl: Make ctl_io.h more self-contained List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 4efebb3de39a2694169d3032fb6ca567409c2bcb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4efebb3de39a2694169d3032fb6ca567409c2bcb commit 4efebb3de39a2694169d3032fb6ca567409c2bcb Author: John Baldwin AuthorDate: 2023-10-16 22:45:43 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:45:43 +0000 ctl: Make ctl_io.h more self-contained Include for struct scsi_sense_data. Include for queue macros. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42207 --- sys/cam/ctl/ctl_io.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h index add8ed2e3ac6..115e336bd354 100644 --- a/sys/cam/ctl/ctl_io.h +++ b/sys/cam/ctl/ctl_io.h @@ -45,6 +45,9 @@ #include #endif +#include +#include + #define CTL_MAX_CDBLEN 32 /* * Uncomment this next line to enable printing out times for I/Os From nobody Mon Oct 16 22:48:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM70t1rz4xtn0; Mon, 16 Oct 2023 22:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XM70Kxhz4Y6Z; Mon, 16 Oct 2023 22:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBrE/uOs6oMoRgyevzEiIB0/JuGHpiiFuuh/NAQpL2A=; b=yNgz9TA89gDCXn7NlyRl+y3yIp6yGilcDYsUKbExA2MoQ0rO4uCrJ+1V2noS9Z/0CSU8gG TMRDR6vLHyaRvz8cLtGhPsqULlX5ycZiaTMc5HlqL+aCHCB+y97dn2Dj2SLk6CyuruDi3z ZP8ibyHVpB5t/H9CGrnEcN+k92lYbTnwjkbfNR7bSsEcTvDeNB/pwwvDyquG4+3nae/rqF bXmxexUUgp6Gc2UHUVe2WZykZchkdIfHjRlRPvvk3S5/rBWB4zKH8m8333r0ChD9HSc/e/ a1jpatz7A5zvZIEOdVm6NUfdzW2G0zR1EMIeu83oklYYfVBBDYdK7GhQUfVdJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496483; a=rsa-sha256; cv=none; b=WC6rAW8q34Rc50xfnXZg0qcFMrGs6TLab4Iw3aHglCI4F0IB1UnFlh12kmTpu3gEB3E0Gn 8z+OuYgTJeGck4M+CmIs/AkhedZMtfI4WG71XWFeSNIsKgltCqo8FgejQALvgxWP/pmTke NlWqMTRvzSWYGBUOcx1akzKgnkQXbNBmECTRpjXAmCgJwmX9nvtABKgdupQO57Hh92uYbP xLvIsWmw8H0YLc3JN4RhTRcoh0KZOMlx20HseoiJ4gWS/BuplZthBbt2BXe+8qyYf9Kgga ypeLZl9Y35tWA+EgSik4mxVfC8TD1aAXa/w+6edGdSWBvBrNZEPC3I8UjUcFdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBrE/uOs6oMoRgyevzEiIB0/JuGHpiiFuuh/NAQpL2A=; b=P0s+yyC9j2D1r4rHdaKMXkK4CDuuO7IPW9qTwzJ42yAq9HsStsw9+AvRLzTbC7Z9yXH9jT UdEbVZRnVxbpcBXhDJJlZ59Q+fgp7KwhR/nhAjyfQrY1Y1BwS8pqRHrq8YACO+PI7l9CJo o8k1laIx3nkSeysoST/pw3+vi58zuLlwyTUZR5c88bXEfDt6wFYC2ud9iN5cE7BadfnAXq ISHWEQvfY7SYx5Hw9DmiUxaCaaXwRcQH2fhKB06KwrZB+lC8b0hZMjsB4y6gYoZh2bAdk/ AFMKE1HUucCGmWtKYfCEAYdZUqjAV7aHJXYxpY3taAe3INULI62KIamYNpK/VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM66YGjzyGF; Mon, 16 Oct 2023 22:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMm2Ym012728; Mon, 16 Oct 2023 22:48:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm29j012725; Mon, 16 Oct 2023 22:48:02 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:02 GMT Message-Id: <202310162248.39GMm29j012725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 10b1a66934b0 - main - ctl: Make ctl_ha.h more self-contained List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 10b1a66934b0c1b252369c496952974f980441a4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10b1a66934b0c1b252369c496952974f980441a4 commit 10b1a66934b0c1b252369c496952974f980441a4 Author: John Baldwin AuthorDate: 2023-10-16 22:46:11 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:46:11 +0000 ctl: Make ctl_ha.h more self-contained Include for queue macros Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42208 --- sys/cam/ctl/ctl_ha.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/ctl/ctl_ha.h b/sys/cam/ctl/ctl_ha.h index 5a6f6502da8b..49a55e16c547 100644 --- a/sys/cam/ctl/ctl_ha.h +++ b/sys/cam/ctl/ctl_ha.h @@ -37,6 +37,8 @@ #ifndef _CTL_HA_H_ #define _CTL_HA_H_ +#include + /* * CTL High Availability Modes: * From nobody Mon Oct 16 22:48:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM81WYBz4xtn5; Mon, 16 Oct 2023 22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XM80xRcz4YDH; Mon, 16 Oct 2023 22: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=1697496484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Id7O0APIVOq29whz7bJTsHVyWAmjCtSqkyfcYXyjx6I=; b=gjOyFwdYuoWZ/gnKSbM2MgouSykjpMKdw6ookepQEZJNUYoIOWao9f3Uel+rF5w18tdlcJ iEWtAnHp03HxfgNrip6whABU7FTgqMPLEtDKmgxDbXd0FhvdMfEzHGW3leafep1v5MA+p7 iPOu5xIOzjl863urP8Ho+W6SVm2tQ2iTDW2awV1FIz2//9Xs74y41gTc+Enne+yXFjqUTM eu9VTMUNe1TuL+LqlMMshf2xyB/Dc6HdbvAaL8PEAkLc79WvJM7zyDpEdwltxdQflkMTvm poc8O1qcYo7Wm3V15F+Z0CoeGQNxHHV1XKnaeZ3K+LofIdeevK/gWWycuawyhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496484; a=rsa-sha256; cv=none; b=egpL0KC6S9/Nty/ohEA93jCpd6ndMmd+Bu16kH+YglwfFlZ82CUE9NAMNG9+X+VNdkk7A1 SDgcy6X77OQNizTzS0xin/A57xVYuvl7DjjdBjxtDTxT6aZLR401nMl1119RA5N3D1RuPn K/X07PCFNEHb7duLyCn/j9G/yDE3LlBD0Jimmj4WVb9gwN0BhMhQOYaDP7YhKmaubLSh8K EtgLdafhf85/LoJsYSEYHf0vfob0VOkPcFmnZpUCkYWbQ/POTMKLfa9oPWVanPpIzAzlFR fiTzV/zCZwZvAmQx93i/TsnWhdIbMK9Sj672zZLTu6S/hJpTPN1WDv+cIDs0+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=1697496484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Id7O0APIVOq29whz7bJTsHVyWAmjCtSqkyfcYXyjx6I=; b=YApE6vf3G6aPEjjBaeCxO0hzXVhaDSuzP4KjoMagp+RpHPHZW1SVXGzqkQtbD0Nv7UqOl2 WC0cC8RHYsA3MjJh85xD0+iz9D0xBIeAeVrbI7qClV+iBa4I2trh9SNiq/6JMIDT3zG4tc 8+ANwsUq5TMCTmcAGNkJwTspkLnB8JdRUDlxoucgOL5q1jWGrmVP68LpuoPXudGNAz2cWj DMr9Tt9DydsGr4oeldgT42svY6l5vLdHauiKJFkTWRUNwYS35OBYiX/FeOKa4iD6rzbyKW VKCCNdvfV7x81VrRiyAGui/8ANMoppC6y+6uo0k5u/kJ/cjWKXDJbidJbqqqCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM800dPzyQD; Mon, 16 Oct 2023 22:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMm33G012770; Mon, 16 Oct 2023 22:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm3i9012767; Mon, 16 Oct 2023 22:48:03 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:03 GMT Message-Id: <202310162248.39GMm3i9012767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: fc8cf0a8deb8 - main - ctl: Make ctl_private.h more self-contained List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: fc8cf0a8deb8908fb17acc56e96f3f700c05136d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fc8cf0a8deb8908fb17acc56e96f3f700c05136d commit fc8cf0a8deb8908fb17acc56e96f3f700c05136d Author: John Baldwin AuthorDate: 2023-10-16 22:46:43 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:46:43 +0000 ctl: Make ctl_private.h more self-contained Include for sysctl context types. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42209 --- sys/cam/ctl/ctl_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h index 9a87345015fa..04846f80e913 100644 --- a/sys/cam/ctl/ctl_private.h +++ b/sys/cam/ctl/ctl_private.h @@ -41,6 +41,7 @@ #ifndef _CTL_PRIVATE_H_ #define _CTL_PRIVATE_H_ +#include #include #include #include From nobody Mon Oct 16 22:48:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM93rTCz4xtn8; Mon, 16 Oct 2023 22:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XM91wyqz4YDm; Mon, 16 Oct 2023 22:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kM4dPmyTpfoDnVEq+HG8uqabUeoTbT2YneCWTpin1Q8=; b=yzIgi+rv9qU8lXjL2I3PU1N6JRKUJzb438hVedO5VHmTEfYqlaFeOcMzoLmSoPZVi0UsHq 5FznswMpRBwOkRkA3ch5YOdYv+T/YymoXBIHgu8P6mjaceHjbop4JOyXtVFr7tlStVg38d BWgii+DMQ3laBNz96XTAp0cOa9aerMlGOKqsi0U70aCQ0pzss2epDT1du2vHb4W6VVvkcp ouPIwW4UqEE8fUDJ9Tpa4qFhUZtihFvD5MAKaEcsSSXF5V+vOiwqK9VeOu+PW42DxeBRon KwtwZYF1rxmDxBcgu83XIK1iNqAp8fFlH4AYE2ekZcvdhMouHnJnjFNLI1KJOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496485; a=rsa-sha256; cv=none; b=LutcKVD253aSJA3or7NWP1ZQep+01CcLTgEsGy7bBe8hqQZSuWQbpbR1lCYehmUezeFj+d 5NbwHy3MZz+EUe7M2pAQzn4ryNwpoS77bRnVpu2Q0IVVci7cPqVERnvgu2D4fz6GxqcqD/ z6FICsjmuCTjoqwqtkqf35WPMgEahINnB5KFXetUa9Mej5TI90sMaeD8tdJNnTvpSg2YBY ttQe/vFZuZiXJ0BdLJh/p6wLPdPWTn2VzaICq3FLhJ4RNv94bFWgCtEMrdtf9aacOZk1Nj /TOAPoA3VMV473YOhMoCUfi1NS8O7U0ZdeGlGHop2nJKpOLFdNpohHWwB5qUUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kM4dPmyTpfoDnVEq+HG8uqabUeoTbT2YneCWTpin1Q8=; b=hsFkiiGufvzFOxjHUS46g6vft2AGJ0G+tiBzRck6qNm2sLhalKhyplF2n6DUeMYPSoEGlY cu//oCvGeyRc6AssOG4VKTQnhPz0Zf1EtmEUsqg/tk3XZZe113UQiN1EHFvlrWLye9eXSy ruARPZ85/ceOikSxA2Znc1m1pCbT/w+Iwc2W+5lJMs9fiTb6v5LVX07qkC2epsUf751Xst Q2XYnCGzh+VZ9pmqXDfWaUsbsRMhnLJ3TnGaGQY6DTLsmrlJ0oHCdQX+HGO4iy/h9iygNh zl1UtRQ6BPS43sllK8hn6ED8IM5VzMQFDlrLxrTl5Ru65UkZ2WUKuKA5qQC4zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM911xFzydl; Mon, 16 Oct 2023 22:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMm56h012819; Mon, 16 Oct 2023 22:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm5Vq012816; Mon, 16 Oct 2023 22:48:05 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:05 GMT Message-Id: <202310162248.39GMm5Vq012816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e846a3e0168f - main - ctl: Use ctl_io_sbuf in ctl_process_done List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: e846a3e0168f9188a6eccedd52707c63fd83cba2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e846a3e0168f9188a6eccedd52707c63fd83cba2 commit e846a3e0168f9188a6eccedd52707c63fd83cba2 Author: John Baldwin AuthorDate: 2023-10-16 22:47:09 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:47:09 +0000 ctl: Use ctl_io_sbuf in ctl_process_done This reduces a second copy of (mostly) the same code. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42210 --- sys/cam/ctl/ctl.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 6faecb0da0a4..a315c5ef7df3 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -13035,25 +13035,7 @@ ctl_process_done(union ctl_io *io) ctl_scsi_path_string(io, path_str, sizeof(path_str)); sbuf_new(&sb, str, sizeof(str), SBUF_FIXEDLEN); - sbuf_cat(&sb, path_str); - switch (io->io_hdr.io_type) { - case CTL_IO_SCSI: - ctl_scsi_command_string(&io->scsiio, NULL, &sb); - sbuf_printf(&sb, "\n"); - sbuf_cat(&sb, path_str); - sbuf_printf(&sb, "Tag: 0x%jx/%d, Prio: %d\n", - io->scsiio.tag_num, io->scsiio.tag_type, - io->scsiio.priority); - break; - case CTL_IO_TASK: - sbuf_printf(&sb, "Task Action: %d Tag: 0x%jx/%d\n", - io->taskio.task_action, - io->taskio.tag_num, io->taskio.tag_type); - break; - default: - panic("%s: Invalid CTL I/O type %d\n", - __func__, io->io_hdr.io_type); - } + ctl_io_sbuf(io, &sb); sbuf_cat(&sb, path_str); sbuf_printf(&sb, "ctl_process_done: %jd seconds\n", (intmax_t)time_uptime - io->io_hdr.start_time); From nobody Mon Oct 16 22:54:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XVf11Jvz4xtsd; Mon, 16 Oct 2023 22:54:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XVf0VxYz4bjB; Mon, 16 Oct 2023 22:54:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496874; 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=4fHAV5uNhTzJI6ZNoCir9qONu6vXNOdi4Gy9l6gxWZs=; b=HURR6GFu2NW2jArq7GklIQvIeo521bqUhvhlK68qWjuub5Nnlz4NI6IS04k5tWIF91UKz1 C5iMzbRsufVTBHkL9gUXnG4QG48OBO33HNcv6sBejRu7+FvVOLMPBmTduxMyCcAkj9s7Mx 3QPJbhXQLbhOtHLOliKd0zttca/AanqZr2Mlqr24Yylr6bhbutZbKHD09999QToQMYPUJt HwcjEoGyO7yeLezLMGfJdNOIkzveFpfVzQGtROKj0aqyHcstmTIHVSLLQ0vXmNbVU02evq i8p3QvrDyZmvlq3tQivCaHNfRtXomY2oRmAYpoP2qx1BfrZaRbBYjAA7y4a7sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496874; a=rsa-sha256; cv=none; b=GO4UFBouI4qI7zjAtKXf64XtIvlyth92zo84hsLyvov7ZyJR9UdubfMxKBSuoLPnq3R2G3 NdOU5c9QXkWnl6lLq5LT7SbVt8bfgaarLKRScwrNXVl5MtD07ATtSETYd7VgNPVE83us4v sSdzQB8S7l7KfFLhPA1Tuyx85aZgQZF20JXod8ArDSRWYtjuX0q8dh/r/w51nrIQ0Uqk+Y 56TsTIyXxO3J5iGH+UcSSEqTILBnACxXoJCoc4DXNJ0hqXhdFY06//30pQ66xKrcCzmCR8 7K0u9sjr55FUdULe/qWVBy+Hwcq31HtlyucjIUvwSeVasd2SxOD49F2xOGCDsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496874; 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=4fHAV5uNhTzJI6ZNoCir9qONu6vXNOdi4Gy9l6gxWZs=; b=IjrpgyyzHepmL44Bn6jjb3uIJZLQfrUUSdVN2FBdlJOkbfRMIi/jvnRhEGTmiRQ5B7zO9v TvBpQHnWtqzjaYSvrSJud9PZD9QDxfHYS6Zf+A5C+l5EcY+Vx7ljvXZ6vRrC49e2WSRB/4 IRRuF8KSQIdEYjBgjCR+AKEC8GCR8Tg4Op3Fd3dr7qd8BoGLpC+L4FhCl0DSO8q/uUaxZ8 XqSD6FUOdv+SZnQqnUEKkUYdr6F3mef8GkMBWkgYUCq/fK59RY6f6LcuWM4BzMnCQnX+Us XIrVnI2795LbJIjwU0hhmpAVplNBXTbiE+cl8ItA+c8UDpzB90Lgb7Fqgxw85w== Received: from [IPV6:2601:648:8683:39a0:f055:f679:76c4:bebe] (unknown [IPv6:2601:648:8683:39a0:f055:f679:76c4:bebe]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S8XVd1lyNzrlq; Mon, 16 Oct 2023 22:54:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <527ab884-ce06-4325-52a6-7c6dec1af563@FreeBSD.org> Date: Mon, 16 Oct 2023 15:54:32 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: git: 74e4a8d208f0 - main - pmap: add pmap_kextract(9) man page Content-Language: en-US To: Mitchell Horne , Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202310131827.39DIRXsu082741@gitrepo.freebsd.org> <068574a3-f63a-4830-be1d-2a8cd67c1819@freebsd.org> From: John Baldwin In-Reply-To: <068574a3-f63a-4830-be1d-2a8cd67c1819@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/14/23 10:34 AM, Mitchell Horne wrote: > On 10/14/23 10:28, Konstantin Belousov wrote: >> On Fri, Oct 13, 2023 at 06:27:33PM +0000, Mitchell Horne wrote: >>> +.Pp >>> +.Fn vtophys >>> +is an alias for >>> +.Fn pmap_kextract >>> +and behaves identically. >>> +.Sh RETURN VALUES >>> +The >>> +.Fn pmap_kextract >>> +function will return the physical address >>> +.Pq Vt vm_paddr_t >>> +associated with the kernel virtual address >> and 'associated'? >> >> The function returns address of physical memory mapped at the supplied >> kernel virtual address. >> > > Sure, this is more accurate. I suggest tweaking this further just to be very explicit about the type of address being returned: The .Fn pmap_kextract function returns the physical address of memory mapped at the kernel virtual address .Va va . or some such. -- John Baldwin From nobody Mon Oct 16 23:32:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLB6GkWz4whjP; Mon, 16 Oct 2023 23:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8YLB5q5Pz3Flr; Mon, 16 Oct 2023 23:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+8KNXyI1axLvTYJm+br7LFfB3/KDXweLPeH6KHcC2Lc=; b=YAWRFTS9v4xit+adh4r0+7X2ygODLLwhXDueWpTeTOSNdIR4M6YUM6jidOe2zkfHBWQESR csc5IsR4aKZdR9fdelSHi00B2ZGw26EYSD3JSqdYvvWXwRD2L+Vf7Gkg9IiOgyEgNmiRx1 9E/ocX523ZWPhB3qfLdGIKUJpIiSmzJLUbfgxBQ6qI3vIvsT33NxprA3zaer9g+WyZMIlU NX9J1NSOPdIgLpcaLRJWVH5U+AjS6myDmZ5qO0jTOE2bN71D+AUaW+NKUUsGx8GnJEZFqn UgVIE3zFCAgTD3v+pxekBYt0urjZ2OQ7IszanBXNY+/E4htAMLSpU/PWpfk7SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499138; a=rsa-sha256; cv=none; b=WFjIi4kUHfZgJ4LfMyTzyX1pp7O/VJo3L7KU2Cxn9crcL5mpQmk2GY/EH6Wk8D8RYqkOcA cG5J/i3/vxtxhf5SdPOPTavoGAxM2Iqg4RDdirqllxK4ZMJmAPK8ipvW989RKpAQiOYlXl UqFg4lzHvPPmI4xi4jJJ/CrfRU1Z2HFxWkgfHO0NS8mmv8C6HZeWPSp/ucqAjDpEvFMRcU jYljl1IHepg/z1q20fD8YU3qPQm8TIjWEMMBdDt2MhRdQ3XVZ/dD8KFwTszNvKfP1L1xEw iRQKE4fchJcw73O66XoyEmMg+2Acct2H9N4CWy8/Rya6N8FWG2ooU+glLZkQHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+8KNXyI1axLvTYJm+br7LFfB3/KDXweLPeH6KHcC2Lc=; b=j6juJcCJ6oX1oLtv7i3o3HTbfcZLnc2wwylu2YkTOpkD6yjVB2Ye4M3xq3dL1MZoZNV1E/ qq+mPeBKH+77H/4k5NV8VhOWvwqwXtzXjxzcxKCNe2D9Hxx4pVA7LIC3RNqVT2kXge6ytn gwNo4WtLGQDTwOuei/wWIPYNsRanIw7wK2lN9oheJNEBRe2nD61bkRS66PpqL1w3zLJtgl Y1+m1HsQsh6zWyHINE+AD/PqJCGxzfv4S1AMrjFxins0xMFafH6P93XwCM1js40ohYVCXW LuEmNMbWHVBXKTzyqBqFw3DPtsbPaUMNVNUsVpfBn/sUuGChnb9XB9p+yyGf8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLB4v8Vz10qH; Mon, 16 Oct 2023 23:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GNWIgM094648; Mon, 16 Oct 2023 23:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GNWIZR094645; Mon, 16 Oct 2023 23:32:18 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:18 GMT Message-Id: <202310162332.39GNWIZR094645@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ae2fc74fe76c - main - bsdinstall partedit: Avoid potential buffer overflow in newfs_command List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: ae2fc74fe76ca8b89c5ef0081ef3f4008f83de41 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ae2fc74fe76ca8b89c5ef0081ef3f4008f83de41 commit ae2fc74fe76ca8b89c5ef0081ef3f4008f83de41 Author: John Baldwin AuthorDate: 2023-10-16 23:25:03 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:03 +0000 bsdinstall partedit: Avoid potential buffer overflow in newfs_command Allocate the buffer holding the newfs command string dynamically (building the string via open_memstream) rather than storing the command into a caller-supplied buffer of unknown length. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42237 --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 68 +++++++++++++++++++------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index b1d4d0f23315..7f34819a3d4d 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -86,12 +86,16 @@ scheme_supports_labels(const char *scheme) return (0); } -static void -newfs_command(const char *fstype, char *command, int use_default) +static char * +newfs_command(const char *fstype, int use_default) { struct bsddialog_conf conf; + FILE *fp; + char *buf; + size_t len; bsddialog_initconf(&conf); + fp = open_memstream(&buf, &len); if (strcmp(fstype, "freebsd-ufs") == 0) { int i; @@ -115,21 +119,21 @@ newfs_command(const char *fstype, char *command, int use_default) choice = bsddialog_checklist(&conf, "", 0, 0, 0, nitems(items), items, NULL); if (choice == BSDDIALOG_CANCEL) - return; + goto out; } - strcpy(command, "newfs "); + fputs("newfs ", fp); for (i = 0; i < (int)nitems(items); i++) { if (items[i].on == false) continue; if (strcmp(items[i].name, "UFS1") == 0) - strcat(command, "-O1 "); + fputs("-O1 ", fp); else if (strcmp(items[i].name, "SU") == 0) - strcat(command, "-U "); + fputs("-U ", fp); else if (strcmp(items[i].name, "SUJ") == 0) - strcat(command, "-j "); + fputs("-j ", fp); else if (strcmp(items[i].name, "TRIM") == 0) - strcat(command, "-t "); + fputs("-t ", fp); } } else if (strcmp(fstype, "freebsd-zfs") == 0) { int i; @@ -153,30 +157,31 @@ newfs_command(const char *fstype, char *command, int use_default) choice = bsddialog_checklist(&conf, "", 0, 0, 0, nitems(items), items, NULL); if (choice == BSDDIALOG_CANCEL) - return; + goto out; } - strcpy(command, "zpool create -f -m none "); + fputs("zpool create -f -m none ", fp); if (getenv("BSDINSTALL_TMPBOOT") != NULL) { char zfsboot_path[MAXPATHLEN]; + snprintf(zfsboot_path, sizeof(zfsboot_path), "%s/zfs", getenv("BSDINSTALL_TMPBOOT")); mkdir(zfsboot_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); - sprintf(command, "%s -o cachefile=%s/zpool.cache ", - command, zfsboot_path); + fprintf(fp, " -o cachefile=%s/zpool.cache ", + zfsboot_path); } for (i = 0; i < (int)nitems(items); i++) { if (items[i].on == false) continue; if (strcmp(items[i].name, "fletcher4") == 0) - strcat(command, "-O checksum=fletcher4 "); + fputs("-O checksum=fletcher4 ", fp); else if (strcmp(items[i].name, "fletcher2") == 0) - strcat(command, "-O checksum=fletcher2 "); + fputs("-O checksum=fletcher2 ", fp); else if (strcmp(items[i].name, "sha256") == 0) - strcat(command, "-O checksum=sha256 "); + fputs("-O checksum=sha256 ", fp); else if (strcmp(items[i].name, "atime") == 0) - strcat(command, "-O atime=off "); + fputs("-O atime=off ", fp); } } else if (strcmp(fstype, "fat32") == 0 || strcmp(fstype, "efi") == 0 || strcmp(fstype, "ms-basic-data") == 0) { @@ -196,19 +201,19 @@ newfs_command(const char *fstype, char *command, int use_default) choice = bsddialog_radiolist(&conf, "", 0, 0, 0, nitems(items), items, NULL); if (choice == BSDDIALOG_CANCEL) - return; + goto out; } - strcpy(command, "newfs_msdos "); + fputs("newfs_msdos ", fp); for (i = 0; i < (int)nitems(items); i++) { if (items[i].on == false) continue; if (strcmp(items[i].name, "FAT32") == 0) - strcat(command, "-F 32 -c 1"); + fputs("-F 32 -c 1", fp); else if (strcmp(items[i].name, "FAT16") == 0) - strcat(command, "-F 16 "); + fputs("-F 16 ", fp); else if (strcmp(items[i].name, "FAT12") == 0) - strcat(command, "-F 12 "); + fputs("-F 12 ", fp); } } else { if (!use_default) { @@ -216,8 +221,11 @@ newfs_command(const char *fstype, char *command, int use_default) bsddialog_msgbox(&conf, "No configurable options exist " "for this filesystem.", 0, 0); } - command[0] = '\0'; } + +out: + fclose(fp); + return (buf); } const char * @@ -539,7 +547,7 @@ gpart_edit(struct gprovider *pp) const char *errstr, *oldtype, *scheme; struct partition_metadata *md; char sizestr[32]; - char newfs[255]; + char *newfs; intmax_t idx; int hadlabel, choice, nitems; unsigned i; @@ -687,10 +695,11 @@ editpart: } gctl_free(r); - newfs_command(items[0].value, newfs, 1); + newfs = newfs_command(items[0].value, 1); set_default_part_metadata(pp->lg_name, scheme, items[0].value, items[2].value, (strcmp(oldtype, items[0].value) != 0) ? newfs : NULL); + free(newfs); endedit: if (strcmp(oldtype, items[0].value) != 0 && cp != NULL) @@ -1022,7 +1031,7 @@ gpart_create(struct gprovider *pp, const char *default_type, struct ggeom *geom; const char *errstr, *scheme; char sizestr[32], startstr[32], output[64], *newpartname; - char newfs[255], options_fstype[64]; + char *newfs, options_fstype[64]; intmax_t maxsize, size, sector, firstfree, stripe; uint64_t bytes; int nitems, choice, junk; @@ -1123,7 +1132,7 @@ gpart_create(struct gprovider *pp, const char *default_type, /* Default options */ strncpy(options_fstype, items[0].init, sizeof(options_fstype)); - newfs_command(options_fstype, newfs, 1); + newfs = newfs_command(options_fstype, 1); init_allocated = false; addpartform: @@ -1142,9 +1151,10 @@ addpartform: case BSDDIALOG_CANCEL: return; case BSDDIALOG_EXTRA: /* Options */ + free(newfs); strncpy(options_fstype, items[0].value, sizeof(options_fstype)); - newfs_command(options_fstype, newfs, 0); + newfs = newfs_command(options_fstype, 0); for (i = 0; i < nitems(items); i++) { if (init_allocated) free((char*)items[i].init); @@ -1166,8 +1176,9 @@ addpartform: * their choices in favor of the new filesystem's defaults. */ if (strcmp(options_fstype, items[0].value) != 0) { + free(newfs); strncpy(options_fstype, items[0].value, sizeof(options_fstype)); - newfs_command(options_fstype, newfs, 1); + newfs = newfs_command(options_fstype, 1); } size = maxsize; @@ -1319,6 +1330,7 @@ addpartform: else set_default_part_metadata(newpartname, scheme, items[0].value, items[2].value, newfs); + free(newfs); for (i = 0; i < nitems(items); i++) { if (items[i].value != NULL) { From nobody Mon Oct 16 23:32:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLD0hY1z4whgV; Mon, 16 Oct 2023 23:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8YLC6mf1z3Fry; Mon, 16 Oct 2023 23:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IHlS5k76PpDKsHgmJpX567709ZRC3fNEthkwou15m4=; b=nR87H99Kz1uZxCeH4jSugIQnYfEyviYYbmogtEj/IrePgeOAobVSCjiQ9fegdH6oBQ1io1 EAOMHNh27XunktWUUF3w/Dai5PS9s/dI6aWaT701t2z1ZKJdNn03EtcgZAB0rW09DmmpsG cBJtlbnBXtJzGL+5vYlnwSSYqccS3W9AhuLioXISZ7N6Rvg4G2w5aa1DmiiGcC/GsEH8FP MhPY+8aJYwDuWm0n941BL/nNlHr2tou+MVQHcrcEm6Re1h5bZ7ChzxGyQG5sF+mEQzPPtk +1jlALXslik6Zr/pD92mxkY4z4cG0gCB0yJbveYoV1Iqa9Tk8RxJIHOrIt/gNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499140; a=rsa-sha256; cv=none; b=A8uE9KPQ20NHJpl+QIOJJ+PT77bI8IBMloLLLLSkUDjvOe3VNYSVkSiSUJrPvh4jr2kHDV ReY8c8pxyoie42lIc9S9St/yQYiyHU6vAlz3sU6miex2pALdF/svmarKKM1VpaQzKAbx05 gyv4cUP1ql0r9J5mDwn0bFNWXdBt2KlMMCOWKIoqS6lsmUIMuTDKKiCXvRazK795MSvRqO dKg5LZW157YucbQpzR4QzrkPtZ2Qhz7K1WMd/VWl38e1SWHtjs7TIHowYgBqpeGiV8UNxW mGXUkee5jg45RnCZ3of0tKC6VVxb3+6qGyw+aDTwDK6V5W5UFUIVNh4xRX0dgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IHlS5k76PpDKsHgmJpX567709ZRC3fNEthkwou15m4=; b=kml6q2pYul8W7rgvrq+sSvAR1GRFz8BqprpCsCtlCf2kbIRRUwFTMnBpHoa6xY4I7M/tRs y8Hxk41Iyb3+npxeL+iekJft/d188+TWHGJvXnRAl033vXC/PPmrMAGuAOSCb8hyW7284f l6waM4g2+8Q9GKhU3cRO8Y1l31KjSVcK8Cb5QczMOXiFVPgW/anhD4Gcwwbntk+tk4O60F 0M/u09oPbiw1iNE9MLIZY07XXRCcZPfOqLvZxJljLC5y9P5yfjxbgY9J2V4xpbmQKMivrU m9ovX/UbE6++MY3REp7JfZxKAC6yB6Gl3JKOj8mfOxfXi3+tQAFezSwqGHesSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLC5Xwbz118T; Mon, 16 Oct 2023 23:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GNWJcb094699; Mon, 16 Oct 2023 23:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GNWJEO094696; Mon, 16 Oct 2023 23:32:19 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:19 GMT Message-Id: <202310162332.39GNWJEO094696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 51749e05e96e - main - bsdinstall partedit: Replace malloc + sprintf with asprintf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 51749e05e96eb07134a38984a8c06608b20f07ea Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=51749e05e96eb07134a38984a8c06608b20f07ea commit 51749e05e96eb07134a38984a8c06608b20f07ea Author: John Baldwin AuthorDate: 2023-10-16 23:25:15 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:15 +0000 bsdinstall partedit: Replace malloc + sprintf with asprintf This avoids potential bugs with the length passed to malloc not matching the string written via sprintf. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42238 --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 10 +++------- usr.sbin/bsdinstall/partedit/partedit.c | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 7f34819a3d4d..7395030b26aa 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -732,18 +732,16 @@ set_default_part_metadata(const char *name, const char *scheme, } if (newfs != NULL && newfs[0] != '\0') { - md->newfs = malloc(strlen(newfs) + strlen(" /dev/") + - strlen(mountpoint) + 5 + strlen(name) + 1); if (strcmp("freebsd-zfs", type) == 0) { zpool_name = strdup((strlen(mountpoint) == 1) ? "root" : &mountpoint[1]); for (i = 0; zpool_name[i] != 0; i++) if (!isalnum(zpool_name[i])) zpool_name[i] = '_'; - sprintf(md->newfs, "%s %s /dev/%s", newfs, + asprintf(&md->newfs, "%s %s /dev/%s", newfs, zpool_name, name); } else { - sprintf(md->newfs, "%s /dev/%s", newfs, name); + asprintf(&md->newfs, "%s /dev/%s", newfs, name); } } } @@ -780,9 +778,7 @@ set_default_part_metadata(const char *name, const char *scheme, if (strcmp("freebsd-zfs", type) == 0) { md->fstab->fs_spec = strdup(zpool_name); } else { - md->fstab->fs_spec = malloc(strlen(name) + - strlen("/dev/") + 1); - sprintf(md->fstab->fs_spec, "/dev/%s", name); + asprintf(&md->fstab->fs_spec, "/dev/%s", name); } md->fstab->fs_file = strdup(mountpoint); /* Get VFS from text after freebsd-, if possible */ diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index bb2580789fe8..b6c81ad9fc25 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -360,8 +360,8 @@ apply_changes(struct gmesh *mesh) TAILQ_FOREACH(md, &part_metadata, metadata) { if (md->newfs != NULL) { char *item; - item = malloc(255); - sprintf(item, "Initializing %s", md->name); + + asprintf(&item, "Initializing %s", md->name); minilabel[i] = item; miniperc[i] = BSDDIALOG_MG_PENDING; i++; From nobody Mon Oct 16 23:32:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLF2rjnz4whxp; Mon, 16 Oct 2023 23:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8YLF0ShKz3FXq; Mon, 16 Oct 2023 23:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XdTETrB/3BNNN4kX8YV3YgzUZEHnHcT7g78JFwiiNI=; b=AYxxZveX8qvfPnck4eQcCF3znqqFcxLp0A/U34ULzkxX7U95qWeoN3bAP50uVPiF7oMrJT XaaEMRrJiLlg7lqjNXM5Tiazub0kF+fhi5GSm5ug8vMpfzO93QqYj926POdBEJMef7PwxF 9AtLEqjZe9YB3IbA9i84nIscJJ8VlqXaVXVnFn/dQCEAFdb9X9z1WTGuCfaDM43ISdvYsI k/WZ0eE0lqrngDdooBiva7Z+I5tzqI3DekQPnso71yjjno0K76e1eOhmA6W78+agA42mk1 CsHzjOwUbnwYmD2+cWZFkODzpG5sckhWF14q2OaU+MF/YwIS1wO3kNLwy0C4tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499141; a=rsa-sha256; cv=none; b=d/NzHsrwcREU1JyOi2csecsBjgLBi+l52Whh5stF8aGG4lOEwUwXProQZUTpNhjKSCYL8F OGmDlLRJFAdfTvtnaR7+rIwELccbhY4ZOZpFRhSSPK/Y6wtD+r1DdpXZxxi9PocFDOns9o 3tv3JgRK34wLr3pvG3PfJe2Jc/176nYFqd4SyJq7r8XR7boM9qH5o8Mm5iW+uxc7OfIcyY OKjf4VIxu18p9Yw3vha4QZ9Hl5GBVE45BfgAWH7+kHcJEhVzi3bL3IUVICsNZDVfOhh2rQ Zn7FGZCMVt6GPVWTfRliim2nKYa0tjiPShqzvTneWrTtlxCCopQ+MYgnF2Q3Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XdTETrB/3BNNN4kX8YV3YgzUZEHnHcT7g78JFwiiNI=; b=IdElSbV21CKacfSDN6FO79F9kMF32gsgKZVQtEbaZ6Qku/sbhWDGiSjBAEKo6A/amfetye eX+0vjX7IAYnBnLqDa659rOpqU4q82kPRdrhXJPbZjakw6PodrpJjJgT/tUmexHaqY9wK+ 0OceajeI3Pr53pqB1eoJD+FXPjvcVvDPQ7MLt0Jxr3QXrFW8jEABzGhZ9XemWD/GzwYwYm cddt75vwSnjTOiZuFFYHGwaONM+TWeoxqBT8C3AIlqJSnGfnTXlAlCnvRh5RDOhsvVip/1 hTwXnZc1IWeYfj5eZdN3jL1A2BXhN7l9m2nLXHkEfGsYl5rkK7nGk5bWk1VkQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLD68ldz118V; Mon, 16 Oct 2023 23:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GNWKVZ094762; Mon, 16 Oct 2023 23:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GNWKwH094759; Mon, 16 Oct 2023 23:32:20 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:20 GMT Message-Id: <202310162332.39GNWKwH094759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a8676bf367b0 - main - bsdinstall partedit: Use asprintf to build wrapper command for newfs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a8676bf367b099dcc97ff61031cbf4ceb5e37899 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a8676bf367b099dcc97ff61031cbf4ceb5e37899 commit a8676bf367b099dcc97ff61031cbf4ceb5e37899 Author: John Baldwin AuthorDate: 2023-10-16 23:25:25 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:25 +0000 bsdinstall partedit: Use asprintf to build wrapper command for newfs Don't abuse the message[] static buffer used elsewhere for error messages to generate the command that actually newfs's each filesystem. Use asprintf to a more aptly-named 'char *command' variable to construct the string instead. This avoids potential bugs from truncation of the command string. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42239 --- usr.sbin/bsdinstall/partedit/partedit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index b6c81ad9fc25..6a216f31161b 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -345,6 +345,7 @@ apply_changes(struct gmesh *mesh) const char **minilabel; const char *fstab_path; FILE *fstab; + char *command; struct bsddialog_conf conf; nitems = 1; /* Partition table changes */ @@ -387,10 +388,11 @@ apply_changes(struct gmesh *mesh) bsddialog_mixedgauge(&conf, "Initializing file systems. Please wait.", 0, 0, i * 100 / nitems, nitems, minilabel, miniperc); - sprintf(message, "(echo %s; %s) >>%s 2>>%s", + asprintf(&command, "(echo %s; %s) >>%s 2>>%s", md->newfs, md->newfs, getenv("BSDINSTALL_LOG"), getenv("BSDINSTALL_LOG")); - error = system(message); + error = system(command); + free(command); miniperc[i] = (error == 0) ? BSDDIALOG_MG_COMPLETED : BSDDIALOG_MG_FAILED; i++; From nobody Mon Oct 16 23:32:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLG1PVLz4whgc; Mon, 16 Oct 2023 23:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8YLG0rdWz3FqG; Mon, 16 Oct 2023 23:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxwwtkzgYnJax6oE1fLo88ZQEAgJaavBNcT/rtLSOaM=; b=DiA1zNJBGM33g45PICB43HGOyoXOMiI5VQSiomrdRycxRNze2RLQk9REvteld2aWADCNO8 MRrRQEdOvxetXZWM2O3gFu2TVhX+HIcuDAzAcKxsBBwza57QxIAHapqVyvRqsks1/3wrgV w+f07q1TdKXcFP5fY3undRcKfWzjqdirlW48JkiDKmz/j0HOnkkD0Fzvf9e89zkqhcPhe1 QARPnyiYOf35S+wHxirWhtx6/zuvN8bF8K+GUN4di40IlBNaQb+Whb/yVKY+P9Xyj40GIc JYx/dbogc2nCta51n36oGa5qxRywKVs4W8NwiZFzGUoOb6M+BvzKLReVss4NLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499142; a=rsa-sha256; cv=none; b=GdFrgdwYJ6erQSYVbWQp+x5xJkhIHQvGDi9o2pfAdawDgDZ2z7IHLAOxRlrHsI3h5TBMND /s0l8So91fkTPx9GwesPSLvsbwBGM3qU753Vqnn6V6Tt/mMZhF2G9+WgultmofAVTJ0L72 XiVOk4LNFJOFRCN1w4Wx2IWBG6m+LirhWo0JJghurMNPllcEPSLtmXrA/DGZtK3X3IATN2 qAgU1D63V9k70jpJYvyOeF4194U/arDiO9aNqI5p8z5lidmnnahYRbAwtkcL1fPWN0+Iyl QXqjKfuP+o933rphe2pQAPJfbRw5Wu+IMyvhLFnCt5FzKNLBWmS79nyaj9g6xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxwwtkzgYnJax6oE1fLo88ZQEAgJaavBNcT/rtLSOaM=; b=acFlu6ts3G9aog6EhNcdi+30yZsR+Xxtvmx5UJUBl/eCC1fPV+CggQ3djE0aj1u1mdKXZh wMsMeaeAuWoyrDBFSdghpETDgTLaYGWKcIH2hXtDroQ74/rLIKxkefcSMei2Mn58KtFabP T6Yz5yObddBCq2SknD6TGR3oCoCSCeoBbwCH3JvCngUOTImwSZMb7tx0FG88kpDPxBQsBT eATWUlL/rGpF8ikAS2BFwNIStd+TdwoMXo+2wukyQdnW5zAOwzEShOuonrGSEoTlaQ+GwK +wMFS5DnnRool03LapN4TDkt1VOYpjFuUid//JAsRrZhVE881OWrhRY4K5nQRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLF6xNzz114P; Mon, 16 Oct 2023 23:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GNWLCQ094820; Mon, 16 Oct 2023 23:32:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GNWLX6094817; Mon, 16 Oct 2023 23:32:21 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:21 GMT Message-Id: <202310162332.39GNWLX6094817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6e8bf24073a1 - main - bsdinstall partedit: Use snprintf instead of sprintf for error messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6e8bf24073a1867c4b21bd84438a8b01ce91d82d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6e8bf24073a1867c4b21bd84438a8b01ce91d82d commit 6e8bf24073a1867c4b21bd84438a8b01ce91d82d Author: John Baldwin AuthorDate: 2023-10-16 23:25:38 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:38 +0000 bsdinstall partedit: Use snprintf instead of sprintf for error messages When generating a message for a dialog box into a static buffer, use snprintf instead of sprintf to avoid buffer overflows. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42240 --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 37 ++++++++++++++++++++---------- usr.sbin/bsdinstall/partedit/part_wizard.c | 6 +++-- usr.sbin/bsdinstall/partedit/partedit.c | 3 ++- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 7395030b26aa..0bcd17950daf 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -62,12 +62,13 @@ gpart_show_error(const char *title, const char *explanation, const char *errstr) while (errmsg[0] == ' ') errmsg++; if (errmsg[0] != '\0') - sprintf(message, "%s%s. %s", explanation, - strerror(error), errmsg); + snprintf(message, sizeof(message), "%s%s. %s", + explanation, strerror(error), errmsg); else - sprintf(message, "%s%s", explanation, strerror(error)); + snprintf(message, sizeof(message), "%s%s", explanation, + strerror(error)); } else { - sprintf(message, "%s%s", explanation, errmsg); + snprintf(message, sizeof(message), "%s%s", explanation, errmsg); } bsddialog_initconf(&conf); @@ -263,7 +264,9 @@ parttypemenu: if (!is_scheme_bootable(items[choice].name)) { char message[512]; - sprintf(message, "This partition scheme (%s) is not " + + snprintf(message, sizeof(message), + "This partition scheme (%s) is not " "bootable on this platform. Are you sure you want " "to proceed?", items[choice].name); conf.button.default_cancel = true; @@ -298,7 +301,9 @@ schememenu: if (!is_scheme_bootable(scheme)) { char message[512]; - sprintf(message, "This partition scheme (%s) is not " + + snprintf(message, sizeof(message), + "This partition scheme (%s) is not " "bootable on this platform. Are you sure you want " "to proceed?", scheme); conf.button.default_cancel = true; @@ -484,10 +489,11 @@ gpart_partcode(struct gprovider *pp, const char *fstype) } /* Shell out to gpart for partcode for now */ - sprintf(command, "gpart bootcode -p %s -i %s %s", + snprintf(command, sizeof(command), "gpart bootcode -p %s -i %s %s", partcode_path(scheme, fstype), indexstr, pp->lg_geom->lg_name); if (system(command) != 0) { - sprintf(message, "Error installing partcode on partition %s", + snprintf(message, sizeof(message), + "Error installing partcode on partition %s", pp->lg_name); bsddialog_initconf(&conf); conf.title = "Error"; @@ -659,7 +665,9 @@ editpart: if (strcmp(items[2].value, "/") == 0 && !is_fs_bootable(scheme, items[0].value)) { char message[512]; - sprintf(message, "This file system (%s) is not bootable " + + snprintf(message, sizeof(message), + "This file system (%s) is not bootable " "on this system. Are you sure you want to proceed?", items[0].value); conf.button.default_cancel = true; @@ -1182,7 +1190,8 @@ addpartform: if (expand_number(items[1].value, &bytes) != 0) { char error[512]; - sprintf(error, "Invalid size: %s\n", strerror(errno)); + snprintf(error, sizeof(error), "Invalid size: %s\n", + strerror(errno)); conf.title = "Error"; bsddialog_msgbox(&conf, error, 0, 0); goto addpartform; @@ -1234,7 +1243,9 @@ addpartform: /* If this is the root partition, check that this scheme is bootable */ if (strcmp(items[2].value, "/") == 0 && !is_scheme_bootable(scheme)) { char message[512]; - sprintf(message, "This partition scheme (%s) is not bootable " + + snprintf(message, sizeof(message), + "This partition scheme (%s) is not bootable " "on this platform. Are you sure you want to proceed?", scheme); conf.button.default_cancel = true; @@ -1249,7 +1260,9 @@ addpartform: if (strcmp(items[2].value, "/") == 0 && !is_fs_bootable(scheme, items[0].value)) { char message[512]; - sprintf(message, "This file system (%s) is not bootable " + + snprintf(message, sizeof(message), + "This file system (%s) is not bootable " "on this system. Are you sure you want to proceed?", items[0].value); conf.button.default_cancel = true; diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index 5618d5ffe025..a3c5cb43ec51 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -277,7 +277,8 @@ query: char warning[512]; int subchoice; - sprintf(warning, "The existing partition scheme on this " + snprintf(warning, sizeof(warning), + "The existing partition scheme on this " "disk (%s) is not bootable on this platform. To install " OSNAME ", it must be repartitioned. This will destroy all " "data on the disk. Are you sure you want to proceed?", @@ -367,7 +368,8 @@ wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype, HN_DECIMAL); humanize_number(neededstr, 7, MIN_FREE_SPACE, "B", HN_AUTOSCALE, HN_DECIMAL); - sprintf(message, "There is not enough free space on %s to " + snprintf(message, sizeof(message), + "There is not enough free space on %s to " "install " OSNAME " (%s free, %s required). Would you like " "to choose another disk or to open the partition editor?", disk, availablestr, neededstr); diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 6a216f31161b..74606a2ef8f3 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -436,7 +436,8 @@ apply_changes(struct gmesh *mesh) fstab_path = "/etc/fstab"; fstab = fopen(fstab_path, "w+"); if (fstab == NULL) { - sprintf(message, "Cannot open fstab file %s for writing (%s)\n", + snprintf(message, sizeof(message), + "Cannot open fstab file %s for writing (%s)\n", getenv("PATH_FSTAB"), strerror(errno)); conf.title = "Error"; bsddialog_msgbox(&conf, message, 0, 0); From nobody Tue Oct 17 06:40:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8kqx1JWZz4x8cm; Tue, 17 Oct 2023 06:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8kqw6mKgz4LWn; Tue, 17 Oct 2023 06:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697524813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaMicHHhUt9q3vkJsny2Odxm55yBZz1qDqR3/T9Pzb4=; b=cMq4LMEaEfkhwKMjnzDBZMG8lyFNOQQXCYurOEPnpuiWVXzcRKUoj4EXG5iiEYzInQgym3 b9ZJ5Q7pN8qLhRe2UUY6seR1pE4fwUhisCN1e8nSuZvWvR3h32c6cOOxDkQhWwDPUb3/se mzmAd34t0DQxU6mdGdgZzBcH9a9KwJwtTW/51K2w2V3wGgnmzmeCTCK9HbTWLfbXvERTqp iTEpEh1BBzmMjUWyPGzq71HmY8+fl4ZFCfA/I1ocxL7aMAewGCF6bGMON/7P5Rv4JTH9l7 nv2bq1ExwrIbp+oBSfeAiJITRDzL9J0y3SMhZN1MZNoOi60kK976sKEvSPVAcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697524812; a=rsa-sha256; cv=none; b=M7XKUCWI2EYRXwJQEIUUhnBTBGEmqf0/N9hL5dFle9XPUE4Iq9FipJaYXOc2vNDtWZ3Z8M 2/0ZcJ6I83/TbmFnY2fui575aujHqFc8hBWMxWiWWXKL4t1vcUqlbef0sbSudhx2d3S7FU bCSt1GpD/aqK4s1CGm/IiaIkHJdsKfmHQ9pTCmbJGHGKA7C3XlauOguQfmImheI50TP1OT XMRf+oKRYe+zrbZmWJx7VW+IJkqbQ+TCA6wAmoOvTUK78Bmb6a7qGGmNzFFHC7FMI8kLB3 vchnf29kWlbiOtfC5rMAF6EoMVJeFlRyk5KM/uOyEqwjei51bjHDu/CzbeC8yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697524812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaMicHHhUt9q3vkJsny2Odxm55yBZz1qDqR3/T9Pzb4=; b=ylW5vR8Pcc1r3WBQukBXnwaCBZhirly/dXzEvAVu8aFvjYMkRXDTKuPtz8qW+bfX6ODOB4 hcyjro1m7TMD1+cc5o3aUiINUs9K/4i0XL0xiVQGl39Gakh0Cttsq7P4+jfAeJN486ye0n WfEacBCVJJhuZku5rpuzxnKrgJPSEYnqYF1/IUJDE8jyLniwSRu9Z2iBMn6S1tmvcVP9/v tPrAQ+DP+NI6MxtDZ4w3gvL0kNLCJPCyOOKqriQh7ZRmP7qxnfeSg6JljLPtsJfMPGe9FO 3G+dWFlOooIfNdwTq552pRzhHdULgv/Vqn2uZ4Xl+hgXFWImnnHLnj9Bt5uv9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8kqw5r9Rz1CFT; Tue, 17 Oct 2023 06:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39H6eCNE001160; Tue, 17 Oct 2023 06:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H6eCcQ001148; Tue, 17 Oct 2023 06:40:12 GMT (envelope-from git) Date: Tue, 17 Oct 2023 06:40:12 GMT Message-Id: <202310170640.39H6eCcQ001148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 18be782c4e5f - main - pfsync: Provide documentation regarding message version List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=18be782c4e5fcbe4d37a951a6c77c13b3c11b8be commit 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be Author: Kajetan Staszkiewicz AuthorDate: 2023-10-17 04:38:47 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 04:38:47 +0000 pfsync: Provide documentation regarding message version Reviewed by: kp MFC after: 3 days Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42235 --- sbin/ifconfig/ifconfig.8 | 7 ++++++- share/man/man4/pfsync.4 | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 1dc4c2e1b56d..bd6cbd05210e 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" -.Dd June 20, 2023 +.Dd October 17, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2886,6 +2886,11 @@ acknowledged that the associated state has been inserted. .It Fl defer Do not defer the first packet in a state. This is the default. +.It Fl version Ar n +Configure message format for compatibility with older versions of FreeBSD. +Refer to +.Xr pfsync 4 +for details. .El .Ss VLAN Parameters The following parameters are specific to diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4 index 5a1d576824e6..4decb50feb7b 100644 --- a/share/man/man4/pfsync.4 +++ b/share/man/man4/pfsync.4 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 6, 2018 +.Dd October 17, 2023 .Dt PFSYNC 4 .Os .Sh NAME @@ -113,6 +113,32 @@ dedicated to pfsync messages such as a crossover cable between two firewalls, or specify a peer address and protect the traffic with .Xr ipsec 4 . .Pp +When new features are introduced to +.Xr pf 4 +the format of messages used by +.Nm +might change. +.Nm +will by default use the latest format. +If synchronization with a peer running an older version of FreeBSD is needed the +.Ar version +parameter can be used. +E.g.: +.Bd -literal -offset indent +# ifconfig pfsync0 version 1301 +.Ed +.Pp +.Bd +Currently the following versions are supported: +.Bl -tag -width indent +.It Cm 1301 +FreeBSD releases 13.2 and older. +Compatibility with FreeBSD 13.1 has been verified. +.It Cm 1400 +FreeBSD release 14.0. +.El +.Ed +.Pp .Nm has the following .Xr sysctl 8 From nobody Tue Oct 17 07:37:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8m6b0l6xz4xC5d; Tue, 17 Oct 2023 07:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8m6Z5JB7z4QSj; Tue, 17 Oct 2023 07:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghPHCBGzCRrvzvORf5tbivK49sAs9TlttaaMrG+cD5w=; b=G5Y4DfSt9l0tmLs0XbTWeQsOK9DNqZJ7xby0mqalGsbQzUKpNfGb2z44RboMGteDINjQly 8u7h8SP6XNNWoVkIJSTJklmDQ84rNFPYI0Vij6piVT7RgFGSEmhgtuUrMNFaYFgX2Cv76U 4QkdA8Y9VOfew4OaooYDrYNK55SHUlASefTxJdiqioqj8ZbpgHMCMeopTnQQR5zz55uZfi /Am++nOV8+Tov8R8XFtep4Y0nGVcCNJg/kfm6RuqxCz9bk6bznEdy1Hzxqw9Ki1MYjhgsg 1zUQX8KRG5pdufWtWT2wG4maIKBo2AOuSDPXJEi+LqVnjLrjChh9Z+ZgTfkZeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697528278; a=rsa-sha256; cv=none; b=MnjJYk8xF0dwwZrUBvr54l9xTTmopBa9pTMaeTCQnM42Mz/JHbpCAfxMdJzw9bBBvlDG5j uHDtbUW2sk3Ml3Up7IHGz/v+uu0Lxe69OIUXRi15tu9wpdg3vdz8OCNRk6Ft/lCrGTUGWj ZMrkpOTyvXCEqMth/2jH87NxVOsWmt7R9U2qbrgrb7rF40VIJ1ykSi8S+dgRQ11CYCHn5E G9nM+NNxSjz710nz1BgMXHrRlmzc0FTaxxwe+dDn0ueDBrZ/PRmmjNhtGWGXrxu5lvUp++ 1FxoyZajyfZYWKeutTtdJ0LSMn/8ujDXzvPQz1rWUzHW76XExeMFgRJP1CROow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghPHCBGzCRrvzvORf5tbivK49sAs9TlttaaMrG+cD5w=; b=Y11jvEt/7gZyxpLkhnfkJEwFKsApKCv/ZjgsjdBF/XrC3b3FcNO4f9SoZ4ZpRkLO1Q+zW5 5+AxA37mz2kC9vXeCgSQ+silYBbk61BngiZW+fN+tyGBtcS4cFuDwjYsaFtJgQNaRx8I6l MLcmC9ft4wryxkJj9KL9K7lzNCC7bEitDjyq82MD/JFb66VvP2cbltr9sOyaxfYDNZDyp6 c67gK4wdFS8hKEr/74yLK2n+ckTD5LWZty5Td918KqOyG+DdANcODOuWso44ZZmLF+MUax q4rfynMfSifshCthbMT7LKE9H3WglLBA375fiXjN/4xBHPZKRRiWHounkKdDDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8m6Z467LzS1; Tue, 17 Oct 2023 07:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39H7bw0I095216; Tue, 17 Oct 2023 07:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H7bwUm095213; Tue, 17 Oct 2023 07:37:58 GMT (envelope-from git) Date: Tue, 17 Oct 2023 07:37:58 GMT Message-Id: <202310170737.39H7bwUm095213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1c5c7e61c85f - main - netlink: add attr parser utility functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 1c5c7e61c85fffa274119a69d69b3405848b9c82 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c5c7e61c85fffa274119a69d69b3405848b9c82 commit 1c5c7e61c85fffa274119a69d69b3405848b9c82 Author: Kristof Provost AuthorDate: 2023-10-14 10:13:30 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 06:47:46 +0000 netlink: add attr parser utility functions - nlattr_get_chara() to read a string into a char array, rather than to a char * - nlattr_get_bytes() to read an arbitrary (fixed length) byte sequence - nlattr_get_nested_ptr() to read a nested type to a struct foo *, rather than struct foo Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42221 --- sys/netlink/netlink_message_parser.c | 42 ++++++++++++++++++++++++++++++++++++ sys/netlink/netlink_message_parser.h | 6 ++++++ 2 files changed, 48 insertions(+) diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index 9ff5cdee40b4..48d712211a98 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -428,6 +428,23 @@ nlattr_get_ifpz(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void return (nlattr_get_ifp_internal(nla, npt, target, true)); } +int +nlattr_get_chara(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + int maxlen = NLA_DATA_LEN(nla); + int target_size = (size_t)arg; + int len = strnlen((char *)NLA_DATA(nla), maxlen); + + if (__predict_false(len >= maxlen) || __predict_false(len >= target_size)) { + NLMSG_REPORT_ERR_MSG(npt, "nla type %d size(%u) is not NULL-terminated or longer than %u", + nla->nla_type, maxlen, target_size); + return (EINVAL); + } + + strncpy((char *)target, (char *)NLA_DATA(nla), target_size); + return (0); +} + int nlattr_get_string(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) { @@ -457,6 +474,20 @@ nlattr_get_stringn(struct nlattr *nla, struct nl_pstate *npt, const void *arg, v *((char **)target) = buf; return (0); } + +int +nlattr_get_bytes(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + size_t size = (size_t)arg; + + if (NLA_DATA_LEN(nla) != size) + return (EINVAL); + + memcpy(target, NLA_DATA(nla), size); + + return (0); +} + int nlattr_get_nla(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) { @@ -476,6 +507,17 @@ nlattr_get_nested(struct nlattr *nla, struct nl_pstate *npt, const void *arg, vo return (error); } +int +nlattr_get_nested_ptr(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + const struct nlhdr_parser *p = (const struct nlhdr_parser *)arg; + int error; + + /* Assumes target points to the beginning of the structure */ + error = nl_parse_header(NLA_DATA(nla), NLA_DATA_LEN(nla), p, npt, *(void **)target); + return (error); +} + int nlf_get_ifp(void *src, struct nl_pstate *npt, void *target) { diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 0242177fdd26..517f3ebd49f2 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -187,14 +187,20 @@ int nlattr_get_ifpz(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); int nlattr_get_ipvia(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); +int nlattr_get_chara(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target); int nlattr_get_string(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); int nlattr_get_stringn(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); +int nlattr_get_bytes(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target); int nlattr_get_nla(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); int nlattr_get_nested(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); +int nlattr_get_nested_ptr(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target); bool nlmsg_report_err_msg(struct nl_pstate *npt, const char *fmt, ...); From nobody Tue Oct 17 07:37:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8m6c0mG6z4xC8Y; Tue, 17 Oct 2023 07:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8m6b6ZBVz4QJ5; Tue, 17 Oct 2023 07:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbJU/ng56S26ltxys9XUrRwMDoUq5pSTCqlJEDA4VvI=; b=FjYXxiujGou4BvVwwQiFxBmxOTcdcbFb4ryOsNtjrgtUUli7OQZM80UcLxRBs2z4+UFSnD 795wFAJdiRb30EP4nS6G8glVeojvnw3/4PHCWdZ4EaGIE3dnSTD0dkpTCuhQ+M12CUGdTS yf2hPLTvXq0KZ/9owlrrEO4eeXag1hn1HCUh9+3/xrq/6PCXBpNcQ9Je/ZvM37Te7/cq41 jdsMq2craJNmiH9eHZqqSVOSFkFRH9QfwLDv1u6o6ao3AS6ozLGlBpF7suGZh9rKnksC7F GGE/iUMoAGoRG5tfGnZknkQk6+zWqtyYmdWTuVjR8q4wpmbw09XpLRgnGdHTJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697528279; a=rsa-sha256; cv=none; b=nTogSR49mvhdDSID9QfJbY1TJ4bEB8nCpkm9HgLk7W4H0vY1wmITAjWpZHz6Am00A1P1KU AHO0YtLUhfyVa+nrcdTD3Tmew0Za5ozr6OpdK27N/5r/CkkJObEjxYl4j0lWfI7Ec+2In3 jSibqPmRuDgPNhL9eljcbBJHwCTEI4hkDyntLZgB6X8IDKffTjQT2NhVunZlnKFnDJv0ZC NxEoMeY+LhEMIYFkPYVk5Y0AGand9ZihhKSifmTITWlfZEXANTCcS36AQUPY1edrwtM1xr PXeOodrurBh+jZsGVnAtvn8tWS3O1nwQiYIPqvSebAUJj8yT0Zle3tQHW3b/TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbJU/ng56S26ltxys9XUrRwMDoUq5pSTCqlJEDA4VvI=; b=cHJMv5bES7/MgJHOkTfKXFFn0/Yl+3itkQJxGlmXj8Nic9zSB7LzBbJqk8dDBzqayiHRiV vYzZ3Qhnhj8fGXkLvVbEQYZK2w0h2EkG7vvThGtXivdODfwQUPInJnWh2JSBXWOqbYNfgF 1g988RIqYQtYkch6t1DJ51CRJURX70wp6ZKHIySxCentXrlAvGuPuenw9ZbZ6Lz80t0r+o QwWVTibdBMzf4Fo6qMYW+MvKz0NTTN+Q2uzlJc/HFhOg953pHRQa7kzO8BKJvGzZQupOj/ TSDz7rGGpaxY1lS/JjrZRAeG4Y4VOslk2+O2bm9pBj2CxH/FS/lLwrGC+tsVaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8m6b4xXlzS2; Tue, 17 Oct 2023 07:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39H7bxLi095265; Tue, 17 Oct 2023 07:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H7bxoQ095262; Tue, 17 Oct 2023 07:37:59 GMT (envelope-from git) Date: Tue, 17 Oct 2023 07:37:59 GMT Message-Id: <202310170737.39H7bxoQ095262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fad5734995e3 - main - netlink: descend into nested parsers when verifying List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: fad5734995e3fba428ce5e4131389c4fff0610ab Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fad5734995e3fba428ce5e4131389c4fff0610ab commit fad5734995e3fba428ce5e4131389c4fff0610ab Author: Kristof Provost AuthorDate: 2023-10-14 12:47:35 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 06:47:48 +0000 netlink: descend into nested parsers when verifying When we verify that the attributes are correctly sorted we should also try to verify the nested attribute parsers. Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42222 --- sys/netlink/netlink_message_parser.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 517f3ebd49f2..c682973d3e33 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -289,6 +289,14 @@ nl_verify_parsers(const struct nlhdr_parser **parser, int count) for (int j = 0; j < p->np_size; j++) { MPASS(p->np[j].type > attr_type); attr_type = p->np[j].type; + + /* Recurse into nested objects. */ + if (p->np[j].cb == nlattr_get_nested || + p->np[j].cb == nlattr_get_nested_ptr) { + const struct nlhdr_parser *np = + (const struct nlhdr_parser *)p->np[j].arg; + nl_verify_parsers(&np, 1); + } } } #endif From nobody Tue Oct 17 07:38:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8m6d3yNWz4xBkh; Tue, 17 Oct 2023 07:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8m6d0rDdz4QQX; Tue, 17 Oct 2023 07:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhvTLEdVPX/oVlTfwM8wQXsLXmB129kzeUJZGP3sWC0=; b=QAPUUjUrK3krgYTnVyjYJubnXLO588PU9Yf4Y/qhuLPf5p7Em4TjQ7fheApFNknHIpOyyS dHiQP7HGO02HqliQXlhgLPwn+aT3UY9OYj0kYplEuqcTeCcaj0GxxTck1MBO4Xec55+n/r +S0xu/KjzE/ch/PvPdr/p9NdDT7GTH1H1m3gh+tkoLxmQKXt0j+f3/7Ve4Y2oz+4mJex6d MujVtb7ZmUXKvb7ldK2hC9/eawPi/MKQtLON1l3sD2rGW44mevC8Qa5Wmcc2vdh+NTlfJh M3ylLaKpb+VEHhKr/rIWTzLWbcv9AGWuTgsOdnRVdxpS9WtfEoauJ+8gsAesrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697528281; a=rsa-sha256; cv=none; b=U8IoOikedaFEYOSDP8pTsAuuM0OnjPsWrkn4r96DUAY3vpdabcKT3M9F6zhdbW00HWn9Sk wcHJi2xUKNSAYkoHVNEirmnQciIunx7v+L1fSQwaFieQ+tuu5leU6G6P9frhB76sT6QANV RCjykcqWvRRIE5Lgo7rm27ROaDCDVlsk5BiAQRtQXJTF8YGS2eGxujtxdhGOqyjZMkKqA0 R6S4NJh3CgU4NUVTOcqrxjz7TiaOhopTXVa6Jn4dlDP+Vt5OEedQ66DzCapON4ydxD1v34 EZRMeDcDsTdRO6xRO2F95cUBTThtCwTAxfZU0y6j5aBmH3hJxj5N09n82bjfJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhvTLEdVPX/oVlTfwM8wQXsLXmB129kzeUJZGP3sWC0=; b=KieZOF8zKT8Fuy4btMEdHKdZllYxPZS3Tjj0PoPLph53tktftDVcjuwyL4/Cfxc1yXcDli 1ohtFBEIcFIbtd1l3MBNgIJYLSpdpq4VYQgFc0lvR775fO26yZl4fh6IRTX/ghgGf0C5VE 2+f/wmNDIYTURzO6kwmNuR28uUpcKiZa/VoVa/dOE6giWaWo/SYKi8b4D3YmWVjOcDLLTB GGiDDJrdUTOmV2Cf6ZbHp3fpt/+G95H683ZTFvBwcat1Sm7TT9YNyVefsbSrKInumfvk/k a1VYdNd4S+f5RprT+izuuilV6CEZjQzwp73VMlEHS4p25mOl8rrQlnhUyKSefw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8m6c5lhnzkb; Tue, 17 Oct 2023 07:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39H7c0V5095317; Tue, 17 Oct 2023 07:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H7c0qR095314; Tue, 17 Oct 2023 07:38:00 GMT (envelope-from git) Date: Tue, 17 Oct 2023 07:38:00 GMT Message-Id: <202310170738.39H7c0qR095314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4f8f43b06ed0 - main - netlink: cope with growing requests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 4f8f43b06ed07e96a250855488cc531799d5b78f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f8f43b06ed07e96a250855488cc531799d5b78f commit 4f8f43b06ed07e96a250855488cc531799d5b78f Author: Kristof Provost AuthorDate: 2023-10-16 09:48:57 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 06:47:52 +0000 netlink: cope with growing requests If a request ends up growing beyong the initially allocated space the netlink functions (such as snl_add_msg_attr_u32()) will allocate a new buffer. This invalidates the header pointer we can have received from snl_create_msg_request(). Always use the hdr returned by snl_finalize_msg(). Reviewed by: melifaro MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42223 --- lib/libpfctl/libpfctl.c | 6 +++--- sbin/ifconfig/af_inet.c | 6 +++--- sbin/ifconfig/af_inet6.c | 2 +- sbin/ifconfig/ifconfig_netlink.c | 6 +++--- sbin/route/route_netlink.c | 8 ++++---- sys/netlink/netlink_snl_generic.h | 2 +- tests/sys/netlink/test_snl_generic.c | 2 +- usr.sbin/arp/arp_netlink.c | 12 ++++++------ usr.sbin/ndp/ndp_netlink.c | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 51276d8bb343..571fabae4359 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -194,7 +194,7 @@ pfctl_startstop(int start) hdr = snl_create_genl_msg_request(&nw, family_id, start ? PFNL_CMD_START : PFNL_CMD_STOP); - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); seq_id = hdr->nlmsg_seq; snl_send_message(&ss, hdr); @@ -1161,7 +1161,7 @@ pfctl_get_creators_nl(struct snl_state *ss, uint32_t *creators, size_t *len) snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETCREATORS); hdr->nlmsg_flags |= NLM_F_DUMP; - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); uint32_t seq_id = hdr->nlmsg_seq; snl_send_message(ss, hdr); @@ -1309,7 +1309,7 @@ pfctl_get_states_nl(struct snl_state *ss, pfctl_get_state_fn f, void *arg) snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETSTATES); hdr->nlmsg_flags |= NLM_F_DUMP; - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); uint32_t seq_id = hdr->nlmsg_seq; snl_send_message(ss, hdr); diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index d9499d64ed13..5e3084165b33 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -355,7 +355,7 @@ in_delete_first_nl(if_ctx *ctx) ifahdr->ifa_family = AF_INET; ifahdr->ifa_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (EINVAL); nlmsg_seq = hdr->nlmsg_seq; @@ -386,7 +386,7 @@ in_delete_first_nl(if_ctx *ctx) ifahdr->ifa_index = ifindex; snl_add_msg_attr_ip4(&nw, IFA_LOCAL, &addr); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (EINVAL); memset(&e, 0, sizeof(e)); snl_read_reply_code(ss, hdr->nlmsg_seq, &e); @@ -426,7 +426,7 @@ in_exec_nl(if_ctx *ctx, unsigned long action, void *data) snl_add_msg_attr_u32(&nw, IFAF_VHID, pdata->vhid); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ctx->io_ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ctx->io_ss, hdr)) return (0); struct snl_errmsg_data e = {}; diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index bc4f77f6848d..fcd04139a8c1 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -488,7 +488,7 @@ in6_exec_nl(if_ctx *ctx, unsigned long action, void *data) snl_add_msg_attr_u32(&nw, IFAF_VHID, pdata->vhid); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ctx->io_ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ctx->io_ss, hdr)) return (0); struct snl_errmsg_data e = {}; diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index a6f52ea2a7f0..826d199d3ccb 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -171,7 +171,7 @@ prepare_ifmap(struct snl_state *ss) hdr->nlmsg_flags |= NLM_F_DUMP; snl_reserve_msg_object(&nw, struct ifinfomsg); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (NULL); uint32_t nlmsg_seq = hdr->nlmsg_seq; @@ -212,7 +212,7 @@ if_nametoindex_nl(struct snl_state *ss, const char *ifname) snl_reserve_msg_object(&nw, struct ifinfomsg); snl_add_msg_attr_string(&nw, IFLA_IFNAME, ifname); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -247,7 +247,7 @@ prepare_ifaddrs(struct snl_state *ss, struct ifmap *ifmap) hdr->nlmsg_flags |= NLM_F_DUMP; snl_reserve_msg_object(&nw, struct ifaddrmsg); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return; uint32_t nlmsg_seq = hdr->nlmsg_seq; diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index cad1c8030535..040b97568f20 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -266,7 +266,7 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs if (rt_metrics->rmx_weight > 0) snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, rt_metrics->rmx_weight); - if (snl_finalize_msg(&nw) && snl_send_message(ss, hdr)) { + if ((hdr = snl_finalize_msg(&nw)) && snl_send_message(ss, hdr)) { struct snl_errmsg_data e = {}; hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -319,7 +319,7 @@ get_ifdata(struct nl_helper *h, uint32_t ifindex, struct snl_parsed_link_simple struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return; hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -822,7 +822,7 @@ flushroute_one(struct nl_helper *h, struct snl_parsed_route *r) snl_add_msg_attr_u32(&nw, RTA_TABLE, r->rta_table); snl_add_msg_attr_ip(&nw, RTA_DST, r->rta_dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (ENOMEM); if (!snl_read_reply_code(ss, hdr->nlmsg_seq, &e)) { @@ -869,7 +869,7 @@ flushroutes_fib_nl(int fib, int af) rtm->rtm_family = af; snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (EINVAL); } diff --git a/sys/netlink/netlink_snl_generic.h b/sys/netlink/netlink_snl_generic.h index 1324cf3da17a..0a2913c9155e 100644 --- a/sys/netlink/netlink_snl_generic.h +++ b/sys/netlink/netlink_snl_generic.h @@ -106,7 +106,7 @@ snl_get_genl_family_info(struct snl_state *ss, const char *family_name, snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, family_name); - if (snl_finalize_msg(&nw) == NULL || !snl_send_message(ss, hdr)) + if ((hdr = snl_finalize_msg(&nw)) == NULL || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); diff --git a/tests/sys/netlink/test_snl_generic.c b/tests/sys/netlink/test_snl_generic.c index f3c11daf19e1..d84d3f88f487 100644 --- a/tests/sys/netlink/test_snl_generic.c +++ b/tests/sys/netlink/test_snl_generic.c @@ -86,7 +86,7 @@ ATF_TC_BODY(test_snl_get_genl_family_groups, tc) snl_init_writer(&ss, &nw); hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, "nlctrl"); - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); snl_send_message(&ss, hdr); hdr = snl_read_reply(&ss, hdr->nlmsg_seq); diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c index 40b5367f330d..d78f380af04b 100644 --- a/usr.sbin/arp/arp_netlink.c +++ b/usr.sbin/arp/arp_netlink.c @@ -63,7 +63,7 @@ get_link_info(struct snl_state *ss, uint32_t ifindex, struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -116,7 +116,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, struct in_addr addr) snl_add_msg_attr_ip(&nw, RTA_DST, (struct sockaddr *)&dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fibnum); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -148,7 +148,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, struct in_addr addr) snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -285,7 +285,7 @@ print_entries_nl(uint32_t ifindex, struct in_addr addr) ndmsg->ndm_ifindex = ifindex; } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss_req, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss_req, hdr)) { snl_free(&ss_req); return (0); } @@ -355,7 +355,7 @@ delete_nl(uint32_t ifindex, char *host) } snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } @@ -422,7 +422,7 @@ set_nl(uint32_t ifindex, struct sockaddr_in *dst, struct sockaddr_dl *sdl, char snl_end_attr_nested(&nw, off); } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index 954d16995b5a..79bdec2356d0 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -76,7 +76,7 @@ get_link_info(struct snl_state *ss, uint32_t ifindex, struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -152,7 +152,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 * snl_add_msg_attr_ip(&nw, RTA_DST, (struct sockaddr *)dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fibnum); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -184,7 +184,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 * snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -327,7 +327,7 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) ndmsg->ndm_ifindex = ifindex; } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss_req, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss_req, hdr)) { snl_free(&ss_req); return (0); } @@ -421,7 +421,7 @@ delete_nl(uint32_t ifindex, char *host) } snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)&dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } @@ -493,7 +493,7 @@ set_nl(uint32_t ifindex, struct sockaddr_in6 *dst, struct sockaddr_dl *sdl, char snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)dst); snl_add_msg_attr(&nw, NDA_LLADDR, sdl->sdl_alen, LLADDR(sdl)); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } From nobody Tue Oct 17 09:05:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8p3Y628jz4xHB7; Tue, 17 Oct 2023 09:05: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 4S8p3Y291xz4Z71; Tue, 17 Oct 2023 09:05:29 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 39H95Gji024622 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 17 Oct 2023 12:05:19 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 39H95Gji024622 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 39H95F7L024620; Tue, 17 Oct 2023 12:05:16 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 17 Oct 2023 12:05:15 +0300 From: Konstantin Belousov To: John Baldwin Cc: Mitchell Horne , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 74e4a8d208f0 - main - pmap: add pmap_kextract(9) man page Message-ID: References: <202310131827.39DIRXsu082741@gitrepo.freebsd.org> <068574a3-f63a-4830-be1d-2a8cd67c1819@freebsd.org> <527ab884-ce06-4325-52a6-7c6dec1af563@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <527ab884-ce06-4325-52a6-7c6dec1af563@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.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) 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: 4S8p3Y291xz4Z71 On Mon, Oct 16, 2023 at 03:54:32PM -0700, John Baldwin wrote: > On 10/14/23 10:34 AM, Mitchell Horne wrote: > > On 10/14/23 10:28, Konstantin Belousov wrote: > > > On Fri, Oct 13, 2023 at 06:27:33PM +0000, Mitchell Horne wrote: > > > > +.Pp > > > > +.Fn vtophys > > > > +is an alias for > > > > +.Fn pmap_kextract > > > > +and behaves identically. > > > > +.Sh RETURN VALUES > > > > +The > > > > +.Fn pmap_kextract > > > > +function will return the physical address > > > > +.Pq Vt vm_paddr_t > > > > +associated with the kernel virtual address > > > and 'associated'? > > > > > > The function returns address of physical memory mapped at the supplied > > > kernel virtual address. > > > > > > > Sure, this is more accurate. > > I suggest tweaking this further just to be very explicit about the type > of address being returned: > > The > .Fn pmap_kextract > function returns the physical address of memory mapped at the > kernel virtual address > .Va va . > > or some such. There are two larger things that are worth adding to the man page, IMO. 1. pmap_kextract() is safe to be used from any context (in particular, it does not do any locking internally) 2. it is caller duty to ensure that the active mapping is alive and stable long enough for the answer to be useful From nobody Tue Oct 17 13:37:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4t6MNTz4xWT0; Tue, 17 Oct 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w4t5qm8z3FXD; Tue, 17 Oct 2023 13:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quYSNTQ9dXByehhoDrCX4NN5Pzg/xghLQumsw3i95D8=; b=FMfquHYPNFqkn3P7gb6jwRgzBey9a7QH6dDsQTV9c4LeQt1Kuc2iYWwmmYTKGynltqYfRP x4SDwcAUwQ46XJNF9N14DtX0FMeh+nZLDMBpxbqsJuwpOoWJrYcmt0Iz2TUQYlP9aQmLVa cncRqOVrzb32odMHU4Ti8o8e+XEGAfM4zlbNH4eGSKxLyRVWOZQ3LzJUdiQQvX74w2bFA+ oQ90UJNc3eXxU66qwhGztyd4/v/BPQoYWW+T1wSBtTleAJ1wRAuUOTyrYLX/wtmMr/a6Qj W+CInA5pZ/O5EpynCRvpOJJtoTmYnxo8QLmy/nU4p8A714ABR8GdoWw4MlHtzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549822; a=rsa-sha256; cv=none; b=naPAHtca2LohOwjnVuv9Hg60mpaCxn686B1OOCFxI3ghL8SyeHpBepTDekwPE4DpcUMjgf Q+DnFzbmrLswU+Pabca4Q5wiN3m+la2gn+MFttJ6LX59/MOEeH5qUJWAPU6xDcQrfXuOpR C/ht8gHGbOTGcwfqY51Ec8cFodRMA6r6BeirB3kKB4Bnh3/CApFKrjYSSp3cF09iOWrKei f+U9cGSYf3z1mDP+DPJhvX05sl5AR6DVsIvrJ8DRZulBWWFDBoU65QA0ilqK7ERArZeDlV HuDSHLrbithOs3eiKW8iZeYyh/ClAY/9Vpjma2uFM2GQCKlSSRFdHlDL93PDtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quYSNTQ9dXByehhoDrCX4NN5Pzg/xghLQumsw3i95D8=; b=NyxXAuKKetGYmGzNPCH2wQnaBEUs24Ea++2fIsnvustDVLGk+2hgW0sDNtCapMdqC8bGKx pOhYQvIUR5+QLI0T0XlHSUkoN+obTdbdZaHYqADpgLH8NPfnKaAQh1q8WTxDQZB1RUW1Ij ygFr1g9Xrai2uBrptD9M/lERqWxAd9mD1GRshG0QspazbQIwVElADEoAf99EdeL/R5ivrr K+ZsNWW4V94sQmxgwNi1qXiBXqGpDbC2oGPIi/1+ReWkJhAdtxbQBMzltwp59KAXhLC3im 8RyVBqo2jyYA6fE2kRpp9ReKdPLvuoNKyW6YKqRDqErFB8VWKyR4z8maRd+Pvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4t4t63z9r3; Tue, 17 Oct 2023 13:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb2Z3095599; Tue, 17 Oct 2023 13:37:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb218095596; Tue, 17 Oct 2023 13:37:02 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:02 GMT Message-Id: <202310171337.39HDb218095596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7123222220aa - main - witness: Unconditionally initialize out-params for witness_save() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 7123222220aa563dc16bf1989d335722e4ff57a6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7123222220aa563dc16bf1989d335722e4ff57a6 commit 7123222220aa563dc16bf1989d335722e4ff57a6 Author: Mark Johnston AuthorDate: 2023-10-16 17:23:40 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:05:45 +0000 witness: Unconditionally initialize out-params for witness_save() As of LLVM 16, the -fsanitize-memory-param-retval option is set to true by default, meaning that MSan will eagerly report uninitialized function parameters and return values, even if they are not used. A witness_save()/witness_restore() call pair fails this test since witness_save() may return before saving file and line number information. Modify witness_save() to initialize the out-params unconditionally; this appears to be the only instance of the problem triggered when booting to a login prompt, so let's just address it directly. Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. MFC after: 1 week --- sys/kern/subr_witness.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index d4ab085197f4..5b9f8afd9565 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -2362,6 +2362,10 @@ witness_save(struct lock_object *lock, const char **filep, int *linep) struct lock_instance *instance; struct lock_class *class; + /* Initialize for KMSAN's benefit. */ + *filep = NULL; + *linep = 0; + /* * This function is used independently in locking code to deal with * Giant, SCHEDULER_STOPPED() check can be removed here after Giant From nobody Tue Oct 17 13:37:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4w09GGz4xWhg; Tue, 17 Oct 2023 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w4v6m7Dz3FMK; Tue, 17 Oct 2023 13:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PeX+Ph75PjUS0S/l2vFsgkCfjD+6CeQAaFZvFI4kzE=; b=Sie367JI0Mm2XpbR51AyXmXAVCyik7MCkMeidlxqhRsyGBfO/d/zb+30J6B9zmmru6NktO pguRKUfXzH+9Hy6EL5lD8FKyNCBI+wNi7aj1utkp4h2CP+rU/Vjt2SbDWHrI9u5kl5ohwD VzH6Y2SUW7qLmTSYek7jO5akyIu5yS+YrDj4pPoCreHNuIZMBIQSUjx2hZRnOK6ejOhvcx afAcbwCRS2QAUQ2jt8LN6VFv4jGX9/t0t2giFVqLO10pYMmgx3t5Oh5n//XaXI2EYPWUA8 xiZ/I7lFLe6nlThHvq3pTv37yhrDC6WPkMajCNMYMvbg8sJCdlhZBwotP8EQbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549823; a=rsa-sha256; cv=none; b=YDOc7PQBOl2eIGMeWggv2owBlkX96v0r9QB0eAmzo5+mXhsFxfro+AXyOim4oU3+JBYk7I WREZwHDOf1x9VsGtYmqEa3Y1fSbqd7PAev7CypCOD1yWn94Twtvk3enuB4WIOqgytbZrxn fm4UxvBDthxNM8OJoIpsInke4TvEM0YVK3tCaHd0/BUzWHtZr4GXpTP0u3x3CFHgnDZAbx L07v2FKO6A2ijhEilfbEJzCTxtBsHYc+2n/l+nBvcrAFWJsvfu8sd3rWig3JcVkUgqPqak JIr0pmuMOOZ6VMhN9qX9YJjcZThJ+mbVEnmh9FMnwzoEo3ZK5FrhqYgQLJerxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PeX+Ph75PjUS0S/l2vFsgkCfjD+6CeQAaFZvFI4kzE=; b=I3uHvlM+bMChOMgDFc0wBX2ncnsnYfO26+ncY2cZmhoGcf5uevacQvVkDsKrHxNdqzVjH3 Z0YUGiul/SXLHOhhprlGcHd5gzUimuZwXs0BhxF6FN2Kszuz3lrKqlMIT1k1qJaJ1zSbFE lcKu48HKSnW5DF25MCltGAqOpi0wYnadpyeykcdMi3fsX5cXLOVTtYbR3vcXw2WHPgCKm7 YsdB4e/ZLotT226yA8zDJrqRF4jeutnJHiA8p6mjwtVaxHM7JLUJ4ON3t34Ud6uWR+5+Bq jcdoKO1QsdZX9HgsZkR7TjoNoZ2vhV/htD1fXUY37PsiiQKJB9Ikq9HaolOgEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4v5sy2z9hn; Tue, 17 Oct 2023 13:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb3q5095647; Tue, 17 Oct 2023 13:37:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb35s095644; Tue, 17 Oct 2023 13:37:03 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:03 GMT Message-Id: <202310171337.39HDb35s095644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e5caed14067b - main - kmsan: Use __builtin_memset to initialize per-thread state List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: e5caed14067b40f1454d74e99789a28508d0eea3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e5caed14067b40f1454d74e99789a28508d0eea3 commit e5caed14067b40f1454d74e99789a28508d0eea3 Author: Mark Johnston AuthorDate: 2023-10-16 19:37:19 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:05:45 +0000 kmsan: Use __builtin_memset to initialize per-thread state Accesses to KMSAN's TLS block are not instrumented, so there's no need to use kmsan_memset(). No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- sys/kern/subr_msan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 54948370a14a..f8fdcf478b79 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -452,7 +452,7 @@ kmsan_thread_alloc(struct thread *td) sizeof(int)); mtd = malloc(sizeof(*mtd), M_KMSAN, M_WAITOK); } - kmsan_memset(mtd, 0, sizeof(*mtd)); + __builtin_memset(mtd, 0, sizeof(*mtd)); mtd->ctx = 0; if (td->td_kstack != 0) From nobody Tue Oct 17 13:37:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4x24yQz4xWfh; Tue, 17 Oct 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w4x0gCtz3Ff6; Tue, 17 Oct 2023 13:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxgVXk982FwBRgHrOzWxTzjmqjMi7m06+Wt48lgLPS8=; b=mEKLZvib/3S2ewTzV0FxLPgvRYHi3ZbdDzbdqGr7Z3eBytCpTQOBN3QZ1aFyBvITidzvkP 4/xWUV8i7na60fwFCNkPixMnWHyanIr9u37/qKC8Taak7vCORaRYXvldPqAMmHKSXFxW3C sBWhfdx8Fo6URZq43+OipcgPNiwJ6D6bdL8vbPN3RHx6TAp+yHq1C/8LVz89hQHIEcYNlB /FI7422RjyLUw8nJc+Zb+Syh6tj7a204d7LRvNKcd/G76CjV6HleLdRHfspDEy5FabBkTd E9c/3IkkEcHoDt8F9hGs1GKzcvnqYf3fugzgE/j1fqbfeb1VnzqWwt6FXx/uIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549825; a=rsa-sha256; cv=none; b=K7XHLeyEAdUB9HDqHnBSDCF3Z+ey1T5Ds9kmtnj6or/bwueNZ5LcKv3E+VJFgZlAuITTJ4 7GeKxN+ePrhd0/4rm8WPhz5bSiql+RstgnXWi2fYy6BSHk/s8eVMfXZ6W9AihT7bzeTser A+78pEPigag0ZyaOYjwU2xa2UaCfFhPEpm7ERafbLNMsgK1ZUwHAJl1gfJz5wGZ+w0sbOz lEtEiWWNaYz2nP/lzbQqWmVNzgwYWQiR4OcMcouX6/G4ZRm1M0UEQw3TlO7x6KW2Z2bMQB 15inSeDwbnaT9XyEH4EsbnuPefTV5Tr2968q+hO/vq3lk4Ov+LGLJJmbrnc6sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxgVXk982FwBRgHrOzWxTzjmqjMi7m06+Wt48lgLPS8=; b=mFQFpvixKKM3J5hovPuLnNeHnsL+SUcxVrQw9O561RjonBjnG72BXj3O3MIz9YHpqXsMur KnbgHW7RUCe2BjR6JncPF8lb399IuOxApxOk0HqzOKu2NUclw/3hhZybf1ROFetgW3A0J8 wpVFLetb407oAagpQgKHyJdV5XDOJ/zYrrq/y0SH47H+7BN3pj80Hwe201MNcv/wyjVEDw CAhYsqiUh9eXoiI6VAsWQc0Ys64uiVqWW4ZuNfYxH0ccfT4dAEPqm+nC+lSwNbJjpRCAmP Hj8B6zVhzXpomfRmB5jIFKoXDaa5JO+8sMJ//ZsQxtnWBtW64kijg8FWZ2eEKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4w6sBkz9hp; Tue, 17 Oct 2023 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb4Nd095689; Tue, 17 Oct 2023 13:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb4Xp095686; Tue, 17 Oct 2023 13:37:04 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:04 GMT Message-Id: <202310171337.39HDb4Xp095686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b6c653c97463 - main - kmsan: Set -fno-sanitize-memory-param-retval for now List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b6c653c9746342b373af01979319b3cb123b2872 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b6c653c9746342b373af01979319b3cb123b2872 commit b6c653c9746342b373af01979319b3cb123b2872 Author: Mark Johnston AuthorDate: 2023-10-16 19:45:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:05:45 +0000 kmsan: Set -fno-sanitize-memory-param-retval for now As of LLVM 16, -fsanitize-memory-param-retval is the default. It yields significantly smaller code, but the KMSAN runtime interceptors need to be updated to stop checking shadow state of parameters. Apply a minimal workaround for now. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- sys/conf/files | 2 +- sys/conf/kern.pre.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index dc837eb02c06..8c3bdca61905 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3872,7 +3872,7 @@ kern/subr_mchain.c optional libmchain kern/subr_memdesc.c standard kern/subr_module.c standard kern/subr_msan.c optional kmsan \ - compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}" + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fstack-protector*}" kern/subr_msgbuf.c standard kern/subr_param.c standard kern/subr_pcpu.c standard diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 4d37cd4156f0..158175eb6899 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -122,8 +122,11 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kcsan \ KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo .if !empty(KMSAN_ENABLED) +# Disable -fno-sanitize-memory-param-retval until interceptors have been +# updated to work properly with it. SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kmsan \ - -fsanitize=kernel-memory + -fsanitize=kernel-memory \ + -fno-sanitize-memory-param-retval .endif KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo From nobody Tue Oct 17 13:37:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4y286Hz4xWNZ; Tue, 17 Oct 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w4y1h6Pz3FmM; Tue, 17 Oct 2023 13:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9oOjgKnE3+I/Q9Zy3ViLHo5gNHJ4ZLG0FJoljmFxwgE=; b=N4Va8yKaicDvB1swl864xR+smv4fgOhzvc5HgDEqJmM+Qm0lXmhLTj7UAXYt3NSwoUWig5 WM4RIXqCyM5uqTid1GrE0TUiEjXNPLX26RaHZCykphuLUxgvjDD7R7IY6KUJrKn+d+yVPi EgiuZ/W9pkuxLKsa3ZIcOs0cQzSFoPAxxIttoW4v9o3R9+eDIourOwQP+W6/yBosjbu0I5 UiRcF/VP4XOmNWnJJRPnCSYTpy75CZC6JrrFm33fqSSqh1BZFnF8nG5bl1nUFtVc31HSv5 UcvEw1xMZoh/WrCEV7hAMwX8UJxYUVtaKzgRrNtBYwaXqyPb+lThLYaBcSjLCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549826; a=rsa-sha256; cv=none; b=xs/8adL7L3lNp3Qba2jBjVIo9i+evh2vmJ+7BC6J0zXNAuUNfoLUOBySvKGskTJDQ424P2 cPT9hLo5TAEeqCTqvdPA9iqFvcqbORNl+26qhlTX/F5SRBdycnXEpXeYcK7YSXRwFGH6Zg k9Wbi22SHgJMGD+6kkIhmF+XdnbVaEP3F3W/MqCukGr/6jfZOdyvMiI5UOX/N9pslCqeOP mX0FodgDZ4ulydCutUXjq4QKIj5/2MNI8oGx3ZyaVFMgXDC5R1BkZKjCKRAdmPlf/whe9N giSYIbaqukA1egqNfWYLw/DwkH/Jd1+9PjKPGzuRAo1C8N/dUtD552qtUBoZQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9oOjgKnE3+I/Q9Zy3ViLHo5gNHJ4ZLG0FJoljmFxwgE=; b=CypOVB66wj5OHlwmBKIFVDsYzpqpjsPNHQ11o2rj2H4x7FP23D+ijf/X339401BXxJ/wKK 91/yqDEKK5RRziptdmCT/eX2NQ1suqBnRekRwOu5lmk/ZfW1KPq4PAywZvIl4+nMTtQ+vF OAk9DS1Szgf0clXFors9TxNSWvUc5IHEJWLTL3tEyUbR0+GcVBISjrQS7n4thM/o13SYDY YJXJSvxJ3ZsE5Bcqg60IGQ82OVZLsf0YHMgaSRtCIY1t0BIsWO6RABhKRShrLQmbLfT41r T4GDAD5nn7tknBInasPBRu0aNeypHd00WBNT+B3lb0RUs/FINUOSUVwrt8eojA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4y0kFVz9Q5; Tue, 17 Oct 2023 13:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb6Fx095731; Tue, 17 Oct 2023 13:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb67k095728; Tue, 17 Oct 2023 13:37:06 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:06 GMT Message-Id: <202310171337.39HDb67k095728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a37e484d0497 - main - amd64: Zero-fill AP PCPU pages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a37e484d049758c70f2d61be0d28a115b6f2f01e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a37e484d049758c70f2d61be0d28a115b6f2f01e commit a37e484d049758c70f2d61be0d28a115b6f2f01e Author: Mark Johnston AuthorDate: 2023-10-16 22:40:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:08 +0000 amd64: Zero-fill AP PCPU pages At least KMSAN relies on zero-initialization of AP PCPU regions, see commit 4b136ef259ce. Prior to commit af1c6d3f3013 these were allocated with allocpages() in the amd64 pmap, which always returns zero-initialized memory. Reviewed by: kib Fixes: af1c6d3f3013 ("amd64: do not leak pcpu pages") MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D42241 --- sys/amd64/amd64/mp_machdep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index ec4501c3aeed..d506ffada4b9 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -300,11 +300,12 @@ amd64_mp_alloc_pcpu(void) m = NULL; if (vm_ndomains > 1) { m = vm_page_alloc_noobj_domain( - acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), 0); + acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), + VM_ALLOC_ZERO); } if (m == NULL) #endif - m = vm_page_alloc_noobj(0); + m = vm_page_alloc_noobj(VM_ALLOC_ZERO); if (m == NULL) panic("cannot alloc pcpu page for cpu %d", cpu); pmap_qenter((vm_offset_t)&__pcpu[cpu], &m, 1); From nobody Tue Oct 17 13:37:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4z3J8Hz4xWnl; Tue, 17 Oct 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w4z2bnkz3FnS; Tue, 17 Oct 2023 13:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4FYlXDS0Q2AbcG5PjbgGodc2JToTOXxmKmum7IFsng=; b=dAKIkxkvyQhr8bi1s11HbcnESTxmekMf13r7XZ0JQSkuZLUdSepBcppmlRnaSC4eGfNA2d +R6i99/9w9xmrAu1XMaaLJ9cKhVPBibgFQakeVyONuxMet4d3ehsjlxIJeeqx31hEnAPRL uySJlC5FjoM046NgTFOLld6clJ3Zq0zE2C55CAJMDOKYoK4OQm/6Mx2ejY51oB3sphjuY+ sVAG6uUskHMEEyFZPmbHVI6UlzehSChAK8nW+p0Lg7aW0Eo+DnTgR997X8cE7jG3RyM4wJ SyIoYoGHLk+3yvxmZdjs3Ve8fFXDgOIvTFnkFbsf2lOoMSSk4WPSz6mSPz8r9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549827; a=rsa-sha256; cv=none; b=XI8DUGWS/FnpaEHZ46JcURlr9bo78NE3oxvg82qoJTtEa61/6eFThy9P3Z8hdHYMmHteVB NQa/HY5lVYdXUlbz7PyvJ8sx2GACexjuK+ve+Cs8YObVx760tGhgl4uRG2g/wN317zQ09m jwW8Dgpuxuq/mTvgXkYRHgAerZSVOvROA+/dK37bA3OULbte772768AR8X6bz9jNktJl6w m43mAXodR3inp+Y5inW1rFwu6cD3r30Qi5brv5f9MdGjr1oAMJiIsNHFlAHVvzqntOU0eU tTNpCWCcbDoWNVvKib42q+YWGRlkHKa7sqxIhuZYp1q5f+oCL7KIvGLqbYXk3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4FYlXDS0Q2AbcG5PjbgGodc2JToTOXxmKmum7IFsng=; b=QvHBMwMzc7AAaLo9CKneZr031JiQ3Jqala9DB4mSgOQJ4mwwEv4GcIIC3ne5rK3GUXY/dZ HnYOb9Xigy5Uxw3DjZj08KfjBBaChTQSR55aO7XjglL0d3xyII5qytg+HW94EBYZpBFa+P L+ZPBry6markdW7ZwLZkgBxInsNu1WBa4AVT+/E1x2IAsD95AVEwEA6iRYdMdMvgr6wnKm /P0QZQ8RIAY5/zRdmQm8WzjlawnSw+f+JMHukztLg/68/MBCkMzg282whE6IQfj9bYFy5V MtGitJukojH5eXjy/2RbXRLffIy6g4/l/JF5oOyV5jFaAANQ4TvkODhYAsxeLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4z1hZczBGj; Tue, 17 Oct 2023 13:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb7w2095783; Tue, 17 Oct 2023 13:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb76r095780; Tue, 17 Oct 2023 13:37:07 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:07 GMT Message-Id: <202310171337.39HDb76r095780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 761ae1ce798a - main - ktrace: Handle uio_resid underflow via MSG_TRUNC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 761ae1ce798add862d78728cc5ac5240ce7db779 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=761ae1ce798add862d78728cc5ac5240ce7db779 commit 761ae1ce798add862d78728cc5ac5240ce7db779 Author: Mark Johnston AuthorDate: 2023-10-16 20:11:55 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:19 +0000 ktrace: Handle uio_resid underflow via MSG_TRUNC When recvmsg(2) is used with MSG_TRUNC on an atomic socket type (DGRAM or SEQPACKET), soreceive_generic() and uipc_peek_dgram() may intentionally underflow uio_resid so that userspace can find out how many bytes it should have asked for. If this happens, and KTR_GENIO is enabled, ktrgenio() will attempt to copy in beyond the end of the output buffer's iovec. In general this will silently cause the ktrace operation to fail since it'll result in EFAULT from uiomove(). Let's be more careful and make sure not to try and copy more bytes than we have. Fixes: be1f485d7d6b ("sockets: add MSG_TRUNC flag handling for recvfrom()/recvmsg().") Reported by: syzbot+30b4bb0c0bc0f53ac198@syzkaller.appspotmail.com Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42099 --- sys/kern/uipc_syscalls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 2dad9d487290..c7c2e6544902 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -948,7 +948,8 @@ kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, AUDIT_ARG_SOCKADDR(td, AT_FDCWD, fromsa); #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = len - auio.uio_resid; + /* MSG_TRUNC can trigger underflow of uio_resid. */ + ktruio->uio_resid = MIN(len - auio.uio_resid, len); ktrgenio(s, UIO_READ, ktruio, error); } #endif From nobody Tue Oct 17 13:37:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w503Z2Cz4xWnx; Tue, 17 Oct 2023 13:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w5035F3z3Fww; Tue, 17 Oct 2023 13:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rg8W7BP5pvV7t00mCCCmgz3sdPzc5M9D6J+djyCRDyc=; b=YD00NUPkayxyUAShJRAP6MkQdCU/RxQKHjbGzUhmY1k0K0LaAS0m5bhhYu1jsubuFWbJ2H Uji+/FlHKzkKWnxV0fPUGTROV7dC2V+JFJ+Zs6YUMQWQEx/+9h6Jr90mdKsX4avcvPNIh5 70aH4qtTGM6mtTxNw2EHcDqndZDoXKqpBEA3Xgv/C+l8PMBuU5g63d0AzMT+Wc5Ii3UWIq ZT8GD+/mEsDAY/OYOmEP4PGCuqdEOfVWLWXUrBWI/MewNNwbu5/DMLOm5DBm3ByXyQ4LPS nil/Jmu5RhdU5wyb6snhs3vZGGpGjuLZgglYezYAZCnKIYsv2R+QtlxeO+VpjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549828; a=rsa-sha256; cv=none; b=svy67dimeFAgEHDjcOAJJIIaMbkhwNaGjD+bvQLen8IQShxZN0Ff8pP6GeLyCUNVorPlHA 64EPawg+y3YOx4+g7E034e6XH2Qy0vTShR1rXe8ogCgf7rGRUUV7lWokBe8pM0Aun5fECk DQIcP5Yl+6NMYQTQ70lZlh1udZG9pAxwIyQyS4AT86TmmkBLxw8m3jNpMI+mhttQgQ8vOV 2Wd4ukfH/B/wxOod2mtDPz9t086j7ffW+IhvKZBkzP94dE7j3Upf0NvaRtj+ZLTaWYeACz GpDr29781AuRfbfEwYpXTMw5XexsNbBuNzWcn5gwoVksurcbyIjEMPutKeyfPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rg8W7BP5pvV7t00mCCCmgz3sdPzc5M9D6J+djyCRDyc=; b=NRNr9fkB+PMm3/XVTpueyJxg1vTrVO+3NTgxG7NZmdrNG7qWTiGmFAkFIwg5JClurDKvvE K5X1EpTywUhfR9ClSoLRtiDNJtpeUazmxq3+CKdf/iFZBaXWgkybAcbYjOUST4XtIdMvcC 1+oGq3fmyWA9qsCYSlZG8cvPCGccNOM19pA6bHA0GdEhK9/ITkL1zABea71QhQOC6dMAyK 3RblAyo8m/o/nSakR4bGxPvplaO3mYDif5TmMpsKmhQnSCnltQES+UzbS4TV7uOl9p0Nsx 8YzBoe2OEs4yTG66EFbg7jBBmwURHTurJkjj5vyHFi+tGhsQ9fZ2nTJDf8mvOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w5029B5z9hq; Tue, 17 Oct 2023 13:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb8m2095822; Tue, 17 Oct 2023 13:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb8oW095819; Tue, 17 Oct 2023 13:37:08 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:08 GMT Message-Id: <202310171337.39HDb8oW095819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8fd0ec53deaa - main - uiomove: Add some assertions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 8fd0ec53deaad34383d4b344714b74d67105b258 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8fd0ec53deaad34383d4b344714b74d67105b258 commit 8fd0ec53deaad34383d4b344714b74d67105b258 Author: Mark Johnston AuthorDate: 2023-10-16 20:12:37 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:19 +0000 uiomove: Add some assertions Make sure that we don't try to copy with a negative resid. Make sure that we don't walk off the end of the iovec array. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42098 --- sys/amd64/amd64/uio_machdep.c | 6 ++++++ sys/arm/arm/uio_machdep.c | 6 ++++++ sys/arm64/arm64/uio_machdep.c | 6 ++++++ sys/i386/i386/uio_machdep.c | 6 ++++++ sys/kern/subr_uio.c | 5 +++++ sys/powerpc/powerpc/uio_machdep.c | 5 +++++ sys/riscv/riscv/uio_machdep.c | 6 ++++++ 7 files changed, 40 insertions(+) diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c index f3e80addc92c..67e14d8e0d12 100644 --- a/sys/amd64/amd64/uio_machdep.c +++ b/sys/amd64/amd64/uio_machdep.c @@ -71,10 +71,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c index 07531f76217b..18661ebd1652 100644 --- a/sys/arm/arm/uio_machdep.c +++ b/sys/arm/arm/uio_machdep.c @@ -72,9 +72,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm64/arm64/uio_machdep.c b/sys/arm64/arm64/uio_machdep.c index f9e4e7a9547f..4fdcaf74890c 100644 --- a/sys/arm64/arm64/uio_machdep.c +++ b/sys/arm64/arm64/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c index 07d71eac5db6..92e067b35bed 100644 --- a/sys/i386/i386/uio_machdep.c +++ b/sys/i386/i386/uio_machdep.c @@ -71,9 +71,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index 21a1f044db54..b0c4a256cd17 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -216,6 +216,8 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) ("uiomove: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); if (uio->uio_segflg == UIO_USERSPACE) { newflags = TDP_DEADLKTREAT; @@ -234,6 +236,9 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) } while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c index 679139a96e99..5de2dd8b416b 100644 --- a/sys/powerpc/powerpc/uio_machdep.c +++ b/sys/powerpc/powerpc/uio_machdep.c @@ -75,10 +75,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/riscv/riscv/uio_machdep.c b/sys/riscv/riscv/uio_machdep.c index 86a39be12cdb..e2f82974b2e9 100644 --- a/sys/riscv/riscv/uio_machdep.c +++ b/sys/riscv/riscv/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { From nobody Tue Oct 17 13:37:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w5219L0z4xWT5; Tue, 17 Oct 2023 13:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w514Jq8z3G4t; Tue, 17 Oct 2023 13:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fkv+G5kmL8LRADhorMuEUexOZHSu8du8Fss6tdDVqVU=; b=fnhTlHWABwBncsAENkmjySbZbgJsXOkloMQZvsptRGmcYO0IEajL3ndz1dDCn0JJNW9XVa TCadk46NkK2kVtD21YwZRf9jGrE1DNYlPuuL3AH7fu4ipxH6z18VACruZ26T+vM0nBC8ho qTW5jeDM+xrm4DF3az4IrTcV8GEwHob6G7jaM4T0pgTLVUDkQ8lGvdinB10+uVKswZdYre +OlnmxANPey3r336OeVTJyqJPLXb8zqJXek8WLAzP3srMe/WXrGNtyuG5UtFfgIABAt8JY gWfGLpHdvOTzY3MUVVvcMLqCgq6GM9syfRfKxPSjKxq4L0vM6F09T4hFcSnFiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549829; a=rsa-sha256; cv=none; b=T4q6gVVz3lBjtasGffUitujzHHH49obb0f82XyyxpiCeTufNLyu5W8yhraAMiM0Dz56ubF xaPZxokqX7JmwThBuFXF2R8GpaUB/WAI8ZfUwduHIcoAlHWCNeVYY+IhtvjZfCZjiFKoyx CL5zJVuYqPtu3RLwHrmn5f4gZFWRyPxaW4Yq/90Xog03wOr7eSwEpJR33hrg9ctPaMb2ae O3ta9P1VOFVxhgIcLEUYCeYysobhdZOVHqd3fHRMUOyu7cIrlW2OqWGl4Y/k0o/wQjV3Is XETSJzG2wVf2k8Sdxk7Hc8KEH5m7cdNIW6IznUW6HNS+gbdii325a6EElqDwtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fkv+G5kmL8LRADhorMuEUexOZHSu8du8Fss6tdDVqVU=; b=GsWQQsdEgo3TZe1xKqzYUqfGASY4V+9V4WD5UoZrWX0LcCShy1qB/W0cPZFVXy7cNdjeNk qIssy20UuH36b38lLhv6OJPtrb+vWiuLD9g4MIgCgH+ttkl6jLv4xChwPTaMiKf+qndOeR KOe6fzs7DNku2Ee8BnWoA2fsea6lO95UcZBhfBV0dWYhEFyBquaTSJBFticuOdyzPfwT1L GJmyYtaxPrthkbFY5N4zTYAqmnrcnxkFKVPrb8HTVzFUkw3V7wCBe7ASp55DMutgwLTJNi VSDSdbIHt7+ILHLqsYaPRjftYE3jkZrmkMV6CBykT/aY5MH9LqJyRioGEKyk8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w513QmSzB7W; Tue, 17 Oct 2023 13:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb90B095881; Tue, 17 Oct 2023 13:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb9cB095879; Tue, 17 Oct 2023 13:37:09 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:09 GMT Message-Id: <202310171337.39HDb9cB095879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b5e7dbac756a - main - socket tests: Clean up the MSG_TRUNC regression tests a bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b5e7dbac756afb49c58315c7081737b34a1d2dfd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e7dbac756afb49c58315c7081737b34a1d2dfd commit b5e7dbac756afb49c58315c7081737b34a1d2dfd Author: Mark Johnston AuthorDate: 2023-10-16 21:35:07 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:36 +0000 socket tests: Clean up the MSG_TRUNC regression tests a bit - Fix style. - Move test case-specific code out of the shared function and into the individual test cases. - Remove unneeded setting of SO_REUSEPORT. - Avoid unnecessary copying. - Use ATF_REQUIRE* instead of ATF_CHECK*. The former cause test execution to stop after a failed assertion, which is what we want. - Add a test case for AF_LOCAL/SOCK_SEQPACKET sockets. MFC after: 1 week --- tests/sys/kern/socket_msg_trunc.c | 230 +++++++++++++++++++++----------------- 1 file changed, 128 insertions(+), 102 deletions(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index a863705adbae..469b9e1503cd 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -25,143 +25,169 @@ * SUCH DAMAGE. */ -#include -#include -#include +#include #include #include #include + #include + #include +#include +#include #include static void -check_recvmsg(const char *test_name) +check_recvmsg(int cs, int ss, struct sockaddr *sa, const size_t sizes[], + size_t nsizes) { - int ss, cs, rc; - struct sockaddr *sa; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - struct sockaddr_un saun; - int *sizes, sizes_count; - int one = 1; - - - if (!strcmp(test_name, "udp")) { - ss = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - sa = (struct sockaddr *)&sin; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "udp6")) { - ss = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(sin6); - sin6.sin6_port = htons(6666); - const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; - sin6.sin6_addr = in6loopback; - sa = (struct sockaddr *)&sin6; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "unix")) { - const char *PATH = "/tmp/test_check_recvmsg_socket"; - ss = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&saun, sizeof(saun)); - saun.sun_family = AF_UNIX; - strcpy(saun.sun_path, PATH); - saun.sun_len = sizeof(saun); - sa = (struct sockaddr *)&saun; - unlink(PATH); - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int unix_sizes[] = {80, 255, 256, 1024, 2000}; - sizes_count = sizeof(unix_sizes) / sizeof(int); - sizes = malloc(sizeof(unix_sizes)); - memcpy(sizes, unix_sizes, sizeof(unix_sizes)); - } else - return; - char buf[4096]; + memset(buf, 0xFF, sizeof(buf)); - for (int i = 0; i < sizes_count; i++) { - int sz = sizes[i]; + for (size_t i = 0; i < nsizes; i++) { + ssize_t rc; + size_t sz = sizes[i]; char tbuf[1]; + rc = sendto(cs, buf, sz, 0, sa, sa->sa_len); - ATF_REQUIRE_EQ(rc, sz); + ATF_REQUIRE_MSG(rc != -1, "sendto failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, NULL, 0, MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); } - close(ss); - close(cs); + ATF_REQUIRE(close(cs) == 0); + ATF_REQUIRE(close(ss) == 0); } -ATF_TC_WITHOUT_HEAD(socket_afinet_udp_recv_trunc); -ATF_TC_BODY(socket_afinet_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet_udp); +ATF_TC_BODY(recv_trunc_afinet_udp, tc) { - check_recvmsg("udp"); + struct sockaddr_in sin; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_port = htons(6666); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sa = (struct sockaddr *)&sin; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afinet6_udp_recv_trunc); -ATF_TC_BODY(socket_afinet6_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet6_udp); +ATF_TC_BODY(recv_trunc_afinet6_udp, tc) { - check_recvmsg("udp6"); + struct sockaddr_in6 sin6; + struct sockaddr *sa; + int cs, ss, rc; + + ss = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_port = htons(6666); + const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; + sin6.sin6_addr = in6loopback; + sa = (struct sockaddr *)&sin6; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afunix_recv_trunc); -ATF_TC_BODY(socket_afunix_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_dgram); +ATF_TC_BODY(recv_trunc_afunix_dgram, tc) { - check_recvmsg("unix"); + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_seqpacket); +ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) +{ + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, nss, cs, rc; + + ss = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + rc = listen(ss, 1); + ATF_REQUIRE_MSG(rc == 0, "listen failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(cs >= 0); + rc = connect(cs, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "connect failed: %s", strerror(errno)); + nss = accept(ss, NULL, NULL); + ATF_REQUIRE(nss >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, nss, sa, sizes, nitems(sizes)); + + ATF_REQUIRE(close(ss) == 0); +} ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); - ATF_TP_ADD_TC(tp, socket_afinet_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afinet6_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afunix_recv_trunc); - - return atf_no_error(); + return (atf_no_error()); } From nobody Tue Oct 17 13:37:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w530C02z4xWrQ; Tue, 17 Oct 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w525dcSz3GG0; Tue, 17 Oct 2023 13:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z05AGBtfV5p0MGWgHu8wVZ7VlSzmkyGQEDSQ8AJz1vk=; b=IrFruGjowKTCkarKhasAtjh1M/R3jBk3BbMWty1rduJYxTilkseWtEknGwSYj0EO2KsaGG ZMkB+2SPxmA83xezFJDp4t2oKP/qQ0IC4ePfhIhRxXnYhpcJIudohkWFw2Y8ZfkDJpFj2P 1OvFBtDn1cB+LZ73hMdVkG6jScjHW22WH+byXFW2jTPbMqW6q/c7OyQT44ZvACBr9g5T/1 4wVojWU4nlAp+Ak7Qe30A9PK7hYMbV86WvWA2UlpJO+0GwLYt6WdUC1PjsaXPVXvAI3Iuq hTVcgTs7I06l+un4l5aTQbMJCESkpv+NCCDjDzui8vWB0mr+rBsGr27ofOcdXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549830; a=rsa-sha256; cv=none; b=M8TicKHvNvQ6QOI+SjkZ2xnB7OxugGLa20sAwWMG6ZYn9nsftQdQGKOf8wNmbps5V648zr cOm5XVWxepzyWNXBF6kICs/Nyw0kwcAZ58idLPhE8GcDFNwTCcKm1V5+acOp0zAONWT425 Ct1ahGHqL8WtxOfMmVdvEz3Qsis/TqZKwRrxnHSwv8NAr13sdgKKTnU5SFYUFoqa3Ayt6v Jdr/bdJqUPTwN7HEMiVX+KFWoQ2GzOIFaOcdqSK9YLPVyO6/ZMLgVNwnqVLJ1xS4KLC6Yt bq+V+e1RgIOdgGqxOValhtVJy+Wap5gqsndiReZ3nM8iLbpqQKVQB8X23TuBJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z05AGBtfV5p0MGWgHu8wVZ7VlSzmkyGQEDSQ8AJz1vk=; b=AV6TEWlHCiUjae/XoPjuVfYapHUvigUjEX+NrXxtQuOoSSlfbgFKTrvc4FCwsp/Q63ixfr 62gaPkdX+/tl5ZX71cJcgOil0EZd0J+FGT8hPmlaS2pIJNfBlxsNRk1f9tBuAI46aV8ysu tAcs55tG80CVMga4NBqYPqJv7Xut7s1Aa280hS5gvKY4atys0x/736CPcH1wGhk9UlLgDA HU4YXcgfddKw4DtABsOkZtLQHiihEEAi4NIFH2FnCPMEpTyo8EcRrm79OdkdoNMNQ1bnSb sBkLt2yf3KVQRZjOLlC+Q4hoLDfHe+kyK4Hscy5qWcZgv5SjYOY/md/4z0SMxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w524SvZz9hr; Tue, 17 Oct 2023 13:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDbABm095932; Tue, 17 Oct 2023 13:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDbAKs095929; Tue, 17 Oct 2023 13:37:10 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:10 GMT Message-Id: <202310171337.39HDbAKs095929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d8735eb7acc0 - main - socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e commit d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e Author: Mark Johnston AuthorDate: 2023-10-16 22:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:57 +0000 socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) MFC after: 1 week --- tests/sys/kern/socket_msg_trunc.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 469b9e1503cd..279170158643 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -27,11 +27,13 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -182,12 +184,67 @@ ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) ATF_REQUIRE(close(ss) == 0); } +/* + * Exercise the case where ktrace was used to dump a truncated buffer. + */ +ATF_TC_WITHOUT_HEAD(recvmsg_trunc_ktrace_uio); +ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) +{ + struct ktr_header ktr; + struct msghdr msg; + struct iovec iov; + const char *tracepath; + char buf[128]; + ssize_t nbytes; + int error, fd, sd[2]; + + tracepath = "ktrace"; + + error = socketpair(AF_UNIX, SOCK_DGRAM, 0, sd); + ATF_REQUIRE(error == 0); + + memset(buf, 0, sizeof(buf)); + nbytes = send(sd[0], buf, sizeof(buf), 0); + ATF_REQUIRE_MSG(nbytes >= 0, "send failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + + fd = open(tracepath, O_RDWR | O_CREAT | O_TRUNC, 0644); + ATF_REQUIRE_MSG(fd >= 0, "open failed: %s", strerror(errno)); + error = ktrace(tracepath, KTROP_SET, KTRFAC_GENIO, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(SET) failed: %s", strerror(errno)); + + iov.iov_base = buf; + iov.iov_len = sizeof(buf) - 1; /* truncate */ + memset(&msg, 0, sizeof(msg)); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + nbytes = recvmsg(sd[1], &msg, MSG_TRUNC); + ATF_REQUIRE_MSG(nbytes >= 0, "recvmsg failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + ATF_REQUIRE((msg.msg_flags & MSG_TRUNC) != 0); + + error = ktrace(tracepath, KTROP_CLEARFILE, 0, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(CLEARFILE) failed: %s", strerror(errno)); + + nbytes = read(fd, &ktr, sizeof(ktr)); + ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); + ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + + ATF_REQUIRE(close(fd) == 0); + ATF_REQUIRE(close(sd[0]) == 0); + ATF_REQUIRE(close(sd[1]) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); + ATF_TP_ADD_TC(tp, recvmsg_trunc_ktrace_uio); return (atf_no_error()); } From nobody Tue Oct 17 13:58:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8wYC37tNz4xXn6; Tue, 17 Oct 2023 13:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8wYC2cvCz3MbZ; Tue, 17 Oct 2023 13:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697551087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZsx3gRkpPe7jnoe5iYhHg1uOirV6ZrN1Jpx3TfGqkI=; b=L8l3Y+mNaorgIczpOoURBoLQB9BqR9HzDTKQyLQtfKtdd/UWkFuAhErLDv/CLPo+YHM02a BIxaNTAmac7RVM+O78WLw7aHPmGHZS3/6rXc1V1V1IOOBMW8T5JBZifbq9F0y1oMmlO+/y sWDNpXdTatNRc9WOPmV6q5FCM7qlJ5QTIV1S2s85yiRnk0S5E0xHCuUyKpK7BKKF9Dg8Im NW9EfwiImXmoIKOfPd1FfyBkUbQRH78g9RksBCzzQ1fkTz6z8WVmmOr+ru9njdfvGfOnr9 8y1PS24C/QIBy7epDRHt6so/NgKVFBlwFuvkRD5/OtLbrOiwBavDaVOvk2cgBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697551087; a=rsa-sha256; cv=none; b=xFr01KkaoQudD/Je0fCf/fFE54o3gx4UKLz3KfrSkWXMBftr9J0rt8V+x4HcnSee1wr0JC ptkEe6Ju65Ws/rWr8BiBldN/raUlv9SR/+DA5Sf9L0g21Egsv3OftgRdhjqz2/WRpNI2M+ wpEdKqZw4LBWgxdxyepxj3BIm3fv1DLRsYV2xOYWs+60j5N3cJfhJBE1zugWTDv91gpjC3 Km8BD2I9DFt8tN4Nti5Wzh63h5nMk1dNTSP+81EAOCpbDUgFLud1P4JTDWAvm/Yk4vQ66P w7e6UZCZh+OYX76cTpC8ESRJiIHTgG59cARlwhHAG28NmbyiAsapjONX8U0oEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697551087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZsx3gRkpPe7jnoe5iYhHg1uOirV6ZrN1Jpx3TfGqkI=; b=kxgJxeT1RWNK59LRb3tkMJuMLHQ/HIw4U6tWT0GzEuhLOkNILTGbJQtUB0SdlhOH5n51ik XW8spIEMlwy0iqMY7qq5rilKj5xG2FweZrFhMs7F1JMhxKgIkEG5W5tB+pBYqKccWaYHk5 33U32hc5GCCKslHKHOMGM2q5outHHLxuqz11lzhjPv9UWdD9j2WD/yJ8axzg82in4EFl1c QVv48V9IhCUPVIxizQ2kMY/OEM44sbKCz4MPciYATYSJ5TdqahsBp7i1U+d+/x19PWXGek M6/C84wmu9w9B6vQMPTHYOLuEXLbmvQjHiD8dPujIxMoAZBWmf29mBQS+l91Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8wYC1RRvzBJs; Tue, 17 Oct 2023 13:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDw7dR029963; Tue, 17 Oct 2023 13:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDw7kp029960; Tue, 17 Oct 2023 13:58:07 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:58:07 GMT Message-Id: <202310171358.39HDw7kp029960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 4a3810075fd3 - main - bhyve: fix buffer overflow in QemuFwCfg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a3810075fd307301d8b3f087efe7a61bc37199b Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=4a3810075fd307301d8b3f087efe7a61bc37199b commit 4a3810075fd307301d8b3f087efe7a61bc37199b Author: Corvin Köhne AuthorDate: 2023-10-16 08:52:21 +0000 Commit: Corvin Köhne CommitDate: 2023-10-17 13:57:28 +0000 bhyve: fix buffer overflow in QemuFwCfg We're accessing one element of the newly allocated and the old directory too much. Reported by: andy@omniosce.org Reviewed by: markj Fixes: 6f9ebb3d0fed2b0ae604dd6daf17f1fe1d8df216 ("bhyve: add helper for adding fwcfg files") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42220 --- usr.sbin/bhyve/qemu_fwcfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 830cee730dbd..5b33dfab037d 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -365,7 +365,7 @@ qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data) /* copy files above file_index to directory */ memcpy(&new_directory->files[file_index + 1], &fwcfg_sc.directory->files[file_index], - (count - file_index) * sizeof(struct qemu_fwcfg_file)); + (count - file_index - 1) * sizeof(struct qemu_fwcfg_file)); /* free old directory */ free(fwcfg_sc.directory); From nobody Tue Oct 17 14:22:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8x5c0tx9z4xZ1l; Tue, 17 Oct 2023 14:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8x5c0Nckz3RZG; Tue, 17 Oct 2023 14:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697552564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1QtjvXEEVRJ+NIrFqoY6xVgFV8YbDKB7vKPicIarMRo=; b=vxDf2G8eZi33zYbAtvQZFqgFrDpP/JqXj5DRQxOKDzTJwloxMyeoHrn1wlFfSVRHhdHuNy v6ZscYmPJgoOBBrUOmXlFMcyOOzH7oZLLFFg/hRy13ojwq7nN8X1ErWiKU5Emg2uHQ8kTP nXRD5ffWYo5UgE+UawDKXSaWO9V6pd2CtIQyjS/PPYGICJ/d+gAjxrspqQKaqoZTGzocBZ BC7wpRVg/sLVWldsklgQuESiej8yQD5mMaGD+oa84P5CpQIIouIsocfENC6n4hpnP+ooYv gfY7W3omImyPh6Coddszkn2rxoxPEdirVoFNmTohAUV74Qjq7ViVQOkhY2W3Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697552564; a=rsa-sha256; cv=none; b=iqeYro/V0USfWeNBX46OPVEwpzsfC5TymckJkrXKyt5aH7P9fTR42lANUPSDxvpyEl9crf bRyrvHtyRWqoCjAqRVLae2tQRere0QwTOvOFkQAHOuT3UqgqrwCOyBOeDS10ARyaiKe21p 0A9iTilnXwffRxFHINv6gEe7bNVJV9pQeCnncdxgl1l9YkkOU6xzCJwZ22KOv8IcJmy19c 3pphEiLaGWE1aNshNdrNKREFV/4sy5jss+pe4J1lKS7msnje0rTL5RUrjDgFbekwOq4ZHb q7KTVwUOPaF6W07sbJl4qBkIfx/pnrBo3lSS/j5fJKt+OWKphHKCjDpvTCKitA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697552564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1QtjvXEEVRJ+NIrFqoY6xVgFV8YbDKB7vKPicIarMRo=; b=xLoy4+iE/roRXbzz4HAAr3PW9FDBZXmwR4xnC7nA+CyybD0se312tmh35LvJBZdoFQqlce PJAY0xR987gNGy61obQcpwB2RAyJbOUhPVDfmOvvylihBq0gWBGkmasbybpQXlp9VgL3K1 6pBYE0mDoXf4FhXSz64tk6amG3Sk7VqxSMeqMSHXO+JyP87d5aSHhva9YO0xRPhusYohKL SP4UJNKUqCEMWC4MzWbvTnwq5eDkYIWT4IkiKqHXUQbaVITqbO7f3QyOoG5y0JGbPU3NFF ps98nRiuHVCO2nKvJFj+D+dePJwC+8Q087QgVYyH0Je+MFO73E1KmbrsCXp/gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8x5b6Yn5zCbT; Tue, 17 Oct 2023 14:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HEMhtX078899; Tue, 17 Oct 2023 14:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HEMhZA078896; Tue, 17 Oct 2023 14:22:43 GMT (envelope-from git) Date: Tue, 17 Oct 2023 14:22:43 GMT Message-Id: <202310171422.39HEMhZA078896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4bd1e1968494 - main - socket tests: Build fix List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 4bd1e19684945aa1fd3397b58613f5210fda9091 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd1e19684945aa1fd3397b58613f5210fda9091 commit 4bd1e19684945aa1fd3397b58613f5210fda9091 Author: Mark Johnston AuthorDate: 2023-10-17 14:21:32 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 14:22:11 +0000 socket tests: Build fix Fixes: d8735eb7acc0 ("socket tests: Add a regression test for ktrace+recv(MSG_TRUNC)") Reported by: Jenkins --- tests/sys/kern/socket_msg_trunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 279170158643..ff0499c4540d 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -231,7 +231,7 @@ ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) nbytes = read(fd, &ktr, sizeof(ktr)); ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); - ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + ATF_REQUIRE((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(close(sd[0]) == 0); From nobody Tue Oct 17 14:38:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8xS74cWSz4xb12; Tue, 17 Oct 2023 14:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8xS744hcz3WsB; Tue, 17 Oct 2023 14:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697553527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=saHwYY7j1+KpN8Phd9gIHSiVL+dxt8DhjTnpx6v8GZM=; b=rUhRFBa51L6g7AIML/h37Q48h43uFUiTvrU0AR/1zHEpKvFvT0QpCyEzlMMxzBLx2M7jIQ n4S3fROe0bsr7dW+dR9d57MQfKiNzduEv3C3rAQZULN1K9MspvEvzzZ9IWTPhQRcQ7wxnL qaj/SEu0hHi0KyJlFk9TWacblczOHLbv2NN38MnqXXVJBq25MSeAL6ImxMUxjt224SBF3X AvoA7SE2K9XsVvtUcXYVeKFOSLTzD5F3WAsef1fBtOltM/K3sA9wP8dnn2xFqQ+lf45azK CRQcS5PvPJ/aO6aji3zo/x8Pk2p/jt8bAJ8vMn0lQydVbIs9MQ/nBjz5/t6kpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697553527; a=rsa-sha256; cv=none; b=Am8YPhFbWEyK52/v4qWgToypMzqP3UUwx2/gG+7xCo6MSnszI7YlwuCzkpLFGBT/AkbWEK LuzqwnWLGzBgBT5IPj19iuv/2+8b70vjFdFwuIRUaEVy4E91ZarDG1KefEo4ZUCH+Gu9sT oA4+NCiUWq4RGMBMT1peR/vw7PfdGEhmeKhrzI/3wCi/mzgrDebg5NhFNGvMbRwubptgfF 4/YMOZOs0v5pRd47OJSZNMFfNsQAFgXGDzRx0T1QZgFVOyUjisLcdItXVguqnXMpHN9KA7 Bhmbzv2fGrK9FWr8b8YTAxyYO67OXZmvWpVPsCNWMOkF0CNkGyYsmdMgvIiXYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697553527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=saHwYY7j1+KpN8Phd9gIHSiVL+dxt8DhjTnpx6v8GZM=; b=JSrD1bzzNhplGx5YUC9p+yKCMEUCw7ZXW2Po+olMxFXkGUziIG5Dz7bYwKCRD3fwE7vMGu FxFgIasCgLAUXoI7k/DYuhdt4s9p03bzhKzIoV2y/jumcOrrHa5ORADsifajRGAUEDWWpL VNE/yVep0KcKHC2NMWbIRGzV4YEEJsKL9O+nANBQ1qpmYB3SQklNyDTU2W7eMY+2nTttNP VrxfzUqgI4mHerSkj5g/W7St3QIrUI5aRxQYkgR9/EIfBkKSm8aa+7HZmHdsjoH/+MkzTQ 9JW9BG3gmccJCm2liO/r3p6+f+PuaPfA3fpDSXnTZqgdo+gZ3KCL8/5cXCLSAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8xS739VHzCBJ; Tue, 17 Oct 2023 14:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HEclOQ097077; Tue, 17 Oct 2023 14:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HEcl2J097074; Tue, 17 Oct 2023 14:38:47 GMT (envelope-from git) Date: Tue, 17 Oct 2023 14:38:47 GMT Message-Id: <202310171438.39HEcl2J097074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 22dc8609c565 - main - tcp: use signed IsLost() related accounting variables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22dc8609c565456fda3de6ddc34e07af98f11203 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=22dc8609c565456fda3de6ddc34e07af98f11203 commit 22dc8609c565456fda3de6ddc34e07af98f11203 Author: Richard Scheffenegger AuthorDate: 2023-10-17 14:07:23 +0000 Commit: Richard Scheffenegger CommitDate: 2023-10-17 14:37:09 +0000 tcp: use signed IsLost() related accounting variables Coverity found that one safety check (kassert) was not functional, as possible incorrect subtractions during the accounting wouldn't show up as (invalid) negative values. Reported by: gallatin Reviewed By: cc, #transport Sponsored By: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42180 --- sys/netinet/tcp_sack.c | 4 ++-- sys/netinet/tcp_var.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 8647630bb6bc..589b0c424acb 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -888,10 +888,10 @@ tcp_free_sackholes(struct tcpcb *tp) while ((q = TAILQ_FIRST(&tp->snd_holes)) != NULL) tcp_sackhole_remove(tp, q); tp->sackhint.sack_bytes_rexmit = 0; - tp->sackhint.sacked_bytes = 0; tp->sackhint.delivered_data = 0; - tp->sackhint.lost_bytes = 0; + tp->sackhint.sacked_bytes = 0; tp->sackhint.hole_bytes = 0; + tp->sackhint.lost_bytes = 0; KASSERT(tp->snd_numholes == 0, ("tp->snd_numholes == 0")); KASSERT(tp->sackhint.nexthole == NULL, diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 11509a87c6e7..c6e24b187e0f 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -128,8 +128,8 @@ struct sackhint { uint32_t recover_fs; /* Flight Size at the start of Loss recovery */ uint32_t prr_delivered; /* Total bytes delivered using PRR */ uint32_t prr_out; /* Bytes sent during IN_RECOVERY */ - uint32_t hole_bytes; /* current number of bytes in scoreboard holes */ - uint32_t lost_bytes; /* number of rfc6675 IsLost() bytes */ + int32_t hole_bytes; /* current number of bytes in scoreboard holes */ + int32_t lost_bytes; /* number of rfc6675 IsLost() bytes */ }; #define SEGQ_EMPTY(tp) TAILQ_EMPTY(&(tp)->t_segq) From nobody Tue Oct 17 15:55:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8f5kWcz4xgP7; Tue, 17 Oct 2023 15:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8z8f54hbz4F1Q; Tue, 17 Oct 2023 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCfs80IW3BBxFPS6ON49NfXtm1IuJMrTP8Vxi7QhDXM=; b=h6nZevO1HqhIv5AsLakruZzvTlBAWcu+5arm6O4n3EVDjev4EDFo5SFEbCharDw6Ubb30/ NfJFzxl0kzaaNhnZZSk+I523M6yJcx6xjyzk+qY0cMVcfr8Cc32DPnFoSg/96FuMGfD4rB VlhjDxKANf/2cuX9y1tLpXcF5vUAjIzmw72LxrqpVaiptVJg8W5+CYMZtWXxPEBUmQno7+ RAwBA6eHckCA71E2gIVgBdAotq5NWUmHXanew0N9CB5cTGAvGDrvXWhr3c3/zatLQ544F6 ilKrZ7lQFWWp1/N27FzXupkeBrJ0/T83SFWqVLNkR+m5Am9GfHPXrxAvP7To5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558130; a=rsa-sha256; cv=none; b=wzijS73axUYB/C8SHH49/vxfZwKyiGINpuU2y8dt4AfscsoICvSLhSHYUrkyK7iaHFowAc kVY5kjn13FQoF4+T0is8TxLH75b8tiVSKf/oYMXgoJbd/nZJ2UZz7bEmbdWLMEDUih3C4D vFk6Y5nCymKRWuELePaohjB63HH9Jbt46hFsAIomSE3ax3UL2yGZt4Jrgaju7U2nmUKzwa ufL92J51BvlykmL9rf16Udr9d0Jh+vYfFsgEbW7A9i1FeBf0D9HctYK6L0H6ibjq34Nr/9 TJb4ktM7wBoJYDEK4jNEeVdM4FGjG6ELofQAYFifOa0X4A2kXwrUTQVq3k+ijQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCfs80IW3BBxFPS6ON49NfXtm1IuJMrTP8Vxi7QhDXM=; b=R79l7oUpN/eazmFSKRxuiq/u0fdr+HMHBZ/rrWPEmQ2bsSMokLS1/qfp2spN9Zo3hq7f5X IdiGgOfYq0rHycsG+pJxGJCKLBPxz9Iljnzp1xzZ918BJ0yvgb42N5ozpDEqn7R40T7LUG m72aJmDAAjbcXtKtkuqHNu0JfqY8Lm/IGxUs5+Oj6jsvesx7gm8LjzsXykGaXg4frN0PHI hsfcZblRHWBAWQEEcASsxRyiAfaOuzIlRCAHZeNq3+Y1lXuZ7HD7iucrjs2Kx1E1+dqduE c5M+k6g73k5gaN5PLs00GMSJscWUVXSngVdN9QTobj4FE6shjyTb4zucOwabdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8f47YjzVds; Tue, 17 Oct 2023 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HFtU1A028973; Tue, 17 Oct 2023 15:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtU8T028970; Tue, 17 Oct 2023 15:55:30 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:30 GMT Message-Id: <202310171555.39HFtU8T028970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 56279238b03a - main - geom_linux_lvm: Avoid removing from vg_list before inserting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 56279238b03a0ccef245b22fff7679fe35cffccc Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=56279238b03a0ccef245b22fff7679fe35cffccc commit 56279238b03a0ccef245b22fff7679fe35cffccc Author: Mark Johnston AuthorDate: 2023-10-17 14:25:38 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:19:05 +0000 geom_linux_lvm: Avoid removing from vg_list before inserting PR: 266693 Reported by: Robert Morris MFC after: 1 week --- sys/geom/linux_lvm/g_linux_lvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c index dddc3ae9184e..c63318fed729 100644 --- a/sys/geom/linux_lvm/g_linux_lvm.c +++ b/sys/geom/linux_lvm/g_linux_lvm.c @@ -512,7 +512,6 @@ g_llvm_free_vg(struct g_llvm_vg *vg) LIST_REMOVE(lv, lv_next); free(lv, M_GLLVM); } - LIST_REMOVE(vg, vg_next); free(vg, M_GLLVM); } @@ -596,7 +595,8 @@ g_llvm_destroy(struct g_llvm_vg *vg, int force) } } - g_llvm_free_vg(gp->softc); + LIST_REMOVE(vg, vg_next); + g_llvm_free_vg(vg); gp->softc = NULL; g_wither_geom(gp, ENXIO); return (0); From nobody Tue Oct 17 15:55:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8g6ZJjz4xgQn; Tue, 17 Oct 2023 15:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8z8g659jz4DwH; Tue, 17 Oct 2023 15:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odmS3avjerTaBzlrWdql1GWlDG4JEAoPmAiFpymuYhY=; b=A4WATrV99spBHLrpDPyOmelsoA0/bd7J/+GOZdAiTXS0Db+ZMt0OLKInRWw6CJ3tPLMLDf NmZxyi8VMJN1ox3GTACDdsXiKtQFXd4nfPlKJmGOgcs67y5ooVXae+HA3T3l6qFoESLz7e YoFBv3ucF7JTGUVsdD9PW0f9E+yktg4ORvJicad/beJwosKaIela5VnT4RV6DVZg1wlKGt 3QFwkAd0Y14+yt4GZNSCqqJmlk1Ke00ZnqMfetQq0k59KRnSVh0KyBWh60/Pd6VoxieBTr RFQWEPG4W0InUiEqPDonIgUM6yntTF+RIf4Zjq4Dg4qPuDrspjClbFoXcrfw8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558131; a=rsa-sha256; cv=none; b=raL7plVSWIl4ezd4iEIGFRQI7ZGylrfFP9nYBIx0R6oZtANNrC56ravvIAf1XOylw9mfzG 9zPfbTuPjDUUBSW+IDy72Q+knKOIWoFnz4e5SdqeTHhRnnEGTseCrLpu2dlRULUmLc+BZn 7uVqHAxMV4gmVZo3nCm6HEh3IzO0Pp22bVuqnJE0Q8qiaTeWGjtBgrqmwkSoySe9NNOQ40 ZUI6ccXoAeIor4AkWumjfVX8m8ATmTAN2LszoBnLGZn2qPoyEfDyGIEWnFMs794b+dJmrH GTOBuY4a5Ppi15Dbtb1wVeyMOaItIlyhnPhE2S3+dhhMn/oPWAbmMiMnPA3+mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odmS3avjerTaBzlrWdql1GWlDG4JEAoPmAiFpymuYhY=; b=JTx787vPs3ZbWVJJsfrNPQ68ddc/AtYty4cMwqLLzIoDw2CCA8UgS0kDZxiI4P4tZXeKnW ulKsD5W0utcaheibxFYtpZ0xpxqJ1pW8iKoGxwCf5FHzlqFj9TW+hpxQdip7qj/HjY5cB9 QxcV1Sl0sFnfPIm//Ry99jkxD+AR2+onKYy6G+NcgDNmUBEaVF/yYM/90wjZ+TkDNntSt/ 3VS5dd4B5rHlbOK/xrtftIxiYyBJweQij22o6lMFpWTsLGMUetpekpRGtw1UxQtQyocB/b u6fd5JUD5tUtKMDP3ZUb52eTcqYXeIVdqFTy3vEgOgiThtKYn9dOG5xPKze+Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8g4vfKzVdt; Tue, 17 Oct 2023 15:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HFtVOV029021; Tue, 17 Oct 2023 15:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtVnn029019; Tue, 17 Oct 2023 15:55:31 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:31 GMT Message-Id: <202310171555.39HFtVnn029019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6223d0b67af9 - main - linuxkpi: Handle direct-mapped addresses in linux_free_kmem() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6223d0b67af923f53d962a9bf594dc37004dffe8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6223d0b67af923f53d962a9bf594dc37004dffe8 commit 6223d0b67af923f53d962a9bf594dc37004dffe8 Author: Mark Johnston AuthorDate: 2023-10-17 14:26:18 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:19:06 +0000 linuxkpi: Handle direct-mapped addresses in linux_free_kmem() See the analysis in PR 271333. It is possible for driver code to allocate a page, store its address as returned by page_address(), then call free_page() on that address. On most systems that'll result in the LinuxKPI calling kmem_free() with a direct-mapped address, which is not legal. Fix the problem by making linux_free_kmem() check the address to see whether it's direct-mapped or not, and handling it appropriately. PR: 271333, 274515 Reviewed by: hselasky, bz Tested by: trasz MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40028 --- sys/compat/linuxkpi/common/src/linux_page.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index ce9ad34464bd..21e338acb089 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -145,6 +145,14 @@ linux_alloc_pages(gfp_t flags, unsigned int order) return (page); } +static void +_linux_free_kmem(vm_offset_t addr, unsigned int order) +{ + size_t size = ((size_t)PAGE_SIZE) << order; + + kmem_free((void *)addr, size); +} + void linux_free_pages(struct page *page, unsigned int order) { @@ -163,7 +171,7 @@ linux_free_pages(struct page *page, unsigned int order) vaddr = (vm_offset_t)page_address(page); - linux_free_kmem(vaddr, order); + _linux_free_kmem(vaddr, order); } } @@ -185,9 +193,17 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - size_t size = ((size_t)PAGE_SIZE) << order; + KASSERT((addr & PAGE_MASK) == 0, + ("%s: addr %p is not page aligned", __func__, (void *)addr)); - kmem_free((void *)addr, size); + if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) { + _linux_free_kmem(addr, order); + } else { + vm_page_t page; + + page = PHYS_TO_VM_PAGE(DMAP_TO_PHYS(addr)); + linux_free_pages(page, order); + } } static int From nobody Tue Oct 17 15:55:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8j1p1pz4xgZ9; Tue, 17 Oct 2023 15:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8z8j0VTHz4Dx2; Tue, 17 Oct 2023 15:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+UYGq7E/q38eJ/MFdKz1sWmzpgvA8PkAcWEbOtsp5GQ=; b=KusWq/Iy2OpVO0hlBnZ6lXRwRkL4ZlLRSdcpG6qg9s2x8/pXYYXSjyJza7yyvDAHx6Pq5R aOwJlWI8ciOPk87mdoQmlDSVRQrd7ELHh59LByBf0XUpHpI2Jh9bJdo8xRPhcH6UslMTrF q/gqVB05WUVvK8D+zJTnu4uH3biny+lsFAWZ/ep7jtDxyyL29zlGr0nwHXuSZL5YtkRnyp J08zVS1iRx8Z8rkvFcGvJMkic/qF6MiZT6UhPrJ8zfOkpISpFQsy++beMzJt+TPYoM05dJ hwLO7m4X9WnfYR2+XZsVvxHEQu7g1miuGdyeJBWhNYwBXAvYdWTVxyQJquqa0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558133; a=rsa-sha256; cv=none; b=jEtIoA1Wo4IlidceExyUMeEvRBoLfptoV7w2MYJv9nJsNVfL+4j5hwBAMaDuPF7lGm/uHj ZmV1fiEq44hnweHGatD67hIifzPiOK2/AJ8SS7zH+M++nTbLHb7bu/mst7IGXdABPnyPRX vwzMfBowO8L9IHQmO9SAjc6JwcCtNo30XtDX2RSPKnCfGZ2XrNAABHxK2dTWYg2zjL5ooc b2VuqWDDYx8TXKtPOjZUze0z5HwxWB7Trkr4tWkOt3g5SwtiuVLXgCWgOzTbP9aS98MDk+ v3RCYW2JuHglDhRaHDyPvVIpH7iJ8GDjSyW923oIvaysiGOeRKRaCUQW8q3hag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+UYGq7E/q38eJ/MFdKz1sWmzpgvA8PkAcWEbOtsp5GQ=; b=szo1mLyznySw1Ky0ykJxxGkP5pJD3daKeqieBCrxQPIiAAXKwPRXZf96J4XPVZtOsHP5yr nRwyb/dFj8Y/gowU56uxlaFnvNxaWy/uJ8Wfoq4qpCnO4EKeoNvICwRdt/PeFgVuN9JB2u W6LHHB2XNySJii3h32jSxI+xPRksYfcSz30pDplNtwHSTWLmmicAIxk5gUdKCewzcio6AP m5KgwpJ2omuFlyooPCku9O+CkBiXFMmNI+s0absPnnV0cbfoiIUfdzcQV13BL01fVOf3IQ xVqGF7FsbwnKLDQgKv61ixu2Z+QEmzbZG3vmGOsAbJ0ed6qabYkJs4tnofffLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8h6LvkzVhJ; Tue, 17 Oct 2023 15:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HFtW47029082; Tue, 17 Oct 2023 15:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtWoA029079; Tue, 17 Oct 2023 15:55:32 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:32 GMT Message-Id: <202310171555.39HFtWoA029079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ae5c3dfd3e75 - main - netinet tests: Add error handling tests for UDP with v4-mapped sockets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: ae5c3dfd3e75bb287984947359d4f958aea505ec Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae5c3dfd3e75bb287984947359d4f958aea505ec commit ae5c3dfd3e75bb287984947359d4f958aea505ec Author: Mark Johnston AuthorDate: 2023-10-17 14:29:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:19:06 +0000 netinet tests: Add error handling tests for UDP with v4-mapped sockets This provides a regression test for commit abca3ae7734f. Add it to the existing v4-mapped address test file, and rename accordingly. Reviewed by: tuexen, karels, rrs MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39216 --- ObsoleteFiles.inc | 3 + tests/sys/netinet/Makefile | 2 +- ...p6_v4mapped_bind_test.c => ip6_v4mapped_test.c} | 81 +++++++++++++++++++--- 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index c3cc72351963..9e4be6b69312 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231006: rename tcp6_v4unmapped_bind_test +OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test + # 20231005: Remove man page link for now gone net80211 function. OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index 144754acfbcc..44f76508bf5c 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -7,9 +7,9 @@ BINDIR= ${TESTSDIR} TESTS_SUBDIRS+= libalias ATF_TESTS_C= ip_reass_test \ + ip6_v4mapped_test \ so_reuseport_lb_test \ socket_afinet \ - tcp6_v4mapped_bind_test \ tcp_connect_port_test \ tcp_md5_getsockopt diff --git a/tests/sys/netinet/tcp6_v4mapped_bind_test.c b/tests/sys/netinet/ip6_v4mapped_test.c similarity index 81% rename from tests/sys/netinet/tcp6_v4mapped_bind_test.c rename to tests/sys/netinet/ip6_v4mapped_test.c index c7fc682d7ae7..d4c4ed526ab5 100644 --- a/tests/sys/netinet/tcp6_v4mapped_bind_test.c +++ b/tests/sys/netinet/ip6_v4mapped_test.c @@ -194,17 +194,15 @@ restore_portrange(void) "failed while restoring value"); } -ATF_TC_WITH_CLEANUP(v4mapped); -ATF_TC_HEAD(v4mapped, tc) +ATF_TC_WITH_CLEANUP(tcp_v4mapped_bind); +ATF_TC_HEAD(tcp_v4mapped_bind, tc) { - /* root is only required for sysctls (setup and cleanup). */ atf_tc_set_md_var(tc, "require.user", "root"); atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects"); atf_tc_set_md_var(tc, "descr", "Check local port assignment with bind and mapped V4 addresses"); } - /* * Create a listening IPv4 socket, then connect to it repeatedly using a * bound IPv6 socket using a v4 mapped address. With a small port range, @@ -213,7 +211,7 @@ ATF_TC_HEAD(v4mapped, tc) * and then the connect would fail with EADDRINUSE. Make sure we get * the right error. */ -ATF_TC_BODY(v4mapped, tc) +ATF_TC_BODY(tcp_v4mapped_bind, tc) { union { struct sockaddr saddr; @@ -315,17 +313,82 @@ ATF_TC_BODY(v4mapped, tc) ATF_REQUIRE_MSG(i >= 1, "No successful connections"); ATF_REQUIRE_MSG(got_bind_error == true, "No expected bind error"); } +ATF_TC_CLEANUP(tcp_v4mapped_bind, tc) +{ + restore_portrange(); +} -ATF_TC_CLEANUP(v4mapped, tc) +ATF_TC(udp_v4mapped_sendto); +ATF_TC_HEAD(udp_v4mapped_sendto, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Validate sendto() with a v4-mapped address and a v6-only socket"); +} +ATF_TC_BODY(udp_v4mapped_sendto, tc) { + struct addrinfo ai_hint, *aip; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + ssize_t n; + socklen_t salen; + int error, ls, s, zero; + short port; + char ch; - restore_portrange(); + ls = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(ls >= 0); + + memset(&ai_hint, 0, sizeof(ai_hint)); + ai_hint.ai_family = AF_INET; + ai_hint.ai_flags = AI_NUMERICHOST; + error = getaddrinfo("127.0.0.1", NULL, &ai_hint, &aip); + ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); + memcpy(&sin, aip->ai_addr, sizeof(sin)); + + error = bind(ls, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind: %s", strerror(errno)); + salen = sizeof(sin); + error = getsockname(ls, (struct sockaddr *)&sin, &salen); + ATF_REQUIRE_MSG(error == 0, + "getsockname() for listen socket failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(salen == sizeof(struct sockaddr_in), + "unexpected sockaddr size"); + port = sin.sin_port; + + s = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s >= 0); + + memset(&ai_hint, 0, sizeof(ai_hint)); + ai_hint.ai_family = AF_INET6; + ai_hint.ai_flags = AI_NUMERICHOST | AI_V4MAPPED; + error = getaddrinfo("127.0.0.1", NULL, &ai_hint, &aip); + ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); + memcpy(&sin6, aip->ai_addr, sizeof(sin6)); + sin6.sin6_port = port; + + ch = 0x42; + n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_ERRNO(EINVAL, n == -1); + + zero = 0; + error = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(IPV6_V6ONLY) failed: %s", strerror(errno)); + + ch = 0x42; + n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(n == 1, "sendto() failed: %s", strerror(errno)); + + ch = 0; + n = recv(ls, &ch, 1, 0); + ATF_REQUIRE_MSG(n == 1, "recv() failed: %s", strerror(errno)); + ATF_REQUIRE(ch == 0x42); } ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, v4mapped); + ATF_TP_ADD_TC(tp, tcp_v4mapped_bind); + ATF_TP_ADD_TC(tp, udp_v4mapped_sendto); return (atf_no_error()); } - From nobody Tue Oct 17 15:55:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8k2kdCz4xgWt; Tue, 17 Oct 2023 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8z8k172Yz4F2j; Tue, 17 Oct 2023 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdZUa21RB5EVMyq0nqDl33y5HEB7q9AUuMOOFkxezg8=; b=KYUCDqrNXARU285B5Bk3J3wbE+1yPbkOHXQB9x+EB5ImpRm0phV8bYnnGzcmmlxl7df4va IALj4yP8tcaO5BvM6ApFj+nHWNYCfsvkJ41n0oFsWVtu8BOxDwQwEJFFmV7ku80n5GY09A qTStRmCTbqUEYSN4gHUbBT6KwmlI/tKAxIqkN3/9jDqi/Y4CEzWHVuNuUe7Rb27ctOeKai GfX8hkFzTGiQ5PbAdnc5t39LoiAqvsl9zv3NTy0GkPMaguyKBuO8FdRSQxyfIZIrEFfY4J TiGZ0xt/27EfS21/nkkgKFxkk963x6MfCpt24Unt/KRA3MDgFEY/g/f19z8QDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558134; a=rsa-sha256; cv=none; b=nNKAHrlUvKwKCR1LT93K4yGKUL7EOkvnwt0ZemAgaM8fPyAJ4N1BaQsKAyLHLoJiCyI8c1 6kpHZK/GJl99cenFHEvzSUPMrsQsKHz7lxfjLuB0IpqCVoQSrcIKT+giFh7D39KeI5KJ8/ ABGraNkSnCVVH0cL/OhVGHSu7Uekvdqw5v81shOpccb70X7Mpww34HeM5YDnPZPTXOHW9O LEKt4Rjvz0RU1gcyClxs8SOtUJ5F43NLCuqcob6UwOYaVVvDyX7/OVsR3VcAVZ79osYcF8 ILGwAlQxGZF34Ho1f/bZSfLOfzh1uKKro0vm98R8ERG3wM7BIYYaR1T/HSQIZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdZUa21RB5EVMyq0nqDl33y5HEB7q9AUuMOOFkxezg8=; b=ebpclrZ6LTjGK5lVzy+LQpbuFRv/zHem462GL2U+EQgaQZBQ7RNr2vZrE63TRUUqOc0WR1 MXACrlRFFch9a1KnmGFlgcQvQV7O5fm0GgjxXSUQkCYEdWvTMeIOb2NOPI+TprDnnqImxK PscNAnkq0+/Miuhfz3wJbjAsWMl8bFTH5CHrLxRRZwEnWc6xW6juyRyJpIXiuK0b8/6foQ yDENjQreYketfXJLLCACiK+ByLoLVbwyPd+uRJnUlGJYTQjQW31m/ipHzpJVnFjzySbe5K D8H5/6Po06ykTr94J9ahUCPkrd3zMjw36RODkM+8sRQNb6BsBuD+vwRkkKnTTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8k0D9HzVhK; Tue, 17 Oct 2023 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HFtXlE029131; Tue, 17 Oct 2023 15:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtXHS029128; Tue, 17 Oct 2023 15:55:33 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:33 GMT Message-Id: <202310171555.39HFtXHS029128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fd8b9c73a5a6 - main - bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a commit fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a Author: Jan Bramkamp AuthorDate: 2023-09-04 08:38:25 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:24:11 +0000 bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS Creating an IP socket to invoke the SIOCGIFFLAGS ioctl on is the only thing preventing bhyve from working inside a bhyve jail with IPv4 and IPv6 disabled restricting the jailed bhyve process to only access the host network via a tap/vmnet device node. PR: 273557 Fixes: 56be282bc999 ("bhyve: net_backends, automatically IFF_UP tap devices") Reviewed by: markj MFC after: 1 week --- usr.sbin/bhyve/net_backends.c | 52 ++++--------------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index fa7cd9c81f46..99781cfdcbb6 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -42,9 +42,7 @@ #include #include -#if defined(INET6) || defined(INET) #include -#endif #include #include #define NETMAP_WITH_LIBS @@ -180,17 +178,6 @@ SET_DECLARE(net_backend_set, struct net_backend); * The tap backend */ -#if defined(INET6) || defined(INET) -static const int pf_list[] = { -#if defined(INET6) - PF_INET6, -#endif -#if defined(INET) - PF_INET, -#endif -}; -#endif - struct tap_priv { struct mevent *mevp; /* @@ -222,11 +209,8 @@ tap_init(struct net_backend *be, const char *devname, { struct tap_priv *priv = NET_BE_PRIV(be); char tbuf[80]; - int opt = 1; -#if defined(INET6) || defined(INET) - struct ifreq ifrq; - int s; -#endif + int opt = 1, up = IFF_UP; + #ifndef WITHOUT_CAPSICUM cap_rights_t rights; #endif @@ -254,39 +238,11 @@ tap_init(struct net_backend *be, const char *devname, goto error; } -#if defined(INET6) || defined(INET) - /* - * Try to UP the interface rather than relying on - * net.link.tap.up_on_open. - */ - bzero(&ifrq, sizeof(ifrq)); - if (ioctl(be->fd, TAPGIFNAME, &ifrq) < 0) { - WPRINTF(("Could not get interface name")); - goto error; - } - - s = -1; - for (size_t i = 0; s == -1 && i < nitems(pf_list); i++) - s = socket(pf_list[i], SOCK_DGRAM, 0); - if (s == -1) { - WPRINTF(("Could open socket")); + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + WPRINTF(("tap device link up failed")); goto error; } - if (ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not get interface flags")); - goto error; - } - ifrq.ifr_flags |= IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not set interface flags")); - goto error; - } - (void)close(s); -#endif - #ifndef WITHOUT_CAPSICUM cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); if (caph_rights_limit(be->fd, &rights) == -1) From nobody Tue Oct 17 16:41:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S909v74GMz4xkGj; Tue, 17 Oct 2023 16:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S909v63y1z4Qqg; Tue, 17 Oct 2023 16:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzyM3ATpZRCv0UQ1fXNZlfYdE4tUxS2hD9aUitdWCCo=; b=xX72rYK6GC9NuBUnoHUNZK88aPtjw8fuDztJ9xc8fauuNI+epJQDwBNHw0SSAmCK9wAAi3 pyy8KmvoBmz+VYUJjpD/vzZcaQVgBWhAJ6FDtQHzFcJNhiVmEBi2/AqfOev+YO/rlnntMf O5gZ3bUNMmivRhr68fUPu1LCCY3HtKCClTa1zI5SPySEIhPKTmO0m03DVrlto5p3l7CbeG 0MiUD9Am/6+t36I/rBq+5dHi50WhjThUK9eWzl+SQmIHRCjcRPZcsnSbFyhUaDw+tDmOro GpoT+WhngvVqD5UTMF7/Sycpz8MAaRKAYRqV9LX4VAaNwqvTIyCGiAg1CGzF7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697560899; a=rsa-sha256; cv=none; b=ge8taFMR/xcTLK5DddIKmTptENu0wRl+4C3w+WezaPeBfIsXlmzyJl/AbNlxKyR6LneEaG tIREBTvfohbfTMamYU5Kq51eSFJwgInfz2r1gSsLKpASpSm4x2sDyXjbivcTcKj+c7JcQP kYoKMbNC4qIijM7uGbph6yHjd/r2xsEJAaHt2VbOxhkatls16EYFIL4KprB8x1TL9JKMQG d/hsjA8SOXw7Amm6Fny/dyri+QYiI7H3o+gZgyNS4cJcY1QcOGERQEXyJ45p+e5MbEcUQF g4JBRP6ce6lgIfJtZabSZxO7MAV7e3lgz/At72lFjCaasYGOFaRuiG/H/1RSlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzyM3ATpZRCv0UQ1fXNZlfYdE4tUxS2hD9aUitdWCCo=; b=tlw5WDuaApF4Bw18DbWPJW0nPv+bsd76JMf0o0lgGCBV45b/da/hg+3Wo7+Ft+d7g4SuRX kdC0IlC9PV6rKoYydMrTTsAMY1OC06hn5J5ildyI+DBBDUcvwaAffx9smryozUIzvWkB8u uqcivcS30MwLo7sW0Za0oNo+c30k0gCjDx+JyLRpV8Cx9xK4GmCBulSlTXkYbBmbesgGU4 3gt7gfPIHnoI7jQ7YtLUGtmNXi6ehA2RqBHO7x6DnVkJZRF25sQvcrTe+aDQkczoxD5fAZ pwjvu6w+RIGsQTgrgLgfpypJ6uWrA06X4SDLUJO7f4H7dsLx85+3+hxlNBfy8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S909v4qdhzXPw; Tue, 17 Oct 2023 16:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HGfdEj009906; Tue, 17 Oct 2023 16:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HGfdZJ009903; Tue, 17 Oct 2023 16:41:39 GMT (envelope-from git) Date: Tue, 17 Oct 2023 16:41:39 GMT Message-Id: <202310171641.39HGfdZJ009903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9ef7a491a423 - main - nmount(MNT_UPDATE): add optional generid fsid parameter List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 commit 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 Author: Konstantin Belousov AuthorDate: 2023-09-29 18:42:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-17 16:40:12 +0000 nmount(MNT_UPDATE): add optional generid fsid parameter to check looked up path against specific mounted filesystem. Reviewed by: mjg Tested by: Andrew Gierth Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42023 --- sys/kern/vfs_mount.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8364081585f8..aa4642c0ba8c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1313,9 +1313,10 @@ vfs_domount_update( struct vnode *rootvp; void *bufp; struct mount *mp; - int error, export_error, i, len; + int error, export_error, i, len, fsid_up_len; uint64_t flag; gid_t *grps; + fsid_t *fsid_up; bool vfs_suser_failed; ASSERT_VOP_ELOCKED(vp, __func__); @@ -1378,10 +1379,24 @@ vfs_domount_update( VI_UNLOCK(vp); VOP_UNLOCK(vp); + rootvp = NULL; + + if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, + &fsid_up_len) == 0) { + if (fsid_up_len != sizeof(*fsid_up)) { + error = EINVAL; + goto end; + } + if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { + error = ENOENT; + goto end; + } + vfs_deleteopt(*optlist, "fsid"); + } + vfs_op_enter(mp); vn_seqc_write_begin(vp); - rootvp = NULL; MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp); From nobody Tue Oct 17 16:41:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S909x0zSlz4xkD3; Tue, 17 Oct 2023 16:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S909x01dCz4QwX; Tue, 17 Oct 2023 16:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfRbJRYoax61Os9vKc3BXBH60LLU5Xb5sAOe4decnJA=; b=WVIHuFG/Yn9aZynmh7spt8YRWnAUZtoV3s9u3hDHZVRrJesHemr6PIECPhugg2iV2TO1qZ nLYX4xZ8Y75ro52K/8Wmk0bKVrShWtwLvJteu5foLiKJSj8GMsTU/YHmym8YjjSlWkPK8I nSaiMb7s7mEHWmF4WTBD46210MoVnGTf4nRZsUwvZDRyHkuyH6bcuHozEMI/zGfmJHMwQT U0oTiJwdhzGxnzkJWQ782Bya89jmhf3jt0T93mpbEp79YzTqodSNaRxMVmsuPKUCtlykps 7YICAF6jnySt8lfUPFY9drkPb09YfJ5Ta1brWOXO9b0ekxiN96DAYK4cklvC6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697560901; a=rsa-sha256; cv=none; b=CX0ydu1dpyJqSw5gxrEo9jKieFBH/iUF/9nq6ruArj7vU1H+jdapiKgOuEsewdORbIsdqE uWQ6X40+q17QRpBZo78i2dwfchE/eUXpki8VsTThzs20RvTUZ1NJu0Eqv9M292ub1u2/yP /+oOLOIQsAOboAU54hcVFJ8n2bvjEueX1ZJu9FXrImlsxsCUrR5Kk6ZkwKWkRd2W7+nfcG eiQm/oC1sx1Nw6ne8faB8X3PrmGOtjeU6gpP/9RHjIgE1HgjLmzrhhcnVvOrHzl8f/cq/N +y126KwKf9/6Gz9aG7Er8pPWlBBc4XTsY0DAplejWQ4n89/4JGuFKxstT84rUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfRbJRYoax61Os9vKc3BXBH60LLU5Xb5sAOe4decnJA=; b=eGWX5z9eX/2gaXLnTCLbqbTYP7wIaGmlI197X1D/rzUz/I7JTxD8zcyhjcGoOO7ANSr3qU +aoTo0Q7RT2YdGeb9tk6Nhe/X3qIsNztdeQDavBCJkm+/E65zLlDlwAiGbcfqZspOknHRQ WrMNu00JH5AjzyoJKJEc82idfQlclq9kPA5Um0La9EdaN2VYHjjVYu8cPLBoGtyNuNlFy1 r4MBGrxSCs16d3dUuGr9yecp8JRVv38PCGVetAolWbo8KZSmjoiJ4UDTFafwnxvrj1OYHO a9NYuRKx4Qf0S2kamnm7nsMJhGeqe1AgQxvLMioI/5N1YyU/oVmGsGZnkUq1eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S909w5lbHzX2S; Tue, 17 Oct 2023 16:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HGfeaA009957; Tue, 17 Oct 2023 16:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HGfeCS009954; Tue, 17 Oct 2023 16:41:40 GMT (envelope-from git) Date: Tue, 17 Oct 2023 16:41:40 GMT Message-Id: <202310171641.39HGfeCS009954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 21b8e363c4eb - main - automount: check for mounted-over autofs instances on flush List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 21b8e363c4eb24c0a5659101603cc08a86d87759 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21b8e363c4eb24c0a5659101603cc08a86d87759 commit 21b8e363c4eb24c0a5659101603cc08a86d87759 Author: Andrew Gierth AuthorDate: 2023-07-10 15:09:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-17 16:40:45 +0000 automount: check for mounted-over autofs instances on flush PR: 272446 Reviewed by: kib MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40961 --- usr.sbin/autofs/automount.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index 188bbc3a040f..cee647cb4e2c 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -260,6 +260,7 @@ static void flush_caches(void) { struct statfs *mntbuf; + struct statfs statbuf; int i, nitems; nitems = getmntinfo(&mntbuf, MNT_WAIT); @@ -274,6 +275,21 @@ flush_caches(void) mntbuf[i].f_mntonname); continue; } + /* + * A direct map mountpoint may have been mounted over, in + * which case we can't MNT_UPDATE it. There's an obvious race + * condition remaining here, but that has to be fixed in the + * kernel. + */ + if (statfs(mntbuf[i].f_mntonname, &statbuf) != 0) { + log_err(1, "cannot statfs %s", mntbuf[i].f_mntonname); + continue; + } + if (strcmp(statbuf.f_fstypename, "autofs") != 0) { + log_debugx("skipping %s, filesystem type is not autofs", + mntbuf[i].f_mntonname); + continue; + } flush_autofs(mntbuf[i].f_mntonname); } From nobody Tue Oct 17 16:41:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S909y2zbGz4xkD5; Tue, 17 Oct 2023 16:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S909y0nM3z4QnX; Tue, 17 Oct 2023 16:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/U6g+h+mdm6Sty58ElnRDHg0+nMgNM66JT04PlRe5c=; b=RBOUjRJpyKeMqg3W4TIwtsCRwpFWDZgGlp3N2hwvr2QUaxz6zQiOHtK3d1FM/nTxKs5oRh JfAgRO8WxPNAuzEHNJgGW1g8556RQfsqZDIki4OxXneUOztY/5+3KL1kU29fH5POQ6yWUm TK8xUtMxm5CEhZ5s2/fMWRyECinHgsP4wTSExWJw/6Z+DgeGiin8iYQrCmYWW8dDjVflAq mwnBypEgLw0VnGXNM+GQwWe46J6MQNhGEzEtn5LoT/Ew6g6DkEmgPCTvG3IokBdhnGEuET u+sf6sUB+WmltvC5TA1v+03naTvc44W2p9Lyd1sCDLsuMYR+R30oCNqC7xz/vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697560902; a=rsa-sha256; cv=none; b=k52NQZdFj9GWfGVFsJCMiJXoDLQblyd7yUi6TaCVKD+1GPvu/UwYqzfYgQAL+idSnnYuXk A6Ps7KputIUfUtXWqc14XmBWaYhyjzzqunVpD3Is3KM3iJa43dFIFkiVxovPbf6tXK3AIS 8TjcJn47Au6exa7Ib1vxwkkpUHNePI+Bq8syHe3V2BXA269ifu62Wlxu1KPguOC7ACol1M 9hyY8SxASYYRrvp0NNdUZ0+M54c/DkJTTojvc8vav8thG9cG7cH/dIBxqhMtfFUfK9Jj1v JfMFzDPrlpQhpY0ZIZnW9aWzk/Nu9CxifGM2LZHs34qiWhgTwEDqLU03sBxayQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/U6g+h+mdm6Sty58ElnRDHg0+nMgNM66JT04PlRe5c=; b=mQluodW+pAF5nylpyblaDolJ5nI3QwmR+69sDGeg1ouF48UQzwVOjxfE7TJF3FPjfgDpM7 /PB+Jn3Pk7Z6eqnU3Qhq0N79warFD7ci8xCYIMd7iIQOXG7UYfEZivT2h3RbX/p8wc6X1N lJOD5vV3VIeCa8mZ+QPVF9UZGmO2zClCrfFEo7R7gZ5xG8ZGDme/kKH39rOZipAxJhb+u3 NIETEt8k9tvBGQni1+prsQ/hqud9MflcWuwH7Vc8esbCJogPV+tMrpGX98JOp+F3hnVdRS XC4H1DO1Uze8ufKilX+BoVUPOgWCMIHpKeksMlRzjoexacwLLfaGtgnzLfQUCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S909x6mZJzXFj; Tue, 17 Oct 2023 16:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HGffTB010003; Tue, 17 Oct 2023 16:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HGffnj010000; Tue, 17 Oct 2023 16:41:41 GMT (envelope-from git) Date: Tue, 17 Oct 2023 16:41:41 GMT Message-Id: <202310171641.39HGffnj010000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 56c44bd92efa - main - automount(8): when flushing autofs, specify fsid List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 56c44bd92efa002b2185445878fc98172ae8c66f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56c44bd92efa002b2185445878fc98172ae8c66f commit 56c44bd92efa002b2185445878fc98172ae8c66f Author: Konstantin Belousov AuthorDate: 2023-09-29 18:43:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-17 16:40:50 +0000 automount(8): when flushing autofs, specify fsid Which should avoid situation where flushed filesystem is not autofs, because it was mounted over autofs mp. Reported and tested by: Andrew "RhodiumToad" Gierth PR: 272446 Reviewed by: mjg Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42023 --- usr.sbin/autofs/automount.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index cee647cb4e2c..6637e16c9129 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -229,7 +229,7 @@ mount_unmount(struct node *root) } static void -flush_autofs(const char *fspath) +flush_autofs(const char *fspath, const fsid_t *fsid) { struct iovec *iov = NULL; char errmsg[255]; @@ -242,6 +242,8 @@ flush_autofs(const char *fspath) __DECONST(void *, "autofs"), (size_t)-1); build_iovec(&iov, &iovlen, "fspath", __DECONST(void *, fspath), (size_t)-1); + build_iovec(&iov, &iovlen, "fsid", + __DECONST(void *, fsid), sizeof(*fsid)); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); @@ -291,7 +293,7 @@ flush_caches(void) continue; } - flush_autofs(mntbuf[i].f_mntonname); + flush_autofs(mntbuf[i].f_mntonname, &statbuf.f_fsid); } } From nobody Tue Oct 17 17:17:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S90z25MZqz4xmFp; Tue, 17 Oct 2023 17:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S90z24tBfz4WlS; Tue, 17 Oct 2023 17:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697563038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xImLEE7T8cP9ZSGnPJeLAllalnoqfR7Gth5I9+icoTE=; b=PQj+I9rgu6JKzF3M92Ig7vvTn1GmSa46+sAOWrsLwdh9wGU3z3sLcTevdKZdDmpfi/kVLb HEHB41gw/YOKAAci30OsuO995JbnsIj4moVEb3CxPswedw7VdloHfs+CWE8OmKOG/wUP69 Zakng3gHhnSjWxEdYfm32+9rGhV3WfdSI51tbzFduRvq0JCmRuNDmSQrp5VpfNmJYtvb0N VY+64mhAUPjxWX+kMoYKozStgaoBrPMvR759G8VZutkFgD+EEUVg0S2wi1lo8/v2wgbB6T 9lHXwZhWLQ8fuSGDAgvA8u7c1+GDyxrGB4LDvnWrRU8hmTqpzHVOo01DkGlQRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697563038; a=rsa-sha256; cv=none; b=gfbAp5GPvcNXCKhniRCcSbFYse/JH0yXnnbcH/KgkExpNfgXmCw43s4lyAtjOSGJVlTaCH GiZhPpReOp0o+PWcgLCRO8in3mkCh6EFrazi3VZtbogbKcd1A6ocQbnIAytOa0/rnUNkGO 5sBBfMCODslXnax0L0Y3bH+trquxHr/OhZ49757ME0fqVI9Rj+1en2aSVvqT2aKgKsIXqF kM8pxdMacbK5pXO+SFyOZO+EAwFDT5DVtb6eBzgGtqIXyxDdwxVac1/UQK7Q/rC6lfbGZq vg/lWDCdTNaJHd/kw3fGYLwT0pgljcRzS3K88dXzNf9FfmvXEKaxEwx39mGgdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697563038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xImLEE7T8cP9ZSGnPJeLAllalnoqfR7Gth5I9+icoTE=; b=Kr6IPsF861IceKB/1FRHIHsVj9sC369PqBQ7OMJ3rejy4t2v7AgWhlrCo73lrUyzDYHxR8 QS0msNPlmlaOPyl39aiX+CKlORa3bdmAkt9K11GgFOZmPkWuyiUvPajHxe8XbTSndgqQon 05SDy4b2/WfFpLp13VenJQ7/1mjRj4XuWVRSfvUQlxXLO/bVdjwGEDqKsbhzBg76Hme2Ka Tsmw4EXBaLKruJqmFxgfvv4GDhYUUjiTJzweIrQD9cpqAssLkSWP5FcYUWGhsRcuc9oLMs jimPNt21CCyqEMTkRr1II1wXZB5SMbZu3+xcLcvv/BB8aXYrk0KJAqiwAfGeCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S90z23dk7zYVy; Tue, 17 Oct 2023 17:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HHHIDV063320; Tue, 17 Oct 2023 17:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HHHIWD063317; Tue, 17 Oct 2023 17:17:18 GMT (envelope-from git) Date: Tue, 17 Oct 2023 17:17:18 GMT Message-Id: <202310171717.39HHHIWD063317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9b42d3e12ffc - main - mkimg: Ensure GPT Entry Array is at least 16k List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 9b42d3e12ffc6896fcb4e60c1b239ddf60705831 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b42d3e12ffc6896fcb4e60c1b239ddf60705831 commit 9b42d3e12ffc6896fcb4e60c1b239ddf60705831 Author: Warner Losh AuthorDate: 2023-10-17 17:14:14 +0000 Commit: Warner Losh CommitDate: 2023-10-17 17:14:23 +0000 mkimg: Ensure GPT Entry Array is at least 16k UEFI v2.10 Section 5.3 documentes that the minimum reserved space after the GPT header be at least 16kB. Enforce this minimum. Before, we'd only set the number of entries to be the unpadded size. gpart's selective enforcement of aspects of the GPT standard meant that these images would work, but couldn't be changed (to add a partition or grow the size of a partition). This ensures that gpart's overly picky standards don't cause problems for people wishing to, for example, resize release images. MFC after: 1 day (we want this in 14.0) PR: 274312 Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42245 --- sys/sys/disk/gpt.h | 7 +++++++ usr.bin/mkimg/gpt.c | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index e48b13684814..596a5cba1681 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -82,6 +82,13 @@ struct gpt_hdr { CTASSERT(offsetof(struct gpt_hdr, padding) == 92); #endif +/* + * The GPT standard (section 5.3 of UEFI standard version 2.10) requires + * we reserve at least 16k after the PMBR and the GPT header for the GPT + * Array Entries. + */ +#define GPT_MIN_RESERVED 16384 + struct gpt_ent { gpt_uuid_t ent_type; gpt_uuid_t ent_uuid; diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index 59c51a6a177b..ed3f008c394f 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include #include @@ -124,13 +124,21 @@ crc32(const void *buf, size_t sz) return (crc ^ ~0U); } +/* + * Return the number of sectors needed to store the partition table. + */ static u_int gpt_tblsz(void) { - u_int ents; + u_int eps; /* Entries per Sector */ - ents = secsz / sizeof(struct gpt_ent); - return ((nparts + ents - 1) / ents); + /* + * Count the number of sectors needed for the GPT Entry Array to store + * the number of partitions defined for this image. Enforce the 16kB + * minimum space for the GPT Entry Array per UEFI v2.10 Section 5.3. + */ + eps = secsz / sizeof(struct gpt_ent); + return (MAX(howmany(GPT_MIN_RESERVED, secsz), howmany(nparts, eps))); } static lba_t From nobody Tue Oct 17 17:53:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S91nH4Sb2z4xnsx; Tue, 17 Oct 2023 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S91nH3h37z4cP2; Tue, 17 Oct 2023 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697565235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGWmyKkthJcoAbPup5VEzXTX9rjFMVD6VzO4wdErfN8=; b=s89hkYUhiwQbPhDzuYzqig3YPylGwkCgSe7C850FjReTTweHxRywX1mdgQqsiHGS35vk1p jw2hGnr6j2BGiD7GdbGYY69RVbWREcrWYCGOq9ATO/6bS5bS4OObIciHGgPIu9TvgeVjxs 4dLIuLpZACrtanCzMae9qXl03zLCbau0f4FgfvH2H9Usk1MO1IaNQQ6wIT+D7vBBjsiycZ pYknFLv8Tr6PtvQWtd4r0YjJ07Dnjw+DP2PSlTJpLoppWVxFWZlDCvStx1pHq8seVYHVD3 /DuFgjWvmqQfZp2quC2aqjSZs6jry7zl8ENBsSMm5aYlhWjVifdQcVyCDzQujg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697565235; a=rsa-sha256; cv=none; b=YVwLp9hwDXG4+NhxUe3PSlF19IRsNRddCCiXzhrYjFIZ1F7/JnS+TzaNkWRRFeOaW4jFqV e4NEwDF6sqkRShpQ+DlsHs4sgP2tAzMmdfStzaNKhYC0DFvmKGMcm7LxXer30MNtMT2AD3 N1qNEwVaFmdCFSLK3YQypwIwtJTdvwieFa8F2nbcj3F6aXuYbXNvPRbomI3OUGPRGrfCSO bxuess1Isrw3r6IukETq+2qoDs2HlueEUP7FbTXiwkqp33LJ5tXeTQhC7ZWFlBRMAkkYp8 T3UkIPIuShI7iLqWWImX2s+eWBzSQTpEO7edk0YdZwohCadLHa48tLbrhSn+9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697565235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGWmyKkthJcoAbPup5VEzXTX9rjFMVD6VzO4wdErfN8=; b=NbqKCIphxNAclFhSseIxNgFzqQ+blZDOidmZlzpvsSsUK/uUoPjjmpPqqJFt0u4mea0xpC hVDv5HimHyPePzd9xM3cvQyPo0Kb7ktBypK+o7xAoGLQM5UmpwzZ9q3uM4ovdFI9i1KOpN cWLyGi85NsoOGqkRAgavIKktsOA5xWvEhyDWlYySn2IhsOK+dT6vLbZ5urKg1ShtlgZPuR 0PUICGOXD9KHjQjEuUEaaQWEbtvkEZDonFQEmq5I5GTwNMSVrC5ZmHpmAzKVa1/kuixTKP 48PuI1zUwS5Attud2LoGf1chbzJKIees9GOTb6FMX+bS7kbDF8KaFu5Ev6Rx/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 4S91nH2lPSzYnf; Tue, 17 Oct 2023 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HHrt8C029253; Tue, 17 Oct 2023 17:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HHrtN3029250; Tue, 17 Oct 2023 17:53:55 GMT (envelope-from git) Date: Tue, 17 Oct 2023 17:53:55 GMT Message-Id: <202310171753.39HHrtN3029250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2ee2890249ca - main - Makefile.inc1: remove ncurses/form from _prebuild_libs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2ee2890249ca359c1f5ee91f184eac13aec37a77 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee2890249ca359c1f5ee91f184eac13aec37a77 commit 2ee2890249ca359c1f5ee91f184eac13aec37a77 Author: Ed Maste AuthorDate: 2023-10-16 13:12:16 +0000 Commit: Ed Maste CommitDate: 2023-10-17 17:53:45 +0000 Makefile.inc1: remove ncurses/form from _prebuild_libs As of d287d3282f43 libbsddialog has a built-in form implementation and does not need a formw dependency. This reverts commit 483a226238ed8949c6d280ae0757a0683962a74b. Reported by: asiciliano Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 67dce43e5228..68549d91598d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3038,7 +3038,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_lib_casper} \ lib/ncurses/tinfo \ lib/ncurses/ncurses \ - lib/ncurses/form \ lib/libpam/libpam lib/libthr \ ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ @@ -3075,7 +3074,6 @@ _lib_libradius= lib/libradius .endif lib/ncurses/ncurses__L: lib/ncurses/tinfo__L -lib/ncurses/form__L: lib/ncurses/ncurses__L .if ${MK_OFED} != "no" _prebuild_libs+= \ From nobody Tue Oct 17 18:32:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S92dr5CRjz4xr9s; Tue, 17 Oct 2023 18:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S92dr4k2Wz3Bt5; Tue, 17 Oct 2023 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV3GSpiIkTVPKecU29DBDimwndgKA1TidU4BiDz9bD0=; b=cVSFavrwcsp56uaJsxFx2CD3WSR+oCEhMscd2pjT5+FcwkzzH4RwYYXsku3s22A9xUHNuL lOtHMJwAzI942fkLBxI3/VBo1F59Ygb1goMydbTh8lnJMgJviPqNYejkOL2VhzSe2gJdLy yZsmEIMUgqvwN8FrsiNAb6KOp22UvDg+Sp2xkS2G74FRKa15sZSSiXR1XVbAElZ5jZxJLI QP6yDwJehZGga7ayUT37xh2vEBQLMP/8g3gxHfAEV9kAy9NKyV+HSGtmyX+Gh4Vz2YUz8A UyVCHbYX72opjXTUbkx6ymjW6idveqtcpLkBOyhPXbgl1X+s9+CDdZ+/reiEng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697567552; a=rsa-sha256; cv=none; b=y0UCPZAt/VXs844XJk0a2igrsT8JyRzLuA3rND0gVtn0xRbo6L1VSYGVwd0uRSoE5W+eHL LYiQSEnPjyW4ELBjGHuJCKlbZs2DVG9KwGSVJm+vwF1QLYeDfW9/AIDfLcho/g29KWxAMa C72i+skEs9YPU+ICiLUj97eqaB02mdKvFaHpu02DXfq4hL7yLQ/Y3KwxhEG+rXUsOAqWhi SSHvE4sDGWmfhi8yrwKN4QFwLTW9SbzF3kWmWHm7w3NK0kX6vx2Ix300VUeqYFLO1hROyP mYL6MFeRZELag5H0XIdzp4O5ft6siRh5U6WzOE1ZzeDrZTplzv9/zqPUl/wsZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV3GSpiIkTVPKecU29DBDimwndgKA1TidU4BiDz9bD0=; b=OW0mZio4Dkal4irHIa0Voclu0SCxnlTYxffoVBmdj2aSDCURKh+rC+7lYGhB8Mfa1++ZMx xG+bz+Mcu1JAmIX1DhCMulVHlbp/CUIl6/DUnr4famUW6vuUGYHtSlEKZlv48aQyCe35KC KzwTUJ3xRjF+0agMsXbL5K7BGs9aIQFEPM3vUbYys9KhaV9kFMyqOTCCfFbzj1ZFlTTBIO ilpwuiVuX9SwUx/zl2kY4HFgWMqYTCxAKDaJn6Z6gn5BVyg4LMSvUdH3SBUSrXI1X3/Ugn /VFd4VU9/1MPQhrdhROyP14kc19fWmyQwLx9V1FNVjOEOHWEQ15fVkN+PpaEjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S92dr3nbkzbZJ; Tue, 17 Oct 2023 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HIWWu1095930; Tue, 17 Oct 2023 18:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HIWWiG095927; Tue, 17 Oct 2023 18:32:32 GMT (envelope-from git) Date: Tue, 17 Oct 2023 18:32:32 GMT Message-Id: <202310171832.39HIWWiG095927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7de582874eb9 - main - bhyve: Remove init_snapshot() and initialize static vars List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 7de582874eb9d08f3f87d11ed9e2b9ce8306db79 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7de582874eb9d08f3f87d11ed9e2b9ce8306db79 commit 7de582874eb9d08f3f87d11ed9e2b9ce8306db79 Author: Vitaliy Gusev AuthorDate: 2023-10-17 14:16:08 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 18:26:51 +0000 bhyve: Remove init_snapshot() and initialize static vars vCPU threads are starting before init_snapshot() is called. That can lead to corruption of vcpu_lock userspace mutex (snapshot.c) and then VM hangs in acquiring that mutex. init_snapshot() initializes only static variables (mutex, cv) and that code can be optimized and removed. Fixes: 9a9a248964696 ("bhyve: init checkput before caph_enter") Reviewed by: markj MFC after: 1 week Sponsored by: vStack --- usr.sbin/bhyve/bhyverun.c | 3 --- usr.sbin/bhyve/snapshot.c | 21 +++------------------ usr.sbin/bhyve/snapshot.h | 1 - 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 0d7f58509244..8147dcd3872b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1021,9 +1021,6 @@ main(int argc, char *argv[]) setproctitle("%s", vmname); #ifdef BHYVE_SNAPSHOT - /* initialize mutex/cond variables */ - init_snapshot(); - /* * checkpointing thread for communication with bhyvectl */ diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 5f643c9ceb50..edce55c03eae 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -137,8 +137,9 @@ static const struct vm_snapshot_kern_info snapshot_kern_structs[] = { }; static cpuset_t vcpus_active, vcpus_suspended; -static pthread_mutex_t vcpu_lock; -static pthread_cond_t vcpus_idle, vcpus_can_run; +static pthread_mutex_t vcpu_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t vcpus_idle = PTHREAD_COND_INITIALIZER; +static pthread_cond_t vcpus_can_run = PTHREAD_COND_INITIALIZER; static bool checkpoint_active; /* @@ -1395,22 +1396,6 @@ vm_do_checkpoint(struct vmctx *ctx, const nvlist_t *nvl) } IPC_COMMAND(ipc_cmd_set, checkpoint, vm_do_checkpoint); -void -init_snapshot(void) -{ - int err; - - err = pthread_mutex_init(&vcpu_lock, NULL); - if (err != 0) - errc(1, err, "checkpoint mutex init"); - err = pthread_cond_init(&vcpus_idle, NULL); - if (err != 0) - errc(1, err, "checkpoint cv init (vcpus_idle)"); - err = pthread_cond_init(&vcpus_can_run, NULL); - if (err != 0) - errc(1, err, "checkpoint cv init (vcpus_can_run)"); -} - /* * Create the listening socket for IPC with bhyvectl */ diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index 179aafb6471d..8bebdafd6117 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -100,7 +100,6 @@ int vm_resume_devices(void); int get_checkpoint_msg(int conn_fd, struct vmctx *ctx); void *checkpoint_thread(void *param); int init_checkpoint_thread(struct vmctx *ctx); -void init_snapshot(void); int load_restore_file(const char *filename, struct restore_state *rstate); From nobody Tue Oct 17 19:03:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S93KW5xz7z4xsZZ; Tue, 17 Oct 2023 19:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S93KW5NLBz3FSX; Tue, 17 Oct 2023 19:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697569407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5EpUYc8BJDcUizQLQrq2DI+5Drp6TJFlVOSZZnIkjM=; b=ZoMKXrFk0lLkRxkbDDXNgatS8MMxk89M0C6UwTADEfDCWHid22V6CjwcBVGXSjVOyuv9He YAvXfZ4eZarkQOPn28Wd5YDkZAi8Rm1gAs+xfD/Jc/IUZ91iyEg4TihgNijdQfQMRrDWut EbZRkdmTTPBcAajha+9FD2tKS45XuguiorZYTYyUh9g4I8XejcRfQBzkmV9QhJjbq6DCZL euHqZ+hAPK/wrioc2JWPmhImWcHTG37SxzCfTGDRJwmsCEXx9s9wY5V4MLExrGUXdtybw1 8Nm2qsE4KgmqNr8WHNbrmUGqZC066u/ANo+aGomoOb8v+8WMmH+Ln+77mD9bOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697569407; a=rsa-sha256; cv=none; b=wcn52FU0e5sLt9SfQ5iEGQNapuQTiAfY+9DM9ad2QMtXFmybxQviRP1dLwaLnpfP4au1NK lEVCVqfSLzeSH86lcU0UP54S9O8/m1GV0Xunf63arBzChRxtGhr2SwJv/FsiRQXdFhux6p Ve4IKDO9wZ4hKGaaiiteye7Jy8cauI/t06yNWwcxSA6tgRzIpZb0L0MIZ8A++Bdrq0Rqw6 HPQowPsQN0z0EnhSdDplNklAhWjpu8v8fby7PffjDJE3FSnmReVPTPY/CKOA7di6N/jzma nsclSmHpAOK0uZQWnTxuJBmttz0OXJy33vcGkNroomwloExQbYvlU0HIRodd7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697569407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5EpUYc8BJDcUizQLQrq2DI+5Drp6TJFlVOSZZnIkjM=; b=tvLlGttAsoB7R3Tt4NsxkkAOQZoZvKrVQycRWY2zb0Am+hvdgrw7iugq/3mPmL59IwUndx 4rRIwdtIgRij3pKF+t9QZaZwondQGDzy1/8lTsPnYUJ+ztjE/Mn8l3GC7byrSd7DJpoC2x WPea1Gt+fpCpA93JGu1esfQEtp0r1hakNh7jJmnlkMiIrVDUuC8Rtb+tdT15PCXw84MkC7 nevXovUMDLcn8LLR1U125Xcqua3E1H0TxU+YdQJDNa+yjnMOaCe25cVQcuStmXsNW56zlH /B7QybRkDGk25guCyzK6lRzjTVEAnTwbLWdvOYuUPNKB4+e40g7iTYeBpb+vXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S93KW4RDrzcGK; Tue, 17 Oct 2023 19:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HJ3RM5046825; Tue, 17 Oct 2023 19:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJ3RKj046822; Tue, 17 Oct 2023 19:03:27 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:03:27 GMT Message-Id: <202310171903.39HJ3RKj046822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2bb78b46e024 - main - ndp: fix timestamp display output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2bb78b46e02413483409fe73244995524b838b6e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2bb78b46e02413483409fe73244995524b838b6e commit 2bb78b46e02413483409fe73244995524b838b6e Author: R. Christian McDonald AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 17:01:38 +0000 ndp: fix timestamp display output The current xo_format string is incorrect. This restores the display format prior to libxo-ification work while also explicitly marking tv_sec and tv_usec as encoded output only. MFC after: 1 week Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42269 --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 1e3469d54228..b7bc25dd7aa4 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1544,7 +1544,7 @@ ts_print(const struct timeval *tvp) /* Default */ sec = (tvp->tv_sec + thiszone) % 86400; - xo_emit("{:tv_sec/%lld}{:tv_usec/%lld}%02d:%02d:%02d.%06u ", + xo_emit("{e:tv_sec/%lld}{e:tv_usec/%lld}{d:/%02d:%02d:%02d.%06u} ", tvp->tv_sec, tvp->tv_usec, sec / 3600, (sec % 3600) / 60, sec % 60, (u_int32_t)tvp->tv_usec); } From nobody Tue Oct 17 19:15:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S93bm2Gftz4xssr; Tue, 17 Oct 2023 19:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S93bm1gkjz3GsM; Tue, 17 Oct 2023 19:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697570148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAC2X1tAahGRL/tSnTLimZ8O39hj44OGNvPIQDLoysQ=; b=GolOcFMkazhDMiGlbe6IEfVZzcEJk+TLqMyncfeRjJlg/RZYOFjEeuswIsJ4DWvVzjTI+9 9VShYcJpaQSy7lj1Jfyg0O0QAyuGuEwRx2JuX7ljv1wMIRjy9IG5C8NhJ+Nppos0GwMbmU yly+NOpL06QaOYt0o+bVt/JU1mLdU2BIWuR+sqxAzgMND1ARBLhfrzKq9qv8Ri0Ro2Jefu j4f2noi90xdsCzd6bz39WMVrGnI4q/Wq8UQS1NwzhJvLdGz/nGJnOUKMRwgECfaqJQ8NlU CZB8Qten8hKgXAFWngCV7Q8PiJj0V+z3270T/c+nAz5Xw7w72PyC54YIqy5CsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697570148; a=rsa-sha256; cv=none; b=dilZlxz5KNefkcjML1K594Vz6dVdgKzg/l/6hKy3OCkpGY2NIcd4iwDpknkbP5UAjZOsUd Tfttg2P74ZSzWhGd5Zmuypnuqwv45/98Jf8274VWhuZ1IaUMpSEMbwU0jSK+OWSQdYpDhv 1Sqivo8VzzHxGOyV7SIZGtVetBLudwkgDzHuGYkD08C3p+7U2EKPb3lwP15V+7l/6EDb9X c6dCuEEjmgEsEoHDKMFHEH+wU3SDnmPD74pqMaMfp+f7qzuBo1PkLZJusoUEIp1lJedCer Exg7oQNt0qSbMvgmkehGCC6KL0wJoWk5eV1swDvgSiwD8HamMF/vRGe8B5QI1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697570148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAC2X1tAahGRL/tSnTLimZ8O39hj44OGNvPIQDLoysQ=; b=E40/8O9wHPKFR3ziBP22JPtKX9dyrP5xnJE975/CKNHmozphWh5GuJs3PECwiWoQ2KsUIQ 13xJcIuar4YKbLjknRWu6WdNymC/c4CuFAmHm2idiO44ZRPofIFNQfh+by9+Gz9mLnWXkZ ol6Y675y4mDB81BBv82eh8O9XnvAa2EoEsoCXAEciQxKMz/WXwkLpZ+/znNCPqUtEMzuin zcBIj5/u1dqfbu+IeY6AMGjRtVYQjfK2oTg/p2ctdhDQbY2S+84QLh2ZBoF4bY2BUxyjrm QdW3X2xZ8KhmZKBhOgfTWzCUCD5m5jTHkR7wrb9etu59JvfuyQpJ/SQkErin4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S93bm0bWkzc8P; Tue, 17 Oct 2023 19:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HJFl42063576; Tue, 17 Oct 2023 19:15:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJFlEx063573; Tue, 17 Oct 2023 19:15:47 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:15:47 GMT Message-Id: <202310171915.39HJFlEx063573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6e281255ea35 - main - lltable: fix ddb show llentry l3_addr pretty printer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6e281255ea3574ca666e99c535a9b2734871ded8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6e281255ea3574ca666e99c535a9b2734871ded8 commit 6e281255ea3574ca666e99c535a9b2734871ded8 Author: R. Christian McDonald AuthorDate: 2023-10-17 17:03:49 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 17:03:49 +0000 lltable: fix ddb show llentry l3_addr pretty printer The ddb commands for lltable do not produce useful l3_addr information. This fixes the llentry pretty printer to correctly display the l3_addr Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42253 --- sys/net/if_llatbl.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index ef4f27dbb00c..fe5273cf19c0 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -1065,18 +1065,13 @@ lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info) } #ifdef DDB -struct llentry_sa { - struct llentry base; - struct sockaddr l3_addr; -}; - static void -llatbl_lle_show(struct llentry_sa *la) +llatbl_lle_show(struct llentry *lle) { - struct llentry *lle; uint8_t octet[6]; + sa_family_t af = AF_UNSPEC; + char l3_addr_fmt[] = " l3_addr=%s (af=%d)\n"; - lle = &la->base; db_printf("lle=%p\n", lle); db_printf(" lle_next=%p\n", lle->lle_next.cle_next); db_printf(" lle_lock=%p\n", &lle->lle_lock); @@ -1097,33 +1092,37 @@ llatbl_lle_show(struct llentry_sa *la) octet[0], octet[1], octet[2], octet[3], octet[4], octet[5]); db_printf(" lle_timer=%p\n", &lle->lle_timer); - switch (la->l3_addr.sa_family) { + if (lle->lle_tbl) { + af = lle->lle_tbl->llt_af; + } + + switch (af) { #ifdef INET case AF_INET: { - struct sockaddr_in *sin; + struct sockaddr_in sin; char l3s[INET_ADDRSTRLEN]; - sin = (struct sockaddr_in *)&la->l3_addr; - inet_ntoa_r(sin->sin_addr, l3s); - db_printf(" l3_addr=%s\n", l3s); + lltable_fill_sa_entry(lle, (struct sockaddr *)&sin); + (void) inet_ntop(af, &sin.sin_addr, l3s, sizeof(l3s)); + db_printf(l3_addr_fmt, l3s, af); break; } #endif #ifdef INET6 case AF_INET6: { - struct sockaddr_in6 *sin6; + struct sockaddr_in6 sin6; char l3s[INET6_ADDRSTRLEN]; - sin6 = (struct sockaddr_in6 *)&la->l3_addr; - ip6_sprintf(l3s, &sin6->sin6_addr); - db_printf(" l3_addr=%s\n", l3s); + lltable_fill_sa_entry(lle, (struct sockaddr *)&sin6); + (void) inet_ntop(af, &sin6.sin6_addr, l3s, sizeof(l3s)); + db_printf(l3_addr_fmt, l3s, af); break; } #endif default: - db_printf(" l3_addr=N/A (af=%d)\n", la->l3_addr.sa_family); + db_printf(l3_addr_fmt, "N/A", af); break; } } @@ -1136,7 +1135,7 @@ DB_SHOW_COMMAND(llentry, db_show_llentry) return; } - llatbl_lle_show((struct llentry_sa *)addr); + llatbl_lle_show((struct llentry *)addr); } static void @@ -1150,7 +1149,7 @@ llatbl_llt_show(struct lltable *llt) for (i = 0; i < llt->llt_hsize; i++) { CK_LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { - llatbl_lle_show((struct llentry_sa *)lle); + llatbl_lle_show(lle); if (db_pager_quit) return; } From nobody Tue Oct 17 20:57:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S95rd06Fbz4x0tL; Tue, 17 Oct 2023 20:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S95rc6dgYz3XFY; Tue, 17 Oct 2023 20:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697576224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q08LTkzubMHIpLk01AhToPaSGp6NHlWPmL27Sx9zK2M=; b=ee6UbHSkQnjvIyPx2HLgNSulyD2gtMSF26Ax2KEjkWD0omeh8K9eqzIlOntvIL43IKO7O0 ZL6z3UkXxHascBZ4MpWdD5s4MF47rYB+aqx9w+UhVWi+266ehj7TWpfj58BFBi1tjWC/lU QilMQUdlIBb90LN4HHfaCieFLkmNDbyO3DxMqZ8rHUjs24W4u8WnOuXxwY4y6aeBpLiT6U 2aTcKBGfKKOmIDabFWSKuaYd5H3mjZHjfgOtyM1FUmqXZLnN9x1WtexecHwKvfxGl8HhQI 5jpU/8X9FN9YR3S7Em/W2jeVIBs/rA/gkSamWBeQLpZuX8qJFhUi19Dx+E+FrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697576224; a=rsa-sha256; cv=none; b=VlLkz2S3lMAyavMUfNbrdV+3kgANnhklGN6qccLqvOcs7h2aKvljgzN3EhXptpi7r/4aGe f2tFbKYnDfOzfs0w56O3+GuW1c0eW8u6hHZNToi9On7eMyt69JyBpWJW2+k+2b4/KlR5bW T77d/0bu1NUzAPNrPP28K3chjruHOKp9sW5VQ3s1k6CBJM/zCmMeNF9pado2VDBob6Aav7 fTx2PSIm1L+sUTOLEYHE+IGiJ+yB+fkSShxy3B/5k6CnkqftiXQzbW6irq6t+wjVqOQs6e hao82WQAojC54T25R0wozQr3GsWIYMpEzNJFMhgVstcD0AInyBp/gGyXnlwaGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697576224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q08LTkzubMHIpLk01AhToPaSGp6NHlWPmL27Sx9zK2M=; b=bdcDS5VDLSgTrrMvgFvrr+OBXw5xpvjbuTWHgVjMglV3xOlHDIDSzLDWqxE/BLt0+TXNxc x9VWkMhb1QMDS00W4uBrzTDBJ+MBMMtsoRHH5aoIHfNZmS0H12h+KzXMyGgwPIUFmPdhb+ 4WZBPOia0UJKVE7Uj74u8aS76CwRqcXtIhLLlw19UOGANaZotb8fWpnEoHPQFRTlmlXPr8 R8Yv7aRVVhHjsEXcpt6cJgiUVLRgwdI0earIizAR/p0Sr+dYfe66b0RQmWc0b223bAvc28 pAHqvwKIrRjo1q+let7CkJj3wB8LBztpwyuOe2Beu1LjwDjVtyCE2i/GskWB2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S95rc5gWBzfn3; Tue, 17 Oct 2023 20:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HKv4NF030985; Tue, 17 Oct 2023 20:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HKv4QO030982; Tue, 17 Oct 2023 20:57:04 GMT (envelope-from git) Date: Tue, 17 Oct 2023 20:57:04 GMT Message-Id: <202310172057.39HKv4QO030982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: cd5edc7db261 - main - nfsd: Avoid acquiring a vnode for some NFSv4 Readdir operations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: cd5edc7db261fb228be4044e6fdd38850eb4e9c4 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cd5edc7db261fb228be4044e6fdd38850eb4e9c4 commit cd5edc7db261fb228be4044e6fdd38850eb4e9c4 Author: Rick Macklem AuthorDate: 2023-10-17 20:55:48 +0000 Commit: Rick Macklem CommitDate: 2023-10-17 20:55:48 +0000 nfsd: Avoid acquiring a vnode for some NFSv4 Readdir operations Without this patch, a NFSv4 Readdir operation acquires the vnode for each entry in the directory. If only the Type, Fileid, Mounted_on_fileid and ReaddirError attributes are requested by a client, acquiring the vnode is not necessary for non-directories. Directory vnodes must be acquired to check for server file system mount points. This patch avoids acquiring the vnode, as above, resulting in a 3-8% improvement in Readdir RPC RTT for some simple tests I did. Note that only non-rdirplus NFSv4 mounts will benefit from this change. Tested during a recent IETF NFSv4 Bakeathon testing event. MFC after: 1 month --- sys/fs/nfsserver/nfs_nfsdport.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 570ae653e06c..776d5c50861c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -117,6 +117,11 @@ extern int nfsrv_issuedelegs; extern int nfsrv_dolocallocks; extern struct nfsdevicehead nfsrv_devidhead; +/* Map d_type to vnode type. */ +static uint8_t dtype_to_vnode[DT_WHT + 1] = { VNON, VFIFO, VCHR, VNON, VDIR, + VNON, VBLK, VNON, VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON }; +#define NFS_DTYPETOVTYPE(t) ((t) <= DT_WHT ? dtype_to_vnode[(t)] : VNON) + static int nfsrv_createiovec(int, struct mbuf **, struct mbuf **, struct iovec **); static int nfsrv_createiovec_extpgs(int, int, struct mbuf **, @@ -2310,7 +2315,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, caddr_t bpos0, bpos1; u_int64_t off, toff, verf __unused; uint64_t *cookies = NULL, *cookiep; - nfsattrbit_t attrbits, rderrbits, savbits; + nfsattrbit_t attrbits, rderrbits, savbits, refbits; struct uio io; struct iovec iv; struct componentname cn; @@ -2361,9 +2366,20 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, if (error) goto nfsmout; NFSSET_ATTRBIT(&savbits, &attrbits); + NFSSET_ATTRBIT(&refbits, &attrbits); NFSCLRNOTFILLABLE_ATTRBIT(&attrbits, nd); NFSZERO_ATTRBIT(&rderrbits); NFSSETBIT_ATTRBIT(&rderrbits, NFSATTRBIT_RDATTRERROR); + /* + * If these 4 bits are the only attributes requested by the + * client, they can be satisfied without acquiring the vnode + * for the file object unless it is a directory. + * This will be indicated by savbits being all 0s. + */ + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_TYPE); + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_FILEID); + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_MOUNTEDONFILEID); + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_RDATTRERROR); } else { NFSZERO_ATTRBIT(&attrbits); } @@ -2606,7 +2622,10 @@ again: new_mp = mp; mounted_on_fileno = (uint64_t)dp->d_fileno; if ((nd->nd_flag & ND_NFSV3) || - NFSNONZERO_ATTRBIT(&savbits)) { + NFSNONZERO_ATTRBIT(&savbits) || + dp->d_type == DT_UNKNOWN || + (dp->d_type == DT_DIR && + nfsrv_enable_crossmntpt != 0)) { if (nd->nd_flag & ND_NFSV4) refp = nfsv4root_getreferral(NULL, vp, dp->d_fileno); @@ -2743,6 +2762,11 @@ again: break; } } + } else if (NFSNONZERO_ATTRBIT(&attrbits)) { + /* Only need Type and/or Fileid. */ + VATTR_NULL(&nvap->na_vattr); + nvap->na_fileid = dp->d_fileno; + nvap->na_type = NFS_DTYPETOVTYPE(dp->d_type); } /* @@ -2774,7 +2798,7 @@ again: supports_nfsv4acls = 0; if (refp != NULL) { dirlen += nfsrv_putreferralattr(nd, - &savbits, refp, 0, + &refbits, refp, 0, &nd->nd_repstat); if (nd->nd_repstat) { if (nvp != NULL) From nobody Tue Oct 17 21:58:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S97Cw0kGBz4x4Rw; Tue, 17 Oct 2023 21:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S97Cv4c8hz3bY2; Tue, 17 Oct 2023 21:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pi5uKWdhoNiYoHj/LigpGPBHSVwKSOaWYiZiz5bpXW4=; b=Zc8tDjciyvXw2RMMK+hcn87zg1HlPU2aXr8IX6WRZCAAjotsOr/cEuQQMvhWXabriC8eAI gH1VhYO20f1KVBrH3c5cGg5wJUw99UFUMZttjPp++E+a2rhsKhoOO5xqWUPOS0IS22q+0z LKCD7XE8lY5mwGt2TZ7Nhrovgv8Z9Kr4pUTayhlUqUgqmkhcFkIiQ4NrhmO2fD6fjA7M1i njMM5w3racMTVGwBAiZ2KI7jbx8m/5uO28bGa7papSt2a2CT35SrwDvB/RLhirrcMbApSK cjUJljMaG8XayT+IJUL4OPhUR4BD2Vjdqi2lyVu7iYBM5nIKBA/bGYLunEEb2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697579931; a=rsa-sha256; cv=none; b=a+c4N4p6ygApem23Rk13CFYgE8dj8IXbLtNxiv0Hb3Ve2deJAtfz1yG4/N4B5O5m2Xq/VQ pSOGtPK6cPxx5jEEmvrs0fQ9U8DP4bYS3Poj6KyHx0slTsf27n22kvxtd+SLExrSJ1tvLC mkHIgjedqNqoiswsrpcJHUbHG4wEskUvvsKEVAa0uW7eKJMRPTAxR5fY2HHxY60JJQb9ni X2w/oY47djEJr7bN5MjL/nTDPwZbp4kKyizRpyJFD9qTjUKjxrc8XDYjbRt0vmCa/PuAGU pz1JFFVPsBgiY4Msb0Plu9V04NtcVqfgYWZd3JOqJWFiO5T18tkbmqggL7ypTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pi5uKWdhoNiYoHj/LigpGPBHSVwKSOaWYiZiz5bpXW4=; b=Uo72YScn0wQzkeF2APrlw/2pC2wEJjYSVD/DaXWl7uFin2OWtNOuZ054qMkITcQoDvWq4+ nJVb4TWH9qLnuI9ggGHHU54IQ74vFGr0IHRLFhSZBihxiQQZADnTM2btsHnuz4tIXh8cHV y5e+axtNmmorGD3ZlggMEVlO7B0uPZHPV/cJQnEocNewAxCAfuW0hyIl9e9mg/zas2KJUq 5/a9yJX+upv2FWAP+Zb5ipGfhBIAYDY4TmSxgsqNhv48VL/PIlX/72HszRaPOYXKnwxS6b MXd95rsl1AXxbs/bnhUwkq2YdoGvLyZb9ha0gwVQsc1wiBGW3NtSpKTT0FA5Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S97Cv3gk5zhL3; Tue, 17 Oct 2023 21:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HLwpLl031387; Tue, 17 Oct 2023 21:58:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HLwpml031384; Tue, 17 Oct 2023 21:58:51 GMT (envelope-from git) Date: Tue, 17 Oct 2023 21:58:51 GMT Message-Id: <202310172158.39HLwpml031384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 83bd5a833c3a - main - mkimg_test: remove vtoc8 images, they aren't needed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 83bd5a833c3a14b74736e7b3fa0be66252a5a3dc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=83bd5a833c3a14b74736e7b3fa0be66252a5a3dc commit 83bd5a833c3a14b74736e7b3fa0be66252a5a3dc Author: Warner Losh AuthorDate: 2023-10-17 21:52:02 +0000 Commit: Warner Losh CommitDate: 2023-10-17 21:56:19 +0000 mkimg_test: remove vtoc8 images, they aren't needed vtoc8 support expired with sparc64 removal, so remove them all. Sponsored by: Netflix --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow.hex | 550 --------------------- .../mkimg/tests/img-63x255-4096-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vmdk.hex | 324 ------------ usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow.hex | 550 --------------------- usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vmdk.hex | 324 ------------ 28 files changed, 4472 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex deleted file mode 100644 index 93afee83d903..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex +++ /dev/null @@ -1,544 +0,0 @@ -00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 10 00 |.............B..| -00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| -00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00001000 00 00 00 00 00 00 20 00 00 00 00 00 00 00 30 00 |...... .......0.| -00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| -00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00005010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00005090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000050c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000051a0 00 00 00 00 0e 10 21 08 00 00 00 00 00 00 00 00 |......!.........| -000051b0 21 08 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000051c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000051d0 00 00 21 08 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000051e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000051f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 3f |.............."?| -00005200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00405200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00406000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex deleted file mode 100644 index dba435854881..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex +++ /dev/null @@ -1,72 +0,0 @@ -00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| -00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| -00000030 00 00 00 00 00 02 00 00 00 00 00 01 00 00 00 00 |................| -00000040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 80 00 00 00 00 03 00 00 00 00 00 00 00 00 00 00 |................| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 |................| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 80 00 00 00 00 05 00 00 80 00 00 00 00 06 00 00 |................| -00030010 80 00 00 00 00 07 00 00 80 00 00 00 00 08 00 00 |................| -00030020 80 00 00 00 00 09 00 00 80 00 00 00 00 0a 00 00 |................| -00030030 80 00 00 00 00 0b 00 00 80 00 00 00 00 0c 00 00 |................| -00030040 80 00 00 00 00 0d 00 00 80 00 00 00 00 0e 00 00 |................| -00030050 80 00 00 00 00 0f 00 00 80 00 00 00 00 10 00 00 |................| -00030060 80 00 00 00 00 11 00 00 80 00 00 00 00 12 00 00 |................| -00030070 80 00 00 00 00 13 00 00 80 00 00 00 00 14 00 00 |................| -00030080 80 00 00 00 00 15 00 00 80 00 00 00 00 16 00 00 |................| -00030090 80 00 00 00 00 17 00 00 80 00 00 00 00 18 00 00 |................| -000300a0 80 00 00 00 00 19 00 00 80 00 00 00 00 1a 00 00 |................| -000300b0 80 00 00 00 00 1b 00 00 80 00 00 00 00 1c 00 00 |................| -000300c0 80 00 00 00 00 1d 00 00 80 00 00 00 00 1e 00 00 |................| -000300d0 80 00 00 00 00 1f 00 00 80 00 00 00 00 20 00 00 |............. ..| -000300e0 80 00 00 00 00 21 00 00 80 00 00 00 00 22 00 00 |.....!......."..| -000300f0 80 00 00 00 00 23 00 00 80 00 00 00 00 24 00 00 |.....#.......$..| -00030100 80 00 00 00 00 25 00 00 80 00 00 00 00 26 00 00 |.....%.......&..| -00030110 80 00 00 00 00 27 00 00 80 00 00 00 00 28 00 00 |.....'.......(..| -00030120 80 00 00 00 00 29 00 00 80 00 00 00 00 2a 00 00 |.....).......*..| -00030130 80 00 00 00 00 2b 00 00 80 00 00 00 00 2c 00 00 |.....+.......,..| -00030140 80 00 00 00 00 2d 00 00 80 00 00 00 00 2e 00 00 |.....-..........| -00030150 80 00 00 00 00 2f 00 00 80 00 00 00 00 30 00 00 |...../.......0..| -00030160 80 00 00 00 00 31 00 00 80 00 00 00 00 32 00 00 |.....1.......2..| -00030170 80 00 00 00 00 33 00 00 80 00 00 00 00 34 00 00 |.....3.......4..| -00030180 80 00 00 00 00 35 00 00 80 00 00 00 00 36 00 00 |.....5.......6..| -00030190 80 00 00 00 00 37 00 00 80 00 00 00 00 38 00 00 |.....7.......8..| -000301a0 80 00 00 00 00 39 00 00 80 00 00 00 00 3a 00 00 |.....9.......:..| -000301b0 80 00 00 00 00 3b 00 00 80 00 00 00 00 3c 00 00 |.....;.......<..| -000301c0 80 00 00 00 00 3d 00 00 80 00 00 00 00 3e 00 00 |.....=.......>..| -000301d0 80 00 00 00 00 3f 00 00 80 00 00 00 00 40 00 00 |.....?.......@..| -000301e0 80 00 00 00 00 41 00 00 80 00 00 00 00 42 00 00 |.....A.......B..| -000301f0 80 00 00 00 00 43 00 00 80 00 00 00 00 44 00 00 |.....C.......D..| -00030200 80 00 00 00 00 45 00 00 00 00 00 00 00 00 00 00 |.....E..........| -00030210 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 |................| -* -00040080 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 00 |................| -00040090 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00050010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00050090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000500c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000501a0 00 00 00 00 0e 10 21 80 00 00 00 00 00 00 00 00 |......!.........| -000501b0 21 80 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000501c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000501d0 00 00 21 80 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000501e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000501f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 b7 |..............".| -00050200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00450200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00460000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex deleted file mode 100644 index ffa27d117070..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex +++ /dev/null @@ -1,20 +0,0 @@ -00000000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 21 01 00 00 00 00 00 00 00 00 |......!.........| -000001b0 21 01 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 21 01 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 36 |.............."6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00420200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex deleted file mode 100644 index 00828a72a331..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex +++ /dev/null @@ -1,52 +0,0 @@ -00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00000030 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00000040 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00000050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 63 78 73 70 61 72 73 65 ff ff ff ff ff ff ff ff |cxsparse........| -00000210 00 00 00 00 00 00 06 00 00 01 00 00 00 00 00 03 |................| -00000220 00 20 00 00 ff ff f4 74 00 00 00 00 00 00 00 00 |. .....t........| -00000230 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 00 00 00 04 00 00 10 05 00 00 20 06 ff ff ff ff |.......... .....| -00000610 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00000a00 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000a10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000a80 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000a90 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000aa0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000ab0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -00000ac0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000ba0 00 00 00 00 0e 10 21 34 00 00 00 00 00 00 00 00 |......!4........| -00000bb0 21 34 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!4..............| -00000bc0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -00000bd0 00 00 21 34 00 00 00 00 00 00 00 00 00 00 00 00 |..!4............| -00000be0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000bf0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 03 |..............".| -00000c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00200a00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00200c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400c00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00400e00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00401000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00600e00 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00600e10 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00600e20 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00600e30 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00600e40 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00600e50 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00600e60 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00601000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex deleted file mode 100644 index d55109faaec5..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex +++ /dev/null @@ -1,28 +0,0 @@ -00000000 46 72 65 65 42 53 44 35 4d 00 00 00 00 00 00 00 |FreeBSD5M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 28 00 00 00 00 00 00 00 00 00 |......(.........| -000001b0 28 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |(...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 28 00 00 00 00 00 00 00 00 00 00 00 00 00 |..(.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 2b 36 |..............+6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00500010 ff ff ff ff ff ff ff ff 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00500020 00 02 00 00 57 69 32 6b 00 00 00 00 00 50 00 00 |....Wi2k.....P..| -00500030 00 00 00 00 00 50 00 00 00 96 04 11 00 00 00 02 |.....P..........| -00500040 ff ff ef b4 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00500050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00500060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex deleted file mode 100644 index 76c4d5313850..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex +++ /dev/null @@ -1,71 +0,0 @@ -00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 68 65 61 64 64 db 05 73 00 00 00 00 00 00 00 00 |headd..s........| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00010050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 68 65 61 64 13 47 fd f1 01 00 00 00 00 00 00 00 |head.G..........| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00020050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00030010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00030020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00030030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00030040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00030050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00040010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00040020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00040030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00040040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00040050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00200000 6d 65 74 61 64 61 74 61 00 00 05 00 00 00 00 00 |metadata........| -00200010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00200020 37 67 a1 ca 36 fa 43 4d b3 b6 33 f0 aa 44 e7 6b |7g..6.CM..3..D.k| -00200030 00 00 01 00 08 00 00 00 04 00 00 00 00 00 00 00 |................| -00200040 24 42 a5 2f 1b cd 76 48 b2 11 5d be d8 3b f4 b8 |$B./..vH..]..;..| -00200050 08 00 01 00 08 00 00 00 06 00 00 00 00 00 00 00 |................| -00200060 ab 12 ca be e6 b2 23 45 93 ef c3 09 e0 00 c7 46 |......#E.......F| -00200070 10 00 01 00 10 00 00 00 06 00 00 00 00 00 00 00 |................| -00200080 1d bf 41 81 6f a9 09 47 ba 47 f2 33 a8 fa ab 5f |..A.o..G.G.3..._| -00200090 20 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 | ...............| -002000a0 c7 48 a3 cd 5d 44 71 44 9c c9 e9 88 52 51 c5 56 |.H..]DqD....RQ.V| -002000b0 24 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 |$...............| -002000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00210000 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 00 |................| -00210010 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00210020 00 02 00 00 00 10 00 00 00 00 00 00 00 00 00 00 |................| -00210030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00300000 06 00 40 00 00 00 00 00 00 00 00 00 00 00 00 00 |..@.............| -00300010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400000 46 72 65 65 42 53 44 31 36 4d 00 00 00 00 00 00 |FreeBSD16M......| -00400010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00400090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -004000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -004001a0 00 00 00 00 0e 10 80 00 00 00 00 00 00 00 00 00 |................| -004001b0 80 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |................| -004001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -004001d0 00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be f8 7f |................| -00400200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00800200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -01400000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex deleted file mode 100644 index 865769bcea7e..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex +++ /dev/null @@ -1,314 +0,0 @@ -00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| -00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| -00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| -00000030 0b 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 |................| -00000040 20 00 00 00 00 00 00 00 00 0a 20 0d 0a 00 00 00 | ......... .....| -00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 23 20 44 69 73 6b 20 44 65 73 63 72 69 70 74 6f |# Disk Descripto| -00000210 72 46 69 6c 65 0a 76 65 72 73 69 6f 6e 3d 31 0a |rFile.version=1.| -00000220 43 49 44 3d 30 30 30 30 30 30 30 30 0a 70 61 72 |CID=00000000.par| -00000230 65 6e 74 43 49 44 3d 66 66 66 66 66 66 66 66 0a |entCID=ffffffff.| -00000240 63 72 65 61 74 65 54 79 70 65 3d 22 6d 6f 6e 6f |createType="mono| -00000250 6c 69 74 68 69 63 53 70 61 72 73 65 22 0a 23 20 |lithicSparse".# | -00000260 45 78 74 65 6e 74 20 64 65 73 63 72 69 70 74 69 |Extent descripti| -00000270 6f 6e 0a 52 57 20 31 30 32 34 30 20 53 50 41 52 |on.RW 10240 SPAR| -00000280 53 45 20 22 22 0a 23 20 54 68 65 20 44 69 73 6b |SE "".# The Disk| -00000290 20 44 61 74 61 20 42 61 73 65 0a 23 44 44 42 0a | Data Base.#DDB.| -000002a0 64 64 62 2e 61 64 61 70 74 65 72 54 79 70 65 20 |ddb.adapterType | -000002b0 3d 20 22 69 64 65 22 0a 64 64 62 2e 67 65 6f 6d |= "ide".ddb.geom| -000002c0 65 74 72 79 2e 63 79 6c 69 6e 64 65 72 73 20 3d |etry.cylinders =| -000002d0 20 22 31 30 32 34 30 22 0a 64 64 62 2e 67 65 6f | "10240".ddb.geo| -000002e0 6d 65 74 72 79 2e 68 65 61 64 73 20 3d 20 22 31 |metry.heads = "1| -000002f0 22 0a 64 64 62 2e 67 65 6f 6d 65 74 72 79 2e 73 |".ddb.geometry.s| -00000300 65 63 74 6f 72 73 20 3d 20 22 31 22 0a 00 00 00 |ectors = "1"....| -00000310 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000400 03 00 00 00 07 00 00 00 00 00 00 00 00 00 00 00 |................| -00000410 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 20 00 00 00 30 00 00 00 40 00 00 00 50 00 00 00 | ...0...@...P...| -00000610 60 00 00 00 70 00 00 00 80 00 00 00 90 00 00 00 |`...p...........| -00000620 a0 00 00 00 b0 00 00 00 c0 00 00 00 d0 00 00 00 |................| -00000630 e0 00 00 00 f0 00 00 00 00 01 00 00 10 01 00 00 |................| -00000640 20 01 00 00 30 01 00 00 40 01 00 00 50 01 00 00 | ...0...@...P...| -00000650 60 01 00 00 70 01 00 00 80 01 00 00 90 01 00 00 |`...p...........| -00000660 a0 01 00 00 b0 01 00 00 c0 01 00 00 d0 01 00 00 |................| -00000670 e0 01 00 00 f0 01 00 00 00 02 00 00 10 02 00 00 |................| -00000680 20 02 00 00 30 02 00 00 40 02 00 00 50 02 00 00 | ...0...@...P...| -00000690 60 02 00 00 70 02 00 00 80 02 00 00 90 02 00 00 |`...p...........| -000006a0 a0 02 00 00 b0 02 00 00 c0 02 00 00 d0 02 00 00 |................| -000006b0 e0 02 00 00 f0 02 00 00 00 03 00 00 10 03 00 00 |................| -000006c0 20 03 00 00 30 03 00 00 40 03 00 00 50 03 00 00 | ...0...@...P...| -000006d0 60 03 00 00 70 03 00 00 80 03 00 00 90 03 00 00 |`...p...........| -000006e0 a0 03 00 00 b0 03 00 00 c0 03 00 00 d0 03 00 00 |................| -000006f0 e0 03 00 00 f0 03 00 00 00 04 00 00 10 04 00 00 |................| -00000700 20 04 00 00 30 04 00 00 40 04 00 00 50 04 00 00 | ...0...@...P...| -00000710 60 04 00 00 70 04 00 00 80 04 00 00 90 04 00 00 |`...p...........| -00000720 a0 04 00 00 b0 04 00 00 c0 04 00 00 d0 04 00 00 |................| -00000730 e0 04 00 00 f0 04 00 00 00 05 00 00 10 05 00 00 |................| -00000740 20 05 00 00 30 05 00 00 40 05 00 00 50 05 00 00 | ...0...@...P...| -00000750 60 05 00 00 70 05 00 00 80 05 00 00 90 05 00 00 |`...p...........| -00000760 a0 05 00 00 b0 05 00 00 c0 05 00 00 d0 05 00 00 |................| -00000770 e0 05 00 00 f0 05 00 00 00 06 00 00 10 06 00 00 |................| -00000780 20 06 00 00 30 06 00 00 40 06 00 00 50 06 00 00 | ...0...@...P...| -00000790 60 06 00 00 70 06 00 00 80 06 00 00 90 06 00 00 |`...p...........| -000007a0 a0 06 00 00 b0 06 00 00 c0 06 00 00 d0 06 00 00 |................| -000007b0 e0 06 00 00 f0 06 00 00 00 07 00 00 10 07 00 00 |................| -000007c0 20 07 00 00 30 07 00 00 40 07 00 00 50 07 00 00 | ...0...@...P...| -000007d0 60 07 00 00 70 07 00 00 80 07 00 00 90 07 00 00 |`...p...........| -000007e0 a0 07 00 00 b0 07 00 00 c0 07 00 00 d0 07 00 00 |................| -000007f0 e0 07 00 00 f0 07 00 00 00 08 00 00 10 08 00 00 |................| -00000800 20 08 00 00 30 08 00 00 40 08 00 00 50 08 00 00 | ...0...@...P...| -00000810 60 08 00 00 70 08 00 00 80 08 00 00 90 08 00 00 |`...p...........| -00000820 a0 08 00 00 b0 08 00 00 c0 08 00 00 d0 08 00 00 |................| -00000830 e0 08 00 00 f0 08 00 00 00 09 00 00 10 09 00 00 |................| -00000840 20 09 00 00 30 09 00 00 40 09 00 00 50 09 00 00 | ...0...@...P...| -00000850 60 09 00 00 70 09 00 00 80 09 00 00 90 09 00 00 |`...p...........| -00000860 a0 09 00 00 b0 09 00 00 c0 09 00 00 d0 09 00 00 |................| -00000870 e0 09 00 00 f0 09 00 00 00 0a 00 00 10 0a 00 00 |................| -00000880 20 0a 00 00 30 0a 00 00 40 0a 00 00 50 0a 00 00 | ...0...@...P...| -00000890 60 0a 00 00 70 0a 00 00 80 0a 00 00 90 0a 00 00 |`...p...........| -000008a0 a0 0a 00 00 b0 0a 00 00 c0 0a 00 00 d0 0a 00 00 |................| -000008b0 e0 0a 00 00 f0 0a 00 00 00 0b 00 00 10 0b 00 00 |................| -000008c0 20 0b 00 00 30 0b 00 00 40 0b 00 00 50 0b 00 00 | ...0...@...P...| -000008d0 60 0b 00 00 70 0b 00 00 80 0b 00 00 90 0b 00 00 |`...p...........| -000008e0 a0 0b 00 00 b0 0b 00 00 c0 0b 00 00 d0 0b 00 00 |................| -000008f0 e0 0b 00 00 f0 0b 00 00 00 0c 00 00 10 0c 00 00 |................| -00000900 20 0c 00 00 30 0c 00 00 40 0c 00 00 50 0c 00 00 | ...0...@...P...| -00000910 60 0c 00 00 70 0c 00 00 80 0c 00 00 90 0c 00 00 |`...p...........| -00000920 a0 0c 00 00 b0 0c 00 00 c0 0c 00 00 d0 0c 00 00 |................| -00000930 e0 0c 00 00 f0 0c 00 00 00 0d 00 00 10 0d 00 00 |................| -00000940 20 0d 00 00 30 0d 00 00 40 0d 00 00 50 0d 00 00 | ...0...@...P...| -00000950 60 0d 00 00 70 0d 00 00 80 0d 00 00 90 0d 00 00 |`...p...........| -00000960 a0 0d 00 00 b0 0d 00 00 c0 0d 00 00 d0 0d 00 00 |................| -00000970 e0 0d 00 00 f0 0d 00 00 00 0e 00 00 10 0e 00 00 |................| -00000980 20 0e 00 00 30 0e 00 00 40 0e 00 00 50 0e 00 00 | ...0...@...P...| -00000990 60 0e 00 00 70 0e 00 00 80 0e 00 00 90 0e 00 00 |`...p...........| -000009a0 a0 0e 00 00 b0 0e 00 00 c0 0e 00 00 d0 0e 00 00 |................| -000009b0 e0 0e 00 00 f0 0e 00 00 00 0f 00 00 10 0f 00 00 |................| -000009c0 20 0f 00 00 30 0f 00 00 40 0f 00 00 50 0f 00 00 | ...0...@...P...| -000009d0 60 0f 00 00 70 0f 00 00 80 0f 00 00 90 0f 00 00 |`...p...........| -000009e0 a0 0f 00 00 b0 0f 00 00 c0 0f 00 00 d0 0f 00 00 |................| -000009f0 e0 0f 00 00 f0 0f 00 00 00 10 00 00 10 10 00 00 |................| -00000a00 20 10 00 00 30 10 00 00 40 10 00 00 50 10 00 00 | ...0...@...P...| -00000a10 60 10 00 00 70 10 00 00 80 10 00 00 90 10 00 00 |`...p...........| -00000a20 a0 10 00 00 b0 10 00 00 c0 10 00 00 d0 10 00 00 |................| -00000a30 e0 10 00 00 f0 10 00 00 00 11 00 00 10 11 00 00 |................| -00000a40 20 11 00 00 30 11 00 00 40 11 00 00 50 11 00 00 | ...0...@...P...| -00000a50 60 11 00 00 70 11 00 00 80 11 00 00 90 11 00 00 |`...p...........| -00000a60 a0 11 00 00 b0 11 00 00 c0 11 00 00 d0 11 00 00 |................| -00000a70 e0 11 00 00 f0 11 00 00 00 12 00 00 10 12 00 00 |................| -00000a80 20 12 00 00 30 12 00 00 40 12 00 00 50 12 00 00 | ...0...@...P...| -00000a90 60 12 00 00 70 12 00 00 80 12 00 00 90 12 00 00 |`...p...........| -00000aa0 a0 12 00 00 b0 12 00 00 c0 12 00 00 d0 12 00 00 |................| -00000ab0 e0 12 00 00 f0 12 00 00 00 13 00 00 10 13 00 00 |................| -00000ac0 20 13 00 00 30 13 00 00 40 13 00 00 50 13 00 00 | ...0...@...P...| -00000ad0 60 13 00 00 70 13 00 00 80 13 00 00 90 13 00 00 |`...p...........| -00000ae0 a0 13 00 00 b0 13 00 00 c0 13 00 00 d0 13 00 00 |................| -00000af0 e0 13 00 00 f0 13 00 00 00 14 00 00 10 14 00 00 |................| -00000b00 20 14 00 00 30 14 00 00 40 14 00 00 50 14 00 00 | ...0...@...P...| -00000b10 60 14 00 00 70 14 00 00 80 14 00 00 90 14 00 00 |`...p...........| *** 3700 LINES SKIPPED *** From nobody Tue Oct 17 21:58:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S97Cx12Vpz4x4w2; Tue, 17 Oct 2023 21:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S97Cw6XW0z3bY4; Tue, 17 Oct 2023 21:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0BR7j3KBj85WHXMbrL5BEywH0U+3qsHqf6EhM747ZA=; b=jcac0CtcPXQUqzxfY0lg+etKhkfzvMBuT0LrcsdhwTvI130ry3JWUFhyW42ZYDhVi9k7tW Thw04R9L3590Bly5zV7LPEoFxpQAMH7M+Cwzdld9xDUElivcdvFoBSNLQYtjZMX+7quoEG Os2q9awzHFXp157B6oO2jvzc+W/2icrjF+c5sGNZd1mklj+Xf01yvKgP9CaQpEAS8EkSpX i9A5+PY9KNAqb9z3YStFvYyOLnJ6ZWJh+uPqEAfGhu29scSrlGM+KBWP41/z6lmqj1CdHD G+Wx+4VC33+6Dj+hixiqse9/OYg90Yfmofc1QKUc43hNEvcwkLjzrtjuNo3yMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697579932; a=rsa-sha256; cv=none; b=X8Nq3D2h84Mabod15E1LBb+jZpg0KwfqQQuTWbTg8lEmHk9hv342yXJ/1m5TEDhzxGLo8T QlIsjcW5Wg31bSMvj94pHo7cAzkkpgaifzBmSwh79/qSyAiQns1vTFAtLfgp7AbSW6eLfY Ovlox5OC6/Zunjg6mwM9u9n+MZDCM2jJF2pCMiAO0jQWUKJ07HDDUWEZm4b3OxY1gnNYO4 c99Irrk2vbjeq/BVKjB1AwFY0qwsZwc2g6g3VKSejO2BPtj+uy39NWAZMIDU4JrBiQgezV O2/uL68AKECiFQPgNZ0QzsRz9aQ21fHDfTqJSBWK0iXRPJ7MC4wI/0KPqa+d3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0BR7j3KBj85WHXMbrL5BEywH0U+3qsHqf6EhM747ZA=; b=C0jmRRk+Ike23a1sQArQajJFV9shoNk4B7VcNh47nS6rGzMn85aIANNohx1TrkUF9xOtvP gGYx66vrVWQj+ZYk07afLrO0VHLcHRI1zsDSLJzCjgr9Q1lSQazW/iGt5HMcSksLq/oTz9 uG7Au8aKiVBIE0o5ArcKAik1DTfAREYksdK7OoTbqj9CDoSh2X35etn3DB5qtRAA6TQsQH KkW7Yrrwx3HOBYvfOZkwf3mX8+KtIAr4HP/UYKLpJJXkmmy1rGRVd9KO8ab6FR2gufTAH7 MNpbZhJfSjs3xhePt1nPKz3bU8rRG/HgAk+pmgaqr0R3VOWiAmYkzgDekWyubQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S97Cw5cvxzglK; Tue, 17 Oct 2023 21:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HLwqGq031441; Tue, 17 Oct 2023 21:58:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HLwqOr031439; Tue, 17 Oct 2023 21:58:52 GMT (envelope-from git) Date: Tue, 17 Oct 2023 21:58:52 GMT Message-Id: <202310172158.39HLwqOr031439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d2abbfede534 - main - mkimg: Regenerate all the tests for gpt List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: d2abbfede5342b19f3e5994140cdb6622c95ef66 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2abbfede5342b19f3e5994140cdb6622c95ef66 commit d2abbfede5342b19f3e5994140cdb6622c95ef66 Author: Warner Losh AuthorDate: 2023-10-17 21:54:20 +0000 Commit: Warner Losh CommitDate: 2023-10-17 21:56:19 +0000 mkimg: Regenerate all the tests for gpt Recent changes to mkimg has changed the generated GPT images to be more correct. Use make rebase to regenerate the baseline. Sponsored by: Netflix --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 569 +++++------ 28 files changed, 3798 insertions(+), 3754 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index a974400ad2e8..ae764c000ae7 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,5 +1,6 @@ +# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 20 00 |.............B .| +00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| 00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * @@ -7,569 +8,573 @@ 00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| 00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 00 00 |......P.........| +00002010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 60 00 |..............`.| +00002030 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| +00002040 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| +00002050 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| +00002060 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| +00002070 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| +00002080 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| +00002090 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| +000020a0 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| +000020b0 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| +000020c0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| +000020d0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| +000020e0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| +000020f0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| +00002100 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| +00002110 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| +00002120 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| +00002130 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| +00002140 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| +00002150 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| +00002160 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| +00002170 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| +00002180 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| +00002190 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| +000021a0 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| +000021b0 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| +000021c0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| +000021d0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| +000021e0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| +000021f0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| +00002200 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| +00002210 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| +00002220 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| +00002230 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| +00002240 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| +00002250 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| +00002260 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| +00002270 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| +00002280 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| +00002290 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| +000022a0 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| +000022b0 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| +000022c0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| +000022d0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| +000022e0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| +000022f0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| +00002300 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| +00002310 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| +00002320 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| +00002330 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| +00002340 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| +00002350 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| +00002360 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| +00002370 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| +00002380 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| +00002390 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| +000023a0 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| +000023b0 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| +000023c0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| +000023d0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| +000023e0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| +000023f0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| +00002400 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| +00002410 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| +00002420 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| +00002430 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| +00002440 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| +00002450 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| +00002460 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| +00002470 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| +00002480 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| +00002490 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| +000024a0 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| +000024b0 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| +000024c0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| +000024d0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| +000024e0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| +000024f0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| +00002500 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| +00002510 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| +00002520 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| +00002530 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| +00002540 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| +00002550 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| +00002560 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| +00002570 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| +00002580 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| +00002590 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| +000025a0 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| +000025b0 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| +000025c0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| +000025d0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| +000025e0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| +000025f0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| +00002600 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| +00002610 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| +00002620 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| +00002630 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| +00002640 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| +00002650 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| +00002660 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| +00002670 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| +00002680 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| +00002690 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| +000026a0 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| +000026b0 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| +000026c0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| +000026d0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| +000026e0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| +000026f0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| +00002700 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| +00002710 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| +00002720 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| +00002730 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| +00002740 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| +00002750 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| +00002760 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| +00002770 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| +00002780 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| +00002790 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| +000027a0 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| +000027b0 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| +000027c0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| +000027d0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| +000027e0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| +000027f0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| +00002800 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| +00002810 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| +00002820 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| +00002830 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| +00002840 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| +00002850 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| +00002860 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| +00002870 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| +00002880 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| +00002890 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| +000028a0 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| +000028b0 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| +000028c0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| +000028d0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| +000028e0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| +000028f0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| +00002900 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| +00002910 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| +00002920 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| +00002930 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| +00002940 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| +00002950 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| +00002960 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| +00002970 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| +00002980 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| +00002990 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| +000029a0 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| +000029b0 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| +000029c0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| +000029d0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| +000029e0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| +000029f0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| +00002a00 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| +00002a10 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| +00002a20 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| +00002a30 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| +00002a40 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| +00002a50 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| +00002a60 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| +00002a70 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| +00002a80 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| +00002a90 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| +00002aa0 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| +00002ab0 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| +00002ac0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| +00002ad0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| +00002ae0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| +00002af0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| +00002b00 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| +00002b10 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| +00002b20 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| +00002b30 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| +00002b40 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| +00002b50 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| +00002b60 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| +00002b70 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| +00002b80 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| +00002b90 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| +00002ba0 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| +00002bb0 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| +00002bc0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| +00002bd0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| +00002be0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| +00002bf0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| +00002c00 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| +00002c10 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| +00002c20 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| +00002c30 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| +00002c40 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| +00002c50 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| +00002c60 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| +00002c70 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| +00002c80 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| +00002c90 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| +00002ca0 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| +00002cb0 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| +00002cc0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| +00002cd0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| +00002ce0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| +00002cf0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| +00002d00 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| +00002d10 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| +00002d20 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| +00002d30 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| +00002d40 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| +00002d50 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| +00002d60 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| +00002d70 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| +00002d80 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| +00002d90 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| +00002da0 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| +00002db0 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| +00002dc0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| +00002dd0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| +00002de0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| +00002df0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| +00002e00 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| +00002e10 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| +00002e20 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| +00002e30 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| +00002e40 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| +00002e50 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| +00002e60 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| +00002e70 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| +00002e80 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| +00002e90 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| +00002ea0 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| +00002eb0 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| +00002ec0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| +00002ed0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| +00002ee0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| +00002ef0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| +00002f00 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| +00002f10 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| +00002f20 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| +00002f30 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| +00002f40 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| +00002f50 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| +00002f60 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| +00002f70 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| +00002f80 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| +00002f90 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| +00002fa0 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| +00002fb0 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| +00002fc0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| +00002fd0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| +00002fe0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| +00002ff0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| +00003000 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| +00003010 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| +00003020 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| +00003030 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| +00003040 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| +00003050 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| +00003060 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| +00003070 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| +00003080 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| +00003090 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| +000030a0 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| +000030b0 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| +000030c0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| +000030d0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| +000030e0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| +000030f0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| +00003100 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| +00003110 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| +00003120 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| +00003130 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| +00003140 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| +00003150 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| +00003160 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| +00003170 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| +00003180 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| +00003190 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| +000031a0 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| +000031b0 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| +000031c0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| +000031d0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| +000031e0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| +000031f0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| +00003200 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| +00003210 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| +00003220 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| +00003230 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| +00003240 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| +00003250 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| +00003260 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| +00003270 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| +00003280 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| +00003290 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| +000032a0 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| +000032b0 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| +000032c0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| +000032d0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| +000032e0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| +000032f0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| +00003300 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| +00003310 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| +00003320 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| +00003330 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| +00003340 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| +00003350 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| +00003360 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| +00003370 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| +00003380 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| +00003390 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| +000033a0 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| +000033b0 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| +000033c0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| +000033d0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| +000033e0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| +000033f0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| +00003400 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| +00003410 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| +00003420 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| +00003430 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| +00003440 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| +00003450 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| +00003460 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| +00003470 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| +00003480 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| +00003490 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| +000034a0 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| +000034b0 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| +000034c0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| +000034d0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| +000034e0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| +000034f0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| +00003500 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| +00003510 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| +00003520 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| +00003530 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| +00003540 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| +00003550 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| +00003560 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| +00003570 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| +00003580 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| +00003590 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| +000035a0 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| +000035b0 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| +000035c0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| +000035d0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| +000035e0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| +000035f0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| +00003600 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| +00003610 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| +00003620 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| +00003630 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| +00003640 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| +00003650 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| +00003660 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| +00003670 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| +00003680 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| +00003690 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| +000036a0 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| +000036b0 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| +000036c0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| +000036d0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| +000036e0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| +000036f0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| +00003700 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| +00003710 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| +00003720 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| +00003730 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| +00003740 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| +00003750 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| +00003760 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| +00003770 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| +00003780 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| +00003790 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| +000037a0 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| +000037b0 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| +000037c0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| +000037d0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| +000037e0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| +000037f0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| +00003800 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| +00003810 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| +00003820 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| +00003830 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| +00003840 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| +00003850 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| +00003860 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| +00003870 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| +00003880 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| +00003890 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| +000038a0 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| +000038b0 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| +000038c0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| +000038d0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| +000038e0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| +000038f0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| +00003900 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| +00003910 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| +00003920 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| +00003930 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| +00003940 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| +00003950 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| +00003960 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| +00003970 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| +00003980 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| *** 7601 LINES SKIPPED *** From nobody Wed Oct 18 02:44:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9FY5351Lz4xNBm; Wed, 18 Oct 2023 02:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9FY52YCsz4YRR; Wed, 18 Oct 2023 02:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697597049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBIGizAExzLhhoLqHyKbDFKO5c0qXZzV7xugcE6Sv14=; b=e/jQy/ee02dKokq4h/18/SUqZP7hxV2i+ANul4UtplcuNvytIhLqJLDct2QUR/jyv9VjfH RBTgTsTniX1B3cOEHVi0lTZMR9M0SBdHYKBpnIOyFpdguE/gjRridMVtb3F0FDWk3cwYDY R3llkOE9fEhiKjZ5yhddMIVhaIkUeRsTuMZnN7Tm0ghviV/ATTQKwqLrDosWogxnrETl8t QY6ODbOYJR/nknhNtlVFplBVBFqWD0DGatHe+lui79Md59oHyPamS6RkabRNUVKchdvw6R VAFPEqzx7zLprygOr6YPNPCs38cNFAcMAIVM8oEX1aU9b3WEcGwQITcO0rcWuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697597049; a=rsa-sha256; cv=none; b=uyABDBmf8bAhA0CkvmlPaLm8gCRFKJd1wCnJdyNRa+y9DVK+8JneAgOqjrEVzLZEFln5+h U7uwmLHbHUz03KTtDj0MChuE0Rzd5YloLyc2cAYk7S/ro0mO1jzQUKZnpEsjpfnKoyGXCF 5m7sJKvc1WMiGbJ08RwiL9c8SaGbiFB4FEh2Bmu6Ka8LG2Rl73ASSqBCZ85RxR5CS9VjxH DSe4bqhFSv4vKtyztukx0riJIJMlbXqbrBfxrb2vueeD1dpEglk71+qQoHG+0Kg6zm3FOK qDjJSZg/uwkmdAZ/O2vWLAASs5nTOLeKQ+/2JRGEGS8D6eX1qRkofdCh1aTUtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697597049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBIGizAExzLhhoLqHyKbDFKO5c0qXZzV7xugcE6Sv14=; b=t416h5cnAGOHzaBUJdsjXGrK8iQrc6Dg11Qlest7GLxsPjogQXDF8pBlIo0oVLT62qgWBG 2ELrkckZaTDjnh3hU4L/eIf6Fj9unLPJ9QUJzgnNqX0zFCEgOP8lPQliAccQ96NUdC3LYs Aif9GylnUtqvfKhyiNXOZOMTTbLO63vVMlRLuGW5C69uv7Clhh4JGq6ab1JfAzTFs0TywC M6fE8Urrl+qRIFUpeZcLcF58+rI0Kh+CUb4FoQrxqb+hb435DoKWXusyT1BZK6i6JyZY3e cWiz3wL7ViyPNWP5l/ldp/6zFpCcr6bHhMsHuWeRjn7yomG52wpMjryFqPtioQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9FY51b4tzqFH; Wed, 18 Oct 2023 02:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39I2i9lI010368; Wed, 18 Oct 2023 02:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I2i9Pm010365; Wed, 18 Oct 2023 02:44:09 GMT (envelope-from git) Date: Wed, 18 Oct 2023 02:44:09 GMT Message-Id: <202310180244.39I2i9Pm010365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: db7257ef972e - main - nfsd: Fix a server crash List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: db7257ef972ed75e33929d39fd791d3699b53c63 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=db7257ef972ed75e33929d39fd791d3699b53c63 commit db7257ef972ed75e33929d39fd791d3699b53c63 Author: Rick Macklem AuthorDate: 2023-10-18 02:40:23 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 02:43:25 +0000 nfsd: Fix a server crash PR#274346 reports a crash which appears to be caused by a NULL default session being destroyed. This patch should avoid the crash. Tested by: Joshua Kinard PR: 274346 MFC after: 2 weeks --- sys/fs/nfs/nfs_commonkrpc.c | 9 +++++++++ sys/fs/nfs/nfs_commonsubs.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 936373c79366..29c7cdbd671c 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1208,6 +1208,14 @@ tryagain: NFSCL_DEBUG(1, "Got badsession\n"); NFSLOCKCLSTATE(); NFSLOCKMNT(nmp); + if (TAILQ_EMPTY(&nmp->nm_sess)) { + NFSUNLOCKMNT(nmp); + NFSUNLOCKCLSTATE(); + printf("If server has not rebooted, " + "check NFS clients for unique " + "/etc/hostid's\n"); + goto out; + } sep = NFSMNT_MDSSESSION(nmp); if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, NFSX_V4SESSIONID) == 0) { @@ -1388,6 +1396,7 @@ tryagain: nd->nd_repstat = NFSERR_STALEDONTRECOVER; } } +out: #ifdef KDTRACE_HOOKS if (nmp != NULL && dtrace_nfscl_nfs234_done_probe != NULL) { diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index ffe1ec542492..f2305795e53e 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -5141,11 +5141,13 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, struct nfsrv_descript *nd = &nfsd; int error; + if (tsep == NULL) + tsep = nfsmnt_mdssession(nmp); + if (tsep == NULL) + return (0); nfscl_reqstart(nd, NFSPROC_DESTROYSESSION, nmp, NULL, 0, NULL, NULL, 0, 0, NULL); NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); - if (tsep == NULL) - tsep = nfsmnt_mdssession(nmp); bcopy(tsep->nfsess_sessionid, tl, NFSX_V4SESSIONID); nd->nd_flag |= ND_USEGSSNAME; error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, From nobody Wed Oct 18 06:55:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9M7N3217z4xct2; Wed, 18 Oct 2023 06:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9M7N2PFYz3RxW; Wed, 18 Oct 2023 06:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697612144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jmLI9GtA2xmBCS6KppE+hSzhTlzG7B4KyGz6rd7NaA=; b=Wd6oMrgWkG2CbA95r/C+rwa1OZbV999AV03JXicKXaA1682IDNWM5dVO8bHBNYUqHushz7 R07/sreYzT7JtOGAKOkJURt/iQr9DL37hs6TDSqLGZf9OOlCwuoA2eRG2ba3++iZWVGse9 GKia5WDOeluHEsnID/Z1yaVqDzdRSbANBlob3xKpVDEWIB/cII21x5UWYA3/OGkrnfBJvK d4eNAnO10AioJRYUDYqLmY9iE4LZjSsMXkbTsccLSzUaOn90tA8cwz8DX6uU6cNT39O7Ic ghTuenKKYIqz1lE6w1qYRR14pUcP0TX+VkgUugpybl6Qn6dgVdBA5QsBovzWjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697612144; a=rsa-sha256; cv=none; b=risH5PrjsqHZEGiCzt2fQax63PVusM4ogNhAmBnKHg9quyVZnYr+n6TdeIjb0FJ4NBLuMr k0WglTG9hg+ChPZnnksqca8yLmzZfAn5n7QeWuOV24VtAjU1zx00V6V+BjzHT05CoH/VuB MKPKLNkpAAvPyBeANzvJJ4oUgaviFBU8Q/Zuq6oz0lyB66537DsDXkzl2Nu9caVdFNCc08 EEA7MjupG9UFePhBSiT0SNcpstS6jjhbbW4YR44K2R9eFWIGeiLJQ0ad1lrZvwYonxCs1S Obc+SwrmiJTVU4fqKIXInXrizAr+4tIJehPiw5ZY4X70Zq+Hn2TtilZ2dQYByQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697612144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jmLI9GtA2xmBCS6KppE+hSzhTlzG7B4KyGz6rd7NaA=; b=VMShCiN6SMqB6Jry4dZtG9WibmJlLBFhJh1M7QQkESyQ9yfamFIsC4cuEeE7grL1UqtYRh e0uAWueayhn2BAQk5aNkly6DKDhfqPAP2WfSS6vkYZgzOK9594Lyd8xumNbhRLkp1TqE9I A2ZqXmd1+ln9zaeD8I0DjKo8CNghJrQU/QhPMYIeq3MO3C5FaJdZnNffJWpHjrOO48t7TK x7zq4hoxxdW/PahRDu9BWsZL/e1jfejcsqtUXnRB44+RbEIMspQWvpTFgDnVhqOz1LxNWj naJjzdI11RowHTLx/PomJRRhR/4iGyFZK8B/WT5MLm4ioghpqM6JJ7hSBenbxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9M7N1Pt7zxCM; Wed, 18 Oct 2023 06:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39I6ti30026110; Wed, 18 Oct 2023 06:55:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I6titH026107; Wed, 18 Oct 2023 06:55:44 GMT (envelope-from git) Date: Wed, 18 Oct 2023 06:55:44 GMT Message-Id: <202310180655.39I6titH026107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: ef1dad6d83ff - main - stress2: Fix "-Wunused-but-set-variable" warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef1dad6d83ff662ed211433ac2e5805bae5d04e9 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=ef1dad6d83ff662ed211433ac2e5805bae5d04e9 commit ef1dad6d83ff662ed211433ac2e5805bae5d04e9 Author: Peter Holm AuthorDate: 2023-10-18 06:54:38 +0000 Commit: Peter Holm CommitDate: 2023-10-18 06:54:38 +0000 stress2: Fix "-Wunused-but-set-variable" warnings --- tools/test/stress2/misc/exlock2.sh | 15 +++++---------- tools/test/stress2/misc/fcntl2.sh | 2 ++ tools/test/stress2/misc/fifo2.sh | 8 ++++---- tools/test/stress2/misc/mmap18.sh | 13 ++++--------- tools/test/stress2/misc/mmap32.sh | 5 ++--- tools/test/stress2/misc/poll2.sh | 4 ++-- tools/test/stress2/misc/procfs4.sh | 7 +++---- tools/test/stress2/misc/sendfile25.sh | 4 +--- tools/test/stress2/misc/setsockopt2.sh | 3 +++ 9 files changed, 26 insertions(+), 35 deletions(-) diff --git a/tools/test/stress2/misc/exlock2.sh b/tools/test/stress2/misc/exlock2.sh index 58a49919d86a..e1760cc52a4d 100755 --- a/tools/test/stress2/misc/exlock2.sh +++ b/tools/test/stress2/misc/exlock2.sh @@ -68,6 +68,7 @@ EOF #include static _Atomic(int) *share; +static int debug; /* Set to "1" for debug output */ static int quit; static char file[80]; @@ -101,9 +102,8 @@ test1(void) ; /* wait for test2 to signal "done" */ close(fd); } -#if defined(DEBUG) - fprintf(stderr, "%s: n = %d\n", __func__, n); -#endif + if (debug != 0) + fprintf(stderr, "%s: n = %d\n", __func__, n); _exit(0); } @@ -114,17 +114,15 @@ test2(void) struct flock fl; struct stat st; time_t start; - int e, fd, n; + int e, fd; e = 0; fd = 0; - n = 0; start = time(NULL); while (time(NULL) - start < RUNTIME) { share[SYNC] = 1; if ((fd = open(file, O_RDWR)) == -1) goto out; - n++; memset(&fl, 0, sizeof(fl)); fl.l_start = 0; fl.l_len = 0; @@ -151,12 +149,9 @@ out: share[SYNC] = 0; usleep(100); } -#if defined(DEBUG) - if (e != 0) { + if (debug != 0 && e != 0) system("ps -Uroot | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); - } -#endif share[SYNC] = 0; _exit(e); diff --git a/tools/test/stress2/misc/fcntl2.sh b/tools/test/stress2/misc/fcntl2.sh index 80be1bd05e5a..acb161fd0523 100755 --- a/tools/test/stress2/misc/fcntl2.sh +++ b/tools/test/stress2/misc/fcntl2.sh @@ -150,6 +150,8 @@ test(void) } close(fd); unlink(file); + if (success == 0) + fprintf(stderr, "No calls to fcntl() succeeded.\n"); _exit(0); } diff --git a/tools/test/stress2/misc/fifo2.sh b/tools/test/stress2/misc/fifo2.sh index 9e4a7e632e9d..4a7b986931d9 100755 --- a/tools/test/stress2/misc/fifo2.sh +++ b/tools/test/stress2/misc/fifo2.sh @@ -96,6 +96,7 @@ EOF #include #define N (128 * 1024 / (int)sizeof(u_int32_t)) +static int debug; /* Set to 1 for debug output */ u_int32_t r[N]; static void @@ -143,11 +144,10 @@ calls(void *arg __unused) arg6 = makearg(); arg7 = makearg(); -#if 0 - fprintf(stderr, "%2d : syscall(%3d, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", - i, SYS_open, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + if (debug != 0) + fprintf(stderr, "%2d : syscall(%3d, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", + i, SYS_open, arg1, arg2, arg3, arg4, arg5, arg6, arg7); usleep(100000); -#endif alarm(1); syscall(SYS_open, arg1, arg2, arg3, arg4, arg5, arg6, arg7); } diff --git a/tools/test/stress2/misc/mmap18.sh b/tools/test/stress2/misc/mmap18.sh index 065b5bb7df6c..f2b19c07fe60 100755 --- a/tools/test/stress2/misc/mmap18.sh +++ b/tools/test/stress2/misc/mmap18.sh @@ -89,6 +89,7 @@ EOF static u_int32_t r[N]; static void *p; +static int debug; /* set to 1 for debug output */ static unsigned long makearg(void) @@ -176,11 +177,9 @@ tmlock(void *arg __unused) if (munlock(makeptr(), len) == 0) n++; } -#if defined(DEBUG) - if (n < 10) + if (debug != 0 && n < 10) fprintf(stderr, "Note: tmlock() only succeeded %d " "times.\n", n); -#endif return (NULL); } @@ -202,11 +201,9 @@ tmprotect(void *arg __unused) n++; usleep(1000); } -#if defined(DEBUG) - if (n < 10) + if (debug != 0 && n < 10) fprintf(stderr, "Note: tmprotect() only succeeded %d " "times.\n", n); -#endif return (NULL); } @@ -226,11 +223,9 @@ tmlockall(void *arg __unused) munlockall(); usleep(1000); } -#if defined(DEBUG) - if (n < 10) + if (debug != 0 && n < 10) fprintf(stderr, "Note: tmlockall() only succeeded %d " "times.\n", n); -#endif return (NULL); } diff --git a/tools/test/stress2/misc/mmap32.sh b/tools/test/stress2/misc/mmap32.sh index a775b756084e..334327a85989 100755 --- a/tools/test/stress2/misc/mmap32.sh +++ b/tools/test/stress2/misc/mmap32.sh @@ -62,6 +62,7 @@ EOF #include #define N 4096 +static int debug; /* set to 1 for debug output */ static uint32_t r[N]; static unsigned long @@ -133,10 +134,8 @@ fuzz(int arg, void *addr, size_t len, int prot, int flags, int fd, n++; } } -#if defined(DEBUG) - if (n == 0 && arg != 5) + if (debug != 0 &&n == 0 && arg != 5) fprintf(stderr, "%s(%d) failed\n", __func__, arg); -#endif exit(0); } diff --git a/tools/test/stress2/misc/poll2.sh b/tools/test/stress2/misc/poll2.sh index 7c0aff9c78ca..aa5ad5f995dd 100755 --- a/tools/test/stress2/misc/poll2.sh +++ b/tools/test/stress2/misc/poll2.sh @@ -136,11 +136,11 @@ static void * pl(void *data __unused) { struct pollfd pfd; - int i, r; + int r; pfd.fd = fds[0]; pfd.events = POLLIN; - for (i = 0; done == 0; i++) { + while (done == 0) { pfd.fd = fds[0]; pfd.events = POLLIN; pthread_set_name_np(pthread_self(), "pl-idle"); diff --git a/tools/test/stress2/misc/procfs4.sh b/tools/test/stress2/misc/procfs4.sh index ffa812a7f73d..18e5c0a6f803 100755 --- a/tools/test/stress2/misc/procfs4.sh +++ b/tools/test/stress2/misc/procfs4.sh @@ -68,6 +68,7 @@ EOF #define MAXRUN 1200 #define PARALLEL 10 +static int debug; /* Set to 1 for debug output */ char *files[] = { "cmdline", "ctl", @@ -116,10 +117,8 @@ test(void) close(fd); } kill(p, SIGHUP); -#if 0 - if (opens < 1) - fprintf(stderr, "Warn %d open(s) for pid %d\n", opens, getpid()); -#endif + if (debug != 0 && opens == 0) + fprintf(stderr, "No ioctl() calls succeeded.\n"); } for (i = 0; i < 64; i++) diff --git a/tools/test/stress2/misc/sendfile25.sh b/tools/test/stress2/misc/sendfile25.sh index fa2e2b8687cd..ae755bf1d4df 100755 --- a/tools/test/stress2/misc/sendfile25.sh +++ b/tools/test/stress2/misc/sendfile25.sh @@ -105,7 +105,7 @@ reader(void) { int on; socklen_t len; struct sockaddr_in inetaddr, inetpeer; - int n, t, *buf, fd; + int n, *buf, fd; on = 1; if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) @@ -132,7 +132,6 @@ reader(void) { (struct sockaddr *)&inetpeer, &len)) < 0) err(1, "accept(), %s:%d", __FILE__, __LINE__); - t = 0; if ((buf = malloc(bufsize)) == NULL) err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__); @@ -142,7 +141,6 @@ reader(void) { for (;;) { if ((n = read(msgsock, buf, bufsize)) < 0) err(1, "read(), %s:%d", __FILE__, __LINE__); - t += n; if (n == 0) break; diff --git a/tools/test/stress2/misc/setsockopt2.sh b/tools/test/stress2/misc/setsockopt2.sh index 44ed98320404..13cc3175cce3 100755 --- a/tools/test/stress2/misc/setsockopt2.sh +++ b/tools/test/stress2/misc/setsockopt2.sh @@ -86,6 +86,7 @@ EOF #include #include +static int debug; /* set to 1 for debug output */ static volatile u_int *share; #define PARALLEL 128 @@ -165,6 +166,8 @@ bad: if (waitpid(pid, NULL, 0) != pid) err(1, "waitpid(%d)", pid); } + if (debug != 0 && success == 0) + fprintf(stderr, "No calls to connect() succeded.\n"); _exit(0); } From nobody Wed Oct 18 07:48:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9NJb4gf9z4xgpT; Wed, 18 Oct 2023 07:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9NJb3wsTz3WMy; Wed, 18 Oct 2023 07:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697615327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fonGzp0e0UWpfSLJpaYqYscupjTyPzkdsctoIdpRrJw=; b=mZvRO/qwdBqBMW3MpC4ahpo7frX/QL/da2grWEV74GaeQOxxFIP07gB4TukELkC8/nTLQN gJ/swHL5lc2uB90mTMTBGoSoYYGp58zuEJNTaZ+KJydLyHrLquAXzY3ODripdAVne8flu3 FnOFb3I1yatmpnr4x10CTbiBbw2ihpu0mP1+utx9n6S4GJFpEJAjgBpsDd0HpHyal23T08 cyNE2dHvuWnsORUbhyQkHx9vmw6XKe66dkyBkmjixEYpWVwunwg8lhzzbGE7GVqGtxkZic Up+2VxqwQo4CZFItuay3dQQT9cCnsO3lYoIkXWMJhKu43yN45q8GuHyHasCvQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697615327; a=rsa-sha256; cv=none; b=AtSa9WRNEr4SnaTeqiWfTOW+/+NRCr1Dsnx2fWoWRLjg8BwbZYCWxtUjA50OBXhl4RVzb0 WDW1Pz3iEP7StGiYle7/UYrabT05xMpD937i7e2rIf5f5jXRiJNPVpPcZUYqTy4kGaCazk jJOMttBk+qX34mdLcc3/Gz0JSmD/IjzBRIcaiR9AHpS8X612Q2DronjVwJkCsM0XAZ0EMX 90iMTkvYLqFB2W37pp8fVA4kvkvyXo6js9/jihm+g6l62rLhRFuEtT+wrNcL6edp75SNKe 9dimoOytT+3SX7urjvhRisAULsHgGDn6KVyrBesF7Bvla0wqPoGx7q+KlOk1bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697615327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fonGzp0e0UWpfSLJpaYqYscupjTyPzkdsctoIdpRrJw=; b=pPon52ThU1Dwm4WmY0DPxsxaY72AZ64y/CspZVK47ZzqQtg+zebMhko0y7DJSjGf5/Wkq7 R+Qz+rW/mkXwJ/Xsri5vO0e3/kAE5bH6w6wr6mm0cnk/8Bl0mDsvktcM5m560pu76A196x xGKDkiA/G7OTl+Qp40+9K+h0fXtxXLHaOc1A6U1yDimtD7t7MDBEaY2YgqODxMoNUAi+yI rGDwHSpfcrRYBum6tuoPea+p/j1Mi333FjL5zUwd7fBXGxBnpN7663u4cVKhSvfulTwBMU Hu5ARKHBiUxz5bdiKPoLNM2QOs9fE+XW2sNyKC/WUK3Xx6A878wwiggu0a6ArQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9NJb2zDMzyWW; Wed, 18 Oct 2023 07:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39I7mli7009927; Wed, 18 Oct 2023 07:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I7mliI009924; Wed, 18 Oct 2023 07:48:47 GMT (envelope-from git) Date: Wed, 18 Oct 2023 07:48:47 GMT Message-Id: <202310180748.39I7mliI009924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: b9cf989234d3 - main - bsdinstall: Fail nicely in jail target List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9cf989234d37a0885ee6228bcb6fa8f20f72b2f Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=b9cf989234d37a0885ee6228bcb6fa8f20f72b2f commit b9cf989234d37a0885ee6228bcb6fa8f20f72b2f Author: Fernando Apesteguía AuthorDate: 2023-10-17 13:37:04 +0000 Commit: Fernando Apesteguía CommitDate: 2023-10-18 07:46:05 +0000 bsdinstall: Fail nicely in jail target If the directory is empty we fail with a message regarding mkdir in which the empty directory can't be seen because it is not quoted. Show a nice message so the user knows what is going on. Reviewed by: bapt@ Differential Revision: https://reviews.freebsd.org/D42252 --- usr.sbin/bsdinstall/scripts/jail | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index feb9d8b1c097..de6dee04b891 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -36,7 +36,6 @@ BSDCFG_SHARE="/usr/share/bsdconfig" : ${BSDDIALOG_OK=0} f_dprintf "Began Installation at %s" "$( date )" -export BSDINSTALL_CHROOT=$1 error() { local msg @@ -54,6 +53,11 @@ error() { fi } +if [ -z "$1" ]; then + error "Directory can not be empty\n\nUsage:\nbsdinstall jail directory" +fi +export BSDINSTALL_CHROOT=$1 + rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC mkdir -p $1 || error "mkdir failed for $1" From nobody Wed Oct 18 12:30:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9VYr5cfKz4wxyB; Wed, 18 Oct 2023 12:30:40 +0000 (UTC) (envelope-from asiciliano@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9VYr57Xsz4b08; Wed, 18 Oct 2023 12:30:40 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697632240; 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=t7LUO13cI7H7bPbnkXhsWsVeYwPrjJ1PCNXk0Ix/MJg=; b=UsVcRJGMMQ01agORuA3R5VgsH6o//VU4RJrgLt/PxZiAJ4V8DvmlSVxFD7XHW1SavRqsdj gfExpxo8ZA2GJSbEgHWhmlcABEiOTZ68oXUy/pEwsjMHspfk3fOgZBkgLB4YojtE8mqj1/ zD0gDnpToK42YPVwnXn9hae9S5+sLBwc0lX/U0AnJJLaAZlKKkxK3q07MOXu9J7T0UCgAY 7kj/MoDPLomlL0MjjdMfq3jhLGTzp8aBBMoszRWM6qLYJRbhjDL1pC8tuUR2Y2wkepKfxP /R+9P813ycCWte6oZOxwpedKs83B12ftakFBt0pLysy0SzfTtQ4UuZSrkwpuww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697632240; a=rsa-sha256; cv=none; b=uQ+LEHFF2lLI19/X47g958VuQkD52aEczLAh8hr/OgmuwxfndiBp3ihAW5GajfAswLYqZg 31R6gwG6VdPN57tQgg+6zChUawSNT+jBYpcsab7nf0T/XYUYF4CsCbkVZf83QYrfSv+CHr JyrwPZ6EQbs0zsaPXjXOp8GtzqMPyX6BliOnXM82dXzMK5YOa1lubgOCsD7jtQjvtiUAz6 fP/Y0T9AwVDiKn8OMkj1UkFCnQ1YXTbO95NDOUtK8jf0YKO+DgiWzJZWuWXCuwVYMj3yPh b4XAtqw2OnAVXmXLPzp8u4Cd8vmkuS4V4XIHpx9ZoaLgnEoWj09kHZXY5H4eag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697632240; 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=t7LUO13cI7H7bPbnkXhsWsVeYwPrjJ1PCNXk0Ix/MJg=; b=c1f12xwIoA92lvJkELqemaS53VMQcQxxK9hlda/DRRMFuretsqimLzrcQVshA/l41jh2g8 eWYyu1BKyRLCwBknuNe4NDbFgbDbE3wiWoqgxewy2S6Cx1LOrdtyDnfCGDSQQk39csqVxP +t8cEjubqUiYM+1G/NSaTNo1XoDfm0jx+Mp6mtQOOCSf+X7wCvbBuJUKNMPK9z4ogyp93C 0UIQkLLLLH9wzmnqTTtgvNOSJohkweKLDAm2n5NISndGjZvXnsmxQBGf8KF49XVN0q5Gvq oWtHIjl7oXsaJNcfABIdAyX132nxZlLzM2KTSzHKT9t7VLD8qgtdXmy1S3iLmg== Received: from [192.168.1.9] (mob-5-91-126-91.net.vodafone.it [5.91.126.91]) (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: asiciliano) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S9VYq72hGz6Zx; Wed, 18 Oct 2023 12:30:39 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Message-ID: <0fe92251-c75a-4074-9640-9af8ce0bf8b1@FreeBSD.org> Date: Wed, 18 Oct 2023 14:30:41 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8cfbeb56aa16 - main - bsdinstall services: Improve mouse configuration To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202205211442.24LEgsv9085401@gitrepo.freebsd.org> <99742C19-34A6-461F-BEA7-6B9206DF42C9@freebsd.org> Content-Language: en-US From: "Alfonso S. Siciliano" In-Reply-To: <99742C19-34A6-461F-BEA7-6B9206DF42C9@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 06/10/2022 22:38, Jessica Clarke wrote: > On 21 May 2022, at 15:42, Alfonso S. Siciliano wrote: >> >> The branch main has been updated by asiciliano: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=8cfbeb56aa160de1ea4f492abeb3aa029e84269f >> >> commit 8cfbeb56aa160de1ea4f492abeb3aa029e84269f >> Author: Alfonso S. Siciliano >> AuthorDate: 2022-05-21 14:37:53 +0000 >> Commit: Alfonso S. Siciliano >> CommitDate: 2022-05-21 14:42:23 +0000 >> >> bsdinstall services: Improve mouse configuration >> >> bsdinstall(8) has an option to enable moused support. >> However, if it is not selected, moused is still started >> through the configuration of nondefault devices. >> So, automatically add the moused_nondefault_enable="NO" >> setting to rc.conf unless moused support is selected. >> >> PR: 227999 >> Reported by: bcran >> Reviewed by: bapt >> Differential Revision: https://reviews.freebsd.org/D35193 > > I question the wisdom of this change. The text specifically says “PS/2 > mouse pointer”, because moused_enable controls only the default mouse, > which rc.conf sets to /dev/psm0. Turning this option on or off would > therefore affect specifically the PS/2 mouse, precisely as described in > the dialog menu entry. USB mice would always remain enabled. > > However, now, leaving the explicitly-PS/2 mouse option disabled *also* > disables non-default, i.e. USB, mice. Moreover, if you go and enable > the option so USB mice work, PS/2 mice are always enabled, but you may > not have a /dev/psm0. You may even be on an architecture where PS/2 > does not exist; atkbdc, and thus psm, only exists for x86. This means > that, in those cases, enabling the option gives an error during boot > because /dev/psm0 doesn’t exist. > > I can understand that some people want to turn off console mouse > support completely; however, with the current way moused works, that > cannot just be a single option that governs both moused_enable and > moused_nondefault_enable. > > Jess > I'll revert this commit. The comment could be added to the PR to track the discussion only in one place. Alfonso >> --- >> usr.sbin/bsdinstall/scripts/services | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services >> index f9141a523a31..1ac69fa63b2d 100755 >> --- a/usr.sbin/bsdinstall/scripts/services >> +++ b/usr.sbin/bsdinstall/scripts/services >> @@ -61,11 +61,17 @@ if [ $retval -ne $BSDDIALOG_OK ]; then >> fi >> >> havedump= >> +havemouse= >> for daemon in $DAEMONS; do >> [ "$daemon" = "dumpdev" ] && havedump=1 continue >> + [ "$daemon" = "moused" ] && havemouse=1 >> echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services >> done >> >> +if [ ! "$havemouse" ]; then >> + echo moused_nondefault_enable=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services >> +fi >> + >> echo '# Set dumpdev to "AUTO" to enable crash dumps, "NO"' \ >> 'to disable' >> $BSDINSTALL_TMPETC/rc.conf.services >> if [ "$havedump" ]; then > From nobody Wed Oct 18 13:45:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9XCj0MQHz4x3NX; Wed, 18 Oct 2023 13:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9XCh6GhCz3CXc; Wed, 18 Oct 2023 13:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697636704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDYgZV+TEkm5/EFDuHYWPFkNwlD+BxLgxTvPixbAloM=; b=UVh1Q48gpG+gg8NCV5MVpo9pZ3S122k8q6SeJUxg7jpNifuWkZgGKxDXkoXzDft+oYukbR d8VrWcnMfKDXDLbK7zdFPLEASQyP2T7JrAb46QNj/vWyG061N55GomFRprC+J4Oy+801lS SXv8Uh86RJYiIIKqZYQmw06I6uEKvyRBaWx7V4MryKJfvSuiSabslBwlLgQXolOn/GAcwj CNKuywNwVhWvpkFtX4oXZ4V3Z4aKxbCLDbH5Y1gwRQGAO4be8El4zqN3jgPzU8k6kpM8NS vqx7kHs8KMd62gkCa2CzjVQgx/hTnpcWSX6SBM+t9+ZfQPRCrx5dOJTb63ni5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697636704; a=rsa-sha256; cv=none; b=rCK8vF41aiGYLE2zxhupGsZAKSa3YI2YZblYVzQLzq56tmG/40B5GZOCB4fZwsRDASAKHY wB8ju4v4grsVLrKdyyG4MicW4GEj9jy2jnK42BoTMeMercIMO8yHu7RXWOCG07fxTwnkXP UmIfA6G2hYY/ZqjdukRi+7Ut47iG/6+VMnXTLdeCOs45yVc0hY0VMF8xmxVzrVqCvQHS4Q /0Wh5HA9vWP+ocwft7AZX6CvYRMl7WBGpC/+/YOzH180nW70CyiLc6HB1OxpQV2c2Et7xP 1tq3I1OzwWWJnbRyrB7JGNP+0wY7032oZBETMH5ibKfIZOBA6a3oxTeeqV/ZHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697636704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDYgZV+TEkm5/EFDuHYWPFkNwlD+BxLgxTvPixbAloM=; b=grNU+D4CRMI4SUiSe/SWYpoU8WoAtbCLc4DrPrE9JahJTP39zCBru8tc1Fzg0Xt7WNXvH2 oP5K56H57u2mZdw6bBJkA8rXePKRnBFEr8qwXzbSDg5qr/3qJSWZVZLvaadI5J+wwxZFwL 8wyrwAGXNROz8WQGcG5z4g2PwfrS65FJWW1mKSu1PjP+FQ2hNe5efjqsqokD+mJdXfzYc/ XkfSozInE9kkxPBz6krFogD1gfW/oF2I03BVCg/93j1VscY7z4qflKKB3ArtlmIN0br2Qy FqX7MtQBNDDzkkUUIuL6SfZImwG+g+M9/96Kl+1rJELIzD49RBL44a8qOPQDig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9XCh5Fp4z17Yx; Wed, 18 Oct 2023 13:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IDj4LF006693; Wed, 18 Oct 2023 13:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IDj4ej006690; Wed, 18 Oct 2023 13:45:04 GMT (envelope-from git) Date: Wed, 18 Oct 2023 13:45:04 GMT Message-Id: <202310181345.39IDj4ej006690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f88bd1174aab - main - linuxkpi: Fix an assertion in linux_free_kmem() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f88bd1174aab1aff7fea7241ab6e103e769d2d7a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f88bd1174aab1aff7fea7241ab6e103e769d2d7a commit f88bd1174aab1aff7fea7241ab6e103e769d2d7a Author: Mark Johnston AuthorDate: 2023-10-18 13:43:02 +0000 Commit: Mark Johnston CommitDate: 2023-10-18 13:43:02 +0000 linuxkpi: Fix an assertion in linux_free_kmem() In the LinuxKPI, PAGE_MASK is the logical negation of FreeBSD's PAGE_MASK, so the original assertion was simply incorrect. Reported by: trasz Tested by: trasz Fixes: 6223d0b67af9 ("linuxkpi: Handle direct-mapped addresses in linux_free_kmem()") --- sys/compat/linuxkpi/common/src/linux_page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 21e338acb089..ead2f24cf5df 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -193,7 +193,7 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - KASSERT((addr & PAGE_MASK) == 0, + KASSERT((addr & ~PAGE_MASK) == 0, ("%s: addr %p is not page aligned", __func__, (void *)addr)); if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) { From nobody Wed Oct 18 14:08:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Xl14Q5Mz4x4Bj; Wed, 18 Oct 2023 14:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9Xl13wMwz3FsH; Wed, 18 Oct 2023 14:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTNYMdCewWIohE85TJHG1/xNupwKAMPb3giu0UuN518=; b=brXFzpmli70kUnXiv+CY1TTRKPBDyU1NRF8BPFx4Cjky964Kq3EowT6ipYQFZhrOS80gUH qJKHjBNzSbXsy2KVbG7CjOywEiBaFVARY8HN3aWNTLcPz7+pbvt9ml6icpppp99Q1kyGrN EsQxzKylJOT1Gd+WBL2C57omGXY6cYU9uMi9r4WkQUg2EtzPLHOXjQbstpv0c5zpRIToRI 6eEOt0g7pLSSag581kyfwHr5cqqDbk6UUehIxkLQi5hJxIH//buCTaZGnF2xZW9hnu1vIr jfwsFPGJEfkA1LpT2fKTMvpHxTNK2gxfnH/FXbG/7P0f5PIzM14NuXNk5oYwpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638125; a=rsa-sha256; cv=none; b=rIgsNTSoGWWqleNu1eG4uFRM/9GcxcEQ9FtS7WYbICG/JhmrWdZNl0UVTAm47yOYMugUaH VeNww/7kCgjxATe4Otos6rPhG718HkzmrU8nlfF/TlVNxpDjh7A9C4B43TKob12W8pCHgf EeWf5Bbv6ROHLYTxINKlx6V0KXFrz4tVKnavtAmdSjjxloeY1mrsJxLuw0eXZvuPlSP5SL rN92B3X73Rliafoc8ztseZGb/L0wZ4Xmsp+gG0sVJdsb4OvKr/d9suVgos1P4u1wlnWLEl ubZixulZsOSrfo6et3NucpYhYqTOZNWt9Z1a2vq6moBhqN7PWregaEI4HPMGnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTNYMdCewWIohE85TJHG1/xNupwKAMPb3giu0UuN518=; b=HmIwxatIK4sCw4a+SSnEtgo4Tbk7h2dBUDLCKyywVHCKS6EgymU83V4FsV6R2yPbNDdNJo tt1GUUWQUBO4Uc+gDpFbBCrWk98Q/kU8TodGT4XHlWgP5kPAhdNVWFCRSWU4ctQlsBfrbP i8HtqnSjZiBxml4H/ieliYJwnE4yWlJ3R84jFyJFjy0rTKbl4NYRRSpluFFm0NXBfUF3c4 SxgsXTDyRfKolXbxIdp1lU9oOLWXZyXsE7xIOAu5LxsDbTH4Ho2+tRlpsrnGqMnW6bMBr/ 5c20SydiW5LkMSv5LbO/RiG7EJefs8tlglGJKDeuOFMr7jzlydDAiaEYeGmh1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Xl12yyDz18Ww; Wed, 18 Oct 2023 14:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IE8j6w040717; Wed, 18 Oct 2023 14:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IE8jAm040714; Wed, 18 Oct 2023 14:08:45 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:08:45 GMT Message-Id: <202310181408.39IE8jAm040714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 64fc8a936c86 - main - hesiod: Modernize. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 64fc8a936c868345a8f687fe2797474c5fcf35cb Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=64fc8a936c868345a8f687fe2797474c5fcf35cb commit 64fc8a936c868345a8f687fe2797474c5fcf35cb Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:05:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:05:55 +0000 hesiod: Modernize. Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D42190 --- lib/libc/net/hesiod.c | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c index 634f109e616b..421c3a4586d1 100644 --- a/lib/libc/net/hesiod.c +++ b/lib/libc/net/hesiod.c @@ -81,8 +81,7 @@ static void translate_errors(void); * initialize a hesiod_p. */ int -hesiod_init(context) - void **context; +hesiod_init(void **context) { struct hesiod_p *ctx; const char *p, *configname; @@ -130,8 +129,7 @@ hesiod_init(context) * Deallocates the hesiod_p. */ void -hesiod_end(context) - void *context; +hesiod_end(void *context) { struct hesiod_p *ctx = (struct hesiod_p *) context; @@ -221,10 +219,7 @@ hesiod_to_bind(void *context, const char *name, const char *type) * by the resolver. */ char ** -hesiod_resolve(context, name, type) - void *context; - const char *name; - const char *type; +hesiod_resolve(void *context, const char *name, const char *type) { struct hesiod_p *ctx = (struct hesiod_p *) context; char *bindname, **retvec; @@ -243,9 +238,7 @@ hesiod_resolve(context, name, type) /*ARGSUSED*/ void -hesiod_free_list(context, list) - void *context; - char **list; +hesiod_free_list(void *context, char **list) { char **p; @@ -263,9 +256,7 @@ hesiod_free_list(context, list) * or ctx->rhs which need to be freed by the caller. */ static int -read_config_file(ctx, filename) - struct hesiod_p *ctx; - const char *filename; +read_config_file(struct hesiod_p *ctx, const char *filename) { char *key, *data, *p, **which; char buf[MAXDNAME + 7]; @@ -357,9 +348,7 @@ read_config_file(ctx, filename) * return a list of them. */ static char ** -get_txt_records(qclass, name) - int qclass; - const char *name; +get_txt_records(int qclass, const char *name) { HEADER *hp; unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor; @@ -483,16 +472,14 @@ static void *context; static int errval = HES_ER_UNINIT; int -hes_init() +hes_init(void) { init_context(); return errval; } char * -hes_to_bind(name, type) - const char *name; - const char *type; +hes_to_bind(const char *name, const char *type) { static char *bindname; if (init_context() < 0) @@ -506,9 +493,7 @@ hes_to_bind(name, type) } char ** -hes_resolve(name, type) - const char *name; - const char *type; +hes_resolve(const char *name, const char *type) { static char **list; @@ -529,20 +514,19 @@ hes_resolve(name, type) } int -hes_error() +hes_error(void) { return errval; } void -hes_free(hp) - char **hp; +hes_free(char **hp) { hesiod_free_list(context, hp); } static int -init_context() +init_context(void) { if (!inited) { inited = 1; @@ -556,7 +540,7 @@ init_context() } static void -translate_errors() +translate_errors(void) { switch (errno) { case ENOENT: From nobody Wed Oct 18 14:08:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Xl26tgFz4x4FZ; Wed, 18 Oct 2023 14:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9Xl24shKz3FVs; Wed, 18 Oct 2023 14:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00xf0MvuGfOz4WROuuY8nGOFvhtugMpdxH5sEo3GL58=; b=nLP4CZJP+We3QjbhHOXZI4Fd8FHFDoRvuIXNFw9PIB0V+OFTEbhT+snwW6dJEEo4uoXW3d WDoFVYltT5HuqXEwpAI25j2d9GzFWeSXqqTfsuz0fNuePmB9fyn6uL+a+xcjO9cbFb9psy Mgty4QV4ufc305Dhed78Z1z8auWgPgj1+UmvjRftiPNEw6844KrZfMAp44p/9dPtwAkn8X c7V7JAu8VuqAXVTJUmTWO0f5jGQMtiLPB9WoSTRI7Qb92t3VMhbh7ZL++7P583zcT60rDw 4c4u6NHfRJZII0X+XM39CGuu8OBETWjteLh+AjvjdaVUp420Mi2D2AIkIVoZuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638126; a=rsa-sha256; cv=none; b=xDcsuHJj9M1TeH1tnqEXLv/sVIhL4xwx9oYfz7fBGZ9j3fmXCugGETYq+l/KJgXFlV0uHb /e4sBrycvL82+3WBhUvDAGR2+dM5U6cFKGmhv/ebNcHyVA8vwqB0r1UBabg9kT+iHNqWsO 84nYdhtl0pHU8g9I/KXSDyaT1DTaHvWTGLlPOom1N5ld1n7pU5ef3fgjrm+WB/GdrJquhu rI2SkHHmDe1jD6f9mTFoLhwODMndBBw1Z9YdptCDZfQDmgeAqwTaiPxRZiNUuoTzjdeC9U qESdQ9XiV4b0k7BtQksIo/vmWhbuQcXYRS5eKUY57cmZRPjeejB7NmLTxU/e4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00xf0MvuGfOz4WROuuY8nGOFvhtugMpdxH5sEo3GL58=; b=tJ8VUAcBVjBML74eUMsS/0hX+HgHU4NytkFONZkLTGULMV3n7ZNdDBj1FMZk86ECinlBoX rjrWszJNNRoSSKsV/35d7X7v9tw0T1zilc/6/iCKXlF4bW/aQWEhFygb/gkr875M8rsY5j 0rjDJ4bHgXKIoCrvMztpEbn/8ahTmB3zMVjbit3H0HjRCZOmopoE6h+jD1ISxSJ22EtGTF yPQitRdTyDWE8JU+Ilkb0YpLRfkUndY/ND5gpFGqmoeDj1a07D5mMc6tNWVNcR/w3u9zOv Hq9qKxFyZq6Qgy+vBATp5Lb6QkvL2SYpYlIa22/pND5/dcxwByQwUV2vsBkgQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Xl23fhjz1873; Wed, 18 Oct 2023 14:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IE8k0q040767; Wed, 18 Oct 2023 14:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IE8kjN040764; Wed, 18 Oct 2023 14:08:46 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:08:46 GMT Message-Id: <202310181408.39IE8kjN040764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a66d27e22fa0 - main - memory(3): Mention more functions. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a66d27e22fa0a6ae42a559d2f58deef88425d795 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a66d27e22fa0a6ae42a559d2f58deef88425d795 commit a66d27e22fa0a6ae42a559d2f58deef88425d795 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:05:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:07:46 +0000 memory(3): Mention more functions. Differential Revision: https://reviews.freebsd.org/D42191 --- lib/libc/stdlib/memory.3 | 57 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/lib/libc/stdlib/memory.3 b/lib/libc/stdlib/memory.3 index 143dce488f7e..a8bdd3a3ddf3 100644 --- a/lib/libc/stdlib/memory.3 +++ b/lib/libc/stdlib/memory.3 @@ -27,50 +27,79 @@ .\" .\" @(#)memory.3 8.1 (Berkeley) 6/4/93 .\" -.Dd June 4, 1993 +.Dd October 18, 2023 .Dt MEMORY 3 .Os .Sh NAME -.Nm malloc , +.Nm aligned_alloc , +.Nm alloca , +.Nm calloc , .Nm free , +.Nm malloc , +.Nm posix_memalign , .Nm realloc , -.Nm calloc , -.Nm alloca , -.Nm mmap -.Nd general memory allocation operations +.Nm reallocf , +.Nm valloc , +.Nm mmap , +.Nm munmap +.Nd memory management functions .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In stdlib.h .Ft void * -.Fn malloc "size_t size" +.Fn aligned_alloc "size_t alignment" "size_t size" +.Ft void * +.Fn alloca "size_t size" +.Ft void * +.Fn calloc "size_t nelem" "size_t elsize" .Ft void .Fn free "void *ptr" .Ft void * +.Fn malloc "size_t size" +.Ft int +.Fn posix_memalign "void **ptr" "size_t alignment" "size_t size" +.Ft void * .Fn realloc "void *ptr" "size_t size" .Ft void * -.Fn calloc "size_t nelem" "size_t elsize" +.Fn reallocf "void *ptr" "size_t size" .Ft void * -.Fn alloca "size_t size" +.Fn valloc "size_t size" .In sys/types.h .In sys/mman.h .Ft void * .Fn mmap "void * addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" +.Ft int +.Fn munmap "void *addr" "size_t len" .Sh DESCRIPTION These functions allocate and free memory for the calling process. They are described in the individual manual pages. .Sh SEE ALSO .Xr mmap 2 , +.Xr aligned_alloc 3 , .Xr alloca 3 , .Xr calloc 3 , .Xr free 3 , .Xr malloc 3 , -.Xr realloc 3 +.Xr posix_memalign 3 , +.Xr realloc 3 , +.Xr reallocf 3 , +.Xr valloc 3 , .Sh STANDARDS -These functions, with the exception of -.Fn alloca +The +.Fn calloc , +.Fn free , +.Fn malloc , and -.Fn mmap -conform to +.Fn realloc +functions conform to .St -isoC . +.Pp +The +.Fn mmap , +.Fn munmap , +and +.Fn posix_memalign +functions conform to +.St -p1003.1-2001 . From nobody Wed Oct 18 14:08:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Xl364Ppz4x4c3; Wed, 18 Oct 2023 14:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9Xl35hp8z3FSB; Wed, 18 Oct 2023 14:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YomwuCAjoh1KN3hwibjfJuQdN8ag/sVCYtK4uPDQF+Q=; b=DBB21QZ3CxELKW6fOchqHeyB6cAq9rWH3PSUzob9AH6vYac0aUGQNoYzscQ/NRleoMqsD6 xUqnBt7FF9XppWlS1vWebWwFr2JKS3EzM79rgnsS+XN4pqL1C1JKfYQznsoiGAyXvEL/N/ C/qk+YidydiL7IlxBB2qU3lB7a8YbUM4xr0RxUS2ZTEjr4/NFUw0TqMv86r3DWeJLu41Zd gyv+to8VAcGESmTEq2ApTrRggxJyP2rN6l2WQRG386ZrhnuH4g65rLnMWE0F22Lbi25acj F2F+6LNix5srAe+cTGsEI/egt6EkR4FhzfjL/qD7U0bGuVoDZR0rsp1bLwV6hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638127; a=rsa-sha256; cv=none; b=RZ1/JxJuucxHEqKvBoJn4d2GvXpKfiUkDvfsw91UWgPysy6tzEo4KH+G7Io6MxkPozfQ+O I62kmBbzmOFtjPvgyR2nfH/rrgKLTwbXzHt0T8WYUUIZio3NQBlPf6zdcubKgnZcPSo9Pu rScuHNj5cO/9HOgeOco72MDn143lE1Mx9hh5Cca6lJD0smIDuQWzbha9AXAlNEm8eu1g+P KzTMCr8MNhDfC8FcA51norkhr6oeTD9+d8G0dGekVlTr4BhwNbFtPDbgkSQ7jsshqP1Io/ QKVD7RVnpejvtER1fxd4ycYOYY4/uDftThzGtW1TuwFUE1K/VJyL2mbDuUibCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YomwuCAjoh1KN3hwibjfJuQdN8ag/sVCYtK4uPDQF+Q=; b=k8xg0jCCmuh5hnuwlw0MrbQ1uTZAb0Xdjdl6jEyagrmQb+MBd2hjUIRYre9o36GDrG7Odq 4ozVHLM3dOYwiCcpDgBc88aCeP/NJhT2Ez8qXurQ/7w05Rvo5QgFd5IYWtpv6i2cnIc/Oh Lre4KD+2hYOmpqJlvkmfhlZQfRsmhOi0no2AhMfgoqyZIgaGuaYTLaNUZsUkKjVauZoP8R o0r8cdZLTZvElt8YnBuA95RI3+/ox6kRVFxavrYKhfvSAbAjXZzhSCYlldN7kvtjBwhFaA XFHQ9VTk6f9DRqfeXC7j0oUC5DkxQAjmjaZA5l/nH4jusJYDMwpDfQk316rZdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Xl34nL2z17gd; Wed, 18 Oct 2023 14:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IE8l0R040816; Wed, 18 Oct 2023 14:08:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IE8lsg040813; Wed, 18 Oct 2023 14:08:47 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:08:47 GMT Message-Id: <202310181408.39IE8lsg040813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: dc41de36abc0 - main - libc: Fix missing or misspelled MLINKS. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: dc41de36abc01cd19d43347e14f077b26d183665 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=dc41de36abc01cd19d43347e14f077b26d183665 commit dc41de36abc01cd19d43347e14f077b26d183665 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:05:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:07:46 +0000 libc: Fix missing or misspelled MLINKS. Differential Revision: https://reviews.freebsd.org/D42192 --- ObsoleteFiles.inc | 3 + lib/libc/db/man/Makefile.inc | 2 +- lib/libc/net/Makefile.inc | 123 +++++++++++++++++++++++++----------- lib/libc/posix1e/Makefile.inc | 12 ++-- lib/libc/rpc/Makefile.inc | 2 + lib/libc/stdio/Makefile.inc | 118 ++++++++++++++++++++++++---------- lib/libc/stdlib/Makefile.inc | 50 +++++++++++---- lib/libc/sys/Makefile.inc | 1 + lib/libc/sys/sctp_generic_sendmsg.2 | 2 +- lib/libc/uuid/uuid.3 | 10 ++- lib/libc/xdr/Makefile.inc | 17 +++-- 11 files changed, 243 insertions(+), 97 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 9e4be6b69312..f54e13ea3d2d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231018: Remove misspelled man page link +OLD_FILES+=usr/share/man/man3/dbm_dirnfo.3.gz + # 20231006: rename tcp6_v4unmapped_bind_test OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc index 15021f0ca900..bbe89473e66d 100644 --- a/lib/libc/db/man/Makefile.inc +++ b/lib/libc/db/man/Makefile.inc @@ -7,7 +7,7 @@ MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 MLINKS+= dbm.3 dbm_clearerr.3 MLINKS+= dbm.3 dbm_close.3 MLINKS+= dbm.3 dbm_delete.3 -MLINKS+= dbm.3 dbm_dirnfo.3 +MLINKS+= dbm.3 dbm_dirfno.3 MLINKS+= dbm.3 dbm_error.3 MLINKS+= dbm.3 dbm_fetch.3 MLINKS+= dbm.3 dbm_firstkey.3 diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index ea5ddf875151..ef4898dbcbe7 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -50,41 +50,73 @@ MAN+= byteorder.3 ethers.3 eui64.3 \ sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ -MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ +MLINKS+=byteorder.3 htonl.3 \ + byteorder.3 htons.3 \ + byteorder.3 ntohl.3 \ byteorder.3 ntohs.3 -MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \ - ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3 -MLINKS+=eui64.3 eui64_aton.3 eui64.3 eui64_hostton.3 \ - eui64.3 eui64_ntoa.3 eui64.3 eui64_ntohost.3 -MLINKS+=getaddrinfo.3 freeaddrinfo.3 -MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \ - gethostbyname.3 gethostbyaddr_r.3 gethostbyname.3 gethostbyname2.3 \ - gethostbyname.3 gethostbyname2_r.3 gethostbyname.3 gethostbyname_r.3 \ - gethostbyname.3 gethostent.3 gethostbyname.3 herror.3 \ - gethostbyname.3 hstrerror.3 gethostbyname.3 sethostent.3 +MLINKS+=ethers.3 ether_aton.3 \ + ethers.3 ether_aton_r.3 \ + ethers.3 ether_hostton.3 \ + ethers.3 ether_line.3 \ + ethers.3 ether_ntoa.3 \ + ethers.3 ether_ntoa_r.3 \ + ethers.3 ether_ntohost.3 +MLINKS+=eui64.3 eui64_aton.3 \ + eui64.3 eui64_hostton.3 \ + eui64.3 eui64_ntoa.3 \ + eui64.3 eui64_ntohost.3 +MLINKS+=getaddrinfo.3 freeaddrinfo.3 +MLINKS+=gethostbyname.3 endhostent.3 \ + gethostbyname.3 gethostbyaddr.3 \ + gethostbyname.3 gethostbyaddr_r.3 \ + gethostbyname.3 gethostbyname2.3 \ + gethostbyname.3 gethostbyname2_r.3 \ + gethostbyname.3 gethostbyname_r.3 \ + gethostbyname.3 gethostent.3 \ + gethostbyname.3 herror.3 \ + gethostbyname.3 hstrerror.3 \ + gethostbyname.3 sethostent.3 MLINKS+=getifaddrs.3 freeifaddrs.3 MLINKS+=getifmaddrs.3 freeifmaddrs.3 -MLINKS+=getipnodebyname.3 getipnodebyaddr.3 getipnodebyname.3 freehostent.3 -MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \ - getnetent.3 getnetbyaddr_r.3 getnetent.3 getnetbyname.3 \ - getnetent.3 getnetbyname_r.3 getnetent.3 setnetent.3 \ +MLINKS+=getipnodebyname.3 getipnodebyaddr.3 \ + getipnodebyname.3 freehostent.3 +MLINKS+=getnetent.3 endnetent.3 \ + getnetent.3 getnetbyaddr.3 \ + getnetent.3 getnetbyaddr_r.3 \ + getnetent.3 getnetbyname.3 \ + getnetent.3 getnetbyname_r.3 \ + getnetent.3 setnetent.3 \ getnetent.3 getnetent_r.3 -MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \ - getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3 -MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \ - getservent.3 getservbyport.3 getservent.3 setservent.3 -MLINKS+=if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \ +MLINKS+=getprotoent.3 endprotoent.3 \ + getprotoent.3 getprotobyname.3 \ + getprotoent.3 getprotobynumber.3 \ + getprotoent.3 setprotoent.3 +MLINKS+=getservent.3 endservent.3 \ + getservent.3 getservbyname.3 \ + getservent.3 getservbyport.3 \ + getservent.3 setservent.3 +MLINKS+=if_indextoname.3 if_nametoindex.3 \ + if_indextoname.3 if_nameindex.3 \ if_indextoname.3 if_freenameindex.3 -MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \ - inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \ - inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 inet_ntoa_r.3\ - inet.3 inet_ntop.3 inet.3 inet_pton.3 \ - inet.3 network.3 inet.3 ntoa.3 +MLINKS+=inet.3 addr.3 \ + inet.3 inet_addr.3 \ + inet.3 inet_aton.3 \ + inet.3 inet_lnaof.3 \ + inet.3 inet_makeaddr.3 \ + inet.3 inet_netof.3 \ + inet.3 inet_network.3 \ + inet.3 inet_ntoa.3 \ + inet.3 inet_ntoa_r.3 \ + inet.3 inet_ntop.3 \ + inet.3 inet_pton.3 \ + inet.3 network.3 \ + inet.3 ntoa.3 MLINKS+= sctp_send.3 sctp_sendx.3 MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3 MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3 MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3 -MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3 +MLINKS+=inet_net.3 inet_net_ntop.3 \ + inet_net.3 inet_net_pton.3 MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ inet6_opt_init.3 inet6_opt_find.3 \ inet6_opt_init.3 inet6_opt_finish.3 \ @@ -108,22 +140,39 @@ MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ inet6_rthdr_space.3 inet6_rthdr_lasthop.3 \ inet6_rthdr_space.3 inet6_rthdr_reverse.3 \ inet6_rthdr_space.3 inet6_rthdr_segments.3 -MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 -MLINKS+=rcmd.3 iruserok.3 rcmd.3 iruserok_sa.3 \ +MLINKS+=linkaddr.3 link_addr.3 \ + linkaddr.3 link_ntoa.3 +MLINKS+=rcmd.3 iruserok.3 \ + rcmd.3 iruserok_sa.3 \ rcmd.3 rcmd_af.3 \ - rcmd.3 rresvport.3 rcmd.3 rresvport_af.3 \ + rcmd.3 rresvport.3 \ + rcmd.3 rresvport_af.3 \ rcmd.3 ruserok.3 -MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \ - resolver.3 res_mkquery.3 resolver.3 res_query.3 \ - resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \ - resolver.3 ns_get16.3 resolver.3 ns_get32.3 \ - resolver.3 ns_put16.3 resolver.3 ns_put32.3 -MLINKS+=sourcefilter.3 setipv4sourcefilter.3 sourcefilter.3 getipv4sourcefilter.3 \ - sourcefilter.3 setsourcefilter.3 sourcefilter.3 getsourcefilter.3 +MLINKS+=resolver.3 dn_comp.3 \ + resolver.3 dn_expand.3 \ + resolver.3 res_init.3 \ + resolver.3 res_mkquery.3 \ + resolver.3 res_query.3 \ + resolver.3 res_search.3 \ + resolver.3 res_send.3 \ + resolver.3 dn_skipname.3 \ + resolver.3 ns_get16.3 \ + resolver.3 ns_get32.3 \ + resolver.3 ns_put16.3 \ + resolver.3 ns_put32.3 +MLINKS+=sourcefilter.3 setipv4sourcefilter.3 \ + sourcefilter.3 getipv4sourcefilter.3 \ + sourcefilter.3 setsourcefilter.3 \ + sourcefilter.3 getsourcefilter.3 .if ${MK_HESIOD} != "no" -SRCS+= hesiod.c +SRCS+= hesiod.c MAN+= hesiod.3 +MLINKS+=hesiod.3 hesiod_init.3 \ + hesiod.3 hesiod_resolve.3 \ + hesiod.3 hesiod_free_list.3 \ + hesiod.3 hesiod_to_bind.3 \ + hesiod.3 hesiod_end.3 .endif afterinstallconfig: modify-nsswitch-conf diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc index 5d3d30ed6dea..0b738ef7e239 100644 --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -95,23 +95,27 @@ MAN+= acl.3 \ posix1e.3 MLINKS+=acl_create_entry.3 acl_create_entry_np.3\ + acl_cmp_np.3 acl_cmp.3 \ acl_delete.3 acl_delete_def_file.3 \ - acl_delete.3 acl_delete_file_np.3 \ + acl_delete.3 acl_delete_def_link_np.3 \ acl_delete.3 acl_delete_fd_np.3 \ + acl_delete.3 acl_delete_file_np.3 \ + acl_delete.3 acl_delete_link_np.3 \ acl_delete_entry.3 acl_delete_entry_np.3\ acl_extended_file_np.3 acl_extended_file_nofollow_np.3 \ acl_extended_file_np.3 acl_extended_link_np.3 \ - acl_get.3 acl_get_file.3 \ acl_get.3 acl_get_fd.3 \ acl_get.3 acl_get_fd_np.3 \ + acl_get.3 acl_get_file.3 \ acl_get.3 acl_get_link_np.3 \ - acl_set.3 acl_set_file.3 \ acl_set.3 acl_set_fd.3 \ acl_set.3 acl_set_fd_np.3 \ + acl_set.3 acl_set_file.3 \ acl_set.3 acl_set_link_np.3 \ acl_to_text.3 acl_to_text_np.3 \ - acl_valid.3 acl_valid_file_np.3 \ acl_valid.3 acl_valid_fd_np.3 \ + acl_valid.3 acl_valid_file_np.3 \ + acl_valid.3 acl_valid_link_np.3 \ extattr.3 extattr_namespace_to_string.3 \ extattr.3 extattr_string_to_namespace.3 \ mac_get.3 mac_get_fd.3 \ diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index 969c775d156a..6ca307d44b74 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -167,6 +167,7 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ rpc_soc.3 svc_fds.3 \ rpc_soc.3 svc_fdset.3 \ rpc_soc.3 svc_getcaller.3 \ + rpc_soc.3 svc_getreq.3 \ rpc_soc.3 svc_register.3 \ rpc_soc.3 svc_unregister.3 \ rpc_soc.3 svcfd_create.3 \ @@ -175,5 +176,6 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ rpc_soc.3 svctcp_create.3 \ rpc_soc.3 svcudp_bufcreate.3 \ rpc_soc.3 svcunix_create.3 \ + rpc_soc.3 xdr_authunix_parms.3 \ rpc_soc.3 xdr_pmap.3 \ rpc_soc.3 xdr_pmaplist.3 diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc index 0fc0a6bfd68c..f02ac627a3b6 100644 --- a/lib/libc/stdio/Makefile.inc +++ b/lib/libc/stdio/Makefile.inc @@ -42,50 +42,102 @@ MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ stdio.3 tmpnam.3 \ ungetc.3 ungetwc.3 wprintf.3 wscanf.3 -MLINKS+=fclose.3 fcloseall.3 fclose.3 fdclose.3 +MLINKS+=fclose.3 fcloseall.3 \ + fclose.3 fdclose.3 MLINKS+=ferror.3 ferror_unlocked.3 \ - ferror.3 clearerr.3 ferror.3 clearerr_unlocked.3 \ - ferror.3 feof.3 ferror.3 feof_unlocked.3 \ - ferror.3 fileno.3 ferror.3 fileno_unlocked.3 + ferror.3 clearerr.3 \ + ferror.3 clearerr_unlocked.3 \ + ferror.3 feof.3 \ + ferror.3 feof_unlocked.3 \ + ferror.3 fileno.3 \ + ferror.3 fileno_unlocked.3 MLINKS+=fflush.3 fflush_unlocked.3 \ fflush.3 fpurge.3 MLINKS+=fgets.3 gets.3 MLINKS+=fgets.3 gets_s.3 -MLINKS+=flockfile.3 ftrylockfile.3 flockfile.3 funlockfile.3 -MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3 fopen.3 fmemopen.3 +MLINKS+=flockfile.3 ftrylockfile.3 \ + flockfile.3 funlockfile.3 +MLINKS+=fopen.3 fdopen.3 \ + fopen.3 freopen.3 \ + fopen.3 fmemopen.3 MLINKS+=fputs.3 fputs_unlocked.3 \ fputs.3 puts.3 MLINKS+=fread.3 fread_unlocked.3 \ fread.3 fwrite.3 \ fread.3 fwrite_unlocked.3 -MLINKS+=fseek.3 fgetpos.3 fseek.3 fseeko.3 fseek.3 fsetpos.3 fseek.3 ftell.3 \ - fseek.3 ftello.3 fseek.3 rewind.3 -MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3 -MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \ - getc.3 getchar_unlocked.3 getc.3 getw.3 +MLINKS+=fseek.3 fgetpos.3 \ + fseek.3 fseeko.3 \ + fseek.3 fsetpos.3 \ + fseek.3 ftell.3 \ + fseek.3 ftello.3 \ + fseek.3 rewind.3 +MLINKS+=funopen.3 fropen.3 \ + funopen.3 fwopen.3 +MLINKS+=getc.3 fgetc.3 \ + getc.3 getc_unlocked.3 \ + getc.3 getchar.3 \ + getc.3 getchar_unlocked.3 \ + getc.3 getw.3 MLINKS+=getline.3 getdelim.3 -MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3 -MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3 \ - mktemp.3 mkostemp.3 mktemp.3 mkostemps.3 mktemp.3 mkostempsat.3 +MLINKS+=getwc.3 fgetwc.3 \ + getwc.3 getwchar.3 +MLINKS+=mktemp.3 mkdtemp.3 \ + mktemp.3 mkstemp.3 \ + mktemp.3 mkstemps.3 \ + mktemp.3 mkostemp.3 \ + mktemp.3 mkostemps.3 \ + mktemp.3 mkostempsat.3 MLINKS+=open_memstream.3 open_wmemstream.3 -MLINKS+=printf.3 asprintf.3 printf.3 dprintf.3 printf.3 fprintf.3 \ - printf.3 snprintf.3 printf.3 sprintf.3 \ - printf.3 vasprintf.3 printf.3 vdprintf.3 \ - printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \ +MLINKS+=printf.3 asprintf.3 \ + printf.3 dprintf.3 \ + printf.3 fprintf.3 \ + printf.3 snprintf.3 \ + printf.3 sprintf.3 \ + printf.3 vasprintf.3 \ + printf.3 vdprintf.3 \ + printf.3 vfprintf.3 \ + printf.3 vprintf.3 \ + printf.3 vsnprintf.3 \ printf.3 vsprintf.3 -MLINKS+=printf_l.3 asprintf_l.3 printf_l.3 fprintf_l.3 printf_l.3 snprintf_l.3 \ - printf_l.3 sprintf_l.3 printf_l.3 vasprintf_l.3 printf_l.3 vfprintf_l.3 \ - printf_l.3 vprintf_l.3 printf_l.3 vsnprintf_l.3 printf_l.3 vsprintf_l.3 -MLINKS+=putc.3 fputc.3 putc.3 putc_unlocked.3 putc.3 putchar.3 \ - putc.3 putchar_unlocked.3 putc.3 putw.3 -MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3 -MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \ +MLINKS+=printf_l.3 asprintf_l.3 \ + printf_l.3 fprintf_l.3 \ + printf_l.3 snprintf_l.3 \ + printf_l.3 sprintf_l.3 \ + printf_l.3 vasprintf_l.3 \ + printf_l.3 vfprintf_l.3 \ + printf_l.3 vprintf_l.3 \ + printf_l.3 vsnprintf_l.3 \ + printf_l.3 vsprintf_l.3 +MLINKS+=putc.3 fputc.3 \ + putc.3 fputc_unlocked.3 \ + putc.3 putc_unlocked.3 \ + putc.3 putchar.3 \ + putc.3 putchar_unlocked.3 \ + putc.3 putw.3 +MLINKS+=putwc.3 fputwc.3 \ + putwc.3 putwchar.3 +MLINKS+=scanf.3 fscanf.3 \ + scanf.3 sscanf.3 \ + scanf.3 vfscanf.3 \ + scanf.3 vscanf.3 \ scanf.3 vsscanf.3 -MLINKS+=scanf_l.3 fscanf_l.3 scanf_l.3 sscanf_l.3 scanf_l.3 vfscanf_l.3 \ - scanf_l.3 vscanf_l.3 scanf_l.3 vsscanf_l.3 -MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3 -MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3 -MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \ - wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3 -MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \ - wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3 +MLINKS+=scanf_l.3 fscanf_l.3 \ + scanf_l.3 sscanf_l.3 \ + scanf_l.3 vfscanf_l.3 \ + scanf_l.3 vscanf_l.3 \ + scanf_l.3 vsscanf_l.3 +MLINKS+=setbuf.3 setbuffer.3 \ + setbuf.3 setlinebuf.3 \ + setbuf.3 setvbuf.3 +MLINKS+=tmpnam.3 tempnam.3 \ + tmpnam.3 tmpfile.3 +MLINKS+=wprintf.3 fwprintf.3 \ + wprintf.3 swprintf.3 \ + wprintf.3 vwprintf.3 \ + wprintf.3 vfwprintf.3 \ + wprintf.3 vswprintf.3 +MLINKS+=wscanf.3 fwscanf.3 \ + wscanf.3 swscanf.3 \ + wscanf.3 vwscanf.3 \ + wscanf.3 vswscanf.3 \ + wscanf.3 vfwscanf.3 diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 413c9421c0ee..227bc32b237d 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -44,27 +44,51 @@ MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 \ strfmon.3 strtod.3 strtol.3 strtonum.3 strtoul.3 system.3 \ tsearch.3 -MLINKS+=a64l.3 l64a.3 a64l.3 l64a_r.3 +MLINKS+=a64l.3 l64a.3 \ + a64l.3 l64a_r.3 MLINKS+=atol.3 atoll.3 MLINKS+=exit.3 _Exit.3 -MLINKS+=getenv.3 clearenv.3 getenv.3 putenv.3 getenv.3 secure_getenv.3 \ - getenv.3 setenv.3 getenv.3 unsetenv.3 +MLINKS+=getenv.3 clearenv.3 \ + getenv.3 putenv.3 \ + getenv.3 secure_getenv.3 \ + getenv.3 setenv.3 \ + getenv.3 unsetenv.3 MLINKS+=getopt_long.3 getopt_long_only.3 -MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3 -MLINKS+=hcreate.3 hcreate_r.3 hcreate.3 hdestroy_r.3 hcreate.3 hsearch_r.3 +MLINKS+=hcreate.3 hdestroy.3 \ + hcreate.3 hsearch.3 +MLINKS+=hcreate.3 hcreate_r.3 \ + hcreate.3 hdestroy_r.3 \ + hcreate.3 hsearch_r.3 MLINKS+=insque.3 remque.3 MLINKS+=lsearch.3 lfind.3 -MLINKS+=ptsname.3 grantpt.3 ptsname.3 ptsname_r.3 ptsname.3 unlockpt.3 -MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3 \ +MLINKS+=ptsname.3 grantpt.3 \ + ptsname.3 ptsname_r.3 \ + ptsname.3 unlockpt.3 +MLINKS+=qsort.3 heapsort.3 \ + qsort.3 heapsort_b.3 \ + qsort.3 mergesort.3 \ + qsort.3 mergesort_b.3 \ + qsort.3 qsort_b.3 \ + qsort.3 qsort_r.3 \ qsort.3 qsort_s.3 -MLINKS+=rand.3 rand_r.3 rand.3 srand.3 -MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \ +MLINKS+=rand.3 rand_r.3 \ + rand.3 srand.3 +MLINKS+=random.3 initstate.3 \ + random.3 setstate.3 \ + random.3 srandom.3 \ random.3 srandomdev.3 MLINKS+=radixsort.3 sradixsort.3 MLINKS+=set_constraint_handler_s.3 abort_handler_s.3 MLINKS+=set_constraint_handler_s.3 ignore_handler_s.3 MLINKS+=strfmon.3 strfmon_l.3 -MLINKS+=strtod.3 strtof.3 strtod.3 strtold.3 -MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3 -MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3 -MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3 +MLINKS+=strtod.3 strtof.3 \ + strtod.3 strtold.3 +MLINKS+=strtol.3 strtoll.3 \ + strtol.3 strtoq.3 \ + strtol.3 strtoimax.3 +MLINKS+=strtoul.3 strtoull.3 \ + strtoul.3 strtouq.3 \ + strtoul.3 strtoumax.3 +MLINKS+=tsearch.3 tdelete.3 \ + tsearch.3 tfind.3 \ + tsearch.3 twalk.3 diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 480002f9875e..f52487a3fef2 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -469,6 +469,7 @@ MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \ sched_get_priority_max.2 sched_rr_get_interval.2 MLINKS+=sched_setparam.2 sched_getparam.2 MLINKS+=sched_setscheduler.2 sched_getscheduler.2 +MLINKS+=sctp_generic_sendmsg.2 sctp_generic_sendmsg_iov.2 MLINKS+=select.2 FD_CLR.3 \ select.2 FD_ISSET.3 \ select.2 FD_SET.3 \ diff --git a/lib/libc/sys/sctp_generic_sendmsg.2 b/lib/libc/sys/sctp_generic_sendmsg.2 index 5c62328aeace..66ce41ee2fcb 100644 --- a/lib/libc/sys/sctp_generic_sendmsg.2 +++ b/lib/libc/sys/sctp_generic_sendmsg.2 @@ -29,7 +29,7 @@ .Dt SCTP_GENERIC_SENDMSG 2 .Os .Sh NAME -.Nm sctp_generic_sendmsg +.Nm sctp_generic_sendmsg , .Nm sctp_generic_sendmsg_iov .Nd send data to a peer .Sh LIBRARY diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3 index 42f7a4b43ccd..1cfd3a86ad91 100644 --- a/lib/libc/uuid/uuid.3 +++ b/lib/libc/uuid/uuid.3 @@ -27,8 +27,14 @@ .Dt UUID 3 .Os .Sh NAME -.Nm uuid_compare , uuid_create , uuid_create_nil , uuid_equal , -.Nm uuid_from_string , uuid_hash , uuid_is_nil , uuid_to_string +.Nm uuid_compare , +.Nm uuid_create , +.Nm uuid_create_nil , +.Nm uuid_equal , +.Nm uuid_from_string , +.Nm uuid_hash , +.Nm uuid_is_nil , +.Nm uuid_to_string .Nd DCE 1.1 compliant UUID functions .Sh LIBRARY .Lb libc diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc index 76997c1da218..b9d0b575d8dc 100644 --- a/lib/libc/xdr/Makefile.inc +++ b/lib/libc/xdr/Makefile.inc @@ -26,26 +26,31 @@ MLINKS+= rpc_xdr.3 xdr_accepted_reply.3 \ xdr.3 xdr_float.3 \ xdr.3 xdr_free.3 \ xdr.3 xdr_getpos.3 \ + xdr.3 xdr_hyper.3 \ xdr.3 xdr_inline.3 \ xdr.3 xdr_int.3 \ xdr.3 xdr_long.3 \ - xdr.3 xdrmem_create.3 \ + xdr.3 xdr_longlong_t.3 \ xdr.3 xdr_opaque.3 \ xdr.3 xdr_pointer.3 \ - xdr.3 xdrrec_create.3 \ - xdr.3 xdrrec_endofrecord.3 \ - xdr.3 xdrrec_eof.3 \ - xdr.3 xdrrec_skiprecord.3 \ xdr.3 xdr_reference.3 \ xdr.3 xdr_setpos.3 \ xdr.3 xdr_short.3 \ xdr.3 xdr_sizeof.3 \ - xdr.3 xdrstdio_create.3 \ xdr.3 xdr_string.3 \ xdr.3 xdr_u_char.3 \ + xdr.3 xdr_u_hyper.3 \ + xdr.3 xdr_u_int.3 \ xdr.3 xdr_u_long.3 \ + xdr.3 xdr_u_longlong_t.3 \ xdr.3 xdr_u_short.3 \ xdr.3 xdr_union.3 \ xdr.3 xdr_vector.3 \ xdr.3 xdr_void.3 \ + xdr.3 xdrmem_create.3 \ + xdr.3 xdrrec_create.3 \ + xdr.3 xdrrec_endofrecord.3 \ + xdr.3 xdrrec_eof.3 \ + xdr.3 xdrrec_skiprecord.3 \ + xdr.3 xdrstdio_create.3 \ xdr.3 xdr_wrapstring.3 From nobody Wed Oct 18 14:13:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9XrY448Rz4x50J; Wed, 18 Oct 2023 14:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9XrY2vHqz3Hnq; Wed, 18 Oct 2023 14:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/u7JzptrmCW6PE/DtHQBRwAHi6lmh3oqDQgmVInhO0=; b=uRrOruFW/OGDi/dBU16dNLCNlwpFC0QhY9XJrBJjFkmI9jmPMtRjCMvC8ODt787PgvtC4m SrLs/JBgZY99b/6XU4NpKIB3XDW+Gkg2/aLUQMj+owAf/fP7dg9YA1ZdTx/T9oqXLdczQ4 /u/eJKoiPFps+IHIH6iAmlke8vjIEhqMTNWDWg3sDCujEQI1HoHM1E7zz2ivitC3k/Q3tR 5tC6sle8/rtESSUZGDjV9Ir8pW1lmYbXhG2MIM99n8r2HhQzFUMP7HglozlMUO9sYg9hey fNtppoCAZLStD3DpmwBdINuJ3h8P6I+WE6Qiu5dP5lGRlBwEXX7/kMfhtOtfQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638413; a=rsa-sha256; cv=none; b=K8AGBmSo4akPIWdQiQMhPJq8ULwoQ6kY/e9/G5nHkbu05hFOzheLCHSCOdb1KABu7sW/Fv HN91ABlvePUmqxaP46OxZBgvzfzsNzFeDzccBzi1vgLbqI9Ff/COTo5J7rSy9qZ3KyQbYL rCFNHXfFZ/d6WjZP5z8ui4kRgyKURk6iAa8rrNryijPvaA+FlTvoxOhgrjtHBMPGrZQFGd WBt6fGBrZQz+s9pAfYgTiVr+qQNCs0FBlgAgIYSCjcT5lvYs9+HjRajmCrNyj4j9srz9pk HWCdyVirWWiX7lvc/gzyeDFB1cQ7PxIyL72E4vmJgE5wMlN4j2M+mCHoFJB6dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/u7JzptrmCW6PE/DtHQBRwAHi6lmh3oqDQgmVInhO0=; b=PMeN3Nh8BpbIj1wzNHit0PTUbDniEZtHnjEki2CS5Dc+Z2agcCzH58nODJ2980wV2+ut/x nIcEOO88ZZutXZ7ZM/OXYnoWKjSh6PoqfHrO8b2eAaxBb/OCjUu602fDztUdLKaiFpY2kc C64kwA5s0Fui26FrcWEwDduuWd6RTDKcVs3q0uxIvqfk/NTdPHyQVQ77rykBn20Amnb2xK Uad8ua+hxrTAS/PcUCc41K56XfT89RRJ+zSpY9SMaMVtUNk6+oStjzIx3S8CCSfPYby4TY kbKCj0iwfjWIcoqr3xtWSMKt07IOkMMmLvXOFHiz5HiFfT4BsKr2hu+5iDJUaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9XrY1y4kz18Vy; Wed, 18 Oct 2023 14:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEDXsf057487; Wed, 18 Oct 2023 14:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEDXce057484; Wed, 18 Oct 2023 14:13:33 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:13:33 GMT Message-Id: <202310181413.39IEDXce057484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3a338c534154 - main - Add the BBR and RACK stacks to the LINT kernel. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 3a338c534154164504005beb00a3c6feb03756cc Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3a338c534154164504005beb00a3c6feb03756cc commit 3a338c534154164504005beb00a3c6feb03756cc Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:13:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:13:12 +0000 Add the BBR and RACK stacks to the LINT kernel. While here, drop the EXTRA_TCP_STACKS option, which serves no purpose and should never have been added. Instead, build bbr and rack as long as either or both of INET and INET6 is enabled. There is no risk to anyone who doesn't load one or both and then twiddle the relevant sysctls. Differential Revision: https://reviews.freebsd.org/D42088 --- share/man/man5/src.conf.5 | 2 -- sys/conf/NOTES | 4 +++- sys/conf/files | 7 +++++++ sys/conf/kern.opts.mk | 1 - sys/conf/kern.post.mk | 4 ---- sys/conf/options | 2 ++ sys/modules/tcp/Makefile | 7 ++----- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 9d26531e515b..bc94d5c62234 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -641,8 +641,6 @@ Avoid installing examples to .Pa /usr/share/examples/ . .It Va WITH_EXPERIMENTAL Include experimental features in the build. -.It Va WITH_EXTRA_TCP_STACKS -Build extra TCP stack modules. .It Va WITHOUT_FDT Do not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a5ed60792a1f..b12d5def2d57 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -681,7 +681,6 @@ options TCP_OFFLOAD # TCP offload support. options TCP_RFC7413 # TCP Fast Open options TCPHPTS -makeoptions WITH_EXTRA_TCP_STACKS=1 # RACK and BBR TCP kernel modules # In order to enable IPSEC you MUST also add device crypto to # your kernel configuration @@ -693,6 +692,9 @@ options IPSEC #IP security (requires device crypto) options IPSEC_SUPPORT #options IPSEC_DEBUG #debug for IP security +# Alternative TCP stacks +options TCP_BBR +options TCP_RACK # TLS framing and encryption/decryption of data over TCP sockets. options KERN_TLS # TLS transmit and receive offload diff --git a/sys/conf/files b/sys/conf/files index 8c3bdca61905..c127ce7e7103 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4361,6 +4361,13 @@ netinet/tcp_pcap.c optional inet tcppcap | inet6 tcppcap \ compile-with "${NORMAL_C} ${NO_WNONNULL}" netinet/tcp_reass.c optional inet | inet6 netinet/tcp_sack.c optional inet | inet6 +netinet/tcp_stacks/bbr.c optional inet tcp_bbr | inet6 tcp_bbr \ + compile-with "${NORMAL_C} -DMODNAME=tcp_bbr -DSTACKNAME=bbr" +netinet/tcp_stacks/rack.c optional inet tcp_bbr | inet6 tcp_bbr \ + compile-with "${NORMAL_C} -DMODNAME=tcp_rack -DSTACKNAME=rack" +netinet/tcp_stacks/rack_bbr_common.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack +netinet/tcp_stacks/sack_filter.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack +netinet/tcp_stacks/tailq_hash.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack netinet/tcp_stats.c optional stats inet | stats inet6 netinet/tcp_subr.c optional inet | inet6 netinet/tcp_syncache.c optional inet | inet6 diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index f908f761b21e..cc6f8a1d8755 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -56,7 +56,6 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ BHYVE_SNAPSHOT \ - EXTRA_TCP_STACKS \ KERNEL_RETPOLINE \ RATELIMIT \ REPRODUCIBLE_BUILD \ diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index a4eb2e94a47b..bea29507a736 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -33,10 +33,6 @@ MKMODULESENV+= CONF_CFLAGS="${CONF_CFLAGS}" MKMODULESENV+= WITH_CTF="${WITH_CTF}" .endif -.if defined(WITH_EXTRA_TCP_STACKS) -MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}" -.endif - .if !empty(KCSAN_ENABLED) MKMODULESENV+= KCSAN_ENABLED="yes" .endif diff --git a/sys/conf/options b/sys/conf/options index 4e74c4ab3a70..d2f31272d189 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -231,6 +231,8 @@ SW_WATCHDOG opt_watchdog.h TCPHPTS opt_inet.h TCP_REQUEST_TRK opt_global.h TCP_ACCOUNTING opt_global.h +TCP_BBR opt_inet.h +TCP_RACK opt_inet.h # # TCP SaD Detection is an experimental Sack attack Detection (SaD) # algorithm that uses "normal" behaviour with SACK's to detect diff --git a/sys/modules/tcp/Makefile b/sys/modules/tcp/Makefile index 8f89977b5b69..364c0326c40d 100644 --- a/sys/modules/tcp/Makefile +++ b/sys/modules/tcp/Makefile @@ -8,13 +8,10 @@ SUBDIR= \ ${_tcp_rack} \ ${_tcpmd5} \ -.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES) -_tcp_bbr= bbr -_tcp_rack= rack -.endif - .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) +_tcp_bbr= bbr +_tcp_rack= rack .if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MTCP_SIGNATURE} _tcpmd5= tcpmd5 .endif From nobody Wed Oct 18 14:44:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YWs51YYz4x6wr; Wed, 18 Oct 2023 14:44:09 +0000 (UTC) (envelope-from mhorne@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YWs4QWtz3ZBt; Wed, 18 Oct 2023 14:44:09 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=oO3DccGcplq+sNVR/y0ZjV68DkXeCRrq3eMxmQn0/Do=; b=pp3zoiBAeQpknlG/dH57w8Y38dMSkYt6kZC7ULV6bjHxXMNdv3g7/hnZpSNI+64JEP3xQC UNVDaAlCfiYIPSlPz3crIxiVnETVcBuetA8P1gsr+RWXAsC4OxKSoimWPgIWocnYVnujup za0nwVtFWfnmwY17Km+lgBlJB7pQURPE7ajSWlMEBbTl/EaGdjW/KXW4kMiRO450DukBBZ nQK+Lyp8gK0Go8FDxKDynIwlVAIefsPyD2KA/kHZDOjpRywsPk4tCkygJe4Cqfm1Oif/Gb 1OsKe3UGOM44pSF435FhAx6wbgg8yp2m91yAZySUQH5wTYurlAYw7jiKathNqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640249; a=rsa-sha256; cv=none; b=t44Mv1wvqxlofx1EkDHR7V/krA3TD8Sd7u4Hge0Vwm2F1vWdQvz8WWxhPY0aOAuHQegwDC WG9m9DycmluHaNko/PVEAvCaMfv+7y/mGTCy0X2UffcHPyLX/K4IP7L9d2kdUmnejPUjLr 2iw6QSlp84Vw8OH9J4aMPBhfkslkF9mM6EpRSU1ElCeE0xqeZQjFIzPukQQ6OxaFGy9G3Y OLGOkP9RjjY/Do1DkT7rZDDfYQFW0YaUO4SuP18kdRKXHVACFq6sg/DrLNN1lsazX/n7G5 BYMDuJX0NGhUz4Rj5ZuCCY+AFLfwxjmlSUQSQWUNXN8cc3im6HTehMj0ijvoGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=oO3DccGcplq+sNVR/y0ZjV68DkXeCRrq3eMxmQn0/Do=; b=iDB4DQFs1sRuNuxSigZpiwzhlasgglIsLNlE7x5MD+VOyIYnGEHSAWrh1ObmpwyqyoTAYH CPg41lVSsTe6ajJj0JRQ6W+eTPwiK1fTOIWVnchKBSyNTkDm4ys/fs/zlbPk0rsDavC/rM ac+Jk2Caw7amUhD8tf+BYlnUpgZd/kW1k2J4+8yZLvj27mJGw/UuyQfbpJTmhhpIKV+IQJ e/Ez4NciocPdO1l1F6aojuDY6LpGEKY+gWmPRLm8upI0hI+glOI48lo2HmNtS4YLy19TfV kV/Egksly+SbaNsBcdHOJJrSyGW4p11vXIeSF48GQ0e5oEMFuFZoW0LK0/uAPw== Received: from [192.168.1.151] (host-173-212-76-127.public.eastlink.ca [173.212.76.127]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S9YWr6Zb0z94N; Wed, 18 Oct 2023 14:44:08 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <587cce35-35d1-4e5e-8ab0-5df8cc8fa670@freebsd.org> Date: Wed, 18 Oct 2023 11:44:07 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3a338c534154 - main - Add the BBR and RACK stacks to the LINT kernel. Content-Language: en-CA To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202310181413.39IEDXce057484@gitrepo.freebsd.org> From: Mitchell Horne Autocrypt: addr=mhorne@freebsd.org; keydata= xsBNBFyS2dQBCADdiXBG8hBVLmYbxu7aSzbwLwUf3HkGFz3rooS1kwyy+SfmjZ4UKNnl9WMx WKrJ7OAZpiNH6bLQ5nsqfx09OnpWL8c/QuPbhNdUywQoqqYpRI0K8GEn//nS9Gs0KTYwVpWb XlrzP+jf3Uh/9L5mcQmStLIH4zaaqMYHW+pMuPrvBmLIHTvLj2QjOkxslrcUdord9uvxe5Ht LU8RuTpQpHOKz705Z9/v7twFdi2HtKzpLwO6SzVyu351di1J+GihsVpcT5josQV5cHbIP3Un x+kmtKBEEc/jl/zBglF7ruWUtwgbryID+2ZPEaO1Mj+RResX4LFVMusq3uUpWRb5WJXxABEB AAHNI01pdGNoZWxsIEhvcm5lIDxtaG9ybmVARnJlZUJTRC5vcmc+wsCUBBMBCgA+AhsDBQsJ CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDpUFCQtC z0EACgkQi/gnTOdUid8IsQf+N8IptrrCgifT5Z0/WUVFfnHThFOKf4zBjaGswsIM8+VKsKnF 15jCWHODUHP6s+dcQ4nQi81PHPsnMfBSkGPvN/X3ess2/1KUVkH+6tAJbqXDjXhD8HT+i0NM QEFIXlLnotpgIKW3yOHjKv3ZvKw9LCvUjyNY9vOJmLk/6AbbkFh+INo65nXtQWb/hM5FVEHW S+zUoU8AqZRJoVAQfj9wmIfg/HdsxeDGKL0zkv5AwKpccvb8VJNGJbCVMgoy5uQYcUeXxcie cg0VlbFLshNQTfyhVQ85vyuHahARrUWs/k8KiYODoBnW1ChtyF8yM6VZTzSYx7pINqPq2YZy i/Htd87ATQRcktnUAQgA3zt4M4ecoQqfxpjliNLujt9klDqvmkJvWmzMuMXdzlPgGRJ0doio 9YIeEdkOt6xN0pPTK/ReCZ8WqFQ8zo23u1pwGuo0CnR58XF19wyxyUuKu/PHbt+56mC8tNHm AXsMyXQmlDqWvn/WzLY7euNRtNS4QQIwtxfM5EC4GGa5KQwxn0kM7dkUSOE/cxr+/kNbHHzb gagZR4cnNUqtPPr3dYXcibCTzgz96Lyt3/qMLXX9RTBRzu+O6E+byxWOe8ar/ZlwY2b4wTQG mhgNttkSxKtxMpZnd8+DGV/bI1P5Ct/K2GeCwNyupQGON5ymn6o7jTch+qmFX0ItkBWO4zn4 9QARAQABwsB8BBgBCgAmAhsMFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDtwFCQtCz4gA CgkQi/gnTOdUid/i5gf/aQ75pJR4TJFM2vVVr6PDIwTdl0b5EchB4w4s4g/zE84XNbMOQanb BginLYEhAacLQVAvM3XdvUEhwrhaMQdjdSEB1krResL3/mbxrtKwdHSMbHA3IS3XdvxFWTB7 P5JjUSPsW6hqgoidbn4w3OxaNHhs45H2b0Nx5QiKcSyepmCZuB52gCEHnEnrdaz8TFQMXOLq 94WbTmZeIjChW3FB61m1gTf0UEFjoZAfTAUB+pbwoCa4AykIeZnDC19vjsruVU9Gy5rLglwd bjsZNfXIJGOZNEvdF8FOBwM7DlXx7SYvTJcUNoNJjOKtQ0bYGVgGqYOB/y2mTjVuKeU0eOkN Uw== In-Reply-To: <202310181413.39IEDXce057484@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/18/23 11:13, Dag-Erling Smørgrav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3a338c534154164504005beb00a3c6feb03756cc > > commit 3a338c534154164504005beb00a3c6feb03756cc > Author: Dag-Erling Smørgrav > AuthorDate: 2023-10-18 14:13:12 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2023-10-18 14:13:12 +0000 > > Add the BBR and RACK stacks to the LINT kernel. > > While here, drop the EXTRA_TCP_STACKS option, which serves no purpose and > should never have been added. Instead, build bbr and rack as long as > either or both of INET and INET6 is enabled. There is no risk to anyone > who doesn't load one or both and then twiddle the relevant sysctls. > > Differential Revision: https://reviews.freebsd.org/D42088 > --- > share/man/man5/src.conf.5 | 2 -- > sys/conf/NOTES | 4 +++- > sys/conf/files | 7 +++++++ > sys/conf/kern.opts.mk | 1 - > sys/conf/kern.post.mk | 4 ---- > sys/conf/options | 2 ++ > sys/modules/tcp/Makefile | 7 ++----- > 7 files changed, 14 insertions(+), 13 deletions(-) Hi, There is a leftover description file, tools/build/options/WITH_EXTRA_TCP_STACKS. Mitchell > > diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 > index 9d26531e515b..bc94d5c62234 100644 > --- a/share/man/man5/src.conf.5 > +++ b/share/man/man5/src.conf.5 > @@ -641,8 +641,6 @@ Avoid installing examples to > .Pa /usr/share/examples/ . > .It Va WITH_EXPERIMENTAL > Include experimental features in the build. > -.It Va WITH_EXTRA_TCP_STACKS > -Build extra TCP stack modules. > .It Va WITHOUT_FDT > Do not build Flattened Device Tree support as part of the base system. > This includes the device tree compiler (dtc) and libfdt support library. > diff --git a/sys/conf/NOTES b/sys/conf/NOTES > index a5ed60792a1f..b12d5def2d57 100644 > --- a/sys/conf/NOTES > +++ b/sys/conf/NOTES > @@ -681,7 +681,6 @@ options TCP_OFFLOAD # TCP offload support. > options TCP_RFC7413 # TCP Fast Open > > options TCPHPTS > -makeoptions WITH_EXTRA_TCP_STACKS=1 # RACK and BBR TCP kernel modules > > # In order to enable IPSEC you MUST also add device crypto to > # your kernel configuration > @@ -693,6 +692,9 @@ options IPSEC #IP security (requires device crypto) > options IPSEC_SUPPORT > #options IPSEC_DEBUG #debug for IP security > > +# Alternative TCP stacks > +options TCP_BBR > +options TCP_RACK > > # TLS framing and encryption/decryption of data over TCP sockets. > options KERN_TLS # TLS transmit and receive offload > diff --git a/sys/conf/files b/sys/conf/files > index 8c3bdca61905..c127ce7e7103 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -4361,6 +4361,13 @@ netinet/tcp_pcap.c optional inet tcppcap | inet6 tcppcap \ > compile-with "${NORMAL_C} ${NO_WNONNULL}" > netinet/tcp_reass.c optional inet | inet6 > netinet/tcp_sack.c optional inet | inet6 > +netinet/tcp_stacks/bbr.c optional inet tcp_bbr | inet6 tcp_bbr \ > + compile-with "${NORMAL_C} -DMODNAME=tcp_bbr -DSTACKNAME=bbr" > +netinet/tcp_stacks/rack.c optional inet tcp_bbr | inet6 tcp_bbr \ > + compile-with "${NORMAL_C} -DMODNAME=tcp_rack -DSTACKNAME=rack" > +netinet/tcp_stacks/rack_bbr_common.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > +netinet/tcp_stacks/sack_filter.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > +netinet/tcp_stacks/tailq_hash.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > netinet/tcp_stats.c optional stats inet | stats inet6 > netinet/tcp_subr.c optional inet | inet6 > netinet/tcp_syncache.c optional inet | inet6 > diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk > index f908f761b21e..cc6f8a1d8755 100644 > --- a/sys/conf/kern.opts.mk > +++ b/sys/conf/kern.opts.mk > @@ -56,7 +56,6 @@ __DEFAULT_YES_OPTIONS = \ > > __DEFAULT_NO_OPTIONS = \ > BHYVE_SNAPSHOT \ > - EXTRA_TCP_STACKS \ > KERNEL_RETPOLINE \ > RATELIMIT \ > REPRODUCIBLE_BUILD \ > diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk > index a4eb2e94a47b..bea29507a736 100644 > --- a/sys/conf/kern.post.mk > +++ b/sys/conf/kern.post.mk > @@ -33,10 +33,6 @@ MKMODULESENV+= CONF_CFLAGS="${CONF_CFLAGS}" > MKMODULESENV+= WITH_CTF="${WITH_CTF}" > .endif > > -.if defined(WITH_EXTRA_TCP_STACKS) > -MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}" > -.endif > - > .if !empty(KCSAN_ENABLED) > MKMODULESENV+= KCSAN_ENABLED="yes" > .endif > diff --git a/sys/conf/options b/sys/conf/options > index 4e74c4ab3a70..d2f31272d189 100644 > --- a/sys/conf/options > +++ b/sys/conf/options > @@ -231,6 +231,8 @@ SW_WATCHDOG opt_watchdog.h > TCPHPTS opt_inet.h > TCP_REQUEST_TRK opt_global.h > TCP_ACCOUNTING opt_global.h > +TCP_BBR opt_inet.h > +TCP_RACK opt_inet.h > # > # TCP SaD Detection is an experimental Sack attack Detection (SaD) > # algorithm that uses "normal" behaviour with SACK's to detect > diff --git a/sys/modules/tcp/Makefile b/sys/modules/tcp/Makefile > index 8f89977b5b69..364c0326c40d 100644 > --- a/sys/modules/tcp/Makefile > +++ b/sys/modules/tcp/Makefile > @@ -8,13 +8,10 @@ SUBDIR= \ > ${_tcp_rack} \ > ${_tcpmd5} \ > > -.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES) > -_tcp_bbr= bbr > -_tcp_rack= rack > -.endif > - > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > defined(ALL_MODULES) > +_tcp_bbr= bbr > +_tcp_rack= rack > .if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MTCP_SIGNATURE} > _tcpmd5= tcpmd5 > .endif From nobody Wed Oct 18 14:54:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YlD3fR3z4x7cw; Wed, 18 Oct 2023 14:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YlD38fsz3bTM; Wed, 18 Oct 2023 14:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ErViBt9fAfp3gmouH3VTbuVTnvES2Sh9g5RfeByptw=; b=sIQNjXog7vB4CtfNzoS+3l9f3s5nYuDt/DOY56MhmNm+gPXr+6CQhiircDlumT0H9V2fgU b66tOJhPbtMy4cNG4FMjwkWrMXlM0FIYB52zzO7Pe+I8uo12fzMGLvdaVn/3a8c48QNEQW cY63be8BP+jKQBuRCvo3nISaIS66WqxFB8X7HmGj530d5CZEcQfSzntytL5tV20YKpl78e twGqW+3ss+wcFB0B7y06rvlpofnrBi8PNWPOz26XdqIwBlccCw9m9GgWN9djYrfi79NY3H wAhN6eWap02bPIx5UvzsSpID6joG/9hYZe4OwS+M26eglMg/UIBgPh58RnmmCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640840; a=rsa-sha256; cv=none; b=fSAc5EEKr9KadJlH9AyivYog3MUc1vJapsC0BZOXwqt2Rw+KnRQOPS8bjcspKqfynwUk9X Vx3PVqlvkTKgwLB0xOUeKisLS9LLVqw40vRFf5WWCYrLskgAqx8Zu+X/dDXuGXXEe280Hd 5ET7Fu7XLVbQWawXHgVy0r9GwcCwD8MeYazlyPDZx0nCZdXfy0wuKiTnVXkwraAieef9cU sooo0ADKE5eIYBjjJYxnIgYfcbhE1GpkOTekr2iv7429XTY31cOPIKr021fHpdEHoIn8I0 7hj7Bg7ObZk9bgwERGspED/ByDpP1oWrdsg4CiG6MkOqpr2jGgdRcGa+AqzcQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ErViBt9fAfp3gmouH3VTbuVTnvES2Sh9g5RfeByptw=; b=dbmLIfPDh9EW/aP9Ic99CVruNNB/YmlFAsZQ30tiQWJ2j37QOcOcsd3eHtg/KwH1WpULhC /8HoTKH183Kd5Bgi6qsnk5CoFu32iNEwaLDj5DS2cEoW+r/CJb6B9CmHj/lo7DhGUewHet RRTLQnFI6QgOVrNtdTaGJ2CpWNEBXDr7Sm+800oLdpEY06wjHQJPEG+ZE94Kv5ilaUyhpk fGE/ICEjM32O+HO6BIYfrd2RGY+vzYz0facO//vdPqIUrPhKtbSoD0eyWvtRUrfbpmHY9C 2A1tY+5yDJbhFR/UqlTT9ewRB89pOAZcW2ImEdy8nM5sDM39C8wl+yIafzi8Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YlD2BbWz19jV; Wed, 18 Oct 2023 14:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEs0MM026439; Wed, 18 Oct 2023 14:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEs0sF026436; Wed, 18 Oct 2023 14:54:00 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:54:00 GMT Message-Id: <202310181454.39IEs0sF026436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c0f52443166a - main - freebsd-update: handle directories changing to files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: c0f52443166ae7ecd512ab0350469d9c3648788c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c0f52443166ae7ecd512ab0350469d9c3648788c commit c0f52443166ae7ecd512ab0350469d9c3648788c Author: Ed Maste AuthorDate: 2023-09-12 02:59:30 +0000 Commit: Ed Maste CommitDate: 2023-10-18 14:48:58 +0000 freebsd-update: handle directories changing to files Further to f6d37c9ca13f ("freebsd-update: handle file -> directory on upgrade"), handle the reverse case of a directory changing to a file. We may not encounter this case on upgradess (before freebsd-update is retired) but it is needed to support rollback. PR: 273950 Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41945 --- usr.sbin/freebsd-update/freebsd-update.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 438e13a51154..30e78f9bffa2 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2894,6 +2894,15 @@ backup_kernel () { set +f } +# Check for and remove an existing directory that conflicts with the file or +# symlink that we are going to install. +dir_conflict () { + if [ -d "$1" ]; then + echo "Removing conflicting directory $1" + rm -rf -- "$1" + fi +} + # Install new files install_from_index () { # First pass: Do everything apart from setting file flags. We @@ -2914,6 +2923,7 @@ install_from_index () { -m ${PERM} ${BASEDIR}/${FPATH} ;; f) + dir_conflict "${BASEDIR}/${FPATH}" if [ -z "${LINK}" ]; then # Create a file, without setting flags. gunzip < files/${HASH}.gz > ${HASH} @@ -2926,6 +2936,7 @@ install_from_index () { fi ;; L) + dir_conflict "${BASEDIR}/${FPATH}" # Create a symlink ln -sfh ${HASH} ${BASEDIR}/${FPATH} ;; @@ -2962,10 +2973,14 @@ install_delete () { rmdir ${BASEDIR}/${FPATH} ;; f) - rm ${BASEDIR}/${FPATH} + if [ -f "${BASEDIR}/${FPATH}" ]; then + rm "${BASEDIR}/${FPATH}" + fi ;; L) - rm ${BASEDIR}/${FPATH} + if [ -L "${BASEDIR}/${FPATH}" ]; then + rm "${BASEDIR}/${FPATH}" + fi ;; esac done < killfiles From nobody Wed Oct 18 14:54:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YlF4vfXz4x7R6; Wed, 18 Oct 2023 14:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YlF4Jglz3b9s; Wed, 18 Oct 2023 14:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZvahCM05lpcnWkkowY2vGguw/ZqNkR+QgCI3PAoxQQ=; b=kM6SvDW8HyYNavLqbDiHV9ZdLiuLR1BCmNoEKwKvP4PkR3Z9qarTHGn5ec6/IN3A5y7AWz NmrIO64E3KctjaEq6Zvhlog8Q9Ewuw8D0lQVC39TwEKzRsfXzXc4ZAsi5j5nS2DHGjIhM4 8am3bxDP2fkG+oo4p6qPD+gcbwDSvQYzvFgHxY0Gi/fYyfbynHBatGmhr6XLYIZYPAl37Z ClcBKt0MjOUlo/qtwRlZgyxppb7Bf5EBkVfePA7Dx1XErXP6Fk1t1fffHY+/UhCtMnOb+2 zTJksX6lf7xpCk2GFyEzeqV1fibPgUXN7d4FiNsbrRf7FW5JVPBq7IQnsMEivg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640841; a=rsa-sha256; cv=none; b=RHF9i09y7+1ZEqQB3dLWG+rZaofYsyxF1TU/tTcKYNPLvCd4i/HSKqLVqc+wtMykV93SIw kBb6JC50vc7hevU6qCDceFz9IaDMB2eTRM9yPaCc+LnRjUtAI2nQ/21EnfVsSrR2DUTE2q +1Dddw6neWCv23AzwQYiXIk+t0N4iJAVGGRImV1QU9mW3oJxckyKAeUgoLTR54LcOEB5PD 0m4mVh8ppfpvEHsQ4WyV1+6XgV5unb+Z/BkbWds4ttjnEWsKB56Bi5JbkAs/RwMVS27qcq OZ2nQNzjFFNaW0rBDzvIBcujVcIpjUK2HGkfIqdyvrkSmtvT9w7k2mLSHtIvtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZvahCM05lpcnWkkowY2vGguw/ZqNkR+QgCI3PAoxQQ=; b=PYLvuKttg6nhqWiKNUUa8WGO8yxr/KlwJ/tV6fsqd+WG+ahLqpJdNf99MMPprPmoGhcqGg e30+gyi1FsL68VBDv/NG/o30M0LByyH6vSeC/H+DOgJwKwQT5y6ekcS/zyqXiRZqUK2qZ5 bVsgc+KpiH/p2ih/Fb/Zlr0Mhl34kn7KhIhLit8A0Uu734DNdpjSLrmu3r/AJWtY8EnyJu GjLPYWUrDI7CV0kwC/NOeTvAcgL3/yniMscHdF/dPts3p0cDhD4Zg9sqR/N8fw/UvCKawD hSEcQEV4caDRddupr4hFNdTAT/TKFJediwTmQDt3X2y2fYeKjkYGjg5qi7c1Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YlF3Bkbz19Nf; Wed, 18 Oct 2023 14:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEs1ZW026484; Wed, 18 Oct 2023 14:54:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEs1wP026481; Wed, 18 Oct 2023 14:54:01 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:54:01 GMT Message-Id: <202310181454.39IEs1wP026481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6b27e1f2eaab - main - freebsd-update: for rollback, first create directories List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6b27e1f2eaab9360a796c943da9d206515e1742b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b27e1f2eaab9360a796c943da9d206515e1742b commit 6b27e1f2eaab9360a796c943da9d206515e1742b Author: Ed Maste AuthorDate: 2023-09-29 15:28:35 +0000 Commit: Ed Maste CommitDate: 2023-10-18 14:52:59 +0000 freebsd-update: for rollback, first create directories rollback_files() tried to install files before creating the directories for those files. In some cases this is due to special handling to install certain classes of files earlier than others. Just create all directories up front when performing rollback. PR: 273950 Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42020 --- usr.sbin/freebsd-update/freebsd-update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 30e78f9bffa2..4866514c321e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3191,6 +3191,11 @@ rollback_setup_rollback () { # Install old files, delete new files, and update linker.hints rollback_files () { + # Create directories first. They may be needed by files we will + # install in subsequent steps (PR273950). + awk -F \| '{if ($2 == "d") print }' $1/INDEX-OLD > INDEX-OLD + install_from_index INDEX-OLD || return 1 + # Install old shared library files which don't have the same path as # a new shared library file. grep -vE '^/boot/' $1/INDEX-NEW | From nobody Wed Oct 18 15:03:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YyY5hjcz4x87D; Wed, 18 Oct 2023 15:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YyY5CVkz3d8k; Wed, 18 Oct 2023 15:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697641429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBHoJFJBrI/5rwy+njnmoWc9xHMxVlfeCGQEb2pf2Js=; b=pZAp4Gli3M6ZuvA+PJ/eqoIywiKeWB93nVdt2yg1WuKoCMn7raXMF/uf0oTzSQyHy3NR48 Yx30nCoVFOnqx7So7PHxfkkiJL1Ere9kvke4x5SrpSlzCG0xwbsntrl9b9f5eQRCXWZrSy mlz7tIMGN0DRlOx18X18tlXMzuFq0OdkJirUblNyfLVVLLBUg1SxqT0FGhP957/IOHRUd5 jsWUVoZEldXwZxhTh5xWggS8R9CWzgD0U7F/OAPtKpel4nBbNo84kwYBjgeQ4IxDVXfISv dEwntBstQFvo24gftPnUFYKlugLQ75BsZzF1eVKyAifel+jBfETDfcF4TebILA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697641429; a=rsa-sha256; cv=none; b=YRdljUVq/E64zgUqxDcmWZEgLOWK7dBLnuFHpx2Epc6qFhQu5bdXbmkSwDlXs/iwiZhxw9 homrauJZDQLsCw3/NloAWOujKyv75HOsnWCD/CdJZFg4ftTccV/Vucm/Mrva4LF+ln3pnc VVtaAEAovcNbjCjtzVwfrLAqO78k4u34983V/+sv9ht0NMz8nVVv4H2DgCcJS6L2knzebm sRPGY/T2vtnW8ecWp8Kop71EOCsFgeUVd9qlwU/1ddvxPuITwslO8PViu2YPxxbuUkOee4 flxtlzVtKLkeuRAqbvtzHvVZGMgq3BH3ihvs439mpYTYdtu1NLNDNixUQn9E5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697641429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBHoJFJBrI/5rwy+njnmoWc9xHMxVlfeCGQEb2pf2Js=; b=KBiOe/Qja/50OXUYN97ES6unQM2unkg/1e4VNKpxsNkou7Q4sI0JIq0/gXUL6HWHJ4OfRQ Eeob48rcC3OXlSeSgxS3R6PUWqhoN1nFRY9bgNHpXripNtipIU7+ERHvm3PHckb1NITM2g xDDwzU0mMPqLSIRGr6dMwb1Ig2yhHSVM/P8KyzkxML5tVFUjmlgEn/uL729YYJrRNOxpMg W94d3i3CskOdUPxk3RI2cZXme/SJP7mu23ZdR498My5rFrOqyOJSC2l7xiezuag4Uu/7v0 jx7KMwr4SsAWz0ly4HN9Y+aIDNjhLBXoMl+owoIS+9pdnipUsK8eRhtElzgAlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YyY4GbPz1B6C; Wed, 18 Oct 2023 15:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IF3n97044706; Wed, 18 Oct 2023 15:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IF3n5a044703; Wed, 18 Oct 2023 15:03:49 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:03:49 GMT Message-Id: <202310181503.39IF3n5a044703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f2ffadeb03e6 - main - rm description of EXTRA_TCP_STACKS option. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f2ffadeb03e6a995ea43cabed1d5308c6cd5fb84 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f2ffadeb03e6a995ea43cabed1d5308c6cd5fb84 commit f2ffadeb03e6a995ea43cabed1d5308c6cd5fb84 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 15:00:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 15:02:05 +0000 rm description of EXTRA_TCP_STACKS option. Fixes: 3a338c534154 Reported by: mhorne --- tools/build/options/WITH_EXTRA_TCP_STACKS | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/build/options/WITH_EXTRA_TCP_STACKS b/tools/build/options/WITH_EXTRA_TCP_STACKS deleted file mode 100644 index ca30b52a5903..000000000000 --- a/tools/build/options/WITH_EXTRA_TCP_STACKS +++ /dev/null @@ -1 +0,0 @@ -Build extra TCP stack modules. From nobody Wed Oct 18 15:18:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9ZHc2d2Jz4x981; Wed, 18 Oct 2023 15:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9ZHc29bQz3fj8; Wed, 18 Oct 2023 15:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZdfn9AQMbCcwvnA69z6MsUsxcpx9FYI3058poP4uhg=; b=kf+v9gfo1g3M0ECSRYHtR5jGZLNiTQnshz3Wp7C3wP0ECxIGfnkqYFlyJOvBIPbXwxMTVs i8bG+2+mTnbI6TCpz3M+IOeo0Rn6ZSbsUI3vly3+icLIBcXHkRX/gW9crBob6vbiEvni4d FmwAJ64rdqXJnFTH3kWGlYtm7myy8rcBwTKyX3l6X76DQardmN4/pGpT149QTsRunj8QAt Aw6u8rASbwa+mOUfGc5MeJYerk62Nr1zz1kUjX4G7CAWw6Araf69sIdVSF2w++pSafGRwl 4X1fnPUfT2zJARqRCAwLU42rl36y8xjHXto+W79yu1jH8wdCp615jZfMlT6iOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697642316; a=rsa-sha256; cv=none; b=Po+xpomfhyT+BYs1Zo+1xTcZ4PW2FVacw32c61uQwvsjw24uUDNjo5/ywdre+Af+3HeyYp TWa5DBKqSzYU3gyCqkPiCiymmX69Dj1THhqxqkKZeKMYlIFqSn2qkqoZaFgkxYe8aENkpP jPgNsM/b31DjQ3enMugwxiHcUOj6y6/9HQVAq3t7kC44dJnkt5Hm/r/+wM+a5xPzKmyqQg yz95QyyVBmfgt/3KKLAZ5aUM39RaF05Zf/B2r9qDTMM7pdk6mMS1MPZ+Sj1g31EKrZ7EaB UXi6jcxPnEheEoQwCpo8A/SbeaC5Apd9dEEzjbkNGF6u2WtIdmabr1rSg4UYwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZdfn9AQMbCcwvnA69z6MsUsxcpx9FYI3058poP4uhg=; b=pJFuRISj+bxWlROmxsaNpsGTx/ztfcKyzoKEiLMxKpC22VU62orNDMsd6iV68fJRbLUDmw HP0NGpK0IEeoydk7cU6uqCzyilyltfTnQS5cBNdhSmy0h9hT4nNGTWD0pdxVsgXIwfpRpD 86MFVIxzM2XIDQAa6OfXB5pWdRQ+efrwi+ZZS6LzKDZlyw4rNvITYEn8wD7YBmGmJkm98U 57xN5RnySaknSMKclcCXK50c3+w/owchlxNuPE97PktssZRGdyUDEwGDcSZpTyTmQ1rm0N yBrcVHYT+VXMvhGh814Fi3m3UoOWRwuVCqeGixWvb2aYxen0spNddhlRRGDCLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9ZHc1CqWz1BGX; Wed, 18 Oct 2023 15:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IFIaLI061550; Wed, 18 Oct 2023 15:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IFIadZ061547; Wed, 18 Oct 2023 15:18:36 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:18:36 GMT Message-Id: <202310181518.39IFIadZ061547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3b5c9845727a - main - Remove $FreeBSD$: one line sh-pattern List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 3b5c9845727a1b95098379f66223525e85e8a73f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3b5c9845727a1b95098379f66223525e85e8a73f commit 3b5c9845727a1b95098379f66223525e85e8a73f Author: Jose Luis Duran AuthorDate: 2023-10-18 15:14:33 +0000 Commit: Warner Losh CommitDate: 2023-10-18 15:15:18 +0000 Remove $FreeBSD$: one line sh-pattern Remove the $FreeBSD$ pattern added to the tests, as well as fixing the mkimg_test.sh script to stop adding it when we rebase the tests. Reviewed by: imp, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/870 --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/mkimg_test.sh | 4 +--- 29 files changed, 1 insertion(+), 31 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex index 01ceaae1963c..0de167c0e198 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex index 25e961888b80..bd8601eccc50 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex index 1ff8880a897b..35b354c7310b 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex index 857c7ea3e4f0..796166f430ee 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex index 76e76c3155c9..93b291550be0 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex index 044e0bc66181..51da710db535 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex index c3b9496e2870..0103906c9fa2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex index 6b4ec6c575d6..36210d5dd44d 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex index 2a44596b10fe..bf6ba8b9560e 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex index 31451cfb320e..94fbb99cbdb9 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex index dbaed6ce1606..3ee432909549 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex index 2ec42edb497d..8311d98ee9c0 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/mkimg_test.sh b/usr.bin/mkimg/tests/mkimg_test.sh index 74680c5d2be7..7c6593b219ef 100755 --- a/usr.bin/mkimg/tests/mkimg_test.sh +++ b/usr.bin/mkimg/tests/mkimg_test.sh @@ -86,9 +86,7 @@ mkimg_rebase() fi if test $update = yes; then - # Prevent keyword expansion when writing the keyword. - (echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline - cat $result >> $baseline + cat $result > $baseline fi rm $image $result _tmp-* From nobody Wed Oct 18 16:17:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9bc41mPJz4xDd8; Wed, 18 Oct 2023 16:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9bc41HYMz4K0R; Wed, 18 Oct 2023 16:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697645876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gSfGcZO5o3fMSmkzpN7ooySgF/WTssTra4BiCYKONFI=; b=YCMlHyUUB88LzhS0cFoHDSdBszJ/E1rEO+KvdDLgft5vfO6BdPPkh+hEf0PT2Lep7dz1P4 kFKlxe8mu7lMxhBtF8I+teVAYOCqyu+FPA2GdbyjEA4dG1t12HoW97g7a0H8cH4FLsXX99 q1MM7ThG13nPw0Gh16eFDiJI553JBEI+HUq8JPSUp5DzrERKM3eLPBSEFz5FHZtMOuhzqv xjUurvLF68B9TKPjs66oxnHQGnCw08+mcVmoMDt3rQGbFo1kvjXmmmLmlZZqT1QxM0hE91 QcwIS/P/jGgyYResWclkZPdNekQRTD4JpG+3lpvBcymrscuSzHKwgv0cHiykVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697645876; a=rsa-sha256; cv=none; b=IHiKmIKHZMPBsgHAwiNC/lYrBNJfHtoFZcLaZWdUXRgNh2aP2R6H8fm+6Xyp4pNYIvBEAk ZaB5UbvYweswH2HViDholUca9OaFiD6+af6xTJIrz7g6XfyiJnGWJA+QaYfXiDZAOuau5D QxjAsXOgo4Edno51RlEVqKZMvI0OIq28cs9wDrpyvF2qTvruZGDnPvYJndH78fVL7MA0XN VWXxff/oOpZJHeym9/j1LRX+1O1DnCpjG7eOP7TVrQ00KfS4dIszbtN2PjOV1DbMCa5ts2 5P6/h+oRA7WxFH1mXwwVi5y1yA5x+XvBiFtHJUHKF18XrW0GIyl/TgluoNXitQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697645876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gSfGcZO5o3fMSmkzpN7ooySgF/WTssTra4BiCYKONFI=; b=EDgkx1UUUnB24oHohFIJarTmmu0ca40tnvRyQnx6UKpk8ZpK2svncxRNgkk9ikX22DHT7g Bx1amE4mc1AUaZJjBJZXlDgzxz3fwUjwuZ6XpHV7Cs6uZB9hGEqeKVFJadrj7hBI6lrvi9 lJsXGDT7VUNBScVM921FnC0mpm5LXlOdHGQeTuDu4paxBJDKrB8jDDgaSy/a5Tua+hl/DO cutYamJWkjhYkOyW9FMpZGJrIm7RgBgl4L2KZwB2YXDfJoctOhMOMqJosr6hJPlrtg9J5o IQq/qMR6KKGa9tgUVNeIYdr+gqODPdAM2dGyj4mMwyUwptwKl73cczkL9x4oNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9bc40Kwjz1Cmc; Wed, 18 Oct 2023 16:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IGHtQn061691; Wed, 18 Oct 2023 16:17:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IGHtLv061687; Wed, 18 Oct 2023 16:17:55 GMT (envelope-from git) Date: Wed, 18 Oct 2023 16:17:55 GMT Message-Id: <202310181617.39IGHtLv061687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3d4424154617 - main - freebsd-update: allow user to break out of conflict resolution loop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 3d44241546173de00852ab5e22263ba538cd8759 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3d44241546173de00852ab5e22263ba538cd8759 commit 3d44241546173de00852ab5e22263ba538cd8759 Author: Ed Maste AuthorDate: 2023-03-03 17:32:51 +0000 Commit: Ed Maste CommitDate: 2023-10-18 16:17:33 +0000 freebsd-update: allow user to break out of conflict resolution loop When a conflict marker is found during update allow the user to confirm they want it to remain in the file. Suggested by: Tim Hogard Reviewed by: imp Sponsored by: The FreeBSD Foundation Fixes: ceb5f28ba5fc ("freebsd-update: re-edit files if merge confli...") Differential Revision: https://reviews.freebsd.org/D38896 --- usr.sbin/freebsd-update/freebsd-update.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 4866514c321e..551d40418240 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2544,7 +2544,11 @@ Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF while true; do - read dummy /dev/null; then + echo + break + fi ${EDITOR} `pwd`/merge/new/${F} < /dev/tty if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then @@ -2555,7 +2559,8 @@ manually... Merge conflict markers remain in: ${F} These must be resolved for the system to be functional. -Press Enter to return to editing this file. +Press Enter to return to editing this file, or type "ACCEPT" to carry on with +these lines remaining in the file. EOF done done < failed.merges From nobody Wed Oct 18 18:05:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0k5DqQz4xLCn; Wed, 18 Oct 2023 18:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9f0k4WsQz4dtH; Wed, 18 Oct 2023 18:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQU1+t/qiqHTdWs+EwgcH2PDgfic+6XHrQZzSFuQrMA=; b=PMEs6sGmPe1W0+hyYeKeecMHOdGthifYv9f88PORuOvTn5rNI28w25d6RmkU5REeeB2BA7 J1WPOfCodMkM/IvKgsgWqk+nd81uQjsOegL8dqzNvF//tg00jZH43KFCmxgT1xTdu/+Saz s0a5FIG7o93vPb64Gm4vlwMONZXOpsbcHQzRQf9L2WnY+xexuFn3CCIf++q9AnYeaQ6Tkh y1Q4HOWW0Sg62YIzXQusARZoBe7EJJaBzx6t0Lb7+v0FChBh25dIIfFVMrzGmhevQD8StH IiKf01bMt3iwj/v+2hS/hmGFGuYEe8grqYMknBKruiT0uLsr+GmoJZzARbLkag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652358; a=rsa-sha256; cv=none; b=eJenwygW69r27kd7kOsjJwoDoP61ZEEMEjKcjLFMujjGEG0d30m8Kh7w+7rpZc0sSgSquT 3z2W39m3jDAdGHo4pL9u4fOA5Ien47mKI+8YqpKhzogN/q+MEsIxi73dA2UjGi5hddBmEx p4DsJWvCOroUJ1T+lMRSMQ9YV2wjFhgLw7iXjlUSKijKqOQQS+sMx6uVE4EKycjWN/8tz5 9C6giN6za74Hlz8rrzScwQQGd+e8Fi0SrlA8u8c7g4ruNW4eIMwZ8iwZj5D+ciRKFQCz7h oantsPYvRANQ4pWp6RA1q1/HFGVuDYAInuEmvW+a7USBgQC7PBm/J0tLMoy/qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQU1+t/qiqHTdWs+EwgcH2PDgfic+6XHrQZzSFuQrMA=; b=Y/0TZCJ7bYmBQEUB9GqGWUCF/4ezgC1/LNfKRY+M0W/Cisd8RMgN+X4hB8gnJYLMrIeIf+ hiVbcRL+ryBeXMg0AaLIRe4gaPtR+bUGfqNiQ4EccHVbuxqAxzOZXUwJZEgBTKVtpbR2lL Yie/nun26eKyewtGZOEA3oQB4vzNZOZOXhtiNsDF57i0WcKjQ3qCHIYQkcr8xN88rz2D9m Fe2VIak9A6DHaF4YPkGdSwd+nPiM08NO/WbId2FOTwEnXkbZnZ66l7BKX51hQvEeB+S29D cSLGVpBQ+FIdlJ1mWMCJw43kyyvsFkWEqr+bUgaTVQmsj50F/PQ2qScDjuwvCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0k3994z2S3; Wed, 18 Oct 2023 18:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II5wBx045778; Wed, 18 Oct 2023 18:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II5wAL045775; Wed, 18 Oct 2023 18:05:58 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:05:58 GMT Message-Id: <202310181805.39II5wAL045775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 90a6ea5ca0b1 - main - hwpmc: tidy pcd_finalize methods List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90a6ea5ca0b1b578e265d2479511bd04347f9510 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=90a6ea5ca0b1b578e265d2479511bd04347f9510 commit 90a6ea5ca0b1b578e265d2479511bd04347f9510 Author: Mitchell Horne AuthorDate: 2023-10-18 17:50:49 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hwpmc: tidy pcd_finalize methods Make them a little bit more consistent with one another in terms of what is done: - Add/reduce assertions to what is most useful: a loop to ensure pcpu_fini freed everything - Add PMCDBG trace entries The exception is the dmc620/cmn600 classes, which behave a little differently, so leave them untouched. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41270 --- sys/dev/hwpmc/hwpmc_amd.c | 32 ++++---------------------------- sys/dev/hwpmc/hwpmc_arm64.c | 4 ++++ sys/dev/hwpmc/hwpmc_armv7.c | 4 ++++ sys/dev/hwpmc/hwpmc_core.c | 4 ++++ sys/dev/hwpmc/hwpmc_powerpc.c | 5 +++++ sys/dev/hwpmc/hwpmc_soft.c | 9 ++------- sys/dev/hwpmc/hwpmc_tsc.c | 10 ++-------- sys/dev/hwpmc/hwpmc_uncore.c | 4 ++++ 8 files changed, 29 insertions(+), 43 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index fbbaf92a1547..000958eb9945 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -1173,37 +1173,13 @@ pmc_amd_initialize(void) void pmc_amd_finalize(struct pmc_mdep *md) { -#if defined(INVARIANTS) - int classindex, i, ncpus, pmcclass; -#endif + PMCDBG0(MDP, INI, 1, "amd-finalize"); pmc_tsc_finalize(md); - KASSERT(amd_pcpu != NULL, ("[amd,%d] NULL per-cpu array pointer", - __LINE__)); - -#if defined(INVARIANTS) - switch (md->pmd_cputype) { -#if defined(__i386__) - case PMC_CPU_AMD_K7: - classindex = PMC_MDEP_CLASS_INDEX_K7; - pmcclass = PMC_CLASS_K7; - break; -#endif - default: - classindex = PMC_MDEP_CLASS_INDEX_K8; - pmcclass = PMC_CLASS_K8; - } - - KASSERT(md->pmd_classdep[classindex].pcd_class == pmcclass, - ("[amd,%d] pmc class mismatch", __LINE__)); - - ncpus = pmc_cpu_max(); - - for (i = 0; i < ncpus; i++) - KASSERT(amd_pcpu[i] == NULL, ("[amd,%d] non-null pcpu", - __LINE__)); -#endif + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(amd_pcpu[i] == NULL, + ("[amd,%d] non-null pcpu cpu %d", __LINE__, i)); free(amd_pcpu, M_PMC); amd_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 9a5debb8016b..4c38a4ae6183 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -611,5 +611,9 @@ pmc_arm64_finalize(struct pmc_mdep *md) { PMCDBG0(MDP, INI, 1, "arm64-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(arm64_pcpu[i] == NULL, + ("[arm64,%d] non-null pcpu cpu %d", __LINE__, i)); + free(arm64_pcpu, M_PMC); } diff --git a/sys/dev/hwpmc/hwpmc_armv7.c b/sys/dev/hwpmc/hwpmc_armv7.c index 5bb6c6fce291..1488af2ae54e 100644 --- a/sys/dev/hwpmc/hwpmc_armv7.c +++ b/sys/dev/hwpmc/hwpmc_armv7.c @@ -535,5 +535,9 @@ pmc_armv7_finalize(struct pmc_mdep *md) { PMCDBG0(MDP, INI, 1, "armv7-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(armv7_pcpu[i] == NULL, + ("[armv7,%d] non-null pcpu cpu %d", __LINE__, i)); + free(armv7_pcpu, M_PMC); } diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 3829a03eb729..ddaff0b5955e 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -1260,6 +1260,10 @@ pmc_core_finalize(struct pmc_mdep *md) { PMCDBG0(MDP,INI,1, "core-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(core_pcpu[i] == NULL, + ("[core,%d] non-null pcpu cpu %d", __LINE__, i)); + free(core_pcpu, M_PMC); core_pcpu = NULL; } diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c index a4bd951fab40..0380988f909f 100644 --- a/sys/dev/hwpmc/hwpmc_powerpc.c +++ b/sys/dev/hwpmc/hwpmc_powerpc.c @@ -581,6 +581,11 @@ pmc_md_initialize(void) void pmc_md_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "powerpc-finalize"); + + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(powerpc_pcpu[i] == NULL, + ("[powerpc,%d] non-null pcpu cpu %d", __LINE__, i)); free(powerpc_pcpu, M_PMC); powerpc_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_soft.c b/sys/dev/hwpmc/hwpmc_soft.c index 5606164b3e0f..4679969fb45c 100644 --- a/sys/dev/hwpmc/hwpmc_soft.c +++ b/sys/dev/hwpmc/hwpmc_soft.c @@ -456,17 +456,12 @@ pmc_soft_initialize(struct pmc_mdep *md) void pmc_soft_finalize(struct pmc_mdep *md) { -#ifdef INVARIANTS - int i, ncpus; + PMCDBG0(MDP, INI, 1, "soft-finalize"); - ncpus = pmc_cpu_max(); - for (i = 0; i < ncpus; i++) + for (int i = 0; i < pmc_cpu_max(); i++) KASSERT(soft_pcpu[i] == NULL, ("[soft,%d] non-null pcpu cpu %d", __LINE__, i)); - KASSERT(md->pmd_classdep[PMC_CLASS_INDEX_SOFT].pcd_class == - PMC_CLASS_SOFT, ("[soft,%d] class mismatch", __LINE__)); -#endif ast_deregister(TDA_HWPMC); free(soft_pcpu, M_PMC); soft_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_tsc.c b/sys/dev/hwpmc/hwpmc_tsc.c index f86b93d58bfb..5d31f8a9c61c 100644 --- a/sys/dev/hwpmc/hwpmc_tsc.c +++ b/sys/dev/hwpmc/hwpmc_tsc.c @@ -339,18 +339,12 @@ pmc_tsc_initialize(struct pmc_mdep *md, int maxcpu) void pmc_tsc_finalize(struct pmc_mdep *md __diagused) { -#ifdef INVARIANTS - int i, ncpus; + PMCDBG0(MDP, INI, 1, "tsc-finalize"); - ncpus = pmc_cpu_max(); - for (i = 0; i < ncpus; i++) + for (int i = 0; i < pmc_cpu_max(); i++) KASSERT(tsc_pcpu[i] == NULL, ("[tsc,%d] non-null pcpu cpu %d", __LINE__, i)); - KASSERT(md->pmd_classdep[PMC_MDEP_CLASS_INDEX_TSC].pcd_class == - PMC_CLASS_TSC, ("[tsc,%d] class mismatch", __LINE__)); -#endif - free(tsc_pcpu, M_PMC); tsc_pcpu = NULL; } diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index fd4266b605ef..0ee41db0658d 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -758,6 +758,10 @@ pmc_uncore_finalize(struct pmc_mdep *md) { PMCDBG0(MDP,INI,1, "uncore-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(uncore_pcpu[i] == NULL, + ("[uncore,%d] non-null pcpu cpu %d", __LINE__, i)); + free(uncore_pcpu, M_PMC); uncore_pcpu = NULL; } From nobody Wed Oct 18 18:05:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0l5xjhz4xL4g; Wed, 18 Oct 2023 18:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9f0l5HxMz4f0D; Wed, 18 Oct 2023 18:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIppKBkdw1cc40PXxCFTApxS7m9xQkYcqx2PZZ+wcJw=; b=UmeCdAXgtYE5Ub5G+llNAM+903x/e7UlIdfV70/Q479ci+vfBt9jcxKGCmLp4jH8TP6YCV 2SKgdjshpsSxnbgrT/mJ8QH6VoLT6czvjqRVRlnxQ5LhOeYot/gn3YNGoqvauzzArXRKhh MLkQMI+HCl6+orLPEI2gxymhhbW1L23A89Rd0rPKjpSuRH8KyhTwtRzs9P/i2JHpPUnz7L uAuGkK/vlPuCveyhDV2aDPhFz2CmLqQFMOFJrzupiFRpsmJBxPFFAHHiXDqjYjv8nSXN6U nMmKpPUc38RG6smgw5rV677DIocjGPafcIqbwbewXlaD1QNT3gzPlBp2lyFuxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652359; a=rsa-sha256; cv=none; b=TlSLLhaR/UUlH3UPI+/7nbm5Y77D+D2Yf8S4hG6zgqE+x1all/dlfrfQrXpHe1zhI1Q0up MQ5GToKbnDdZY+ZGeiKjjkBJf4bZUbvYP4GT7pFU6aQrNmWoIanrKkxYmpVSk2yeL5T/nL +FCWq2pw7bZvrTvSzcNDQPkuZZVtMWPKfY31vWq2RyrH4VZV7dVx0VLXHnJ25SR8ifwXNY qOcreooSRrlsAMZXlAHhG1C8C+BrOQOzE+MMqsp8Zer1hdU+V5cHYF5OYNvWHlvN9ZEiF+ GGwGqfSLoAN5CUhgVU6hSyt+9YmXoaKwqbKb7pFQ+LZDyD1hcR/cx1JWWJtwYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIppKBkdw1cc40PXxCFTApxS7m9xQkYcqx2PZZ+wcJw=; b=EPxpwGpAZ40in3Xrp62GV6EdubBSew8tDmA93N3945+91Wpbgstc+Ud5Y3JZ56F1X+8YPA tfjtoLWi1+PhZCAx2reO3qZQssnxQOt/zbFwWzIc4a+azXzaomQGAsyKgSifftuTKCmPJz yP7TrAL2ih6xErEr7rivaNuJifaarpLGu+zkkbj+f8MbEB3NwwnFYoUREm7/a8eZOMiPPb C2gK5nQpHDVig7D+qiVPnoNnjeAnsjailoGiiwt5h99uUI06ZFMfUOmIPEMJgbC0BFNuag SqECqFboI2j8v2Qv8aAium7YowYOy4snn5+uytsZQdA6KZlZCT+w8qJaWQ9HLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0l4NnMz27W; Wed, 18 Oct 2023 18:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II5xuc045829; Wed, 18 Oct 2023 18:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II5x0U045826; Wed, 18 Oct 2023 18:05:59 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:05:59 GMT Message-Id: <202310181805.39II5x0U045826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 440e7cb4aca9 - main - hwpmc_core: remove two non-existent function prototypes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 440e7cb4aca9b6f5662ab492bd016d8ed0f85da0 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=440e7cb4aca9b6f5662ab492bd016d8ed0f85da0 commit 440e7cb4aca9b6f5662ab492bd016d8ed0f85da0 Author: Mitchell Horne AuthorDate: 2023-10-18 17:53:05 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hwpmc_core: remove two non-existent function prototypes Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41271 --- sys/dev/hwpmc/hwpmc_core.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_core.h b/sys/dev/hwpmc/hwpmc_core.h index 6fbb1cca319c..cd23055afbe2 100644 --- a/sys/dev/hwpmc/hwpmc_core.h +++ b/sys/dev/hwpmc/hwpmc_core.h @@ -198,11 +198,9 @@ int pmc_core_initialize(struct pmc_mdep *_md, int _maxcpu, void pmc_core_finalize(struct pmc_mdep *_md); int pmc_iaf_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width); -void pmc_iaf_finalize(struct pmc_mdep *_md); int pmc_iap_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width, int _flags); -void pmc_iap_finalize(struct pmc_mdep *_md); #endif /* _KERNEL */ #endif /* _DEV_HWPMC_CORE_H */ From nobody Wed Oct 18 18:06:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0m5zfsz4xLFg; Wed, 18 Oct 2023 18:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9f0m5Ym1z4dsB; Wed, 18 Oct 2023 18:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MCd6ssSgaG2cULo0K7rLixi2BnUKt9opnLNvTzLmYSg=; b=w21QiDZ6sAn6IfigAoL0Ls/NfELjZNYevbnkkxzs2kVE7JTOtsVEuOWl3bZ3gaTVBA/1Io RH2DyewIbwgQ8Vm0fw347zU6LcNyTV/0/ExXbVRw8/Y7+4F+oZpnLWqftNAdhJ08GRHR+u wvzS00I0/cWELXn081Ax4/ClALM1syC4c2qpMWLoxF8IEXJSEcR5vcuX+uNUejOcwUFrYq VLQ8OfWctB8I4uofRKNAHRbEjAE4sPEq1AJ3FDvrw6qqUBkpFCs8wBblYcYpGkF/P5HPpj +/26ryJIizOeZRPBP2daLCcqP+kkmmWqgxgSowAJMCpJgjZTYgcikw+GzaZwyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652360; a=rsa-sha256; cv=none; b=By6Z8Wz1UfJAI3uEEX53AmMo/XmTusHmrrfFLWOKxZt8SlifuCKJzEaCs41n51LAqk1nzP /IyH2XMoS27+OFasOaQOCVJTAwI8MlI3jUCjHp0WZFKntF3JM6wmepr8CXCU90czbFwbhj IBtZ2nZAROAna81tLgDExM8GufYxXn4x4aTadDVccv888vEvU+qExxtJI/E7S2vWSVfjxK BH8zZtDtNHFx1X9kTRFoHv0cxoOFP0BIE0OkKQFd2h8C0ao0R7nGKwF2l0E4iSfEUqTCWi rN79tY3natcJU/bGPjRZhGHT9Ca/nGF6dyDShe4hHMWKw9OGfYJi44FSmGUMlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MCd6ssSgaG2cULo0K7rLixi2BnUKt9opnLNvTzLmYSg=; b=irG5tp8gfFNKDNAuoyCsay7cr2sTAe/Fezehi54xvbrQcKpAN/YDUceu8N1USt7/4kOAVb M8XilaP2utiXIjxGBPGPoy3qsdpvv8CFFmjql+p0Di+AYQfVRZD778oH8Yl4QlAzZ7SKKM 2oL5P1hF1oa8zHRsFU18naunESlY9fecky1pBmhYlG29bXnczpb//XwFDsHLEZcCyQcJjN hTH9J0FOfVdTVEOZjUdC4vaYCD68q+vHD2OdnliaEAwRYW4Pr2v1gsd6XOtzwTu30PMWLu TfMYhOOlX+zwn9rfkJStyP3Tj9zZd4wCnEq4wiSVCRHtJjb/2MoiLXn1URJEAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0m4dxQz253; Wed, 18 Oct 2023 18:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II60vf045871; Wed, 18 Oct 2023 18:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II60oK045868; Wed, 18 Oct 2023 18:06:00 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:00 GMT Message-Id: <202310181806.39II60oK045868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: d9e3fe322662 - main - hpwmc_amd.c: style improvements List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9e3fe3226624c391a80b623d844bb578888cec3 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d9e3fe3226624c391a80b623d844bb578888cec3 commit d9e3fe3226624c391a80b623d844bb578888cec3 Author: Mitchell Horne AuthorDate: 2023-10-18 17:53:27 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hpwmc_amd.c: style improvements - Return style - Explicit value checks - Whitespace formatting - Comment formatting - Local variable declaration order - __unused annotations Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41272 --- sys/dev/hwpmc/hwpmc_amd.c | 280 +++++++++++++++++++--------------------------- 1 file changed, 116 insertions(+), 164 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 000958eb9945..d8ca2e094d02 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -383,23 +383,20 @@ const int amd_event_codes_size = nitems(amd_event_codes); /* * Per-processor information */ - struct amd_cpu { struct pmc_hw pc_amdpmcs[AMD_NPMCS]; }; - static struct amd_cpu **amd_pcpu; /* - * read a pmc register + * Read a PMC value from the MSR. */ - static int amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) { - enum pmc_mode mode; const struct amd_descr *pd; pmc_value_t tmp; + enum pmc_mode mode; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); @@ -411,7 +408,8 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) pd = &amd_pmcdesc[ri]; mode = PMC_TO_MODE(pm); - PMCDBG2(MDP,REA,1,"amd-read id=%d class=%d", ri, pd->pm_descr.pd_class); + PMCDBG2(MDP, REA, 1, "amd-read id=%d class=%d", ri, + pd->pm_descr.pd_class); #ifdef HWPMC_DEBUG KASSERT(pd->pm_descr.pd_class == amd_pmc_class, @@ -420,7 +418,7 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) #endif tmp = rdmsr(pd->pm_perfctr); /* RDMSR serializes */ - PMCDBG2(MDP,REA,2,"amd-read (pre-munge) id=%d -> %jd", ri, tmp); + PMCDBG2(MDP, REA, 2, "amd-read (pre-munge) id=%d -> %jd", ri, tmp); if (PMC_IS_SAMPLING_MODE(mode)) { /* * Clamp value to 0 if the counter just overflowed, @@ -437,15 +435,14 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) } *v = tmp; - PMCDBG2(MDP,REA,2,"amd-read (post-munge) id=%d -> %jd", ri, *v); + PMCDBG2(MDP, REA, 2, "amd-read (post-munge) id=%d -> %jd", ri, *v); - return 0; + return (0); } /* * Write a PMC MSR. */ - static int amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) { @@ -470,24 +467,22 @@ amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) if (PMC_IS_SAMPLING_MODE(mode)) v = AMD_RELOAD_COUNT_TO_PERFCTR_VALUE(v); - PMCDBG3(MDP,WRI,1,"amd-write cpu=%d ri=%d v=%jx", cpu, ri, v); + PMCDBG3(MDP, WRI, 1, "amd-write cpu=%d ri=%d v=%jx", cpu, ri, v); /* write the PMC value */ wrmsr(pd->pm_perfctr, v); - return 0; + return (0); } /* - * configure hardware pmc according to the configuration recorded in - * pmc 'pm'. + * Configure hardware PMC according to the configuration recorded in 'pm'. */ - static int amd_config_pmc(int cpu, int ri, struct pmc *pm) { struct pmc_hw *phw; - PMCDBG3(MDP,CFG,1, "cpu=%d ri=%d pm=%p", cpu, ri, pm); + PMCDBG3(MDP, CFG, 1, "cpu=%d ri=%d pm=%p", cpu, ri, pm); KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); @@ -501,78 +496,65 @@ amd_config_pmc(int cpu, int ri, struct pmc *pm) __LINE__, pm, phw->phw_pmc)); phw->phw_pmc = pm; - return 0; + return (0); } /* * Retrieve a configured PMC pointer from hardware state. */ - static int amd_get_config(int cpu, int ri, struct pmc **ppm) { *ppm = amd_pcpu[cpu]->pc_amdpmcs[ri].phw_pmc; - - return 0; + return (0); } /* - * Machine dependent actions taken during the context switch in of a + * Machine-dependent actions taken during the context switch in of a * thread. */ - static int -amd_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) +amd_switch_in(struct pmc_cpu *pc __pmcdbg_used, struct pmc_process *pp) { - (void) pc; - - PMCDBG3(MDP,SWI,1, "pc=%p pp=%p enable-msr=%d", pc, pp, + PMCDBG3(MDP, SWI, 1, "pc=%p pp=%p enable-msr=%d", pc, pp, (pp->pp_flags & PMC_PP_ENABLE_MSR_ACCESS) != 0); /* enable the RDPMC instruction if needed */ if (pp->pp_flags & PMC_PP_ENABLE_MSR_ACCESS) load_cr4(rcr4() | CR4_PCE); - return 0; + return (0); } /* - * Machine dependent actions taken during the context switch out of a + * Machine-dependent actions taken during the context switch out of a * thread. */ - static int -amd_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) +amd_switch_out(struct pmc_cpu *pc __pmcdbg_used, + struct pmc_process *pp __pmcdbg_used) { - (void) pc; - (void) pp; /* can be NULL */ - - PMCDBG3(MDP,SWO,1, "pc=%p pp=%p enable-msr=%d", pc, pp, pp ? + PMCDBG3(MDP, SWO, 1, "pc=%p pp=%p enable-msr=%d", pc, pp, pp ? (pp->pp_flags & PMC_PP_ENABLE_MSR_ACCESS) == 1 : 0); /* always turn off the RDPMC instruction */ load_cr4(rcr4() & ~CR4_PCE); - return 0; + return (0); } /* - * Check if a given allocation is feasible. + * Check if a given PMC allocation is feasible. */ - static int -amd_allocate_pmc(int cpu, int ri, struct pmc *pm, +amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, const struct pmc_op_pmcallocate *a) { - int i; + const struct pmc_descr *pd; uint64_t allowed_unitmask, caps, config, unitmask; enum pmc_event pe; - const struct pmc_descr *pd; - - (void) cpu; + int i; - KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), - ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); KASSERT(ri >= 0 && ri < AMD_NPMCS, ("[amd,%d] illegal row index %d", __LINE__, ri)); @@ -580,26 +562,30 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, /* check class match */ if (pd->pd_class != a->pm_class) - return EINVAL; + return (EINVAL); if ((a->pm_flags & PMC_F_EV_PMU) == 0) return (EINVAL); caps = pm->pm_caps; - PMCDBG2(MDP,ALL,1,"amd-allocate ri=%d caps=0x%x", ri, caps); + PMCDBG2(MDP, ALL, 1,"amd-allocate ri=%d caps=0x%x", ri, caps); - if((ri >= 0 && ri < 6) && !(a->pm_md.pm_amd.pm_amd_sub_class == PMC_AMD_SUB_CLASS_CORE)) - return EINVAL; - if((ri >= 6 && ri < 12) && !(a->pm_md.pm_amd.pm_amd_sub_class == PMC_AMD_SUB_CLASS_L3_CACHE)) - return EINVAL; - if((ri >= 12 && ri < 16) && !(a->pm_md.pm_amd.pm_amd_sub_class == PMC_AMD_SUB_CLASS_DATA_FABRIC)) - return EINVAL; + /* Validate sub-class. */ + if ((ri >= 0 && ri < 6) && a->pm_md.pm_amd.pm_amd_sub_class != + PMC_AMD_SUB_CLASS_CORE) + return (EINVAL); + if ((ri >= 6 && ri < 12) && a->pm_md.pm_amd.pm_amd_sub_class != + PMC_AMD_SUB_CLASS_L3_CACHE) + return (EINVAL); + if ((ri >= 12 && ri < 16) && a->pm_md.pm_amd.pm_amd_sub_class != + PMC_AMD_SUB_CLASS_DATA_FABRIC) + return (EINVAL); if (strlen(pmc_cpuid) != 0) { - pm->pm_md.pm_amd.pm_amd_evsel = - a->pm_md.pm_amd.pm_amd_config; - PMCDBG2(MDP,ALL,2,"amd-allocate ri=%d -> config=0x%x", ri, a->pm_md.pm_amd.pm_amd_config); + pm->pm_md.pm_amd.pm_amd_evsel = a->pm_md.pm_amd.pm_amd_config; + PMCDBG2(MDP, ALL, 2,"amd-allocate ri=%d -> config=0x%x", ri, + a->pm_md.pm_amd.pm_amd_config); return (0); } @@ -607,7 +593,7 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, /* map ev to the correct event mask code */ config = allowed_unitmask = 0; - for (i = 0; i < amd_event_codes_size; i++) + for (i = 0; i < amd_event_codes_size; i++) { if (amd_event_codes[i].pe_ev == pe) { config = AMD_PMC_TO_EVENTMASK(amd_event_codes[i].pe_code); @@ -615,58 +601,52 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, AMD_PMC_TO_UNITMASK(amd_event_codes[i].pe_mask); break; } + } if (i == amd_event_codes_size) - return EINVAL; + return (EINVAL); unitmask = a->pm_md.pm_amd.pm_amd_config & AMD_PMC_UNITMASK; - if (unitmask & ~allowed_unitmask) /* disallow reserved bits */ - return EINVAL; + if ((unitmask & ~allowed_unitmask) != 0) /* disallow reserved bits */ + return (EINVAL); - if (unitmask && (caps & PMC_CAP_QUALIFIER)) + if (unitmask && (caps & PMC_CAP_QUALIFIER) != 0) config |= unitmask; - if (caps & PMC_CAP_THRESHOLD) + if ((caps & PMC_CAP_THRESHOLD) != 0) config |= a->pm_md.pm_amd.pm_amd_config & AMD_PMC_COUNTERMASK; - /* set at least one of the 'usr' or 'os' caps */ - if (caps & PMC_CAP_USER) + /* Set at least one of the 'usr' or 'os' caps. */ + if ((caps & PMC_CAP_USER) != 0) config |= AMD_PMC_USR; - if (caps & PMC_CAP_SYSTEM) + if ((caps & PMC_CAP_SYSTEM) != 0) config |= AMD_PMC_OS; - if ((caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0) + if ((caps & (PMC_CAP_USER | PMC_CAP_SYSTEM)) == 0) config |= (AMD_PMC_USR|AMD_PMC_OS); - if (caps & PMC_CAP_EDGE) + if ((caps & PMC_CAP_EDGE) != 0) config |= AMD_PMC_EDGE; - if (caps & PMC_CAP_INVERT) + if ((caps & PMC_CAP_INVERT) != 0) config |= AMD_PMC_INVERT; - if (caps & PMC_CAP_INTERRUPT) + if ((caps & PMC_CAP_INTERRUPT) != 0) config |= AMD_PMC_INT; pm->pm_md.pm_amd.pm_amd_evsel = config; /* save config value */ - PMCDBG2(MDP,ALL,2,"amd-allocate ri=%d -> config=0x%x", ri, config); + PMCDBG2(MDP, ALL, 2, "amd-allocate ri=%d -> config=0x%x", ri, config); - return 0; + return (0); } /* * Release machine dependent state associated with a PMC. This is a * no-op on this architecture. - * */ - -/* ARGSUSED0 */ static int -amd_release_pmc(int cpu, int ri, struct pmc *pmc) +amd_release_pmc(int cpu, int ri, struct pmc *pmc __unused) { -#ifdef HWPMC_DEBUG - const struct amd_descr *pd; -#endif + const struct amd_descr *pd __pmcdbg_used; struct pmc_hw *phw __diagused; - (void) pmc; - KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); KASSERT(ri >= 0 && ri < AMD_NPMCS, @@ -677,25 +657,23 @@ amd_release_pmc(int cpu, int ri, struct pmc *pmc) KASSERT(phw->phw_pmc == NULL, ("[amd,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); -#ifdef HWPMC_DEBUG +#ifdef HWPMC_DEBUG pd = &amd_pmcdesc[ri]; if (pd->pm_descr.pd_class == amd_pmc_class) KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), ("[amd,%d] PMC %d released while active", __LINE__, ri)); #endif - - return 0; + return (0); } /* - * start a PMC. + * Start a PMC. */ - static int -amd_start_pmc(int cpu, int ri, struct pmc *pm) +amd_start_pmc(int cpu __diagused, int ri, struct pmc *pm) { - uint64_t config; const struct amd_descr *pd; + uint64_t config; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); @@ -704,7 +682,7 @@ amd_start_pmc(int cpu, int ri, struct pmc *pm) pd = &amd_pmcdesc[ri]; - PMCDBG2(MDP,STA,1,"amd-start cpu=%d ri=%d", cpu, ri); + PMCDBG2(MDP, STA, 1, "amd-start cpu=%d ri=%d", cpu, ri); KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), ("[amd,%d] pmc%d,cpu%d: Starting active PMC \"%s\"", __LINE__, @@ -713,18 +691,17 @@ amd_start_pmc(int cpu, int ri, struct pmc *pm) /* turn on the PMC ENABLE bit */ config = pm->pm_md.pm_amd.pm_amd_evsel | AMD_PMC_ENABLE; - PMCDBG1(MDP,STA,2,"amd-start config=0x%x", config); + PMCDBG1(MDP, STA, 2, "amd-start config=0x%x", config); wrmsr(pd->pm_evsel, config); - return 0; + return (0); } /* * Stop a PMC. */ - static int -amd_stop_pmc(int cpu, int ri, struct pmc *pm) +amd_stop_pmc(int cpu __diagused, int ri, struct pmc *pm) { const struct amd_descr *pd; uint64_t config; @@ -741,7 +718,7 @@ amd_stop_pmc(int cpu, int ri, struct pmc *pm) ("[amd,%d] PMC%d, CPU%d \"%s\" already stopped", __LINE__, ri, cpu, pd->pm_descr.pd_name)); - PMCDBG1(MDP,STO,1,"amd-stop ri=%d", ri); + PMCDBG1(MDP, STO, 1, "amd-stop ri=%d", ri); /* turn off the PMC ENABLE bit */ config = pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE; @@ -761,7 +738,7 @@ amd_stop_pmc(int cpu, int ri, struct pmc *pm) DELAY(1); } - return 0; + return (0); } /* @@ -770,23 +747,21 @@ amd_stop_pmc(int cpu, int ri, struct pmc *pm) * to sleep or do anything a 'fast' interrupt handler is not allowed * to do. */ - static int amd_intr(struct trapframe *tf) { - int i, error, retval, cpu; - uint64_t config, evsel, perfctr; - struct pmc *pm; struct amd_cpu *pac; + struct pmc *pm; pmc_value_t v; + uint64_t config, evsel, perfctr; uint32_t active = 0, count = 0; + int i, error, retval, cpu; cpu = curcpu; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] out of range CPU %d", __LINE__, cpu)); - PMCDBG3(MDP,INT,1, "cpu=%d tf=%p um=%d", cpu, (void *) tf, - TRAPF_USERMODE(tf)); + PMCDBG3(MDP, INT, 1, "cpu=%d tf=%p um=%d", cpu, tf, TRAPF_USERMODE(tf)); retval = 0; @@ -803,9 +778,7 @@ amd_intr(struct trapframe *tf) * a single interrupt. Check all the valid pmcs for * overflow. */ - for (i = 0; i < AMD_CORE_NPMCS; i++) { - if ((pm = pac->pc_amdpmcs[i].phw_pmc) == NULL || !PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) { continue; @@ -823,8 +796,8 @@ amd_intr(struct trapframe *tf) continue; /* Stop the PMC, reload count. */ - evsel = amd_pmcdesc[i].pm_evsel; - perfctr = amd_pmcdesc[i].pm_perfctr; + evsel = amd_pmcdesc[i].pm_evsel; + perfctr = amd_pmcdesc[i].pm_perfctr; v = pm->pm_sc.pm_reloadcount; config = rdmsr(evsel); @@ -852,7 +825,6 @@ amd_intr(struct trapframe *tf) * if this NMI was for a pmc overflow which was serviced * in an earlier request or should be ignored. */ - if (retval) { DPCPU_SET(nmi_counter, min(2, active)); } else { @@ -867,12 +839,12 @@ amd_intr(struct trapframe *tf) else counter_u64_add(pmc_stats.pm_intr_ignored, 1); - PMCDBG1(MDP,INT,2, "retval=%d", retval); + PMCDBG1(MDP, INT, 2, "retval=%d", retval); return (retval); } /* - * describe a PMC + * Describe a PMC. */ static int amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) @@ -891,25 +863,20 @@ amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) strlcpy(pi->pm_name, pd->pm_descr.pd_name, sizeof(pi->pm_name)); pi->pm_class = pd->pm_descr.pd_class; - if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) { - pi->pm_enabled = TRUE; + if ((phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) != 0) { + pi->pm_enabled = true; *ppmc = phw->phw_pmc; } else { - pi->pm_enabled = FALSE; + pi->pm_enabled = false; *ppmc = NULL; } - return 0; + return (0); } /* - * i386 specific entry points + * Return the MSR address of the given PMC. */ - -/* - * return the MSR address of the given PMC. - */ - static int amd_get_msr(int ri, uint32_t *msr) { @@ -917,29 +884,27 @@ amd_get_msr(int ri, uint32_t *msr) ("[amd,%d] ri %d out of range", __LINE__, ri)); *msr = amd_pmcdesc[ri].pm_perfctr - AMD_PMC_PERFCTR_0; - return (0); } /* - * processor dependent initialization. + * Processor-dependent initialization. */ - static int amd_pcpu_init(struct pmc_mdep *md, int cpu) { - int classindex, first_ri, n; - struct pmc_cpu *pc; struct amd_cpu *pac; + struct pmc_cpu *pc; struct pmc_hw *phw; + int classindex, first_ri, n; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number %d", __LINE__, cpu)); - PMCDBG1(MDP,INI,1,"amd-init cpu=%d", cpu); + PMCDBG1(MDP, INI, 1, "amd-init cpu=%d", cpu); amd_pcpu[cpu] = pac = malloc(sizeof(struct amd_cpu), M_PMC, - M_WAITOK|M_ZERO); + M_WAITOK | M_ZERO); /* * Set the content of the hardware descriptors to a known @@ -957,33 +922,30 @@ amd_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu pointer", __LINE__)); for (n = 0, phw = pac->pc_amdpmcs; n < AMD_NPMCS; n++, phw++) { - phw->phw_state = PMC_PHW_FLAG_IS_ENABLED | + phw->phw_state = PMC_PHW_FLAG_IS_ENABLED | PMC_PHW_CPU_TO_STATE(cpu) | PMC_PHW_INDEX_TO_STATE(n); - phw->phw_pmc = NULL; - pc->pc_hwpmcs[n + first_ri] = phw; + phw->phw_pmc = NULL; + pc->pc_hwpmcs[n + first_ri] = phw; } return (0); } - /* - * processor dependent cleanup prior to the KLD - * being unloaded + * Processor-dependent cleanup prior to the KLD being unloaded. */ - static int amd_pcpu_fini(struct pmc_mdep *md, int cpu) { - int classindex, first_ri, i; - uint32_t evsel; - struct pmc_cpu *pc; struct amd_cpu *pac; + struct pmc_cpu *pc; + uint32_t evsel; + int classindex, first_ri, i; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number (%d)", __LINE__, cpu)); - PMCDBG1(MDP,INI,1,"amd-cleanup cpu=%d", cpu); + PMCDBG1(MDP, INI, 1, "amd-cleanup cpu=%d", cpu); /* * First, turn off all PMCs on this CPU. @@ -1014,9 +976,9 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) pc = pmc_pcpu[cpu]; KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu state", __LINE__)); -#if defined(__amd64__) +#ifdef __amd64__ classindex = PMC_MDEP_CLASS_INDEX_K8; -#elif defined(__i386__) +#else classindex = md->pmd_cputype == PMC_CPU_AMD_K8 ? PMC_MDEP_CLASS_INDEX_K8 : PMC_MDEP_CLASS_INDEX_K7; #endif @@ -1025,30 +987,26 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) /* * Reset pointers in the MI 'per-cpu' state. */ - for (i = 0; i < AMD_NPMCS; i++) { + for (i = 0; i < AMD_NPMCS; i++) pc->pc_hwpmcs[i + first_ri] = NULL; - } - free(pac, M_PMC); - return (0); } /* * Initialize ourselves. */ - struct pmc_mdep * pmc_amd_initialize(void) { - int classindex, error, i, ncpus; struct pmc_classdep *pcd; - enum pmc_cputype cputype; struct pmc_mdep *pmc_mdep; + char *name; + enum pmc_cputype cputype; enum pmc_class class; + int classindex, error, i, ncpus; int family, model, stepping; - char *name; /* * The presence of hardware performance counters on the AMD @@ -1071,7 +1029,7 @@ pmc_amd_initialize(void) family, model, stepping); switch (cpu_id & 0xF00) { -#if defined(__i386__) +#ifdef __i386__ case 0x600: /* Athlon(tm) processor */ classindex = PMC_MDEP_CLASS_INDEX_K7; cputype = PMC_CPU_AMD_K7; @@ -1087,11 +1045,12 @@ pmc_amd_initialize(void) break; default: - (void) printf("pmc: Unknown AMD CPU %x %d-%d.\n", cpu_id, (cpu_id & 0xF00) >> 8, model); - return NULL; + printf("pmc: Unknown AMD CPU %x %d-%d.\n", cpu_id, family, + model); + return (NULL); } -#ifdef HWPMC_DEBUG +#ifdef HWPMC_DEBUG amd_pmc_class = class; #endif @@ -1100,7 +1059,7 @@ pmc_amd_initialize(void) * the MDEP structure used by MI code. */ amd_pcpu = malloc(sizeof(struct amd_cpu *) * pmc_cpu_max(), M_PMC, - M_WAITOK|M_ZERO); + M_WAITOK | M_ZERO); /* * These processors have two classes of PMCs: the TSC and @@ -1108,13 +1067,11 @@ pmc_amd_initialize(void) */ pmc_mdep = pmc_mdep_alloc(2); - pmc_mdep->pmd_cputype = cputype; - ncpus = pmc_cpu_max(); /* Initialize the TSC. */ error = pmc_tsc_initialize(pmc_mdep, ncpus); - if (error) + if (error != 0) goto error; /* Initialize AMD K7 and K8 PMC handling. */ @@ -1128,8 +1085,7 @@ pmc_amd_initialize(void) /* fill in the correct pmc name and class */ for (i = 0; i < AMD_NPMCS; i++) { - (void) snprintf(amd_pmcdesc[i].pm_descr.pd_name, - sizeof(amd_pmcdesc[i].pm_descr.pd_name), "%s-%d", + snprintf(amd_pmcdesc[i].pm_descr.pd_name, PMC_NAME_MAX, "%s-%d", name, i); amd_pmcdesc[i].pm_descr.pd_class = class; } @@ -1147,29 +1103,25 @@ pmc_amd_initialize(void) pcd->pcd_stop_pmc = amd_stop_pmc; pcd->pcd_write_pmc = amd_write_pmc; + pmc_mdep->pmd_cputype = cputype; pmc_mdep->pmd_intr = amd_intr; - pmc_mdep->pmd_switch_in = amd_switch_in; + pmc_mdep->pmd_switch_in = amd_switch_in; pmc_mdep->pmd_switch_out = amd_switch_out; - pmc_mdep->pmd_npmc += AMD_NPMCS; + pmc_mdep->pmd_npmc += AMD_NPMCS; - PMCDBG0(MDP,INI,0,"amd-initialize"); + PMCDBG0(MDP, INI, 0, "amd-initialize"); return (pmc_mdep); - error: - if (error) { - free(pmc_mdep, M_PMC); - pmc_mdep = NULL; - } - +error: + free(pmc_mdep, M_PMC); return (NULL); } /* * Finalization code for AMD CPUs. */ - void pmc_amd_finalize(struct pmc_mdep *md) { From nobody Wed Oct 18 18:06:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0p0QtFz4xKl8; Wed, 18 Oct 2023 18:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9f0n6cYGz4f5N; Wed, 18 Oct 2023 18:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2zEOkm1ydqhIVO1Nw7c6A43JUHCGvrTmxwASfkF+KtI=; b=DRgwSXYea36w2KNnSuM6jHg7168QK8rINm5hJm34YnSAbbbDJf2DG79znSHx2Lh3CwAiah soUOryfaMimil3gEVdU4jQTDMNi6n3jce0A5Tt/ZkvzpmjAelxi0Lmrp770KMQp+0MeuFk vROfdtuISo84FGHNFQ2wsv3Pvvdyi73rK8vmXw8WDn2isUkGBKgqYFasB7YEg0KZLXi/hZ TIyGKZ7A/edK2OwZpnYZCux7zw9u19FKZl64a2BUo5hJDCylmqoUYyVtNSdh00LauvuRzZ kcHh3aPO4mC73r2je+PT9HiAjJSZnrpdio2jAFul7hE8JpjOKTJyiWJzIQIzCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652361; a=rsa-sha256; cv=none; b=kZ6dCuR4PCBfXX1+TgubuFkUUJanVgAOr7K72tit9dvjXvo8QGtvL58rRv7MqJCy1/Rmrj CWOCMchh0Ch8pEd0aCQPZR67dyiM8Ler+R4WpJr+Do8Bnp4GeWx3UxYJAq4pgCbi8wxdOm C6kIh0wdrxGdJJ9h2TILXQ51vwEL82VLjDKMUcR5T3pca7vIpW8rp3sAtS4ePUfpqtDVym IGacxJks8ObkXAeHkFh4Ho3BfZh7LvfLESb0xYtSPH+1yxYhdjfLEYLAlror8BYnGCamJv AkJYKlhq2fKvJupwqXmCHkFD71f/E0nvT7s+FlR3gbJ1K4ZKX+W7ZskY6zDuVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2zEOkm1ydqhIVO1Nw7c6A43JUHCGvrTmxwASfkF+KtI=; b=UTcS+SmVfD3JqjKElYZSS/4TgJJJ831vWmTTXOvnkEmihP1FInRAQSlqXh32MRSDOKoqTs V4ePv1MaLzeZLPtZqELIBixoAV4vDAiDIF6UKfp2Xjd+/wVg5bCWVZTQc2Ukz0AhJK4KNS iUAQLDHFkOBX/3qBO62+BTpVnHKEKum8wfnDufhaagWKQPMGi9/AujWV4gqA26ArBdbo24 +rxqE86Xz4MgpFrJuGztp/7XcOostO2B+aQIF0SPhwu4tsswxmlJ2aSo5KyFUp3G9juNdZ uQ5xOiVSqR2gHpdHBknDS9Zf1d93DoLLvM9oDUfQmWeJX4FTj/7IdPdLVGC+2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0n5gT9z27X; Wed, 18 Oct 2023 18:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II61kY045913; Wed, 18 Oct 2023 18:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II61fi045910; Wed, 18 Oct 2023 18:06:01 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:01 GMT Message-Id: <202310181806.39II61fi045910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 75780146d627 - main - hwpmc_amd: simplify counter descriptor definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75780146d627ff4be978191a142da4d67be5aaa6 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=75780146d627ff4be978191a142da4d67be5aaa6 commit 75780146d627ff4be978191a142da4d67be5aaa6 Author: Mitchell Horne AuthorDate: 2023-10-18 17:54:04 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hwpmc_amd: simplify counter descriptor definitions No functional change intended. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41273 --- sys/dev/hwpmc/hwpmc_amd.c | 207 +++++++--------------------------------------- 1 file changed, 30 insertions(+), 177 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index d8ca2e094d02..367f9d0ceebf 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -63,184 +63,37 @@ struct amd_descr { uint32_t pm_perfctr; /* address of PERFCTR register */ }; -static struct amd_descr amd_pmcdesc[AMD_NPMCS] = +/* Counter hardware. */ +#define PMCDESC(evsel, perfctr) \ + { \ + .pm_descr = { \ + .pd_name = "", \ + .pd_class = -1, \ + .pd_caps = AMD_PMC_CAPS, \ + .pd_width = 48 \ + }, \ + .pm_evsel = (evsel), \ + .pm_perfctr = (perfctr) \ + } + +static struct amd_descr amd_pmcdesc[AMD_NPMCS] = { - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_0, - .pm_perfctr = AMD_PMC_PERFCTR_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_1, - .pm_perfctr = AMD_PMC_PERFCTR_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_2, - .pm_perfctr = AMD_PMC_PERFCTR_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_3, - .pm_perfctr = AMD_PMC_PERFCTR_3 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_4, - .pm_perfctr = AMD_PMC_PERFCTR_4 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_5, - .pm_perfctr = AMD_PMC_PERFCTR_5 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_0, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_1, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_2, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_3, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_3 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_4, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_4 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_5, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_5 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_0, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_1, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_2, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_3, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_3 - } + PMCDESC(AMD_PMC_EVSEL_0, AMD_PMC_PERFCTR_0), + PMCDESC(AMD_PMC_EVSEL_1, AMD_PMC_PERFCTR_1), + PMCDESC(AMD_PMC_EVSEL_2, AMD_PMC_PERFCTR_2), + PMCDESC(AMD_PMC_EVSEL_3, AMD_PMC_PERFCTR_3), + PMCDESC(AMD_PMC_EVSEL_4, AMD_PMC_PERFCTR_4), + PMCDESC(AMD_PMC_EVSEL_5, AMD_PMC_PERFCTR_5), + PMCDESC(AMD_PMC_EVSEL_EP_L3_0, AMD_PMC_PERFCTR_EP_L3_0), + PMCDESC(AMD_PMC_EVSEL_EP_L3_1, AMD_PMC_PERFCTR_EP_L3_1), + PMCDESC(AMD_PMC_EVSEL_EP_L3_2, AMD_PMC_PERFCTR_EP_L3_2), + PMCDESC(AMD_PMC_EVSEL_EP_L3_3, AMD_PMC_PERFCTR_EP_L3_3), + PMCDESC(AMD_PMC_EVSEL_EP_L3_4, AMD_PMC_PERFCTR_EP_L3_4), + PMCDESC(AMD_PMC_EVSEL_EP_L3_5, AMD_PMC_PERFCTR_EP_L3_5), + PMCDESC(AMD_PMC_EVSEL_EP_DF_0, AMD_PMC_PERFCTR_EP_DF_0), + PMCDESC(AMD_PMC_EVSEL_EP_DF_1, AMD_PMC_PERFCTR_EP_DF_1), + PMCDESC(AMD_PMC_EVSEL_EP_DF_2, AMD_PMC_PERFCTR_EP_DF_2), + PMCDESC(AMD_PMC_EVSEL_EP_DF_3, AMD_PMC_PERFCTR_EP_DF_3) }; struct amd_event_code_map { From nobody Wed Oct 18 18:06:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0q4LKwz4xL2N; Wed, 18 Oct 2023 18:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9f0q1pBdz4dyF; Wed, 18 Oct 2023 18:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjBRFAaI3MGJeLGh956aDhJHOQ3uFW2TB1Mr40lAjVA=; b=X8LcSJjvJg6t1LsKzOsflvPIqUTUyavLdtWPgogASGMQ/NHREN3wTz1e+W6vnya+OqXiR4 cLuegyeHqhClEgxmb5F++zPKXJ7T1z1NyvbbLR4QnWaYkKMTb8RBmWZguFFB8B5kNjuYMb vmEZ9un7MlmjhEDayTNbFrZgHjsxjYvbO9MQmvd6gAenzvsHUg/O52akCzqF17upJIMAj9 Th0YKQm5lmc0uxQ8ZQEZY8cbMIyBBxEM2lIaR2fguHcRcuw+AeKMS9knnPaGatC4JA/NKV oDy9FhkHzxrjFbf4ocJH3CqalT9JUpMpD53P7NXecoxPIW2autB5Rzw4Vaq2kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652363; a=rsa-sha256; cv=none; b=ON0vpc2TbMo0gXUqv52BqxVChcl+Bf44q+lrIkd01W6SxEOH/PpbxoNCPrNazn6oolm9qj RmD1vBJU4l9MAjmZCr/OEM5rdKjN0wa0XWhOsf0A/D9oObUmwicqIYhK4uxX8qXdGATpWZ s0kfTYzs+KOznlmva4VBkvS/o2VLTaj3WXyAhGSMsMRu6Z38y5sAJk3GGtYIYK1xXg5LsU /iq7grrUb3esrA1DjRSjFrR8rG5APkMg9AcOl8A1R51s7waWnN0teNE9NTVHpxM23O0n2W c42OQPOXuR31kG1rN/PbOBiR0mB1Ger6V0dWaFyyHkMIU6tjZmcPE9op3ARiAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjBRFAaI3MGJeLGh956aDhJHOQ3uFW2TB1Mr40lAjVA=; b=QBlp2OYQugm9wQ9SkFZQxajWnJbn+rsgKrc79nOZhL2cshzrFa2Rldi2QVK1vdxNfb0mJL zVo4R7V+94HZOSKX7VyMgMATfu6gxdO32vy2swF9Qmjaf1KYrWlsrv08CWdETs0lTfs2vz Rk0EriLfjGkB0sOaW2s27jHEp623+YEt/4QjV4yFVB3K+MkwBOtia/6kbJU3YcAyolzR4N c0t6nqy1hHBf3K1vknuA9MKi5K6KRKKx2S+bfUXaf0FFFIBP8LRsXANYq4/8k9i0vQv1Gi fvOTIw/k48cdtZaXyWTZafTsISwE3rW+8FqHR2iCzpTM7BdKHrxhgB5QzBN03w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0p6rQHz1td; Wed, 18 Oct 2023 18:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II62nZ045963; Wed, 18 Oct 2023 18:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II623k045960; Wed, 18 Oct 2023 18:06:02 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:02 GMT Message-Id: <202310181806.39II623k045960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2c6f474ee824 - main - hwpmc_amd: kill off k7 support bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c6f474ee824bf0742958984e095f5633860a909 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6f474ee824bf0742958984e095f5633860a909 commit 2c6f474ee824bf0742958984e095f5633860a909 Author: Mitchell Horne AuthorDate: 2023-10-18 17:54:24 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:45 +0000 hwpmc_amd: kill off k7 support bits This is i386-only, and has been effectively disabled since 2018 when the companion support was removed from libpmc (e92a1350b50e). Remove the kernel support to simplify the AMD class. Reviewed by: jkoshy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41274 --- sys/dev/hwpmc/hwpmc_amd.c | 110 ++++++---------------------------------------- sys/dev/hwpmc/hwpmc_amd.h | 2 +- 2 files changed, 14 insertions(+), 98 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 367f9d0ceebf..01a6cf202b4d 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -30,8 +30,7 @@ * SUCH DAMAGE. */ -#include -/* Support for the AMD K7 and later processors */ +/* Support for the AMD K8 and later processors */ #include #include @@ -48,15 +47,11 @@ #include #include -#ifdef HWPMC_DEBUG -enum pmc_class amd_pmc_class; -#endif - #define OVERFLOW_WAIT_COUNT 50 DPCPU_DEFINE_STATIC(uint32_t, nmi_counter); -/* AMD K7 & K8 PMCs */ +/* AMD K8 PMCs */ struct amd_descr { struct pmc_descr pm_descr; /* "base class" */ uint32_t pm_evsel; /* address of EVSEL register */ @@ -68,7 +63,7 @@ struct amd_descr { { \ .pm_descr = { \ .pd_name = "", \ - .pd_class = -1, \ + .pd_class = PMC_CLASS_K8, \ .pd_caps = AMD_PMC_CAPS, \ .pd_width = 48 \ }, \ @@ -103,35 +98,6 @@ struct amd_event_code_map { }; const struct amd_event_code_map amd_event_codes[] = { -#if defined(__i386__) /* 32 bit Athlon (K7) only */ - { PMC_EV_K7_DC_ACCESSES, 0x40, 0 }, - { PMC_EV_K7_DC_MISSES, 0x41, 0 }, - { PMC_EV_K7_DC_REFILLS_FROM_L2, 0x42, AMD_PMC_UNITMASK_MOESI }, - { PMC_EV_K7_DC_REFILLS_FROM_SYSTEM, 0x43, AMD_PMC_UNITMASK_MOESI }, - { PMC_EV_K7_DC_WRITEBACKS, 0x44, AMD_PMC_UNITMASK_MOESI }, - { PMC_EV_K7_L1_DTLB_MISS_AND_L2_DTLB_HITS, 0x45, 0 }, - { PMC_EV_K7_L1_AND_L2_DTLB_MISSES, 0x46, 0 }, - { PMC_EV_K7_MISALIGNED_REFERENCES, 0x47, 0 }, - - { PMC_EV_K7_IC_FETCHES, 0x80, 0 }, - { PMC_EV_K7_IC_MISSES, 0x81, 0 }, - - { PMC_EV_K7_L1_ITLB_MISSES, 0x84, 0 }, - { PMC_EV_K7_L1_L2_ITLB_MISSES, 0x85, 0 }, - - { PMC_EV_K7_RETIRED_INSTRUCTIONS, 0xC0, 0 }, - { PMC_EV_K7_RETIRED_OPS, 0xC1, 0 }, - { PMC_EV_K7_RETIRED_BRANCHES, 0xC2, 0 }, - { PMC_EV_K7_RETIRED_BRANCHES_MISPREDICTED, 0xC3, 0 }, - { PMC_EV_K7_RETIRED_TAKEN_BRANCHES, 0xC4, 0 }, - { PMC_EV_K7_RETIRED_TAKEN_BRANCHES_MISPREDICTED, 0xC5, 0 }, - { PMC_EV_K7_RETIRED_FAR_CONTROL_TRANSFERS, 0xC6, 0 }, - { PMC_EV_K7_RETIRED_RESYNC_BRANCHES, 0xC7, 0 }, - { PMC_EV_K7_INTERRUPTS_MASKED_CYCLES, 0xCD, 0 }, - { PMC_EV_K7_INTERRUPTS_MASKED_WHILE_PENDING_CYCLES, 0xCE, 0 }, - { PMC_EV_K7_HARDWARE_INTERRUPTS, 0xCF, 0 }, -#endif - { PMC_EV_K8_FP_DISPATCHED_FPU_OPS, 0x00, 0x3F }, { PMC_EV_K8_FP_CYCLES_WITH_NO_FPU_OPS_RETIRED, 0x01, 0x00 }, { PMC_EV_K8_FP_DISPATCHED_FPU_FAST_FLAG_OPS, 0x02, 0x00 }, @@ -264,12 +230,6 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) PMCDBG2(MDP, REA, 1, "amd-read id=%d class=%d", ri, pd->pm_descr.pd_class); -#ifdef HWPMC_DEBUG - KASSERT(pd->pm_descr.pd_class == amd_pmc_class, - ("[amd,%d] unknown PMC class (%d)", __LINE__, - pd->pm_descr.pd_class)); -#endif - tmp = rdmsr(pd->pm_perfctr); /* RDMSR serializes */ PMCDBG2(MDP, REA, 2, "amd-read (pre-munge) id=%d -> %jd", ri, tmp); if (PMC_IS_SAMPLING_MODE(mode)) { @@ -310,12 +270,6 @@ amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) pd = &amd_pmcdesc[ri]; mode = PMC_TO_MODE(pm); -#ifdef HWPMC_DEBUG - KASSERT(pd->pm_descr.pd_class == amd_pmc_class, - ("[amd,%d] unknown PMC class (%d)", __LINE__, - pd->pm_descr.pd_class)); -#endif - /* use 2's complement of the count for sampling mode PMCs */ if (PMC_IS_SAMPLING_MODE(mode)) v = AMD_RELOAD_COUNT_TO_PERFCTR_VALUE(v); @@ -510,12 +464,6 @@ amd_release_pmc(int cpu, int ri, struct pmc *pmc __unused) KASSERT(phw->phw_pmc == NULL, ("[amd,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); -#ifdef HWPMC_DEBUG - pd = &amd_pmcdesc[ri]; - if (pd->pm_descr.pd_class == amd_pmc_class) - KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), - ("[amd,%d] PMC %d released while active", __LINE__, ri)); -#endif return (0); } @@ -749,7 +697,7 @@ amd_pcpu_init(struct pmc_mdep *md, int cpu) struct amd_cpu *pac; struct pmc_cpu *pc; struct pmc_hw *phw; - int classindex, first_ri, n; + int first_ri, n; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number %d", __LINE__, cpu)); @@ -764,13 +712,7 @@ amd_pcpu_init(struct pmc_mdep *md, int cpu) * state and initialize pointers in the MI per-cpu descriptor. */ pc = pmc_pcpu[cpu]; -#if defined(__amd64__) - classindex = PMC_MDEP_CLASS_INDEX_K8; -#elif defined(__i386__) - classindex = md->pmd_cputype == PMC_CPU_AMD_K8 ? - PMC_MDEP_CLASS_INDEX_K8 : PMC_MDEP_CLASS_INDEX_K7; -#endif - first_ri = md->pmd_classdep[classindex].pcd_ri; + first_ri = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_K8].pcd_ri; KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu pointer", __LINE__)); @@ -793,7 +735,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) struct amd_cpu *pac; struct pmc_cpu *pc; uint32_t evsel; - int classindex, first_ri, i; + int first_ri, i; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number (%d)", __LINE__, cpu)); @@ -829,13 +771,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) pc = pmc_pcpu[cpu]; KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu state", __LINE__)); -#ifdef __amd64__ - classindex = PMC_MDEP_CLASS_INDEX_K8; -#else - classindex = md->pmd_cputype == PMC_CPU_AMD_K8 ? PMC_MDEP_CLASS_INDEX_K8 : - PMC_MDEP_CLASS_INDEX_K7; -#endif - first_ri = md->pmd_classdep[classindex].pcd_ri; + first_ri = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_K8].pcd_ri; /* * Reset pointers in the MI 'per-cpu' state. @@ -855,10 +791,8 @@ pmc_amd_initialize(void) { struct pmc_classdep *pcd; struct pmc_mdep *pmc_mdep; - char *name; enum pmc_cputype cputype; - enum pmc_class class; - int classindex, error, i, ncpus; + int error, i, ncpus; int family, model, stepping; /* @@ -869,7 +803,6 @@ pmc_amd_initialize(void) * field returned by CPUID for instruction family >= 6. */ - name = NULL; family = CPUID_TO_FAMILY(cpu_id); model = CPUID_TO_MODEL(cpu_id); stepping = CPUID_TO_STEPPING(cpu_id); @@ -882,31 +815,15 @@ pmc_amd_initialize(void) family, model, stepping); switch (cpu_id & 0xF00) { -#ifdef __i386__ - case 0x600: /* Athlon(tm) processor */ - classindex = PMC_MDEP_CLASS_INDEX_K7; - cputype = PMC_CPU_AMD_K7; - class = PMC_CLASS_K7; - name = "K7"; - break; -#endif case 0xF00: /* Athlon64/Opteron processor */ - classindex = PMC_MDEP_CLASS_INDEX_K8; cputype = PMC_CPU_AMD_K8; - class = PMC_CLASS_K8; - name = "K8"; break; - default: printf("pmc: Unknown AMD CPU %x %d-%d.\n", cpu_id, family, model); return (NULL); } -#ifdef HWPMC_DEBUG - amd_pmc_class = class; -#endif - /* * Allocate space for pointers to PMC HW descriptors and for * the MDEP structure used by MI code. @@ -927,20 +844,19 @@ pmc_amd_initialize(void) if (error != 0) goto error; - /* Initialize AMD K7 and K8 PMC handling. */ - pcd = &pmc_mdep->pmd_classdep[classindex]; + /* Initialize AMD K8 PMC handling. */ + pcd = &pmc_mdep->pmd_classdep[PMC_MDEP_CLASS_INDEX_K8]; pcd->pcd_caps = AMD_PMC_CAPS; - pcd->pcd_class = class; + pcd->pcd_class = PMC_CLASS_K8; pcd->pcd_num = AMD_NPMCS; pcd->pcd_ri = pmc_mdep->pmd_npmc; pcd->pcd_width = 48; /* fill in the correct pmc name and class */ for (i = 0; i < AMD_NPMCS; i++) { - snprintf(amd_pmcdesc[i].pm_descr.pd_name, PMC_NAME_MAX, "%s-%d", - name, i); - amd_pmcdesc[i].pm_descr.pd_class = class; + snprintf(amd_pmcdesc[i].pm_descr.pd_name, PMC_NAME_MAX, "K8-%d", + i); } pcd->pcd_allocate_pmc = amd_allocate_pmc; diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h index eeea7536a2c5..d72fbc4878b6 100644 --- a/sys/dev/hwpmc/hwpmc_amd.h +++ b/sys/dev/hwpmc/hwpmc_amd.h @@ -31,7 +31,7 @@ #ifndef _DEV_HWPMC_AMD_H_ #define _DEV_HWPMC_AMD_H_ 1 -/* AMD K7 and K8 PMCs */ +/* AMD K8 PMCs */ #define AMD_PMC_EVSEL_0 0xC0010000 #define AMD_PMC_EVSEL_1 0xC0010001 From nobody Wed Oct 18 18:06:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0r29pZz4xL2P; Wed, 18 Oct 2023 18:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9f0r1pDQz4f8d; Wed, 18 Oct 2023 18:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcbZaFBWsNt/wO0bB82CUt3MO9S73qfk+PeL5Goso68=; b=INz3sPje8ICa5MAe5WDnJ63J6BaExgo+0NTjjFNlxPXY8bLcRyvNLG3g2xpOXQvvNUuO4r 6b9OjsOrX9/DEd4oTi+BbFgUgXuIK/3MNTuryNcnvUaqTK9/ZQtofFnNA35BDbZyoj1knZ //kKlvFi/5cT9BbxgulSPnrLNiSzmLNAfEZ0C4W3d9y9QJm6EWRMa4xybtc2f5PK14BLVW WPm6NMh/rOSsWkbqJMSwg9X8q7q05FNzlvuBRwTpzAYeEIEQyPCfN5oghSoRJunKVRPBuF 6+KkqbIXl7yWYyUEJcQ6CB+KiDna6cZisbL7sph0hMuViZiab+0l0qGn0yAEBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652364; a=rsa-sha256; cv=none; b=yXXW6Y3DKOeGmOU2we7b36pCFmobY8xnRJTeaMGJzw9ZSsBUI36qtSLwQpVW3JVeoWI789 hQcWer4+PUKOUKeaHsO1YihmfIZtSez20wfPLO3e4HI2KulUXcVu2E3CoHKTZBzRHmZ3bZ ZqZN7ivqd2OaCTZGzo1AWtrajD24Hvfct1/iSoBU2MVOyrBMRoo5GKuNi4m6NpTmOx4HM/ ftNHIq0JaO7yTXx+1wJsfHS+tTWXqeocPIpf+BilS53K4E2RwWmYH22zpesxNm051I+Wwz LDvNGkwRJbW+uSy7B2w6pFKwzFFyS+Monp3mUXcXiCuGyBOO2kIlkftXIe7u9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcbZaFBWsNt/wO0bB82CUt3MO9S73qfk+PeL5Goso68=; b=JoxrbL94AVcEH5vDUYtnx5MYKkCxYJn3HdUyTtkzlB7kbG30+Ov25L68Y2j0cb/nZKOMip sUmmv9khGkfK6n8kQSRQDFbA6xWP/1VX8xx9ubSTXFOwMXMoOJjR801PTfINBhgsslCeGY dhn6zAzG7+oaM+3KRgswUMJsZBorHzgxOcv6g22wc4D31eHQ0F6P6oA8nS1NNal2OHmF4X 9IaxVCcyxiIUUugG+Dsv+gLc5XHi3nOPye/axbQiXgH5TQs8LJ8pwYTF7ayCp6q9jGaphO BWXSgyuhbWQZZ/vlXwfGIifPLiIBYz0yKBvGfa0FAeLvsB8jfAEccedYBmkkug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0r0kbLz2L5; Wed, 18 Oct 2023 18:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II64JG046021; Wed, 18 Oct 2023 18:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II64VE046018; Wed, 18 Oct 2023 18:06:04 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:04 GMT Message-Id: <202310181806.39II64VE046018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 82d6d46d0d1d - main - pmc: remove last bits of AMD K7 CPU support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82d6d46d0d1dbdaa32c754f97e94a772d01cb26c Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=82d6d46d0d1dbdaa32c754f97e94a772d01cb26c commit 82d6d46d0d1dbdaa32c754f97e94a772d01cb26c Author: Mitchell Horne AuthorDate: 2023-10-18 17:56:41 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:45 +0000 pmc: remove last bits of AMD K7 CPU support This includes event definitions from sys/pmc_events.h, definitions from sys/pmc.h, and the man pages. Reviewed by: jkoshy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41275 --- ObsoleteFiles.inc | 3 + lib/libpmc/Makefile | 1 - lib/libpmc/pmc.3 | 11 +- lib/libpmc/pmc.atom.3 | 1 - lib/libpmc/pmc.atomsilvermont.3 | 1 - lib/libpmc/pmc.cmn-600.3 | 1 - lib/libpmc/pmc.core.3 | 1 - lib/libpmc/pmc.core2.3 | 1 - lib/libpmc/pmc.corei7.3 | 1 - lib/libpmc/pmc.corei7uc.3 | 1 - lib/libpmc/pmc.dmc-620.3 | 1 - lib/libpmc/pmc.haswell.3 | 1 - lib/libpmc/pmc.haswelluc.3 | 1 - lib/libpmc/pmc.haswellxeon.3 | 1 - lib/libpmc/pmc.iaf.3 | 1 - lib/libpmc/pmc.ivybridge.3 | 1 - lib/libpmc/pmc.ivybridgexeon.3 | 1 - lib/libpmc/pmc.k7.3 | 260 ------------------------------- lib/libpmc/pmc.k8.3 | 1 - lib/libpmc/pmc.sandybridge.3 | 1 - lib/libpmc/pmc.sandybridgeuc.3 | 1 - lib/libpmc/pmc.sandybridgexeon.3 | 1 - lib/libpmc/pmc.soft.3 | 1 - lib/libpmc/pmc.tsc.3 | 1 - lib/libpmc/pmc.ucf.3 | 1 - lib/libpmc/pmc.westmere.3 | 1 - lib/libpmc/pmc.westmereuc.3 | 1 - sys/dev/hwpmc/pmc_events.h | 37 +---- sys/sys/pmc.h | 4 +- tools/build/mk/OptionalObsoleteFiles.inc | 1 - 30 files changed, 6 insertions(+), 334 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f54e13ea3d2d..749b6dfd7ca0 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231018: pmc.k7(3) removed +OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz + # 20231018: Remove misspelled man page link OLD_FILES+=usr/share/man/man3/dbm_dirnfo.3.gz diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index 5deff06270f7..f4c02968e806 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -76,7 +76,6 @@ MAN+= pmc.haswellxeon.3 MAN+= pmc.iaf.3 MAN+= pmc.ivybridge.3 MAN+= pmc.ivybridgexeon.3 -MAN+= pmc.k7.3 MAN+= pmc.k8.3 MAN+= pmc.sandybridge.3 MAN+= pmc.sandybridgeuc.3 diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3 index d2be8f6c3a6d..25e534e52b23 100644 --- a/lib/libpmc/pmc.3 +++ b/lib/libpmc/pmc.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 16, 2023 +.Dd June 23, 2023 .Dt PMC 3 .Os .Sh NAME @@ -130,9 +130,6 @@ enumeration. Supported CPUs include: .Pp .Bl -tag -width "Li PMC_CPU_ARMV7_CORTEX_A15" -compact -.It Li PMC_CPU_AMD_K7 -.Tn "AMD Athlon" -CPUs. .It Li PMC_CPU_AMD_K8 .Tn "AMD Athlon64" CPUs. @@ -227,10 +224,6 @@ performance measurement architecture version 2 and later. Programmable hardware counters present in CPUs conforming to the .Tn Intel performance measurement architecture version 1 and later. -.It Li PMC_CLASS_K7 -Programmable hardware counters present in -.Tn "AMD Athlon" -CPUs. .It Li PMC_CLASS_K8 Programmable hardware counters present in .Tn "AMD Athlon64" @@ -498,7 +491,6 @@ following manual pages: .It Em "PMC Class" Ta Em "Manual Page" .It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 .It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 -.It Li PMC_CLASS_K7 Ta Xr pmc.k7 3 .It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 .It Li PMC_CLASS_TSC Ta Xr pmc.tsc 3 .El @@ -551,7 +543,6 @@ Doing otherwise is unsupported. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3 index 34cd4a646e6c..0819525321f4 100644 --- a/lib/libpmc/pmc.atom.3 +++ b/lib/libpmc/pmc.atom.3 @@ -1170,7 +1170,6 @@ and the underlying hardware events used on these CPUs. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.atomsilvermont.3 b/lib/libpmc/pmc.atomsilvermont.3 index 975e4310e61a..72baa6453565 100644 --- a/lib/libpmc/pmc.atomsilvermont.3 +++ b/lib/libpmc/pmc.atomsilvermont.3 @@ -508,7 +508,6 @@ The number of times the MSROM starts a flow of UOPS. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.cmn-600.3 b/lib/libpmc/pmc.cmn-600.3 index fc137d2df48e..1fa75a674c0b 100644 --- a/lib/libpmc/pmc.cmn-600.3 +++ b/lib/libpmc/pmc.cmn-600.3 @@ -560,7 +560,6 @@ Average latency to form a TX TLP .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3 index 43a46633806f..4ee4b4c9235d 100644 --- a/lib/libpmc/pmc.core.3 +++ b/lib/libpmc/pmc.core.3 @@ -785,7 +785,6 @@ may not count some transitions. .Xr pmc.atom 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3 index 201867bd9ed8..45e4a4c7916d 100644 --- a/lib/libpmc/pmc.core2.3 +++ b/lib/libpmc/pmc.core2.3 @@ -1100,7 +1100,6 @@ and the underlying hardware events used. .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3 index 5f5436745478..ab7a47e79846 100644 --- a/lib/libpmc/pmc.corei7.3 +++ b/lib/libpmc/pmc.corei7.3 @@ -1579,7 +1579,6 @@ Counts number of segment register loads. .Xr pmc.core 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3 index e062302a4e43..ca4283e38c90 100644 --- a/lib/libpmc/pmc.corei7uc.3 +++ b/lib/libpmc/pmc.corei7uc.3 @@ -882,7 +882,6 @@ into a power down mode. .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.dmc-620.3 b/lib/libpmc/pmc.dmc-620.3 index 568ff3fab6f0..1fcd6ae9c733 100644 --- a/lib/libpmc/pmc.dmc-620.3 +++ b/lib/libpmc/pmc.dmc-620.3 @@ -130,7 +130,6 @@ The following PMC events are available: .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3 index 736440612886..0e1a4623eda6 100644 --- a/lib/libpmc/pmc.haswell.3 +++ b/lib/libpmc/pmc.haswell.3 @@ -917,7 +917,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.haswelluc.3 b/lib/libpmc/pmc.haswelluc.3 index 42d379a0cb9f..03c37995a41b 100644 --- a/lib/libpmc/pmc.haswelluc.3 +++ b/lib/libpmc/pmc.haswelluc.3 @@ -201,7 +201,6 @@ Number of requests allocated in Coherency Tracker. .Xr pmc.corei7uc 3 , .Xr pmc.haswell 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.haswellxeon.3 b/lib/libpmc/pmc.haswellxeon.3 index 55ff8d061c3a..cd6c71fd6606 100644 --- a/lib/libpmc/pmc.haswellxeon.3 +++ b/lib/libpmc/pmc.haswellxeon.3 @@ -931,7 +931,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3 index b407f4b650c9..0757795c95af 100644 --- a/lib/libpmc/pmc.iaf.3 +++ b/lib/libpmc/pmc.iaf.3 @@ -124,7 +124,6 @@ CPU, use the event specifier .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3 index 95e4e0800650..4b88f95be21c 100644 --- a/lib/libpmc/pmc.ivybridge.3 +++ b/lib/libpmc/pmc.ivybridge.3 @@ -829,7 +829,6 @@ Dirty L2 cache lines evicted by the MLC prefetcher. .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3 index 56e901be26ca..56b2f2f62c0b 100644 --- a/lib/libpmc/pmc.ivybridgexeon.3 +++ b/lib/libpmc/pmc.ivybridgexeon.3 @@ -862,7 +862,6 @@ Dirty L2 cache lines filling the L2. .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.k7.3 b/lib/libpmc/pmc.k7.3 deleted file mode 100644 index 0c2c158cf956..000000000000 --- a/lib/libpmc/pmc.k7.3 +++ /dev/null @@ -1,260 +0,0 @@ -.\" Copyright (c) 2003-2008 Joseph Koshy. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd October 4, 2008 -.Dt PMC.K7 3 -.Os -.Sh NAME -.Nm pmc.k7 -.Nd measurement events for -.Tn AMD -.Tn Athlon -(K7 family) CPUs -.Sh LIBRARY -.Lb libpmc -.Sh SYNOPSIS -.In pmc.h -.Sh DESCRIPTION -AMD K7 PMCs are present in the -.Tn "AMD Athlon" -series of CPUs and are documented in: -.Rs -.%B "AMD Athlon Processor x86 Code Optimization Guide" -.%N "Publication No. 22007" -.%D "February 2002" -.%Q "Advanced Micro Devices, Inc." -.Re -.Ss PMC Features -AMD K7 PMCs are 48 bits wide. -Each K7 CPU contains 4 PMCs with the following capabilities: -.Bl -column "PMC_CAP_INTERRUPT" "Support" -.It Em Capability Ta Em Support -.It PMC_CAP_CASCADE Ta \&No -.It PMC_CAP_EDGE Ta Yes -.It PMC_CAP_INTERRUPT Ta Yes -.It PMC_CAP_INVERT Ta Yes -.It PMC_CAP_READ Ta Yes -.It PMC_CAP_PRECISE Ta \&No -.It PMC_CAP_SYSTEM Ta Yes -.It PMC_CAP_TAGGING Ta \&No -.It PMC_CAP_THRESHOLD Ta Yes -.It PMC_CAP_USER Ta Yes -.It PMC_CAP_WRITE Ta Yes -.El -.Ss Event Qualifiers -Event specifiers for AMD K7 PMCs can have the following optional -qualifiers: -.Bl -tag -width indent -.It Li count= Ns Ar value -Configure the counter to increment only if the number of configured -events measured in a cycle is greater than or equal to -.Ar value . -.It Li edge -Configure the counter to only count negated-to-asserted transitions -of the conditions expressed by the other qualifiers. -In other words, the counter will increment only once whenever a given -condition becomes true, irrespective of the number of clocks during -which the condition remains true. -.It Li inv -Invert the sense of comparison when the -.Dq Li count -qualifier is present, making the counter to increment when the -number of events per cycle is less than the value specified by -the -.Dq Li count -qualifier. -.It Li os -Configure the PMC to count events happening at privilege level 0. -.It Li unitmask= Ns Ar mask -This qualifier is used to further qualify a select few events, -.Dq Li k7-dc-refills-from-l2 , -.Dq Li k7-dc-refills-from-system -and -.Dq Li k7-dc-writebacks . -Here -.Ar mask -is a string of the following characters optionally separated by -.Ql + -characters: -.Pp -.Bl -tag -width indent -compact -.It Li m -Count operations for lines in the -.Dq Modified -state. -.It Li o -Count operations for lines in the -.Dq Owner -state. -.It Li e -Count operations for lines in the -.Dq Exclusive -state. -.It Li s -Count operations for lines in the -.Dq Shared -state. -.It Li i -Count operations for lines in the -.Dq Invalid -state. -.El -.Pp -If no -.Dq Li unitmask -qualifier is specified, the default is to count events for caches -lines in any of the above states. -.It Li usr -Configure the PMC to count events occurring at privilege levels 1, 2 -or 3. -.El -.Pp -If neither of the -.Dq Li os -or -.Dq Li usr -qualifiers were specified, the default is to enable both. -.Ss AMD K7 Event Specifiers -The event specifiers supported on AMD K7 PMCs are: -.Bl -tag -width indent -.It Li k7-dc-accesses -.Pq Event 40H -Count data cache accesses. -.It Li k7-dc-misses -.Pq Event 41H -Count data cache misses. -.It Li k7-dc-refills-from-l2 Op Li ,unitmask= Ns Ar mask -.Pq Event 42H -Count data cache refills from L2 cache. -This event may be further qualified using the -.Dq Li unitmask -qualifier. -.It Li k7-dc-refills-from-system Op Li ,unitmask= Ns Ar mask -.Pq Event 43H -Count data cache refills from system memory. -This event may be further qualified using the -.Dq Li unitmask -qualifier. -.It Li k7-dc-writebacks Op Li ,unitmask= Ns Ar mask -.Pq Event 44H -Count data cache writebacks. -This event may be further qualified using the -.Dq Li unitmask -qualifier. -.It Li k7-hardware-interrupts -.Pq Event CFH -Count the number of taken hardware interrupts. -.It Li k7-ic-fetches -.Pq Event 80H -Count instruction cache fetches. -.It Li k7-ic-misses -.Pq Event 81H -Count instruction cache misses. -.It Li k7-interrupts-masked-cycles -.Pq Event CDH -Count the number of cycles when the processor's -.Va IF -flag was zero. -.It Li k7-interrupts-masked-while-pending-cycles -.Pq Event CEH -Count the number of cycles interrupts were masked while pending due -to the processor's -.Va IF -flag being zero. -.It Li k7-l1-and-l2-dtlb-misses -.Pq Event 46H -Count L1 and L2 DTLB misses. -.It Li k7-l1-dtlb-miss-and-l2-dtlb-hits -.Pq Event 45H -Count L1 DTLB misses and L2 DTLB hits. -.It Li k7-l1-itlb-misses -.Pq Event 84H -Count L1 ITLB misses that are L2 ITLB hits. -.It Li k7-l1-l2-itlb-misses -.Pq Event 85H -Count L1 (and L2) ITLB misses. -.It Li k7-misaligned-references -.Pq Event 47H -Count misaligned data references. -.It Li k7-retired-branches -.Pq Event C2H -Count all retired branches (conditional, unconditional, exceptions -and interrupts). -.It Li k7-retired-branches-mispredicted -.Pq Event C3H -Count all mispredicted retired branches. -.It Li k7-retired-far-control-transfers -.Pq Event C6H -Count retired far control transfers. -.It Li k7-retired-instructions -.Pq Event C0H -Count all retired instructions. -.It Li k7-retired-ops -.Pq Event C1H -Count retired ops. -.It Li k7-retired-resync-branches -.Pq Event C7H -Count retired resync branches (non control transfer branches). -.It Li k7-retired-taken-branches -.Pq Event C4H -Count retired taken branches. -.It Li k7-retired-taken-branches-mispredicted -.Pq Event C5H -Count mispredicted taken branches that were retired. -.El -.Ss Event Name Aliases -The following table shows the mapping between the PMC-independent -aliases supported by -.Lb libpmc -and the underlying hardware events used. -.Bl -column "branch-mispredicts" "Description" -.It Em Alias Ta Em Event -.It Li branches Ta Li k7-retired-branches -.It Li branch-mispredicts Ta Li k7-retired-branches-mispredicted -.It Li dc-misses Ta Li k7-dc-misses -.It Li ic-misses Ta Li k7-ic-misses -.It Li instructions Ta Li k7-retired-instructions -.It Li interrupts Ta Li k7-hardware-interrupts -.It Li unhalted-cycles Ta (unsupported) -.El -.Sh SEE ALSO -.Xr pmc 3 , -.Xr pmc.atom 3 , -.Xr pmc.core 3 , -.Xr pmc.core2 3 , -.Xr pmc.iaf 3 , -.Xr pmc.k8 3 , -.Xr pmc.soft 3 , -.Xr pmc.tsc 3 , -.Xr pmclog 3 , -.Xr hwpmc 4 -.Sh HISTORY -The -.Nm pmc -library first appeared in -.Fx 6.0 . -.Sh AUTHORS -The -.Lb libpmc -library was written by -.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org . diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.k8.3 index 96cc7f5ef058..29571aa1c097 100644 --- a/lib/libpmc/pmc.k8.3 +++ b/lib/libpmc/pmc.k8.3 @@ -776,7 +776,6 @@ and the underlying hardware events used. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmclog 3 , diff --git a/lib/libpmc/pmc.sandybridge.3 b/lib/libpmc/pmc.sandybridge.3 index 4f5b6c779efa..5672cfbcd958 100644 --- a/lib/libpmc/pmc.sandybridge.3 +++ b/lib/libpmc/pmc.sandybridge.3 @@ -909,7 +909,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.sandybridgeuc.3 b/lib/libpmc/pmc.sandybridgeuc.3 index 072794bca757..080c9f31ffee 100644 --- a/lib/libpmc/pmc.sandybridgeuc.3 +++ b/lib/libpmc/pmc.sandybridgeuc.3 @@ -200,7 +200,6 @@ Counts the number of core-outgoing entries in the coherent tracker queue. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3 index f823537421f0..3d238bbad2de 100644 --- a/lib/libpmc/pmc.sandybridgexeon.3 +++ b/lib/libpmc/pmc.sandybridgexeon.3 @@ -986,7 +986,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3 index ce965caa2f02..dcbf8d904838 100644 --- a/lib/libpmc/pmc.soft.3 +++ b/lib/libpmc/pmc.soft.3 @@ -89,7 +89,6 @@ Write page fault. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3 index 59fcdc1898d1..c613433eb0f1 100644 --- a/lib/libpmc/pmc.tsc.3 +++ b/lib/libpmc/pmc.tsc.3 @@ -61,7 +61,6 @@ maps to the TSC. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmclog 3 , diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3 index d39b0e8f0db7..7604e915d384 100644 --- a/lib/libpmc/pmc.ucf.3 +++ b/lib/libpmc/pmc.ucf.3 @@ -87,7 +87,6 @@ offset C0H under device number 0 and Function 0. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3 index 1d7c206f25c3..00aaa0b74338 100644 --- a/lib/libpmc/pmc.westmere.3 +++ b/lib/libpmc/pmc.westmere.3 @@ -1372,7 +1372,6 @@ Counts number of SID integer 64 bit shift or move operations. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3 index d9574be03422..67b21ef42f84 100644 --- a/lib/libpmc/pmc.westmereuc.3 +++ b/lib/libpmc/pmc.westmereuc.3 @@ -1076,7 +1076,6 @@ disabled. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h index 73362baa7e9c..ab157cb05dcf 100644 --- a/sys/dev/hwpmc/pmc_events.h +++ b/sys/dev/hwpmc/pmc_events.h @@ -62,39 +62,6 @@ __PMC_EV_ALIAS("cycles", TSC_TSC) #define PMC_EV_SOFT_FIRST 0x20000 #define PMC_EV_SOFT_LAST (PMC_EV_SOFT_FIRST + PMC_EV_DYN_COUNT - 1) -/* - * AMD K7 Events, from "The AMD Athlon(tm) Processor x86 Code - * Optimization Guide" [Doc#22007K, Feb 2002] - */ - -#define __PMC_EV_K7() \ -__PMC_EV(K7, DC_ACCESSES) \ -__PMC_EV(K7, DC_MISSES) \ -__PMC_EV(K7, DC_REFILLS_FROM_L2) \ -__PMC_EV(K7, DC_REFILLS_FROM_SYSTEM) \ -__PMC_EV(K7, DC_WRITEBACKS) \ -__PMC_EV(K7, L1_DTLB_MISS_AND_L2_DTLB_HITS) \ -__PMC_EV(K7, L1_AND_L2_DTLB_MISSES) \ -__PMC_EV(K7, MISALIGNED_REFERENCES) \ -__PMC_EV(K7, IC_FETCHES) \ -__PMC_EV(K7, IC_MISSES) \ -__PMC_EV(K7, L1_ITLB_MISSES) \ -__PMC_EV(K7, L1_L2_ITLB_MISSES) \ -__PMC_EV(K7, RETIRED_INSTRUCTIONS) \ -__PMC_EV(K7, RETIRED_OPS) \ -__PMC_EV(K7, RETIRED_BRANCHES) \ -__PMC_EV(K7, RETIRED_BRANCHES_MISPREDICTED) \ -__PMC_EV(K7, RETIRED_TAKEN_BRANCHES) \ -__PMC_EV(K7, RETIRED_TAKEN_BRANCHES_MISPREDICTED) \ -__PMC_EV(K7, RETIRED_FAR_CONTROL_TRANSFERS) \ -__PMC_EV(K7, RETIRED_RESYNC_BRANCHES) \ -__PMC_EV(K7, INTERRUPTS_MASKED_CYCLES) \ -__PMC_EV(K7, INTERRUPTS_MASKED_WHILE_PENDING_CYCLES) \ -__PMC_EV(K7, HARDWARE_INTERRUPTS) - -#define PMC_EV_K7_FIRST PMC_EV_K7_DC_ACCESSES -#define PMC_EV_K7_LAST PMC_EV_K7_HARDWARE_INTERRUPTS - /* AMD K8 PMCs */ #define __PMC_EV_K8() \ @@ -2431,7 +2398,7 @@ __PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF) * START #EVENTS DESCRIPTION * 0 0x1000 Reserved * 0x1000 0x0001 TSC - * 0x2000 0x0080 AMD K7 events + * 0x2000 0x0080 free (was AMD K7 events) * 0x2080 0x0100 AMD K8 events * 0x10000 0x0080 INTEL architectural fixed-function events * 0x10080 0x0F80 free (was INTEL architectural programmable events) @@ -2457,8 +2424,6 @@ __PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF) #define __PMC_EVENTS() \ __PMC_EV_BLOCK(TSC, 0x01000) \ __PMC_EV_TSC() \ - __PMC_EV_BLOCK(K7, 0x02000) \ - __PMC_EV_K7() \ __PMC_EV_BLOCK(K8, 0x02080) \ __PMC_EV_K8() \ __PMC_EV_BLOCK(IAF, 0x10000) \ diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 714d8a7c65b7..5c0067121305 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -81,7 +81,6 @@ extern char pmc_cpuid[PMC_CPUID_LEN]; * Please keep the pmc(3) manual page in sync with this list. */ #define __PMC_CPUS() \ - __PMC_CPU(AMD_K7, 0x00, "AMD K7") \ __PMC_CPU(AMD_K8, 0x01, "AMD K8") \ __PMC_CPU(INTEL_CORE, 0x87, "Intel Core Solo/Duo") \ __PMC_CPU(INTEL_CORE2, 0x88, "Intel Core2") \ @@ -130,7 +129,7 @@ enum pmc_cputype { __PMC_CPUS() }; -#define PMC_CPU_FIRST PMC_CPU_AMD_K7 +#define PMC_CPU_FIRST PMC_CPU_AMD_K8 #define PMC_CPU_LAST PMC_CPU_ARMV8_CORTEX_A76 /* @@ -138,7 +137,6 @@ enum pmc_cputype { */ #define __PMC_CLASSES() \ __PMC_CLASS(TSC, 0x00, "CPU Timestamp counter") \ - __PMC_CLASS(K7, 0x01, "AMD K7 performance counters") \ __PMC_CLASS(K8, 0x02, "AMD K8 performance counters") \ __PMC_CLASS(IAF, 0x06, "Intel Core2/Atom, fixed function") \ __PMC_CLASS(IAP, 0x07, "Intel Core...Atom, programmable") \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index eba077e7472c..298a3b2e403e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6810,7 +6810,6 @@ OLD_FILES+=usr/share/man/man3/pmc.haswellxeon.3.gz OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz -OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz From nobody Wed Oct 18 18:06:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0s2sdkz4xL2S; Wed, 18 Oct 2023 18:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9f0s2H3Xz4f6m; Wed, 18 Oct 2023 18:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fB1p0dH9lTYqGXCKShRoKs8UczNyx0hAmNm/qCh8YtI=; b=FlPA9XHZEs3+flmCQewLGTwhTBy6MHqg6jAi3Nf4PI2nPf1vH7UvwLrmXbpO9lyzpkij/E m75NO1IzWP/8nWj//pKrX11h6fjVT4+X76mvCRwuHpTlDR1P00uIJCGFt3puJpP3KD6vSa SGnD1zu3Xh2bXiymMUEAqJj6H91KGNy3jSW7+IJpOwh7NBCdLdvsVxNMCx/arh03osuZn6 cOxvMkYtt4DciSL5LXo6O7v3mbCbhc5/rdyXiNAb/qqPPAFS4f3ACvWDR8umebhJUqzsD5 91IthgUZUC09dE/IMTcGOGkWhWFm78riceCNlKC092JkywhyTg8L1c5T3NKdog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652365; a=rsa-sha256; cv=none; b=K85U0Gkfw3sBxbYlDErFkGxNrc+z9zHtz8ckaHh01m3+DXa12gbyzDlb/gthsn3iwHnZvc Rpc9ZIDSmcyv9PGZLhlVNwlUaaT0I+Cd/JSuHQdtgRDAfCjUbn4OP22l2krhHnhRHVgWxL qytd6XKfM3vIgaeFVNjRalon2RhfL34SByBd5zhfUiOnXjAkUsODm2g1U2NDHyuOYGBUkX rjK6e5oJjBuxUC6Mwejy2GqsqNXNySb8j88liL/HVi5DUjjN451WMmWgCWvu7G5ae1ZC3f FAVhA8GCpmEUr3buDBQFDCj5oTfDmJ+YBvwPJZ8XNoXDySMa1NV7WuOoN9lrow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fB1p0dH9lTYqGXCKShRoKs8UczNyx0hAmNm/qCh8YtI=; b=IPcr7rvmscqLwiVmw3xJxVrWFOOfT3w9xZSqDHNjBGm/BBCewuU4ERJeQ0Fuf1ZRq8RXgF hhqUpKM0d7nMuJvZe7dOCgZ2Dhv+n1EjOHKn1BgYV2Htagynug1ggtDpBvFxFoUokoa7Re 4geSnzYmYGU7vrdJpPPYsJ1RkCz/GNtqyojQ+uLMWjv8fUfC5vZIOLG1jgq7dh5s6rsxEe ylM6EDf4FVIItnB6bDuHf4j9ufj96va233AuNGyxt8klqsTq72jf1V7qwCIRNr74BcnS5M Gmz4drJpyWiL7f8RUPa3AIgU6PxKrtnTvx7HeI+64Tp5qStbqQk2EhFql+wtDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0s1CgFz27Z; Wed, 18 Oct 2023 18:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II65EC046061; Wed, 18 Oct 2023 18:06:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II65jU046058; Wed, 18 Oct 2023 18:06:05 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:05 GMT Message-Id: <202310181806.39II65jU046058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: b293497146fe - main - pmc.amd(3): rename from pmc.k8(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b293497146fea63d76a1c7492c3a21e4e5bf8f48 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b293497146fea63d76a1c7492c3a21e4e5bf8f48 commit b293497146fea63d76a1c7492c3a21e4e5bf8f48 Author: Mitchell Horne AuthorDate: 2023-10-18 17:57:06 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:45 +0000 pmc.amd(3): rename from pmc.k8(3) This is the first step in recognizing that the K8 microarchitecture represents a small and aged subset of AMD CPUs supported by this class. Future changes will update the code and documentation details to better reflect this. Keep the old filename as an alias. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41279 --- lib/libpmc/Makefile | 6 +++++- lib/libpmc/pmc.3 | 4 ++-- lib/libpmc/{pmc.k8.3 => pmc.amd.3} | 5 +++-- lib/libpmc/pmc.atom.3 | 2 +- lib/libpmc/pmc.atomsilvermont.3 | 2 +- lib/libpmc/pmc.cmn-600.3 | 2 +- lib/libpmc/pmc.core.3 | 2 +- lib/libpmc/pmc.core2.3 | 2 +- lib/libpmc/pmc.corei7.3 | 2 +- lib/libpmc/pmc.corei7uc.3 | 2 +- lib/libpmc/pmc.dmc-620.3 | 2 +- lib/libpmc/pmc.haswell.3 | 2 +- lib/libpmc/pmc.haswelluc.3 | 2 +- lib/libpmc/pmc.haswellxeon.3 | 2 +- lib/libpmc/pmc.iaf.3 | 2 +- lib/libpmc/pmc.ivybridge.3 | 2 +- lib/libpmc/pmc.ivybridgexeon.3 | 2 +- lib/libpmc/pmc.sandybridge.3 | 2 +- lib/libpmc/pmc.sandybridgeuc.3 | 2 +- lib/libpmc/pmc.sandybridgexeon.3 | 2 +- lib/libpmc/pmc.soft.3 | 2 +- lib/libpmc/pmc.tsc.3 | 2 +- lib/libpmc/pmc.ucf.3 | 2 +- lib/libpmc/pmc.westmere.3 | 2 +- lib/libpmc/pmc.westmereuc.3 | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 26 files changed, 33 insertions(+), 27 deletions(-) diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index f4c02968e806..34993a428fbd 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -62,6 +62,7 @@ MAN+= pmclog.3 MAN+= pmc.soft.3 # PMC-dependent manual pages +MAN+= pmc.amd.3 MAN+= pmc.atom.3 MAN+= pmc.atomsilvermont.3 MAN+= pmc.cmn-600.3 @@ -76,7 +77,6 @@ MAN+= pmc.haswellxeon.3 MAN+= pmc.iaf.3 MAN+= pmc.ivybridge.3 MAN+= pmc.ivybridgexeon.3 -MAN+= pmc.k8.3 MAN+= pmc.sandybridge.3 MAN+= pmc.sandybridgeuc.3 MAN+= pmc.sandybridgexeon.3 @@ -112,4 +112,8 @@ MLINKS+= \ pmclog.3 pmclog_feed.3 \ pmclog.3 pmclog_read.3 +# Class aliases +MLINKS+= \ + pmc.amd.3 pmc.k8.3 + .include diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3 index 25e534e52b23..9a5b599759ff 100644 --- a/lib/libpmc/pmc.3 +++ b/lib/libpmc/pmc.3 @@ -491,7 +491,7 @@ following manual pages: .It Em "PMC Class" Ta Em "Manual Page" .It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 .It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 -.It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 +.It Li PMC_CLASS_K8 Ta Xr pmc.amd 3 .It Li PMC_CLASS_TSC Ta Xr pmc.tsc 3 .El .Ss Event Name Aliases @@ -534,6 +534,7 @@ driver, applications are urged to dynamically link with the library. Doing otherwise is unsupported. .Sh SEE ALSO +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -543,7 +544,6 @@ Doing otherwise is unsupported. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.amd.3 similarity index 99% rename from lib/libpmc/pmc.k8.3 rename to lib/libpmc/pmc.amd.3 index 29571aa1c097..ee0aae26d42f 100644 --- a/lib/libpmc/pmc.k8.3 +++ b/lib/libpmc/pmc.amd.3 @@ -21,10 +21,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 4, 2008 -.Dt PMC.K8 3 +.Dd 24 June, 2023 +.Dt PMC.AMD 3 .Os .Sh NAME +.Nm pmc.amd .Nm pmc.k8 .Nd measurement events for .Tn AMD diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3 index 0819525321f4..480668e6e6bd 100644 --- a/lib/libpmc/pmc.atom.3 +++ b/lib/libpmc/pmc.atom.3 @@ -1166,11 +1166,11 @@ and the underlying hardware events used on these CPUs. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atomsilvermont 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.atomsilvermont.3 b/lib/libpmc/pmc.atomsilvermont.3 index 72baa6453565..cacee51d0e0c 100644 --- a/lib/libpmc/pmc.atomsilvermont.3 +++ b/lib/libpmc/pmc.atomsilvermont.3 @@ -504,11 +504,11 @@ The number of times the MSROM starts a flow of UOPS. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.cmn-600.3 b/lib/libpmc/pmc.cmn-600.3 index 1fa75a674c0b..406209807301 100644 --- a/lib/libpmc/pmc.cmn-600.3 +++ b/lib/libpmc/pmc.cmn-600.3 @@ -553,6 +553,7 @@ Average latency to form a TX TLP .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -560,7 +561,6 @@ Average latency to form a TX TLP .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3 index 4ee4b4c9235d..b4fa9ab661a4 100644 --- a/lib/libpmc/pmc.core.3 +++ b/lib/libpmc/pmc.core.3 @@ -782,10 +782,10 @@ may not count some transitions. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmclog 3 , diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3 index 45e4a4c7916d..86604b7ff16c 100644 --- a/lib/libpmc/pmc.core2.3 +++ b/lib/libpmc/pmc.core2.3 @@ -1097,10 +1097,10 @@ and the underlying hardware events used. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3 index ab7a47e79846..32b28eb3db48 100644 --- a/lib/libpmc/pmc.corei7.3 +++ b/lib/libpmc/pmc.corei7.3 @@ -1575,11 +1575,11 @@ Counts number of segment register loads. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3 index ca4283e38c90..6a059d84a0f9 100644 --- a/lib/libpmc/pmc.corei7uc.3 +++ b/lib/libpmc/pmc.corei7uc.3 @@ -878,11 +878,11 @@ into a power down mode. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.dmc-620.3 b/lib/libpmc/pmc.dmc-620.3 index 1fcd6ae9c733..f9054b637c90 100644 --- a/lib/libpmc/pmc.dmc-620.3 +++ b/lib/libpmc/pmc.dmc-620.3 @@ -123,6 +123,7 @@ The following PMC events are available: .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -130,7 +131,6 @@ The following PMC events are available: .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3 index 0e1a4623eda6..495516cf45a0 100644 --- a/lib/libpmc/pmc.haswell.3 +++ b/lib/libpmc/pmc.haswell.3 @@ -909,6 +909,7 @@ Dirty L2 cache lines evicted by demand. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -917,7 +918,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.haswelluc.3 b/lib/libpmc/pmc.haswelluc.3 index 03c37995a41b..a9587c3b5604 100644 --- a/lib/libpmc/pmc.haswelluc.3 +++ b/lib/libpmc/pmc.haswelluc.3 @@ -195,13 +195,13 @@ Number of requests allocated in Coherency Tracker. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.haswell 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.haswellxeon.3 b/lib/libpmc/pmc.haswellxeon.3 index cd6c71fd6606..e6cf65c5e6dc 100644 --- a/lib/libpmc/pmc.haswellxeon.3 +++ b/lib/libpmc/pmc.haswellxeon.3 @@ -922,6 +922,7 @@ Dirty L2 cache lines evicted by demand. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -931,7 +932,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3 index 0757795c95af..eaf45db140f5 100644 --- a/lib/libpmc/pmc.iaf.3 +++ b/lib/libpmc/pmc.iaf.3 @@ -121,10 +121,10 @@ CPU, use the event specifier .Qq iaf-instr-retired.any,usr,anythread . .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3 index 4b88f95be21c..1490b896a73c 100644 --- a/lib/libpmc/pmc.ivybridge.3 +++ b/lib/libpmc/pmc.ivybridge.3 @@ -823,13 +823,13 @@ Dirty L2 cache lines evicted by the MLC prefetcher. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3 index 56b2f2f62c0b..415cdf518bd6 100644 --- a/lib/libpmc/pmc.ivybridgexeon.3 +++ b/lib/libpmc/pmc.ivybridgexeon.3 @@ -856,13 +856,13 @@ Dirty L2 cache lines filling the L2. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.sandybridge.3 b/lib/libpmc/pmc.sandybridge.3 index 5672cfbcd958..77221d985ded 100644 --- a/lib/libpmc/pmc.sandybridge.3 +++ b/lib/libpmc/pmc.sandybridge.3 @@ -902,6 +902,7 @@ Split locks in SQ. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -909,7 +910,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.sandybridgeuc.3 b/lib/libpmc/pmc.sandybridgeuc.3 index 080c9f31ffee..70ce768d9966 100644 --- a/lib/libpmc/pmc.sandybridgeuc.3 +++ b/lib/libpmc/pmc.sandybridgeuc.3 @@ -195,12 +195,12 @@ Counts the number of core-outgoing entries in the coherent tracker queue. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgexeon 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3 index 3d238bbad2de..e7bfc8c71708 100644 --- a/lib/libpmc/pmc.sandybridgexeon.3 +++ b/lib/libpmc/pmc.sandybridgexeon.3 @@ -978,6 +978,7 @@ Split locks in SQ. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -986,7 +987,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3 index dcbf8d904838..08d5af63d02d 100644 --- a/lib/libpmc/pmc.soft.3 +++ b/lib/libpmc/pmc.soft.3 @@ -84,12 +84,12 @@ Write page fault. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , .Xr pmc.westmereuc 3 , diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3 index c613433eb0f1..4834d897f90c 100644 --- a/lib/libpmc/pmc.tsc.3 +++ b/lib/libpmc/pmc.tsc.3 @@ -57,11 +57,11 @@ The alias maps to the TSC. .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmclog 3 , .Xr hwpmc 4 diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3 index 7604e915d384..a7cea6bb57f9 100644 --- a/lib/libpmc/pmc.ucf.3 +++ b/lib/libpmc/pmc.ucf.3 @@ -81,13 +81,13 @@ offset C0H under device number 0 and Function 0. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3 index 00aaa0b74338..231bc331894e 100644 --- a/lib/libpmc/pmc.westmere.3 +++ b/lib/libpmc/pmc.westmere.3 @@ -1367,12 +1367,12 @@ Counts number of SID integer 64 bit shift or move operations. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3 index 67b21ef42f84..5d6286b0e91e 100644 --- a/lib/libpmc/pmc.westmereuc.3 +++ b/lib/libpmc/pmc.westmereuc.3 @@ -1071,12 +1071,12 @@ disabled. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 298a3b2e403e..f4eb36f50df1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6798,6 +6798,7 @@ OLD_FILES+=usr/sbin/pmcannotate OLD_FILES+=usr/sbin/pmccontrol OLD_FILES+=usr/sbin/pmcstat OLD_FILES+=usr/share/man/man3/pmc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.amd.3.gz OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz OLD_FILES+=usr/share/man/man3/pmc.core.3.gz From nobody Wed Oct 18 19:43:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9h8v3v3Qz4xS0n; Wed, 18 Oct 2023 19:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9h8v3N6Lz4sH9; Wed, 18 Oct 2023 19:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697658191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzE9wJflJZug54A7Lda2Oqjiu3nZSGwAnCTkqjXkK3s=; b=jGHUrAV6IzfzNc+7F6TEvtMmjunDLgPCqubHqO5I7Qx4+hsydfRdEj2SC24798q4j2FlHV h678iRU/nM3TnKzpENQi3mD4rp41jZgMRjdD7NqzfQyusaOnrYCXAzjbYqCEpoGzxq1Ewc TVwOl7wmYs6K4e2HTKogsWH+oa+R7nm3ZZPhDNyVxP6qoXJ1OcUuln/Qp1H7nraqn7ZPi3 /kIRTwsm4sDLV3rOMELzA9CM7f+47kUK65ni89qXWsRQqudFU8IoMurh7N4RoKcE0AeR4B GCcxSSg44UVBx8+pOdfuhtaMlSju8osuDaTGL3a15onIdB1ov3DJEdH0AQmMLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697658191; a=rsa-sha256; cv=none; b=T5JFYmvJn3FV/fhDL24xk9gP20QL2MHEjo5/EL0sRl94RZAXfl9rctk4tBGPV8T74Z09vc NvHkLIZTxiq3Ahcgu6kT2mFu0Te0PZK3Gw1q7WAzO3LwgFdr4416S42R8PCVvds0sYpGVL j5qEwP03vNC6RB9u9Jpnx4lMUp02qbke0UnxFvgSOWlLhSYfWj3th8VFCQD9jujk9MA3+L zi7989jrCjVEMhRVMGSOPXM+n9OdH0gWH6owE5He0TAdQuUTbMk9wiI+fIY8kLALXRyX0R 4OaqmP4+C/VL3Z8HNOEnSBKcwT2dHKDNXzbtxCia/ud2BXUUbif2gVCzE+vRiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697658191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzE9wJflJZug54A7Lda2Oqjiu3nZSGwAnCTkqjXkK3s=; b=VfyM9jAv2gvRBsVIzvf0qJWxip+keE7trgebpSr7QotrByklqhHWeORn8YNYJ7Qn4A37am 6xwkMHOjOkM0HZ+5ANXdPadAgAMMaKpIfwbdVi3hcJOdQ5jgTvQ6Vf28Uds9wUqMl2Webo I02zwA/Aa4SEiwZ1MXxe1HGlufXe4c3W1lTjP904aUG/fj1uCRDSGkfBrsfPNX7W6BqIVP nvvhkiQTYE4OVBB9XMCBQ7fQlCXKrYP+BrNA3eynSs6rdugUXtdMWRgm0xSFjN917PGkDF wZWMoX6F7XMh6sSWy7wrMYNv1P0Ji2HI2T79V1YxI9I4O0tVXIvHDxmBLUZY2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9h8v2PgZz4cT; Wed, 18 Oct 2023 19:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IJhBhq011428; Wed, 18 Oct 2023 19:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IJhB5F011425; Wed, 18 Oct 2023 19:43:11 GMT (envelope-from git) Date: Wed, 18 Oct 2023 19:43:11 GMT Message-Id: <202310181943.39IJhB5F011425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: c4e298251ab0 - main - nfscl: Handle the NFSERR_RETRYUNCACHEDREP error from a NFSv4 server List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: c4e298251ab01665f5bb3edeb740a51331818a45 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e298251ab01665f5bb3edeb740a51331818a45 commit c4e298251ab01665f5bb3edeb740a51331818a45 Author: Rick Macklem AuthorDate: 2023-10-18 19:42:12 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 19:42:12 +0000 nfscl: Handle the NFSERR_RETRYUNCACHEDREP error from a NFSv4 server In a recent email list discussion related to NFSv4 mount problems against a non-FreeBSD NFSv4 server, the reporter of the issue noted that the server had replied 10068 (NFSERR_RETRYUNCACHEDREP). This did not seem related to the mount problem, but I had never seen this error before. It indicates that an RPC retry after a new TCP connection has been established failed because the server did not cache the reply. Since this should only happen for idempotent operations, redoing the RPC should be safe. This patch modifies the NFSv4.1/4.2 client to redo the RPC instead of considering the server error fatal. It should only affect the unusual case where TCP connections to NFSv4 servers are breaking without the NFSv4 server rebooting. Reported by: J David MFC after: 2 weeks --- sys/fs/nfs/nfs_commonkrpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 29c7cdbd671c..29fbb8dc4351 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1300,7 +1300,8 @@ tryagain: nd->nd_procnum != NFSPROC_LOCKU))) || (nd->nd_repstat == NFSERR_DELAY && (nd->nd_flag & ND_NFSV4) == 0) || - nd->nd_repstat == NFSERR_RESOURCE) { + nd->nd_repstat == NFSERR_RESOURCE || + nd->nd_repstat == NFSERR_RETRYUNCACHEDREP) { /* Clip at NFS_TRYLATERDEL. */ if (timespeccmp(&trylater_delay, &nfs_trylater_max, >)) From nobody Wed Oct 18 20:08:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9hkb3svXz4xSvZ; Wed, 18 Oct 2023 20:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9hkb3KM8z4vVZ; Wed, 18 Oct 2023 20:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697659735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xdFuUphjfEPK4RpPyNuV04eNt+TOTuukcFJvv+32lA=; b=dclEpXJCpDqB/JmBxuO8VDOfHzNa2u7NS3/voHrFopNLXBj/xncpCqKmSXRYgQTW8UBi2/ KQiThiB+ZgllPOrquUOQBPylZIr/6YsXwn0rz95wJWWkixM7QHgK1086kgv77allo2vl8C Q+Ovi9UiFH1wZGUIuzEhIRp8/kv+/odWvH7pRzqUQLvuiu6YIhf3I5auyXTkH/tH/d8Ax4 e/Gq5aY8uogpNnUeVA8XjBoRj4UvzMH2EpOq7xlFhfH9OwQYkwo898tPdVOoqUtDba0GuT 0AZtuHAnncsAaGytIkUqM/7MVjkkzLIsI94CuKR1sFV9QYSdTtuFe2M3dpCdsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697659735; a=rsa-sha256; cv=none; b=pTfSxGsoLpK0lje7GIywQdbXK1L1j4neDdf42up+c4tD+UwdXeHdgNm5KQRFptcJqB8fS9 78a/FYQ/qEC5fr0pYJbRM8SDkN29TX2fs0282wfpRGiPXivXiET6SqkA/6LuHsizUnlYJI goLiJxbNc2L+/ptltAWEBtVbIuUSpvabn8keDE6FVOyzpr7aE1DwVNDy/+OtUH3BdQoXdh M9SsKQ/dicPrUCx47QEgY9ml9NCre869waNLe+RC/bsLPK9mcts0AKuEq+eUNnyB2ruRt6 SJAL2nDcEUNjiYh8sdFERyqUR+DbBGfimeD8jM6jxkIQ+lpRH8Pm+1M98nizTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697659735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xdFuUphjfEPK4RpPyNuV04eNt+TOTuukcFJvv+32lA=; b=JQsyjqR3tXOe6ekIS3hRg5XTZ29R2cvghHJxs7JeUr+BPbUsx9MEhNCMlPzmIJF2XPIq/m ySDWP0xewEe4W7BxZWIt6OX6FgYO1I/QcljPyuFwEklwK8j1EyAsbQwR+FpdH2Ahqk+iMq AQaj63GQizNdVY+7sas5EHI0RrXSmlmTn0Mq/0todYufUlF4nmTya8FxnEqNRRe4jbabgr 4ZGhl9zT0ioUlmpJ16aV9dI1vPbHueiB+YlUmJIdbM4xo1wANb1ruilqBS9bhmQoUbzz5b aZ8/jV8iZE2JRzMq5OQbCI3GPHBfbhcbdIfWMOvEn8c/HWy/xq5zPYoxXbMn9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9hkb28KPz5R9; Wed, 18 Oct 2023 20:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IK8tw4046148; Wed, 18 Oct 2023 20:08:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IK8tTp046145; Wed, 18 Oct 2023 20:08:55 GMT (envelope-from git) Date: Wed, 18 Oct 2023 20:08:55 GMT Message-Id: <202310182008.39IK8tTp046145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 57ce37f9dcd0 - main - nfscl: Make NFSv4.2 Copy set atime on infd List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 57ce37f9dcd0ec749e5e4512e1e44eb963565c68 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=57ce37f9dcd0ec749e5e4512e1e44eb963565c68 commit 57ce37f9dcd0ec749e5e4512e1e44eb963565c68 Author: Rick Macklem AuthorDate: 2023-10-18 20:07:39 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 20:07:39 +0000 nfscl: Make NFSv4.2 Copy set atime on infd RFC7862 does not specify infile atime behaviour when a NFSv4.2 Copy operation is performed. Since the collective opinion of a mailing list discussion (on freebsd-hackers@) seemed to indicate that copy_file_range(2) should update atime on the infd, even if there is no data copied, this patch attempts to ensure that behaviour. For Copy, it preceeds the Copy operation with a Setattr of TimeAccess_Set(NFSv4. speak for atime) for the invp. For the case where no data will be copied, it does a Setattr RPC to set TimeAccess_Set for the invp. A __FreeBSD_version bump will be done as a separate commit, since this patch changes the internal interface between the nfscommon and nfscl modules. MFC after: 1 month --- sys/fs/nfs/nfs_commonsubs.c | 2 +- sys/fs/nfsclient/nfs_clrpcops.c | 35 +++++++++++++++++++++++++++++++++++ sys/fs/nfsclient/nfs_clvnops.c | 21 ++++++++++++++++++--- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index f2305795e53e..832713e6c1de 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -296,7 +296,7 @@ static struct { { NFSV4OP_OPEN, 8, "CreateLayGet", 12, }, { NFSV4OP_IOADVISE, 1, "Advise", 6, }, { NFSV4OP_ALLOCATE, 2, "Allocate", 8, }, - { NFSV4OP_SAVEFH, 5, "Copy", 4, }, + { NFSV4OP_SAVEFH, 6, "Copy", 4, }, { NFSV4OP_SEEK, 2, "Seek", 4, }, { NFSV4OP_SEEK, 1, "SeekDS", 6, }, { NFSV4OP_GETXATTR, 2, "Getxattr", 8, }, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 8fe9158384a0..14351d915ba2 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -8617,6 +8617,7 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, struct nfsrv_descript *nd = &nfsd; struct nfsmount *nmp; nfsattrbit_t attrbits; + struct vattr va; uint64_t len; nmp = VFSTONFS(outvp->v_mount); @@ -8627,14 +8628,35 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, if (len > nfs_maxcopyrange) len = nfs_maxcopyrange; NFSCL_REQSTART(nd, NFSPROC_COPY, invp, cred); + /* + * First do a Setattr of atime to the server's clock + * time. The FreeBSD "collective" was of the opinion + * that setting atime was necessary for this syscall. + * Do the Setattr before the Copy, so that it can be + * handled well if the server replies NFSERR_DELAY to + * the Setattr operation. + */ + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + *tl = txdr_unsigned(NFSV4OP_SETATTR); + nfsm_stateidtom(nd, instateidp, NFSSTATEID_PUTSTATEID); + VATTR_NULL(&va); + va.va_atime.tv_sec = va.va_atime.tv_nsec = 0; + va.va_vaflags = VA_UTIMES_NULL; + nfscl_fillsattr(nd, &va, invp, 0, 0); + + /* Now Getattr the invp attributes. */ NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); + + /* Set outvp. */ NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); (void)nfsm_fhtom(nmp, nd, VTONFS(outvp)->n_fhp->nfh_fh, VTONFS(outvp)->n_fhp->nfh_len, 0); + + /* Do the Copy. */ NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_COPY); nfsm_stateidtom(nd, instateidp, NFSSTATEID_PUTSTATEID); @@ -8649,12 +8671,25 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, *tl++ = newnfs_false; *tl++ = newnfs_true; *tl++ = 0; + + /* Get the outvp attributes. */ *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSWRITEGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); + error = nfscl_request(nd, invp, p, cred); if (error != 0) return (error); + /* Skip over the Setattr reply. */ + if ((nd->nd_flag & ND_NOMOREDATA) == 0) { + NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); + if (*(tl + 1) == 0) { + error = nfsrv_getattrbits(nd, &attrbits, NULL, NULL); + if (error != 0) + goto nfsmout; + } else + nd->nd_flag |= ND_NOMOREDATA; + } if ((nd->nd_flag & ND_NOMOREDATA) == 0) { /* Get the input file's attributes. */ NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 383d45ba260b..fd88531789d9 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3889,7 +3889,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) struct vnode *outvp = ap->a_outvp; struct mount *mp; struct nfsvattr innfsva, outnfsva; - struct vattr *vap; + struct vattr va, *vap; struct uio io; struct nfsmount *nmp; size_t len, len2; @@ -3998,10 +3998,25 @@ generic_copy: * will not reply NFSERR_INVAL. * Setting "len == 0" for the RPC would be preferred, * but some Linux servers do not support that. + * If the len is being set to 0, do a Setattr RPC to + * set the server's atime. This behaviour was the + * preferred one for the FreeBSD "collective". */ - if (inoff >= vap->va_size) + if (inoff >= vap->va_size) { *ap->a_lenp = len = 0; - else if (inoff + len > vap->va_size) + VATTR_NULL(&va); + va.va_atime.tv_sec = va.va_atime.tv_nsec = 0; + va.va_vaflags = VA_UTIMES_NULL; + inattrflag = 0; + error = nfsrpc_setattr(invp, &va, NULL, + ap->a_incred, curthread, &innfsva, + &inattrflag); + if (inattrflag != 0) + ret = nfscl_loadattrcache(&invp, + &innfsva, NULL, 0, 1); + if (error == 0 && ret != 0) + error = ret; + } else if (inoff + len > vap->va_size) *ap->a_lenp = len = vap->va_size - inoff; } else error = 0; From nobody Wed Oct 18 20:15:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9hsx2WHXz4xT89; Wed, 18 Oct 2023 20:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9hsx1yLgz3C7C; Wed, 18 Oct 2023 20:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oL96zT9uV/QeMHN4fMCFS7b0me9hwcqJ9vzvrPGat2c=; b=ICalZDHpQx2j3EqgCe3Z8mSa4jwcr/w+YhhQT7O4hrpMgIZi+sLJsaSU7LU3LmvLdXxKhT CAo91q4Ey/l/sAgDCrkzn/ETOvnhznbUAxjKSgpFbRRtuLArL0ohrG84rozhBF3MA9dJOb yyhf6UFdrqrjz+oZuFBP4o11nuMqxLi575tfITR1uXzszxIr+xSPhhBguLDg7NgTQn4TuD qeo6OTgTCujZjP6cFFralEZsGSGmbHYhn4fsAve/QLmGX8KFR7h5VBSaI+4jr3wReEHbag Bfn2NaWfPq/2PpAbtg8d/AQ+vxi7heDaJrVoBRcLQQbcwA52NBjR4Dxud+9a5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697660117; a=rsa-sha256; cv=none; b=xYMv4yb0mhM9hwSdEjJJHiLPR5tl0SDgMM41dNg9jsFZGHXqpQ1guNdl1b9/HzxkWnOdnE 43he6a0DmI8PWUa9yIhpLYr5TGXVl0lLlrW4XVZfAVrkHDRL2pzHN2oEA5LZF5uBferQ/c 2QUPFeE4c7pjF/F7Us9E2r/68/yF1MEmufSJ19QF++HxyUaoUieV+knQdHuyA4lMzv55A0 /+BnAswxh6dW0HJbk+K0dbe9iAsKyrVT0cBvknSFny2Y1pxYQSTjqznH2yFybCYOTZSAH8 4sB+2uocqrX5oqACVTmLVX7nkv2DCQf4VFQPA7weuLdxD8Nk9F6d+ss5vc0crQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oL96zT9uV/QeMHN4fMCFS7b0me9hwcqJ9vzvrPGat2c=; b=uqD7A4K5VsoHWJjUCfKhmEB0jsueo3EVfkGabEcR0l+ep4TuJJYR0nY3x15+Fc9GADgcNC oytGer54I3TcWr/WXJ2QH5ZCKg+qFk3OF9GmOqlpRlsyRGDWZVc+8Ez67/wkT8N5AQLFpv CV0vZtoupYH5QWAYqTpWCt8gGyuLDxB07RUXdMZl2ZRLlnc2RNz6nVm+jiEAUz4KyCM4qm ERxGCpkOeK9I3lh296EOn9tGPTLqsLqXuCQY6ERPZZmwONaa3LFgTxccdNFoSYkI9b0Zeb v+WXfLOpCCaE2SHKlXvO+pwOa9ZdBiz8YO4+O4mP+oFF5oLGcaHOhPjWNzXtkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9hsx1124z4tP; Wed, 18 Oct 2023 20:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IKFHbs062438; Wed, 18 Oct 2023 20:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IKFHlx062435; Wed, 18 Oct 2023 20:15:17 GMT (envelope-from git) Date: Wed, 18 Oct 2023 20:15:17 GMT Message-Id: <202310182015.39IKFHlx062435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 17f5e2b904af - main - param.h: Bump __FreeBSD_version for commit 57ce37f9dcd0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 17f5e2b904aff8e4863199a137ee21ef0939bcf4 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=17f5e2b904aff8e4863199a137ee21ef0939bcf4 commit 17f5e2b904aff8e4863199a137ee21ef0939bcf4 Author: Rick Macklem AuthorDate: 2023-10-18 20:12:26 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 20:12:26 +0000 param.h: Bump __FreeBSD_version for commit 57ce37f9dcd0 Commit 57ce37f9dcc0 changed the internal KAPI between the nfscommon and nfscl modules. Both must be rebuilt from sources. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 2e4310dac111..929458626a85 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500001 +#define __FreeBSD_version 1500002 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Oct 18 20:19:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9hyW0gt4z4xSyT; Wed, 18 Oct 2023 20:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9hyW09Z0z3CYS; Wed, 18 Oct 2023 20:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBBBTcaD1/xKPt0MaX3lyR4pJzwdxw+8t06QkBYaddI=; b=rMu/P4fqu6IAJ9IzHTVrZK33UQ1M45PZdVqE0dPS4kZQIVEWni3oB/US+a102G9uoAykoh fJYZn2a5XVmPRYfM+diErksRdLhuIqIz+A45nKOYtdyVSJaW/67nkxJVUcoEAgjeYfnz63 /AaRUlcvnLGOKYmRFkr4YuH4jx611QNfnUqP7MIAlRUGQAjM/5rTtUGU8ht4X8NZc0EmkP jCCQPfdaDDy8O3F0pyTCzgma/StTbt6QBn+BfBMnmkfJe7Fz+xCW+Jy5vzIr88ExJG0kYg tO6/TuL/sWrvDKxVfmwnmccd/mNWt451lX/Iz+xbY/Moox8NWH0kmeWg6PlP6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697660355; a=rsa-sha256; cv=none; b=N0S6Ga5eTIWphc2uPGiVGDe94M44kZPcnIx4MtnGhjUrHe4/nR4s+gaL7gkHXmfvjGuPKx mPt0e8f4psSZxlhRsPRJEg+m1XUzGsP/lD5tn4wo5ZkMEQDFCE3qutSfuUAwwhLKA1m7s5 qfu5jXUNhRLlQsrwBTrfPvs0kyg893xX0NtFImdfclXIAqz1S7DB99IR2Zu+PRJQnMIfyy DBHV7iaaZ1aUy2BbqNR3tbOaznZfAiPIJ2DjSNDGNhsc6mH3E+OSmxqV9upJlCzwUHsJnd BqSWLtkMM2IuQbOigRtq1R0Uo+yzdL5taZphgeFN3T0/It+vQME0f6OirLJ+FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBBBTcaD1/xKPt0MaX3lyR4pJzwdxw+8t06QkBYaddI=; b=OkKC1ozHWprgJVG5oUDsHdM+WzsOuXBJcP3z8Zk9l3Co8w307sQ1AJ4Ti+r6hcoeE8Qzn4 Oyonp/imW9+/KDBCoBYwHzhDpLepRj2qxG7IMZ6pD898J4v+rcEJLsFT0xY0IZ65Sx+z+Z aQUsurFhmaLbVvbKujw5Fio2Vaghpvj3nnaKDOx7K+jq5a3Ii6sSkwt25z/oa3XTFFgHCa DBLQtkuazCU6UnH8dVmXuazuFVvG3q7dvqpCXdAaSGCn7cSRrRChaqYJB6xlOMBB3KLl2H E3Yvw/dn28/+LdiN1LUONgk7dbC3Mr91RWSiVZTo4o93+HGcknmUZKnmD9DzMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9hyV6LQMz5Sl; Wed, 18 Oct 2023 20:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IKJEk2063065; Wed, 18 Oct 2023 20:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IKJE8f063062; Wed, 18 Oct 2023 20:19:14 GMT (envelope-from git) Date: Wed, 18 Oct 2023 20:19:14 GMT Message-Id: <202310182019.39IKJE8f063062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: fb7140b1f928 - main - UPDATING: Add entry for commit 57ce37f9dcd0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: fb7140b1f928a00d03ce2c11a9e6e1b7515272fe Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fb7140b1f928a00d03ce2c11a9e6e1b7515272fe commit fb7140b1f928a00d03ce2c11a9e6e1b7515272fe Author: Rick Macklem AuthorDate: 2023-10-18 20:17:42 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 20:17:42 +0000 UPDATING: Add entry for commit 57ce37f9dcd0 --- UPDATING | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPDATING b/UPDATING index b750b2b913b5..9334ebf0dd5e 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ 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".) +20231018: + Commit 57ce37f9dcd0 changed the internal KAPI between the + nfscommon and nfscl modules. Both must be rebuilt from sources. + 20231010: dialog(1) has been replaced in base by bsddialog(1), while most of the time replacing a dialog(1) call by a bsddialog(1) call works out of the From nobody Thu Oct 19 02:44:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9sWS3HHRz4xqxB; Thu, 19 Oct 2023 02:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9sWS2mXcz3gsZ; Thu, 19 Oct 2023 02:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697683492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmAOq7wySaitB/62r9PMV9n/63f53EsWfcnpr5zgOCc=; b=CLUsubmjxavstWO93y2dSgpoYlI401yLr6Bm2wb15jGHDH8ZNruY8oBgpKt6CACWS1GJXJ OEaELNGiaX9AjE32lRdx6UWbVXX5mDIEml9a+HEvLQHdF+UQUPShmhKwX76AvGhapjE67c FGJPIsUWTq8wOoY5fV3k8qFCp/2VAjNXT9EDDeJdfqsXrC5rn7KelErkeyD36bNkB44fYc 9yulS/GmDxa3m2EcloUSFKCp/cz/eogDGxisH3HSajWm7exvYRBb5z7cZuV3E8OEZGSAEZ 5W3D1Mvt3yAK7bb7lTQgs3rQoNRPLUk2GGg/v4B3C58qJMyN84l9EGLRBYU8vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697683492; a=rsa-sha256; cv=none; b=UkViZ0kQgI7dE14c9HlxK5jcTulDZzSnvNkmbe6Cwl6hOoYaEIU2Vaa39weA/xAfPkKHHN k/2dA69GkDcTl94srMQJBDET/f7bXqi/yFGR244kKn3alp7S7HNXxwXWY9jYvx5SaDI0xM F1fNuGmwKsbGo6/s9CGeLSYK9ffzqzcn19sCDlY35HQf6bKrJ89yhYjEGd/wihj9hepVLB caNmHrpVwRC6V0yD+k7rVmLVQVDI+wMZ4iHJyyaeQeidy0s7N+qtYT2H7tj6hqrhYZasPB c4FfObMzKQ+k7xkwKeWpfRwoGXvzzXnYl2b7HI1q56UoZE3fGJupNkrhtlO3bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697683492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmAOq7wySaitB/62r9PMV9n/63f53EsWfcnpr5zgOCc=; b=Huem5Lx3Qvfye+5zwQI5/lHwR6EK3ab3BLqVyWn87wHui7AoyCjdtU1lvaQKZLkR/RepHi cMl9lAi177F3JLrHngYOJM9Ffy6W0x7FRf8fI/wLDsFK9A8c6zMwQYEEUdbguJ3s5TKiF+ iDnb/EiOg+CHcqa1lX/iMsLou8VSVYBBLBxgFublOsqMB1Hxmn197iEhyOR8NJH3SrTP4D AaSheNcBsttvTQircYsrIv9E1SSub8RAWq8yDk6ts+4vEM9nr6mIbKzknJA4BiiiGMdr4F ZUg9Jm6ZXSyQN3TPwmLqWtokX96I8sN4pb0JLP7WGtVTh62IpeDLRI5iCKFr6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9sWS1sFqzXf5; Thu, 19 Oct 2023 02:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J2iqqO010039; Thu, 19 Oct 2023 02:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J2iqva010036; Thu, 19 Oct 2023 02:44:52 GMT (envelope-from git) Date: Thu, 19 Oct 2023 02:44:52 GMT Message-Id: <202310190244.39J2iqva010036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 767c97c501ae - main - install: handle -m +X more accurately List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 767c97c501ae72eb3d74bc23ddf5a1d570d8f841 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=767c97c501ae72eb3d74bc23ddf5a1d570d8f841 commit 767c97c501ae72eb3d74bc23ddf5a1d570d8f841 Author: Kyle Evans AuthorDate: 2023-10-19 02:43:06 +0000 Commit: Kyle Evans CommitDate: 2023-10-19 02:44:05 +0000 install: handle -m +X more accurately As described by chmod(1), +X in the mode may be used to optionally set the +x bit if the file is a directory if any of the execute/search bits are set in the original mode. The latter is not applicable because we assume -m is a fresh mask, but a functional +X could be useful in the former case if we're passing along a common INSTALL_MODE that's designed to install either 0644 or 0755 depending simply on whether it's a directory or not. Reviewed by: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42273 --- usr.bin/xinstall/tests/install_test.sh | 16 ++++++++++++++++ usr.bin/xinstall/xinstall.c | 12 ++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index b42bdfd0dc60..cbe95f0dfbf3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -481,6 +481,21 @@ set_owner_group_mode_unpriv_body() { atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)" } +atf_test_case set_optional_exec +set_optional_exec_head() { + atf_set "require.user" "unprivileged" +} +set_optional_exec_body() +{ + echo "abc" > testfile.src + + atf_check install -d -m ug+rX testdir + atf_check test -x testdir + + atf_check install -m ug+rX testfile.src testfile + atf_check test ! -x testfile +} + atf_init_test_cases() { atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe @@ -523,4 +538,5 @@ atf_init_test_cases() { atf_add_test_case mkdir_simple atf_add_test_case set_owner_group_mode atf_add_test_case set_owner_group_mode_unpriv + atf_add_test_case set_optional_exec } diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index d19bacbe8c1b..1ab9cac76f2f 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -189,6 +189,7 @@ main(int argc, char *argv[]) fset = 0; iflags = 0; + set = NULL; group = owner = NULL; while ((ch = getopt(argc, argv, "B:bCcD:df:g:h:l:M:m:N:o:pSsT:Uv")) != -1) @@ -255,11 +256,10 @@ main(int argc, char *argv[]) break; case 'm': haveopt_m = 1; + free(set); if (!(set = setmode(optarg))) errx(EX_USAGE, "invalid file mode: %s", optarg); - mode = getmode(set, 0); - free(set); break; case 'N': if (!setup_getid(optarg)) @@ -301,6 +301,14 @@ main(int argc, char *argv[]) usage(); } + /* + * Default permissions based on whether we're a directory or not, since + * an +X may mean that we need to set the execute bit. + */ + if (set != NULL) + mode = getmode(set, dodir ? S_IFDIR : 0) & ~S_IFDIR; + free(set); + if (getenv("DONTSTRIP") != NULL) { warnx("DONTSTRIP set - will not strip installed binaries"); dostrip = 0; From nobody Thu Oct 19 03:06:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9t0W6Gdqz4xs9K; Thu, 19 Oct 2023 03:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9t0W5hdxz4G0t; Thu, 19 Oct 2023 03:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697684795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ldDNF1NLrGBoEK4yuDeRfIjllSsYCEa5s5XvH4C+1h0=; b=xKXELo2g8kvJQmNsY1osQSL273USc1TkK/lI6bsxbpgM/jdAn2Ul18qBDq6t3poz/OQYJx N2zYXzmnPUbvuANz4e8wgp1gJvrM9Pm2Z0wsjHItg6RdsR6e2K5heqluCxRGhvKoU4/a7p /IrSIyzD+Lhpe5he1m9iCZaao7IDOacY9nJb0+8zp1lwOBR+RazHrCBDdd9aBbMf+JoNP/ 5KeJpAyi3LCELzAxa0m99c0fwqDUcsGWMjT7eu9YVvmJ/9RVny3BSKHYobNFiOOcyYGs4K xMzTb6z7Hwm0RXsfNCUt0wTQEichyKslqeR2ENuj0C/4RSJRc+o8n6wdDOm5cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697684795; a=rsa-sha256; cv=none; b=XXV05V6f265TbehnxeEWjG0+19NJxS68I8+X+R+oqvkHcl4vBEeuhYCQjO9srba91TUZrT xtylvQ36bh8cd0B0gHhnDYjvjvKVw6cWlMK5rTr6adiBM07v0BdIc0ll+g6dba8Pa/4yvo hro+OAol1zEwBj2uhROCwQlPLyjQLa0gwumMseqi2ZN4LDghw4091q4cluWxZdPZXvD9Xq bXAm7BFoH0uWMWNzqvarELkY+mVpS5+hvuk7+n+2p45uhh1WbOsJz2XOHvBBqoRr1X3Dt2 BrgJnt/Lg8z5FVVMUAYgoCx1WRhXH+/5uk5T+DlO3AeZ9LtT/2nSETfw3yCYhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697684795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ldDNF1NLrGBoEK4yuDeRfIjllSsYCEa5s5XvH4C+1h0=; b=ec3yFn/hxL44ecplphwaSBRQco6Z7iTQkVpqMKeJ6q3ir7/wPkDn9wivmYbrU/uLjOFarb OkXDnFfFCGnjLgN9JuiFc8nkuDlwu/OfKDz3Sn2WiRErXSoZpRm0ijwlCfLZF3l73gDE2t ddD7NlPFwp7hc6CrgTcFY0znq8S43PnaOsXg59+Z55IaydwYySM40Ep1IQdPqc9pUqDxAr rq/zxInwsRcatn7Cw1H2DVhvGRwNIOAVrkCSyn6fvaqdXojlOnGCgHNn/2HG4iuelelx3k ko+9TrJrjLtsdc+0Jb/SIGF2K0Mfp/IpOI75U58DRWVp0u3lt8A6uJARn+EJzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9t0W4lcBzY0c; Thu, 19 Oct 2023 03:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J36ZEd045471; Thu, 19 Oct 2023 03:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J36ZgW045468; Thu, 19 Oct 2023 03:06:35 GMT (envelope-from git) Date: Thu, 19 Oct 2023 03:06:35 GMT Message-Id: <202310190306.39J36ZgW045468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b064a4c9eed5 - main - smartpqi: Drop spinlock before freeing memory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547 commit b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547 Author: John F. Carr AuthorDate: 2023-10-19 03:02:42 +0000 Commit: Warner Losh CommitDate: 2023-10-19 03:06:40 +0000 smartpqi: Drop spinlock before freeing memory pqisrc_free_device frees the device softc with the os spinlock held. This causes crashes when devices are removed because the memory free might sleep (which is prohibited with spin locks held). Drop the spinlock before releasing the memory. MFC After: 2 days PR: 273289 Reviewed by: imp --- sys/dev/smartpqi/smartpqi_discovery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c index 7e084a81cd89..ac37c2233762 100644 --- a/sys/dev/smartpqi/smartpqi_discovery.c +++ b/sys/dev/smartpqi/smartpqi_discovery.c @@ -1671,11 +1671,11 @@ pqisrc_free_device(pqisrc_softstate_t * softs, pqi_scsi_dev_t *device) pqisrc_delete_softs_entry(softs, device); DBG_NOTE("Removed memory for device : B %d: T %d: L %d\n", device->bus, device->target, device->lun); + OS_RELEASE_SPINLOCK(&softs->devlist_lock); pqisrc_device_mem_free(softs, device); + } else { + OS_RELEASE_SPINLOCK(&softs->devlist_lock); } - - OS_RELEASE_SPINLOCK(&softs->devlist_lock); - } From nobody Thu Oct 19 03:24:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9tPf2bWgz4xt3y; Thu, 19 Oct 2023 03:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9tPf25Y8z4JNb; Thu, 19 Oct 2023 03:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697685894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1G2UhIzh58uT5rLgi9LSTXhxaFL7hRGEhagzD5CJMc=; b=V0B3z3l9tt8o3CTI5CqoZknkcvDf1UOeNchzzdDrzZvysDEUPe/01vkvhoCUjrjsNRgXjR kZTpHNITNR03+X9oOqAl91a3gDTkWNllATC0c1Xq50JDvqALDobKOkIpV3Cv6N3fF6Z0/5 6CAUP1ygPpnGOnHp4B8KmV+vUE4OGdx2PmCOm810DSNqhoB+pLjHIvUifDUqdjsRxampa3 2VGcxnWC82buIuV7EQyXpNeBr9fo1ilhVsxVKnSng0z2nj/pAvjUOaamfrm1jEA330JGhF afBYg+ekRsgbiiaXxPiKyE3pw5UH0WLzkKmrDE5HaE8u0DfG4m/eSRDgyH9fEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697685894; a=rsa-sha256; cv=none; b=YRMO5jV9Lj6ytGA21SvG1Jtj1MymXUr4672rbtqCDdn3J6Tdx1OvpgPLPF/5hK+twTNR0p ChGWkGPuMkp93E4uMCCyOfeHezvJD80eHMxhkrYcLOXYgmMrKK2MI5B6E23lT8dKOTQbfm cerDRRo81u90bAUxa6WF0JDmYUZX3i2v87ymgchY+iEm/Kpygcnnt+GgB2GX7SwJ9cZqCM SHOPEEompxq6hvFNLMqbZA4tItBUxcc807mMTi9xwpRnLcjmNyiIEQRwgxsrgXLulkzlWo zCrKWSqCrdu9asI5gaeERlWKv6sNpkcjyjTPTdzONcNF/Do7DrO/IHcSoTmqNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697685894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1G2UhIzh58uT5rLgi9LSTXhxaFL7hRGEhagzD5CJMc=; b=Hg7EBe5FTO/wU+FTWCFxdGU9ngYhAUhYghPLD+63b4LCqS6tFjBMErFjVAzOHT42GAUXUt YBnL71lWiTxqRQX/c7Kck9sJH6pm8gWzqM41FsCQ5HqF1BQF8YTmpKePG5wKGdqWC7IS7S 8nV4hlXYdX/GR9a+sqVCb3wGbkGMOHqRd/xOt0QlPHTmD4556Hhosq+T47gcpDDP7jMCci z8x2DPFmHPFV24w4Hft7hQgrhJXuqDYjoBb6gJ3yk7nazof0ZiFlqmoarLc8Cj1wZdA0Av 6b1AcBJ2o3WZ7YFa2azHsuoykNqcDUP1HanWSZVVqiAJWDyYHs+ovlYk3iYlCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9tPf18v4zYdm; Thu, 19 Oct 2023 03:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J3Os7w078939; Thu, 19 Oct 2023 03:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J3OsqK078936; Thu, 19 Oct 2023 03:24:54 GMT (envelope-from git) Date: Thu, 19 Oct 2023 03:24:54 GMT Message-Id: <202310190324.39J3OsqK078936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f07b267d8cc8 - main - smartpqi: Change alignment for dma tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f07b267d8cc87e88be3c78aa69504b5ebc6571ee Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f07b267d8cc87e88be3c78aa69504b5ebc6571ee commit f07b267d8cc87e88be3c78aa69504b5ebc6571ee Author: John Hall AuthorDate: 2023-10-19 03:10:58 +0000 Commit: Warner Losh CommitDate: 2023-10-19 03:12:27 +0000 smartpqi: Change alignment for dma tags Problem: Under certain I/O conditions, a program doing large block disk reads can cause a controller to crash. Root Cause: The SCSI read request and destination address in the BDMA descriptor is incorrect, causing the BDMA engine in the controller to assert. Fix: Change the alignment for creating bus_dma_tags in the driver from PAGE_SIZE (4k) to 1, which allows the controller to manage it's own address range for BDMA transactions. Risk: Medium Exposure: This reverts a change first made to support NVMe drives on Excalibur. At that time a 4k alignment was necessary. This no longer seems to be the case. PR: 259541 Reported by: Ka Ho Ng Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41619 --- sys/dev/smartpqi/smartpqi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c index e79a6f0a173f..402841bbf4d6 100644 --- a/sys/dev/smartpqi/smartpqi_main.c +++ b/sys/dev/smartpqi/smartpqi_main.c @@ -629,8 +629,8 @@ smartpqi_attach(device_t dev) * Create DMA tag for mapping buffers into controller-addressable space. */ if (bus_dma_tag_create(softs->os_specific.pqi_parent_dmat,/* parent */ - PAGE_SIZE, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR,/* lowaddr */ + 1, 0, /* algnmnt, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ (bus_size_t)softs->pqi_cap.max_sg_elem*PAGE_SIZE,/* maxsize */ From nobody Thu Oct 19 05:22:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9x0t5f6Hz4y0KR; Thu, 19 Oct 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9x0t4tDVz4WLr; Thu, 19 Oct 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxmCcHEQ6izrezYl94vYTc0ehzqbWq9TjWvY+jm62Uc=; b=refzRkndTPgAlh1Ur8f5DI+nZF94e3H/t0cgeCNwTdyYDtO19qsxGkZN8HvxwpirWfjI3Q xL7lG8nMYPrvnkKfW1pTrbEC7uwgwzj6rLrmiPVQTBNAczC2i1E1TJAKxNWalRVvtvXg30 1m6Z6RzQUbQXnDcnxmpjRTI5NLWN50xNC3l8Hv2oRNW1g3qioEdmMWnJxZlVKBCG7kaOj2 cMH8sFjChM+uUFAYZPs1BWy80dVVDbIRkmVIG+JmaMh5v+rXz8cB+uU+ES1lCmCTkEH4e6 jpyg8Oxif2hoDHfmkBSUNfXI+65z8dHcELeohY9LPHCtW+Lyr/UKrZTKsuNjEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697692926; a=rsa-sha256; cv=none; b=yoBvbUY5JOsvZZcHOuUoV77Qt2I3oQ72vk2MmrMxqdfagNOt5MDsFFPhoY7ACl3EURKL6b uviZwauXEYo1+GNXRm8nI0ODYV8VzUBKmcstFp25HqCwD2bFR8oRunq5NSbfa6MuDIfnQN A4eaLy2uglcOAZ3OnaQylz2kJQ/EQcSPS2y0JNQ65lmfE8oV8qRtqOh4/s+x+SqeCUcjl7 AnAqm4KHxTVLbnaQ3cRqWs7BqGmWJbkw8MicdwzBdmIBGNS7HkMkPPDPjNmUTF2qNmsl/j UoL5RvO/Ldwviio8SrfF0rDDru11H+owyr9rNF1VcWtOo4Wscju8gj79H5d4AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxmCcHEQ6izrezYl94vYTc0ehzqbWq9TjWvY+jm62Uc=; b=Yql8BVZsMgnqTYCH84UYZuOQY9NykFjQhPYzHXqzmsCzAh6BagqQP6BsuVAXGM+19ycD09 xCsdqNc8mnaWd7duEmQkFNcPrQlevQXO+Q/alF78DFyPv90qkwnBlFp58orJewoYmTk7Ea cxLhqpp1kMaV9TzRqwWALYpVPSM1cBDKsvmP+RN2s/nl0DRiDKH5LH8sr6b7aHzXqL8Tb0 OljMHeVtOaY6DuoQCZ6IoAXygohUUKjxRzCLNR3IRy0cJ0hlXIZaynvtxkRRtK03PiAqEO ubcp4hYFceXPpSzKdlnUGkpIpzQos3oGAuijaG/byIKwi9AfOWT4AfvI66jSLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9x0t3wrkzcV9; Thu, 19 Oct 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J5M6gi073749; Thu, 19 Oct 2023 05:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J5M6Ln073746; Thu, 19 Oct 2023 05:22:06 GMT (envelope-from git) Date: Thu, 19 Oct 2023 05:22:06 GMT Message-Id: <202310190522.39J5M6Ln073746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 2d49ff1e21a7 - main - tests/netlink: mark the vlan(4) test with required module List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2d49ff1e21a74b8f641752b63a59dc3ef9e38ddc Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2d49ff1e21a74b8f641752b63a59dc3ef9e38ddc commit 2d49ff1e21a74b8f641752b63a59dc3ef9e38ddc Author: Gleb Smirnoff AuthorDate: 2023-10-19 05:21:53 +0000 Commit: Gleb Smirnoff CommitDate: 2023-10-19 05:21:53 +0000 tests/netlink: mark the vlan(4) test with required module --- tests/sys/netlink/test_rtnl_iface.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/netlink/test_rtnl_iface.py b/tests/sys/netlink/test_rtnl_iface.py index d34e36ee8eef..41cb4d16de94 100644 --- a/tests/sys/netlink/test_rtnl_iface.py +++ b/tests/sys/netlink/test_rtnl_iface.py @@ -317,6 +317,7 @@ class TestRtNlIface(NetlinkTestTemplate, SingleVnetTestTemplate): @pytest.mark.require_user("root") def test_create_vlan_plain(self): """Creates 802.1Q VLAN interface in vlanXX and ifX fashion""" + self.require_module("if_vlan") os_ifname = self.vnet.iface_alias_map["if1"].name ifindex = socket.if_nametoindex(os_ifname) From nobody Thu Oct 19 05:22:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9x0v70k5z4xyvY; Thu, 19 Oct 2023 05:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9x0v6LNsz4WYf; Thu, 19 Oct 2023 05:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LT3ibNk/zVzzq9MXiJAM0C3QHH8jbo2D+Ib8qeIAtI=; b=lNBZZdkSagyaadA+RssdZiRLu+a1kITYoKjdcXM7SjfXl6ZV5UQpjjX/+oGkxJdCJAGxJQ 4qdGYgF9zkydejMVSo+ZpB29OMI3iZKFmfAOfy0kribH93c5nkxf8ZKMOnDa/ocypN2c+C zVv3neaIUWXHCJBOevO3HtrP3uQs0Iq5Z+netE1kWBEj32ezNMRy+N9nbic5tLBDx0FMKt nJ7k3fLgERb8j3NGlniNC6WYXJGD+riImOocJTHdNS/lUNCQ7KdSqwxytrSRbr2rl7O7Il ierV0zV/ZpmbvzSCbqTOcdXgVn7kCGAWRJy132Ha2OhxaAxOnEDdaDAr79A5Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697692927; a=rsa-sha256; cv=none; b=vsWL/aGxBDJBOYj7bP440OI94dDRbBdhaCOY0xx5GqJw+2Tebotp3vl5ywtbsjg48rdUKs EG7g2pWX8Sbmab23nnpRocpT/bEJLYWBOTteIhPS3BfdwK24Rj4yGPec3xlDICtztUTt3G kFdz+pa4dZAn1TUUgqYEnb2MLUgj/hT2J69tRkIArwxbiwNZMp7JIkwZGGsBSU2xtNmDB/ DhPpAAmaHyn6JGmMWwbiKfxwW9RhdktQEwhLTSBpRSERY6cjAg9WQCxswpSoS4q3cTWYGY /9Q4deu6I89pW78njvWtGj3SXkRjeBdlv5zKyacTegWW/9s5mMSdPDFcd8RHUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LT3ibNk/zVzzq9MXiJAM0C3QHH8jbo2D+Ib8qeIAtI=; b=WrXL90gcQOvjeq1BBpf3nbOH1s9WyrKb9UY/uwJmYG3HYVwl15caifkN7VSetIoJ/bmJJb b2Y2iw/aE0NybVWbr9uOfyTAgyI4/4DD4xdHWYaUQ6PrjhfqX0Z0OvUALDchuBXNSPspiR 6bzvylQg8QZQcx30Fuxnm9F7WZaq6me6gaGN4oGaEe7nAuWiR8DQO2FiBoTIlJQfMKdypL YBIvrbhRlnPnh3iv1GyyWMzueEYGtktRo075/skhopmtqDLGZWMNFKlGcg2SspQz6JGOKW MkJBHCIWrc9kdJ1aWQJP+p3V9wCKVryIBoLcdzeEpUbesLoUgwnHlVMlyDbzrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9x0v58BkzcHl; Thu, 19 Oct 2023 05:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J5M7tb073794; Thu, 19 Oct 2023 05:22:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J5M7uk073791; Thu, 19 Oct 2023 05:22:07 GMT (envelope-from git) Date: Thu, 19 Oct 2023 05:22:07 GMT Message-Id: <202310190522.39J5M7uk073791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 28f6910714e3 - main - net/route: properly brace the RT_LOG() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 28f6910714e32138fa2b2950a22aac91c04bd053 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=28f6910714e32138fa2b2950a22aac91c04bd053 commit 28f6910714e32138fa2b2950a22aac91c04bd053 Author: Gleb Smirnoff AuthorDate: 2023-10-19 05:21:53 +0000 Commit: Gleb Smirnoff CommitDate: 2023-10-19 05:21:53 +0000 net/route: properly brace the RT_LOG() macro --- sys/net/route/route_debug.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/net/route/route_debug.h b/sys/net/route/route_debug.h index b00fbf1784e7..1e682bd4561b 100644 --- a/sys/net/route/route_debug.h +++ b/sys/net/route/route_debug.h @@ -107,10 +107,11 @@ SYSCTL_DECL(_net_route_debug); * Example: [nhop_neigh] nhops_update_neigh: L2 prepend update from lle/inet/valid/vtnet0/10.0.0.157 */ #define RT_LOG(_l, _fmt, ...) RT_LOG_##_l(_l, _fmt, ## __VA_ARGS__) -#define _RT_LOG(_l, _fmt, ...) if (_DEBUG_PASS_MSG(_l)) { \ - _output("[" DEBUG_PREFIX_NAME "] %s: " _fmt "\n", __func__, ##__VA_ARGS__); \ -} - +#define _RT_LOG(_l, _fmt, ...) do { \ + if (_DEBUG_PASS_MSG(_l)) \ + _output("[" DEBUG_PREFIX_NAME "] %s: " _fmt "\n", \ + __func__, ##__VA_ARGS__); \ +} while (0) /* * Wrapper logic to avoid compiling high levels of debugging messages for production systems. From nobody Thu Oct 19 08:52:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB1gS5QmRz4y8cW; Thu, 19 Oct 2023 08:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB1gS4zNMz3R1h; Thu, 19 Oct 2023 08:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzvSsZ1B3M2a7JV+YSE4HipaOAXGQCqmGHotl71Shec=; b=vbt4wJwKHYxMVBbTZzSptHZPt09JnkKUideQASi4naVIUJKHycTDiq4rhTMXWiJ/cJffaK pIXPwYbnuiNgZ6YsrMnu/PXQbyKy9zHflbnmBEcMV+BrdXUMzsz3SGtqhBkh28TbL2YJIe Alg7XRdjbW/05seCali6EPtIniecV1k0D345u7X5MDRuwqltkznrEzK/K5W83qUR9DCdBo UiQUsGb0/7XoKD/fcsB3jdAKdvPTsn9uI6x1RZGTd4jqDNgNqxVpfUGCJAPAFGLPf8Rgb7 15fIfKnmBE7xwzP2zDAU5VirfMeBxBZMCDO0AG2tsUqjicIu5atbOA6Ff8+ISg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697705540; a=rsa-sha256; cv=none; b=GwfkdLtSz/H4tt9jhddYBAVogD0SEc7pR43E1bg4nvXbWX/D93RlffrImU7pjUR1ybs0YJ jFMy9WH5awEWZolhr225pA+Myi+RwIa+l1RJ3Sy5B4jzZGFjMwLvZ5gwGMcfaRCKKcI/rK u0ZL6X3pv9ruHKUnA44PffX7dhtKjGqcq4MqIiKfsvpmnsoflP4V6RvYGBSxRYHg4G9c0V 29NcacNK35uVJ9pJFDh2EGUBrMixG9aEb1bHWono3BhddGlf++RMl432KJasbc4o3aSydi /HHjt9iADPNL0r5kWh6X8jFsKmXpUIgvMtoCD6D26+goszhBBVFSOYwhe23a4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzvSsZ1B3M2a7JV+YSE4HipaOAXGQCqmGHotl71Shec=; b=a94kCzVUienCcTcto6SGNG247blOkRcVAhJ8Ne1MqkStXg6jNAE+U+8zVdOGc1yigx8XQi WtLa2V0fWlmdeEXQfj//FGg0XyjjdN59eW3L1BOnKGhu/+HAuI2CVyU6/gQdbxdN8Ei0lX CsBsw+Zfh8UBUsA6w4O1W3e6mK2M114dkCMCtb6VFOxbKscBj/qkdPXzjA8e69fMi8mx7u dS2h5Zq1T6QVD156zuY2bjYE19uyScLcwt7rSCAd1V44eKuFt8aG18qkG8qRkDBItKyavU R7a4kzBdFg3IrESOrKG7isXYqnF1EUATx6ODp/qdKVz0KG+YixkYQpFX528sPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB1gS42L9zjrG; Thu, 19 Oct 2023 08:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J8qKmD028788; Thu, 19 Oct 2023 08:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J8qKqb028786; Thu, 19 Oct 2023 08:52:20 GMT (envelope-from git) Date: Thu, 19 Oct 2023 08:52:20 GMT Message-Id: <202310190852.39J8qKqb028786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5ed470bdb9da - main - pf: Update documentation regarding matching, scrubbing and reassembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 5ed470bdb9da6442d6030cf0a7a8493f759fbb43 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5ed470bdb9da6442d6030cf0a7a8493f759fbb43 commit 5ed470bdb9da6442d6030cf0a7a8493f759fbb43 Author: Kajetan Staszkiewicz AuthorDate: 2023-10-19 08:41:32 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 08:41:32 +0000 pf: Update documentation regarding matching, scrubbing and reassembly Update pf documentation: - default behaviour of fragment reassembly - introduction of scrub option for filter rules - disadvantages of using the old scrub ruleset - options supported for match rules - fix missing list block end - remove duplicate description of match filter rule - update example to modern syntax Reviewed by: kp Fragments obtained from: OpenBSD Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42270 --- share/man/man5/pf.conf.5 | 149 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 103 insertions(+), 46 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 2bc57d4f7f5b..349e6c9ee4eb 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 21, 2023 +.Dd October 17, 2023 .Dt PF.CONF 5 .Os .Sh NAME @@ -386,7 +386,9 @@ set limit frags 20000 .Ed .Pp sets the maximum number of entries in the memory pool used for fragment -reassembly (generated by +reassembly (generated by the +.Ar set reassemble +option or .Ar scrub rules) to 20000. Using @@ -480,6 +482,29 @@ For example: .Bd -literal -offset indent set optimization aggressive .Ed +.It Ar set reassemble yes | no Op Cm no-df +The +.Cm reassemble +option is used to enable or disable the reassembly of fragmented packets, +and can be set to +.Cm yes +or +.Cm no . +If +.Cm no-df +is also specified, fragments with the +.Dq dont-fragment +bit set are reassembled too, +instead of being dropped; +the reassembled packet will have the +.Dq dont-fragment +bit cleared. +The default value is +.Cm no . +.Pp +This option is ignored if there are pre-FreeBSD 14 +.Cm scrub +rules present. .It Ar set block-policy The .Ar block-policy @@ -753,19 +778,21 @@ Used to specify that packets must already be tagged with the given tag in order to match the rule. Inverse tag matching can also be done by specifying the ! operator before the tagged keyword. +.El .Sh TRAFFIC NORMALIZATION -Traffic normalization is used to sanitize packet content in such -a way that there are no ambiguities in packet interpretation on -the receiving side. -The normalizer does IP fragment reassembly to prevent attacks -that confuse intrusion detection systems by sending overlapping -IP fragments. -Packet normalization is invoked with the -.Ar scrub -directive. -.Pp -.Ar scrub -has the following options: +Traffic normalization is a broad umbrella term +for aspects of the packet filter which deal with +verifying packets, packet fragments, spoofed traffic, +and other irregularities. +.Ss Scrub +Scrub involves sanitising packet content in such a way +that there are no ambiguities in packet interpretation on the receiving side. +It is invoked with the +.Cm scrub +option, added to filter rules. +.Pp +Parameters are specified enclosed in parentheses. +At least one of the following parameters must be specified: .Bl -tag -width xxxx .It Ar no-df Clears the @@ -824,22 +851,8 @@ Replaces the IP identification field with random values to compensate for predictable values generated by many hosts. This option only applies to packets that are not fragmented after the optional fragment reassembly. -.It Ar fragment reassemble -Using -.Ar scrub -rules, fragments can be reassembled by normalization. -In this case, fragments are buffered until they form a complete -packet, and only the completed packet is passed on to the filter. -The advantage is that filter rules have to deal only with complete -packets, and can ignore fragments. -The drawback of caching fragments is the additional memory cost. -This is the default behaviour unless no fragment reassemble is specified. -.It Ar no fragment reassemble -Do not reassemble fragments. .It Ar reassemble tcp Statefully normalizes TCP connections. -.Ar scrub reassemble tcp -rules may not have the direction (in/out) specified. .Ar reassemble tcp performs the following normalizations: .Pp @@ -891,6 +904,41 @@ blind attacker would have to guess the timestamp as well. .Pp For example, .Bd -literal -offset indent +match in all scrub (no-df random-id max-mss 1440) +.Ed +.Ss Scrub ruleset (pre-FreeBSD 14) +In order to maintain compatibility with older releases of FreeBSD +.Ar scrub +rules can also be specified in their own ruleset. +In such case they are invoked with the +.Ar scrub +directive. +If there are such rules present they determine packet reassembly behaviour. +When no such rules are present the option +.Ar set reassembly +takes precedence. +The +.Ar scrub +rules can take all parameters specified above for a +.Ar scrub +option of filter rules and 2 more parameters controlling fragment reassembly: +.Bl -tag -width xxxx +.It Ar fragment reassemble +Using +.Ar scrub +rules, fragments can be reassembled by normalization. +In this case, fragments are buffered until they form a complete +packet, and only the completed packet is passed on to the filter. +The advantage is that filter rules have to deal only with complete +packets, and can ignore fragments. +The drawback of caching fragments is the additional memory cost. +This is the default behaviour unless no fragment reassemble is specified. +.It Ar no fragment reassemble +Do not reassemble fragments. +.El +.Pp +For example, +.Bd -literal -offset indent scrub in on $ext_if all fragment reassemble .Ed .Pp @@ -902,6 +950,14 @@ much in the same way as works in the packet filter (see below). This mechanism should be used when it is necessary to exclude specific packets from broader scrub rules. +.Pp +.Ar scrub +rules in the +.Ar scrub +ruleset are evaluated for every packet before stateful filtering. +This means excessive usage of them will cause performance penalty. +.Ar scrub reassemble tcp +rules must not have the direction (in/out) specified. .Sh QUEUEING with ALTQ The ALTQ system is currently not available in the GENERIC kernel nor as loadable modules. @@ -1479,28 +1535,21 @@ rules differ from .Ar block and .Ar pass -rules in that parameters are set every time a packet matches the rule, not only +rules in that parameters are set for every rule a packet matches, not only on the last matching rule. For the following parameters, this means that the parameter effectively becomes "sticky" until explicitly overridden: .Ar queue , .Ar dnpipe , -.Ar dnqueue +.Ar dnqueue , +.Ar rtable , +.Ar scrub . .It Ar pass The packet is passed; state is created unless the .Ar no state option is specified. -.It Ar match -Action is unaltered, the previously matched rule's action still matters. -Match rules apply queue and rtable assignments for every matched packet, -subsequent matching pass or match rules can overwrite the assignment, -if they don't specify a queue or an rtable, respectively, the previously -set value remains. -Additionally, match rules can contain log statements; the is logging done -for each and every matching match rule, so it is possible to log a single -packet multiple times. .El .Pp By default @@ -2579,6 +2628,8 @@ contain the necessary header information for the subprotocol that allows to filter on things such as TCP ports or to perform NAT. .Pp Besides the use of +.Ar set reassemble +option or .Ar scrub rules as described in .Sx TRAFFIC NORMALIZATION @@ -2587,7 +2638,11 @@ above, there are three options for handling fragments in the packet filter. One alternative is to filter individual fragments with filter rules. If no .Ar scrub -rule applies to a fragment, it is passed to the filter. +rule applies to a fragment or +.Ar set reassemble +is set to +.Cm no +, it is passed to the filter. Filter rules with matching IP header parameters decide whether the fragment is passed or blocked, in the same way as complete packets are filtered. @@ -2620,11 +2675,13 @@ rules. .Pp In most cases, the benefits of reassembly outweigh the additional memory cost, and it's recommended to use +.Ar set reassemble +option or .Ar scrub -rules to reassemble -all fragments via the +rules with the .Ar fragment reassemble -modifier. +modifier to reassemble +all fragments. .Pp The memory allocated for fragment caching can be limited using .Xr pfctl 8 . @@ -2989,12 +3046,12 @@ rdr on $ext_if proto tcp from any to any port 80 \e # (157.161.48.183, the only routable address) # and the private network is 10.0.0.0/8, for which we are doing NAT. +# Reassemble incoming traffic +set reassemble yes + # use a macro for the interface name, so it can be changed easily ext_if = \&"kue0\&" -# normalize all incoming traffic -scrub in on $ext_if all fragment reassemble - # block and log everything by default block return log on $ext_if all From nobody Thu Oct 19 10:34:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB3x22fgYz4xGsX; Thu, 19 Oct 2023 10:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB3x22575z3Ymb; Thu, 19 Oct 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697711654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6m8UaAImprzWyzG9F1hPX+02qSkX65oWCcdcLkJyFw=; b=LsUQ8u83oGjSTLACUNCc0ycVpvHsu9jX0q7HGGg0TbS3zuzQew+8kHBeRDMPjYBL6EEVM+ MdDqA69nbAu7LrFp/+Ul/roeWYBaKBg3ZCu+pcO5B6+/RZy39217K3OwumigOEScCjtNND wx1Ygm7IHwz15wJe6S9X4Fc2YtSV5XjoxasnTmVhlPPl8CDoobgog5cfxYQMNvcT8oFXGq /t6NHj9zTwn6zftRyZUqRo/gLiM9jmQalBwyfzWPVKUF9jArtV/t5i1y5Cv5wa50yANQQB lXtmk7EH2kkPLytnVx9Brwie0Bmt1v7Pa8Dep96cOt/BBSqiqLh4F8ISqkDUPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697711654; a=rsa-sha256; cv=none; b=qksVxBvQiHUsv2EZgSgaiRvuF9FtytPaQtmMy4Uph+VoKGtBo8DzRZC3AobVs+2f1iy6Cs zfZWcjf7Ym1f+gnX6Ef7GDA85sk3hQL3C5xWwIESHqgIyuylONNASZwyXGSLIn8fnY05eU KnIS/XPqmvIgbs8TaYpa9KUlosi4msgg9lSVoOw33NzF0gaXsus18O/5IZUJzx90zo3PD3 pzD593a2GQ8fQSIpza6dW986g1TE/pbmwCfMUQJ9tJ5Bli2yAU0aNyAZnwhvBA5rQGQ55F bO6Gvr3FYR+0JwJIXv5gaDSOdT3c+fAiOi29opEtuH9kjRllyNrLbiYB+7cS6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697711654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6m8UaAImprzWyzG9F1hPX+02qSkX65oWCcdcLkJyFw=; b=xUcUKzLRzD1wTbDtAoiQpqytFR6M/XTffHUMjab2ybjZ9ynj3G0xRkRhdE37pu0eKY9Uzz 24vWDOWtF9TGUaal/GA4Xz7ag0L5/L/yJCtcflDj6aZAIjlqwOhDlXlwStIaPru5pdP1Gx MhgAQzle0g8L8lWB2a0NcaWiwkL6OCPJwHuXdMLYhaP+eL2C+cArqjvJZ+zL6JN/T3geiI kgA0acCGU7JR9u+jHHU36ABZl2VRBrdI4gt1sR/bDu5IK7OrnTh/ln9IqOm1QQXXRO0G64 Q8oXmXCHze5nd42o1ZQsSPzhYa5wA3qsmBYwuMaf/KP941DRcAf6bCUr8bk2CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB3x217tXzmLg; Thu, 19 Oct 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JAYEu0095529; Thu, 19 Oct 2023 10:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JAYEE9095527; Thu, 19 Oct 2023 10:34:14 GMT (envelope-from git) Date: Thu, 19 Oct 2023 10:34:14 GMT Message-Id: <202310191034.39JAYEE9095527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: bb8ecf259f96 - main - vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb8ecf259f96510b9c2146d846403393543061b7 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8ecf259f96510b9c2146d846403393543061b7 commit bb8ecf259f96510b9c2146d846403393543061b7 Author: Dmitry Chagin AuthorDate: 2023-10-19 10:33:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-19 10:33:58 +0000 vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI This is a temporary solution to fix PR before release. During 15.0 it's necessary to refactor symlinks handling between vfs & namecache. PR: 273414 Reported by: Vincent Milum Jr, Dan Kotowski, glebius Tested by: Dan Kotowski, glebius Reviewed by: Differential Revision: https://reviews.freebsd.org/D41806 MFC after: 3 days --- sys/kern/vfs_cache.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 99e293d5a873..4b51b3558739 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5426,12 +5426,14 @@ cache_fplookup_symlink(struct cache_fpl *fpl) struct nameidata *ndp; struct componentname *cnp; struct vnode *dvp, *tvp; + struct pwd *pwd; int error; ndp = fpl->ndp; cnp = fpl->cnp; dvp = fpl->dvp; tvp = fpl->tvp; + pwd = *(fpl->pwd); if (cache_fpl_islastcn(ndp)) { if ((cnp->cn_flags & FOLLOW) == 0) { @@ -5487,6 +5489,9 @@ cache_fplookup_symlink(struct cache_fpl *fpl) cache_fpl_checkpoint(fpl); return (cache_fpl_partial(fpl)); } + if (__predict_false(pwd->pwd_adir != pwd->pwd_rdir)) { + return (cache_fpl_aborted(fpl)); + } } return (0); } From nobody Thu Oct 19 11:00:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB4W73XVzz4xHs6; Thu, 19 Oct 2023 11:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB4W731Spz3dK1; Thu, 19 Oct 2023 11:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697713219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7L151Cej8FIrzCCwm+I8WLzTkWUIubJ8+WfpwH8NUTM=; b=iWV8j419t+N4gDuv/Hi2hKVWAILgKj2BbQsaUecSayY6sLxpXlH0EAdYQ63ZRrbzGV8iIg KD0hoiwrkA/ZTFZkkM1V6cEIieDd3Rd9MmeePta3H0wdPvpdqr3xny+0Ruuj2o79Oprr43 +khny2e9vtqHWHf1/BipMs82jYuu9L5FHx+MsWY1JRnym00y/qaqwt/XqchFO1lRBX0HRR lZ8XAs1r93V7XrZOdpPhVlkEAAhrjfUtGAeQiOpXJ+325a0eeYT3/UoDsOrH80+tS4OZi8 BQEcs5NHecZLO9+BpQM69+HUFAfllcJioxoCyCRnXMSHcK1TYsn0KdVJurz3OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697713219; a=rsa-sha256; cv=none; b=cUk4H/evRWeDQVE2RcuezCktQ05CRc6806pQeiuPSPIgxmf5221qFN0Q3zh77UFVnvG41H 9uV8TuSDtzM1tjG5rrLXcY8cxtJZTLt6DtnZlOdnvUnqS4GNkPPYO04iQElR6PyR0sHmDY 74DTPdz8t3L+gfKvE6bJXYPPB+toXN3YSwdR6E7zl6NaoKpTGkzfPjvDT03g5HAEBllkZ0 hax6ZfN+S5A6YY27DqGctiUpEsXqrjMbbOL6+Vb8FyKDoboym1vU34uYUOE1s30wJDlVDY 4rTBwNIHXTAHod0OWUMXehTeggflM0gnPkRKUAPP9LFWf5gjER63Ib0C6y7McQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697713219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7L151Cej8FIrzCCwm+I8WLzTkWUIubJ8+WfpwH8NUTM=; b=R0KmERIT0sKSRAeBhUP82BuQwXU/VLQJXGNHDKfCUsw8bJPHA3kQ752DHuse0ByQ7KeiSq cyKStdccpRNhgt5kGGxDFhvdqLqU/yhR2w6foZXwviXoxfgTtUk7fqD7cz1Dc2vwPRYNca CGuzvpG44tHrg5shk4aX2+GtYdneNzvXmJb8AllzC5W/9DzMZXQruI3IJEtfFaer/RD6/P +K/tLNhM2Jem5Wt+/XwB8MKS93n+vGmbM/5w1TLNgNC+Nb92BiRhAS2d2mDCkTprLdDtcE BukYAnzfa1U92p9U/XxSddILCMeetPRcaCWMCZ/DdN3S0geC5n/VMaQi3aMHNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB4W724Sxzm2k; Thu, 19 Oct 2023 11:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JB0Jce039293; Thu, 19 Oct 2023 11:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JB0JJN039291; Thu, 19 Oct 2023 11:00:19 GMT (envelope-from git) Date: Thu, 19 Oct 2023 11:00:19 GMT Message-Id: <202310191100.39JB0JJN039291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: e44751530e04 - main - bsdinstall hostname: Restore bsdconfig API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e44751530e04ef8326ff22c0d3f7d880c82d3395 Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=e44751530e04ef8326ff22c0d3f7d880c82d3395 commit e44751530e04ef8326ff22c0d3f7d880c82d3395 Author: Alfonso S. Siciliano AuthorDate: 2023-10-19 10:54:24 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-10-19 10:59:49 +0000 bsdinstall hostname: Restore bsdconfig API Restore bsdconfig API to handle hostname dialog because bsddialog 1.0 matches all features required by bsdconfig(1). Implicitly this commit restores also Xdialog(1) for this script. This commit reverts: - "bsdinstall hostname: Replace dialog with bsddialog" 6368dcb29228dd8e18d50c54c3ca1596262d4676 - "bsdinstall(8) hostname: Update for bsddialog 0.3" 5f3ec44e7e9c11f90ad1128db1116925b493fad0. The script continues to use bsddialog(1) by default via $DIALOG in bsdconfig(1). --- usr.sbin/bsdinstall/scripts/hostname | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/hostname b/usr.sbin/bsdinstall/scripts/hostname index 7aa97ef095f7..19df8885893b 100755 --- a/usr.sbin/bsdinstall/scripts/hostname +++ b/usr.sbin/bsdinstall/scripts/hostname @@ -47,8 +47,6 @@ f_include $BSDCFG_SHARE/dialog.subr ############################################################ GLOBALS -: ${BSDDIALOG_CANCEL=1} - # # Strings that should be moved to an i18n file and loaded with f_include_lang() # @@ -75,14 +73,18 @@ dialog_hostname() local hline= local value="$*" - bsddialog \ + local height width + f_dialog_inputbox_size height width \ + "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$prompt" "$value" "$hline" + + $DIALOG \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --hline "$hline" \ --ok-label "$msg_ok" \ --no-cancel \ --inputbox "$prompt" \ - 0 0 "$value" \ + $height $width "$value" \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD } @@ -98,7 +100,7 @@ f_dialog_backtitle "$msg_freebsd_installer" # Get user input # HOSTNAME=$( dialog_hostname "$HOSTNAME" ) -[ $? -eq $BSDDIALOG_CANCEL ] && exit 1 +[ $? -eq $DIALOG_CANCEL ] && exit 1 # # Store the user's choice From nobody Thu Oct 19 12:37:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB6gS05Kcz4xPDy; Thu, 19 Oct 2023 12:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB6gR6szGz4JPZ; Thu, 19 Oct 2023 12:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697719059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqfQ6C7xy/AA1msqRwpEI7Tyx3caU3u5EZB4kOCPezk=; b=OQGGeJKtdqQynz0liEUS2nzp31N2zn0ZP19h+8auIG6nyVyNM8jB/CIiPdvBsBJzeAlmgB c56KcDh0hHBakd+7Zlr+5aFpTwWdvSnqaQDHGbOp9IpCE3MW2kyusef31+KpRMWFsYGZGh wXSOwiOXMurZJknJkPomOUJ+/DgyJbYWz+jRytyQ3LmZgLib7UCLQ+Y7swr28vnMA4KP9C Im90FE6+e7zxhKzElPstwNcCSvMvfWFhXMUWiuT7dyFR8lZP6JdR650CwosLX6T5KLHBpv BaKx+P0+8SU/8FVQfmoLfg0h0tTa6c69HPZTqwV756LfEdcsoygq9uWPWjAzdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697719059; a=rsa-sha256; cv=none; b=EKVQdWirdaYMVa0KPZkH4uDSEud9JX1icYDCKbfXoV6SW+OR3EnWAY65/VwwD5v11fI2Tx uNxGP609E1JgoEL/1qHmqywupl70yBTN4Xuavq4b10S7rJAnC4C8Kp3mbYfECIhANpzZs9 Rp+tTDNCZT/C+oPkhz/TgLyr87IJ9c+v2ULAHimw+vmQUn6wNev50eE29aPaC4SCi2Mm9D QA9l2+U4LpAm3/igEymPaqDCBpPDQ8eOKd0f8b0UKgOs06m4CGtwTj2TEks6a87jDH1oZN 5mcTSXrcq3noJwQ6rLq1ShIRsvScN5wkTSliYYzdQtOe4n9CV1WGCnLheOFPbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697719059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqfQ6C7xy/AA1msqRwpEI7Tyx3caU3u5EZB4kOCPezk=; b=V3B14zxJPKe2fIIlswdlQI4JLFJxQNMvtuKtM4Q7CgdTS158kt572vfUn7ORY7VbtNUSAl dt+qezoXcO0cWQwUqlQ8bK4u/pOjgNd//DaGylrH9wXQBOa1cusKGfDTkjIHtKzjRN0hfP m2Tm2y0RCbDdVbmsLgaOl3e/2XbJJRq3Jj+mBI5QMVl0rn7r+wRDlA11/NjoMlBMI8qzBS 6x/0ksaK9InMr/XB7HMokWyrMYCV4s2NwvF7EWGI/gqjmL2DEWNwMEH4S3a7fcpZAriCRi x0uJ32O1kNKXdbg8b8OFNwGNStwtHwX4fOYqkPK1FGLLyOpQy7vzY4MMyTLJSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB6gR5q71zpqp; Thu, 19 Oct 2023 12:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JCbdFX094557; Thu, 19 Oct 2023 12:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JCbdXp094554; Thu, 19 Oct 2023 12:37:39 GMT (envelope-from git) Date: Thu, 19 Oct 2023 12:37:39 GMT Message-Id: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fabf705f4b5a - main - pf: fix pf divert-to loop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: fabf705f4b5aff2fa2dc997c2d0afd62a6927e68 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fabf705f4b5aff2fa2dc997c2d0afd62a6927e68 commit fabf705f4b5aff2fa2dc997c2d0afd62a6927e68 Author: Igor Ostapenko AuthorDate: 2023-10-19 10:12:15 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 10:12:15 +0000 pf: fix pf divert-to loop Resolved conflict between ipfw and pf if both are used and pf wants to do divert(4) by having separate mtags for pf and ipfw. Also fix the incorrect 'rulenum' check, which caused the reported loop. While here add a few test cases to ensure that divert-to works as expected, even if ipfw is loaded. divert(4) PR: 272770 MFC after: 3 weeks Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D42142 --- sys/netinet/ip_divert.c | 31 ++- sys/netinet/ip_var.h | 10 + sys/netpfil/pf/pf.c | 32 ++- tests/sys/netpfil/pf/Makefile | 4 + tests/sys/netpfil/pf/divapp.c | 149 ++++++++++++++ tests/sys/netpfil/pf/divert-to.sh | 413 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 625 insertions(+), 14 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index dd0a8b74c013..ad95a1ce0d76 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -171,11 +171,19 @@ divert_packet(struct mbuf *m, bool incoming) u_int16_t nport; struct sockaddr_in divsrc; struct m_tag *mtag; + uint16_t cookie; NET_EPOCH_ASSERT(); mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); - if (mtag == NULL) { + if (mtag != NULL) { + cookie = ((struct ipfw_rule_ref *)(mtag+1))->rulenum; + nport = htons((uint16_t) + (((struct ipfw_rule_ref *)(mtag+1))->info)); + } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { + cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; + nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + } else { m_freem(m); return; } @@ -216,7 +224,7 @@ divert_packet(struct mbuf *m, bool incoming) divsrc.sin_len = sizeof(divsrc); divsrc.sin_family = AF_INET; /* record matching rule, in host format */ - divsrc.sin_port = ((struct ipfw_rule_ref *)(mtag+1))->rulenum; + divsrc.sin_port = cookie; /* * Record receive interface address, if any. * But only for incoming packets. @@ -265,7 +273,6 @@ divert_packet(struct mbuf *m, bool incoming) } /* Put packet on socket queue, if any */ - nport = htons((uint16_t)(((struct ipfw_rule_ref *)(mtag+1))->info)); SLIST_FOREACH(dcb, &V_divhash[DIVHASH(nport)], dcb_next) if (dcb->dcb_port == nport) break; @@ -304,6 +311,7 @@ div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, const struct ip *ip; struct m_tag *mtag; struct ipfw_rule_ref *dt; + struct pf_divert_mtag *pfdt; int error, family; if (control) @@ -390,13 +398,30 @@ div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, return (EAFNOSUPPORT); } + mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL); + if (mtag == NULL) { + /* this should be normal */ + mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, + sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); + if (mtag == NULL) { + m_freem(m); + return (ENOBUFS); + } + m_tag_prepend(m, mtag); + } + pfdt = (struct pf_divert_mtag *)(mtag+1); + if (sin) + pfdt->idir = sin->sin_port; + /* Reinject packet into the system as incoming or outgoing */ NET_EPOCH_ENTER(et); if (!sin || sin->sin_addr.s_addr == 0) { dt->info |= IPFW_IS_DIVERT | IPFW_INFO_OUT; + pfdt->ndir = PF_DIVERT_MTAG_DIR_OUT; error = div_output_outbound(family, so, m); } else { dt->info |= IPFW_IS_DIVERT | IPFW_INFO_IN; + pfdt->ndir = PF_DIVERT_MTAG_DIR_IN; error = div_output_inbound(family, so, m, sin); } NET_EPOCH_EXIT(et); diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 06560fb52afe..a8c687682af9 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -326,6 +326,16 @@ extern void (*ip_divert_ptr)(struct mbuf *m, bool incoming); extern int (*ng_ipfw_input_p)(struct mbuf **, struct ip_fw_args *, bool); extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); + +/* pf specific mtag for divert(4) support */ +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +struct pf_divert_mtag { + uint16_t idir; // initial pkt direction + uint16_t ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter +}; +#define MTAG_PF_DIVERT 1262273569 + #endif /* _KERNEL */ #endif /* !_NETINET_IP_VAR_H_ */ diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 39d240f49dbd..a6c7ee359416 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7628,7 +7628,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, u_short action, reason = 0; struct mbuf *m = *m0; struct ip *h = NULL; - struct m_tag *ipfwtag; + struct m_tag *mtag; struct pf_krule *a = NULL, *r = &V_pf_default_rule, *tr, *nr; struct pf_kstate *s = NULL; struct pf_kruleset *ruleset = NULL; @@ -7718,21 +7718,26 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, off = h->ip_hl << 2; if (__predict_false(ip_divert_ptr != NULL) && - ((ipfwtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL)) != NULL)) { - struct ipfw_rule_ref *rr = (struct ipfw_rule_ref *)(ipfwtag+1); - if (rr->info & IPFW_IS_DIVERT && rr->rulenum == 0) { + ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL)) { + struct pf_divert_mtag *dt = (struct pf_divert_mtag *)(mtag+1); + if ((dt->idir == PF_DIVERT_MTAG_DIR_IN && dir == PF_IN) || + (dt->idir == PF_DIVERT_MTAG_DIR_OUT && dir == PF_OUT)) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { action = PF_DROP; goto done; } pd.pf_mtag->flags |= PF_MTAG_FLAG_PACKET_LOOPED; - m_tag_delete(m, ipfwtag); } if (pd.pf_mtag && pd.pf_mtag->flags & PF_MTAG_FLAG_FASTFWD_OURS_PRESENT) { m->m_flags |= M_FASTFWD_OURS; pd.pf_mtag->flags &= ~PF_MTAG_FLAG_FASTFWD_OURS_PRESENT; } + m_tag_delete(m, mtag); + + mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); + if (mtag != NULL) + m_tag_delete(m, mtag); } else if (pf_normalize_ip(m0, kif, &reason, &pd) != PF_PASS) { /* We do IP header normalization and packet reassembly here */ action = PF_DROP; @@ -8014,17 +8019,19 @@ done: if (__predict_false(ip_divert_ptr != NULL) && action == PF_PASS && r->divert.port && !PACKET_LOOPED(&pd)) { - ipfwtag = m_tag_alloc(MTAG_IPFW_RULE, 0, - sizeof(struct ipfw_rule_ref), M_NOWAIT | M_ZERO); - if (ipfwtag != NULL) { - ((struct ipfw_rule_ref *)(ipfwtag+1))->info = + mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, + sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); + if (mtag != NULL) { + ((struct pf_divert_mtag *)(mtag+1))->ndir = ntohs(r->divert.port); - ((struct ipfw_rule_ref *)(ipfwtag+1))->rulenum = dir; + ((struct pf_divert_mtag *)(mtag+1))->idir = + (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : + PF_DIVERT_MTAG_DIR_OUT; if (s) PF_STATE_UNLOCK(s); - m_tag_prepend(m, ipfwtag); + m_tag_prepend(m, mtag); if (m->m_flags & M_FASTFWD_OURS) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { @@ -8052,6 +8059,9 @@ done: ("pf: failed to allocate divert tag\n")); } } + /* this flag will need revising if the pkt is forwarded */ + if (pd.pf_mtag) + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_PACKET_LOOPED; if (pd.act.log) { struct pf_krule *lr; diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 44fe95680dfb..c9adab5626d4 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -2,10 +2,12 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf +BINDIR= ${TESTSDIR} TESTS_SUBDIRS+= ioctl ATF_TESTS_SH+= altq \ anchor \ + divert-to \ dup \ ether \ forward \ @@ -45,6 +47,8 @@ ATF_TESTS_PYTEST+= sctp.py # Tests reuse jail names and so cannot run in parallel. TEST_METADATA+= is_exclusive=true +PROGS= divapp + ${PACKAGE}FILES+= CVE-2019-5597.py \ CVE-2019-5598.py \ daytime_inetd.conf \ diff --git a/tests/sys/netpfil/pf/divapp.c b/tests/sys/netpfil/pf/divapp.c new file mode 100644 index 000000000000..908c41eaa67f --- /dev/null +++ b/tests/sys/netpfil/pf/divapp.c @@ -0,0 +1,149 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Igor Ostapenko + * + * 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 PROJECT 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 PROJECT 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. + */ + +/* Used by tests like divert-to.sh */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + + +struct context { + unsigned short divert_port; + bool divert_back; + + int fd; + struct sockaddr_in sin; + socklen_t sin_len; + char pkt[IP_MAXPACKET]; + ssize_t pkt_n; +}; + +static void +init(struct context *c) +{ + c->fd = socket(PF_DIVERT, SOCK_RAW, 0); + if (c->fd == -1) + errx(EX_OSERR, "init: Cannot create divert socket."); + + memset(&c->sin, 0, sizeof(c->sin)); + c->sin.sin_family = AF_INET; + c->sin.sin_port = htons(c->divert_port); + c->sin.sin_addr.s_addr = INADDR_ANY; + c->sin_len = sizeof(struct sockaddr_in); + + if (bind(c->fd, (struct sockaddr *) &c->sin, c->sin_len) != 0) + errx(EX_OSERR, "init: Cannot bind divert socket."); +} + +static ssize_t +recv_pkt(struct context *c) +{ + fd_set readfds; + struct timeval timeout; + int s; + + FD_ZERO(&readfds); + FD_SET(c->fd, &readfds); + timeout.tv_sec = 3; + timeout.tv_usec = 0; + + s = select(c->fd + 1, &readfds, 0, 0, &timeout); + if (s == -1) + errx(EX_IOERR, "recv_pkt: select() errors."); + if (s != 1) // timeout + return -1; + + c->pkt_n = recvfrom(c->fd, c->pkt, sizeof(c->pkt), 0, + (struct sockaddr *) &c->sin, &c->sin_len); + if (c->pkt_n == -1) + errx(EX_IOERR, "recv_pkt: recvfrom() errors."); + + return (c->pkt_n); +} + +static void +send_pkt(struct context *c) +{ + ssize_t n; + char errstr[32]; + + n = sendto(c->fd, c->pkt, c->pkt_n, 0, + (struct sockaddr *) &c->sin, c->sin_len); + if (n == -1) { + strerror_r(errno, errstr, sizeof(errstr)); + errx(EX_IOERR, "send_pkt: sendto() errors: %d %s.", errno, errstr); + } + if (n != c->pkt_n) + errx(EX_IOERR, "send_pkt: sendto() sent %zd of %zd bytes.", + n, c->pkt_n); +} + +int +main(int argc, char *argv[]) +{ + struct context c; + int npkt; + + if (argc < 2) + errx(EX_USAGE, + "Usage: %s [divert-back]", argv[0]); + + memset(&c, 0, sizeof(struct context)); + + c.divert_port = (unsigned short) strtol(argv[1], NULL, 10); + if (c.divert_port == 0) + errx(EX_USAGE, "divert port is not defined."); + + if (argc >= 3 && strcmp(argv[2], "divert-back") == 0) + c.divert_back = true; + + + init(&c); + + npkt = 0; + while (recv_pkt(&c) > 0) { + if (c.divert_back) + send_pkt(&c); + npkt++; + if (npkt >= 10) + break; + } + + if (npkt != 1) + errx(EXIT_FAILURE, "%d: npkt=%d.", c.divert_port, npkt); + + return EXIT_SUCCESS; +} diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh new file mode 100644 index 000000000000..0a37cea78ad3 --- /dev/null +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -0,0 +1,413 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Igor Ostapenko +# +# 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. + +# +# pf divert-to action test cases +# +# -----------| |-- |----| ----| |----------- +# ( ) inbound |pf_check_in| ) -> |host| -> ( ) |pf_check_out| outbound ) +# -----------| | |-- |----| ----| | |----------- +# | | +# \|/ \|/ +# |------| |------| +# |divapp| |divapp| +# |------| |------| +# +# The basic cases: +# - inbound > diverted | divapp terminated +# - inbound > diverted > inbound | host terminated +# - inbound > diverted > outbound | network terminated +# - outbound > diverted | divapp terminated +# - outbound > diverted > outbound | network terminated +# - outbound > diverted > inbound | e.g. host terminated +# +# When a packet is diverted, forwarded, and possibly diverted again: +# - inbound > diverted > inbound > forwarded +# > outbound | network terminated +# - inbound > diverted > inbound > forwarded +# > outbound > diverted > outbound | network terminated +# +# Test case naming legend: +# in - inbound +# div - diverted +# out - outbound +# fwd - forwarded +# ipfwon - with ipfw enabled, which allows all +# + +. $(atf_get_srcdir)/utils.subr + +divert_init() +{ + if ! kldstat -q -m ipdivert; then + atf_skip "This test requires ipdivert" + fi +} + +ipfw_init() +{ + if ! kldstat -q -m ipfw; then + atf_skip "This test requires ipfw" + fi +} + +assert_ipfw_is_off() +{ + if kldstat -q -m ipfw; then + atf_skip "This test is for the case when ipfw is not loaded" + fi +} + +atf_test_case "ipfwoff_in_div" "cleanup" +ipfwoff_in_div_head() +{ + atf_set descr 'Test inbound > diverted | divapp terminated' + atf_set require.user root +} +ipfwoff_in_div_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000" + + jexec div $(atf_get_srcdir)/divapp 2000 & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is expected to "eat" the packet + atf_check -s not-exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_in_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div" "cleanup" +ipfwon_in_div_head() +{ + atf_set descr 'Test inbound > diverted | divapp terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_body() +{ + ipfwoff_in_div_body "ipfwon" +} +ipfwon_in_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_in_div_in" "cleanup" +ipfwoff_in_div_in_head() +{ + atf_set descr 'Test inbound > diverted > inbound | host terminated' + atf_set require.user root +} +ipfwoff_in_div_in_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 divert-back & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_in_div_in_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div_in" "cleanup" +ipfwon_in_div_in_head() +{ + atf_set descr 'Test inbound > diverted > inbound | host terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_in_body() +{ + ipfwoff_in_div_in_body "ipfwon" +} +ipfwon_in_div_in_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_out_div" "cleanup" +ipfwoff_out_div_head() +{ + atf_set descr 'Test outbound > diverted | divapp terminated' + atf_set require.user root +} +ipfwoff_out_div_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq no state" \ + "pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is expected to "eat" the packet + atf_check -s not-exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_out_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_out_div" "cleanup" +ipfwon_out_div_head() +{ + atf_set descr 'Test outbound > diverted | divapp terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_out_div_body() +{ + ipfwoff_out_div_body "ipfwon" +} +ipfwon_out_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_out_div_out" "cleanup" +ipfwoff_out_div_out_head() +{ + atf_set descr 'Test outbound > diverted > outbound | network terminated' + atf_set require.user root +} +ipfwoff_out_div_out_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq no state" \ + "pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 divert-back & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_out_div_out" "cleanup" +ipfwon_out_div_out_head() +{ + atf_set descr 'Test outbound > diverted > outbound | network terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_out_div_out_body() +{ + ipfwoff_out_div_out_body "ipfwon" +} +ipfwon_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_in_div_in_fwd_out_div_out" "cleanup" +ipfwoff_in_div_in_fwd_out_div_out_head() +{ + atf_set descr 'Test inbound > diverted > inbound > forwarded > outbound > diverted > outbound | network terminated' + atf_set require.user root +} +ipfwoff_in_div_in_fwd_out_div_out_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + # host router site + epair0=$(vnet_mkepair) + epair1=$(vnet_mkepair) + + vnet_mkjail router ${epair0}b ${epair1}a + ifconfig ${epair0}a 192.0.2.1/24 up + jexec router sysctl net.inet.ip.forwarding=1 + jexec router ifconfig ${epair0}b 192.0.2.2/24 up + jexec router ifconfig ${epair1}a 198.51.100.1/24 up + test $ipfwon && jexec router ipfw add 65534 allow all from any to any + + vnet_mkjail site ${epair1}b + jexec site ifconfig ${epair1}b 198.51.100.2/24 up + jexec site route add default 198.51.100.1 + test $ipfwon && jexec site ipfw add 65534 allow all from any to any + + route add -net 198.51.100.0/24 192.0.2.2 + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + # Should be routed without pf + atf_check -s exit:0 -o ignore ping -c3 198.51.100.2 + + jexec router pfctl -e + pft_set_rules router \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2001 no state" \ + "pass out inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2002 no state" + + jexec router $(atf_get_srcdir)/divapp 2001 divert-back & + indivapp_pid=$! + jexec router $(atf_get_srcdir)/divapp 2002 divert-back & + outdivapp_pid=$! + # Wait for the divappS to be ready + sleep 1 + + # Both divappS are NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 198.51.100.2 + + wait $indivapp_pid && wait $outdivapp_pid +} +ipfwoff_in_div_in_fwd_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div_in_fwd_out_div_out" "cleanup" +ipfwon_in_div_in_fwd_out_div_out_head() +{ + atf_set descr 'Test inbound > diverted > inbound > forwarded > outbound > diverted > outbound | network terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_in_fwd_out_div_out_body() +{ + ipfwoff_in_div_in_fwd_out_div_out_body "ipfwon" +} +ipfwon_in_div_in_fwd_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "ipfwoff_in_div" + atf_add_test_case "ipfwoff_in_div_in" + atf_add_test_case "ipfwon_in_div" + atf_add_test_case "ipfwon_in_div_in" + + atf_add_test_case "ipfwoff_out_div" + atf_add_test_case "ipfwoff_out_div_out" + atf_add_test_case "ipfwon_out_div" + atf_add_test_case "ipfwon_out_div_out" + + atf_add_test_case "ipfwoff_in_div_in_fwd_out_div_out" + atf_add_test_case "ipfwon_in_div_in_fwd_out_div_out" +} From nobody Thu Oct 19 13:37:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB80V212mz4xSHN; Thu, 19 Oct 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB80V1X3mz4PZq; Thu, 19 Oct 2023 13:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697722650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4hMG7lrr0x4FKTLf/i61B7j5DxBLUnSuGaPdOkDARY=; b=FqdwTN5k+j1qOcLUeLKcAV5RbkRWh3fknvHPNBB0Ie98JvEvmXSrPVZg/l4DOC504p6yeb AJfWIy38JWrqHMDrFWCZ8f53k7QCPJzRafIDHEui3OgQqZbB3NsCdAlyrmKzAO62zDEBxK 5Ne/sUL6nZh0XXv6r4zsWcHqSItWeZ0Jg1V5omx1hRq1KE7OXGNhpTR5OGiDnzhEINVJdC /BOEC7hybuLXT8ydUnwN4Q0Jl9LbgSMm5hYOBvhQYoP3+4JDcxLiNX0dLOZ1g3KtRyxbnC zNSqdrQ2auJ1HtqrdivqmxDA/8xMQ3EuJcsL35iM2jAr63FP3RjilXdIhYdQIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697722650; a=rsa-sha256; cv=none; b=xi007rkqbqjGIphekw6xlazx+XuO+cxnmETKcVSRDtN24ega5wo/sPvfG8Z6qFlKZ9z2OR rqJ7bSa2b8HQrz9MuHEWQv7eCx3U+1xM7R1BEJPNmrtW4xd6hI6mN40yO5RDjzixsQK4lI xxovitIHQtLNnUKpAc+mtUat9AMFGI40Q/YiZKRLfFZoPxwQ4OFTMvmk0pVnGEPH393lIt cr9S9kdRz/ImvGXFsP+LBkaZbD+Y4pdknTFcggG1/3GmewCkCARWy+w8WGjkM7GSQpp78p uLpEqFhyD3rQ1davvqhJhWqyZwn5IZWIKImySFt3i/7Stb2Kpimj9XKfJ34Sxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697722650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4hMG7lrr0x4FKTLf/i61B7j5DxBLUnSuGaPdOkDARY=; b=vveNK6cGkRHHBje6zZmj+yGPeCRggTTGBaUoAOpiL1F2E+6gGv8HG+Ce6z0st74dwtl4F5 oJzVpFk5uv+UKJv0DNObC+5EJB08quhz/0HgCV1JjqgVVT8gyJDYPGq6SaQ4K9v4dtqGhf iraQprbjWmAYBKgvNl2NxgFgUazFAk7fFk732oMY8gKheF6mEN9klAzcGE+Z+QwiOeGvkx fgcMQZXcA4JTJ9Jy8/lS2fLlRWPspDEufzfmgi2aW+wkuGHXhSa/5Ef7AzsKfrZ1BSdhT+ USw9GPO0IqCSraBCGjuKcomoVc94dx8h5dz/ukspya/NRCYTryhYrzqIUQ0LVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB80V0VTkzrmj; Thu, 19 Oct 2023 13:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JDbTr6094503; Thu, 19 Oct 2023 13:37:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JDbTv3094500; Thu, 19 Oct 2023 13:37:29 GMT (envelope-from git) Date: Thu, 19 Oct 2023 13:37:29 GMT Message-Id: <202310191337.39JDbTv3094500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 24fe0cb84d71 - main - ping tests: Fix test on i386 platforms List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 24fe0cb84d71a0e9d648c43f92b5c3a730c3855a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24fe0cb84d71a0e9d648c43f92b5c3a730c3855a commit 24fe0cb84d71a0e9d648c43f92b5c3a730c3855a Author: Jose Luis Duran AuthorDate: 2023-10-17 11:35:38 +0000 Commit: Mark Johnston CommitDate: 2023-10-19 13:35:39 +0000 ping tests: Fix test on i386 platforms Actually use INT_MAX (0x7fffffff), not UINT_MAX (0xffffffff) to avoid overflowing time_t and missing the test. Reported by: Jenkins Reviewed by: markj Fixes: 5b8af90fe332 ("ping: Add ATF-Python tests") Pull Request: https://github.com/freebsd/freebsd-src/pull/874 Differential Revision: https://reviews.freebsd.org/D42268 --- sbin/ping/tests/test_ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 900fbf45d52d..3c66e6c54c4d 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -51,7 +51,7 @@ def build_response_packet(echo, ip, icmp, oip_ihl, special): # Build a package with a timestamp of INT_MAX # (time-warped package) payload_no_timestamp = sc.bytes_hex(load)[16:] - load = (b"\xff" * 8) + sc.hex_bytes(payload_no_timestamp) + load = b"\x7f" + (b"\xff" * 7) + sc.hex_bytes(payload_no_timestamp) if special == "wrong": # Build a package with a wrong last byte payload_no_last_byte = sc.bytes_hex(load)[:-2] From nobody Thu Oct 19 14:00:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8WG1kJWz4xTgK; Thu, 19 Oct 2023 14:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB8WG1KHxz4RGl; Thu, 19 Oct 2023 14:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6XHygmyW0eZABPaYgj7uRln4rnvzva0mfKM80HcLRyg=; b=QihMHgYsCFvNpXMqhnqcwN1RoDaAtkudrDDHfpUaU4NGuzEM1RRhrHq/EjTp6xQkPJveeB dhk9Wd2/77ZQWD3Ep+ykeqTebQ+Hmj6uRKDdbSI5Zm+a/Uw42ZgNjqn/S2QlkyR4CtN2lD psDwyFWzxdAUdivpaJzoMn2Q3mFaHqBnAI6/mRb/y8WaAL5PCO/MU8DIgFlnxBTp/MRXhc Fh9sp7ILL6xL4/iXSgUCfyg49lHIrhv0RsVj6JLC4DeN+DDlD3XzaNE9pB9mVBtXuKNolp 0JaLV4tAoteHJNIRfcsaIO3K0VNJloTeIx/TcdXuSgBY3YCg2DXESn0BySMr9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724042; a=rsa-sha256; cv=none; b=tUplEBHkj49uHVUy7UxRa/DeJHLTryTpIiTrYTei1kZ34mTLA/QxxTBj1IeX3BfzElDMQH /jv70zWziXr+Lo9c4lXEcClxjPoXywtWBogL07qoF2NGbpCVE9yCRI0pkaVZfJz5p6DNXj 8gf+4QCl5/R+VhM1DbAHW4oMOeaekQaF/NzxTNL+saMHb82Cdn7YEfS3jUvYi5CmaKJufd laBmTe1SjTAjhyUlxlQCP06kSvz5jpu1p/u5nivk8WH9ybe+EHFCuZHaWMKmYoFPFsnjTr v1nFtiBQ0IngA1Vl+FUUtHNigN7EPe5K5gLk+hHMUtQ/4bKdXYAnKjuBLBxbiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6XHygmyW0eZABPaYgj7uRln4rnvzva0mfKM80HcLRyg=; b=R5aZkXzZOri5md+ikWzHdnLbuueJX9pFLQdlfUr34FyS68lWu9DKgiFnEjlyYdDpMEAZLW 0ge+HI9jAvnSJRbyMt0V404IsLmCMXema5mpqA2fdF1HxogVKHUupvAGkrVF/QjsioF2tT YxnCQ0F1S/FTSHrbRhvdz5iro5Nt2/j+wyIt57GIqTc5tyk2BKqjMUImU/74pcKpYJZ576 5wRdVSOU0tT5X3KYyk8xbzLt3niPXEbDm/kPtROQr/HAUMK+Kcgucr9120vyvI2m5qFmvq rEeggBu7nZIQjcgPbdamjaK4RMZZY/U7ZHXt0GDtUwkuxqVMCb/eEyuCgG7H4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8WG0P1NzsHD; Thu, 19 Oct 2023 14:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JE0f3t037736; Thu, 19 Oct 2023 14:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE0fLC037733; Thu, 19 Oct 2023 14:00:41 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:00:41 GMT Message-Id: <202310191400.39JE0fLC037733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: b5437d6c65e0 - main - hwpmc_amd: remove an unused variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5437d6c65e0dfd7b9d681aedbc1d382e092b3d3 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b5437d6c65e0dfd7b9d681aedbc1d382e092b3d3 commit b5437d6c65e0dfd7b9d681aedbc1d382e092b3d3 Author: Mitchell Horne AuthorDate: 2023-10-19 13:58:48 +0000 Commit: Mitchell Horne CommitDate: 2023-10-19 14:00:31 +0000 hwpmc_amd: remove an unused variable This should fix the LINT builds. Reported by: Jenkins Sponsored by: The FreeBSD Foundation Fixes: 2c6f474ee824 ("hwpmc_amd: kill of k7 support bits") --- sys/dev/hwpmc/hwpmc_amd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 01a6cf202b4d..d2fb17549990 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -451,7 +451,6 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, static int amd_release_pmc(int cpu, int ri, struct pmc *pmc __unused) { - const struct amd_descr *pd __pmcdbg_used; struct pmc_hw *phw __diagused; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), From nobody Thu Oct 19 14:20:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8yN4sbDz4xVQZ; Thu, 19 Oct 2023 14:20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB8yN43DGz4Vtn; Thu, 19 Oct 2023 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BWNEkWmM5sEcLdOqeOHS09L/jsV2ClRIUyMdw/QHo1g=; b=upoNxv4WwrtLFbIzAsUWUAQYSCQ4uKfx9RPDL4UJaNJuSeSONuctJMRY4MWqI2AhyWZV6v PLQLOoimeICEKNq6rX5mYNnp27FaGNbb4FZVVQ9hGdy2GA1mEDKdQHmrBhqhHI1SwTwJg3 BYTlqPzMny6+Dsj7BZRTA4m00m6Hm7cuQE5iHdQcFg1d5rZqvqWZqUdgoQIHv64BGALMpk UfpTYIfsjjpBFko59FIXChG4o3GFYcyd4PNCyJV9HrFDB44L1ly3RslpGeOlsFZpftkNiF NEXvuZR4somFkRBCrwXY0vFnz5L6x7nybHT5kF8lL6XsmyHBxAsk0gIUJasHng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725244; a=rsa-sha256; cv=none; b=XYhos5UuKztyZuR5MsnAqOl+GcHEBq5qoYEg9aWNL9HPzo+G/HflghjJi89ge8zN5tIF8j Rcpi3OmwKS8D/0NqZF7JIltZFDAMyFig5lZmNfymRUdM0R73bI0MXs7Nit9mmaMXQh0QXx 5hLtsE6RcVwGAGH7OczlsVNMXBYqOIjqlGkem8CURorpO7SZt4kExxrH0j6GG0A9CNx02D eldhVFk3IS5xSpc3ZrE+7JlFFTTI77mkBG2vhrvJfYfek6cXPtVavZP50C+MvM/uho1ogS GAsrGEsF8wv4q3bUo0CzrdDCBejAHwg75EddXI1V5/cQOrpCw1cR1TiOsaF1/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=1697725244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BWNEkWmM5sEcLdOqeOHS09L/jsV2ClRIUyMdw/QHo1g=; b=Py7eRciAluYBTTf5bHbO0tboEpJI5hNYkiGN9LPL1rVoc7a1LfLsy0KDQWjA4UaSbH3Xdi E8mzR3PesRvysav+/J07fh4Z1XWHa27b1GGeFY2DXDHeSoIiPpM/THTBSuEOom6o5SSSxT aMrLcYqdZ3Fk6Vuz2N+rFbQQih08h8+xh8VHZIJyDtIGBgr/P61RczWN9s7QN5dkh2UJC1 wO9oqd2iffBoqPBnG+6Cy0AQ2IKKBJKFOZiMvEmPKXj2by/U+XgiXRqL8wTzC8NqY2EUCW EAnJ3tTcz4K3OIBt6T6Q7uTjkUGbWoPVcGJ/ml+KM0rU4vvGppOaJvQv414whg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8yN3704zsbF; Thu, 19 Oct 2023 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JEKiCK071111; Thu, 19 Oct 2023 14:20:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEKitw071108; Thu, 19 Oct 2023 14:20:44 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:20:44 GMT Message-Id: <202310191420.39JEKitw071108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 Author: Kristof Provost AuthorDate: 2023-10-19 10:06:29 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 14:19:39 +0000 pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h When userspace includes pfvar.h it doesn't get the kernel's COMPAT_* defines, so we end up not having required symbols in userspace. This caused the libpfctl port to fail to build. libpfctl will be updated to use the new netlink-based state export code soon, which will also fix thix build issue. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 59579a0849d9..ec8f8293945b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1951,9 +1951,7 @@ struct pfioc_iface { #define DIOCCLRSTATUS _IO ('D', 22) #define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook) #define DIOCSETDEBUG _IOWR('D', 24, u_int32_t) -#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) -#endif #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule) /* XXX cut 26 - 28 */ #define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm) @@ -2014,9 +2012,7 @@ struct pfioc_iface { #define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill) #define DIOCGIFSPEEDV0 _IOWR('D', 92, struct pf_ifspeed_v0) #define DIOCGIFSPEEDV1 _IOWR('D', 92, struct pf_ifspeed_v1) -#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATESV2 _IOWR('D', 93, struct pfioc_states_v2) -#endif #define DIOCGETSYNCOOKIES _IOWR('D', 94, struct pfioc_nv) #define DIOCSETSYNCOOKIES _IOWR('D', 95, struct pfioc_nv) #define DIOCKEEPCOUNTERS _IOWR('D', 96, struct pfioc_nv) From nobody Thu Oct 19 14:41:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB9Qs1gblz4xWZ7 for ; Thu, 19 Oct 2023 14:41:57 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB9Qr6TxMz4XYG for ; Thu, 19 Oct 2023 14:41:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4083f61312eso14574135e9.3 for ; Thu, 19 Oct 2023 07:41:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697726515; x=1698331315; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aJcPdynuVtlnT4qNwZy5h9AXj/VZvzpoz2++U2mHWe0=; b=jXcBg8Cg3bGTe7XNOm5PDG1iBXmLY9VslEt6iFRZ5IouuNFREGFm5IIgWLqzky1PkC 0Mv0w/DpvHaFwGqZJ19apcI3DoP1+OpkL/F05o7Mp6b0pHZWxShLLCEtdOtDJ8sB5IJq Ms8tvsSvVx91Y7V8aZsFoGXkefzhdYVr+fAun3tGooTUtKybinzwlDhEYP2SI4ME+5rY DAQTAYv/Vw02q5g6t/RYJf6C3MgbmJKAZjWTTzCegkU43zq0FhBL5amhTIV4EAXxOPQK yiE6JqshygAeomks/NOgmUhkjS55fyYG3B7hvhkf3U+dB39Em4itSVk6GAHGIDgnHp1I dCLg== X-Gm-Message-State: AOJu0YwT1KrKWZm2RViBuiSs5sVexP+gm4z8cnCx24PcUC7JIdgWoZZU HYyn4kwiD0jVJ/+I2UvMfy/u9QrwhD4XlvbFy9tAoQ== X-Google-Smtp-Source: AGHT+IFPvOBUbeY2g2HGBXdbkUEkisGXWikmzj5RiogkeaZx8EcWrV8UsF0clAaqgbIFIOBPNW3HJw== X-Received: by 2002:a05:600c:17d3:b0:405:40ec:415d with SMTP id y19-20020a05600c17d300b0040540ec415dmr1932374wmo.39.1697726514900; Thu, 19 Oct 2023 07:41:54 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id x22-20020a05600c189600b004083a105f27sm4510684wmp.26.2023.10.19.07.41.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2023 07:41:54 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.100.2.1.4\)) Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h From: Jessica Clarke In-Reply-To: <202310191420.39JEKitw071108@gitrepo.freebsd.org> Date: Thu, 19 Oct 2023 15:41:43 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> To: Kristof Provost X-Mailer: Apple Mail (2.3774.100.2.1.4) 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:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4SB9Qr6TxMz4XYG On 19 Oct 2023, at 15:20, Kristof Provost wrote: >=20 > The branch main has been updated by kp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc6cd830b0bc6= b815e8c4 >=20 > commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 > Author: Kristof Provost > AuthorDate: 2023-10-19 10:06:29 +0000 > Commit: Kristof Provost > CommitDate: 2023-10-19 14:19:39 +0000 >=20 > pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >=20 > When userspace includes pfvar.h it doesn't get the kernel's = COMPAT_* > defines, so we end up not having required symbols in userspace. = This > caused the libpfctl port to fail to build. >=20 > libpfctl will be updated to use the new netlink-based state export = code > soon, which will also fix thix build issue. >=20 > Sponsored by: Rubicon Communications, LLC ("Netgate") That=E2=80=99s normally a feature to stop userspace using deprecated = things. Will you be reverting this once libpfctl is fixed? One could also hack libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC that=E2=80=99= s what was done for kbdcontrol to allow it to run on old kernels). Jess From nobody Thu Oct 19 14:56:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB9lZ1dlKz4xXlM; Thu, 19 Oct 2023 14:56:26 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB9lZ13V0z4bKv; Thu, 19 Oct 2023 14:56:26 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697727386; 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=xLiJswrXTJeF9HUk9Y6A8p+5EQxcSLwVKpBv+t0RlY4=; b=PI2SQOqmZS0v0jsCHH+svPtmb7559yJuWL8r4DCEf6HQqinh/GvN9XurHETZuP+9HxTkAr FyqsM+8GYrYOqt6GFG86HMqnWqpd0GQCV/yauGj/V0XvGoTSPEkZElMoCs+xZf/5DIoevG 5o90v39eDirSNEPPcRzuxe793lb4bu2toJU8dYSPNtWH5sOze1mtoI47PuuxHdOqEeOKt+ Z7i1ICJkzAaLUp9oy6MLJ7qofANfoPMqvGhloPyTTM6jxQ8siqXM/5yVnG1aSQs8rpASLQ UmwHrD+Lixorj6w3W1M4YMda6/Dle42ugGmKim93uew9xY7V0upNsVulQgH53A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697727386; a=rsa-sha256; cv=none; b=EgK9RE1PKk+8Jm714gh+3rLJ0amZSW8N8HZGBNoSGN/4YTW6TJZHotUoG5CU5GrHkijHCl M/8qa40ENh5c2bkWEI5Mm9QGaq4cWQyKI6dsGD3y4LoEkL6FFcM8naMFUvAUKNf/Qn7Djn bKnALhKlNhZ81zQ7xaDnP1rAuoNFmFyWf2Yfx4BpNjuq9iy+uEqfJhbTZZA8JGBV3ncrb+ HizzmLWBRrjLski4inqtprv9wZGMh+kSMWzc2I+xvGsl0M2vl2JjiWaRWvOSE5BlSliK3g 1rDXV0F6+awPPDOTe/twDG2A5L+67Abje92GScyKDWoMG7FF60zxVvFjf6x1qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697727386; 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=xLiJswrXTJeF9HUk9Y6A8p+5EQxcSLwVKpBv+t0RlY4=; b=nHyuT3/CR1VkwgPFAAoDyIjkuNu9XwGdmQ+ii+LEAJbR73Yt1KF7CAxf+R8zlcdi5Uj2GJ ndMFapDUTrrtYTk9MLKddc57+F5rAHuiq7eMfy0bvTaJzCzlbpW2BORZcGczpC69Yl1pQz oLnTaabBwTkGr+/H6fi4DJyi0P26Zo9kS/nDhoeOOxfQPabMUB5vWVZwCV9wjrNsFI4j7S mZ59WZACWxcYs3N2G+FGEfTesMV9TFBl+Do9zeazDptIN6afTzDQGEK5eP7/iCtP0Fcxz2 e0m5qW5bzYxYIu/KcUvH1F/2ipWb9SUY0UE1iNrLd7MgFcl8BU4JaCgNiCBlng== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SB9lY6c8zz1694; Thu, 19 Oct 2023 14:56:25 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 0F8D581D7; Thu, 19 Oct 2023 16:56:24 +0200 (CEST) From: Kristof Provost To: Jessica Clarke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h Date: Thu, 19 Oct 2023 16:56:23 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 19 Oct 2023, at 16:41, Jessica Clarke wrote: > On 19 Oct 2023, at 15:20, Kristof Provost wrote: >> >> The branch main has been updated by kp: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc6c= d830b0bc6b815e8c4 >> >> commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 >> Author: Kristof Provost >> AuthorDate: 2023-10-19 10:06:29 +0000 >> Commit: Kristof Provost >> CommitDate: 2023-10-19 14:19:39 +0000 >> >> pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >> >> When userspace includes pfvar.h it doesn't get the kernel's COMPAT_= * >> defines, so we end up not having required symbols in userspace. Thi= s >> caused the libpfctl port to fail to build. >> >> libpfctl will be updated to use the new netlink-based state export = code >> soon, which will also fix thix build issue. >> >> Sponsored by: Rubicon Communications, LLC ("Netgate") > > That=E2=80=99s normally a feature to stop userspace using deprecated th= ings. > Will you be reverting this once libpfctl is fixed? One could also hack > libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC that=E2=80= =99s > what was done for kbdcontrol to allow it to run on old kernels). > I wasn=E2=80=99t planning on that, no. The libpfctl port fix should land = soon, but I figured that it=E2=80=99d be better to keep the definitions, = because userspace doesn=E2=80=99t know if the kernel is built with or wit= hout COMPAT_FREEBSD14. I=E2=80=99m open to being persuaded that that=E2=80=99s a bad idea though= =2E Long-term (i.e. by freebsd 16) the plan is for all of these ioctls to go = away (so the code for them will stay in 15, but not be in 16), but that d= oes depend on me doing a fair bit of work before then. Best regards, Kristof From nobody Thu Oct 19 15:02:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB9tw6sYfz4xXgQ for ; Thu, 19 Oct 2023 15:02:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB9tw47Wgz4byG for ; Thu, 19 Oct 2023 15:02:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-40675f06f1fso5447215e9.1 for ; Thu, 19 Oct 2023 08:02:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697727767; x=1698332567; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GIiXoKdczDxAtPy81sfr9hQgf9DkYxIsJ1NAh9GEsNU=; b=Zav5v3fmz4rbN/T0EfK2EAsMh2S5VI0gz1jZZwCR+lW3oeKKzWV8x/nolaM4MDXdTu JpoIWZJEqBPiEl19AjE057dPepeMnbLfkgfb/vuilZlfuFZdL5dUJhgHUERTyh7Pb8/d BZI4QYc65rgkug5+nvhOCQNsG5PUwUwzSqLlumA4Cb7RBXQTvUd9bLMkeR6iZuXA/82a BSsyq+4O0CGzUd2YE94YqWgdpci2u8XtJiWtXkQfrXjeXTxPy1TMuU1fPuAwnCEro65l 3gFZfs7/PfuSSK+TDh/UNV/H3oSv3kPCoPAOi0VVClCViMDd7sJuurNdlEcBHdtKWwCp iRtA== X-Gm-Message-State: AOJu0Ywn41X0BxHE1mZ3K7cPDVS6VDlHpj73hLhg4+omgkqVTdISJvJd vZeRZGB77VCW25aWoPmidMPGgQ== X-Google-Smtp-Source: AGHT+IEtqPAGcADh5pXOXFCWPLERDzlM6ILACTZJSIEsHl2iiyLRTDKs+9v53FwHsJB2LUycrF9tUg== X-Received: by 2002:a05:600c:4747:b0:408:3634:b81e with SMTP id w7-20020a05600c474700b004083634b81emr2082761wmo.13.1697727766343; Thu, 19 Oct 2023 08:02:46 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id h5-20020a05600c350500b003fc0505be19sm4682425wmq.37.2023.10.19.08.02.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2023 08:02:45 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.100.2.1.4\)) Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h From: Jessica Clarke In-Reply-To: Date: Thu, 19 Oct 2023 16:02:35 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1EB17D31-16CB-44D2-A19E-6CC9699156D1@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> To: Kristof Provost X-Mailer: Apple Mail (2.3774.100.2.1.4) 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:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4SB9tw47Wgz4byG On 19 Oct 2023, at 15:56, Kristof Provost wrote: >=20 > On 19 Oct 2023, at 16:41, Jessica Clarke wrote: >> On 19 Oct 2023, at 15:20, Kristof Provost wrote: >>>=20 >>> The branch main has been updated by kp: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc6cd830b0bc6= b815e8c4 >>>=20 >>> commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 >>> Author: Kristof Provost >>> AuthorDate: 2023-10-19 10:06:29 +0000 >>> Commit: Kristof Provost >>> CommitDate: 2023-10-19 14:19:39 +0000 >>>=20 >>> pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >>>=20 >>> When userspace includes pfvar.h it doesn't get the kernel's = COMPAT_* >>> defines, so we end up not having required symbols in userspace. = This >>> caused the libpfctl port to fail to build. >>>=20 >>> libpfctl will be updated to use the new netlink-based state export = code >>> soon, which will also fix thix build issue. >>>=20 >>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>=20 >> That=E2=80=99s normally a feature to stop userspace using deprecated = things. >> Will you be reverting this once libpfctl is fixed? One could also = hack >> libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC = that=E2=80=99s >> what was done for kbdcontrol to allow it to run on old kernels). >>=20 > I wasn=E2=80=99t planning on that, no. The libpfctl port fix should = land soon, but I figured that it=E2=80=99d be better to keep the = definitions, because userspace doesn=E2=80=99t know if the kernel is = built with or without COMPAT_FREEBSD14. > I=E2=80=99m open to being persuaded that that=E2=80=99s a bad idea = though. Indeed it doesn=E2=80=99t, because it shouldn=E2=80=99t. The thinking is = that userspace should *never* explicitly use them, only the kernel to provide compatibility with binaries built against older versions. Deliberately exposing them to userspace is quite unusual and deemed generally dodgy. Jess > Long-term (i.e. by freebsd 16) the plan is for all of these ioctls to = go away (so the code for them will stay in 15, but not be in 16), but = that does depend on me doing a fair bit of work before then. >=20 > Best regards, > Kristof From nobody Thu Oct 19 15:09:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBB2M20gfz4xY8Y; Thu, 19 Oct 2023 15:09:15 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBB2M1Pqnz4cQr; Thu, 19 Oct 2023 15:09:15 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728155; 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=ymcvD0Llk9TgxiEpUSoJY2mC52cjwvXlV/Ss4RsmJH8=; b=kEsJAqikz8FcUENS1S9lWIviE3Q3z7UzdSGALSST05kz9NML85ywkty/TbgdV8L4VhrKhl rJhBEls+k/BltbMIowrOiQl0Rpv5/hAMhQCLF2SfVbIRNecOZh96TQg5tnWX61PZbQVENr pvTvFmi0bYYO/FnDuD/RXL2MJonq6P+Hdk/4UPuGATdFwCxf7/6ARp5KcnfsLW2Kholibf EQQ5KAOP9WT74ue7s3W9Z0VSvt+Fa1UiySKqIstNKhYCZO7qrAhaNCw47k4aljkE2U2j7a TWN2fLBRVICD51w5aEbFZF4IqT4JeSwoFF2uwDtcy6E36F88zfACL2E9Lc3tpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697728155; a=rsa-sha256; cv=none; b=mJdNKAHeRDYx4ClrT0zYqYOVvCjYKnKIcttGdb7zs1M9IFjOL/jnPli9WIa7kTshLiolpq UWnMUOijkXTLnlRWDijweqjfjNilnQnQd3kUWcE0BlrdIKqb27KkjI/2viSIdtfcU19h5Y zMHQkBzEgXAHV/CFOefJoWZdXpvhn3zq8H5iWyvCzc/8Bitr2QBuwQr5xxLEXBfoBnjcvb M6i/KKDz9C3cbCo08r7iw4kwodmSsWF8KG7I7V8Gs9XzTUCni/dICjN2qIaVYPOFoa/peC tJT03dbQC+U5CfuJLx4tMuffCbjDLFpXwM8KkrgdIF0ysUY3nsWYbTJ7NGiMNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728155; 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=ymcvD0Llk9TgxiEpUSoJY2mC52cjwvXlV/Ss4RsmJH8=; b=ZzSuRAm3VyHzj1x7H6SWVIbdz/QiRblwYkeVkwOZuYZ76XXHcngt4v8X9WthSbCxRSgzSr g0tU73v9HIHtRAHZXJWHGUeC/d0hnJ2huMyM/Cp/0iCpRE4sur50Q2cX+X9wm/YRTTunPx JcpbrYG6z1aXqmjl7wsD6LjLd/BAMcgu1+mnnd57Dit+zeT/WsvKCbh2iOvgUFu+dVdn+V maXGBCh6EK6/meo2w4wsibpObMKRaA55KN17fF/clldmTF7bpvLWusURjKGTXdU9baAjo5 5v+2hZAcYUv9/jutypdWA5EuPscRqsbAD0PIXG00Cyw3y/+psExTWEWFKcnZ2w== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SBB2L6ts7z169B; Thu, 19 Oct 2023 15:09:14 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 76216843E; Thu, 19 Oct 2023 17:09:13 +0200 (CEST) From: Kristof Provost To: Jessica Clarke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h Date: Thu, 19 Oct 2023 17:09:12 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <1EB17D31-16CB-44D2-A19E-6CC9699156D1@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> <1EB17D31-16CB-44D2-A19E-6CC9699156D1@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 19 Oct 2023, at 17:02, Jessica Clarke wrote: > On 19 Oct 2023, at 15:56, Kristof Provost wrote: >> >> On 19 Oct 2023, at 16:41, Jessica Clarke wrote: >>> On 19 Oct 2023, at 15:20, Kristof Provost wrote: >>>> >>>> The branch main has been updated by kp: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc= 6cd830b0bc6b815e8c4 >>>> >>>> commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 >>>> Author: Kristof Provost >>>> AuthorDate: 2023-10-19 10:06:29 +0000 >>>> Commit: Kristof Provost >>>> CommitDate: 2023-10-19 14:19:39 +0000 >>>> >>>> pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >>>> >>>> When userspace includes pfvar.h it doesn't get the kernel's COMPAT= _* >>>> defines, so we end up not having required symbols in userspace. Th= is >>>> caused the libpfctl port to fail to build. >>>> >>>> libpfctl will be updated to use the new netlink-based state export= code >>>> soon, which will also fix thix build issue. >>>> >>>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>> >>> That=E2=80=99s normally a feature to stop userspace using deprecated = things. >>> Will you be reverting this once libpfctl is fixed? One could also hac= k >>> libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC that=E2= =80=99s >>> what was done for kbdcontrol to allow it to run on old kernels). >>> >> I wasn=E2=80=99t planning on that, no. The libpfctl port fix should la= nd soon, but I figured that it=E2=80=99d be better to keep the definition= s, because userspace doesn=E2=80=99t know if the kernel is built with or = without COMPAT_FREEBSD14. >> I=E2=80=99m open to being persuaded that that=E2=80=99s a bad idea tho= ugh. > > Indeed it doesn=E2=80=99t, because it shouldn=E2=80=99t. The thinking i= s that userspace > should *never* explicitly use them, only the kernel to provide > compatibility with binaries built against older versions. Deliberately > exposing them to userspace is quite unusual and deemed generally dodgy.= > That makes sense. I=E2=80=99ll revert this change once the libpfctl port = update has had a chance to land and get built. Best regards, Kristof From nobody Thu Oct 19 15:18:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBBFF2f2Bz4xYSF; Thu, 19 Oct 2023 15:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBBFF26xQz4dj9; Thu, 19 Oct 2023 15:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoh/j7g7k98S9BJy6scTid3fBx4j8rN8w81nU1xHB/M=; b=WCnJ629z3pxSoaeRYaY+tFoqlX9ER6/aqrITJDqXLAP5ldkByqrg1YSj994lAPPzirtYRd 1PGRwyISLmzrDDe327udcHYmGreVdtzcgRvZYf9XZDFpbzKy6C2YBOIs44/+rdEwU3HbWi JMbcPhW87r9pIKZmJxZMauDarP1izN9biKzUGrVr0ksmx9f5VO6tazdcK9okd+EM7yMCVX DO3TZ0mbsI7pibEF3Y/siE++DyBC3/OGn43yjmGDJu84d0Rk+XkVLFqB0h3o9lTIarM7hY Dj+4cSiZnzDUNls1q4VO8H8JSuAv535eMywo2emmLAybbQx/V20zaFzFOq/X0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697728721; a=rsa-sha256; cv=none; b=uScOesiTqARYDZ+0Uz4f1HnQp8Z821KWZuX6BoEVibG1Sjc7izn+T9Pu8r4RZQfNOGB1M/ sZ617u/5ugQoLS33qzmRs+X940SN730nG999HccElq0rt5yIKbKy6YZbIOvpFgVx0sSO3U /ppsQMEJefoDDc0x7fVje9ouBQj2VT1WCfreG3CBmKqeVCOpgxM9SYQYqlNpwNcSY858/0 n/vafn5CpzDAlzRTzl0kMDU/vm3kos9xCAe28HU7nzgAuYiSaV/X5Vgbf5gULSy9sssWft wPq6snCTNpDIcOpa9YmX45cWkWySkHcoeXmZo8kEbb0AQXGVlnLDEDkhqaqIFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoh/j7g7k98S9BJy6scTid3fBx4j8rN8w81nU1xHB/M=; b=ay86fDeADdSFSLx540uAsS1NKkQJHBdOddhJboZxIRHWvGdzVFHQHTOBiB5Q8FjN/1ic+9 ekaI3G3KIFYL2NA8FnOUW8uh0vZ1JPmsx1TWrbbpWIfN0Z0F6oi1yNMcmClbQCFanPAkF8 f1s2AV4ZknDaia2iJ+Pur57fKWStsogSPOlilwVABCxKPXdrIwM3XStSTwGFXrTKVNyJ6k cZOjrUUWe6ht57CBehABEEFgthj20cXGBFDK+Ola18mMjAFsufvIFVrkJho/4+wvbhGhYk oesD9V1BqETpzuNEH1ATfH3Ul6gy9SIEmcUtFIi+8M+FuusnwtLD0TKXRZGVIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBBFF1BX5ztyh; Thu, 19 Oct 2023 15:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JFIfkD062437; Thu, 19 Oct 2023 15:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JFIfwD062434; Thu, 19 Oct 2023 15:18:41 GMT (envelope-from git) Date: Thu, 19 Oct 2023 15:18:41 GMT Message-Id: <202310191518.39JFIfwD062434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 7e5504d3d8ca - main - Add myself as ports committer, update mentor/mentee List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e5504d3d8ca844397e10f5266d06027d0b3b372 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=7e5504d3d8ca844397e10f5266d06027d0b3b372 commit 7e5504d3d8ca844397e10f5266d06027d0b3b372 Author: Michael Osipov AuthorDate: 2023-10-19 13:53:11 +0000 Commit: Michael Osipov CommitDate: 2023-10-19 15:17:35 +0000 Add myself as ports committer, update mentor/mentee This completes step 5 from Committer's Guide. Approved by: jrm (mentor) Differential Review: https://reviews.freebsd.org/D42293 --- share/misc/committers-ports.dot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 4ce4a747cfc2..cc20d7bdbd20 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -240,6 +240,7 @@ mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] meta [label="Koichiro Iwao\nmeta@FreeBSD.org\n2018/03/19"] mfechner [label="Matthias Fechner\nmfechner@FreeBSD.org\n2018/03/01"] +michaelo [label="Michael Osipov\nmichaelo@FreeBSD.org\n2023/10/16"] mikael [label="Mikael Urankar\nmikael@FreeBSD.org\n2020/01/16"] milki [label="Jonathan Chu\nmilki@FreeBSD.org\n2013/12/15"] misha [label="Mikhail Pchelin\nmisha@FreeBSD.org\n2016/11/15"] @@ -533,6 +534,7 @@ joneum -> kai jrm -> dch jrm -> jwb +jrm -> michaelo junovitch -> tz @@ -678,6 +680,8 @@ olivier -> pizzamig osa -> otis osa -> vg +otis -> michaelo + pat -> adamw pav -> ahze From nobody Thu Oct 19 15:25:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBBNz2B5Sz4xZ1P; Thu, 19 Oct 2023 15:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBBNz01lKz4fVT; Thu, 19 Oct 2023 15:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697729123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1hFhkW3M+g1J+MQTkth6YUX0tL9BqwjA4DFZ42ZoLso=; b=TBwbAtPFGXHmuxY7enpAkhM4zFtNCoUQAgXme5BXb08T972Z97La4SAXc2A071rtFGpjUb sX83xnJO4eXFHf35azckSq/CPW+hXp9dEWPoKfLCIzsAHePbOLgLNrLocvGEbmPLOQMToy KV7mutdmxi6AX9l5+6qmLozH+iQbZXZ/vdpY1k9svKvs87HAy/BjnDCKw3jYxwe9o80eix RDC/OKCy9FCqA4oJgEVBSGba4aVJCGlK0gIJHGFams0s3RMYAZsXOXDVJ0rRQ/6SXxkpi2 QQj6jiT98FIPLQdxi4FhKwv+uTeluLCbkfMmMxLEy/mu+o4+XZ1gVym8cvoUvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697729123; a=rsa-sha256; cv=none; b=oJiUDg7X9zcEugYVF8qdJQuGaZNl1i92wNasula9oRwH8t8sbuvx3YqNzXn08ayQVAldE3 /AIaJe2hnKybJu9Zere3KxBD3Ic9bs2CYpaOKSN+ttDh0/Cex4YjfK3YUHUJy2DtwtA9xw FfmZU2+GlR4PislcM4YDb9RuCF1MC88kO+z9vLSFaJc8m/s1iKTYf8f2T2rKgCHED/HEwX yYQlu/B8rxUqQ8aORnMGOvopdG0Vtm1lIGN6SXfgjusVc3krBJVQ38xioHDvZ/a2b1VvC4 w44Y9h1iX7CWL3x1+XBwftnzTIIA8AGm/ssQbGpBkDOGLz+xffZMcpOnHGABbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697729123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1hFhkW3M+g1J+MQTkth6YUX0tL9BqwjA4DFZ42ZoLso=; b=KupId1bStDnG1oUoLHQjJdexk3eHg+nB5D0c2ZU8eoJfCMvwftZECkTSsGwzdcowJJEzRM Xd3BLpFV5DHHSxTLSaAdEgRi0oFvMXXV1kHHeL5SwqoA86kfQNEz8CLHoOyYofbkZhFzr6 uE3Fd2DNRa3FiKqPJVbkB5XoXgQ3sPJxLQgNPOaGjbSUi+NEAl4b1E5QXQheQ9pZiKqPvB GO97CJ4hh4g4NOVFeYIp9YennvAIsb5iOmm1kVVQxT9R17g1m412sNP6KpEXtxvgTlSwJu 94NfpE13M4HTPhfbh/BhH/C68c7hzzxiBbGiPrVKs/zfhkNCUK5kCEC7tZF8uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBBNy6CTDzvdr; Thu, 19 Oct 2023 15:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JFPM32078338; Thu, 19 Oct 2023 15:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JFPMtv078335; Thu, 19 Oct 2023 15:25:22 GMT (envelope-from git) Date: Thu, 19 Oct 2023 15:25:22 GMT Message-Id: <202310191525.39JFPMtv078335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: afbb8041a063 - main - amd64: Fix two typos of loader tunables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: afbb8041a0633c97acb51ac895c9ae3cde4fe540 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=afbb8041a0633c97acb51ac895c9ae3cde4fe540 commit afbb8041a0633c97acb51ac895c9ae3cde4fe540 Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 15:23:33 +0000 amd64: Fix two typos of loader tunables To match the sysctl MIBs and document entries in security(7). Fixes: 2dec2b4a34b4 amd64: flush L1 data cache on syscall return with an error Fixes: 17edf152e556 Control for Special Register Buffer Data Sampling mitigation Reviewed by: kib MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42249 --- sys/amd64/amd64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 440c21c918be..f235d72519ae 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1480,7 +1480,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); TUNABLE_INT_FETCH("machdep.mitigations.ssb.disable", &hw_ssb_disable); - TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush", + TUNABLE_INT_FETCH("machdep.syscall_ret_flush_l1d", &syscall_ret_l1d_flush_mode); TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable); @@ -1488,7 +1488,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable); - TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable", + TUNABLE_INT_FETCH("machdep.mitigations.rngds.enable", &x86_rngds_mitg_enable); TUNABLE_INT_FETCH("machdep.mitigations.zenbleed.enable", From nobody Thu Oct 19 16:14:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBCTs0qmvz4xcC8; Thu, 19 Oct 2023 16:14:41 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SBCTr6zJ6z3FGl; Thu, 19 Oct 2023 16:14:40 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id 0B5A65A94D; Thu, 19 Oct 2023 09:14:40 -0700 (PDT) Date: Thu, 19 Oct 2023 09:14:39 -0700 From: Gleb Smirnoff To: Kristof Provost , Igor Ostapenko Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop Message-ID: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202310191237.39JCbdXp094554@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:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4SBCTr6zJ6z3FGl On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: K> +++ b/sys/netinet/ip_var.h ... K> +/* pf specific mtag for divert(4) support */ K> +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; K> +struct pf_divert_mtag { K> + uint16_t idir; // initial pkt direction K> + uint16_t ndir; // a) divert(4) port upon initial diversion K> + // b) new direction upon pkt re-enter K> +}; This can be written as: typedef enum { PF_DIVERT_MTAG_DIR_IN = 1, PF_DIVERT_MTAG_DIR_OUT = 2, } pf_mtag_dir; struct pf_divert_mtag { pf_mtag_dir idir; /* Initial packet direction. */ union { pf_mtag_dir ndir; /* New direction after re-enter. */ uint16_t port; /* Initial divert(4) port. */ }; }; The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN instead of 1 when looking at a structure. And compilation time failure if anybody sets it to a wrong value. Using "port" instead of "ndir" when assigning a port improves readability of code. This will grow structure from 4 bytes to 8, as enum is always an int. However, uma allocator backing m_tag_alloc() will allocate same amount of memory. Sorry for not messaing that in the phabricator. -- Gleb Smirnoff From nobody Thu Oct 19 16:19:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBCbS3x5pz4xcXX; Thu, 19 Oct 2023 16:19:32 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBCbS0Cnfz3Fly; Thu, 19 Oct 2023 16:19:32 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-57b9231e91dso4813101eaf.2; Thu, 19 Oct 2023 09:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697732371; x=1698337171; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=LjYT0TyRQFnr+Iv2YO80LBeR9NdSzi4ViPU89rFSTto=; b=PgjREPkpsO8Ri7snEI3Iw+sFNrBu1aFPW2OA5YS1dTn0k8JSV9QbTANB0nG7QkX6Gr fcc6HXnPutVq8OgOsNuBiiHzw/PeKojkCYnPfqTUNSd1ASQ+lBi1hBnt5MQCl1RG57+f P2dKJD7ond8XC6mJE1aAedVI8Mug0kbHepCkyLDULU2d1kv/9ifozBm9j59LPm17Rw35 2mkMUApQoaGXN4e16ehM04iuwtZwWKNVviXKE9HtvjxuCPuRPdN5UmycRWBLMTue6Kry +JNo//FW301ucWJWghfb9NoOEDtZQ8v/zWjqHHfTmULQAKtBmLIKC02uX+Y6+4Igu28A ULYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697732371; x=1698337171; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LjYT0TyRQFnr+Iv2YO80LBeR9NdSzi4ViPU89rFSTto=; b=nxE/HHgJLocELqIPCG0RUEqV9xwu6Ml+OwmdXm+Wf/eiyWYWXAc6i/V+NDb7Y68+30 fCCp2CANjik1mvy+yieKBQ6015WtYs4DaGZeLWXsWPkDkyf2/PpiXbPuYBK8fCy7kg9M f5x3Shb7UivuZoDSCiBXuuFzhf5HRUf4XDUdK3ujxEwhGWtR0VXRTKG1Hxh1KIAfYyhD vNuxZ7lEol/ylGx+cY9dECX30jUinxehleGnuCHJcefAd3pMfCco+7uLxC0GJ3P3o6hV QSQaoMScoTwvW1i22IJ3SIGn2SAffycdu7W6v1V3G4LkbmUgmVZQwinKVNPrxsdw51nw zitw== X-Gm-Message-State: AOJu0Yx7OvQUceCTDhBGhlKtvfMZCZov5jTNw4QuPHGkp9G//ekKpenh Jp44iPQyM/GnulslciSix/Nadm55WhdxdulDcl7s9664 X-Google-Smtp-Source: AGHT+IEk4lfo8erQpI+QZz6cz8uZYzPktXRV2ro5klksx5nvRmUv/9/jwNL1IQlAyH1vUKVUndeeziNsdylGteuLUTE= X-Received: by 2002:a4a:a708:0:b0:571:28d5:2c71 with SMTP id g8-20020a4aa708000000b0057128d52c71mr2869841oom.2.1697732370911; Thu, 19 Oct 2023 09:19:30 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:7b90:0:b0:4f0:1250:dd51 with HTTP; Thu, 19 Oct 2023 09:19:30 -0700 (PDT) In-Reply-To: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> From: Mateusz Guzik Date: Thu, 19 Oct 2023 18:19:30 +0200 Message-ID: Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop To: Gleb Smirnoff Cc: Kristof Provost , Igor Ostapenko , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-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: 4SBCbS0Cnfz3Fly On 10/19/23, Gleb Smirnoff wrote: > On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: > K> +++ b/sys/netinet/ip_var.h > ... > K> +/* pf specific mtag for divert(4) support */ > K> +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; > K> +struct pf_divert_mtag { > K> + uint16_t idir; // initial pkt direction > K> + uint16_t ndir; // a) divert(4) port upon initial diversion > K> + // b) new direction upon pkt re-enter > K> +}; > > This can be written as: > > typedef enum { > PF_DIVERT_MTAG_DIR_IN = 1, > PF_DIVERT_MTAG_DIR_OUT = 2, > } pf_mtag_dir; > struct pf_divert_mtag { > pf_mtag_dir idir; /* Initial packet direction. */ > union { > pf_mtag_dir ndir; /* New direction after re-enter. */ > uint16_t port; /* Initial divert(4) port. */ > }; > }; > > The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN > instead > of 1 when looking at a structure. And compilation time failure if anybody > sets > it to a wrong value. Using "port" instead of "ndir" when assigning a port > improves readability of code. > > This will grow structure from 4 bytes to 8, as enum is always an int. > However, > uma allocator backing m_tag_alloc() will allocate same amount of memory. > > Sorry for not messaing that in the phabricator. > I don't have an opinion on employing an enum, but if going that route one can shrink it by using smaller enums -- grep for __enum_uint8 for an example. -- Mateusz Guzik From nobody Thu Oct 19 16:19:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBCbd30n4z4xcTt for ; Thu, 19 Oct 2023 16:19:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBCbd0zR2z3Fwh for ; Thu, 19 Oct 2023 16:19:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-50797cf5b69so8753618e87.2 for ; Thu, 19 Oct 2023 09:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697732379; x=1698337179; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xgdtjIni3YroBbwgFhLV2Ql8IZk3AaaGa5qlATtt2tE=; b=INjylFcxYkdRqZdnT1JzRwvxxzujEGLwvN4i6tsGygeqU9yvr0bk/X6QsMLV/Ks8NK XSjXkk9GCzKNaBazpMznSGsJWXqpxJ/SORSIN4n5+PAINfWeQzAipahO4e/De5uBlfyB jxPXMScNkfn7kE+Zed0zjx9IcPtooC1T7wGjPSEci1sv571ZUeo+VROeRfa193kpF79V hrUIGMZGxkphoJZdasmlsMHhyXbG2ompSOdQ61pjfuCgD07MneW3KeLzZwYVDNzB35kF 9gxZanGCeDwHqfYoEUt9eEA8hGLZHTwgGU0pAQSuZtoll8QlIpz+JhpGPyv19oHF9KIN i2GQ== X-Gm-Message-State: AOJu0YzrJLTcEZkdN97kcMOgH73x2UAk8nyLTchxlQA5AmPaAZ0gmKIa mGbHLKMGa39azvoDKz92DldqwQ== X-Google-Smtp-Source: AGHT+IHkUJNNsBJpLF2imfYWUNQK9WlTms4YADWd/oOLkQvQrLhk3elx039QGCltETAIrIA39Aqt0Q== X-Received: by 2002:a05:6512:314a:b0:503:8fa:da21 with SMTP id s10-20020a056512314a00b0050308fada21mr1876753lfi.43.1697732378874; Thu, 19 Oct 2023 09:19:38 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id q12-20020a05600c2e4c00b0040648217f4fsm4716517wmf.39.2023.10.19.09.19.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2023 09:19:38 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.100.2.1.4\)) Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop From: Jessica Clarke In-Reply-To: Date: Thu, 19 Oct 2023 17:19:27 +0100 Cc: Kristof Provost , Igor Ostapenko , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <6BB48213-2480-40B5-8698-058B4ED71304@freebsd.org> References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3774.100.2.1.4) 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:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4SBCbd0zR2z3Fwh On 19 Oct 2023, at 17:14, Gleb Smirnoff wrote: >=20 > On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: > K> +++ b/sys/netinet/ip_var.h > ... > K> +/* pf specific mtag for divert(4) support */ > K> +enum { PF_DIVERT_MTAG_DIR_IN=3D1, PF_DIVERT_MTAG_DIR_OUT=3D2 }; > K> +struct pf_divert_mtag { > K> + uint16_t idir; // initial pkt direction > K> + uint16_t ndir; // a) divert(4) port upon initial diversion > K> + // b) new direction upon pkt re-enter > K> +}; >=20 > This can be written as: >=20 > typedef enum { > PF_DIVERT_MTAG_DIR_IN =3D 1, > PF_DIVERT_MTAG_DIR_OUT =3D 2, > } pf_mtag_dir; You don=E2=80=99t need the typedef, whether you use it or not is a = matter of taste. > struct pf_divert_mtag { > pf_mtag_dir idir; /* Initial packet direction. */ > union { > pf_mtag_dir ndir; /* New direction after re-enter. = */ > uint16_t port; /* Initial divert(4) port. */ > }; > }; >=20 > The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN = instead > of 1 when looking at a structure. And compilation time failure if = anybody sets > it to a wrong value. Using "port" instead of "ndir" when assigning a = port > improves readability of code. >=20 > This will grow structure from 4 bytes to 8, as enum is always an int. = However, > uma allocator backing m_tag_alloc() will allocate same amount of = memory. We have __enum_uint8(_decl) these days, one could easily add a 16-bit = variant. Jess From nobody Thu Oct 19 17:01:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBDWv2ds4z4xfm3; Thu, 19 Oct 2023 17:01: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBDWt6r5zz3M31; Thu, 19 Oct 2023 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697734891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXhq+7QzcnhE4AZfMtWbexxC3ZRuq2hcF/CiwOv7VrQ=; b=WPtSXNsmD9VQcn+LdXgeXw1Vz8h3V6hXtZ/SOW6ipC7ydY0Apo9fDaWGEj+LZPkUYGvxGj Fu1faCDQDZa7rK+QWJRmlQMEkts622LboxhK5nmTjDE39hYlNgA13yvt35qBTtZ+D7E1XK IIt5l8mG1EZECr7tVOCxkJTakbIKwtzSC1C7jt/6w6m2SAHbMYtpsvwtW1uJ5crpdRRui0 mr57FiTtYN5M6DOEdV92OkKa1V+0KwKcrFaMratqzQ1cvJYqJ+VDz7O7ak0Gt7YpiJqViv 5Ilo5bWrIahOuK9GNRui+UGdCldZ7yme22IgeLMmQnUCqMKq4TEAr+ito9ZdAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697734891; a=rsa-sha256; cv=none; b=CnoVuqFrgwDqfc8lbhKRRYgVIxSWGNK8+0lI3EgLm3fEcy3TEvVBV5hMSC77Oj2A7fv94f ar5GLStJxNdkC2aoOLyIU2D4cP01xNTQVysFAKmildKtKGBAq/W9COkU69lfnpDOxii6WL 93Bqw6/u7yYJrif5NbcYwY124hYF6ew7uwSuyIuBeMpapjZaSg/IEIzGgq8FiOtS+DyxQD 7BBeOL00/2dhQ7XtrTF0bfPfTAgdnGaTIf492yWoJc01XYb5QwgylGyZ1f4JQIKQ8HX2Dk Cg7iu0LwJV6YVLihtoYG6CMI7E0oJjMxcvHCxc9flw1iY3u2X/TR4X0aZm+weA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697734891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXhq+7QzcnhE4AZfMtWbexxC3ZRuq2hcF/CiwOv7VrQ=; b=ZwlV6kx16NkQHV8C8Hsn80esd5/bYdg8h0hq8H+Q/QJOZeR1pb3N6rH8fhwYqXiu33BogX v2bWFqSKg2CBhLpXWTaUaMTEqcBaGAu3aPltnKCpqO/eB7T9mVpedj5JM/DR9aq4Jjm6Rh d6YpjSrpYHNEzJQlEOftYscmgZ+ie9JhIu2hV8StZUiw0hKnyrmVjIW3CoMGaAmA4XEegf LXgpgv8ACF+Ka455h3Zagy3zj/TLPzi9ErOcVyo+RnVQcvsiuN1MnBHpG+REfmA2NZdh7K 1LIGvIm6x4ar32NoYQfCSuJnY94fLR85jysz9OmPqMw9gUiSBNRQvOuzcCsydA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBDWt5tbbzyGP; Thu, 19 Oct 2023 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JH1Uoa041170; Thu, 19 Oct 2023 17:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JH1UXB041167; Thu, 19 Oct 2023 17:01:30 GMT (envelope-from git) Date: Thu, 19 Oct 2023 17:01:30 GMT Message-Id: <202310191701.39JH1UXB041167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 02320f642095 - main - pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 02320f64209563e35fa371fc5eac94067f688f7f Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=02320f64209563e35fa371fc5eac94067f688f7f commit 02320f64209563e35fa371fc5eac94067f688f7f Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 17:00:31 +0000 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable since 7ff48af7040f (Allow a specific setting for pv entries) but is fetched from system environment 'vm.pmap.pv_entries'. That is inconsistent and obscure. This reverts 36e1b9702e21 (Correct the tunable name in the message). PR: 231577 Reviewed by: jhibbits, alc, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42274 --- sys/arm/arm/pmap-v6.c | 4 ++-- sys/i386/i386/pmap.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 719851432203..92e992a4b25e 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1750,7 +1750,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -3012,7 +3012,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 6b839484e6c5..967ad48de460 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -998,7 +998,7 @@ __CONCAT(PMTYPE, init)(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -2519,7 +2519,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index fe6b95eda085..f41ea24cd30c 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1069,7 +1069,7 @@ mmu_booke_init(void) TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_reserve_kva(pvzone, pv_entry_max); From nobody Thu Oct 19 17:20:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBDxM68LNz4xgND; Thu, 19 Oct 2023 17:20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBDxM5j7dz3NLm; Thu, 19 Oct 2023 17:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kp+C//6roN8RZA5n48xUd3E4kePC7PjaydIZ3itdQRU=; b=YKcnPa/eURqFPuL/zYvUNOwtBwux8mt/HfVUWL3M6lieSxIdcWhncIXvBmwjog0CwgUfP2 xZwl1rpfZd2wqBIONWRTuoFW1bsAmkymsXCIn69FM2nrGt+ChjtvB9NiLOY+sepMp6k73B G2g3rs1+a994e+SzftTkuWOglXRKBzPw2BXaDT/4HNBmlhwQ0k4a0pVYJdwHiZ6Bi/hfB/ QyEtMWgy7XMcMP7Jbi9iOvzVJMkrekCzoSA5zelczFzJKNd9Sr0qC1PbHO4fEWL1ExyXNp 5lfqz9/TpSY/8F1qKBBayDYjwQjRBb9XLnRslK5NG3o13XoZrtT8CQXP/lUhCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697736007; a=rsa-sha256; cv=none; b=wpvv+SpwboES5IX84/UzGDe6/9BaOLRk3oIOcDyTBlcbW+GrPeBzjAl4VnOLi5fXRLUqd4 wEO3fmZ5y2B8AdlRYqXEZ1M3KuLywHLssmhUP1rwvdM+S1pkW7bLJ4l31owfp3lLE/qls5 n5FTO1rkwXrjx6wUGc6loCmhWIaHTbU0joMq3j5+QCJSQXCpDmVKZLUsxZcsj/SCWA2KzR 1ALRT6VT+n21H5KNaw1p1qJuUE8lfQ97OVAQsaR2NouYTYq+p9QscjzvIjsv4a/iG20uQL ShYy/LlNXAuNBwFsMi8mefGmp2jwdyGdupVZaYC1oTlVD3FoMErOMwDOWYAfvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kp+C//6roN8RZA5n48xUd3E4kePC7PjaydIZ3itdQRU=; b=ckA8bvhVSYbupOlywQdoD7KJsDy8vaa2A2IDDrSSmWD3m4Bhw9wilMYyjZTI+xbpVY2gDV vTIx4S28rOMGVYB7wovusg4Er0N6RMOtAVLFJI0aO8+fiB+RuOCTVh8DgVKVlVXSBiv+He oHDToGWrlin5yf/GRxnFmnaM2JSfFcvrt5Xl2fVvN052idOoYmcUuWhmXqrnEX+bNdGwvj O0ir94/EVXmgmIVOwjWLYY19mhEZmtfbJqIN5OtqLdtgxhmx8GVg+WuR9gRGaPNejLiR4G 6hcmmcgIukx2+HtObEvAo/F+EaVLY3olvCbXDlfihLJg1V8s9oua4MNzBv9Zvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBDxM4lxNzy4p; Thu, 19 Oct 2023 17:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JHK7mm065478; Thu, 19 Oct 2023 17:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JHK75n065475; Thu, 19 Oct 2023 17:20:07 GMT (envelope-from git) Date: Thu, 19 Oct 2023 17:20:07 GMT Message-Id: <202310191720.39JHK75n065475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f3ff0918ffcd - main - vmx: Prefer consistent naming for loader tunables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f3ff0918ffcdbcb4c39175f3f9be70999edb14e8 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ff0918ffcdbcb4c39175f3f9be70999edb14e8 commit f3ff0918ffcdbcb4c39175f3f9be70999edb14e8 Author: Zhenlei Huang AuthorDate: 2023-10-19 17:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 17:18:25 +0000 vmx: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with different names. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to read and maintain. 1. hw.vmm.l1d_flush -> hw.vmm.vmx.l1d_flush 2. hw.vmm.l1d_flush_sw -> hw.vmm.vmx.l1d_flush_sw 3. hw.vmm.vmx.use_apic_pir -> hw.vmm.vmx.cap.posted_interrupts 4. hw.vmm.vmx.use_apic_vid -> hw.vmm.vmx.cap.virtual_interrupt_delivery 5. hw.vmm.vmx.use_tpr_shadowing -> hw.vmm.vmx.cap.tpr_shadowing Old names are kept for compatibility. Meanwhile, add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. Reviewed by: corvink, jhb, kib, #bhyve MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D42251 --- sys/amd64/vmm/intel/vmx.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 51c6afe5a7da..317ed7e5d7fb 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -192,15 +192,18 @@ SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, invpcid, CTLFLAG_RD, &cap_invpcid, 0, "Guests are allowed to use INVPCID"); static int tpr_shadowing; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &tpr_shadowing, 0, "TPR shadowing support"); static int virtual_interrupt_delivery; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &virtual_interrupt_delivery, 0, "APICv virtual interrupt delivery support"); static int posted_interrupts; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &posted_interrupts, 0, "APICv posted interrupt support"); static int pirvec = -1; @@ -213,10 +216,10 @@ SYSCTL_UINT(_hw_vmm_vmx, OID_AUTO, vpid_alloc_failed, CTLFLAG_RD, &vpid_alloc_failed, 0, NULL); int guest_l1d_flush; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush, 0, NULL); int guest_l1d_flush_sw; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush_sw, 0, NULL); static struct msr_entry msr_load_list[1] __aligned(16); @@ -832,8 +835,12 @@ vmx_modinit(int ipinum) &tmp); if (error == 0) { tpr_shadowing = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_tpr_shadowing", &tpr_shadowing); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.tpr_shadowing", + &tpr_shadowing); } if (tpr_shadowing) { @@ -854,8 +861,12 @@ vmx_modinit(int ipinum) procbased2_vid_bits, 0, &tmp); if (error == 0 && tpr_shadowing) { virtual_interrupt_delivery = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_vid", &virtual_interrupt_delivery); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.virtual_interrupt_delivery", + &virtual_interrupt_delivery); } if (virtual_interrupt_delivery) { @@ -881,8 +892,12 @@ vmx_modinit(int ipinum) } } else { posted_interrupts = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_pir", &posted_interrupts); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.posted_interrupts", + &posted_interrupts); } } } @@ -899,7 +914,10 @@ vmx_modinit(int ipinum) guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush", &guest_l1d_flush); /* * L1D cache flush is enabled. Use IA32_FLUSH_CMD MSR when @@ -911,8 +929,12 @@ vmx_modinit(int ipinum) if (guest_l1d_flush) { if ((cpu_stdext_feature3 & CPUID_STDEXT3_L1D_FLUSH) == 0) { guest_l1d_flush_sw = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush_sw", &guest_l1d_flush_sw); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush_sw", + &guest_l1d_flush_sw); } if (guest_l1d_flush_sw) { if (nmi_flush_l1d_sw <= 1) From nobody Thu Oct 19 17:28:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBF6n030qz4xgrr; Thu, 19 Oct 2023 17:28:17 +0000 (UTC) (envelope-from zlei@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBF6m6VfZz3PwT; Thu, 19 Oct 2023 17:28:16 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uThdu/WKdVZvlDZNe596rGZZm7DmSvHjz1U0Z5FcI1k=; b=IrudJ6YKPzMPgmVqBOdtos3FBUzL6Bghy90p5ZTTIRXKDrzVVo8ry0WfiQVWhJk7GsM/M2 gr68RsblJOAgRjoBZ6kO6L4BFF7NUb+0FYulFEyonoyET/HwWGi1EW08Byr2dcdRsjusXo slYocn6+I1+0jXLTPMt2802VfOhh2/Eb4cnQJXjYpDKUMvFN7URaQvQapl3eTml0tBF6QH voijjdc9VKA+ogZjweDX/zlTS+dr2Ov94hLxiKCT0HtrGBX5Ir/Ed/Q7oOhLPCyXZ6xOAd VUqzpxVinGqD8zpMLul6hGldnzJVjPDEUfn6BWf6G7K6jt/UheDEqMtzFWzFyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697736496; a=rsa-sha256; cv=none; b=hqYo02dqoynwMsmFl7WuDvV9X9CV5Hvdsmu0yhSOTng4R72ZmyKJX8xoU53JW5kPhG1UmO xJtyVBT6ve1kFDkJ2Wj9XAEegUvH1au+2SymS6bWaUgjlB9zwiVG0su//PfJ2vwW4c8hKH Rmhui8kaD8Dfy+y2IAQxEOedPp1MhIUE+YFCAI6o8hvuE8Yw+Zs0CCpA/nOiVqPntzQZXa fV0a/BBGoYcYImzpp5bBax7+wV5ThVVvPtLxy279Otrr83e8AYQ2gQyoa/MzTTjwj7Bwuy QjZjRVxxf0otrcfovIF5ZBvrgXlTx0urTEJrt9/ajW4kS3nc0lkZ3YPrCMPP8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uThdu/WKdVZvlDZNe596rGZZm7DmSvHjz1U0Z5FcI1k=; b=knEF83FUK3/LEWHXKTNljRXNGIzxkPZCK3szdOwJmOfVcH3dFpZRdmqfj/fFDAL3i/48jE CSD0syxpqct8iwXvcKfj+brP4QgWoZ1xaHwB9xhjAtHlZjfjk8u/D8JyQSHoCaLSPfLOWm T+7YSudNrkXs5ygXmslgmNaM/8zeCyusgHJVc6uggVHfsStOYQXPmsLYXZ2ugRSV09tv1v 797CaVTNUt3jlkrJpeVOx8lONpHzVPXS5vh/JrabFuDU8IcnqGpsMGkifDf5kTEbt74Rtd PlCgQwTl3kXQQHWpGRAvoUA/JQlnO+Gxme2VXLuywomBDvZq3349uyMFKqhVng== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SBF6l4qS4z19M1; Thu, 19 Oct 2023 17:28:15 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 02320f642095 - main - pmap: Prefer consistent naming for loader tunable Date: Fri, 20 Oct 2023 01:28:10 +0800 References: <202310191701.39JH1UXB041167@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" In-Reply-To: <202310191701.39JH1UXB041167@gitrepo.freebsd.org> Message-Id: <07922B4A-923A-41A3-8134-10BAF338564B@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) > On Oct 20, 2023, at 1:01 AM, Zhenlei Huang wrote: >=20 > The branch main has been updated by zlei: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D02320f64209563e35fa371fc5eac9406= 7f688f7f >=20 > commit 02320f64209563e35fa371fc5eac94067f688f7f > Author: Zhenlei Huang > AuthorDate: 2023-10-19 17:00:31 +0000 > Commit: Zhenlei Huang > CommitDate: 2023-10-19 17:00:31 +0000 >=20 > pmap: Prefer consistent naming for loader tunable >=20 > The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable = since > 7ff48af7040f (Allow a specific setting for pv entries) but is = fetched > from system environment 'vm.pmap.pv_entries'. That is inconsistent = and The 'system environment' is misleading. I meant 'kernel environment' . Sorry for fast commit. > obscure. >=20 > This reverts 36e1b9702e21 (Correct the tunable name in the = message). >=20 > PR: 231577 > Reviewed by: jhibbits, alc, kib > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D42274 > --- > sys/arm/arm/pmap-v6.c | 4 ++-- > sys/i386/i386/pmap.c | 4 ++-- > sys/powerpc/booke/pmap.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c > index 719851432203..92e992a4b25e 100644 > --- a/sys/arm/arm/pmap-v6.c > +++ b/sys/arm/arm/pmap-v6.c > @@ -1750,7 +1750,7 @@ pmap_init(void) > */ > TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); > pv_entry_max =3D shpgperproc * maxproc + vm_cnt.v_page_count; > - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); > + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); > pv_entry_max =3D roundup(pv_entry_max, _NPCPV); > pv_entry_high_water =3D 9 * (pv_entry_max / 10); >=20 > @@ -3012,7 +3012,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) > if (ratecheck(&lastprint, &printinterval)) > printf("Approaching the limit on PV entries, = consider " > "increasing either the vm.pmap.shpgperproc = or the " > - "vm.pmap.pv_entries tunable.\n"); > + "vm.pmap.pv_entry_max tunable.\n"); > retry: > pc =3D TAILQ_FIRST(&pmap->pm_pvchunk); > if (pc !=3D NULL) { > diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c > index 6b839484e6c5..967ad48de460 100644 > --- a/sys/i386/i386/pmap.c > +++ b/sys/i386/i386/pmap.c > @@ -998,7 +998,7 @@ __CONCAT(PMTYPE, init)(void) > */ > TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); > pv_entry_max =3D shpgperproc * maxproc + vm_cnt.v_page_count; > - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); > + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); > pv_entry_max =3D roundup(pv_entry_max, _NPCPV); > pv_entry_high_water =3D 9 * (pv_entry_max / 10); >=20 > @@ -2519,7 +2519,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) > if (ratecheck(&lastprint, &printinterval)) > printf("Approaching the limit on PV entries, = consider " > "increasing either the vm.pmap.shpgperproc = or the " > - "vm.pmap.pv_entries tunable.\n"); > + "vm.pmap.pv_entry_max tunable.\n"); > retry: > pc =3D TAILQ_FIRST(&pmap->pm_pvchunk); > if (pc !=3D NULL) { > diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c > index fe6b95eda085..f41ea24cd30c 100644 > --- a/sys/powerpc/booke/pmap.c > +++ b/sys/powerpc/booke/pmap.c > @@ -1069,7 +1069,7 @@ mmu_booke_init(void) > TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); > pv_entry_max =3D shpgperproc * maxproc + vm_cnt.v_page_count; >=20 > - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); > + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); > pv_entry_high_water =3D 9 * (pv_entry_max / 10); >=20 > uma_zone_reserve_kva(pvzone, pv_entry_max); From nobody Thu Oct 19 18:36:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdl0Xjnz4xkkL; Thu, 19 Oct 2023 18:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBGdl04bQz3Vlx; Thu, 19 Oct 2023 18:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=270yDVKUP7yfmdq55+iiH+i22zK3yMYgsfyUjTSMs5g=; b=ZvARRnklgc+WiBaQ5gnA0P78zEmzLjDsyeCTt5svXhuvdqFqJAd1OjKyQg0rhTyXp1n+y6 vFSwr2dS0AJgKDMdyE8FMDh6S2fxdwRZQv3ZXLrb4YuBoehKHoFDIZ8Laiq+Cu1KuAuUfo fjLOqofyVqLEnBkY7m7+2sLIzsV08VWxxJs5hcKDH5rPE1aJ68oLgXazBTZ/I/nNzlN225 ZeF9/UAGc0nMzUkQ7UzMFwdA2GN5+s7a5QK1IimzQZgPM1toAVWwVoTbUXhTKktwzKQzVN e2RekPvfq21JtphK/lnKr9komghcYB4Htm8b6ahq6u60ohNDv244+nf/IMAe4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740603; a=rsa-sha256; cv=none; b=kvRXNPkRPr6mv9cHljSwfp8t0VbW+shnDGLwL/NWBbna9ax2oi9d1vO9pYolpaivb+6Pze W0ts5b4lAf610zurd+GvaPgCyFjvpWuq8ADsXGkVupql1GQM5vHMrx/o7mEITYfX8KlqHH 5CZmPnqv8pRlZEHnxh4n/4d5jaQQgLanWVucxtgW3ubA/ENxU19Xmch5zFknLJ/1UWzbh4 eT1H4CeamO++tlW5KdImSjSXy/wVjAN4Vqe0jkVBH21+3NM1C2zIpwDcY9YL4ksI6YZCGC uaBW1wjN3ylhG7FLZ63WmqwopUSDoYrStrlRGKxOlKpiXGFIDA2PuT6Ts6U9fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=270yDVKUP7yfmdq55+iiH+i22zK3yMYgsfyUjTSMs5g=; b=gS9meMzdxg4ar6gSZc8Tk3nOnn07rZxkNEKqV08QWtwME9BWrFby2OCuwkOph4XWGo0jC6 UpfBi+x2UtdqkldxHdR6ZwXqNLqYfE6HWbbaIakCudDL/+JsVSHcmHzoNEveHSsMVvd5Xg uehlS8rHJq8r4eouvwHyxUym6U4s6LQKIoKOUfEFq88+3Rk5m+fAKq1EnLLbdCbZxchHSJ m5d0xZiLhJ9Mj/FqkYxT7b6S/w5QfHUGzgzxZljs1edHkyWHz0vIjt21/w3hfQkvgBAcXd lgqzc9VaxNgPvHVm/slYmGRKmwMtO/TnoI9AY5q/7kzkYeGeH3nXcBliLuZfcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdk6F8Kz10tb; Thu, 19 Oct 2023 18:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JIags6094142; Thu, 19 Oct 2023 18:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIagVX094139; Thu, 19 Oct 2023 18:36:42 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:42 GMT Message-Id: <202310191836.39JIagVX094139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3de4f78d46c5 - main - Add support for Chacha20-Poly1305 to kernel TLS on FreeBSD. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 3de4f78d46c58f23017942967ec74cbc3d2e175d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3de4f78d46c58f23017942967ec74cbc3d2e175d commit 3de4f78d46c58f23017942967ec74cbc3d2e175d Author: John Baldwin AuthorDate: 2020-12-23 22:09:51 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 Add support for Chacha20-Poly1305 to kernel TLS on FreeBSD. FreeBSD's kernel TLS supports Chacha20 for both TLS 1.2 and TLS 1.3. Obtained from: OpenSSL commit 77f3936928068bee9d7e0c6939709ac179cb1059 --- crypto/openssl/include/internal/ktls.h | 5 +++++ crypto/openssl/ssl/ktls.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/crypto/openssl/include/internal/ktls.h b/crypto/openssl/include/internal/ktls.h index 95492fd0659f..3c82cae26b47 100644 --- a/crypto/openssl/include/internal/ktls.h +++ b/crypto/openssl/include/internal/ktls.h @@ -40,6 +40,11 @@ # define OPENSSL_KTLS_AES_GCM_128 # define OPENSSL_KTLS_AES_GCM_256 # define OPENSSL_KTLS_TLS13 +# ifdef TLS_CHACHA20_IV_LEN +# ifndef OPENSSL_NO_CHACHA +# define OPENSSL_KTLS_CHACHA20_POLY1305 +# endif +# endif typedef struct tls_enable ktls_crypto_info_t; diff --git a/crypto/openssl/ssl/ktls.c b/crypto/openssl/ssl/ktls.c index ddbfd1447c54..daa758294a4c 100644 --- a/crypto/openssl/ssl/ktls.c +++ b/crypto/openssl/ssl/ktls.c @@ -37,6 +37,10 @@ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, case SSL_AES128GCM: case SSL_AES256GCM: return 1; +# ifdef OPENSSL_KTLS_CHACHA20_POLY1305 + case SSL_CHACHA20POLY1305: + return 1; +# endif case SSL_AES128: case SSL_AES256: if (s->ext.use_etm) @@ -74,6 +78,12 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, else crypto_info->iv_len = EVP_GCM_TLS_FIXED_IV_LEN; break; +# ifdef OPENSSL_KTLS_CHACHA20_POLY1305 + case SSL_CHACHA20POLY1305: + crypto_info->cipher_algorithm = CRYPTO_CHACHA20_POLY1305; + crypto_info->iv_len = EVP_CIPHER_CTX_get_iv_length(dd); + break; +# endif case SSL_AES128: case SSL_AES256: switch (s->s3.tmp.new_cipher->algorithm_mac) { From nobody Thu Oct 19 18:36:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdm1xsPz4xkw7; Thu, 19 Oct 2023 18:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBGdm1NW1z3VmN; Thu, 19 Oct 2023 18:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sfe6mPSssggho28Rf7vsHlVQUQyjNsFYCSO8KtFdKk4=; b=YW/H3Deo3BmiAJnYLmwBcaOt2a7KIwlRPSYW/sWzc+yXueaa9nDQMRNVW+Ae4RbhiWMAg3 P5lQzsKIb05nrMI60jI0FhSExMepzT+teuweFKtbiGwkx3F/JkLCDX6z0saarr2euz+mkJ g/Nx8itzsSoEgFfibeWsFbTllI+W84bnwEqQyMB2fqmeb+nW9386Mhjddkq7N8pgY+92U7 wJlCNYo9ofby63lBu+PAaD+A7neEobYF9Sh2azyr8Onzcb+5XSrHTr2EUuIUnMkCAVs2kR ntYn9yvUsi/VefO98nAUEFELzYHBoafq5rbsx2XAQ2+UpU7ueyxs3DyITt1hXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740604; a=rsa-sha256; cv=none; b=pmdtQeVOs0RIacE+bbfzvykzW/bYAw6d4yhbDnKGAFZ/bCPJ9sXPGAJGRzF5iTesZ2I+Xs y74hG3wCeqgzcoq46q6a3AiNcU+PoqylK5HX9l4IZYurijV4T/UAD2k3zaBjbYQPfaX1yH GhMGG2p4SHJ4fLZb3MFc9eLSS078ojam6ChPEmaYQbnVBcC950yQ2BgXEn5y/2wG0KiyYT Hf+QtIZs7rB/RFGgK8EXvm5dXmy27asZY6xT+FR+xadZ1m+VPkxH4YsB+TENcG82zoXA0g dUjy/lmEOE2/T4XKC21ABbv6RiPzThSKwvwRA+R5WHTNY0hm1f53wt4rK3tfmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sfe6mPSssggho28Rf7vsHlVQUQyjNsFYCSO8KtFdKk4=; b=hpQKbqcmH859TYTEITt9TBnpAk6QHfTsA7eXJGUYQUGzUsBlI5SMNUuiOkO/Bk0zySgx1x NgGKCDKqXRqyRJnRDqmNfWhm3x34pwWfpCDCjy7Rp2gBsS8T2Oh3zJrgDn34wj/7X8MsU6 KDa00c6NpWbAeqJhrBnrkt+L+hEXNF+kfka5uXO8OhOdkfRaWkLo4h4MKiTGPaZ6SoNRO7 KfQmG5GIFW8eT/6aCpdv/DK9WPUVNhAl7mnPda0LZSIoDACegSZ7oLYf3v6iGqW/QwyFse +WS+/5t4wa0mF1uXLTTPwG1rbwJaTsZjRv7/3MNt1JnJTPy/i+qF0W1E8aXYKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdm07xzz10tc; Thu, 19 Oct 2023 18:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JIahsX094193; Thu, 19 Oct 2023 18:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIahRU094190; Thu, 19 Oct 2023 18:36:43 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:43 GMT Message-Id: <202310191836.39JIahRU094190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: eee55a22b202 - main - KTLS: Check for unprocessed receive records in ktls_configure_crypto. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: eee55a22b20214ca41cd6b1bbea79b863c8c11ac Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eee55a22b20214ca41cd6b1bbea79b863c8c11ac commit eee55a22b20214ca41cd6b1bbea79b863c8c11ac Author: John Baldwin AuthorDate: 2022-02-24 18:12:07 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Check for unprocessed receive records in ktls_configure_crypto. KTLS implementations currently assume that the start of the in-kernel socket buffer is aligned with the start of a TLS record for the receive side. The socket option to enable KTLS specifies the TLS sequence number of this initial record. When read ahead is enabled, data can be pending in the SSL read buffer after negotiating session keys. This pending data must be examined to ensurs that the kernel's socket buffer does not contain a partial TLS record as well as to determine the correct sequence number of the first TLS record to be processed by the kernel. In preparation for enabling receive kernel offload for TLS 1.3, move the existing logic to handle read ahead from t1_enc.c into ktls.c and invoke it from ktls_configure_crypto(). Obtained from: OpenSSL commit 85773128d0e80cd8dcc772a6931d385b8cf4acd1 --- crypto/openssl/ssl/ktls.c | 100 ++++++++++++++++++++++++++++++++++------- crypto/openssl/ssl/ssl_local.h | 4 +- crypto/openssl/ssl/t1_enc.c | 66 ++------------------------- crypto/openssl/ssl/tls13_enc.c | 3 +- 4 files changed, 91 insertions(+), 82 deletions(-) diff --git a/crypto/openssl/ssl/ktls.c b/crypto/openssl/ssl/ktls.c index daa758294a4c..28bb62d236ab 100644 --- a/crypto/openssl/ssl/ktls.c +++ b/crypto/openssl/ssl/ktls.c @@ -10,6 +10,67 @@ #include "ssl_local.h" #include "internal/ktls.h" +#ifndef OPENSSL_NO_KTLS_RX + /* + * Count the number of records that were not processed yet from record boundary. + * + * This function assumes that there are only fully formed records read in the + * record layer. If read_ahead is enabled, then this might be false and this + * function will fail. + */ +static int count_unprocessed_records(SSL *s) +{ + SSL3_BUFFER *rbuf = RECORD_LAYER_get_rbuf(&s->rlayer); + PACKET pkt, subpkt; + int count = 0; + + if (!PACKET_buf_init(&pkt, rbuf->buf + rbuf->offset, rbuf->left)) + return -1; + + while (PACKET_remaining(&pkt) > 0) { + /* Skip record type and version */ + if (!PACKET_forward(&pkt, 3)) + return -1; + + /* Read until next record */ + if (!PACKET_get_length_prefixed_2(&pkt, &subpkt)) + return -1; + + count += 1; + } + + return count; +} + +/* + * The kernel cannot offload receive if a partial TLS record has been read. + * Check the read buffer for unprocessed records. If the buffer contains a + * partial record, fail and return 0. Otherwise, update the sequence + * number at *rec_seq for the count of unprocessed records and return 1. + */ +static int check_rx_read_ahead(SSL *s, unsigned char *rec_seq) +{ + int bit, count_unprocessed; + + count_unprocessed = count_unprocessed_records(s); + if (count_unprocessed < 0) + return 0; + + /* increment the crypto_info record sequence */ + while (count_unprocessed) { + for (bit = 7; bit >= 0; bit--) { /* increment */ + ++rec_seq[bit]; + if (rec_seq[bit] != 0) + break; + } + count_unprocessed--; + + } + + return 1; +} +#endif + #if defined(__FreeBSD__) # include "crypto/cryptodev.h" @@ -59,9 +120,9 @@ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, } /* Function to configure kernel TLS structure */ -int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, +int ktls_configure_crypto(SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, void *rl_sequence, ktls_crypto_info_t *crypto_info, - unsigned char **rec_seq, unsigned char *iv, + int is_tx, unsigned char *iv, unsigned char *key, unsigned char *mac_key, size_t mac_secret_size) { @@ -114,11 +175,11 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, crypto_info->tls_vminor = (s->version & 0x000000ff); # ifdef TCP_RXTLS_ENABLE memcpy(crypto_info->rec_seq, rl_sequence, sizeof(crypto_info->rec_seq)); - if (rec_seq != NULL) - *rec_seq = crypto_info->rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->rec_seq)) + return 0; # else - if (rec_seq != NULL) - *rec_seq = NULL; + if (!is_tx) + return 0; # endif return 1; }; @@ -167,15 +228,20 @@ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, } /* Function to configure kernel TLS structure */ -int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, +int ktls_configure_crypto(SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, void *rl_sequence, ktls_crypto_info_t *crypto_info, - unsigned char **rec_seq, unsigned char *iv, + int is_tx, unsigned char *iv, unsigned char *key, unsigned char *mac_key, size_t mac_secret_size) { unsigned char geniv[12]; unsigned char *iiv = iv; +# ifdef OPENSSL_NO_KTLS_RX + if (!is_tx) + return 0; +# endif + if (s->version == TLS1_2_VERSION && EVP_CIPHER_get_mode(c) == EVP_CIPH_GCM_MODE) { if (!EVP_CIPHER_CTX_get_updated_iv(dd, geniv, @@ -199,8 +265,8 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, memcpy(crypto_info->gcm128.key, key, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->gcm128.rec_seq, rl_sequence, TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->gcm128.rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->gcm128.rec_seq)) + return 0; return 1; # endif # ifdef OPENSSL_KTLS_AES_GCM_256 @@ -214,8 +280,8 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, memcpy(crypto_info->gcm256.key, key, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->gcm256.rec_seq, rl_sequence, TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->gcm256.rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->gcm256.rec_seq)) + return 0; return 1; # endif # ifdef OPENSSL_KTLS_AES_CCM_128 @@ -229,8 +295,8 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, memcpy(crypto_info->ccm128.key, key, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->ccm128.rec_seq, rl_sequence, TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->ccm128.rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->ccm128.rec_seq)) + return 0; return 1; # endif # ifdef OPENSSL_KTLS_CHACHA20_POLY1305 @@ -244,8 +310,10 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->chacha20poly1305.rec_seq, rl_sequence, TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->chacha20poly1305.rec_seq; + if (!is_tx + && !check_rx_read_ahead(s, + crypto_info->chacha20poly1305.rec_seq)) + return 0; return 1; # endif default: diff --git a/crypto/openssl/ssl/ssl_local.h b/crypto/openssl/ssl/ssl_local.h index 5fb1feb80163..bb5816024a17 100644 --- a/crypto/openssl/ssl/ssl_local.h +++ b/crypto/openssl/ssl/ssl_local.h @@ -2762,9 +2762,9 @@ __owur int ssl_log_secret(SSL *ssl, const char *label, /* ktls.c */ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, const EVP_CIPHER_CTX *dd); -int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, +int ktls_configure_crypto(SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, void *rl_sequence, ktls_crypto_info_t *crypto_info, - unsigned char **rec_seq, unsigned char *iv, + int is_tx, unsigned char *iv, unsigned char *key, unsigned char *mac_key, size_t mac_secret_size); # endif diff --git a/crypto/openssl/ssl/t1_enc.c b/crypto/openssl/ssl/t1_enc.c index 91238e6457b8..26182a1cd6eb 100644 --- a/crypto/openssl/ssl/t1_enc.c +++ b/crypto/openssl/ssl/t1_enc.c @@ -98,42 +98,6 @@ static int tls1_generate_key_block(SSL *s, unsigned char *km, size_t num) return ret; } -#ifndef OPENSSL_NO_KTLS - /* - * Count the number of records that were not processed yet from record boundary. - * - * This function assumes that there are only fully formed records read in the - * record layer. If read_ahead is enabled, then this might be false and this - * function will fail. - */ -# ifndef OPENSSL_NO_KTLS_RX -static int count_unprocessed_records(SSL *s) -{ - SSL3_BUFFER *rbuf = RECORD_LAYER_get_rbuf(&s->rlayer); - PACKET pkt, subpkt; - int count = 0; - - if (!PACKET_buf_init(&pkt, rbuf->buf + rbuf->offset, rbuf->left)) - return -1; - - while (PACKET_remaining(&pkt) > 0) { - /* Skip record type and version */ - if (!PACKET_forward(&pkt, 3)) - return -1; - - /* Read until next record */ - if (!PACKET_get_length_prefixed_2(&pkt, &subpkt)) - return -1; - - count += 1; - } - - return count; -} -# endif -#endif - - int tls_provider_set_tls_params(SSL *s, EVP_CIPHER_CTX *ctx, const EVP_CIPHER *ciph, const EVP_MD *md) @@ -201,12 +165,7 @@ int tls1_change_cipher_state(SSL *s, int which) int reuse_dd = 0; #ifndef OPENSSL_NO_KTLS ktls_crypto_info_t crypto_info; - unsigned char *rec_seq; void *rl_sequence; -# ifndef OPENSSL_NO_KTLS_RX - int count_unprocessed; - int bit; -# endif BIO *bio; #endif @@ -473,30 +432,11 @@ int tls1_change_cipher_state(SSL *s, int which) else rl_sequence = RECORD_LAYER_get_read_sequence(&s->rlayer); - if (!ktls_configure_crypto(s, c, dd, rl_sequence, &crypto_info, &rec_seq, - iv, key, ms, *mac_secret_size)) + if (!ktls_configure_crypto(s, c, dd, rl_sequence, &crypto_info, + which & SSL3_CC_WRITE, iv, key, ms, + *mac_secret_size)) goto skip_ktls; - if (which & SSL3_CC_READ) { -# ifndef OPENSSL_NO_KTLS_RX - count_unprocessed = count_unprocessed_records(s); - if (count_unprocessed < 0) - goto skip_ktls; - - /* increment the crypto_info record sequence */ - while (count_unprocessed) { - for (bit = 7; bit >= 0; bit--) { /* increment */ - ++rec_seq[bit]; - if (rec_seq[bit] != 0) - break; - } - count_unprocessed--; - } -# else - goto skip_ktls; -# endif - } - /* ktls works with user provided buffers directly */ if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) { if (which & SSL3_CC_WRITE) diff --git a/crypto/openssl/ssl/tls13_enc.c b/crypto/openssl/ssl/tls13_enc.c index ddcff5eb8911..861ecdf91701 100644 --- a/crypto/openssl/ssl/tls13_enc.c +++ b/crypto/openssl/ssl/tls13_enc.c @@ -723,7 +723,8 @@ int tls13_change_cipher_state(SSL *s, int which) /* configure kernel crypto structure */ if (!ktls_configure_crypto(s, cipher, ciph_ctx, RECORD_LAYER_get_write_sequence(&s->rlayer), - &crypto_info, NULL, iv, key, NULL, 0)) + &crypto_info, which & SSL3_CC_WRITE, iv, key, + NULL, 0)) goto skip_ktls; /* ktls works with user provided buffers directly */ From nobody Thu Oct 19 18:36:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdn2Z5qz4xkf3; Thu, 19 Oct 2023 18:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBGdn1wWPz3VsF; Thu, 19 Oct 2023 18:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBVhHzfQ8BduRX5ZoRQAQZUGnh0AzoI7v2MC8oS7qdk=; b=MofE2VL7KfwqLpFON1y2XcCes46nGbP77/cfHhyrVZCA+JNMElEXoCfsN8wv1LYEFj0uwC 69nJu+d+vAirNYYjW2m6Vuu4ZY676IQ/GprJxPhoVABwQEkO91fTTznEOa/vx2awjBMUsv OO08+H8GyGRW7HuJuxeYq+aZ0TaGFYqaB60nJt+LaTOkiFxvg0yRehesMuLxJ+Go7rjS7N WgoO6pV9m3wAi9rPUhI681FXEBx1Fd4bbvGCZdImY3NWLassbdPMnd+UpWUioQo78YuHBZ luv3h9IGFxGlxw21+GnmyGOjzSUEIPUyk28F+QtkfC3DbuJxR6y4mHj3iEhibw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740605; a=rsa-sha256; cv=none; b=RXT5enLXDxxpov08+d8d2IWHQ/HrpYAs/MMSe5+jPKtxbez1b3bugB5zEVH5kL/J3wbHQt PqsAvqYfXWzVSsnhpBUsg5oe0lRPMesOMf9w/euuzQhYghxoY+GnJJrApJP+FtjVxWsOyH TP+kB9Y4dzZM661JQz2EqFP1JznMVSKmBiLRRfRqdQXtKDiCng6VbeGEXTAg4qjlud2AZ4 JBWAy83zIkZ+/VzpOUKXvUJvnd+jWdiYtayuCk/lZKow3KRH4KcZEy8P+B9AWx9FiAzB/o hdsFCXkKQl27xiQXaph3Y1n9oWZVLuxlcJUjgwmg0tCXAEbLSm4ezBO9B51etQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBVhHzfQ8BduRX5ZoRQAQZUGnh0AzoI7v2MC8oS7qdk=; b=A8EjZLBjU5x1ESTUz3YMd90SkZSvOgT7KH46VmWyFUns23F8qwl9Yr3PTsGmynP5RUjBOD FWWysj4ZfFqpwiRcbjRuH/3uLH9WI7S/ZTbAQQxDMzz8a8ivperbOrKMG1dRQ+XeQbJy5Z +omwn4RmRMHHKOwvagX01zoJqDQo+w+PM4MvyAvSXd4C3wUPktWkF7g8EdZTTIQbeMzcRH wZcWOfzAy2lRHU1p+AEj3QpfJbaRLSNRl521uTEQU4h3cGUQkCgdr+44mHSZZzaOQbRyvF snmCEvKhiSwCzMcWjc6xq7vzqm4h3i0bvWEoVI26YPHIRxPXh+zXwI2XLFzbiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdn0jQvz11bZ; Thu, 19 Oct 2023 18:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JIaj97094248; Thu, 19 Oct 2023 18:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIajHo094245; Thu, 19 Oct 2023 18:36:45 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:45 GMT Message-Id: <202310191836.39JIajHo094245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0fc28f22d5b6 - main - KTLS: Add using_ktls helper variable in ssl3_get_record(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 0fc28f22d5b6a75d8a0449262a05cefe1040f982 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0fc28f22d5b6a75d8a0449262a05cefe1040f982 commit 0fc28f22d5b6a75d8a0449262a05cefe1040f982 Author: John Baldwin AuthorDate: 2022-03-08 00:55:18 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Add using_ktls helper variable in ssl3_get_record(). When KTLS receive is enabled, pending data may still be present due to read ahead. This data must still be processed the same as records received without KTLS. To ease readability (especially in consideration of additional checks which will be added for TLS 1.3), add a helper variable 'using_ktls' that is true when the KTLS receive path is being used to receive a record. Obtained from: OpenSSL commit 031132c297e54cbc20404a0bf8de6ed863196399 --- crypto/openssl/ssl/record/ssl3_record.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/crypto/openssl/ssl/record/ssl3_record.c b/crypto/openssl/ssl/record/ssl3_record.c index 3c0b1323a459..57915e1bd6e0 100644 --- a/crypto/openssl/ssl/record/ssl3_record.c +++ b/crypto/openssl/ssl/record/ssl3_record.c @@ -185,18 +185,23 @@ int ssl3_get_record(SSL *s) int imac_size; size_t num_recs = 0, max_recs, j; PACKET pkt, sslv2pkt; - int is_ktls_left; + int using_ktls; SSL_MAC_BUF *macbufs = NULL; int ret = -1; rr = RECORD_LAYER_get_rrec(&s->rlayer); rbuf = RECORD_LAYER_get_rbuf(&s->rlayer); - is_ktls_left = (SSL3_BUFFER_get_left(rbuf) > 0); max_recs = s->max_pipelines; if (max_recs == 0) max_recs = 1; sess = s->session; + /* + * KTLS reads full records. If there is any data left, + * then it is from before enabling ktls. + */ + using_ktls = BIO_get_ktls_recv(s->rbio) && SSL3_BUFFER_get_left(rbuf) == 0; + do { thisrr = &rr[num_recs]; @@ -409,7 +414,7 @@ int ssl3_get_record(SSL *s) #endif /* KTLS may use all of the buffer */ - if (BIO_get_ktls_recv(s->rbio) && !is_ktls_left) + if (using_ktls) len = SSL3_BUFFER_get_left(rbuf); if (thisrr->length > len) { @@ -518,11 +523,7 @@ int ssl3_get_record(SSL *s) return 1; } - /* - * KTLS reads full records. If there is any data left, - * then it is from before enabling ktls - */ - if (BIO_get_ktls_recv(s->rbio) && !is_ktls_left) + if (using_ktls) goto skip_decryption; if (s->read_hash != NULL) { @@ -734,8 +735,7 @@ int ssl3_get_record(SSL *s) * Therefore we have to rely on KTLS to check the plaintext length * limit in the kernel. */ - if (thisrr->length > SSL3_RT_MAX_PLAIN_LENGTH - && (!BIO_get_ktls_recv(s->rbio) || is_ktls_left)) { + if (thisrr->length > SSL3_RT_MAX_PLAIN_LENGTH && !using_ktls) { SSLfatal(s, SSL_AD_RECORD_OVERFLOW, SSL_R_DATA_LENGTH_TOO_LONG); goto end; } From nobody Thu Oct 19 18:36:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdp3py0z4xkRJ; Thu, 19 Oct 2023 18:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBGdp2xQ5z3VyH; Thu, 19 Oct 2023 18:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dKiBtuiOx6uEw89FxFGcwPl0DUIaQGT3egm1l6/Guzs=; b=Q4WiGPOOV8V/7G1KB2hHWq74tq7WmaO4u9/1Lpx9vhxS/U1d1Lp9ZZtepX2/1i1ZOldI3y G/yAnuGzumyem5QrYULfz0zUmKCRaaV2rK/KYjmBVg1NbOJTXQCpBxWNMstD3SUD0jz55X 2YV2p4IZrYvjwwWrYnyHSz7W9l6sHc0IYj8t3WatxX3d6X+OXhqSctqtiC4uOSRC/JIuNc bzwt+ps07/1e6d7OEypMAWCMKbHFGRI+iTecOQz2k+SI5TcodA1JSUfZk/dF+YwRAmxXY5 gApe8KqrYKSvvBUrQNbQGUdMeVfdsNa4Dx39zPIfHFeL5WhlcZhU0J9gh1iUPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740606; a=rsa-sha256; cv=none; b=oz5jqsfH0mzoN5V53mDomRog8RJv84trfyEqLFXzMlyyhIdvJPWVtg7UA6xM3QdG1Nuu+b 9xgcdGQ5iYfgSF9LOnmHPyW3wUhxhwHiLACl6eIaWgaOiHwPa3b+fuCKF9OuURakUnm29E 5XuZMh8sHKWVpmHwvDEW9Fbvf4MCsLy4pVJcE1jk5l17EJdzOtGkQytlynL3OQ0lZJxFy/ RuKIcjSNojXj5go0p+KvgkhfeK4iw2Dm677EVo0wDd/n/J+NjJeIBX/zocJkyRuO/liRM9 XeVeH7+udmv6Jec7A0wKZz/Uyt5HMFTTfI+90ti4j1TdmeV613qT/jwCkoifmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dKiBtuiOx6uEw89FxFGcwPl0DUIaQGT3egm1l6/Guzs=; b=rE0OdMhn7sjeL2oj8LMaMD9Dk/EqqwVTd9yxbUYBwbNsVftE4y+/DzyXuwB1xROVuZ3Wyk P0BOBRcq27Ef1ChzJOT6lctWsKhQ6uOf5g06Z3KfQ0ns9JioQai9Q8TjR7W2S5lxnwQ7Cf o1aj/BbQNz97kEdReM72YYM80sZvjncJaQ885btOirLa8iH91jfMsJPTvpbMj8TWiRoyUe W+P6OJyoHfUln1BmjzZVEM2XekdXuirAMyJxPyClevlxEfOGYgVNb9CV8+jc9gaMejBikx goe0JEF5TQ0O82nAxRSES2kP5pW8RGb/TZdF586D2SYJuj7uxDtfIhEfS73z2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdp1jSZz11Jr; Thu, 19 Oct 2023 18:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JIakMw094297; Thu, 19 Oct 2023 18:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIakvd094294; Thu, 19 Oct 2023 18:36:46 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:46 GMT Message-Id: <202310191836.39JIakvd094294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c085ca524579 - main - KTLS: Handle TLS 1.3 in ssl3_get_record. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: c085ca5245797ae17fc69353bbdf7584acb2feaa Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c085ca5245797ae17fc69353bbdf7584acb2feaa commit c085ca5245797ae17fc69353bbdf7584acb2feaa Author: Daiki Ueno AuthorDate: 2021-10-10 06:54:07 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Handle TLS 1.3 in ssl3_get_record. - Don't unpad records, check the outer record type, or extract the inner record type from TLS 1.3 records handled by the kernel. KTLS performs all of these steps and returns the inner record type in the TLS header. - When checking the length of a received TLS 1.3 record don't allow for the extra byte for the nested record type when KTLS is used. - Pass a pointer to the record type in the TLS header to the SSL3_RT_INNER_CONTENT_TYPE message callback. For KTLS, the old pointer pointed to the last byte of payload rather than the record type. For the non-KTLS case, the TLS header has been updated with the inner type before this callback is invoked. Obtained from: OpenSSL commit a5fb9605329fb939abb536c1604d44a511741624) --- crypto/openssl/ssl/record/ssl3_record.c | 46 ++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/crypto/openssl/ssl/record/ssl3_record.c b/crypto/openssl/ssl/record/ssl3_record.c index 57915e1bd6e0..d6c0cf346723 100644 --- a/crypto/openssl/ssl/record/ssl3_record.c +++ b/crypto/openssl/ssl/record/ssl3_record.c @@ -366,7 +366,9 @@ int ssl3_get_record(SSL *s) } } - if (SSL_IS_TLS13(s) && s->enc_read_ctx != NULL) { + if (SSL_IS_TLS13(s) + && s->enc_read_ctx != NULL + && !using_ktls) { if (thisrr->type != SSL3_RT_APPLICATION_DATA && (thisrr->type != SSL3_RT_CHANGE_CIPHER_SPEC || !SSL_IS_FIRST_HANDSHAKE(s)) @@ -396,7 +398,13 @@ int ssl3_get_record(SSL *s) } if (SSL_IS_TLS13(s)) { - if (thisrr->length > SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH) { + size_t len = SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH; + + /* KTLS strips the inner record type. */ + if (using_ktls) + len = SSL3_RT_MAX_ENCRYPTED_LENGTH; + + if (thisrr->length > len) { SSLfatal(s, SSL_AD_RECORD_OVERFLOW, SSL_R_ENCRYPTED_LENGTH_TOO_LONG); return -1; @@ -689,21 +697,29 @@ int ssl3_get_record(SSL *s) if (SSL_IS_TLS13(s) && s->enc_read_ctx != NULL && thisrr->type != SSL3_RT_ALERT) { - size_t end; + /* + * The following logic are irrelevant in KTLS: the kernel provides + * unprotected record and thus record type represent the actual + * content type, and padding is already removed and thisrr->type and + * thisrr->length should have the correct values. + */ + if (!using_ktls) { + size_t end; - if (thisrr->length == 0 - || thisrr->type != SSL3_RT_APPLICATION_DATA) { - SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_BAD_RECORD_TYPE); - goto end; - } + if (thisrr->length == 0 + || thisrr->type != SSL3_RT_APPLICATION_DATA) { + SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_BAD_RECORD_TYPE); + goto end; + } - /* Strip trailing padding */ - for (end = thisrr->length - 1; end > 0 && thisrr->data[end] == 0; - end--) - continue; + /* Strip trailing padding */ + for (end = thisrr->length - 1; end > 0 && thisrr->data[end] == 0; + end--) + continue; - thisrr->length = end; - thisrr->type = thisrr->data[end]; + thisrr->length = end; + thisrr->type = thisrr->data[end]; + } if (thisrr->type != SSL3_RT_APPLICATION_DATA && thisrr->type != SSL3_RT_ALERT && thisrr->type != SSL3_RT_HANDSHAKE) { @@ -712,7 +728,7 @@ int ssl3_get_record(SSL *s) } if (s->msg_callback) s->msg_callback(0, s->version, SSL3_RT_INNER_CONTENT_TYPE, - &thisrr->data[end], 1, s, s->msg_callback_arg); + &thisrr->type, 1, s, s->msg_callback_arg); } /* From nobody Thu Oct 19 18:36:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdq5jKpz4xl4g; Thu, 19 Oct 2023 18:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBGdq3cfxz3W3n; Thu, 19 Oct 2023 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6XaeGLIdyS+4pWpTUe891x6391CLivN9RCuKDcJLJY=; b=uxn11LbPIEY89tlEdmRWcIOqks5+MP66Sp3wecIKmE43b5dhJ1waiQpxlEEvpwu8RYnVyq ozY09FrOswUksO3c3yGMG5Gzct47hr7QS+Em8uje8tiFpGXuXnuhuFkuT/0+3Xm9Ax2sms XGtlctfabxbLiVWYTVn8AEI3c0dRM0UwzhUc+qxb4yeQ8XE0PhHn1xW4Wd3XznsS1fvdjl E2hQvOsEejcNt0KheP75O81LIY7ynQ6wpKogbhxZUh49D4FrzfZjJXd644vfpglrgjHKr0 XIjDvdlOpQKKX2SkOgOLNs71AHAUVuqHySnoa+yYH3A8gP3vaj9Jbn3Tzsfl3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740607; a=rsa-sha256; cv=none; b=DcCTEhxPuZB7mTiPoIS61plgRk3g+fa0OxE8aSAY7ln8fKAXg/+oWZDm0ePMmo5hqlZYbM R1rhqVOQwU7Z8+kRwCoMTHg0uIHqJkLUQHgXFA9iVjjviiioUGbYEhtH1gsecFsKaViOEg ICFRrPjZocbm99nkuPBQsWQ/azpXcquVtBS8d1Kfq1IZtxSwBJ0g+D26o7GWRE5xlSkPRk Mnlt/Plpip/1ZiHNWSzsaL3mTYpUH5JtloaQjRWewBA45tmHuB5Onq8ZxFvLczYc2TzfF9 2iRh6WBp1OYHZ1hVCsTJJdxWDasmz+G2bSCnJA3ASNYxcqnH2YVdfI1EBQo6jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6XaeGLIdyS+4pWpTUe891x6391CLivN9RCuKDcJLJY=; b=LYvZNTjr2KybQO3Jy2ARxZjuB3sZPYuQThxCNuIRJTphADo/WKS4rKUVpKu4+YtB2gyKbp J8y9Q5Rx7pVup3L+2SXiVprmF1xrkX16GNilLiuH3zEu4w1n4aIDADuGfZsxxLRxvmV/eJ b0HfXggVnbvmwXaxmtmEfVgEdtWhOmmskUgtABHAZEdK7xnril5+wh4pQ9LoScaXxZl3MK fzCFBPfgdjdNBPp+QseRnRwFkN6HU4xwsZ4RxPF0FSzH6ytzlYeL9zqBYf9T0BPsGy1HCb 5AvuqNC8ssPpGAXv0C/oDLWRaatpbUBCAEkdOPnA9zOHQ4NhRdxWk/g2HhlZvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdq2kkSz10wH; Thu, 19 Oct 2023 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JIalLm094355; Thu, 19 Oct 2023 18:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIalxJ094352; Thu, 19 Oct 2023 18:36:47 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:47 GMT Message-Id: <202310191836.39JIalxJ094352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6ed16d17333c - main - KTLS: Enable KTLS for receiving as well in TLS 1.3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6ed16d17333c5b1895aff35ddc1d46834f53a9eb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6ed16d17333c5b1895aff35ddc1d46834f53a9eb commit 6ed16d17333c5b1895aff35ddc1d46834f53a9eb Author: Daiki Ueno AuthorDate: 2021-10-10 07:14:06 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Enable KTLS for receiving as well in TLS 1.3 This removes a guard condition that prevents KTLS being enabled for receiving in TLS 1.3. Use the correct sequence number and BIO for receive vs transmit offload. Obtained from: OpenSSL commit 7c78932b9a4330fb7c8db72b3fb37cbff1401f8b --- crypto/openssl/ssl/tls13_enc.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/crypto/openssl/ssl/tls13_enc.c b/crypto/openssl/ssl/tls13_enc.c index 861ecdf91701..39a27d926ce7 100644 --- a/crypto/openssl/ssl/tls13_enc.c +++ b/crypto/openssl/ssl/tls13_enc.c @@ -438,6 +438,7 @@ int tls13_change_cipher_state(SSL *s, int which) const EVP_CIPHER *cipher = NULL; #if !defined(OPENSSL_NO_KTLS) && defined(OPENSSL_KTLS_TLS13) ktls_crypto_info_t crypto_info; + void *rl_sequence; BIO *bio; #endif @@ -692,8 +693,7 @@ int tls13_change_cipher_state(SSL *s, int which) s->statem.enc_write_state = ENC_WRITE_STATE_VALID; #ifndef OPENSSL_NO_KTLS # if defined(OPENSSL_KTLS_TLS13) - if (!(which & SSL3_CC_WRITE) - || !(which & SSL3_CC_APPLICATION) + if (!(which & SSL3_CC_APPLICATION) || (s->options & SSL_OP_ENABLE_KTLS) == 0) goto skip_ktls; @@ -709,7 +709,10 @@ int tls13_change_cipher_state(SSL *s, int which) if (!ktls_check_supported_cipher(s, cipher, ciph_ctx)) goto skip_ktls; - bio = s->wbio; + if (which & SSL3_CC_WRITE) + bio = s->wbio; + else + bio = s->rbio; if (!ossl_assert(bio != NULL)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); @@ -717,19 +720,26 @@ int tls13_change_cipher_state(SSL *s, int which) } /* All future data will get encrypted by ktls. Flush the BIO or skip ktls */ - if (BIO_flush(bio) <= 0) - goto skip_ktls; + if (which & SSL3_CC_WRITE) { + if (BIO_flush(bio) <= 0) + goto skip_ktls; + } /* configure kernel crypto structure */ - if (!ktls_configure_crypto(s, cipher, ciph_ctx, - RECORD_LAYER_get_write_sequence(&s->rlayer), - &crypto_info, which & SSL3_CC_WRITE, iv, key, - NULL, 0)) + if (which & SSL3_CC_WRITE) + rl_sequence = RECORD_LAYER_get_write_sequence(&s->rlayer); + else + rl_sequence = RECORD_LAYER_get_read_sequence(&s->rlayer); + + if (!ktls_configure_crypto(s, cipher, ciph_ctx, rl_sequence, &crypto_info, + which & SSL3_CC_WRITE, iv, key, NULL, 0)) goto skip_ktls; /* ktls works with user provided buffers directly */ - if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) - ssl3_release_write_buffer(s); + if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) { + if (which & SSL3_CC_WRITE) + ssl3_release_write_buffer(s); + } skip_ktls: # endif #endif From nobody Thu Oct 19 18:38:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGgH34g1z4xkkX; Thu, 19 Oct 2023 18:38:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBGgH28gGz3X98; Thu, 19 Oct 2023 18:38:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aoTavFlRj5Oc5AqWkKJ8Voy1pyVf/5MrqkxrBSs2KXc=; b=SRMR6leXAfdnDl6xL6SZd4+JLQeHDpTyXt9zo/taPFpXu6dqoEDqsyTESvhbpV4cN31a3G D0sAHCL/yrM9C9isOxrhdwOZKtGZM4QIU+vpxxfYCYIyXOdnymcqm/MwXV1+nbvpg/unqk SbEbLnCaG+8upBQIPIIJ4OeV8tA+c06O4slkV9YCc2xlx3ARMdNTNANkk2NQpUV3JXASS8 H3Ny6APfbwv1smg2Ym6AvPgG9YDC5i0L2+jQp+Q868jZP15fM6aY1wX3Eg3DcSPthAbdth Cd8tMWuFbrQKFLRqMpt84PJb0J8jauphxaT8NQspEqA+xrGtOk7NB1OkfiN9gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740683; a=rsa-sha256; cv=none; b=qVCWFjO0UnHOBWrTjTOETL5wpruaVeic0+LtEQ5RKmdU34d0WSvkBDuoUOFOcCZktwGcO8 JrjL7vdIIt8dkz9GXjzvZCQOfA09pe4C4svVe4t8zEl8dGQxfZXixTv0lXKd/IqOJkBdf0 m06hTH6a7CcNC//3bHTnIMYOvT+Y0CabkyFpSDMmEAKtFeSIx+YlwBSlRBPuS7nvkaYGhI wrMvdjb3UBAafD/EpQMvo/UmBA7n+DPkzBZIvxk65TSQ6vSG/C3lpwR7nMr75WirnFeIt5 YFbUvWlHkkTWfaMXv22r6PRzH2x6KZNjqsiXaQesLJUAq0KpJL5XQ+ruFg92qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aoTavFlRj5Oc5AqWkKJ8Voy1pyVf/5MrqkxrBSs2KXc=; b=NoAsAixYn6lQT9FBsbzvn9NUXU53rtNTrHWUzkN60F3IFK0jIGoYTwW9DGMnuKSOPypnKW ibGr6W6OOPo02CUF+ybYINqX1ZmXtIWHTYkNTTs4QzJclbGX8MmLH+2hLw9Sa+jaHqPPvh aYMAB47CWA86hfHHAVksOpqJY8h0kH9pvzDY+XySsDleM6zvXcsGaHdaRYtZBP5KlW8ikb enc4Uymr6ZSjdCr7PcUagV2YNM7BGC4KTXtihHO2fchunAnmC+LdgjVb0wyu1gPe83vdhi 2zbBzafHvj/tZcl1DAS7o39DGii0b+ArREl/2bvOOpKmZXn67Kkmom4+FKKYwg== Received: from [IPV6:2601:648:8683:39a0:a9a6:ccb4:a3d2:7302] (unknown [IPv6:2601:648:8683:39a0:a9a6:ccb4:a3d2:7302]) (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 4SBGgG5q8fz1B96; Thu, 19 Oct 2023 18:38:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <89d50de6-bce6-8dfc-1635-f298c5fc9b8c@FreeBSD.org> Date: Thu, 19 Oct 2023 11:38:00 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: git: 6ed16d17333c - main - KTLS: Enable KTLS for receiving as well in TLS 1.3 Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202310191836.39JIalxJ094352@gitrepo.freebsd.org> In-Reply-To: <202310191836.39JIalxJ094352@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/19/23 11:36 AM, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6ed16d17333c5b1895aff35ddc1d46834f53a9eb > > commit 6ed16d17333c5b1895aff35ddc1d46834f53a9eb > Author: Daiki Ueno > AuthorDate: 2021-10-10 07:14:06 +0000 > Commit: John Baldwin > CommitDate: 2023-10-19 18:34:58 +0000 > > KTLS: Enable KTLS for receiving as well in TLS 1.3 > > This removes a guard condition that prevents KTLS being enabled for > receiving in TLS 1.3. Use the correct sequence number and BIO for > receive vs transmit offload. > > Obtained from: OpenSSL commit 7c78932b9a4330fb7c8db72b3fb37cbff1401f8b This series restores support for KTLS receive for TLS 1.3 previously backported from OpenSSL master into OpenSSL 1.1.1 in base. -- John Baldwin From nobody Thu Oct 19 19:36:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBHz56Vnvz4xnmZ; Thu, 19 Oct 2023 19:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBHz561fqz3f3S; Thu, 19 Oct 2023 19:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697744209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1C9BNi73wMUFG+Mx/bYQffdMvV6xvlfJItwosyT2l8=; b=FxD0pgsTvKz/rCA2mYEiQeeU8e/kzXJ+1SWa7LCxcspVRIODFn13QQ182T0gHDhGufGZb/ Y8GcnifMxbKE4QOXCo50VAYHyJCKk305B3+ImUisJko6CZi1yB9HpcjRqqqSngzioOJwJq WqO9AXKDtCzv2H7BGjX/E5fjJQTMrwr2fk1SSSxR3nFhYbGFCnQvIppgF73Myn+/7iu4JJ 77Ko9HX8ix1qT+UzquytmM6SaOmTGotjYMZZHBHqXVOZ8tzSLGZuEPnaQiTiqsjLltSxow a9X2jH8OHA0QAazhDWgzplcEfJgNh5f5cKOMNkZwHObcFndNU24dnvY6UEb+gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697744209; a=rsa-sha256; cv=none; b=oYz9T9sjc6yvzrdiohshtZsJd8dTgCZkoBVk5Kw0YDRyC6RfkevQdLVawWBozUpDuSKvSL W3aGEG8owCwVAIvy+PscYaTMk1SAhdPOeZcFHuExwArDA38n2Kdr2no560vQmqd49OeCgx 5TUehd4fnDlUAIWZ5xMRDxd768Nzb2JRCzhiE2myXyQEnv3xNqpAHAfVyBpN0dLNqkD7Ji uLsR5INVJ3XnIn6i2CgS0R6Y//xQ3sRM88YyK72fEpZmVq1qLZTAFRC0x5Sht2ETDe4BTZ gHi7//UYMvEWR6+FJZ2y1MEUXxBP2i4ArbbcQo5s/qhkFVZB91A8W+CAjBb0YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697744209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1C9BNi73wMUFG+Mx/bYQffdMvV6xvlfJItwosyT2l8=; b=rdwNMuQI6+UyWNVFD/Io3wqUjICDduuAmCLVNrAXVl0E9aSLLS5NLAe2HIHlRMsQ6Bb52X IbtX+jvHYDY8Jncu5IcX76U0o0osFPaOvBzhD7vJPZpBo+A7zJTjmIBOFfD89bM+flbwrZ 6Buxf0Wz0Xq62aYyvvQI1g7ea6pLq6+EhAY5tFD4BfP0PR47NAC0vbi5mihBOXJ/ebwOUh +nay8ry4PFHBvhgI0BIp10qCS5iL0Li/68yuK+kG60N89bfV/fTsg4xx2CU/5v9K4aIdNo jojtjPkje8gWSd7z/Es6HhqosKLxeGb/fcLFOyEFQ+yp/+Ju5IHX8P132qU9ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBHz5545Lz134H; Thu, 19 Oct 2023 19:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JJanw9094349; Thu, 19 Oct 2023 19:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJaniG094346; Thu, 19 Oct 2023 19:36:49 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:36:49 GMT Message-Id: <202310191936.39JJaniG094346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f300335d9aeb - main - nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f300335d9aebf2e99862bf783978bd44ede23550 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f300335d9aebf2e99862bf783978bd44ede23550 commit f300335d9aebf2e99862bf783978bd44ede23550 Author: Rick Macklem AuthorDate: 2023-10-19 19:35:35 +0000 Commit: Rick Macklem CommitDate: 2023-10-19 19:35:35 +0000 nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH When I implemented a test patch using Open Claim_Deleg_Cur_FH I discovered that the NFSv4.1/4.2 server was broken for this Open option. Fortunately it is never used by the FreeBSD client and never used by other clients unless delegations are enabled. (The FreeBSD NFSv4 server does not have delegations enabled by default.) Claim_Deleg_Cur_FH was broken because the code mistakenly assumed a stateID argument, which is not the case. This patch fixes the bug by changing the XDR parser to not expect a stateID and to fill most of the stateID in from the clientID. The clientID is the first two elements of the "other" array for the stateID and is sufficient to identify which client the delegation is issued to. Since there is only one delegation issued to a client per file, this is sufficient to locate the correct delegation. If you are running non-FreeBSD NFSv4.1/4.2 mounts against the FreeBSD server, you need this patch if you have delegations enabled. PR: 274574 MFC after: 2 weeks --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++++++++-- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 7d3ebc683d16..3daee65ab83a 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3000,12 +3000,18 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == - NFSV4OPEN_CLAIMDELEGATECURFH) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; + } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { + /* Fill in most of the stateid from the clientid. */ + stateid.seqid = 0; + stateid.other[0] = clientid.lval[0]; + stateid.other[1] = clientid.lval[1]; + stateid.other[2] = 0; + stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index c73840277022..da57ebde7a52 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2568,6 +2568,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2578,8 +2582,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2830,6 +2834,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2840,8 +2848,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Thu Oct 19 20:03:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBJYN4y3Gz4xpvC; Thu, 19 Oct 2023 20:03:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBJYN4HFlz4F7X; Thu, 19 Oct 2023 20:03:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697745784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=z5VcjUBoMMWpNWBCIUAIrmxZq8e9OwIxn1dNsA7IlIY=; b=RSlI6EcPaB9BKNCugaaHEDFw6aRMkqTxLy6C4DB+aVoiL8sIHtE0qpgkuwjIGzPCHhNAeq 5Nue9FXr3FE3Ju+8suD8PQh87/o4oL9pyASL/uITpyA0Uc6jIfkrnLJn3cTZ9cwHBHFVHL VAsYyjVuEV0672dxpCGuScL7AG2tRKY91CuFP35PA7y0Sh1vMG4HXhKmoBPfhR/8a7hdvT aQks9zX5CIBCk2+S1aPfErNjkwSD1mT1j77ZY7eJ7TH1kSM0W8ZClQC0RQmiQxdv+CNVpz E5l9MMRVXUEFL1k5JxChiyxRkZLMzIWRFal/7uSqiQQigdfs1PU4fBuYPtRh5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697745784; a=rsa-sha256; cv=none; b=MFwgC7AD5ffZjOTWwbexia3ICr4R7aECeEOIHQME+3p4FbuA9+rciBYwttpT0CWPqjvFB1 ss/OmTxBPtz3JQ8pATff/+11YHaFp+bwQtA3QJrhfbk7GwYkHvV8VYClHL7IM3MqEBrBlJ j10QUUsfbBGSLHZQ3uEj6rZ+vZokeWguLJYrtJiIg/dCua5e0jTGaq6whouIz+XQJNRxGp tbZ5vHs7B+5/FEMYxzKM8nyAr5iMZCTsYvl1yFZfzfFQJGEkCW8LaBal0XFfGva+SwKCny CJBqmcHcbYUAgjtzhqYNl0pNhJEV1e7yibXHETHB6tssnPbVIpgbHRn7JPg1wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697745784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=z5VcjUBoMMWpNWBCIUAIrmxZq8e9OwIxn1dNsA7IlIY=; b=k/UVcPUt15p1SjGL9AnbmUkv6n2GDjIXHIKgehoC5Ob3xbiZ42DpiWFB+reHnk3k5LpR2m HSNG1yAfC8pHoIAY3LKy7CWx14kMML6Mhao1LiX0ict1Sx4mnh4ubqLFBqIh3wNCNYo//k jTkm8DR/WWX705gzDPmTg8ruU2QmDwZP/+pOAUaqL6ZWBYDhC1WqaqAAaxvdguxE+e0doz nxvzEqEkm04N9nfHLU/fDRAerwZ2lTslHFLUe7nRdOm/W0qWPino7tr5I01NofThuwhSk1 mKi+oXxwGtRP2HfPRjXHd+/pw66RUy59M0CYLa25hndlT7UyOfuyHnLHzs7ULg== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SBJYN28JRz1C9J; Thu, 19 Oct 2023 20:03:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 9F9D28BA4; Thu, 19 Oct 2023 22:03:02 +0200 (CEST) From: Kristof Provost To: Gleb Smirnoff Cc: Igor Ostapenko , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop Date: Thu, 19 Oct 2023 22:03:02 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <86D6E74C-3062-4718-816E-07CBA4F2903F@FreeBSD.org> In-Reply-To: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_=" --=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_= Content-Type: text/plain; format=flowed On 19 Oct 2023, at 18:14, Gleb Smirnoff wrote: > On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: > K> +++ b/sys/netinet/ip_var.h > ... > K> +/* pf specific mtag for divert(4) support */ > K> +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; > K> +struct pf_divert_mtag { > K> + uint16_t idir; // initial pkt direction > K> + uint16_t ndir; // a) divert(4) port upon initial diversion > K> + // b) new direction upon pkt re-enter > K> +}; > > This can be written as: > > typedef enum { > PF_DIVERT_MTAG_DIR_IN = 1, > PF_DIVERT_MTAG_DIR_OUT = 2, > } pf_mtag_dir; > struct pf_divert_mtag { > pf_mtag_dir idir; /* Initial packet direction. */ > union { > pf_mtag_dir ndir; /* New direction after re-enter. > */ > uint16_t port; /* Initial divert(4) port. */ > }; > }; > > The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN > instead > of 1 when looking at a structure. And compilation time failure if > anybody sets > it to a wrong value. Using "port" instead of "ndir" when assigning a > port > improves readability of code. > > This will grow structure from 4 bytes to 8, as enum is always an int. > However, > uma allocator backing m_tag_alloc() will allocate same amount of > memory. > Something like this? diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index ad95a1ce0d76..78ca36fc2a0f 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming) (((struct ipfw_rule_ref *)(mtag+1))->info)); } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; - nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + nport = htons(((struct pf_divert_mtag *)(mtag+1))->port); } else { m_freem(m); return; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a8c687682af9..0f3facc54d4e 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -328,11 +328,17 @@ extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); /* pf specific mtag for divert(4) support */ -enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +__enum_uint8_decl(pf_mtag_dir) { + PF_DIVERT_MTAG_DIR_IN = 1, + PF_DIVERT_MTAG_DIR_OUT = 2 +}; struct pf_divert_mtag { uint16_t idir; // initial pkt direction - uint16_t ndir; // a) divert(4) port upon initial diversion - // b) new direction upon pkt re-enter + union { + __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter + uint16_t port; /* Initial divert(4) port */ + }; }; #define MTAG_PF_DIVERT 1262273569 diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a6c7ee359416..1cd8412193dc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8022,7 +8022,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); if (mtag != NULL) { - ((struct pf_divert_mtag *)(mtag+1))->ndir = + ((struct pf_divert_mtag *)(mtag+1))->port = ntohs(r->divert.port); ((struct pf_divert_mtag *)(mtag+1))->idir = (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : Best regards, Kristof --=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

On 19 Oct 2023, at 18:14, Gleb Smirnoff wrote:

On Thu, Oct 19, 2023 at 12:37:39PM = +0000, Kristof Provost wrote:
K> +++ b/sys/netinet/ip_var.h
=2E..
K> +/* pf specific mtag for divert(4) support */
K> +enum { PF_DIVERT_MTAG_DIR_IN=3D1, PF_DIVERT_MTAG_DIR_OUT=3D2 };
K> +struct pf_divert_mtag {
K> + uint16_t idir; // initial pkt direction
K> + uint16_t ndir; // a) divert(4) port upon initial diversion
K> + // b) new direction upon pkt re-enter
K> +};

This can be written as:

typedef enum {
PF_DIVERT_MTAG_DIR_IN =3D 1,
PF_DIVERT_MTAG_DIR_OUT =3D 2,
} pf_mtag_dir;
struct pf_divert_mtag {
pf_mtag_dir idir; /* Initial packet direction. */
union {
pf_mtag_dir ndir; /* New direction after re-enter. */=
uint16_t port; /* Initial divert(4) port. */
};
};

The benefit is that in the debugger you will see PF_DIVER= T_MTAG_DIR_IN instead
of 1 when looking at a structure. And compilation time failure if anybody= sets
it to a wrong value. Using "port" instead of "ndir" when assigning a port=
improves readability of code.

This will grow structure from 4 bytes to 8, as enum is al= ways an int. However,
uma allocator backing m_tag_alloc() will allocate same amount of memory.<= /p>

Something like this?

di=
ff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index ad95a1ce0d76..78ca36fc2a0f 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming)
                    (((struct ipfw_rule_ref *)(mtag+1))->info));
        } else if ((mtag =3D m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) !=3D=
 NULL) {
                cookie =3D ((struct pf_divert_mtag *)(mtag+1))->idir;
-               nport =3D htons(((struct pf_divert_mtag *)(mtag+1))->n=
dir);
+               nport =3D htons(((struct pf_divert_mtag *)(mtag+1))->p=
ort);
        } else {
                m_freem(m);
                return;
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index a8c687682af9..0f3facc54d4e 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -328,11 +328,17 @@ extern int        (*ip_dn_ctl_ptr)(struct sockopt *=
);
 extern int     (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *);

 /* pf specific mtag for divert(4) support */
-enum { PF_DIVERT_MTAG_DIR_IN=3D1, PF_DIVERT_MTAG_DIR_OUT=3D2 };
+__enum_uint8_decl(pf_mtag_dir) {
+       PF_DIVERT_MTAG_DIR_IN =3D 1,
+       PF_DIVERT_MTAG_DIR_OUT =3D 2
+};
 struct pf_divert_mtag {
        uint16_t idir;  // initial pkt direction
-       uint16_t ndir;  // a) divert(4) port upon initial diversion
-                       // b) new direction upon pkt re-enter
+       union {
+               __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon=
 initial diversion
+                               // b) new direction upon pkt re-enter
+               uint16_t port;  /* Initial divert(4) port */
+       };
 };
 #define MTAG_PF_DIVERT 1262273569

diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index a6c7ee359416..1cd8412193dc 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -8022,7 +8022,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, str=
uct mbuf **m0,
                mtag =3D m_tag_alloc(MTAG_PF_DIVERT, 0,
                    sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO);
                if (mtag !=3D NULL) {
-                       ((struct pf_divert_mtag *)(mtag+1))->ndir =3D
+                       ((struct pf_divert_mtag *)(mtag+1))->port =3D
                            ntohs(r->divert.port);
                        ((struct pf_divert_mtag *)(mtag+1))->idir =3D
                            (dir =3D=3D PF_IN) ? PF_DIVERT_MTAG_DIR_IN :

Best regards,
Kristof

--=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_=-- From nobody Thu Oct 19 20:34:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBKFD71zTz4xrPW; Thu, 19 Oct 2023 20:34:08 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SBKFD4zyRz4HDk; Thu, 19 Oct 2023 20:34:08 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id EC3FB5B05E; Thu, 19 Oct 2023 13:34:06 -0700 (PDT) Date: Thu, 19 Oct 2023 13:34:06 -0700 From: Gleb Smirnoff To: Kristof Provost Cc: Igor Ostapenko , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop Message-ID: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> <86D6E74C-3062-4718-816E-07CBA4F2903F@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86D6E74C-3062-4718-816E-07CBA4F2903F@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:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4SBKFD4zyRz4HDk On Thu, Oct 19, 2023 at 10:03:02PM +0200, Kristof Provost wrote: K> Something like this? ... K> --- a/sys/netinet/ip_var.h K> +++ b/sys/netinet/ip_var.h K> @@ -328,11 +328,17 @@ extern int (*ip_dn_ctl_ptr)(struct sockopt K> *); K> extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); K> K> /* pf specific mtag for divert(4) support */ K> -enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; K> +__enum_uint8_decl(pf_mtag_dir) { K> + PF_DIVERT_MTAG_DIR_IN = 1, K> + PF_DIVERT_MTAG_DIR_OUT = 2 K> +}; K> struct pf_divert_mtag { K> uint16_t idir; // initial pkt direction K> - uint16_t ndir; // a) divert(4) port upon initial diversion K> - // b) new direction upon pkt re-enter K> + union { K> + __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon K> initial diversion K> + // b) new direction upon pkt re-enter K> + uint16_t port; /* Initial divert(4) port */ K> + }; K> }; idir should also be __enum_uint8(pf_mtag_dir) or a typedefed type for brevity. -- Gleb Smirnoff From nobody Thu Oct 19 21:16:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBL9t19zzz4xskd; Thu, 19 Oct 2023 21:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBL9s66DYz4KhW; Thu, 19 Oct 2023 21:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOyDTdeIsmHSNvND4Ez95Tt6BxE9PShgWDCTzVOKqpo=; b=eiRkZzLSr4uNqt5oZzdYSN1r/iWIGn6RDTUoT6IHmGDg5+00hXqYoYrJAQL61dL7xGFN7+ CJA7sIcYbYyJ99aiw+EcFLVh6xw2I1R182vCpWOyr1kp25rWaG67Gn8C/M2tHYoOqs7GHI u2LUv4n7P6j/L+Oug67I99cgQPjERA6Fcg7gmSwpKauJ7qd6x0pvC0likNYMkk8P/1AMy0 LccIs6y1ZrwULjgrn2WHugP08aJeF1+nMiHy50WRXYYj2WndSF3bM+eSkWR7/1Wh0HBizz 0rZRv2UimiwOfi3x1m6VqnKf0chMGG9GJHyMl7q+5B5CnXqKD7SF4ajo1JQ1ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697750177; a=rsa-sha256; cv=none; b=bLGPnTmzGL4FH4xEXdtz+lg6cvCJjY8Eg9ZBjaXq0DKhYZEdaUHisepdFD5JMbVu/Fuhhs ZRwcp5pOQlZL2PVmoPNIg+BVgm83zTv/TDgRSly3qD2VZzKKu14elYqp3gbpZH3hWw7yyB sMr3eWg3RsVqFJDEtmAYD12QEzugmgfMlEK9KbfgVz+ouF/vhymmG8U+MSEWdYSku7W9hU c1DWI9xbIq2Kk8mHHrNS4AROFzfUdRA5EZbD1jZ/P9iLLlo2aJVW3Sm6YEVqiTJQdg5J/J P0Aml9UB/JaH5Uq78zdeq2HYI+1xxkSaKdaLho0vHT9kwLXYzTQGhS9pFUnS9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOyDTdeIsmHSNvND4Ez95Tt6BxE9PShgWDCTzVOKqpo=; b=AUxiPLFerusRIlr3OZjv+iEcFYgSo6pKq6g4+NmfOaIvq7a0pvsFz04L/dR02+Lt8gYW3T BPcKOnd5N5DV1iNadjGXwLBEqX4XFav14cT3/MDLKbYsZlFEdoHY6beCQBs92kYIX/HDSm M9xkb2P4y7JSQz63th5lAML5JOI53s7hpm0nuHXxwyptfLPG26xDmhes0eWDNjaTU5PXeY BmRUkvvyOTs2T7DtfE16baRNmrGjYh3i9BpESJLNdgOuqf0Vf0EMLvxDDRZfxYBxgSyXUD ZgJpLHVGECDezCB5B/KKVeS5U7Q8z8fDgeO1IrsZgjERuYggEVLjrotmKPkNuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBL9s54rqz15Td; Thu, 19 Oct 2023 21:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JLGHub060199; Thu, 19 Oct 2023 21:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLGHxX060196; Thu, 19 Oct 2023 21:16:17 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:16:17 GMT Message-Id: <202310192116.39JLGHxX060196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7e02c7074c4c - main - mpi3mr: Move creation of watchdog to interupt config hook List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 7e02c7074c4c6df77b860e0dbcd032a2ea04b98b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7e02c7074c4c6df77b860e0dbcd032a2ea04b98b commit 7e02c7074c4c6df77b860e0dbcd032a2ea04b98b Author: Sumit Saxena AuthorDate: 2023-10-19 21:06:29 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:09:38 +0000 mpi3mr: Move creation of watchdog to interupt config hook Move creation of watchdog process from just before we configure the interrupt config hook to into the config hook itself. This prevents it from racing the config intr hook and doing an extra reset of the card. This extra reset is usually harmless, but sometimes it can prevent discovery of devices if done at just the wrong time. This can lead to no disks being registered in a box full of disks, for example. Starting it later eliminates this race, making discovery reliable. Reviewed by: imp --- sys/dev/mpi3mr/mpi3mr_pci.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index d7278e5549e7..4935ac0d519c 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -307,6 +307,7 @@ static void mpi3mr_ich_startup(void *arg) { struct mpi3mr_softc *sc; + int error; sc = (struct mpi3mr_softc *)arg; mpi3mr_dprint(sc, MPI3MR_XINFO, "%s entry\n", __func__); @@ -314,8 +315,16 @@ mpi3mr_ich_startup(void *arg) mtx_lock(&sc->mpi3mr_mtx); mpi3mr_startup(sc); + mtx_unlock(&sc->mpi3mr_mtx); + error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, + &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", + device_get_unit(sc->mpi3mr_dev)); + + if (error) + device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); + mpi3mr_dprint(sc, MPI3MR_XINFO, "disestablish config intrhook\n"); config_intrhook_disestablish(&sc->mpi3mr_ich); sc->mpi3mr_ich.ich_arg = NULL; @@ -443,14 +452,6 @@ mpi3mr_pci_attach(device_t dev) goto load_failed; } - error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, - &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", - device_get_unit(sc->mpi3mr_dev)); - if (error) { - device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); - goto load_failed; - } - sc->mpi3mr_ich.ich_func = mpi3mr_ich_startup; sc->mpi3mr_ich.ich_arg = sc; if (config_intrhook_establish(&sc->mpi3mr_ich) != 0) { From nobody Thu Oct 19 21:52:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLzH3W4Yz4xwGG; Thu, 19 Oct 2023 21:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBLzH33sVz4SCR; Thu, 19 Oct 2023 21:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ROo6vTgwFj70bnBvgJXuIQ7dr0NBkSS1DD+N0ZTwqY=; b=bULQ4G8kP+YUgTd6wxsDtN5IVfPkA8W3kEXyCzb1qrM1eb/j6JQoFV3lfVjC/g3UsqysFG wACK6DGmfyq19/wkj43GrZZYHxHDeaCJ5URdxZbvU66PoFB3Yf+oK9LteONR6TD1o+Lf6j yLRevPvDvcg9re66fsqBqnFtoT13g3u3QM90v1WWeYlpzFSBFf9swiZGfT6JenSPVlG1X3 rg9TFQAUB38MvApwpaAniMi+Sarup2ROLlzOCzgDblMUKBQwMwO6YINRxvPZYW4G3gRkdi OCrYEk78SilQrpowNeYQlmiVIrTRQT/F49AuR/JAd9Gfev7C0Fzjz6tUCryaBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697752331; a=rsa-sha256; cv=none; b=hgmS0i7MDWV54orE/gOOLwIA4V7jESfLxIBMGt2MY6hQdgaT9w5pqXzfYXfhQ7jlPbzJi6 nGKbx3CrAqtaQRX416na6jTl2OFanT/Q2TaAolAappKeyCQre5NFXwmF/j/C4Ffed7pWN3 XgvnHCLH8seU/aFT1YYaYbSy/c69yDQAL2hgImxqxVEMuPH+qZ3As968LxSGQ987OD46d5 7UNnLGISohctS3MCkT2H3ftnJUWYNsU97+2OZEg/aMSJY9JfJ16FgZmeRo5V3jCSzOl9mp J/hzKjCcmvAN2P7gFqldn/UaWKQjy32iHweNZST0eYg7bN5jYyQFS4VMkKwBCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ROo6vTgwFj70bnBvgJXuIQ7dr0NBkSS1DD+N0ZTwqY=; b=broXSYZeb3LCQ/iiBuB9sd3dQfZuPJaPP7lwxmQaUKL1WYqfDIO6zh1FGX20TxcnhWMsGA W2Lfk3Dv+hqHo9nJWppfZ0q92hjdBdGfvlDXAK4KzdqhKNcKoSmfI5/ZvI7s2QMhyQW36l ebptyzSck5qpP2m7LWWQurcPI4v6oATV/U3rQjQoHeZ2ti0CWI0kppJDl3YS5S6R2xvHKT cvpAT7KbryymIt1eHJQzK/yNytyXgYNwY5yCUwqksVj5La4pDVMvEwSQvhUXsdDU579t7a mlVlW6LTdjSLdoZn78ApZy7lkOv/WYg5t+AJMLTXtXuPmi8pxp9sjb8VcXnn1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLzH27KPz15ns; Thu, 19 Oct 2023 21:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JLqBd0025329; Thu, 19 Oct 2023 21:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLqBnM025326; Thu, 19 Oct 2023 21:52:11 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:52:11 GMT Message-Id: <202310192152.39JLqBnM025326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b259e74cfd9b - main - Fix Sumit's email address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b259e74cfd9be8a9ffa41a2bf2f3ba05db04430e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b259e74cfd9be8a9ffa41a2bf2f3ba05db04430e commit b259e74cfd9be8a9ffa41a2bf2f3ba05db04430e Author: Warner Losh AuthorDate: 2023-10-19 21:49:05 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:49:05 +0000 Fix Sumit's email address In my haste to get things in for 14.0, I used the wrong email address for Sumit Saxena. Fix that here so git log is correct. --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 2e4c03966084..b022419e8108 100644 --- a/.mailmap +++ b/.mailmap @@ -14,3 +14,4 @@ Alfonso Gregory <83477269+gAlfonso-bit@users.noreply.githu Jose Luis Duran Val Packett Piotr Paweł Stefaniak +Sumit Saxena From nobody Thu Oct 19 22:48:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBNCj4TCHz4xyXH; Thu, 19 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBNCj3vH5z4X4K; Thu, 19 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0gtykd7221JI0Ihn8kCuA4Qn1CN6ty/0U35VzyIwAk=; b=fML4ELlOR/cI+6Rm801NMSWvB7k9O/WIatTm0ndHtGEl8CgjBBRYynPwLsp9qoJlcZwAy4 wg8fyLUtMnzEhq76a/v2QIj+fEkIwDJtNgcnZOHOazjQItNEMKXQAr1Z9Sxopb30804gIG gteATGKF9wEpMzFKCQyWpFNkrTTg3NZD6m/fKCG6f1MurCbsK4iHOCScqaZl974yEVr+en 2SMmDxLiiOwS4OUgjtqGCfyKAz1LFF/1R0BuFRH/qogN52I3LeQwCGDiuI29nFYVC9ZXPK OSuu4wPRZS56ClIJRzi2QnAy5vRufA7RqHrWnt+f3MEB+YPi9FbILdSrZy55/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697755681; a=rsa-sha256; cv=none; b=wj3SRMeqaVtDuYUHieLNKgI872/o3ZFYzOyVT9oL/0obnzRqWD9NfWLCWqc5IM6eUI6Acy 6XvhNRlNAyjl7bJslXQ8g99XGTeV7scLanavHZ/3KFXvY9Tj8l9ZUSxhHnwtMoqdO3YbOU nuPt/ItmZFQx1XRQ/wSNnRfETT2SNfzC7zkAZQIIVpxb3HQj6OWGtYnN9H1SJ+QMk2/e2Y 9Z2bZ//8qdbNuqa2JEtw7xSXNDC2Pho7Wm+xvg0sUycDkEtQEGARBAKLSRxjEX4s9rloZF v0FxOEqGOqqLI8RK/8punmd/cr8IJF+GKggK+66eBPbFK8GTG+V4vqOEjbaHMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0gtykd7221JI0Ihn8kCuA4Qn1CN6ty/0U35VzyIwAk=; b=qUOYcwL0Mi2ii8MorXZb61TCBMw34ICnJa99G3rajOHFcGQcLYoNerHhVq7qX2xtOD9oog /MT/+SjTVZTmOg7cLN5NsI03HJtTDykUgr/6fLOP9kD379hmWay6QWnU1H/tEiZQ+5N/9X X9aUd8bDZ2xVzo+OhqYsXAW+d5a/+KLxyU7y0m8f4NfgVzAwWy4ehYQF2vIghgZgmlpzh9 oe4tsWAhfbAnchHapK0s2blInJbOhGfEefY5yDsP1g/tjcoVkXPiJlwnIh+nbuZdg2pfq6 npinziTHYJXHaADn1Jb//R7+zqdl+6SYLjlwbbv09anHXCmoDj4gc+jeNVYZGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBNCj2yZDz17bD; Thu, 19 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JMm1pf010770; Thu, 19 Oct 2023 22:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JMm1FY010767; Thu, 19 Oct 2023 22:48:01 GMT (envelope-from git) Date: Thu, 19 Oct 2023 22:48:01 GMT Message-Id: <202310192248.39JMm1FY010767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: a959ae1c503d - main - releng-gce: Add missing _ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a959ae1c503d104f1e28033522362e5054f52c94 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a959ae1c503d104f1e28033522362e5054f52c94 commit a959ae1c503d104f1e28033522362e5054f52c94 Author: Colin Percival AuthorDate: 2023-10-19 22:46:59 +0000 Commit: Colin Percival CommitDate: 2023-10-19 22:46:59 +0000 releng-gce: Add missing _ Fixes: 1b10bdf0e2fa8 "releng-gce: Add ZFS support to GCE" MFC after: 3 days --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index f7fb0d8dc419..e84b2df809a9 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -53,7 +53,7 @@ gce-do-login: @true .for _FS in ${GCE_FSLIST} -GCE_IMG_${FS}= ${.OBJDIR}/gce.${_FS}.raw +GCE_IMG_${_FS}= ${.OBJDIR}/gce.${_FS}.raw # Really? Uppercase characters are not allowed? Sigh... # And don't even get me started on the '.'. GCE_TARGET_${_FS}= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}-${_FS}${SNAPSHOT_DATE} From nobody Fri Oct 20 08:42:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBdPZ3jMtz4xW5b; Fri, 20 Oct 2023 08:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBdPZ392Qz4Gt4; Fri, 20 Oct 2023 08:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697791346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w1W1bxX+1g0SKQ0LKHh9KIaCk9+GOVPzakruDIqCO0=; b=NwcudPRkwoImAt2eqYLO2/7VvnjHCjukiAq2RDDnFitm+vlxV39nTMZLlc/aFlhKSrTA8F fD8kuLQzY2zpHYVTXpjsZLXpSMlbsItOu3fT7/vMD3XcNEDF78H5qMLHvYUyRN0wCxbiaZ npFq8QDcqVLbMS+QBaURcBCP/tWMaaErvtiPY/GZtsSbDmUigMELS6rqOkPLNNjAkuVSEV gzIFHWYUK9/Qp48V8ew0KSasY/gpzv5p1t2lrI5gB0ejd/xkjsdXVb+7YMSNwtFCvGx6tv zog1JpujIo1aahp6ehODeuyD2ryrj1/IqsQqhg3qG0xbZv60mh3I7R8jL+SihA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697791346; a=rsa-sha256; cv=none; b=TN9UjgYOVx7BVGb20e2lugqj9Cs1tRJFg9KwH2JtFZemfwQ5Ex7LJ8m6od7PudXAWAAnz4 KpwLu2kpIaNmXLWdpibhAOC7xDZdV7RmFbR+d+IYL7XNot9nyu5EcfcazbJCyRpqnyIKhz +XKryWe7E41lC+X72GF/2cHbWJHE/hVB9KLX2RoVuE8h541ANwi5A3KRI8EPnFZR+RdG6z rxdskPfFD2UVCjpiQBZAnNzXXzp6ruvJNlK+l7Kv/wdAEjccy/i9I1L45RjQ8NOhw50Ajw qKD+JSO7OnZ9jdCVFKV8JSWFaqCfOGExKxMD9QecsK0sgrBcbWUFsy9MhjLT4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697791346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w1W1bxX+1g0SKQ0LKHh9KIaCk9+GOVPzakruDIqCO0=; b=oP7TELW6BUkg1oULg2lj5XkaethyeWG9cjSmT08Phxe1E50hr5pA0D219G+CYXiqIyIOsu 7Mdh5/OjLjh1yX1uVcaPOQxI0Z+D6JRIMjWD0Dmliq25DjinDOALt0OoCsGpRA0DGwS43o xDMamhIFex7dJ5DUsQf5bdAlxIFO3VSFBZA1WbDBjujZXv6NanB9V0nDw3ffo2+eblZ9sY AJyIun1LtOqMvfMWTInbBE3ONrc2VrnypFEB70T9yAhgKtDJohNuByV6G79Dbt/Qqr7XzS wgd6UbSDSjKhC2lT3L5o+X92zUOUJ1gmKTu+7B9FSiV6xr/oFc4zIMLJwJWQzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBdPZ1x88zBTP; Fri, 20 Oct 2023 08:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39K8gQTL005802; Fri, 20 Oct 2023 08:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39K8gQfS005799; Fri, 20 Oct 2023 08:42:26 GMT (envelope-from git) Date: Fri, 20 Oct 2023 08:42:26 GMT Message-Id: <202310200842.39K8gQfS005799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c1146e6ad67f - main - pf: use an enum for packet direction in divert tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: c1146e6ad67fb866c2472a1cbe5609fd939fd5ef Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1146e6ad67fb866c2472a1cbe5609fd939fd5ef commit c1146e6ad67fb866c2472a1cbe5609fd939fd5ef Author: Kristof Provost AuthorDate: 2023-10-20 07:13:56 +0000 Commit: Kristof Provost CommitDate: 2023-10-20 07:16:08 +0000 pf: use an enum for packet direction in divert tag The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN instead of 1 when looking at a structure. And compilation time failure if anybody sets it to a wrong value. Using "port" instead of "ndir" when assigning a port improves readability of code. Suggested by: glebius MFC after: 3 weeks X-MFC-With: fabf705f4b --- sys/netinet/ip_divert.c | 2 +- sys/netinet/ip_var.h | 14 ++++++++++---- sys/netpfil/pf/pf.c | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index ad95a1ce0d76..78ca36fc2a0f 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming) (((struct ipfw_rule_ref *)(mtag+1))->info)); } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; - nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + nport = htons(((struct pf_divert_mtag *)(mtag+1))->port); } else { m_freem(m); return; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a8c687682af9..a8a9adc1d4c6 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -328,11 +328,17 @@ extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); /* pf specific mtag for divert(4) support */ -enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +__enum_uint8_decl(pf_mtag_dir) { + PF_DIVERT_MTAG_DIR_IN = 1, + PF_DIVERT_MTAG_DIR_OUT = 2 +}; struct pf_divert_mtag { - uint16_t idir; // initial pkt direction - uint16_t ndir; // a) divert(4) port upon initial diversion - // b) new direction upon pkt re-enter + __enum_uint8(pf_mtag_dir) idir; // initial pkt direction + union { + __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter + uint16_t port; /* Initial divert(4) port */ + }; }; #define MTAG_PF_DIVERT 1262273569 diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a6c7ee359416..1cd8412193dc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8022,7 +8022,7 @@ done: mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); if (mtag != NULL) { - ((struct pf_divert_mtag *)(mtag+1))->ndir = + ((struct pf_divert_mtag *)(mtag+1))->port = ntohs(r->divert.port); ((struct pf_divert_mtag *)(mtag+1))->idir = (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : From nobody Fri Oct 20 09:16:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBf8j53H7z4xXvk; Fri, 20 Oct 2023 09:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBf8j4Zm6z4LKP; Fri, 20 Oct 2023 09:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697793381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lk2RxlLEOL2a5imL/EbVeVAuObMrOWsKB49AKAmJySI=; b=ikmcrwiI4qKNO2wYEXNYte4ML6QTN27iehrrkQmfJzZYPRsDa+QRKv1CPbIzE8+WPFXHgl Tsnz+gDgcA8CUzgFXXY2ZH6WIrRo7pIFgerrC9OSjdTYFR/idtdrbVcQpeCH7PcNDrplrv 10qNsO8M8Ja6pdrVUgxV9/ert4t8DSmLRr4VeHIT+NchX5i8gSlHkPvX/S1PNsoDQzyE0G ojIaJq6nByDzUbivdURhpspjcgabO1Nwcb7i3GKl3bzY7PtlHnMuPVcrxmoQmoORwwL2XV T7f9tUK+6zoweqAmVJIXQYiOBs/yLHoBhkus4uJG6IKcvSQLwU4c9U4U9Qw6XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697793381; a=rsa-sha256; cv=none; b=YtzWyGk7mvyrE2ykzShGU8+WI0D5YCS71X1enkmSlsa2Gp241yn3HSj5FjBO/z05cpKdrT 8WgzzuDsDJ/Am3L4PzmNypQRx4glg7XqcW+43xUnpIABoaIUsTV2iqT1Sxcy4SbfGdfJUv jhenWLpewLI4OEmfpyX1fumqRF7XIVDnUyQ8HfgNzR+Q15WI3zePaHAHi8eq3Pc5ZFcXlB 4mXo6m3AUghClx6brAfsVvyaQnTcxJkYR2G2KQlFKHJi0KJIA/rnQyYBszaEBoEzQEwqjI UiQ0+7LGpORSzL2HvVSCibL3oJ1J6Fq4rXR5+BiL4Rvlqar/Ex+XqINnVZuRvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697793381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lk2RxlLEOL2a5imL/EbVeVAuObMrOWsKB49AKAmJySI=; b=FSA/v8Gep1k7j6eerWtXVjeHSaEGUMFlnT+5PAICmDbHrlB6HTK20+uYA8tl4tyUm+Hha4 lFknS9IgVNe2uLYZ4f82hVG+rLPkWuo3lvYndYDJ6N6HESELY9n4k1x11gb6ZE2njEf6Qz qCe27ViEKxQb1JbuAxdrNkbTDdSICEJLbk9rTSO+uqwsFXLsZkX2+9DA3mSnJplNpANLy/ c9FyzsLPxxSMhIlPsPp8Na3P25+OmemWYZZz3YagM65RdHjqqp3PqYX/YsSoISx6XGzoBa M2Mm7L2b/Qs85c8DPh4OU2Vs1LQQU3os17bt1tG6+L/J0LKncHS5lLCsI53Xxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBf8j3f7qzBPy; Fri, 20 Oct 2023 09:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39K9GLRr056708; Fri, 20 Oct 2023 09:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39K9GLn0056705; Fri, 20 Oct 2023 09:16:21 GMT (envelope-from git) Date: Fri, 20 Oct 2023 09:16:21 GMT Message-Id: <202310200916.39K9GLn0056705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 49fa9a64372b - main - Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49fa9a64372b087cfd66459a20f4ffd25464b6a3 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=49fa9a64372b087cfd66459a20f4ffd25464b6a3 commit 49fa9a64372b087cfd66459a20f4ffd25464b6a3 Author: Wei Hu AuthorDate: 2023-10-20 08:58:20 +0000 Commit: Wei Hu CommitDate: 2023-10-20 09:15:21 +0000 Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read It is observed that netvsc's send rings could stall on the latest Azure Boost platforms. This is due to vmbus_rxbr_read() routine doesn't check if host is waiting for more room to put data, which leads to host side sleeping forever on this vmbus channel. The problem was only observed on the latest platform because the host requests larger buffer ring room to be available, which causes the issue to happen much more easily. Fix this by adding check in the vmbus_rxbr_read call and signaling the host in the callers if check returns positively. Reported by: NetApp Tested by: whu MFC after: 3 days Sponsored by: Microsoft --- sys/dev/hyperv/vmbus/vmbus_br.c | 9 ++++++++- sys/dev/hyperv/vmbus/vmbus_brvar.h | 2 +- sys/dev/hyperv/vmbus/vmbus_chan.c | 12 ++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus_br.c b/sys/dev/hyperv/vmbus/vmbus_br.c index 27adf71fd6ea..f663bb7c2ba5 100644 --- a/sys/dev/hyperv/vmbus/vmbus_br.c +++ b/sys/dev/hyperv/vmbus/vmbus_br.c @@ -684,7 +684,8 @@ vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, * We assume (dlen + skip) == sizeof(channel packet). */ int -vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) +vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip, + boolean_t *need_sig) { uint32_t rindex, br_dsize = rbr->rxbr_dsize; @@ -717,5 +718,11 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) mtx_unlock_spin(&rbr->rxbr_lock); + if (need_sig) { + *need_sig = + vmbus_rxbr_need_signal(rbr, + dlen + skip + sizeof(uint64_t)); + } + return (0); } diff --git a/sys/dev/hyperv/vmbus/vmbus_brvar.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h index 8593c1886b0f..a04169f3291c 100644 --- a/sys/dev/hyperv/vmbus/vmbus_brvar.h +++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h @@ -129,7 +129,7 @@ void vmbus_rxbr_deinit(struct vmbus_rxbr *rbr); void vmbus_rxbr_setup(struct vmbus_rxbr *rbr, void *buf, int blen); int vmbus_rxbr_peek(struct vmbus_rxbr *rbr, void *data, int dlen); int vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, - uint32_t skip); + uint32_t skip, boolean_t *need_sig); int vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, boolean_t *need_sig); int vmbus_rxbr_idxadv_peek(struct vmbus_rxbr *rbr, void *data, diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index d5c4d357e9ec..ecb2e947c953 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -1205,6 +1205,7 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, { struct vmbus_chanpkt_hdr pkt; int error, dlen, hlen; + boolean_t sig_event; error = vmbus_rxbr_peek(&chan->ch_rxbr, &pkt, sizeof(pkt)); if (error) @@ -1235,9 +1236,12 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, *dlen0 = dlen; /* Skip packet header */ - error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen); + error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } @@ -1246,6 +1250,7 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, struct vmbus_chanpkt_hdr *pkt, int *pktlen0) { int error, pktlen, pkt_hlen; + boolean_t sig_event; pkt_hlen = sizeof(*pkt); error = vmbus_rxbr_peek(&chan->ch_rxbr, pkt, pkt_hlen); @@ -1277,9 +1282,12 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, * by the above vmbus_rxbr_peek(). */ error = vmbus_rxbr_read(&chan->ch_rxbr, pkt + 1, - pktlen - pkt_hlen, pkt_hlen); + pktlen - pkt_hlen, pkt_hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } From nobody Fri Oct 20 10:29:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBgnL6ctMz4xc6l; Fri, 20 Oct 2023 10:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBgnL62tRz4Rnf; Fri, 20 Oct 2023 10:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQdiDtAq3YiEWfqVoTrS9sRKTohhgv/5GrQTciWekFU=; b=FUYQxe2FlRZChl/lqlphMS94r2xvGHp2orf3xBi9OaBF0Z10bv/WIGuB9rl+fYcTzfPLSF ZTqkpehrN1U6dXcfQHi6beYHuZTg5SsZuHvIuQqtIN+Gi0F5kstmp9xhKVEnkeTGYTgRmI qwae8SAxpTndM59Smydt0dJUVytG5fADnibQHbv58E/07KOD5VDXoqPNVHsQYgNkN7u/4P TCKZYLrMzhTG/fAgsTp0NeIW2uyO7QPdqOyWiO0PyPiML/NnTqr6uUF78GLnJbr0tNeUJm cM+Vle5oUscBHFEOKZ3Myk+j4tOEoIwpF2vgBKrj7R1cHZcj3r2X90w1tWBbJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697797782; a=rsa-sha256; cv=none; b=xZB67giLcPwdHSNHaD4CYb6Oxgop0XZ2/xEWXmciB97kxB20Mr+fiuBAer7p7JW/oCsNYI V+NhLFeF40QXArkGx8xz+QyhU1PePNaLmmFA6RC8LuceMJlwDyhn/+Ty0nrOPaNHM96HNG ls3Zw0JwniOdAlJXoH0biLQwZSjO8OXRCxBDhFGOpJ405QSS88LdlnaJbN68YedCkgGUI4 51b12Kn3+PY3Zhx8x7CWsZEZpttcz2XSwpDBG51iqdYSr7ZNJvXHlTrRJ4BFMwpLpipFdJ peQ4Y8ihzRNSmc4kglbj6tWzqapvIGZ+NrqB6sgz6Y6qYXH0l7yn9CZsYNiy6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQdiDtAq3YiEWfqVoTrS9sRKTohhgv/5GrQTciWekFU=; b=dnCuiPnfGu0bAiOa68JeKDxT2NHaW6dJmgckBkHPcoN5i5RSVE9mazRXYaIvEjfs7w7frk ylhg91rg5Mo0qralnHBXzCQuSO0s14CgWJyNxkhGw9ctQWb/fTxB+nu+r3tvQW9PHYBA1+ 9qjErgbsOelwY4/SVQjHV3pEqOjfwDMI0PSkcLaKi97QfVzPG308T37kxMBGUJvlDhanhH Jsu+7AV+wa0ICw4w66NDHKVBB9xPZL1qw4slQgWPCWJkVRZaDRTmNVDkxFHRB/DtN6os6D +pVpkk+RNVoiVamleSojD/96sDUb2cEy9y2if0jOKQheaZ4J1/POb5qE6U6gjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBgnL55ZLzTtt; Fri, 20 Oct 2023 10:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KATg15073740; Fri, 20 Oct 2023 10:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KATgpX073737; Fri, 20 Oct 2023 10:29:42 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:29:42 GMT Message-Id: <202310201029.39KATgpX073737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 87945a082980 - main - certctl: Fix recent regressions. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 87945a082980260b52507ad5bfb3a0ce773a80da Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=87945a082980260b52507ad5bfb3a0ce773a80da commit 87945a082980260b52507ad5bfb3a0ce773a80da Author: Dag-Erling Smørgrav AuthorDate: 2023-10-20 10:29:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-20 10:29:40 +0000 certctl: Fix recent regressions. - If an untrusted certificate is also found in the list of trusted certificate, issue a warning and skip it, but don't fail. - Split on -+BEGIN CERTIFICATE-+ instead of "Certificate:" since that's what we're really looking for. Also fix a long-standing bug: .crl files are not certificates, so we should not include them when searching for certificates. Reported by: madpilot, netchild, tijl Reviewed by: netchild, allanjude Differential Revision: https://reviews.freebsd.org/D42276 --- usr.sbin/certctl/certctl.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index b7d3a95bc7d7..2ffa94bc7db7 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -67,8 +67,7 @@ cert_files_in() find -L "$@" -type f \( \ -name '*.pem' -or \ -name '*.crt' -or \ - -name '*.cer' -or \ - -name '*.crl' \ + -name '*.cer' \ \) 2>/dev/null } @@ -114,7 +113,7 @@ create_trusted() otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint) if [ "$certhash" = "$otherhash" ] ; then info "Skipping untrusted certificate $hash ($otherfile)" - return 1 + return 0 fi done for otherfile in $(find $CERTDESTDIR -name "$hash.*") ; do @@ -182,7 +181,7 @@ do_scan() IFS="$oldIFS" for CFILE in $(cert_files_in "$@") ; do verbose "Reading $CFILE" - case $(grep -c '^Certificate:$' "$CFILE") in + case $(egrep -c '^-+BEGIN CERTIFICATE-+$' "$CFILE") in 0) ;; 1) @@ -191,8 +190,8 @@ do_scan() *) verbose "Multiple certificates found, splitting..." SPLITDIR=$(mktemp -d) - egrep '^[^#]' "$CFILE" | \ - split -p '^Certificate:$' - "$SPLITDIR/x" + egrep '^(---|[0-9A-Za-z/+=]+$)' "$CFILE" | \ + split -p '^-+BEGIN CERTIFICATE-+$' - "$SPLITDIR/x" for CERT in $(find "$SPLITDIR" -type f) ; do "$CFUNC" "$CERT" done From nobody Fri Oct 20 10:29:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBgnN0yXVz4xcgY; Fri, 20 Oct 2023 10:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBgnN0V9Mz4S5d; Fri, 20 Oct 2023 10:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA+1l84JlX6hHhBhChsRa5kSBsIEC1pxRP5XXygzfMU=; b=a5JU0IvNHyT05hGsQfAEFAQS+9936dVVozi6t1zKovy/mAh6tx2aUJZhwtu9ifwqf1lyuu UQ5FNeOB95O/t91nb1nFRyX7iOPqmFb/JitE0X8CrRuo5XIqKuHKHZU8qZCEVL52l/mA9D 4clU0uWDdfm3kI2ZTHmqhyyvJihcBOL+jOTp1nM2+uKjltroW0WFw1qeTDQgenmIP8MI79 hjqNl4TaoB1yzbra/UXrRt3BXfdz6QKviSH9NG+CEm2qLXoyg5vZ9OeM06iyhewAbvoCOp vzweZZbisH2AJJ73xzNr4GjWr0sYS9YyVP/kWAgySMxjEIpMizETHMraveo6HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697797784; a=rsa-sha256; cv=none; b=NGyd5ZyIBqJPnnsxUEGMU4xzHHP6luT1cfNB5C2F9t1m1xuuT7022tKxVCRvQWsuIqp5l4 CRnkzkSCo46mULlPpFkQYNXLRpnSE4zGVZVzXBylL5ez6VGEwCD2uFVX1mCSbhBctzhbtl +PMKqUU9KYJOPkCfdyXxV9VsKDgi+k/42SdBz36lZXS8YiiPfl1S3N++z/93GrrGKzzJAH CpJK4S+vgn1DrWijxK8MYj+tVZYwETeaN6wllydAPA5bsHSuBPNC1/BGnYo1Xd1zS61/ti 19l7xHCxSOqvamIO2KWNc+Il3crTKw7kS+1SIzVfZ80FHrqT+43hExCGMSW1NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA+1l84JlX6hHhBhChsRa5kSBsIEC1pxRP5XXygzfMU=; b=CWbUhIfOnUMADHSt23RsBxyeZ61gaCLsKEEdozRRV15oRZrD73M6osjMy6rhis46AjnVxt ZOo0P4cY9EdnTkrZ+lsdYo9ENJEKza1dIG4MSnPbMhZCqbtb0Sv/GyIoavYeAfIb6Q2iFl WwRmfBEvO8VxUwr35cjEINrvgv1Fh6t7yB6xhZTA31mIfhY9ccasj6nlS8gjU5copI9Qeo 91QcLTA4sxFQ5Vy3peueuRkZcFBa+Tg4FB6+1nRUudx9cBXPi+OuFDB5z7HlIfqGDVeYPr KJXM5lTae9yPXgOl/QoPOp6sIjZwgwEHm8JDc9A7AQR7NRWblIsHzXL4u4Raqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBgnM6K7szTyk; Fri, 20 Oct 2023 10:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KAThOk073782; Fri, 20 Oct 2023 10:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KATh1O073779; Fri, 20 Oct 2023 10:29:43 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:29:43 GMT Message-Id: <202310201029.39KATh1O073779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ca57a343e86e - main - libc: More missing MLINKS. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: ca57a343e86ed3015596db68bda17518ad45436a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ca57a343e86ed3015596db68bda17518ad45436a commit ca57a343e86ed3015596db68bda17518ad45436a Author: Dag-Erling Smørgrav AuthorDate: 2023-10-20 10:29:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-20 10:29:40 +0000 libc: More missing MLINKS. Differential Revision: https://reviews.freebsd.org/D42292 --- contrib/libc-pwcache/pwcache.3 | 6 +++++- lib/libc/gen/Makefile.inc | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/libc-pwcache/pwcache.3 b/contrib/libc-pwcache/pwcache.3 index 32895ce9b54c..f730153d9951 100644 --- a/contrib/libc-pwcache/pwcache.3 +++ b/contrib/libc-pwcache/pwcache.3 @@ -62,7 +62,11 @@ .Sh NAME .Nm pwcache , .Nm user_from_uid , -.Nm group_from_gid +.Nm uid_from_user , +.Nm pwcache_userdb , +.Nm group_from_gid , +.Nm gid_from_group , +.Nm pwcache_groupdb .Nd cache password and group entries .Sh LIBRARY .Lb libc diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 655843f03715..7eaa471a8dc7 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -484,7 +484,11 @@ MLINKS+=posix_spawn.3 posix_spawnp.3 \ MLINKS+=psignal.3 strsignal.3 \ psignal.3 sys_siglist.3 \ psignal.3 sys_signame.3 -MLINKS+=pwcache.3 group_from_gid.3 \ +MLINKS+=pwcache.3 gid_from_group.3 \ + pwcache.3 group_from_gid.3 \ + pwcache.3 pwcache_groupdb.3 \ + pwcache.3 pwcache_userdb.3 \ + pwcache.3 uid_from_user.3 \ pwcache.3 user_from_uid.3 MLINKS+=rand48.3 _rand48.3 \ rand48.3 drand48.3 \ From nobody Fri Oct 20 10:51:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBhGM0DLTz4xdXR; Fri, 20 Oct 2023 10:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBhGL6sQdz4VQK; Fri, 20 Oct 2023 10:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697799083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haZnvcLbAnTj7AJ8Tr90RnOOVxQ8EcV2h7yHx3cDQAc=; b=jRVpxfhdgWszZhczYXhZ86h7p16z+4y9C2CesvzpQiCgrOGZWAJ/5LS46hOeY5W27Uvcg5 A4iHwotMpXfG971k8Edc4R6WLxEBPfBRmHJ2gbdHf8TtpF9uF04pSfDLFqALl/Y1RNCZzH +NCJcip3qW2zGAu8hQwVZjMDIqgRLQMopS0UHaqDl8/gYmz0Uc/rWCjnBYkfqOZk0nC3Ia Upq1iLixwy4eoN0RzYB0ugHXE98hpLh727tLj7bhaxsJUcBqSAV9Fw/eUQiiztVCnq8RHo WJ4bEjjlKfWPl5j2wOgbywDCkSdSe9cKgVGVBY9UEN9wRpsx+VR3P2qWRH2hWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697799083; a=rsa-sha256; cv=none; b=sCYREsWaItMVwzvA8eFLKBFXYNoLoGfd4Iua8TkT2xGlI7uDc8m4xIQYlqUPHnmIj1BvWQ fPj8AFchxtrcm2Hr1Q7h8ozRl5ZcUVwR0MpeFrQps1LAIchGRBlFvyDw64f1IWyU0tcmPk GXEmWoSurazPO3D6rh6yriHpO8kuUZjyTDDl3hvlUBWdZt/MsZtV+yY+5UiAH9IraopUgB aFMIb9NdTMO+yggxwQ9nhIjlO+FnUqcIwGfR0EfhiMm3DsbKpEU9bCQ+kHMRHKx4pUOnqy Nk0iqtA7m6NM4k3vY1GC0VllnSVhzOfIJwBnMVix19AdqvLgjWFEjPMp+Gv9mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697799083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haZnvcLbAnTj7AJ8Tr90RnOOVxQ8EcV2h7yHx3cDQAc=; b=YRYyfm0lSSP8t4rstQabgYylERFvhC+t/8Lld4aLXePqSKbRUqC68/dOOlT1GxLOS5nXEk iA0kCpadG2DwrVNqTwrgyHugxgnaj3YDxwcmuMaDrLagyKp7r6oH3jHOGmwWi6veJc3z2r l7eWj4iLX6g/tU2vmMg8kWNDF8B1rdohIZ0qgmK0z0Qb63OvOQ435NiTZaWBdrbRLiEgQA GVw/TcncjTDohmizkVLEEHWtXjWIh3aaV5dvNPsuVbYpy1D0MpoGhRj0EoQtNL8W9PloD6 hOcVD+L0b2XM2q1lylN5wvcHMN91Qb3KVciEI7tVcwSjdGHvtprMUQJMeBpqvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBhGL5wS9zVXT; Fri, 20 Oct 2023 10:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KApMaM019424; Fri, 20 Oct 2023 10:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KApMNX019407; Fri, 20 Oct 2023 10:51:22 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:51:22 GMT Message-Id: <202310201051.39KApMNX019407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: da4b0d6eb06d - main - netfront: fix the support for disabling LRO at boot time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da4b0d6eb06d730487d48e15d2d5e10c56266fd9 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=da4b0d6eb06d730487d48e15d2d5e10c56266fd9 commit da4b0d6eb06d730487d48e15d2d5e10c56266fd9 Author: Doug Rabson AuthorDate: 2023-08-12 13:19:47 +0000 Commit: Doug Rabson CommitDate: 2023-10-20 10:50:20 +0000 netfront: fix the support for disabling LRO at boot time The driver has a tunable hw.xn.enable_lro which is intended to control whether LRO is enabled. This is currently non-functional - even if its set to zero, the driver still requests LRO support from the backend. This change fixes the feature so that if enable_lro is set to zero, LRO no longer appears in the interface capabilities and LRO is not requested from the backend. PR: 273046 MFC after: 1 week Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D41439 --- sys/dev/xen/netfront/netfront.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index b4e7722552e6..dafb838cf328 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -2272,7 +2272,7 @@ int create_netdev(device_t dev) { struct netfront_info *np; - int err; + int err, cap_enabled; if_t ifp; np = device_get_softc(dev); @@ -2304,7 +2304,11 @@ create_netdev(device_t dev) if_sethwassist(ifp, XN_CSUM_FEATURES); /* Enable all supported features at device creation. */ if_setcapabilities(ifp, IFCAP_HWCSUM|IFCAP_TSO4|IFCAP_LRO); - if_setcapenable(ifp, if_getcapabilities(ifp)); + cap_enabled = if_getcapabilities(ifp); + if (!xn_enable_lro) { + cap_enabled &= ~IFCAP_LRO; + } + if_setcapenable(ifp, cap_enabled); if_sethwtsomax(ifp, 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN)); if_sethwtsomaxsegcount(ifp, MAX_TX_REQ_FRAGS); From nobody Fri Oct 20 14:07:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBmcN4hcJz4xpmp; Fri, 20 Oct 2023 14:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBmcN45zzz4ktC; Fri, 20 Oct 2023 14:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697810836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9zae9zItOh4kWX8HMzzoUwRIMFmOPumBKfqWRWRxUY=; b=QWeZo3wK4xEDlUL3UBev13fDpwmKFWLnx2GPFTt8Dbz21qDh7W25pa0MlKQj4L/b4WaMcd /eQb6OPn/Axs0A+eExVUymgLS7m41nRif6zb2n8+wfwRoGGeAyjaCMHmmXjSBym3zSHVZG ekvTb8wzrGlUYLuVhPJIT0brovyBdsqeqzrh+nrbW3C0FkXz3qrywxNZHDOvxWusqDGz+t IjhV6hFlhpZkF1tGPboITQPErfrGbP7wBgAEZDa2R4lwgYeC7h+/LoeAkerWT/413ABAQj In9+7sh52+QtLRrpuJ+/I/IFMSLqOvCO4oFKtRvoIXEESDwcjrThkNiknoASRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697810836; a=rsa-sha256; cv=none; b=OA5KMtmHAPpqE8B4Xj7/PcGExjqAUH7OkdNx/pdA47lRaEH0i1huWeU9q+EAbA0DuHsVQT esBiTRKmFUwDJHbbXKLV3mjlL4G3WGUSGrpsZKKOgaqYfTHyL6m4riUBNMExpsjcCsCUep /S7JoJ8REZpevyXvx+A/jKFxjEDz5DJq/d3yKsZAdEKbE1ni4xGXAipK4OZp+O6HJfKbE7 mF/2hZIeULAydleAwcNQsMi+ca6L0wLSynuc2i/JZWaSKEQN50MG8I4Ty9W+m3Y+X/b6no cuFNgmuxhb/9JBleJuft3wMGXf1siQyh8mnYFY3kH2aK1urzEDVD+iVAj3Rb5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697810836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9zae9zItOh4kWX8HMzzoUwRIMFmOPumBKfqWRWRxUY=; b=jUmmMnR6EYA4ciWuik5+ZC4Ye04xUENHSgsx6+TnTVekcHVCMOQkgq03+rLtFwM44WXJqY +svRkeOXnJBvlWf2tFIILPhuIimoOb7OEBAbjOXH3Z4pKwPGDzx43+lLZQ+aky/0F70Qxg wQ51WAHkIbrMHXYtxVWLnVksxhnT7akElmQ5W+WJ7JPxuHlIWjyvnHHwIp6jQK5Kin3LSp BKaLwMiLbTEQsYvxAvjPGHpsSLLnLBs1/n5oTLF9Ez3T4Z4HXXXl9FzaJFhdQYYTSDEg9o 9R4FT5vSfbxEx+oMfiaExwdDq/mXUL0h0nKuIBXox8LjOgbqKp27NiB5NZTzkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBmcN35xSzbtD; Fri, 20 Oct 2023 14:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KE7Gap039323; Fri, 20 Oct 2023 14:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KE7Gcf039320; Fri, 20 Oct 2023 14:07:16 GMT (envelope-from git) Date: Fri, 20 Oct 2023 14:07:16 GMT Message-Id: <202310201407.39KE7Gcf039320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6ad6929974e6 - main - netinet tests: Fix leaks in ip6_v4mapped_test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6ad6929974e6394d57a40f7d43c899963c6ae5ec Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ad6929974e6394d57a40f7d43c899963c6ae5ec commit 6ad6929974e6394d57a40f7d43c899963c6ae5ec Author: Mark Johnston AuthorDate: 2023-10-20 14:05:58 +0000 Commit: Mark Johnston CommitDate: 2023-10-20 14:05:58 +0000 netinet tests: Fix leaks in ip6_v4mapped_test Reported by: Coverity MFC after: 1 week --- tests/sys/netinet/ip6_v4mapped_test.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet/ip6_v4mapped_test.c b/tests/sys/netinet/ip6_v4mapped_test.c index d4c4ed526ab5..bbc8d11d63ef 100644 --- a/tests/sys/netinet/ip6_v4mapped_test.c +++ b/tests/sys/netinet/ip6_v4mapped_test.c @@ -294,8 +294,7 @@ ATF_TC_BODY(tcp_v4mapped_bind, tc) error = connect(csock, &su_mapped.saddr, su_mapped.saddr.sa_len); if (error != 0 && errno == EADDRINUSE) { /* This is the specific error we were looking for. */ - ATF_REQUIRE_MSG(error == 0, - "client connect %d failed, " + atf_tc_fail("client connect %d failed, " " client had duplicate port: %s", i, strerror(errno)); } @@ -312,6 +311,8 @@ ATF_TC_BODY(tcp_v4mapped_bind, tc) } ATF_REQUIRE_MSG(i >= 1, "No successful connections"); ATF_REQUIRE_MSG(got_bind_error == true, "No expected bind error"); + + ATF_REQUIRE(close(lsock) == 0); } ATF_TC_CLEANUP(tcp_v4mapped_bind, tc) { @@ -365,6 +366,7 @@ ATF_TC_BODY(udp_v4mapped_sendto, tc) ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); memcpy(&sin6, aip->ai_addr, sizeof(sin6)); sin6.sin6_port = port; + freeaddrinfo(aip); ch = 0x42; n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); @@ -383,6 +385,9 @@ ATF_TC_BODY(udp_v4mapped_sendto, tc) n = recv(ls, &ch, 1, 0); ATF_REQUIRE_MSG(n == 1, "recv() failed: %s", strerror(errno)); ATF_REQUIRE(ch == 0x42); + + ATF_REQUIRE(close(s) == 0); + ATF_REQUIRE(close(ls) == 0); } ATF_TP_ADD_TCS(tp) From nobody Fri Oct 20 15:19:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBpCC739Cz4xtSM; Fri, 20 Oct 2023 15:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBpCC6VzQz4tHF; Fri, 20 Oct 2023 15:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697815143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhOayl6dGlDCjOtbDwZXjPtqQf4R+QJn3u2pPhq85qc=; b=Y/+eAchsDt7koXNq8hgbydD6Rhfy9uVRdCzi/cgdUcPf7R61Mi09MEMXcwKgqIl61xijRZ UiKX+1j7BjPZBCZyhnEsxQcWnfcSX+aUpjGJOVwhofRu4iyQw27goCARSK/myE5Il4P1J7 NbzzaMgoRF3PXbtPE4huuK/sCzVjQ67b1XYROjDdgCHkGbqrDk+O8Txknl+hmbdw9/n5/P eBxPRSyf23etKWKGjeC19z2TiPolH15UctTLPMmEvdf3s3njo8TmFYSHcWrTr2uIV8QUQF jGv3ZiVos0YxretacKVp1mpaONL8+yzE4DFZyH5Fux5rQWTzkDEXp5QyF+aj7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697815143; a=rsa-sha256; cv=none; b=JY+H2wN3av/2hFQLHGunqLZuSU1CeFTIEw55Bb8WKZacC3qHHeRvTAKEuBhtyfd2jKRwdj xDEh/umfXaVmJsJfpbSL3DyoNg85tFypuTJDUXTgqSXQcdpyNWXEQCaamTVmplXpPLjoRW y/OeHtV5fLa7UeVwMfq4MxHtmOQdVOeUz6hHID+fEtQrB5ZkAXVpFEb4SmBCX4QyAc+drA 4P11cNglSKggwFI0ilgPuJODHuiNehFCmpxQuSUWAftXAIYFhOtUENKj6IT8ZrUTf5Ci1m iafn35GWZTzGV6ADzLMnk8vLcFQnNIHOewm9EEBgQkQ7BYA+a98Ef6yZDaI5eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697815143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhOayl6dGlDCjOtbDwZXjPtqQf4R+QJn3u2pPhq85qc=; b=eymf0bmp98V+gUZ1nu4ibupEnnSzCMVQkYysQdtdRmFFIPOPRghvOGER1m8b5wKrvwPShw pIwEoY/+SqX89f4wWzFdfSnb/ZCNHdPNyuP+06afDxBWwciX6qc2l4Ng9FtuGWJg11o+qq iHoHSXmsBZQxC52zoox+lgTHbMW4GI2oDHHoAzeHdY21QRPWqWyg+iqJ3jMxSK/jlI1Kwp qlaeVSYipXgM95y5Q++p2I6Bv4UXhxa9Hs1s0+fPGqi/PDHARAfS/PjPjiKwaDtTfo+njz qT1X8W+LBVl+7/8hqlN7W889S5T56rxqtv4EKP41qLN8Jhw54gmUB+8jux5l3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBpCC5c1Fzd39; Fri, 20 Oct 2023 15:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KFJ3hL055689; Fri, 20 Oct 2023 15:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFJ3VP055686; Fri, 20 Oct 2023 15:19:03 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:19:03 GMT Message-Id: <202310201519.39KFJ3VP055686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: eb875881553b - main - Tweaks to libarchive's upgrade instructions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb875881553b5aa0a53ccfb02131ea254f4ee3b1 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=eb875881553b5aa0a53ccfb02131ea254f4ee3b1 commit eb875881553b5aa0a53ccfb02131ea254f4ee3b1 Author: Mitchell Horne AuthorDate: 2023-10-20 15:11:21 +0000 Commit: Mitchell Horne CommitDate: 2023-10-20 15:12:02 +0000 Tweaks to libarchive's upgrade instructions I would like to use this file as an example of the FREEBSD-upgrade convention, see D42302. libarchive is picked somewhat arbitrarily as a longstanding piece of contrib software in FreeBSD. - Remove SVN references (HEAD/trunk) - Mention the vendor/libarchive git branch - Update link to import instructions - Remove $FreeBSD$ Reviewed by: mm, imp, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42308 --- contrib/libarchive/FREEBSD-upgrade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/libarchive/FREEBSD-upgrade b/contrib/libarchive/FREEBSD-upgrade index 0689acff2599..0b5d4e921f49 100644 --- a/contrib/libarchive/FREEBSD-upgrade +++ b/contrib/libarchive/FREEBSD-upgrade @@ -1,25 +1,25 @@ -$FreeBSD$ - libarchive The source code is pulled with git: git clone git://github.com/libarchive/libarchive.git +The git branch for imports is named vendor/libarchive. + For the contrib directory files and directories were pruned by: - + sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' You may check if there are any new files that we don't need and add them to FREEBSD-Xlist. -The instructions for importing new release and merging to HEAD can be found -at FreeBSD wiki: +The instructions for importing new release and merging to main can be found +in the Committers' Guide: - http://wiki.freebsd.org/SubversionPrimer/VendorImports + https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git -To make local changes to libarchive, simply patch and commit to the trunk -branch (aka HEAD). Never make local changes on the vendor branch. +To make local changes to libarchive, simply patch and commit to the main +branch. Never make local changes on the vendor branch. mm@FreeBSD.org -27-July-2012 +19-October-2023 From nobody Fri Oct 20 15:45:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBpnb3Y4tz4xvnZ; Fri, 20 Oct 2023 15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBpnb34ctz3Ccc; Fri, 20 Oct 2023 15: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=1697816723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ivm+Uhf24ZmmIuosdME8F+vXEI7658eyBs4M5cXLyks=; b=MgBef932uGXmIByadVsjt5mh3Vm8ALlJgmgUrStIUUUa+l471nkzenf17019hBUkTpoEMw aTGE8WQ37qaKwdShkuRY3eOG176JmUE8XjpxmPiboNGrHwmkjtby1xLENDYaBhpctuctf9 m+BMJd2d4q799jTw5I7YCPZfwyQWYaxuyxM9eO3hs4rSL//52Izz3qmsNe4qai/tTRFiZx 4vzYY2KOUu0NJqTjJlGL3+BESzruzewn5NdGg5S0DYv73c5peb/0yGI8XyLZPDHZTVQyJv iRy+wB38oS/twFuY3mYLxkm6oJt5GlhvpyMHEnr5PtEc5zNO50MkR45OG6m/gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697816723; a=rsa-sha256; cv=none; b=Q56hznPFAo+BiwvUCdZQ5NDyDVl1Ycx/YorxaOvr1TemhuhfKsd4c4ByCODjR7U3N0x/ov bt/2dRM679XdfR9HTT6qxFXip9QWS6f0xg4AyO1nVqD5OX73pgoGEKGcVV4e/O6u7tDLbL rwQF/eZTR1wjfy09VElXlmz2/vjlQcOFijNGi3vxuWP1mF5u0a7UGd7esh5Tzx81cN4+iR mbjgKBo2X59lokP9LD2m8yguUZABDgSU8D64sOt4kvSpdOejN2wjqxBl5IKyzD5fMDWDSN ngo9BxWZZTh+5RLzNwtr0p/3kg1AXxIvBIbnxt9Oz913NuCJIxMWXa90VCzjUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ivm+Uhf24ZmmIuosdME8F+vXEI7658eyBs4M5cXLyks=; b=tuNLvDpVayy2LEd4b5biyD4XveZxPrQTQG8bBjVMs4oCRrEG8sHBiaHx0imt8GSxKSultH 9FUJm0F9KU4p7AhhrJkxPMNE6C3G+Qsv2y0KTpnnfii/zXPGp2B+LKj+w0Pq4mq0W8Hn26 IY92yVyxrVhr6NIi6cYoVjAD7J8qNQUh5NTm26sHLSmGWMeQjY+ffK+itJ5Zw4n1HUY6X6 yh7JTecEELZbkZqhWPRvGLfuowGz6x8RL7PIVMFQDqs5B2CMk0gDuciYZQQ4+DEkOsmGPK Sp0vCBS+dxIGhRhK/w89jNgV+zKyAEYBikTwo5MVAJ92rxxqKQlophQKVx1heA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBpnb27MDzfHw; Fri, 20 Oct 2023 15:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KFjNH6004980; Fri, 20 Oct 2023 15:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFjNZo004977; Fri, 20 Oct 2023 15:45:23 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:45:23 GMT Message-Id: <202310201545.39KFjNZo004977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f39010b1393d - main - sys/sys: Check for __ASSEMBLER__ in elf_common.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f39010b1393d471f1c59195acde5d95cdb66847c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f39010b1393d471f1c59195acde5d95cdb66847c commit f39010b1393d471f1c59195acde5d95cdb66847c Author: Andrew Turner AuthorDate: 2023-10-12 09:45:43 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 15:36:28 +0000 sys/sys: Check for __ASSEMBLER__ in elf_common.h When preprocessing assembly files with clang or gcc the __ASSEMBLER__ macro is defined. Check for this as an alternative to LOCORE in elf_common.h so it can be included by .S files. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42224 --- sys/sys/elf_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index ce82734833cf..934f66fee953 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -44,7 +44,7 @@ * not include the padding. */ -#ifndef LOCORE +#if !defined(LOCORE) && !defined(__ASSEMBLER__) typedef struct { u_int32_t n_namesz; /* Length of name. */ u_int32_t n_descsz; /* Length of descriptor. */ @@ -112,7 +112,7 @@ typedef Elf_Note Elf_Nhdr; * The header for GNU-style hash sections. */ -#ifndef LOCORE +#if !defined(LOCORE) && !defined(__ASSEMBLER__) typedef struct { u_int32_t gh_nbuckets; /* Number of hash buckets. */ u_int32_t gh_symndx; /* First visible symbol in .dynsym. */ From nobody Fri Oct 20 15:45:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBpnc6h5Gz4xw9J; Fri, 20 Oct 2023 15:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBpnc4cZYz3D0c; Fri, 20 Oct 2023 15:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80sp9s9+ftXJUEUk69n5Q911SA4AW4QZMXGRh6GespE=; b=Yy3KguKWTwLlHw5FrzfWVmqpeLdSpVIX/ORbbByJdMA1TIlFs/RObvE/1jpx94/kahMPJA s9P2u/GopyvR1Vi9OzWj2ZufftJIAGYsuApn6uA0E4Rj7ZuG0pO2l5xRaNwPf6R2gGlmoS pC5OHvaG6P4vLJ0wsw54ExtbkJmWNAfa8C2DrAqe9iLgU/LLLcg+sAT02OALz3tQ+bFzTn X/Q6RHPek/kbeGkveqTYmkiIDCPIYJWuW+JsrUZmXE94I2FpfzflhNsM398rbad+T2SqT4 J9m3x4ZOrD8TyRCiCcyiYXUrOBS/c8jC7r21ueM0gw55cPX96OPrghtpD7V4pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697816724; a=rsa-sha256; cv=none; b=hYd7jUqWnm86ZP+9r1QMy9SEuKhEmoaqT7Vycj0sL+Lf7X2/ZwYWfLETgT27HM9evNXUNv fTIkLLGvNPW1sZlSO3IQOeqruQh8dM3vrjR6InsGIpM8oUl0CNElNi941x4e/z5eCm/82A 6mIoBrH+V0+eOK305fyf5LacRq3WmDeLOvZXGz2S1hOy4f73dLO2X2SSJ+me5Cf+RXcKqK Wl8o3qlouNdLZX3Y/IqltN9/Zy2/L0DT1kE7j6iwwrQiXXPszPQPWIjczj+ZIbbpZbT1vP j2NFlwWvUMYHwT8+e19xsdRut1HizLJp8H/z7VSYkLxtwBAla3IsN5FwGA+2+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=1697816724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80sp9s9+ftXJUEUk69n5Q911SA4AW4QZMXGRh6GespE=; b=QTe3I31J6v/0u66Nx0j7ZH4x83UTgp8Cu8dleHWSgbK+z4Cqd43ZHxeMw0Up9a5ZMjmU1C 2NgBkeYSfrR2f8Z3Bsx52HQ2r9CHX9Tm38kUMjggby8/RGDXHi6UWue/+fp60F8dkIUSez R67FccW2m4UjDm7lX7mH69q5mWe8fR7jC+QPDxt7t/Ht25zCQiGn8F1JbvGauEQjFsJLYT 7r8K5oEuFupcg5FwuVy4f641/qZPf/xQvm9kLvI8VpwPzDEWhB2+1NZjzQ+j+lehb0CvRR cxjC8PN+bkDCRn/md17IEn5v9Mav58laQf9VM+aq15RG1S0Lt+tXwHt6pLi48Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBpnc3PfHzf3l; Fri, 20 Oct 2023 15:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KFjOSI005026; Fri, 20 Oct 2023 15:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFjOLA005023; Fri, 20 Oct 2023 15:45:24 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:45:24 GMT Message-Id: <202310201545.39KFjOLA005023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ceefd491c7f0 - main - tools/build: Support building with glibc 2.38 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: ceefd491c7f0490515fadca2f3740cb24e3f449e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ceefd491c7f0490515fadca2f3740cb24e3f449e commit ceefd491c7f0490515fadca2f3740cb24e3f449e Author: Andrew Turner AuthorDate: 2023-10-20 15:45:06 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 15:45:06 +0000 tools/build: Support building with glibc 2.38 Ubuntu 23.10 uses glibc 2.38. This adds strlcpy and strlcmp so we need to remove them from the cross build environment. Reviewed by: jrtc27 (earlier version), arichardson Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42303 --- tools/build/Makefile | 10 ++++++++-- tools/build/cross-build/include/linux/string.h | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index a19d2bf64bc6..668a7198e228 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -196,9 +196,15 @@ SRCS+= strtonum.c merge.c heapsort.c reallocf.c SRCS+= rpmatch.c .if ${.MAKE.OS} == "Linux" -# On Linux, glibc does not provide strlcpy,strlcat or strmode. +# On Linux, glibc does not provide strmode. It only provides strlcpy +# and strlcat from glibc 2.38. .PATH: ${LIBC_SRCTOP}/string -SRCS+= strlcpy.c strlcat.c strmode.c +SRCS+= strmode.c +# Assume if strlcpy exists so does strlcat +_WITH_EXPLICIT_STRLCPY!= cat ${HOST_INCLUDE_ROOT}/strings.h ${HOST_INCLUDE_ROOT}/string.h | grep -c strlcpy || true +.if ${_WITH_EXPLICIT_STRLCPY} == 0 +SRCS+= strlcpy.c strlcat.c +.endif # On Linux, glibc provides ffs* but not fls* SRCS+= fls.c flsl.c flsll.c # Compile the fgetln/fgetwln/closefrom fallback code from libbsd: diff --git a/tools/build/cross-build/include/linux/string.h b/tools/build/cross-build/include/linux/string.h index 87347df1e9bf..8fac9e0fe083 100644 --- a/tools/build/cross-build/include/linux/string.h +++ b/tools/build/cross-build/include/linux/string.h @@ -47,8 +47,11 @@ #include __BEGIN_DECLS +#if !defined(__GLIBC__) || \ + (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 38) || !defined(_GNU_SOURCE))) size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz); +#endif char *strnstr(const char *str, const char *find, size_t str_len); void strmode(mode_t mode, char *str); From nobody Fri Oct 20 16:04:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBqD62TkMz4xxHD; Fri, 20 Oct 2023 16:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBqD61wyDz3Jjd; Fri, 20 Oct 2023 16:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRdecdeUeLQZoynh2P3CuGa2uAfzOMo9Umb1yYNZlAw=; b=oloEUYQHthT5TD8ZsqOGSUYdB+kab9YaT7krwqiE3d0G9GIf0YiRb958otfE5dyTpWUsv6 ftJm1SKmGlv87lfJYE4vXF46WkQ+j4WT9J0GbJGu6G4zbH5FMt74qVYqnwnNTomcKw7P4C ziCX6RZo/pT9og2ybDGSRw94Dp9aaZ6zDfycR4zgkAfFnBBoj0r8fbdJxlVuav0IUVNKjV eupqaBf5rbeuNzW6/LjuhaIA+NYY2Gixxv+Z+j584atyhkvLhO2m3hvWc3zKOKbC5J59gf Ma9yF0lmm+ybBvDgkdjOJ1A8yC5D/iCRDhduJgUoyXcQVUCp3L0IRen5A7Tjig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817894; a=rsa-sha256; cv=none; b=dPVl8tWOpgqUX2LLgB1pOzjhHGF1oENcZzrxAcyrK0QmNEMEQr/pk7W77WO7Ht8eLA7ZNA /EsVgPOoYzRhnUIt6kEtqALe0wIni/t7kNBhotHFiScuJmrJXhAfhosbtY1KHyO850Cmkq nGpwBO7qEGMi5gCu/cU5orH7uBlnk2/CueOlcZAiUyBtBb7g6eaMQrGYfXVnH8HZC4gh3h jP3yudiFBlPuxW3VKDPlFIGPrLx32zjRDeaH+w0NeTIPyUaewO7iEo5+7n3llfUEtUtn/c rsBt/pyX30UyoaT4oUI5tMFoJ/b3Qq+ab3XuimJpWGUD9yi+Wb2in9dU7m3r1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRdecdeUeLQZoynh2P3CuGa2uAfzOMo9Umb1yYNZlAw=; b=yyAMAOXeCv04qimDsFkueuBKfi2m0uQM72SC7xXkv8YFApnGnV+rJ0cVVJAr80ubBVp29r S+tBrnbLiinG9GKQCS5z9guRijiu1Y0lihzsgf7JwlMINZzIZHyD0I6kkLVltfFy+6CCHx wkuqek1LXJhHVuYlHhm1s7X6emO9rRcDaxNpgQIKStphncqBagGmOF6RPIdMlDAZraEToI Kh6oskPrH0elVGnKXAFB2hGwH2b4whXMqxYgzFHFomFCy8aIbKcJopNAD3PNS2b3lPe5u3 bXyisBKpL9ice5m9Q4q6udG8/k45mYjv1pwXFQIaDMXYyagZxd0Qo4P7uOpSVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBqD60zQYzfN1; Fri, 20 Oct 2023 16:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KG4s67039369; Fri, 20 Oct 2023 16:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KG4sKC039366; Fri, 20 Oct 2023 16:04:54 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:04:54 GMT Message-Id: <202310201604.39KG4sKC039366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 82597d2102a0 - main - arm64: Support creating a BTI & PAC note List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 82597d2102a02c4e9e9355717c32867d34b77ef0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=82597d2102a02c4e9e9355717c32867d34b77ef0 commit 82597d2102a02c4e9e9355717c32867d34b77ef0 Author: Andrew Turner AuthorDate: 2023-10-10 13:00:59 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 15:59:25 +0000 arm64: Support creating a BTI & PAC note To detect when an object file is build with the Branch Target Identification (BTI) and Pointer Authentication Code (PAC) extensions there is an elf note the compiler will insert. It will only do so from a high level language, e.g. C or C++. To get the not in assembly add the GNU_PROPERTY_AARCH64_FEATURE_1_NOTE macro that can be used to create it, and the GNU_PROPERTY_AARCH64_FEATURE_1_VAL macro to insert the correct value based on which combination of BTI and PAC are enabled. Reviewed by: markj (earlier version), emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42225 --- sys/arm64/include/asm.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sys/arm64/include/asm.h b/sys/arm64/include/asm.h index 6ebfca6eaf0c..da3c3df5f647 100644 --- a/sys/arm64/include/asm.h +++ b/sys/arm64/include/asm.h @@ -142,6 +142,58 @@ #define BTI_J #endif +/* + * GNU_PROPERTY_AARCH64_FEATURE_1_NOTE can be used to insert a note that + * the current assembly file is built with Pointer Authentication (PAC) or + * Branch Target Identification support (BTI). As the linker requires all + * object files in an executable or library to have the GNU property + * note to emit it in the created elf file we need to add a note to all + * assembly files that support BTI so the kernel and dynamic linker can + * mark memory used by the file as guarded. + * + * The GNU_PROPERTY_AARCH64_FEATURE_1_VAL macro encodes the combination + * of PAC and BTI that have been enabled. It can be used as follows: + * GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL); + * + * To use this you need to include for + * GNU_PROPERTY_AARCH64_FEATURE_1_* + */ +#if defined(__ARM_FEATURE_BTI_DEFAULT) +#if defined(__ARM_FEATURE_PAC_DEFAULT) +/* BTI, PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL \ + (GNU_PROPERTY_AARCH64_FEATURE_1_BTI | GNU_PROPERTY_AARCH64_FEATURE_1_PAC) +#else +/* BTI, no PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL \ + (GNU_PROPERTY_AARCH64_FEATURE_1_BTI) +#endif +#elif defined(__ARM_FEATURE_PAC_DEFAULT) +/* No BTI, PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL \ + (GNU_PROPERTY_AARCH64_FEATURE_1_PAC) +#else +/* No BTI, no PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL 0 +#endif + +#if defined(__ARM_FEATURE_BTI_DEFAULT) || defined(__ARM_FEATURE_PAC_DEFAULT) +#define GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(x) \ + .section .note.gnu.property, "a"; \ + .balign 8; \ + .4byte 0x4; /* sizeof(vendor) */ \ + .4byte 0x10; /* sizeof(note data) */ \ + .4byte (NT_GNU_PROPERTY_TYPE_0); \ + .asciz "GNU"; /* vendor */ \ + /* note data: */ \ + .4byte (GNU_PROPERTY_AARCH64_FEATURE_1_AND); \ + .4byte 0x4; /* sizeof(property) */ \ + .4byte (x); /* property */ \ + .4byte 0 +#else +#define GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(x) +#endif + #endif /* _MACHINE_ASM_H_ */ #endif /* !__arm__ */ From nobody Fri Oct 20 16:04:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBqD73Bhbz4xxMC; Fri, 20 Oct 2023 16:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBqD72mGZz3Jdn; Fri, 20 Oct 2023 16:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1fP8TQTR4hy4eKDw2fBlr38jIN+7sy7q8Ryj1g0ZSA=; b=IvZyHmuIMBEGfouO8Zcgr1iPRAFXCmCT1nYGIp08o8S5rxStAzB+dMlWXUhyHzKXjs0XG4 pX4uvv+leQzRB0xJ53aSI1N83hJEZ7iJI1Gf/op3lPwrl4fz/ZEyW96s8HqhdyfenEZ5X0 /K3bbbmo8eNca8gANrOhvboxbaoYo9egWhT7BE4XW/4HfLnzWNB/+Vf0KWYHXrm/AiDby+ mupSv2bzYpX69nDmst4teB7H8aDbqEadpjgzlOyg/LqmDIaTu3uYVrzFiyWcHFc89br741 /wT0n7r5ZLLNnEzj4MX2Ra1xEJk47EHyO+PLjWu0M4NVTJQiNZdqd5QvaYPVJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817895; a=rsa-sha256; cv=none; b=PrZgARVLkPdm0E4HigF/5MaHwjoGZwvNes+NDAkDWVOirNKGeCuGoNGRNG2nBun2zv0JTL zkzwomC8uMirig66y14UKO5JA8yraPiMiboL1Kzma/h+GCYwXPeK1kYLQpxrV/Y1fqcbov HVZkflLbPArbbkrVdLmsTc83W8fVODeWVzOs/95E6TClnrgUbJZsx8U64QAaozI4poUSLB Lxi24SXcfR+Zte6RR+DTmTezRrjz50OnJy9wmmtenrC96OuiN/o4KwVPVi+WRR+OnieR0i k+c/zvtsAQ6tz+IN50IKjSj3Fo9AkXFL0fKk25Y89OisR0MwdaP6KFbE/yQDOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1fP8TQTR4hy4eKDw2fBlr38jIN+7sy7q8Ryj1g0ZSA=; b=KJOwrrbUquP6dOv54apAF+FgYpYXnGhC9BrFnMX18OnYjletrmvFRUi03P+lk/x+vCLb8V mq4AGWwC5EHd+S7SVQ8y/m1uTfGcggTxeHRnhogZsC7qoULu27G2qKZTAtVK5BF5ykcSUP YR1UTh9c5F0qup4XWNpwrtbOBhBOf3G6gLF75WHMPyoBWWS5g9Mc8meAMVd/pq/OZJwWCH hKlqsFz7SSp1JQ9Cgo9qPi4lp5x1Q66VSrtOhqcdUdPbbJkZYFI52NHJ7tKjO4vMYYMwOt 3wwY/HrX1sZcaumDoXaZ93t6HwNDLN2lojpTe/tFVGQdZeU5j8gWraYlJnl/Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBqD71q3CzfN2; Fri, 20 Oct 2023 16:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KG4tbx039411; Fri, 20 Oct 2023 16:04:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KG4tfJ039408; Fri, 20 Oct 2023 16:04:55 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:04:55 GMT Message-Id: <202310201604.39KG4tfJ039408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2b39a6f68c38 - main - arm64: Add PAC instruction macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2b39a6f68c3839454cd255b91978202cd995182a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b39a6f68c3839454cd255b91978202cd995182a commit 2b39a6f68c3839454cd255b91978202cd995182a Author: Andrew Turner AuthorDate: 2023-10-12 09:48:38 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 16:01:05 +0000 arm64: Add PAC instruction macros To support Pointer Authentication (PAC) in assembly files add a pair of macros that sign the link register. When used before storing to the stack it will allow hardware to detect if it has changed before using it in the return instruction. Reviewed by: markj, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42226 --- sys/arm64/include/asm.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/arm64/include/asm.h b/sys/arm64/include/asm.h index da3c3df5f647..16be39b3eae4 100644 --- a/sys/arm64/include/asm.h +++ b/sys/arm64/include/asm.h @@ -142,6 +142,28 @@ #define BTI_J #endif +/* + * To help protect against ROP attacks we can use Pointer Authentication + * to sign the return address before pushing it to the stack. + * + * PAC_LR_SIGN can be used at the start of a function to sign the link + * register with the stack pointer as the modifier. As this is in the hint + * space it is safe to use on CPUs that don't implement pointer + * authentication. It can be used in place of the BTI_C instruction above as + * a valid BTI landing pad instruction. + * + * PAC_LR_AUTH is used to authenticate the link register using the stack + * pointer as the modifier. It should be used in any function that uses + * PAC_LR_SIGN. The stack pointer must be identical in each case. + */ +#ifdef __ARM_FEATURE_PAC_DEFAULT +#define PAC_LR_SIGN hint #25 /* paciasp */ +#define PAC_LR_AUTH hint #29 /* autiasp */ +#else +#define PAC_LR_SIGN +#define PAC_LR_AUTH +#endif + /* * GNU_PROPERTY_AARCH64_FEATURE_1_NOTE can be used to insert a note that * the current assembly file is built with Pointer Authentication (PAC) or From nobody Fri Oct 20 16:35:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBqvH3N2Lz4xyVj; Fri, 20 Oct 2023 16:35:23 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBqvG5fDNz3Ptq; Fri, 20 Oct 2023 16:35:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.208.179 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=none Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2b95d5ee18dso16900351fa.1; Fri, 20 Oct 2023 09:35:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697819720; x=1698424520; 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=9ayR/ZQvmG95zbyTMcG9eNZgf6fICuNTKGNX17z9wA8=; b=lBAv4BU6ZKFm4JR4n479EufOmibDGckAVvIiyqR2OFtVbXGdOXanvI/sF+qiW74TQ1 eDpyEtEIJ8xH8u+8b0PWS1G+bl0bR+OD/MYvQhJGaqtgSwZTmYxHklIXPUBoR8D75PWs W299EsdSEacYDWEnhq9EsQ4z/eIHWHfDqHeVv4lOaOHytf2xj5lkGSueHXHWxu/6/UFZ EB74zdONpvkRWz2S77cD3xcuoP1ea89XofNd7wSjuvfYilyxe56JiDLiJLPWUELpXa39 lZfOgwAg6C8EN9mdjjxQm1jRF9OTVl/133uL3Knhi1KoQ3jlqvxlCX77cqNQM4gQCwiW 1rbQ== X-Gm-Message-State: AOJu0Ywf7u3nJ6NJ/3849MqTZwwx8H1zwzq/bDUrMMMa04pcWD79OwCW 109Ljsu/RpI2EhJCqOQepqwfmnA3ncGpR6oP4ElQRrBL X-Google-Smtp-Source: AGHT+IESEbWLyTn7YsMt1AvNA9R1SMv8ADs58W1lg81rHA/6JrWK65oy2qAVVcz6sYYdnjCZoy4qYbDfMQKn7O4O2Qo= X-Received: by 2002:a05:6512:3053:b0:507:b0a1:6088 with SMTP id b19-20020a056512305300b00507b0a16088mr1939296lfb.46.1697819719752; Fri, 20 Oct 2023 09:35:19 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202310171337.39HDb4Xp095686@gitrepo.freebsd.org> In-Reply-To: <202310171337.39HDb4Xp095686@gitrepo.freebsd.org> From: Ed Maste Date: Fri, 20 Oct 2023 12:35:08 -0400 Message-ID: Subject: Re: git: b6c653c97463 - main - kmsan: Set -fno-sanitize-memory-param-retval for now To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: - X-Spamd-Result: default: False [-1.36 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.64)[0.639]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.179:from]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.179:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com] X-Rspamd-Queue-Id: 4SBqvG5fDNz3Ptq On Tue, 17 Oct 2023 at 09:37, Mark Johnston wrote: > > commit b6c653c9746342b373af01979319b3cb123b2872 > Author: Mark Johnston > AuthorDate: 2023-10-16 19:45:42 +0000 > Commit: Mark Johnston > CommitDate: 2023-10-17 13:05:45 +0000 > > kmsan: Set -fno-sanitize-memory-param-retval for now > > As of LLVM 16, -fsanitize-memory-param-retval is the default. It yields > significantly smaller code, but the KMSAN runtime interceptors need to > be updated to stop checking shadow state of parameters. Apply a minimal > workaround for now. What could we do to be more proactive in finding this kind of issue? Is it just a consequence of our (current lack of) LLVM FreeBSD CI/testing infrastructure? From nobody Fri Oct 20 17:47:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBsVV587Dz4y2wJ; Fri, 20 Oct 2023 17:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBsVV4YZ4z3WK8; Fri, 20 Oct 2023 17:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esuWqVlDqXfVPs9HwjyM/malky9TCcP9vbgvOd8e9zg=; b=GGcmw8h5BYdS6pKOLoXpaFrvBFnh4gVeqFfT/WpDJ/tWMCaF6JU0473EiJy4UW2zKNHQe7 AXARC+K+6ldnpfo2Tpl1gwhbYrU5dElOgrrIRgWujMYaGOMavRvYar7o9H7vk7SUAgjRiG 9pDb9McZaYGlcEg4Rkv7xP2XlMZwx/60+ZZ0WcpyMOAYCRPUms3tWw+jA9AfIrjfXCs4nP 6iSqzbriawXGYf6RZeGY6W8J9MnHQv0bB9wxwj4yaPP1RRsCnxb5pqNvb2pJRN7+ANEj2F djWhz0dYtFMZ+5O8E1N6kn8FvipAiweXSSL0mPCgJQw1fSlVqeCdHzX+cKPZ1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697824050; a=rsa-sha256; cv=none; b=D55De5DTqbjA7vvVysLvotSpBLE8TyWQPhRjAZfsQi4SQhf+5cLu1Eiww7zYt94S5C2sdD ha5CMRkq+OSj7SC/xnvsbg38YHUIKo5pJ/1xwuXzQMIaETCR9saBU7XYvNx9Yr3J8ENOcn 9vI45S7rnQTQS2O3cD9TWLYbyZ2hD05HddB9Z7dB1YwVN8OShDqySaoZqXqX+SphdwJwTe IfsFzoz+xOxgT0cgX9nehFVwrfTgcz5OFCu4AgT/j7LX+o3T7usaWWwsPLg76NqBhRK9Ht UlE03QfwQiBIDz1HedAk6ComBvHgYn7KchjqDCNGSyLgk99whIRrcC2q/E/8kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esuWqVlDqXfVPs9HwjyM/malky9TCcP9vbgvOd8e9zg=; b=hA9NdyOEeDqiGv/ZqoqaKw30kfYxvGyFDCgjDQSDw0Xf1KmWQI+Qo/amKQ3g/OQPXuWsjK xD0+Kzmle4NpV5VtAp6c9OY+nsip9NFzuOqHNqHPo+pIvDLDk8KpnXqrkenjNvOkQcuO4S kMCvLV0iaIcYuSSXenkeL9ZZHw9xQMCk8AqIeZNnk3/M5EtP+vv0exMMGyMCfmkPXLFsKx tf5zTdHJIQyMILvjBFLDg5gJFFMNCW+OPHyF0WixlNHJ78g6DmYuEnVqK7YlC2dNWE4XPf JJeWx3fenioq/DjHX+M/H08svPcJtRnWZBIT79r4IK/HbLfOMbNzsU3EX5M2Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBsVV3c4tzjG4; Fri, 20 Oct 2023 17:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KHlUnK005436; Fri, 20 Oct 2023 17:47:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KHlUgB005433; Fri, 20 Oct 2023 17:47:30 GMT (envelope-from git) Date: Fri, 20 Oct 2023 17:47:30 GMT Message-Id: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6120673f7566c35023921540d2d682572d1bf1ce Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6120673f7566c35023921540d2d682572d1bf1ce commit 6120673f7566c35023921540d2d682572d1bf1ce Author: Gleb Smirnoff AuthorDate: 2023-10-20 17:47:08 +0000 Commit: Gleb Smirnoff CommitDate: 2023-10-20 17:47:08 +0000 tests: fix ATF_TESTS_PYTEST no clean build The hack with .xtmp file was effectively making the make to ignore changes to the sources, breaking NO_CLEAN builds. The hack can be actually omitted as setting SCRIPTSNAME_${_T} for every test is sufficient to prevent renaming by bsd.prog.mk. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D42283 --- share/mk/atf.test.mk | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk index 4b8ac8dedc27..bbc76b7fd97f 100644 --- a/share/mk/atf.test.mk +++ b/share/mk/atf.test.mk @@ -111,39 +111,19 @@ ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}} .endif .if !empty(ATF_TESTS_PYTEST) -# bsd.prog.mk SCRIPTS interface removes file extension unless -# SCRIPTSNAME is set, which is not possible to do here. -# Workaround this by appending another extension (.xtmp) to the -# file name. Use separate loop to avoid dealing with explicitly -# stating expansion for each and every variable. -# -# ATF_TESTS_PYTEST -> contains list of files as is (test_something.py ..) -# _ATF_TESTS_PYTEST -> (test_something.py.xtmp ..) -# -# Former array is iterated to construct Kyuafile, where original file -# names need to be written. -# Latter array is iterated to enable bsd.prog.mk scripts framework - -# namely, installing scripts without .xtmp prefix. Note: this allows to -# not bother about the fact that make target needs to be different from -# the source file. -_TESTS+= ${ATF_TESTS_PYTEST} -_ATF_TESTS_PYTEST= +SCRIPTS+= ${ATF_TESTS_PYTEST} .for _T in ${ATF_TESTS_PYTEST} -_ATF_TESTS_PYTEST += ${_T}.xtmp +SCRIPTSDIR_${_T}= ${TESTSDIR} +SCRIPTSNAME_${_T}= ${_T} TEST_INTERFACE.${_T}= atf TEST_METADATA.${_T}+= required_programs="pytest" -.endfor - -SCRIPTS+= ${_ATF_TESTS_PYTEST} -.for _T in ${_ATF_TESTS_PYTEST} -SCRIPTSDIR_${_T}= ${TESTSDIR} CLEANFILES+= ${_T} ${_T}.tmp # TODO(jmmv): It seems to me that this SED and SRC functionality should # exist in bsd.prog.mk along the support for SCRIPTS. Move it there if # this proves to be useful within the tests. ATF_TESTS_PYTEST_SED_${_T}?= # empty -ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T:S,.xtmp$,,} -${_T}: +ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T} +${_T}: ${.CURDIR}/${_T} echo "#! /usr/libexec/atf_pytest_wrapper -P ${TESTSBASE}" > ${.TARGET}.tmp .if empty(ATF_TESTS_PYTEST_SED_${_T}) cat ${ATF_TESTS_PYTEST_SRC_${_T}} >>${.TARGET}.tmp From nobody Fri Oct 20 18:36:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBtZp0K0Jz4y5Y5; Fri, 20 Oct 2023 18:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBtZn6y9gz3c4p; Fri, 20 Oct 2023 18:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697826978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kY6Hu4U1UomBJ5AVTu9LFWtxEm2LLANMCeV+23VCkC4=; b=AS68VOn9y/3aPBT+tj5uJBDqGnI1tMp/hG/9YcAl188OAKr0FxKpW7F/rHSoMGMu0l5YVm ipfBa/ZFefmeP1KO5hSa5UkwzJW6znn7ppUUcu94EHIOOj1UHTFJV9jTSiXP7bcR5XJkDO 1LMyjZxwajy1ul/wLXknj40LKP35tVUCjyGRupw7bc202yHVRA7A5YqhDgEak3ST+pF1jr 0EocNqvvIGh0KeLD0tLJ357Bqc4ic5hmwOZwB98mbt+wzOObeW6vG86n+r3SAnaf/qRPU9 wwwCACmCV92jllYFyxs0YU9OzUdKQgaPFKao3BhoziPJJGsVHy1qphxdOEd8jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697826978; a=rsa-sha256; cv=none; b=I70337lnWzvkZtZQDW1q/FH1ZGFDdnojdHeBGUOn3Kx6BKb9Lu2i+ytqIhcTCrmpFcLFDg BJWjdzanbWnFvHsGbKkbMXaD0yxU+5TuyPacpEgUJB//icRzWkhC3bAFgvGztU9du3hgH0 y9reqSrIEltb9Dga7ufAQbQeUpemXOqjDf1hRPqJE7gdq694Kw6HPIrQvCawjcvBzAJkIX rl1z6RhDDa/AgqrZ/01/8SwwSmUxQyjUUwrYrmk1D8WQy5AgBi9aH4okSXt/FAufVY4MeS WXVvsya0HbxkX4arRZLamqkh0ocbxuZLk5QynL1SyhJl4cbiYDVzZLn0sLGgGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697826978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kY6Hu4U1UomBJ5AVTu9LFWtxEm2LLANMCeV+23VCkC4=; b=d33cipi8jspwFGF+qrXiBz5NvvqvxuOuinOKZBKH0/TErpvgwg7rnrgnhaw1FGIPbrEEKR f/HKxms9aVBytpfg6MDbMYG9SwZ7ml+OZnWSnANUqd6Wm801BmICxJTz63zcDBr+E2FPPi XjmgR3jL/tOeyYsKsKVYs1wOtuI8NaLTlxyphRwCtLEr1LST7JW1HyItKsV+lhNWO19lmB owvl43s7FuKuuY9AZ9ikfL4xLKN0xGhvgkFdLS+rJk3PjGLQpSHtu4A4KYpN0FhHevkrtm MZTLhVCseDbj0OU1leoc6/NYEAcWfnnE19g1pGps1WEzMfTkPyY6vkzdKtkm9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBtZn63YJzkg3; Fri, 20 Oct 2023 18:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KIaHpq089247; Fri, 20 Oct 2023 18:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KIaHDN089244; Fri, 20 Oct 2023 18:36:17 GMT (envelope-from git) Date: Fri, 20 Oct 2023 18:36:17 GMT Message-Id: <202310201836.39KIaHDN089244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f7c4f4964971 - main - ObsoleteFiles.inc: Remove old mixer(8) tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f7c4f49649717000238184a975b2339bcd8c06d9 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c4f49649717000238184a975b2339bcd8c06d9 commit f7c4f49649717000238184a975b2339bcd8c06d9 Author: John Baldwin AuthorDate: 2023-10-20 18:33:11 +0000 Commit: John Baldwin CommitDate: 2023-10-20 18:36:04 +0000 ObsoleteFiles.inc: Remove old mixer(8) tests These were removed when the new mixer(3) library was imported. PR: 274602 Fixes: 903873ce1560 Implement and use new mixer(3) library for FreeBSD. --- ObsoleteFiles.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 749b6dfd7ca0..f08785ac77da 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -2779,6 +2779,11 @@ OLD_FILES+=usr/share/man/man4/ng_h4.4.gz # 20210923: rename boot(9) to kern_reboot(9) OLD_FILES+=usr/share/man/man9/boot.9.gz +# 20210922: Old mixer(8) tests removed +OLD_FILES+=usr/tests/usr.sbin/mixer/Kyuafile +OLD_FILES+=usr/tests/usr.sbin/mixer/mixer_test +OLD_DIRS+=usr/tests/usr.sbin/mixer + # 20210921: remove cloudabi OLD_FILES+=usr/share/man/man4/cloudabi.4.gz OLD_FILES+=usr/share/man/man4/cloudabi32.4.gz From nobody Fri Oct 20 19:52:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBwGh16XNz4y8sM; Fri, 20 Oct 2023 19:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBwGh0dZzz4MpV; Fri, 20 Oct 2023 19:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC9asVcDpxKUYJ84utvzUpLxT+Gd4s0f8YBwHncgYbs=; b=Bd0e+MXWNzNrCWlwnWiyznQeZNfJMTp1gw9W2fS1DxPCLhIu7CZU0MjL2Uo4J+oJCLPxOq 6H4VgF2thn9hFcTpgiNR4J7/4f1VhUmkaTxvlRfq3C2X/390XD6lXnY5Y9NvsPPluWiY1v qv0XVWGzANKa5BYxv6ltbTcQx42uezrwVgnQXYzyJuoWIhDaE44CPcqGB9SNas7/mQwlJ+ GBsnKDJs+2KwkdwfW/G3rGKkWp6FKMAb0qa7Qtdb8EoNw6F+TEe8HD5oD78VhiKsTq+F7/ yYH8579GXlYkaTMH7Lx64mwA5VRrWv5PL7nHXmKNw5X0JNskcVamz1BUnr1XzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697831548; a=rsa-sha256; cv=none; b=H3Xn6ewl9Y02O/rXb5YJ7YM6j64OO5xSObauNC/P/3h8ETGa1s/WFyL/LPr3fORebEG/4n 9eU1n/qC7DPW//UiZ43QaM2ZcfXPoRZUCGk+EaN0QLNzfCJKpgRdEtAJ87rvYjkvbsRwOb zTvH0nN2VuyXGbWG/uE9WToakpL4fLJ67oLU83D84i1jySxOTSJjnDrRH+yxkNGqRhkkHx xhxzQ/dZOpEDcBTAqeMhtqPC2nr1/v/nN7QXAW63Dc2nQ9j/70OOXkR7PlFavmxFLaiWj2 F2jKGlP0iSpnMpwIk/GL6eW7WddHcwC4uDCuOUsLLHOo7DvHlLGxcL6Cg6PxPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC9asVcDpxKUYJ84utvzUpLxT+Gd4s0f8YBwHncgYbs=; b=sbe09rA9LZGGs5KSKA4G2cr+xRPhemodwykYp00tYnHiymVywqlsF5eUM0LkHXNWahFXJz z2iQIbo/lHt1cwBbg0XMpSLl5Ld4Nc/ZRIFEp+CUOCTOhiTCPlmFuA3tRe3GqbLLxl1NBj CVPginnbCgJ6oaRxP3v78vvR+qmTrFzLY4kRpyTno8ouTNSOhqdgpgDU0unBGhxQn6/1+t T0otJbsjMHWHSVe3yMKH6nQMrLViSH+N7xpJf93SM/DuLToUfig+HBOGxQ+hFMvWyQjw1i 3hbmQVZUxU0SPh8uIIqpuYNQJ6bz2/+LkQp5bUUsE8VK0rz1KSXQVQ+E1lMNew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBwGg6qJrzm6g; Fri, 20 Oct 2023 19:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KJqRoN021433; Fri, 20 Oct 2023 19:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KJqRat021430; Fri, 20 Oct 2023 19:52:27 GMT (envelope-from git) Date: Fri, 20 Oct 2023 19:52:27 GMT Message-Id: <202310201952.39KJqRat021430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: def6ee77dbc2 - main - certctl.8: document LOCALBASE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: def6ee77dbc2ab7d4314002f01367e84e69b0a23 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=def6ee77dbc2ab7d4314002f01367e84e69b0a23 commit def6ee77dbc2ab7d4314002f01367e84e69b0a23 Author: Brooks Davis AuthorDate: 2023-10-16 22:35:34 +0000 Commit: Brooks Davis CommitDate: 2023-10-20 19:52:10 +0000 certctl.8: document LOCALBASE Document the LOCALBASE variable and that it's set to user.localbase by default. Update path defaults that depend on it. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D40529 --- usr.sbin/certctl/certctl.8 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 4ce61916d79a..286072c1b4d6 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 13, 2022 +.Dd October 10, 2023 .Dt CERTCTL 8 .Os .Sh NAME @@ -98,18 +98,22 @@ Remove the specified file from the untrusted list. Alternate destination directory to operate on. .It Ev DISTBASE Additional path component to include when operating on certificate directories. +.It Ev LOCALBASE +Location for local programs. +Defaults to the value of the user.localbase sysctl which is usually +.Pa /usr/local . .It Ev TRUSTPATH List of paths to search for trusted certificates. Default: .Pa /usr/share/certs/trusted .Pa /usr/local/share/certs -.Pa /usr/local/etc/ssl/certs +.Pa /etc/ssl/certs .It Ev UNTRUSTPATH List of paths to search for untrusted certificates. Default: .Pa /usr/share/certs/untrusted -.Pa /usr/local/etc/ssl/untrusted -.Pa /usr/local/etc/ssl/blacklisted +.Pa /etc/ssl/untrusted +.Pa /etc/ssl/blacklisted .It Ev CERTDESTDIR Destination directory for symbolic links to trusted certificates. Default: From nobody Fri Oct 20 19:52:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBwGj24qbz4y90K; Fri, 20 Oct 2023 19:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBwGj1Z37z4Mq4; Fri, 20 Oct 2023 19:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X2JPns9YDUMyf1A0pghCsXOh79asuPf8h8UG/vjYUaw=; b=WTTamQsX3MgLOraWwXS2skiba/2cglztzvxVameGY1bawg7WbBMacK/hEHlTxo/xEb2CFo uuR0E3YQmT4STHgb+DC+ARU9GCPv3IyRuYCBIogF4hPnSdPIJFd9KxphJ9t/03wjVjvPJy eCHKqhN0fTQ8EOiHYMXW0bYPiZwvKggfQg73D55ESfcIobK9IzBj4l1wD+DJ2hhixqaGdE iVzsCux+OyTurkVs2LQZwJg/Yih/I5Mg7gQlDo99nPqMRpprkL4FprMCWQq6sqN2TW7Zrb AG1mLE1B3ES/R9ADTypTef33NvH/tEcqKqy8NXI550b0xDQTVVGzsJLs2KcMAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697831549; a=rsa-sha256; cv=none; b=Y2irR+Xm+t53Vm7g+2fEtWdbAj6hETcbCJ4Py7Y2kSXO5pA+3soHoyMXBVElVFRAOB2RMi RiVkWtg8tr414qAJteC24c7UkGN1lkqZM2XmXPbaJ3yr8XaiBIvTGyz+wBrMX+w1OxjFlu e26JJazoL3jaq51tAiszgeqaAONzhd/gkgBue128jQ9MYeSHurJ3vZvrp24VnqTldtakQx 2aIymjt7LcSQqFjK5pMTVHB2MG/LENkfUT48uw3dw+BqqgzsDbN5a53CWmIp8xAE6fe/g1 7dTfrRMiXwGfgHqojgGcSAni2suMz3KoTzq30QadDZcNhoVOT09rLV1MAs4krg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X2JPns9YDUMyf1A0pghCsXOh79asuPf8h8UG/vjYUaw=; b=CZz9jZC6Sr0xLquD5tVQrNguD5FUdXnnSdcW3p/Qbbn9yDZQ/AuFLvi6qE28LbzcZAfvv+ jyjxAbYsNM5Hog3T7Dr+Ccx7ayKXj/uFH/9wCvWB9MC1Uz3ZBvCnAWRuFLItRrl38wFxsv e1Bi5QdGMagemsnWqRGQQGUhFSVVQoIPWtF7JXNHGExBW7Yw4qpWMhJMhoAOll9CymIrAG K1d3y+Hm7MPQrpgBHgerhw+mBef4Ru/WKJu8FmzLM6MVP2Gfa4wn5wvFR2G25J04bJIEP6 NDqv3u6erAGSL32WJJ4s7EIWrOdPfuzkxI8+EEjzdTRBfCLTkH6QMVGDHMK66g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBwGj0gbCzmGW; Fri, 20 Oct 2023 19:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KJqTdQ021475; Fri, 20 Oct 2023 19:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KJqSdD021472; Fri, 20 Oct 2023 19:52:28 GMT (envelope-from git) Date: Fri, 20 Oct 2023 19:52:28 GMT Message-Id: <202310201952.39KJqSdD021472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0e0c4f58370f - main - certctl: invoke with LOCALBASE set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e0c4f58370f25cdd824df06f38865b0d455a183 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0c4f58370f25cdd824df06f38865b0d455a183 commit 0e0c4f58370f25cdd824df06f38865b0d455a183 Author: Brooks Davis AuthorDate: 2023-10-16 22:35:40 +0000 Commit: Brooks Davis CommitDate: 2023-10-20 19:52:10 +0000 certctl: invoke with LOCALBASE set When invoking certctl as part of installworld, set LOCALBASE in the environment to match the build environment. That ensures that LOCABASE is non-empty on systems without the user.localbase sysctl and avoids allowing a system configuration detail to leak into the build. Users who wish to build targeting a non-standard LOCALBASE should ensure it is set in src.conf or similar. Reviewed by: Mina Galić Differential Revision: https://reviews.freebsd.org/D40530 --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 68549d91598d..512c4049fd76 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1489,6 +1489,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .if !make(packageworld) && ${MK_CAROOT} != "no" @if which openssl>/dev/null; then \ PATH=${TMPPATH:Q}:${PATH:Q} \ + LOCALBASE=${LOCALBASE:Q} \ sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash; \ else \ echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \ From nobody Fri Oct 20 21:54:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SByzc6612z4yGqm; Fri, 20 Oct 2023 21:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SByzc5ZZyz4fqf; Fri, 20 Oct 2023 21:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGC5y9zfhwNi7MRhdo+ybKn5rgfu9XaeYX5A3VBSDo0=; b=Na3Hf36O6K8AwzlX/WI2yipt/OkYPHjGfaulZpnk2gUeLU1PHvDgcjkWCYoCKfc22znDTT T2ukgUCPovbvSFmmjV4Ouzsbh+FsbInpkm3QsCMbvrxaN32G2yXoPm08PPMR1CfMnZFD+1 OW2d/ChDfL45s+2kDJpQPdK64LjOmak+cpy1Ff/RvBSFe2iXaqsJRrn+5FUi/q8+o93+85 3s4wgMIZRFIEUfrM/UUZPd8YyoAquUYRNUEUH9LHB9QFOa5ZW9H+g4acc5QiQv9kJkSsUJ 3XkpdFYhGDJYN0DFT+gTpFg8IpX3VJRrFD3gNR90RHAVHJuIR6ZwFLk8vpdu/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697838876; a=rsa-sha256; cv=none; b=kPPhmTiQS+hwUzA1KaS0HNc0BYvxYAALK/4ccFUmRTi1M7hBNlL0lh1TpnKQRgPJMVrZVg rYLps67h5mS3ZbbWLGY3Y2tuOrrOf+VZ0KWKBY3X7ywoQZGQLkI6qtN3++UbwLFzaYKfiG ZHCcjbbZmXm3d58OL9V0xcdu4+lEROtPEOXKCxjNVmrH7xprnTpGJ2Q7uSfakTK1+YCX/T SUkvdh/6UkdgSEq6xVZ5n6ClSmvdaZ/OTZWoK6XzaReS4AhWX6v8/7PB/TnoHftcmxeixo 4QcfL30vA12fxvsEZtAUn3hY319Yt+qVLdHpzf+f57H4kdsjAzp6T80rsONKEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGC5y9zfhwNi7MRhdo+ybKn5rgfu9XaeYX5A3VBSDo0=; b=rSQsYZpP0PLiWFzl43Gc72BLPskvLlpLtIkKEdukZ+gJ/8iYRdhz+JvZzHFzk+1Vh6+Fky dCINOXp2vlLsHdWb4q2nMbx4FUvPpaM1SDb10EVvAMwNW96IemgAXesFVq7qLurmaY7jhN gCAc08SAjaj+HpUF8bS8aqr8ZowGUSML5faQnSpoenGNoeGwjyj5upPQ+wWcyGHPTenz8w 8MwU+rp/ZWUCEhUz7VSVsTHJLmIs8+/Fs70t+CsxEZUpsJX5G69dvM5cALHYZomuaHxfpk u144OTQ9elXETx862mCVBoN0XqS+UGXAjKkNY2Rhpe5OQjrUtmbWHPsKbC/Z2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SByzc4LNHzpdV; Fri, 20 Oct 2023 21:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KLsaJF022067; Fri, 20 Oct 2023 21:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KLsaeA022064; Fri, 20 Oct 2023 21:54:36 GMT (envelope-from git) Date: Fri, 20 Oct 2023 21:54:36 GMT Message-Id: <202310202154.39KLsaeA022064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2d4924892144 - main - x86 msi: Enable/disable IDT vectors for MSI groups all at once List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2d4924892144f653a7a7afba27ed1bf536dd7e51 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2d4924892144f653a7a7afba27ed1bf536dd7e51 commit 2d4924892144f653a7a7afba27ed1bf536dd7e51 Author: John Baldwin AuthorDate: 2023-10-20 21:52:38 +0000 Commit: John Baldwin CommitDate: 2023-10-20 21:52:38 +0000 x86 msi: Enable/disable IDT vectors for MSI groups all at once Unlike MSI-X, when a device uses multiple MSI interrupts, the entire group of interrupts are enabled/disabled at once in the relevant PCI config register. Currently, the interrupt code enables the IDT vector for each MSI interrupt when a handler is first registered. If the PCI device triggers an MSI interrupt which doesn't yet have a handler, this can trigger a panic when the Xrsvd ISR executes rather than treating it as a stray device interrupt. To fix, enable all the IDT vectors for an MSI group when the first interrupt handler is configured, and don't disable the IDT vectors until the last interrupt handler for the group is torn down. When migrating an MSI group between CPUs, enable/disable the entire group of IDT vectors if at least one interrupt handler is configured for the group. Reported by: jhay Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42232 --- sys/x86/x86/msi.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 7f4d87c09453..246645efbc10 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -120,6 +120,7 @@ struct msi_intsrc { u_int msi_cpu; /* Local APIC ID. (g) */ u_int msi_count:8; /* Messages in this group. (g) */ u_int msi_maxcount:8; /* Alignment for this group. (g) */ + u_int msi_enabled:8; /* Enabled messages in this group. (g) */ u_int *msi_irqs; /* Group's IRQ list. (g) */ u_int msi_remap_cookie; }; @@ -204,7 +205,12 @@ msi_enable_intr(struct intsrc *isrc) { struct msi_intsrc *msi = (struct msi_intsrc *)isrc; - apic_enable_vector(msi->msi_cpu, msi->msi_vector); + msi = msi->msi_first; + if (msi->msi_enabled == 0) { + for (u_int i = 0; i < msi->msi_count; i++) + apic_enable_vector(msi->msi_cpu, msi->msi_vector + i); + } + msi->msi_enabled++; } static void @@ -212,7 +218,12 @@ msi_disable_intr(struct intsrc *isrc) { struct msi_intsrc *msi = (struct msi_intsrc *)isrc; - apic_disable_vector(msi->msi_cpu, msi->msi_vector); + msi = msi->msi_first; + msi->msi_enabled--; + if (msi->msi_enabled == 0) { + for (u_int i = 0; i < msi->msi_count; i++) + apic_disable_vector(msi->msi_cpu, msi->msi_vector + i); + } } static int @@ -277,11 +288,8 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) /* Must be set before BUS_REMAP_INTR as it may call back into MSI. */ msi->msi_cpu = apic_id; msi->msi_vector = vector; - if (msi->msi_intsrc.is_handlers > 0) - apic_enable_vector(msi->msi_cpu, msi->msi_vector); - for (i = 1; i < msi->msi_count; i++) { - sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); - if (sib->msi_intsrc.is_handlers > 0) + if (msi->msi_enabled > 0) { + for (i = 0; i < msi->msi_count; i++) apic_enable_vector(apic_id, vector + i); } error = BUS_REMAP_INTR(device_get_parent(msi->msi_dev), msi->msi_dev, @@ -317,15 +325,13 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) * to prevent races where we could miss an interrupt. If BUS_REMAP_INTR * failed then we disable and free the new, unused vector(s). */ - if (msi->msi_intsrc.is_handlers > 0) - apic_disable_vector(old_id, old_vector); - apic_free_vector(old_id, old_vector, msi->msi_irq); - for (i = 1; i < msi->msi_count; i++) { - sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); - if (sib->msi_intsrc.is_handlers > 0) + if (msi->msi_enabled > 0) { + for (i = 0; i < msi->msi_count; i++) apic_disable_vector(old_id, old_vector + i); - apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); } + apic_free_vector(old_id, old_vector, msi->msi_irq); + for (i = 1; i < msi->msi_count; i++) + apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); return (error); } From nobody Fri Oct 20 21:54:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SByzf0GSYz4yGx0; Fri, 20 Oct 2023 21:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SByzd6VDZz4g4Z; Fri, 20 Oct 2023 21:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddZfvzM7q3/TZhKHPPyMz33QHfqWZ4i2lPdg1CjwQf4=; b=K9wI6ZNj3lOde8WP6SoPi2FbtUXMf5MDN3fGmctMxoYK4dCXf8JWUdur1Eiaw3Ufs9yFWS XzAjNHBhd9LGznharnE/Ai0vqcY8IJJY4ocEKgKwU0REz0OuXQcPE8/S5MY4Yd815+ZabS VOcwHlvx9Mfep/MIh1CEXOCrS7HU1VpQuTRZ9jsOe2LWJl2J+bZ7R5/OH0BqpzosZA78+w Z3/opiSRM4McphMF9pormqk3MAegLnusKe4jbXrZVdv8/cPe7ZhmbYPtK3WsQEuuK5lqzY maAcL/U0oCmoe1YdrvgmU6YDhwrU4u2cGrpuboBxYMvDCT/lFCdfk+p56MKKTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697838877; a=rsa-sha256; cv=none; b=RF+y6ks5Szf9nUKiZSCbq1p99lJFSsPBc1Ns/O/BnEoVFON1xRiNxH/E1f02yYelFSAiPS n928s+YOufP0yIWnXLA7jgvMYsQnH0csxhKU2NbR0g/FHcPYrL9oWnxVuKR5GFaT66aIsR gqc7gXrJ6KpupxVBHtkAtxOTlyGjTHr0uY9XGLv5R2XvsQRvJ9qX6wjptPHFij4DLsXKos yK/KLhlvddRnWhCMQyE3jdN5N6pBN0QEJE0RmjrE/tYqwVUBukYOiG8V897htOrGnTGZzA IcLWr3BgAuQoztYNliQWPLXZDNQuYlKANXYOUpmL0BQx2p2h8IYh36OXnmFGbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddZfvzM7q3/TZhKHPPyMz33QHfqWZ4i2lPdg1CjwQf4=; b=GEvtWUUnFeoFD3zm/1mi/989rOkosckY9gZonq6DMAF+9sjPEAUyTOhh7LPpINfce0MjNS +RTl2dEwLqrm53SCzZa+RA6j+El2HEUvFCDfqlNxnjORDm/evSshlqMl9rqonvvhMSB+zp PoOUR1FYz6x5z0k4FhimK3yLd3QoNaSfto6sJ1uBiF00Ke5lFNC2JHKQUAP4X1Vt1B5pzW b6Lcw7E/UM+uZgR5tog6knmdXQ9n6mzuBnP1vLOpURJYV8Nox2DRmd9UBtjhD3FG4T8ATG oh3v+VBQcDcWojQOp5vWePjKxB2TDUDWuwKgNMlpaWOXDWxmmEZ6C8LtafIDCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SByzd5b8jzpqQ; Fri, 20 Oct 2023 21:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KLsbpO022112; Fri, 20 Oct 2023 21:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KLsb8e022109; Fri, 20 Oct 2023 21:54:37 GMT (envelope-from git) Date: Fri, 20 Oct 2023 21:54:37 GMT Message-Id: <202310202154.39KLsb8e022109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bfccb4a42979 - main - x86: Cosmetic cleanups to struct msi_intsrc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: bfccb4a429795954cfeca4ba60a07c0e1ec35e07 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bfccb4a429795954cfeca4ba60a07c0e1ec35e07 commit bfccb4a429795954cfeca4ba60a07c0e1ec35e07 Author: John Baldwin AuthorDate: 2023-10-20 21:53:05 +0000 Commit: John Baldwin CommitDate: 2023-10-20 21:53:05 +0000 x86: Cosmetic cleanups to struct msi_intsrc - Sort members by size. - Change msi_msix from a u_int to a bool. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42305 --- sys/x86/x86/msi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 246645efbc10..888635cba3f4 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -114,15 +114,15 @@ struct msi_intsrc { struct intsrc msi_intsrc; device_t msi_dev; /* Owning device. (g) */ struct msi_intsrc *msi_first; /* First source in group. */ + u_int *msi_irqs; /* Group's IRQ list. (g) */ u_int msi_irq; /* IRQ cookie. */ - u_int msi_msix; /* MSI-X message. */ - u_int msi_vector:8; /* IDT vector. */ u_int msi_cpu; /* Local APIC ID. (g) */ + u_int msi_remap_cookie; /* IOMMU cookie. */ + u_int msi_vector:8; /* IDT vector. */ u_int msi_count:8; /* Messages in this group. (g) */ u_int msi_maxcount:8; /* Alignment for this group. (g) */ u_int msi_enabled:8; /* Enabled messages in this group. (g) */ - u_int *msi_irqs; /* Group's IRQ list. (g) */ - u_int msi_remap_cookie; + bool msi_msix; /* MSI-X message. */ }; static void msi_create_source(void); @@ -277,7 +277,7 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) /* Allocate IDT vectors on this cpu. */ if (msi->msi_count > 1) { - KASSERT(msi->msi_msix == 0, ("MSI-X message group")); + KASSERT(!msi->msi_msix, ("MSI-X message group")); vector = apic_alloc_vectors(apic_id, msi->msi_irqs, msi->msi_count, msi->msi_maxcount); } else @@ -733,7 +733,7 @@ again: msi->msi_cpu = cpu; msi->msi_first = msi; msi->msi_vector = vector; - msi->msi_msix = 1; + msi->msi_msix = true; msi->msi_count = 1; msi->msi_maxcount = 1; msi->msi_irqs = NULL; @@ -775,7 +775,7 @@ msix_release(int irq) msi->msi_dev = NULL; apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq); msi->msi_vector = 0; - msi->msi_msix = 0; + msi->msi_msix = false; msi->msi_count = 0; msi->msi_maxcount = 0; From nobody Fri Oct 20 21:54:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SByzg0fLDz4yGlf; Fri, 20 Oct 2023 21:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SByzg09L4z4gG8; Fri, 20 Oct 2023 21:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDwieO9e/iu1uy/z9qGKQGO3IdpLSiqmhD9RRQLx8SY=; b=ZdT1XIWlszp4NAi8zjqued/TG0A8qG6nZ/6ZcmTdDZtAL55+nIiEPLESkhIuFI/6VYL1P5 s4pPXgq2Gr7c6dJzoZcJVQdLh7bWm3pYwR+lHDwdvhQvb5I6jxEhnP3GqpxCc46uLUcfj6 ygcqLws2KtdS0jfsKWiCfhJTidz3i5K50x5BteWrCmTybaohLqwYD0COsoyeYA6+e17tLi vqzz0gcxLf9ba/2WehhGkTP+hqoTDRAnkY7ZKa1anPjvJNLR1hFCUs0awNc4clfN+QAtqd 2SRFI8tGkDFCpJ8m0AAfPMQ1eCngpFDCMK23FA9FhhmXpb0uA1ypedrz+vx4KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697838879; a=rsa-sha256; cv=none; b=hujvN59SWQKcMaWZv0NE2asDtKQ3TDM3IXSfurek76xOc4B6LUv6O9+WyIRgsjWdid1iqj GUY8rk3n3v07roDHc8ic6NKUzmgLWSvAnV7fw9B9LDMBliZxZVYbVKmpL5PEKGwfzpL1qf JkmbyTHY5tojOXLitpqYetfc2k3/6LLms2oVXlGTugJEfwDQBPvo0UsXOGo3Awi9dBKlS9 ePmnG0q2sUEt0+G+1s6li2VmqZd8atV0YIZ36Gi347TPKcqWfv57mWNQCoIkVLOeNXaL/m +4sPTfqoVSh0jTf2zhiBA7mIbanHBrxT201PFOM99Los4HsQL2AY2wLtzWsfiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDwieO9e/iu1uy/z9qGKQGO3IdpLSiqmhD9RRQLx8SY=; b=LZkSwHubl8sOsaIlq6eMA2M++gY7b1hoZMPFAwkjqFw3Ob3csFUlTTyJeqXgyWsFzBUfBD i96KDCpbt7avVYsJII0VrHFRSn+ubpF8jleyfdzNxJhGi6d2e7GP+DyI/dOW2gSmTJ8o4Y Cj+p0EhUWbzNj8YpVQs3BUdm8xuPKAZoN/3Ady0fBL5/J/ZkGkTFveTskhZUkz+NegheeG WoQKRtmgZ5wijWOQWdD5th7bZ7eUCmcNEe+oWVDNvfGihjQJWUKoC6HX6Cvp5JN0TypKVR hN4ovZbS2Xzpowx6aN38ye+Ay2M+6V1NOpnOafyGZmyZS8x1R4jzm7CdCB4mjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SByzf699dzqCw; Fri, 20 Oct 2023 21:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KLsc4x022161; Fri, 20 Oct 2023 21:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KLscvU022158; Fri, 20 Oct 2023 21:54:38 GMT (envelope-from git) Date: Fri, 20 Oct 2023 21:54:38 GMT Message-Id: <202310202154.39KLscvU022158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f6c2774fe415 - main - acpi_pcib: Rename decoded_bus_range to get_decoded_bus_range List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f6c2774fe415f3b79c551b8075c159d6a7d4d0bf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f6c2774fe415f3b79c551b8075c159d6a7d4d0bf commit f6c2774fe415f3b79c551b8075c159d6a7d4d0bf Author: John Baldwin AuthorDate: 2023-10-20 21:53:49 +0000 Commit: John Baldwin CommitDate: 2023-10-20 21:53:49 +0000 acpi_pcib: Rename decoded_bus_range to get_decoded_bus_range While here, change the return value to bool. Discussed by: gibbs --- sys/dev/acpica/acpi_pcib_acpi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 02e3a0be5956..a66ca1199af7 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -288,18 +288,18 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) #endif #if defined(NEW_PCIB) && defined(PCI_RES_BUS) -static int -decoded_bus_range(struct acpi_hpcib_softc *sc, rman_res_t *startp, +static bool +get_decoded_bus_range(struct acpi_hpcib_softc *sc, rman_res_t *startp, rman_res_t *endp) { struct resource_list_entry *rle; rle = resource_list_find(&sc->ap_host_res.hr_rl, PCI_RES_BUS, 0); if (rle == NULL) - return (ENXIO); + return (false); *startp = rle->start; *endp = rle->end; - return (0); + return (true); } #endif @@ -497,7 +497,7 @@ acpi_pcib_acpi_attach(device_t dev) * If we have a region of bus numbers, use the first * number for our bus. */ - if (decoded_bus_range(sc, &start, &end) == 0) + if (get_decoded_bus_range(sc, &start, &end)) sc->ap_bus = start; else { rid = 0; @@ -517,7 +517,7 @@ acpi_pcib_acpi_attach(device_t dev) * If there is a decoded bus range, assume the bus number is * the first value in the range. Warn if _BBN doesn't match. */ - if (decoded_bus_range(sc, &start, &end) == 0) { + if (get_decoded_bus_range(sc, &start, &end)) { if (sc->ap_bus != start) { device_printf(dev, "WARNING: BIOS configured bus number (%d) is " From nobody Fri Oct 20 22:10:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBzKd0LXRz4yHbs; Fri, 20 Oct 2023 22:10: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBzKc6ghsz3DLP; Fri, 20 Oct 2023 22:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697839812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEVRuWJK6y1sBVM7jjODvGcbR9CzP7MmrI6SenDi9vU=; b=ExXX/41fr9Kwc2wj3H8T1lMiMlm38AafBJfcouKbdj0Ply8hozXaI0PdCg/5cABQv+9Ca1 ihHcOJvPUhMqjTldTQpoUiXdkKFv/G9apxBFITQ8zfXdWLiO7g5KvnRbgCn/j+cWTmOYz6 wCmmTG7UoxMt32C4hb7NthGPd3bHzu4L19YCCLTcf5T8mK3o3m1vQHlh7VCWZSd0dwcmvs i2nuSBosxnb2YnbViiW0pk0MPu94eQ1sZCWaI941TZxAnceIewYsHhn9BAGAl7rjPyXlGB 0H19yGOiVEY0/OV1aKZBPCfhOncxd2G/eJiLFbEktqRriw8FVBj6QhA3XOj7sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697839812; a=rsa-sha256; cv=none; b=JdPYp7w76YwA+qIgE+uoUwmK92/i/lHpiT31NdC4K/WLcFOmPpoTA+kw1NAYqeD9jjt3gs k3xwJi4woGMafB4pgUod2sAnxrNcodtq4t58V5UF+JrRwIDD0d4qjwMfU593iZFpOwBH0X OdAr+0tvoPLZNEVz4bVUHMa2FigyO9QPwQwjA7cVi5DuoLy1e4UnM4RyTSMCav9eBXGluc 8c8N0mwX9dQNNq8OE5wLTnSFSeaAPK1sUuHt6n8hb/jbxcK3fymBpCJL4tnOjnWdBW9pg9 ia4FwxkaKn447tDJt0s4hSZ1hRHseeOUXw03ej0OgSNl7fkkQLLC6NLyEAolBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697839812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEVRuWJK6y1sBVM7jjODvGcbR9CzP7MmrI6SenDi9vU=; b=QNuFqole24wXh0WE+Mj6MgVi2IEfFABkb5ulkiyj5iWsJ49ZtC0rq0oYcnkSPnatW5zNvu cVj7oTV/kOG7Pf3Ul0wVY3fE1KwDWuu9v4sSr7Iz6rxOXbSRNJ8uwwDWZwzVe5N2dVZFx3 fqpMrBzrz52qkCj8VOvCFFRnV5mHpRcYo8S0rOe83nwnXw1TqATcWuL7eUijxielUvfxs4 RO12Fm/UUePAzIpeOA8ULcWm8A9iKfF31PuWKv/OGNoJ0BeQMgUqxuoszLsaaDW4CZOFA9 I2XeXU10LIfOwOoy2YJwVV+14yshSbg9pgFFJ+0yEMZgM/hpkqlhL/wf0RO09A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBzKc5lGKzqMM; Fri, 20 Oct 2023 22:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KMACbU046205; Fri, 20 Oct 2023 22:10:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KMACDq046193; Fri, 20 Oct 2023 22:10:12 GMT (envelope-from git) Date: Fri, 20 Oct 2023 22:10:12 GMT Message-Id: <202310202210.39KMACDq046193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a113f9dd9886 - main - uart: Support EARLY_PRINTF on x86 for port-mapped COM ports List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a113f9dd9886e48914ba48b1f02ecf3ad0fc00d3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a113f9dd9886e48914ba48b1f02ecf3ad0fc00d3 commit a113f9dd9886e48914ba48b1f02ecf3ad0fc00d3 Author: Warner Losh AuthorDate: 2023-10-20 22:07:03 +0000 Commit: Warner Losh CommitDate: 2023-10-20 22:07:24 +0000 uart: Support EARLY_PRINTF on x86 for port-mapped COM ports Support early printf for the ns8250 uart driver. Adding options UART_NS8250_EARLY_PORT=0xYYY options EARLY_PRINTF to your kernel config will enable it. The code is rather simple minded, so caveat emptor. This will enable printf before cninit. cninit automatically disables this and switches to the real routine. It only works for port-mapped COM ports, and only if you know the port's address at compile time. It's intended for be a debugging aide, not a general purpose thing. Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42306 --- sys/conf/options.amd64 | 3 +++ sys/conf/options.i386 | 3 +++ sys/dev/uart/uart_dev_ns8250.c | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 8402c89640f7..df18abfa8e1e 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -65,3 +65,6 @@ NO_LEGACY_PCIB opt_cpu.h # Compatibility with Linux MP table bugs. MPTABLE_LINUX_BUG_COMPAT + +# x86 specific uart options +UART_NS8250_EARLY_PORT opt_uart.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index c827e0bb7a69..b98591a2a7da 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -109,3 +109,6 @@ NO_LEGACY_PCIB opt_cpu.h # Compatibility with Linux MP table bugs. MPTABLE_LINUX_BUG_COMPAT + +# x86 specific uart options +UART_NS8250_EARLY_PORT opt_uart.h diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index de9b67c6bef1..3787c6ed4c9b 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -78,6 +78,27 @@ static int broken_txfifo = 0; SYSCTL_INT(_hw, OID_AUTO, broken_txfifo, CTLFLAG_RWTUN, &broken_txfifo, 0, "UART FIFO has QEMU emulation bug"); +/* + * To use early printf on x86, add the following to your kernel config: + * + * options UART_NS8250_EARLY_PORT=0x3f8 + * options EARLY_PRINTF +*/ +#if defined(EARLY_PRINTF) && (defined(__amd64__) || defined(__i386__)) +static void +uart_ns8250_early_putc(int c) +{ + u_int stat = UART_NS8250_EARLY_PORT + REG_LSR; + u_int tx = UART_NS8250_EARLY_PORT + REG_DATA; + int limit = 10000; /* 10ms is plenty of time */ + + while ((inb(stat) & LSR_THRE) == 0 && --limit > 0) + continue; + outb(tx, c); +} +early_putc_t *early_putc = uart_ns8250_early_putc; +#endif /* EARLY_PRINTF */ + /* * Clear pending interrupts. THRE is cleared by reading IIR. Data * that may have been received gets lost here. From nobody Fri Oct 20 22:16:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBzSM10Nlz4yHnp; Fri, 20 Oct 2023 22:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBzSM0M0Pz3FSk; Fri, 20 Oct 2023 22:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697840163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8/6I6yNFGPikmcEa1lG2+jposMVZlLS3vxT0fBO5/A=; b=SlXGUmweK066y4RX1tHySepIo3taNORJu9TlXJ0YyKoYjH7bihdbu0PAYrQ4k3tXqPrpZb Z9mQ7W5CPGeWTSl8PGEK018/x1CY9+SLUxVdn+vWCJB+dGDUpre5YlRKrLfvslr4vd5cuy 5csHnw4ivLpDaQtV/J6hF/wRHnhls/aj/zkr3MLQkDqefBWpTn49EpukPCpXAM4SuvYklt jQTXLUMbx7yVXrRBs0mKkqD5Et/rGO8vvaYFY5InG0xBKB/zGi2YHbNvaoW84+0k5ytjTv PZ41tjI6A4GgKUVyw6N68lWqXQqWpHa9aWtimSwuJV/z0gjMi5U7qBbjBryK7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697840163; a=rsa-sha256; cv=none; b=FJgotNoAZX3FAaEB2GV2/9U3O+vlLD+CS82m7Jfpr+/JETXXZKbdVIMlafbRBI4wougK0l cVm6rBQDZIGdh9yJjv7yijMS5KLR5xHozgQWnVugGYU/94I7ICD3bSCVp7WL7CS5Rah7D9 bBNJmVlyzrMW1o3BnXTIhCqzLl59xGo9pMCgGLz6XgAywsKnvx/1WeOmjO8eUDMpMF3qX6 oVOaZ6MM92pqogQLNPd/soM/cLMTZjsXDVIY5SGmjPHgis+sCgkv5KaW4rrsb4lBZbtzwA Bc8BGjdV7q17byJCNuUEpSJFjjDp/UBoBicsXYs+A1LljQlSfI54CeCbPj5C9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697840163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8/6I6yNFGPikmcEa1lG2+jposMVZlLS3vxT0fBO5/A=; b=GgFPSNAQ2RSverq75gzJVU6HNZlTZ0ZFKGAL6r3RgiaRpHKBn3eXWSHz6KgK1gy7ylvZsn jd2sdIMp1QMp7LiJaYF/TCEhpRQotND4HL+MSLMgSxtiGu6FgouDSJyoUTnFSJVgW3Dl9h 89K3crpbXw0HBVnCeuOa97M+Y/5O6iz3ynDbJ6AlJqMjDRun3qB6/7FVafsxgu8ubiOl2q RptEgv91pB/T/+Zhn571djjaUB6vUDkdF8lyjHoXh5BcqmMD7ReDRex5AzmVQLWQGCRO/U aKolQpjm2g78ngt6axcOoKdJ0R2e8YwYyYsUTlz2jRalgN8UO9g0MLEO0gEztw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBzSL6Rtzzr2V; Fri, 20 Oct 2023 22:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KMG2oc056514; Fri, 20 Oct 2023 22:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KMG2rO056511; Fri, 20 Oct 2023 22:16:02 GMT (envelope-from git) Date: Fri, 20 Oct 2023 22:16:02 GMT Message-Id: <202310202216.39KMG2rO056511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 1e39a0886e09 - main - Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2 commit 1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2 Author: Kirk McKusick AuthorDate: 2023-10-20 22:14:46 +0000 Commit: Kirk McKusick CommitDate: 2023-10-20 22:15:40 +0000 Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. Add missing check for failed block read when checking information about a snapshot file. Reported-by: Andreas Bock PR: 274404 MFC-after: 1 week --- sbin/fsck_ffs/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 49e89f9221b0..d1d09d07b43a 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -299,6 +299,8 @@ checksnapinfo(struct inode *snapip) size = fragroundup(fs, DIP(snapip->i_dp, di_size) - lblktosize(fs, lbn)); bp = getdatablk(idesc.id_parent, size, BT_DATA); + if (bp->b_errs != 0) + return (0); snapblklist = (daddr_t *)bp->b_un.b_buf; /* * snapblklist[0] is the size of the list From nobody Fri Oct 20 22:33:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBzrX6s9zz4yJgV; Fri, 20 Oct 2023 22:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBzrX6GNXz3Gk0; Fri, 20 Oct 2023 22:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697841212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1YVNrf1Jsl/iA8qUcRkB+brfptOTljBAlnkKCKvyz8=; b=DLHz0jflALEBkNA/up6rbimUCIYMVd8C0WbeQhgcqMpnVaQdOU9bxSabv3BZrlktDBDaNl x34oc9tsTq1lpJo0IyKm+GuBLDXB7FC/6mdV39nCriLs1M8t3J40ata7X/fA9g6jBlll9Y MFAGIs+IKLh6innD3Zm7bDxpvYWfdlkRLTlG8qLuDz/mR/lOhcEMvf34aR6KVBhrETGSCq WTlFeNAyyhMPtS5TAGqQkXemhhV6/IzRuass14DIbdRj9NzTtCmW7Hlx781YlrnzqE8N/L MnOgEu8SCWL1wADTk8l7stjUosHOnBxXlU3NfQUfhZ+1XckG/tjWhtWwJjYC7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697841212; a=rsa-sha256; cv=none; b=O0LwsBhjkawze+HaVXJuQchYQv2YQCs6KwHTlOLFU0hLrJ7DX6q9KBAxPT1eNIoSO2KyQg 5pdVEITY4VNeZo3iTHI3LeGz8JOvFr76B2YqnzDSScSsfVUamlyxhxw6mXrDXn7q25n7bD hEHtYox3EyOQrulmyrwoS/tgQMJVMVaDLI1MPHs8e65YzR9bWM7TYNn9vXqC00L0KC0jEh EhH4K3rEPeBr8n6DJIY/c3rGkSUPXXg1BS2mHY0IxzaYPdYf9Y40wIgDBitMDHcT75F63g 4QsulrqBE0UrdIa9gD5u3FkBtqcIXiokC9FB8s7rmEBVb7HG1/B3rnohP25XKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697841212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1YVNrf1Jsl/iA8qUcRkB+brfptOTljBAlnkKCKvyz8=; b=HzjztUGDN9DKj0I1A8cCbk2IUc2rqNv1sR5Gpz5jPI8dNMfXUu9Z6UKdk37VZaYQ/x+hbT Xo7Jz4RNqmOj75W3hNAX6dRMji/js1e4ClDkSsXT4gmIHpBxoLxtuzrXS6Xp8yFC9/ssm4 c5NlpMVLkUhPc66eBlxOGKd6mUWmjaGhLNrkIjLIGazt1fdcbysldh7eGYzPMDZSDslDuq jhPri1VIS3DEio0zD1MiEiFk9G6HmP9QM2fLM08JPtG+oIZZnNhGObc4N5pfhRCB4EaMdB MMayMaDrYT7L2zpM/4l15SeHC8feBloVaXKh+iV9jumlxmyNcn7nW4wAUpHSmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBzrX5KwRzqrq; Fri, 20 Oct 2023 22:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KMXWIR088993; Fri, 20 Oct 2023 22:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KMXWj2088990; Fri, 20 Oct 2023 22:33:32 GMT (envelope-from git) Date: Fri, 20 Oct 2023 22:33:32 GMT Message-Id: <202310202233.39KMXWj2088990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 3943698c6dbe - main - Minor sysctl description cleanup. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3943698c6dbed0f4ef1b2e34c89035155e813533 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=3943698c6dbed0f4ef1b2e34c89035155e813533 commit 3943698c6dbed0f4ef1b2e34c89035155e813533 Author: Kirk McKusick AuthorDate: 2023-10-20 22:32:05 +0000 Commit: Kirk McKusick CommitDate: 2023-10-20 22:32:05 +0000 Minor sysctl description cleanup. No functional change. Agreed-by: Mateusz Guzik --- sys/kern/vfs_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 0fe2bc46446c..881e9452a6db 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1506,7 +1506,7 @@ static int vnlruproc_sig; static u_long vnlruproc_kicks; SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, kicks, CTLFLAG_RD, &vnlruproc_kicks, 0, - "Number of times vnlru got woken up due to vnode shortage"); + "Number of times vnlru awakened due to vnode shortage"); #define VNLRU_COUNT_SLOP 100 From nobody Fri Oct 20 23:12:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC0jY44Fqz4yLZc; Fri, 20 Oct 2023 23:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SC0jY3YlTz3LGY; Fri, 20 Oct 2023 23:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697843553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPxsOrG1WHSQm0TdLZlRwQtHrKe9ux91cFdGE8Hnlhc=; b=Jvkm9xiKbkM4ySIAG2X1D1NUU9nGMRwOf+7bHpAKNNG/IDcyL54e4CZ4WUYfsk2+wRKPCZ VBAgTRKPCArGM7If6q1Upnhf7lbtM8XYWa4rXhSTP5egiM+r2gYd75sc0G1dduVVGTiqO/ 5C+4GpYVPT/sO3ZvWVd1IvKmDowCUhT2ZbeMngB1PWGjWlqosuL99Yb1QH/xKcfcz0fPv+ dU3pDz4kfAiICf5DJC063IBUQ61vEqBxrholgBIrWFKP8ZUhDaWvaNPZrs79hOjk7w024b YEI/+Ug4gfGPqqH6WCM5pkUWIdyeDVP3tY0h1oohuMqFdssRRdjww84J3Cyelg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697843553; a=rsa-sha256; cv=none; b=NCxpcLCVUDRQK8VeTy6yNGNWag92gAuwxVrr/VuIjQ6oP5zKtM0+U1roODUbr/GzHIQeDJ 9DUqPzx6s8Fu59/W7OVL2GM9wCgSw7jtwH/e8qwZDsNsoDeGaehH5ajRuCcyv14HYq5XGV gwlbFnsPTfsxU7YXmuROv1lR+D/WkuZOfJrnEWMRRdI3WUJmoxbdKgOL3ATC7oV/YwdoWV ye/WU2+3jh6E2IvJsQ1GIEBClbvxIjBkbps7GzLjH5lABhS4Unw6g8bt2IJSdcshptE1tB 8rgJt627MeZtAyjDwEAqK8O73nMPFmjxrqEpWnUZxhGQutYLc3KGNiLtnCxW1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697843553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPxsOrG1WHSQm0TdLZlRwQtHrKe9ux91cFdGE8Hnlhc=; b=lSA2GWv9jWDQ53TivPEmjMpCse1B1yoySvJN8gvxSLIfi7mqJEJeLoy6/UQXaiHQ0zrU1L xyQBLue5iLMgb23EepzD0lQp/eGPnlBlhW2Z4V1xeMtMXhJOjyU6syfBbMtF/3USz0J+21 ETv7k4vIuHsqv23RGgsvGuTiIG7UYCVgneezDAy+FUt2ficA1hdGOTkRbqMZ9cQhDnXhNO MKWCeiczQjiMpeqGGXFVXysM/U+6zjSMP5TO9SB4hadC+0CEMh2Ji21PVTZibQYmIdcoex yRRHX0dIO0+Jdw3x8jKxiyI2Ttk3bGdRVQQIYl0ZWSnqOfICkWK1MR5GVpGZiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC0jY2d1Szs7l; Fri, 20 Oct 2023 23:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KNCXsC056116; Fri, 20 Oct 2023 23:12:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KNCX0G056113; Fri, 20 Oct 2023 23:12:33 GMT (envelope-from git) Date: Fri, 20 Oct 2023 23:12:33 GMT Message-Id: <202310202312.39KNCX0G056113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 196787f79e67 - main - nfscl: Use Claim_Null_FH and Claim_Deleg_Cur_FH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 196787f79e67374527a1d528a42efa8b31acd9af Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=196787f79e67374527a1d528a42efa8b31acd9af commit 196787f79e67374527a1d528a42efa8b31acd9af Author: Rick Macklem AuthorDate: 2023-10-20 23:10:25 +0000 Commit: Rick Macklem CommitDate: 2023-10-20 23:10:25 +0000 nfscl: Use Claim_Null_FH and Claim_Deleg_Cur_FH For NFSv4.1/4.2, there are two new options for the Open operation. These two options use the file handle for the file instead of the file handle for the directory plus a file name. By doing so, the client code is simplified (it no longer needs the "nfsv4node" structure attached to the NFS vnode). It also avoids problems caused by another NFS client (or process running locally in the NFS server) doing a rename or remove of the file name between the Lookup and Open. Unfortunately, there was a bug (fixed recently by commit X) in the NFS server which mis-parsed the Claim_Deleg_Cur_FH arguments. To allow this patch to work with the broken FreeBSD NFSv4.1/4.2 server, NFSMNTP_BUGGYFBSDSRV is defined and is set when a correctly formatted Claim_Deleg_Cur_FH fails with NFSERR_EXPIRED. (This is what the old, broken NFS server does, since it erroneously uses the Getattr arguments as a stateID.) Once this flag is set, the client fills in a stateID, to make the broken NFS server happy. Tested at a recent IETF NFSv4 Bakeathon. MFC after: 1 month --- sys/fs/nfsclient/nfs_clport.c | 4 +- sys/fs/nfsclient/nfs_clrpcops.c | 92 +++++++++++++++++++++++++++++++---------- sys/fs/nfsclient/nfs_clstate.c | 47 +++++++++++++++++---- sys/fs/nfsclient/nfs_clvnops.c | 16 ------- sys/fs/nfsclient/nfsmount.h | 1 + 5 files changed, 114 insertions(+), 46 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 8ea50d80ae19..c0318b692d86 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -264,10 +264,10 @@ nfscl_nget(struct mount *mntp, struct vnode *dvp, struct nfsfh *nfhp, np->n_fhp = nfhp; /* - * For NFSv4, we have to attach the directory file handle and + * For NFSv4.0, we have to attach the directory file handle and * file name, so that Open Ops can be done later. */ - if (nmp->nm_flag & NFSMNT_NFSV4) { + if (NFSHASNFSV4(nmp) && !NFSHASNFSV4N(nmp)) { np->n_v4 = malloc(sizeof (struct nfsv4node) + dnp->n_fhp->nfh_len + cnp->cn_namelen - 1, M_NFSV4NODE, M_WAITOK); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 14351d915ba2..2276e09f6e7e 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -392,16 +392,6 @@ nfsrpc_open(vnode_t vp, int amode, struct ucred *cred, NFSPROC_T *p) nfhp = np->n_fhp; retrycnt = 0; -#ifdef notdef -{ char name[100]; int namel; -namel = (np->n_v4->n4_namelen < 100) ? np->n_v4->n4_namelen : 99; -bcopy(NFS4NODENAME(np->n_v4), name, namel); -name[namel] = '\0'; -printf("rpcopen p=0x%x name=%s",p->p_pid,name); -if (nfhp->nfh_len > 0) printf(" fh=0x%x\n",nfhp->nfh_fh[12]); -else printf(" fhl=0\n"); -} -#endif do { dp = NULL; error = nfscl_open(vp, nfhp->nfh_fh, nfhp->nfh_len, mode, 1, @@ -452,6 +442,39 @@ else printf(" fhl=0\n"); op->nfso_own->nfsow_clp, nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp); } + } else if (NFSHASNFSV4N(nmp)) { + /* + * For the first attempt, try and get a layout, if + * pNFS is enabled for the mount. + */ + if (!NFSHASPNFS(nmp) || nfscl_enablecallb == 0 || + nfs_numnfscbd == 0 || + (np->n_flag & NNOLAYOUT) != 0 || retrycnt > 0) + error = nfsrpc_openrpc(nmp, vp, nfhp->nfh_fh, + nfhp->nfh_len, nfhp->nfh_fh, nfhp->nfh_len, + mode, op, NULL, 0, &dp, 0, 0x0, cred, p, 0, + 0); + else + error = nfsrpc_getopenlayout(nmp, vp, + nfhp->nfh_fh, nfhp->nfh_len, nfhp->nfh_fh, + nfhp->nfh_len, mode, op, NULL, 0, &dp, + cred, p); + if (dp != NULL) { + NFSLOCKNODE(np); + np->n_flag &= ~NDELEGMOD; + /* + * Invalidate the attribute cache, so that + * attributes that pre-date the issue of a + * delegation are not cached, since the + * cached attributes will remain valid while + * the delegation is held. + */ + NFSINVALATTRCACHE(np); + NFSUNLOCKNODE(np); + (void) nfscl_deleg(nmp->nm_mountp, + op->nfso_own->nfsow_clp, + nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp); + } } else { error = EIO; } @@ -538,19 +561,40 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, *tl = txdr_unsigned(delegtype); } else { if (dp != NULL) { - *tl = txdr_unsigned(NFSV4OPEN_CLAIMDELEGATECUR); - NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); - if (NFSHASNFSV4N(nmp)) - *tl++ = 0; - else + if (NFSHASNFSV4N(nmp)) { + *tl = txdr_unsigned( + NFSV4OPEN_CLAIMDELEGATECURFH); + NFSLOCKMNT(nmp); + if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) != + 0) { + NFSUNLOCKMNT(nmp); + /* + * Add a stateID argument to make old + * broken FreeBSD NFSv4.1/4.2 servers + * happy. + */ + NFSM_BUILD(tl, uint32_t *,NFSX_STATEID); + *tl++ = 0; + *tl++ = dp->nfsdl_stateid.other[0]; + *tl++ = dp->nfsdl_stateid.other[1]; + *tl = dp->nfsdl_stateid.other[2]; + } else + NFSUNLOCKMNT(nmp); + } else { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMDELEGATECUR); + NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); *tl++ = dp->nfsdl_stateid.seqid; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; + *tl++ = dp->nfsdl_stateid.other[0]; + *tl++ = dp->nfsdl_stateid.other[1]; + *tl = dp->nfsdl_stateid.other[2]; + (void)nfsm_strtom(nd, name, namelen); + } + } else if (NFSHASNFSV4N(nmp)) { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); } else { *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); + (void)nfsm_strtom(nd, name, namelen); } - (void) nfsm_strtom(nd, name, namelen); } NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); @@ -2713,6 +2757,8 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, if ((rflags & NFSV4OPEN_RESULTCONFIRM) && (owp->nfsow_clp->nfsc_flags & NFSCLFLAGS_GOTDELEG) && !error && dp == NULL) { + KASSERT(!NFSHASNFSV4N(nmp), + ("nfsrpc_createv4: result confirm")); do { ret = nfsrpc_openrpc(VFSTONFS(dvp->v_mount), dvp, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, @@ -8009,8 +8055,12 @@ nfsrpc_openlayoutrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, nfsm_strtom(nd, op->nfso_own->nfsow_owner, NFSV4CL_LOCKNAMELEN); NFSM_BUILD(tl, uint32_t *, 2 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(NFSV4OPEN_NOCREATE); - *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); - nfsm_strtom(nd, name, namelen); + if (NFSHASNFSV4N(nmp)) { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); + } else { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); + nfsm_strtom(nd, name, namelen); + } NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSZERO_ATTRBIT(&attrbits); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 74d6a14fc4c4..579210941802 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -4383,9 +4383,15 @@ nfscl_moveopen(vnode_t vp, struct nfsclclient *clp, struct nfsmount *nmp, nfscl_newopen(clp, NULL, &owp, NULL, &op, &nop, owp->nfsow_owner, lop->nfso_fh, lop->nfso_fhlen, cred, &newone); ndp = dp; - error = nfscl_tryopen(nmp, vp, np->n_v4->n4_data, np->n_v4->n4_fhlen, - lop->nfso_fh, lop->nfso_fhlen, lop->nfso_mode, op, - NFS4NODENAME(np->n_v4), np->n_v4->n4_namelen, &ndp, 0, 0, cred, p); + if (NFSHASNFSV4N(nmp)) + error = nfscl_tryopen(nmp, vp, lop->nfso_fh, lop->nfso_fhlen, + lop->nfso_fh, lop->nfso_fhlen, lop->nfso_mode, op, + NULL, 0, &ndp, 0, 0, cred, p); + else + error = nfscl_tryopen(nmp, vp, np->n_v4->n4_data, + np->n_v4->n4_fhlen, lop->nfso_fh, lop->nfso_fhlen, + lop->nfso_mode, op, NFS4NODENAME(np->n_v4), + np->n_v4->n4_namelen, &ndp, 0, 0, cred, p); if (error) { if (newone) nfscl_freeopen(op, 0, true); @@ -4476,14 +4482,16 @@ nfsrpc_reopen(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, if (error) return (error); vp = NFSTOV(np); - if (np->n_v4 != NULL) { + if (NFSHASNFSV4N(nmp)) + error = nfscl_tryopen(nmp, vp, fhp, fhlen, fhp, fhlen, mode, op, + NULL, 0, dpp, 0, 0, cred, p); + else if (np->n_v4 != NULL) error = nfscl_tryopen(nmp, vp, np->n_v4->n4_data, np->n_v4->n4_fhlen, fhp, fhlen, mode, op, NFS4NODENAME(np->n_v4), np->n_v4->n4_namelen, dpp, 0, 0, cred, p); - } else { + else error = EINVAL; - } vrele(vp); return (error); } @@ -4500,18 +4508,43 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, int reclaim, u_int32_t delegtype, struct ucred *cred, NFSPROC_T *p) { int error; + struct nfscldeleg *dp; + bool try_busted_xdr; + dp = *ndpp; do { + *ndpp = dp; /* *ndpp needs to be set for retries. */ error = nfsrpc_openrpc(nmp, vp, fhp, fhlen, newfhp, newfhlen, mode, op, name, namelen, ndpp, reclaim, delegtype, cred, p, 0, 0); + try_busted_xdr = false; if (error == NFSERR_DELAY) (void) nfs_catnap(PZERO, error, "nfstryop"); - } while (error == NFSERR_DELAY); + else if (error == NFSERR_EXPIRED && NFSHASNFSV4N(nmp) && + reclaim == 0 && dp != NULL) { + /* This case is a Claim_Deleg_Cur_FH Open. */ + NFSLOCKMNT(nmp); + if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) == 0) { + /* + * Old FreeBSD NFSv4.1/4.2 servers erroneously + * expect a stateID argument for Open + * Claim_Deleg_Cur_FH and interpret the + * Getattr reply as a stateID. This results + * in an NFSERR_EXPIRED failure. + * Setting NFSMNTP_BUGGYFBSDSRV makes the Open + * send a stateID, in violation of RFC8881. + */ + try_busted_xdr = true; + nmp->nm_privflag |= NFSMNTP_BUGGYFBSDSRV; + } + NFSUNLOCKMNT(nmp); + } + } while (error == NFSERR_DELAY || try_busted_xdr); if (error == EAUTH || error == EACCES) { /* Try again using system credentials */ newnfs_setroot(cred); do { + *ndpp = dp; /* *ndpp needs to be set for retries. */ error = nfsrpc_openrpc(nmp, vp, fhp, fhlen, newfhp, newfhlen, mode, op, name, namelen, ndpp, reclaim, delegtype, cred, p, 1, 0); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index fd88531789d9..00b6c7617101 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2052,14 +2052,6 @@ nfs_rename(struct vop_rename_args *ap) tdnp->n_fhp->nfh_len != fnp->n_v4->n4_fhlen || NFSBCMP(tdnp->n_fhp->nfh_fh, fnp->n_v4->n4_data, tdnp->n_fhp->nfh_len))) { -#ifdef notdef -{ char nnn[100]; int nnnl; -nnnl = (tcnp->cn_namelen < 100) ? tcnp->cn_namelen : 99; -bcopy(tcnp->cn_nameptr, nnn, nnnl); -nnn[nnnl] = '\0'; -printf("ren replace=%s\n",nnn); -} -#endif free(fnp->n_v4, M_NFSV4NODE); fnp->n_v4 = newv4; newv4 = NULL; @@ -2713,14 +2705,6 @@ nfs_lookitup(struct vnode *dvp, char *name, int len, struct ucred *cred, dnp->n_fhp->nfh_len != np->n_v4->n4_fhlen || NFSBCMP(dnp->n_fhp->nfh_fh, np->n_v4->n4_data, dnp->n_fhp->nfh_len))) { -#ifdef notdef -{ char nnn[100]; int nnnl; -nnnl = (len < 100) ? len : 99; -bcopy(name, nnn, nnnl); -nnn[nnnl] = '\0'; -printf("replace=%s\n",nnn); -} -#endif free(np->n_v4, M_NFSV4NODE); np->n_v4 = malloc( sizeof (struct nfsv4node) + diff --git a/sys/fs/nfsclient/nfsmount.h b/sys/fs/nfsclient/nfsmount.h index 37b84a015dab..7571add27b9c 100644 --- a/sys/fs/nfsclient/nfsmount.h +++ b/sys/fs/nfsclient/nfsmount.h @@ -124,6 +124,7 @@ struct nfsmount { #define NFSMNTP_DELEGISSUED 0x00000400 #define NFSMNTP_NODEALLOCATE 0x00000800 #define NFSMNTP_FAKEROOTFH 0x00001000 +#define NFSMNTP_BUGGYFBSDSRV 0x00002000 /* New mount flags only used by the kernel via nmount(2). */ #define NFSMNT_TLS 0x00000001 From nobody Sat Oct 21 01:32:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC3qG3swGz4xFYC; Sat, 21 Oct 2023 01:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SC3qG3L4Sz3Xxn; Sat, 21 Oct 2023 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gb68wf2l06WR0x7Sp4CSLNqakXBALTPe3NBMwyvVqQ=; b=mbGHFGfMvdmpme+Ybo7ffmQ4T1nwe6cGQjbDEkwaSknjBdr5bre9pTnlZpk/9zQNytvVWt wH+Jmq4uyFLmi4HQqY5PtObsoJmzfcs5TSn0NCLRe72PljRzcBHQcJ+DcYAcVtvpf0mY8F eeGQZ3VzRlFjRRppf7Z1up4uZcVF9o8LpLwXhzUGzFnP1CmScklqgq85WNYfRXkazggc00 4q5A1BQPzCHGOYQ7CRW/tdok2b9SFwwXTEoTaFkgyF+dl+d6Azk929HDa9oERSMIdq/PvR 1Om8Jh6zVt8IGe2kC78q3BnST7qmEwHSRnAH3bIMVvcbmd/psaqz9ZJusWTffg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697851962; a=rsa-sha256; cv=none; b=DZ7w7RvlVZFEwytPwOqpCAsxIVvkSKSxcxpsFYGa9PSUfDsjt3tDyELQ0CLZxjq+gjaR2U 4WnCcYD0/jjmN/15iG1QgqJPC2ikOZ3PpOKGgayPLsaNatKwIAixZ4iRqHI+iXbegm5cUA oq1ZZJhM9vj8/75oFj3Iy1LYFI2Btbrx5hD2Fmfcgk+75IztyFPDMo33mtV4Whx3N6EqLG QdxTNIhlGwykbNMahwsK7OzKJjNyj2ILU6EtJjHtGm1ptxubwLuPOo2vJpK7MlActf2PJy ZO8rHFpwH8aSXnWVIZ/vMv4wHZvSAOnC1YDyFgZAiyVPYjeJWeTP1UigB0+Geg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gb68wf2l06WR0x7Sp4CSLNqakXBALTPe3NBMwyvVqQ=; b=B55lmerIIJ1nbcOV0syyw5zc3YUP/ue9edIpp9KzTZ4fao0/74EiDXM+plIiHeouhjQo58 WrrdUYhCXfQeA0s5/fbxzm3ONHuJlTzR6gF5+q4GnI+22Gxaow6J3dvq46GPYTXcUHHzrs pw8HWce8NNE8T3nQxocYNvACjj0aTRB3SZKqE8a0bwUYnNT0yAuDjs/tn6uzl+zDvTRewx XW0FVtRohHPf99KyPudvPQzy+h/QYOLd86iuH1sCCtTiebIPoCeRwkf23qPSd+tNl+/kEy g5c/pMYrTRdQfXZCyDf5+DKszLJBjaKDi/iGsAoYfsXQvz3ZzZTuKM+Nqkel9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC3qG2NbHzwnq; Sat, 21 Oct 2023 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39L1Wg3C088498; Sat, 21 Oct 2023 01:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L1WgSu088494; Sat, 21 Oct 2023 01:32:42 GMT (envelope-from git) Date: Sat, 21 Oct 2023 01:32:42 GMT Message-Id: <202310210132.39L1WgSu088494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 9e7f349ff106 - main - amd64 pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 9e7f349ff10691c2e3fb03898dbc942794a47566 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7f349ff10691c2e3fb03898dbc942794a47566 commit 9e7f349ff10691c2e3fb03898dbc942794a47566 Author: Zhenlei Huang AuthorDate: 2023-10-20 07:31:44 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 01:31:58 +0000 amd64 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.allow_2m_x_ept' is loader tunable and have public document entry in security(7) but is fetched from kernel environment 'hw.allow_2m_x_ept'. That is inconsistent and obscure. As there is public security advisory FreeBSD-SA-19:25.mcepsc [1], people may refer to it and use 'hw.allow_2m_x_ept', let's keep old name for compatibility. [1] https://www.freebsd.org/security/advisories/FreeBSD-SA-19:25.mcepsc.asc Reviewed by: kib Fixes: c08973d09c95 Workaround for Intel SKL002/SKL012S errata MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42311 --- sys/amd64/amd64/pmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 8c438cfb4639..cc463832babf 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2342,7 +2342,10 @@ pmap_allow_2m_x_ept_recalculate(void) CPUID_TO_MODEL(cpu_id) == 0x57 || /* Knights */ CPUID_TO_MODEL(cpu_id) == 0x85)))) pmap_allow_2m_x_ept = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.allow_2m_x_ept", &pmap_allow_2m_x_ept); +#endif + TUNABLE_INT_FETCH("vm.pmap.allow_2m_x_ept", &pmap_allow_2m_x_ept); } static bool From nobody Sat Oct 21 01:32:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC3qH501Kz4xFl0; Sat, 21 Oct 2023 01:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SC3qH4X5Jz3Y5y; Sat, 21 Oct 2023 01:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3YjTWwZC7Ec5tGLAXAq4cAfjdX8IwZCw28r3FVSby0=; b=ZMMK/Hr/ODJO0oO7hPDJVqfiHuAKBhnHN9ecTRXLfl5b4SJfEvvp9L3htfkGjVisVym7cH DOwZGoGpnfLXXa8w2x8tweZBTLLG6a6RGYsj20+KdUNFpTNs3eeelWYzNJrdsocMHTXbWX FDzfgAYOT+UsvD3A3PMkXEs1MdPuFKjV6H1jtatgoFsEBZSKBbcDZBc+aDCFtPQuANqF0I MWvHhGnpqVq5QIOAsd9iJvOseT0q5tPh4X2lXp79qKWC/ZCR5S2aqhKwCKw207aqh0VSzW zvcFTcm+6wVxirejgCGvpesB2w8ST/ne+QDkPPLekV8B/1kX3Iv0ryfgEbe72Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697851963; a=rsa-sha256; cv=none; b=oQJxva7Whsbh6yi/6M14JwzUrdDRLlzfREQ7L9aZf71zn7mW4ectu0t3Wh2nfzoKVx12sP reBk7z5fRmQGNAgeGOMhybmMp5BiKWRnyT56jLSZwIxf4hIVQtpa7uQRtdXlpTxMI8Tkwb YoO+yOyFaCoPnEKeQzn2wfhEshfuuCJJtX3VxIgFnGSzo29vq63AVherw8NyepHOmOar2K 4/Bgb3uNPhlrSd61owgKFwnTJ1gItvDgmoFR5li90XvvGrhoKdxXNvbzRJi1QkuWYNqb7Q 3wxkNgm0tL1mjJdbe3LGdjPq2JhvOcoNuzxA3NJO/kXK9nYqD6Sv4hh7eBMI8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3YjTWwZC7Ec5tGLAXAq4cAfjdX8IwZCw28r3FVSby0=; b=dbFYywknbgwitv82bG4nuEmhugpydqNi7VwBL4azZx7mEDjPDq4bwjUBtlyLzGHQlM6GCp BIeNPTXrDzzY/IZ/HWc/TVqMdOWYRQRRY/TANj1IWRcIGcOH+nqQjZnnJp5VMDmC0EmVAk cS2UWKwmFoF3GGpsMHd3WdYqC5Ivw7WiJqu5vRX5X9JXb2jJykKnDIJ/co5wMrF7P19z79 5vyvjzlzgA1WjdxwlZj3g3FqqBFg2fDVOiceqSi8E+m6miV0V9WwVQO8ce0eJmJebeBw23 PtGG84jLalq2F2uhh5+uJPecOjNZCU0Vxp/Tw47q4FusBR8388LoN1Sm34X1FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC3qH3dvzzwcG; Sat, 21 Oct 2023 01:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39L1WhRE088552; Sat, 21 Oct 2023 01:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L1Wh7R088549; Sat, 21 Oct 2023 01:32:43 GMT (envelope-from git) Date: Sat, 21 Oct 2023 01:32:43 GMT Message-Id: <202310210132.39L1Wh7R088549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 12cce5994b92 - main - x86: Prefer consistent naming for loader tunables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 12cce5994b92f8235f379d660ccb28da8e69f55b Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=12cce5994b92f8235f379d660ccb28da8e69f55b commit 12cce5994b92f8235f379d660ccb28da8e69f55b Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 01:31:58 +0000 x86: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with inconsistent naming. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to maintain. 1. hw.dmar.timeout -> hw.iommu.dmar.timeout 2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression 3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline 4. hw.x2apic_enable -> hw.apic.x2apic_mode Those tunables are for field debugging, no need to keep old names for compatibility. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42248 --- sys/x86/acpica/madt.c | 2 +- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/x86/local_apic.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 3d7c5a67375b..200eec1fbb28 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -221,7 +221,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index a5821df6b835..ebdf24976504 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -429,7 +429,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 43fe4625cd08..6a913883cc5c 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -493,7 +493,7 @@ lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -526,7 +526,7 @@ lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); } From nobody Sat Oct 21 04:54:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC8JQ1H8Pz4xTDQ; Sat, 21 Oct 2023 04:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SC8JQ0SVfz4Q9M; Sat, 21 Oct 2023 04:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697864086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8N7Bq85wE9SCub5FR4DsKhRQDF9fJ9fgUO71acBagYU=; b=gwWw+vK5l79PXs2kdJSAaLrnZ+j94ZM8AKeuJFX5H7hFJFBIElR4vCSVGJadknEDiITqB/ dk/NCknJ93dENaSvD/lxfCuSxCDuk6FAhB9W4vaKMgwe7vpHVtRUREPVhxobzMKXaLDJE5 trNiyCBMg2WpRag2v7wleceBepYASNdG43WF45CF/dHr+OYihhIzf88HBDO63bX+Hg5gjS junVlk+5hP+4DQJ3lphmd5LKWn9GmXlZqpjTNOa4IXGzO4gLl/cDlQ0hdEXEt49GLWQBbk i+GJ44CHTte3oxfAHbmc851hy/oeC/tsicSY7G6BbQJeYL+Y+2y95WRJ79wNGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697864086; a=rsa-sha256; cv=none; b=R8GpdOWwgmqRZ1UboCaMyVx7oHj+n9Uzzg/fRjtHDhdsmgU79O5zC5pmApUHBb66dFJTkA rpaUFufSg5KqAbuf/KWZN0p1RN1OjXP4U6hJAV+IPsh5FDmyri9aPZxGICsFM5UtwPLxUE C/lp/+Z2tA7FZc7mdWZ00plxymcwfeQNP6ujAPRsXw9qZgjojp9t5eA4o8Iy593kCS8S5J +UMT0foPj8ZQth2rAn7tNzMiMcU7pOk1ygf73rwcOOt1124Td8nkwfoq8iMwkzyD4059tf iRZ7m9z4qyFoOA0cfdOcnZIlZcIuz5XhS6Y3gx1rt4OJcqwxdesam/G+MfjacQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697864086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8N7Bq85wE9SCub5FR4DsKhRQDF9fJ9fgUO71acBagYU=; b=YmHm3QMf4o+M7azH6tcbiNpqpP6BPugeZOaHmshNCp5Djekl7kE/855b+ZJ8Nb3krw6zM5 JwoHWdQG6D5RoBnyf9UF3/sio97SDqP/ohs5EbPKuLrZ5AcYJaMgydICMFYMwmQ6oz9swB gIfvOaGSqpdv0S5LS4egu6MYwMM2Lrer/FX6hp6r5pUkz6qq9EGPgoOo6EKmuVV4ClpEjR s6bxGTo1U0zGVX9SjTM0bNwHjqdnKvazFOX4QD/dh+g4FQBKEH7DY9w1t9eeiQ4I3xDr1K v/u0iwMnLzTdoR1AX/VFHyukZ9pa21CuR7HUkGn4uB4vX2tyg/b/RHLm5Cr/HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC8JP6bsGz127W; Sat, 21 Oct 2023 04:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39L4sjgQ023567; Sat, 21 Oct 2023 04:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L4sjoj023564; Sat, 21 Oct 2023 04:54:45 GMT (envelope-from git) Date: Sat, 21 Oct 2023 04:54:45 GMT Message-Id: <202310210454.39L4sjoj023564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 7a974a649848 - main - bpf: Make dead_bpf_if const List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 7a974a649848e1222a49d0d49726d06bd5c1dbd9 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7a974a649848e1222a49d0d49726d06bd5c1dbd9 commit 7a974a649848e1222a49d0d49726d06bd5c1dbd9 Author: Zhenlei Huang AuthorDate: 2023-10-21 04:52:27 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 04:52:27 +0000 bpf: Make dead_bpf_if const The dead_bpf_if is not subjected to be written. Make it const so that on destructive writing to it the kernel will panic instead of silent memory corruption. No functional change intended. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42189 --- sys/net/bpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 96420b709911..9e135b90614b 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -100,7 +100,7 @@ MALLOC_DEFINE(M_BPF, "BPF", "BPF data"); -static struct bpf_if_ext dead_bpf_if = { +static const struct bpf_if_ext dead_bpf_if = { .bif_dlist = CK_LIST_HEAD_INITIALIZER() }; @@ -2859,7 +2859,7 @@ bpfdetach(struct ifnet *ifp) continue; CK_LIST_REMOVE(bp, bif_next); - *bp->bif_bpf = (struct bpf_if *)&dead_bpf_if; + *bp->bif_bpf = __DECONST(struct bpf_if *, &dead_bpf_if); CTR4(KTR_NET, "%s: sheduling free for encap %d (%p) for if %p", @@ -3162,7 +3162,7 @@ void bpfattach2(struct ifnet *ifp, u_int dlt, u_int hdrlen, struct bpf_if **driverp) { - *driverp = (struct bpf_if *)&dead_bpf_if; + *driverp = __DECONST(struct bpf_if *, &dead_bpf_if); } void From nobody Sat Oct 21 06:10:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC9zs0w3wz4xYb1; Sat, 21 Oct 2023 06:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SC9zs0632z4W5C; Sat, 21 Oct 2023 06:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697868633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AtP2kkdb+tZprMTZQOqBACMlrrNyxz1mljFJKoiSYc=; b=gURV7wQiQF8GJOqe9N3Yr0qPLws3OR+Dpk+qwSy5qFdDUDUsa7BcFN2YtshVWWyQbBFmHh yPdsTEmkoDc8Liv3dNgV7vTy8kxGONfcYzg3vPGKxp+jgTB8kClXg4EQoeWz3l26mZrjJt IilJa2o191Ham2nPiZktpR0evd7BhtATt6O1lF1Ka3D8ISJjDdUxqHOYkK7kNvk2Uax31x kBMA9jJ71zBS4unpOyV1YuB3adftv5he1RJYBmjNHL4xGTACIRKP6Ti/gk2rpMGaTuTEYn WjIzg4QG/nZgwSc+WKxpolG72e3ErkCkjncZq6EORoVpRKxUZDu188Il3AkxAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697868633; a=rsa-sha256; cv=none; b=hbvchQbrl2vcq96IxD7tUWZvNtIzZ2rlD3EtiQUKB/ARjsd57+sdg1J77RumCp5OMAg2Xh UwytE9WhsvOD+JqKgWz4Fh2ZVp3TSWXy+raU/uCnJQiD8iGg1BvdagzRv1Jky2FK2TlJgQ NBJ/vMddDnKm8kdxv/JXlvzQD/er3wVQ2FHlGOS8sZsA8G5/zvbJw6/04ZFRjWEVbg/UjO uIOyds5cSIYhSfhsvqwJLgfgspWsqzy8V0WWmMhA0O9peeG0woZu2exkm92OqdqrO4bRWC 8PnLW9uh/0gbQ5Q988aWdl6wev+fM2nxa4TZwZpEvP1ISnmwXE6sATAsYVPMvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697868633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AtP2kkdb+tZprMTZQOqBACMlrrNyxz1mljFJKoiSYc=; b=xrNrkewB4WREIdPTtlnj72pBnZoAzRUsM/fvn1XUl67qIMKXj1Zukv1uEPLfZISI4rkfsE huwufVTHR2mLdDi6OoPzY44AMOkgeaq1SoBhUoZYi53f+wm9u2LCKFyN5D2O8+t4SVbGK9 vBroorLBWZJ3wjUU0RmG5TpOaU8JDi4Kd9Cv5Q/+Diq5n2g4d2MaU7NSMqNgFVWkXh9B1g /voySnr49PXVuEWi1Yire4rNINnX3yqS4Mh1xsOqHIahmKptGb7aZLtbf8p8p0gYhYPNXx 1sF3dt/rxW4SX2NIls1F8dDOYhU5WSyNWgHnV0hudX40E+t7SFFjjryD4CKOGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC9zr6GWYz14Jp; Sat, 21 Oct 2023 06:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39L6AWNj050352; Sat, 21 Oct 2023 06:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L6AWUh050349; Sat, 21 Oct 2023 06:10:32 GMT (envelope-from git) Date: Sat, 21 Oct 2023 06:10:32 GMT Message-Id: <202310210610.39L6AWUh050349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2fee3974603b - main - ufs quotas: fix configuring soft quota grace time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2fee3974603bce6f2dc153eb6af459cb4f864ab4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2fee3974603bce6f2dc153eb6af459cb4f864ab4 commit 2fee3974603bce6f2dc153eb6af459cb4f864ab4 Author: Mikel Lechner AuthorDate: 2023-10-21 06:08:38 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-21 06:08:38 +0000 ufs quotas: fix configuring soft quota grace time The QTF_CLOSING flag needs to be cleared earlier to allow dqget() to work. PR: 274552 MFC after: 1 week --- sys/ufs/ufs/ufs_quota.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 8f77fb3a95d2..78f539bcabd2 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -580,6 +580,15 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname, VN_LOCK_DSHARE(vp); VOP_UNLOCK(vp); *vpp = vp; + + /* + * Allow the getdq from getinoquota below to read the quota + * from file. + */ + UFS_LOCK(ump); + ump->um_qflags[type] &= ~QTF_CLOSING; + UFS_UNLOCK(ump); + /* * Save the credential of the process that turned on quotas. * Set up the time limits for this quota. @@ -594,13 +603,6 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname, ump->um_itime[type] = dq->dq_itime; dqrele(NULLVP, dq); } - /* - * Allow the getdq from getinoquota below to read the quota - * from file. - */ - UFS_LOCK(ump); - ump->um_qflags[type] &= ~QTF_CLOSING; - UFS_UNLOCK(ump); /* * Search vnodes associated with this mount point, * adding references to quota file being opened.