From nobody Mon Jan 22 05:01:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJJ3c1NpTz573B3; Mon, 22 Jan 2024 05:01: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 4TJJ3c0yhhz54v4; Mon, 22 Jan 2024 05:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IUhgYl5kfVKHcw7yEixTmxINQHI5QNJoQ8tIVeP8VBQ=; b=Y6HD4TCi/sGU19dIennnJ881P4L02gQ8Qp3ydsCaI25JSqBXEgdiu3NQRYKQWsNID4K9om SaMvrgzuCvLezPw1n7jVpnlbqNDTP+smilMN3akWMCz1QttsefKVQzGcU1UMYX+nKXH2E5 hLF6TbmlWPkQvcn6wfY7W3A9vGEIx+PM69iTzSk/Vl+MhVDwEyPDS/+wy2qsviniyL6ysh RaWIJpQvfAN91IePZXkNtc74LMZbNT6kM6Q3YufBor4bZDMwIghh8XzHPF9fdUCfLF4U9a 8mKwSU4C40BaGGh1xo0K6z7rPLCvUpVEvmTNIkfEiVRs0wkSfw+1qfwI4Htq3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IUhgYl5kfVKHcw7yEixTmxINQHI5QNJoQ8tIVeP8VBQ=; b=nuJjyjWOfAJqrODd3vE5h2ycgaabEj+e954gAvZH+y5TOphJNxuKbvbTdiwIogFOc9ytCF rPigFozdQbDLalc0myV91brEleWM4yku/ZjIx8n/dk7qB90HN7KcBuotAgtBTZfm6vVANc fdH34oFGGQgHC7rigjfyMsKTfBHwXiCDufzokHpangWgF/R1QKQks15eQ5u3y6fIBqSzlo G28tSL5FFMvQyfmesGG31QnJbXdMqVRJuu+MIs4ny2FVzQIia1ObtK+qiT34dGUKTW82Op JnJMVLWrSK0GincYteiLDbVZ231N33lB7Z12DiIcB/glSIIkVl9O5UHWa5KiXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705899708; a=rsa-sha256; cv=none; b=jXOTgQDa9aLw/b/UkS+j+juwEWaEARkWCouLd6djzcLqCNunqOGw46QEOI7dFCERmlObPY udV3LajzAtny5sKeZ+bVJy6hK3ZIw2bEdXo/DRx6Dtsi3Z6hQX9l5nVuGQVElDonXbVoQb dRYWeP7gb5x7l3gd4dHTF7UgXy8OhAJSoTduPDkft1pjFTX9pkkJrHpmOQzN9Vu/iDjP44 ZOEsSBgeUIWqi1IJnyuRNAbVa44h7jY74hvbYnVpU5AzS+YT77ilU0I8iaxfFTPcgoPbV0 hGwdxqZXhE7uVTy+N1nsL5Afw/6DLrZzAdWmAsXIFOGYyCODf1p/U2y7x5oGmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJJ3c02Njznc9; Mon, 22 Jan 2024 05:01: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 40M51lAt053597; Mon, 22 Jan 2024 05:01:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M51lgY053594; Mon, 22 Jan 2024 05:01:47 GMT (envelope-from git) Date: Mon, 22 Jan 2024 05:01:47 GMT Message-Id: <202401220501.40M51lgY053594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0a586a7d756c - stable/14 - linuxkpi: correct zone item size for linux_mm_zone List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a586a7d756c47ef0e0171e32664467aea4279a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0a586a7d756c47ef0e0171e32664467aea4279a0 commit 0a586a7d756c47ef0e0171e32664467aea4279a0 Author: Konstantin Belousov AuthorDate: 2024-01-14 21:00:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-22 05:01:24 +0000 linuxkpi: correct zone item size for linux_mm_zone (cherry picked from commit 4958df5dabce62ef4e9e96b0d1bf62f3a6cce689) --- sys/compat/linuxkpi/common/src/linux_current.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_current.c b/sys/compat/linuxkpi/common/src/linux_current.c index bec53384361f..c342eb279caa 100644 --- a/sys/compat/linuxkpi/common/src/linux_current.c +++ b/sys/compat/linuxkpi/common/src/linux_current.c @@ -294,7 +294,7 @@ linux_current_init(void *arg __unused) uma_zone_reserve(linux_current_zone, lkpi_task_resrv); uma_prealloc(linux_current_zone, lkpi_task_resrv); linux_mm_zone = uma_zcreate("lkpimm", - sizeof(struct task_struct), NULL, NULL, NULL, NULL, + sizeof(struct mm_struct), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_reserve(linux_mm_zone, lkpi_task_resrv); uma_prealloc(linux_mm_zone, lkpi_task_resrv); From nobody Mon Jan 22 05:02:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJJ4C4Zw3z573XH; Mon, 22 Jan 2024 05:02: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 4TJJ4C48Ldz55Wh; Mon, 22 Jan 2024 05:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FrD480Ut3JT2TFIBewP06bQuAD+Pe8XALkubrPmXGzc=; b=cIJ3cuf6apx4CFT7zcwgp+8k/HxxZi4Ohd1xuEASw7ZYibqg8hy8Fzcj/o/bfTAdDxLwAj YIvEaz2Lw6dy/nw3Sy1scFVjxcJwAlzikXqiixAT6YuQVUAR+4y9IX8cwRC2dHVO9U4pBB QQArhdPbYX7K9eiRopK3tFq66D0Xpb6vVu2jdmcJmAEmaz8Mc9bG50eVCv1AgLsIoSH/QF Vb0MUUhsG8GUOE3Xw09KwYPmaMZQ3DxKYWTGIlQDFsqmEH2GdiWh2xyUYF3qb8Zh3GW35L XE4leU2KgAUbFKZcZ07/NTGDldOjxX96RJOajmDLW7pKJq12CY4ph7TW9tel2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FrD480Ut3JT2TFIBewP06bQuAD+Pe8XALkubrPmXGzc=; b=wLOpEQO4dghhHnx9UYm1PWES7dnLn1bHI+NtbwXUG9DNznYZdqvFlAIZkZVd4M2hAb54Af 95KoFVCV3S52jUxf5tCC/smTYTtE3cF0Og8RqUMo1O84Nl/ZXSWzBdFM84rn1XOYPT7ezi z/pKjCvypthjHt4B0/fPXM6ViNeBf91MeYB3U6xBXW3RkkvvW7RnabFfClNWdvrLCj+SZj dCnUDmBLpFZBNDU95hCuWyu1hE84tA4MAABOigMjMM6h+8Vrqya925RWNZWB1gValyaEZn 5geVZP/Kq9UBZWm6aYfm4JpOOD2Fzyds+bc9I8CJiFcLz+omrrDCSoZI26tkmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705899739; a=rsa-sha256; cv=none; b=mcd0PKY9U3SeIokae04+3KG3atiplR/3Q7JhO/XsHgtvZdp4GdRBzpvORR8ANLyS/7W+sX Y0vhqwIPPZV45d8WoAQwAhFMLpDuGT7+u4YnZODsQWEfJdJpKLhs8UZY1fY+XyyWH2bYbw isZVFsu31siTpwxwHnuUgVUdZZOBHcMtY7PvNWBDNZf92jv1kteAOawEL/scWJj1sTMCtr 8fcB1mAFLZefV/dBaYKoF8RC43wqwfxqke9pftzTQA3y9GYSPt75ikVHfU5yb5KrHiPf6+ DUpKYDULP1Bcm63wFLmhSvuySRjH45s/8wI6GvabeoPDeUtmWRV9+WxlLl9K6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJJ4C3C44zpD2; Mon, 22 Jan 2024 05:02: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 40M52JAY055848; Mon, 22 Jan 2024 05:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M52JjZ055845; Mon, 22 Jan 2024 05:02:19 GMT (envelope-from git) Date: Mon, 22 Jan 2024 05:02:19 GMT Message-Id: <202401220502.40M52JjZ055845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d0ed621ef2ce - stable/13 - linuxkpi: correct zone item size for linux_mm_zone List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d0ed621ef2ce64394166d9555a28658ba4bd3a33 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d0ed621ef2ce64394166d9555a28658ba4bd3a33 commit d0ed621ef2ce64394166d9555a28658ba4bd3a33 Author: Konstantin Belousov AuthorDate: 2024-01-14 21:00:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-22 05:01:56 +0000 linuxkpi: correct zone item size for linux_mm_zone (cherry picked from commit 4958df5dabce62ef4e9e96b0d1bf62f3a6cce689) --- sys/compat/linuxkpi/common/src/linux_current.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_current.c b/sys/compat/linuxkpi/common/src/linux_current.c index a054d1f40b2a..b193416f5fed 100644 --- a/sys/compat/linuxkpi/common/src/linux_current.c +++ b/sys/compat/linuxkpi/common/src/linux_current.c @@ -288,7 +288,7 @@ linux_current_init(void *arg __unused) uma_zone_reserve(linux_current_zone, lkpi_task_resrv); uma_prealloc(linux_current_zone, lkpi_task_resrv); linux_mm_zone = uma_zcreate("lkpimm", - sizeof(struct task_struct), NULL, NULL, NULL, NULL, + sizeof(struct mm_struct), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_reserve(linux_mm_zone, lkpi_task_resrv); uma_prealloc(linux_mm_zone, lkpi_task_resrv); From nobody Mon Jan 22 09:39:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQD13TYpz57X1j; Mon, 22 Jan 2024 09:39: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 4TJQD12xmdz4MmN; Mon, 22 Jan 2024 09:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6eaaEU9VGmDiw4oPDBDNir0VP1vRPM8q/wDdViSkO4=; b=tWDjbuZLESMir6oeeWylMbiiDHiTaSSXmBuzSw15jAyOkJM7HPgZrJUdGpuJ7jibYmeQZH oXh/Zl5cT8xYtscBccQ8FnyuwNrdE5c8ZD0TDVLxI4jI3ckNRUNp8ZhXxXW6zGHUYKnxQ0 G1uvVgRsEbxijIk+TliZpaKE0d7AKkXg36Z26/Y2JeeXQLRRtIphb4QOEDigI/JSHBBWPG usH+l5MAkpuL0idenp00h7n8sFbneOwDOq6Pw+KYhvmnluDVhMRZYq0jdvoV2wdiOT5Gw0 Hmc9i8ic8wmvt5jTNTfoxomhlPn+3frv5ddM00wvxDGPeUgWwQpAevgfbai1iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6eaaEU9VGmDiw4oPDBDNir0VP1vRPM8q/wDdViSkO4=; b=FORR9KPxEnwfqWrsuW3oykWLq24BK/QbMX/fe4494o7+Y1+9ml8yrvsnT+8H4i3jx91V5k 3FX3lhfs488WfZ5TRv6/Fag0syZDHxPqH3ZYqZMtuKWLTKJKXmA1Ae2zuiBDk6F4uN5KGC MCwLDeXK6pIBzoFdtQ7fdczC7VMv3KgchZ3mehfdRMnWaVkLC8VSQbuEgxjEWqdjKulJ6G P3oe1NZKMWLAUF95y1haBu8FDjwj6JAtmcG4kP+CTRDp68UcXGiSx/EDbO2bunOaojriGV uw+89tu394Ysrl0Vr1/41jAQn47rPu1bxkhYx/i2Kz9H5fLQY2Z1bzQOrlf1sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916369; a=rsa-sha256; cv=none; b=nOpnQM3+RVezy/siEAGA+8b6oMWxeEKxI4OT0ygsZ8ZXwo7JGCehIa6GWFuACMmxL18Orc zWcH/XG6O25nK7cqZQCp6ID9+IXbwGys5BVoiWkgGgij65fEsTA9QrNGG2BFYurnSPCscK SE5JY0Lhx6pG2JnJPMq4OoqtezimTvXuvQNi84YVJyrA3hNKxCp3oYGiiti9qFPTRyiRxx yzkjncaEzlNjBvmLEqTGmnaFnDZ71BTRjRe+ItXLg1IwrgIlqgAQVS4RgZISRQM/J3vC34 RAkFXXbtdNesZQMsGlQCBljCaj6weA0pQktONu+kAyhX2bv26FBwe4bz1FuDLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQD11pRFzwrY; Mon, 22 Jan 2024 09:39: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 40M9dTSu010652; Mon, 22 Jan 2024 09:39:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9dTxi010649; Mon, 22 Jan 2024 09:39:29 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:39:29 GMT Message-Id: <202401220939.40M9dTxi010649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d1fdafc789df - stable/14 - jail: add security.jail.mlock_allowed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1fdafc789dfd6c9ad4145ca0bcfde87b1ca818e Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d1fdafc789dfd6c9ad4145ca0bcfde87b1ca818e commit d1fdafc789dfd6c9ad4145ca0bcfde87b1ca818e Author: Baptiste Daroussin AuthorDate: 2024-01-04 14:09:44 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:39:16 +0000 jail: add security.jail.mlock_allowed when the parameter allow.mlock was added a way for jails to check if the parameter was set or now has not been added, this change covers it. MFC After: 3 days Reviewed by: jamie@ Differential Revision: https://reviews.freebsd.org/D43314 (cherry picked from commit 9fd978680db6495180a4d46f76529d344b003c80) --- sys/kern/kern_jail.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index e95008be42e8..91466c46bc62 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4393,6 +4393,10 @@ SYSCTL_PROC(_security_jail, OID_AUTO, mount_allowed, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, PR_ALLOW_MOUNT, sysctl_jail_default_allow, "I", "Processes in jail can mount/unmount jail-friendly file systems (deprecated)"); +SYSCTL_PROC(_security_jail, OID_AUTO, mlock_allowed, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + NULL, PR_ALLOW_MLOCK, sysctl_jail_default_allow, "I", + "Processes in jail can lock/unlock physical pages in memory"); static int sysctl_jail_default_level(SYSCTL_HANDLER_ARGS) From nobody Mon Jan 22 09:39:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQDZ5N2Cz57XHb; Mon, 22 Jan 2024 09:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJQDZ3hctz4Mw5; Mon, 22 Jan 2024 09:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fgadJuXyz5474v846b7BV49qcSGwg4cO4oRKLE9eAA=; b=rrBc9WyT9AfAtbYYWDvNDPrIqITftAX6KkE6zKVdPLNmQVq9jUqs1RabC5Wqw3Nevnohjd sWKKUymt+1MUnQxb4U0IKno352Q/JzvKkHx5hBzVBeqREx0am6fXRuyCPG/TOMEHkJwVNG fMk5b0tcTXcvEK19V7M/XN/Cf/m/Jx/k2Bw34JzbdDylW511oru9E0YiyDnOtcCMP5rxwz NTi4oDh4vn7yxXrLjjuz0y9MnLRlSkxbU7sFKigJt/kw0fe5xSyEDmgT3aiMWBXs+e3q2m Trv2DqfgUK8P0ouyUJdvdlNsffI7ae2KHHzYdFv6FYp4RFzgC/OolqurRplNpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fgadJuXyz5474v846b7BV49qcSGwg4cO4oRKLE9eAA=; b=BNFoHVgegRR4p6X6WCum5gAzbihEUHI+y29yyjL1Lwc5Mx/8mmvH97OMwzctkml8Te37qf yhwYCKEnC8sXV8hwPU3y/AF3NYXhCbiJWLyooi+6rgnb4xBQ7tPrfwIkWfjwNpfRseHxsa Xq9ORViikapEnPVT3hqll3eNGAVU/sj/wCSoofjDgMgGq3pACZ/N/CcDSadrJ9OOU6AE5j wc/Nnon/Td1rTMoOAtNQrrhg4izhhZBHcWg9tr1/Up8wpKJEcm6lp5+ptabP756kEUjvtx YrtBbJpHcv4PkBeLia8RXHoaSfdFWjKV+J6Xj8LcZpjSmr1UPqAQSh5uRkbkxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916398; a=rsa-sha256; cv=none; b=Xc9BawveWPMaGAOd7eusMxbTK7xrkXqRNQZZ0fypZALmJ7gBxU1RyaxIz9f4kCd7YOppFL qAHdNih78OyhgipisMrfOUv3zgPL92ztuZjY/q51oy7qK0pu+pZbphG6wXIwMg1s6m4b8m 8Apa8raKYmGUsg9Dela/KTEsRXwjLRalH8L0D/J0JeShBTig52XZ0XuuqmZDxQDhEAAvEe tojXfXwuKawUqwk1wFcd3f+BOPjQIQ88ZZswMyhkRWPPUxURpcEz/k++iyiqwMw1q0msvL rif6x/LVScZWddOsoSuW/lyYomsP04y1JZ6YsY6YlhTLFUJyziTYHiYiw1Oojw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQDZ2lFxzwdv; Mon, 22 Jan 2024 09:39: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 40M9dweg010843; Mon, 22 Jan 2024 09:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9dwff010840; Mon, 22 Jan 2024 09:39:58 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:39:58 GMT Message-Id: <202401220939.40M9dwff010840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 73e891526ebf - stable/13 - jail: add security.jail.mlock_allowed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 73e891526ebfda33ccc6162b0b41af46ee3a689c Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=73e891526ebfda33ccc6162b0b41af46ee3a689c commit 73e891526ebfda33ccc6162b0b41af46ee3a689c Author: Baptiste Daroussin AuthorDate: 2024-01-04 14:09:44 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:39:49 +0000 jail: add security.jail.mlock_allowed when the parameter allow.mlock was added a way for jails to check if the parameter was set or now has not been added, this change covers it. MFC After: 3 days Reviewed by: jamie@ Differential Revision: https://reviews.freebsd.org/D43314 (cherry picked from commit 9fd978680db6495180a4d46f76529d344b003c80) --- sys/kern/kern_jail.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 8b043687a75b..5c2da1048b7b 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4066,6 +4066,10 @@ SYSCTL_PROC(_security_jail, OID_AUTO, mount_allowed, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, PR_ALLOW_MOUNT, sysctl_jail_default_allow, "I", "Processes in jail can mount/unmount jail-friendly file systems (deprecated)"); +SYSCTL_PROC(_security_jail, OID_AUTO, mlock_allowed, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + NULL, PR_ALLOW_MLOCK, sysctl_jail_default_allow, "I", + "Processes in jail can lock/unlock physical pages in memory"); static int sysctl_jail_default_level(SYSCTL_HANDLER_ARGS) From nobody Mon Jan 22 09:40:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQFZ1w3Qz57XHl; Mon, 22 Jan 2024 09:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJQFZ1bGLz4NDD; Mon, 22 Jan 2024 09:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTCgyehsZQSFhtAFeOBNqv5QiG3Xv5Wy2U8fIiTZI/o=; b=Yx/QILAWQwPrOS41Xm1ymnEtado3/2RVggK8bS4UaeUFgGdFfPvFVIch47Z9tNIzHY5Rh6 +P9OAgr+/8xROKQbz5Bsnhv9PRBQ+FgdpIvBmeQctiQnhuEuazzyyV9tmhZ+GWDpiRnVhL 4RyBnGeisJJUxglqtnbEooNSAEm8jLllCy/9n1Eop/70IomY8Dw/NenyYn92ebE0C2hZK5 cgrSX+OSZW4rvKQFfToa0p9EuzIdzesCOTwm726dTgSOiXJlX0tdAPjfFLKrdtEAVTUHXR pYiWC90j86osg5qjZn58+MCx5Rg7if2sY5B5H6GccHb0Q50/6qiK5gElJA8Nlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTCgyehsZQSFhtAFeOBNqv5QiG3Xv5Wy2U8fIiTZI/o=; b=o/A9es4BbGJH2fMJfG1RDG7IylQQo33jXSqos6yCXma4BLB8HrUt0XcSRzKwXQbgK1TFjr gCSrknUr5SFkUF0qmicDFsscyQXR0mGr+SbAiHotri8CQE3ByK28s+RzYRB5z3c7mdxY/l WP7EkwE1fS5E3+ulC5box4vMlAetX1u+fHZgEYE+OfsLXkk3s2f17aQJSbaJqbziz6RK05 T8EksAa8ZCgf/LQYf6MwYezJftLJQHoDKUWOKPRrlA0fLlaxLrbzNZYjD/+kZU661L+2JQ oB3p6TVs4CBMgruInXzhM1D9FxUXEAWgKnQ2OGjJ8Qulv1Z64nKOAMfPu6InHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916450; a=rsa-sha256; cv=none; b=Sq3sl2HQ2w2rJOhBB9KpvSrLvkmZPZUgRgv8ftqu4cb5gKuEokLlmI9tPjsHvpjvwMkMjf 7DWfWUSqSZR340lbFlelZAJ0PtTCGtVHFzpn7dXh5HxOy3SoQyIPBeF7KNiTExCmrijFZm poAVr1TPQdanrmfto2S6MyMmJQUyTXPaG1DMo/l+1q6cHIJYp/BdUPhRtFx632hwgXOUis w3uHXVHqFiEJzPfAevT1swuBkehMiKCZkIRIXA3betSRb1aNfkaNqOi+9KdDNG5XZb0RK1 WBY8tx75Gw1cJKh/w+Gja+8rwwQOg0sku7eNQZ9TODTAnMg3RIrswc3u8gg34g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQFZ0fgXzwJY; Mon, 22 Jan 2024 09:40:50 +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 40M9eoqW019585; Mon, 22 Jan 2024 09:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9eotg019582; Mon, 22 Jan 2024 09:40:50 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:40:50 GMT Message-Id: <202401220940.40M9eotg019582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 9d29be87d86c - stable/14 - pci_vendors: update to 2023-11-11 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d29be87d86c9bbaa5e07cc5dfeda31581de99aa Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9d29be87d86c9bbaa5e07cc5dfeda31581de99aa commit 9d29be87d86c9bbaa5e07cc5dfeda31581de99aa Author: Baptiste Daroussin AuthorDate: 2023-12-04 10:51:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:40:39 +0000 pci_vendors: update to 2023-11-11 (cherry picked from commit 01e286b54190620ceec85ef865a51eb79b5d81c0) --- share/misc/pci_vendors | 580 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 500 insertions(+), 80 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 50115d979327..bad1d0bd066b 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.09.22 -# Date: 2023-09-22 03:15:02 +# Version: 2023.11.11 +# Date: 2023-11-11 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,8 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] - f1ab P41 Plus NVMe SSD (DRAM-less) - f1ac P44 Pro NVMe SSD + f1ab P41 Plus NVMe SSD (DRAM-less) [Echo Harbor] + f1ac P44 Pro NVMe SSD [Hollywood Beach] 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -773,6 +773,9 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front + 1028 22cb PERC H365i Front + 1028 22cc PERC H965i Front + 1028 22cd HBA465i Front 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -816,6 +819,8 @@ 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter # 9700 16 external port Storage controller 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter + 1028 22d2 PERC H975i Front + 1028 22d3 PERC H975i Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1055,6 +1060,7 @@ 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0703 ThinkSystem M.2 RAID B540d-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1201,7 +1207,7 @@ 103c 8b17 ProBook 445 G9/455 G9 [Ryzen 7 Integrated Radeon GPU] 15ff Fenghuang [Zhongshan Subor Z+] 1607 Arden - 1636 Renoir + 1636 Renoir [Radeon RX Vega 6 (Ryzen 4000/5000 Mobile Series)] 1637 Renoir Radeon High Definition Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 @@ -1215,6 +1221,8 @@ 1681 Rembrandt [Radeon 680M] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s + 1900 Phoenix3 + 1901 Phoenix4 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 3151 RV380 GL [FireMV 2400] @@ -3944,6 +3952,7 @@ 1849 5236 RX 6650 XT Challenger D OC 73f0 Navi 33 [Radeon RX 7600M XT] 73ff Navi 23 [Radeon RX 6600/6600 XT/6600M] + 1462 5021 MSI RX 6600XT MECH 2X 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB @@ -3960,6 +3969,7 @@ 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 1002 0e3b RX 7900 GRE [XFX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] @@ -4815,6 +4825,7 @@ 1014 04fb PCIe3 x16 20GB Cache 12Gb Quad SAS RAID+ Adapter(580B) 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A) 04ed Internal Shared Memory (ISM) virtual PCI device + 0611 4769 Cryptographic Adapter 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -5281,7 +5292,7 @@ 1646 VanGogh IOMMU 1647 VanGogh PCIe GPP Bridge 1648 VanGogh Internal PCIe GPP Bridge to Bus - 1649 VanGogh PSP/CCP + 1649 Family 19h PSP/CCP 164f Milan IOMMU 1650 Milan Data Fabric; Function 0 1651 Milan Data Fabric; Function 1 @@ -8439,6 +8450,7 @@ 764d PXI-2521 764e PXI-2522 764f PXI-2523 + 7652 PXIe-4080 7654 PXI-2796 7655 PXI-2797 7656 PXI-2798 @@ -8453,7 +8465,14 @@ 76a3 PXIe-6535B 76a4 PXIe-6536B 76a5 PXIe-6537B + 76d8 PXIe-4081 + 76d9 PXIe-4082 + 77a8 PXIe-6375 783e PXI-8368 + 7882 PXIe-6376 + 7883 PXIe-6378 + 799e PXIe-6386 + 799f PXIe-6396 9020 PXI-2501 9030 PXI-2503 9040 PXI-2527 @@ -8748,6 +8767,8 @@ 13e9 0070 Win/TV (Video Section) 036e Bt878 Video Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 + 0000 0004 Euresys PICOLO Pro 3E 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8768,6 +8789,23 @@ 14f1 0002 Bt878 Mediastream Controller PAL BG 14f1 0003 Bt878a Mediastream Controller PAL BG 14f1 0048 Bt878/832 Mediastream Controller + 1805 0101 Euresys PICOLO Tetra + 1805 0102 Euresys PICOLO Tetra + 1805 0103 Euresys PICOLO Tetra + 1805 0104 Euresys PICOLO Tetra + 1805 0105 Euresys PICOLO Tetra + 1805 0106 Euresys PICOLO Tetra + 1805 0107 Euresys PICOLO Tetra + 1805 0108 Euresys PICOLO Tetra + 1805 0201 Euresys PICOLO Tetra-X + 1805 0202 Euresys PICOLO Tetra-X + 1805 0203 Euresys PICOLO Tetra-X + 1805 0204 Euresys PICOLO Tetra-X + 1805 0401 Euresys PICOLO Tymo + 1805 0402 Euresys PICOLO Tymo + 1805 0403 Euresys PICOLO Tymo + 1805 0404 Euresys PICOLO Tymo + 1805 1001 Euresys PICOLO Junior 4 1822 0001 VisionPlus DVB card 1851 1850 FlyVideo'98 - Video 1851 1851 FlyVideo II @@ -8843,6 +8881,8 @@ 1852 1852 FlyVideo'98 (with FM Tuner) 0878 Bt878 Audio Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 (Audio Section) + 0000 0004 Euresys PICOLO Pro 3E (Audio Section) 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8865,6 +8905,23 @@ 14f1 0002 Bt878 Video Capture (Audio Section) 14f1 0003 Bt878 Video Capture (Audio Section) 14f1 0048 Bt878 Video Capture (Audio Section) + 1805 0101 Euresys PICOLO Tetra (Audio Section) + 1805 0102 Euresys PICOLO Tetra (Audio Section) + 1805 0103 Euresys PICOLO Tetra (Audio Section) + 1805 0104 Euresys PICOLO Tetra (Audio Section) + 1805 0105 Euresys PICOLO Tetra (Audio Section) + 1805 0106 Euresys PICOLO Tetra (Audio Section) + 1805 0107 Euresys PICOLO Tetra (Audio Section) + 1805 0108 Euresys PICOLO Tetra (Audio Section) + 1805 0201 Euresys PICOLO Tetra-X (Audio Section) + 1805 0202 Euresys PICOLO Tetra-X (Audio Section) + 1805 0203 Euresys PICOLO Tetra-X (Audio Section) + 1805 0204 Euresys PICOLO Tetra-X (Audio Section) + 1805 0401 Euresys PICOLO Tymo (Audio Section) + 1805 0402 Euresys PICOLO Tymo (Audio Section) + 1805 0403 Euresys PICOLO Tymo (Audio Section) + 1805 0404 Euresys PICOLO Tymo (Audio Section) + 1805 1001 Euresys PICOLO Junior 4 (Audio Section) 1822 0001 VisionPlus DVB Card 18ac d500 DViCO FusionHDTV5 Lite 270f fc00 Digitop DTT-1000 @@ -8991,6 +9048,10 @@ 1147 VScom 020 2 port parallel adaptor 2000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge 10b5 9030 ATCOM AE400P Quad E1 PCI card + 2300 Euresys DOMINO Gamma + 2374 Euresys DOMINO Alpha + 2491 Euresys GRABLINK Value + 2493 Euresys GRABLINK Expert 2540 IXXAT CAN-Interface PC-I 04/PCI 2724 Thales PCSM Security Card 3376 Cosateq 4 Port CAN Card @@ -9106,6 +9167,7 @@ e1c5 0006 TA1-PCI4 9036 9036 9050 PCI <-> IOBus Bridge + 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended 10b5 1169 Wasco OPTOIO32standard 32 digital in, 32 digital out @@ -9117,6 +9179,7 @@ 10b5 2905 Alpermann+Velte PCI TS: Time Synchronisation Board 10b5 3196 Goramo PLX200SYN sync serial card 10b5 9050 PCI-I04 PCI Passive PC/CAN Interface + 11a9 5334 PDS4 12fe 0001 CAN-PCI/331 CAN bus controller 1369 8901 PCX11+ PCI 1369 8f01 VX222 @@ -9542,6 +9605,7 @@ 10be Tseng Labs International Co. 10bf Most Inc 10c0 Boca Research Inc. + 9135 iX3D Ultimate Rez 10c1 ICM Co., Ltd. 10c2 Auspex Systems Inc. 10c3 Samsung Semiconductors, Inc. @@ -12778,16 +12842,20 @@ 2331 GH100 [H100 PCIe] 2336 GH100 [H100] 2337 GH100 [H100 SXM5 64GB] + 2338 GH100 [H100 SXM5 96GB] 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] 233d GH100 [H100 96GB] 2342 GH100 [GH200 120GB] 2343 GH100 2345 GH100 [GH200 480GB] + 23b0 GH100 + 23f0 GH100 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] 2460 GA103M [GeForce RTX 3080 Ti Laptop GPU] + 2480 GA104 [Reserved Dev ID A] 2482 GA104 [GeForce RTX 3070 Ti] 2483 GA104 2484 GA104 [GeForce RTX 3070] @@ -12816,6 +12884,7 @@ 24ba GA104GLM [RTX A4500 Laptop GPU] 24bb GA104GLM [RTX A3000 Laptop GPU] 24bf GA104 [GeForce RTX 3070 Engineering Sample] + 24c0 GA104 [Initial Dev ID B] 24c7 GA104 [GeForce RTX 3060 8GB] 24c8 GA104 [GeForce RTX 3070 GDDR6X] 24c9 GA104 [GeForce RTX 3060 Ti GDDR6X] @@ -12843,6 +12912,7 @@ 2571 GA106 [RTX A2000 12GB] 2582 GA107 [GeForce RTX 3050 8GB] 2583 GA107 [GeForce RTX 3050 4GB] + 2584 GA107 [GeForce RTX 3050 6GB] 25a0 GA107M [GeForce RTX 3050 Ti Mobile] 25a2 GA107M [GeForce RTX 3050 Mobile] 25a3 GA107 @@ -12881,6 +12951,7 @@ 26b8 AD102GL [L40G] 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] + 2703 AD103 [GeForce RTX 4080 SUPER] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] @@ -12891,6 +12962,7 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b1 AD104GL [RTX 4500 Ada Generation] 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] @@ -13074,6 +13146,7 @@ 2011 Q-Motion Video Capture/Edit board 4750 S5930 [Matchmaker] 5920 S5920 + 801d Roper Scientific PCI TAXI interface 8043 LANai4.x [Myrinet LANai interface chip] 8062 S5933_PARASTATION 807d S5933 [Matchmaker] @@ -13147,6 +13220,7 @@ 1028 06e6 Latitude 11 5175 2-in-1 1028 09be Latitude 7410 1028 0b10 Precision 3571 + 1028 0c06 Precision 3580 17aa 224f ThinkPad X1 Carbon 5th Gen 5260 RTS5260 PCI Express Card Reader 5261 RTS5261 PCI Express Card Reader @@ -13160,6 +13234,7 @@ 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) + 5772 RTS5772DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -13342,13 +13417,17 @@ 8813 RTL8813AE 802.11ac PCIe Wireless Network Adapter 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter 8852 RTL8852AE 802.11ax PCIe Wireless Network Adapter + a85a RTL8852AE WiFi 6 802.11ax PCIe Adapter b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 17aa b736 Z50-75 + b821 RTL8821CE PCIe 802.11ac Wireless Network Controller b822 RTL8822BE 802.11a/b/g/n/ac WiFi adapter 103c 831b Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported) 17aa 5124 ThinkPad E595 17aa b023 ThinkPad E595 + b852 RTL8852BE PCIe 802.11ax Wireless Network Controller + b85b RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R] c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter c822 RTL8822CE 802.11ac PCIe Wireless Network Adapter c82f RTL8822CE 802.11ac PCIe Wireless Network Adapter @@ -13379,6 +13458,8 @@ 500c Alveo U280 XDMA Platform 5020 Alveo U50 XMDA Platform 505c Alveo U55C + 5074 Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card + 5084 Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter 6987 SmartSSD 6988 SmartSSD 7011 7-Series FPGA Hard PCIe block (AXI/debug) @@ -15366,7 +15447,7 @@ 1179 0021 KIOXIA CD5 series SSD 1d49 4039 Thinksystem U.2 CM5 NVMe SSD 1d49 403a Thinksystem AIC CM5 NVMe SSD - 0113 BG3 NVMe SSD Controller + 0113 BG3 x2 NVMe SSD Controller (DRAM-less) 1179 0001 Toshiba KBG30ZMS128G 128GB NVMe SSD 0115 XG4 NVMe SSD Controller 0116 XG5 NVMe SSD Controller @@ -15686,6 +15767,8 @@ 000b ATP867-B 000d ATP8620 000e ATP8620 + 0011 ATP865-B + 1191 0011 ACARD AEC-6280 8002 AEC6710 SCSI-2 Host Adapter 8010 AEC6712UW SCSI 8020 AEC6712U SCSI @@ -15949,7 +16032,7 @@ 6281 88F6281 [Kirkwood] ARM SoC # This device ID was used for earlier chips. 6381 MV78xx0 [Discovery Innovation] ARM SoC - 6440 88SE6440 SAS/SATA PCIe controller + 6440 88SE63x0 x1, 88SE6440 x4 PCIe SAS/SATA 3Gb/s RAID controller 6450 64560 System Controller 6460 MV64360/64361/64362 System Controller 6480 MV64460/64461/64462 System Controller @@ -15960,7 +16043,7 @@ 6820 88F6820 [Armada 385] ARM SoC 6828 88F6828 [Armada 388] ARM SoC 6920 88F6920 [Armada 390] ARM SoC - 7042 88SX7042 PCI-e 4-port SATA-II + 7042 88SX7042 PCIe 4-port SATA-II controller 16b8 434b Tempo SATA E4P 7810 MV78100 [Discovery Innovation] ARM SoC 7820 MV78200 [Discovery Innovation] ARM SoC @@ -16426,9 +16509,9 @@ 13f7 1394 OHCI Compliant Host Controller 6729 OZ6729 673a OZ6730 - 6832 OZ6832/6833 CardBus Controller - 6836 OZ6836/6860 CardBus Controller - 6872 OZ6812 CardBus Controller + 6832 OZ6832/6833 CardBus Controller [Saturn] + 6836 OZ6836/6860 CardBus Controller [Mercury] + 6872 OZ6812 CardBus Controller [Challenger] 6925 OZ6922 CardBus Controller 6933 OZ6933/711E1 CardBus/SmartCardBus Controller 1025 1016 Travelmate 612 TX @@ -16602,6 +16685,7 @@ 00a3 VisionLink F4 00a9 VisionLink CLS 00ab PCIe8g3 A5 10G + 00b5 PCIe8 RFx SDR 123e Simutech, Inc. # nee C-Cube Microsystems / acquired by Magnum Semiconductor 123f LSI Logic @@ -16834,6 +16918,8 @@ 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers + 2269 SM2269XT (DRAM-less) NVMe SSD Controller + 8366 SM8366 NVMe SSD Controller [MonTitan] 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17461,11 +17547,18 @@ 0035 PCI-DAS64/M1/16 0036 PCI-DAS64/M2/16 0037 PCI-DAS64/M3/16 + 004b PCI-MDB64 004c PCI-DAS1000 004d PCI-QUAD04 0052 PCI-DAS4020/12 0053 PCIM-DDA06/16 0054 PCI-DIO96 + 0055 CPCI-DIO24H + 0056 PCIM-DAS1602/16 + 0057 PCI-DAS3202/16 + 0059 PCI-QUAD-AC5 + 005a CPCI-DIO96H + 005b CPCI-DIO48H 005d PCI-DAS6023 005e PCI-DAS6025 005f PCI-DAS6030 @@ -17478,10 +17571,23 @@ 0066 PCI-DAS6052 0067 PCI-DAS6070 0068 PCI-DAS6071 + 006e PCI-CTR10 006f PCI-DAS6036 0070 PCI-DAC6702 + 0071 PCI-DAC6703 + 0074 PCI-CTR20HD + 0077 PCI-DIO24/LP 0078 PCI-DAS6013 0079 PCI-DAS6014 + 007b PCIM-DAS16JR/16 + 007e PCI-DIO24/S + 00a5 PCI-2511 + 00a6 PCI-2513 + 00a7 PCI-2515 + 00a8 PCI-2517 + 00be PCI-QUAD05 + 00da PCIe-DIO96H + 00db PCIe-DIO24 0115 PCIe-DAS1602/16 1308 Jato Technologies Inc. 0001 NetCelerator Adapter @@ -17643,6 +17749,9 @@ 1344 4000 3.2TB U.2 1344 5000 6.4 TB U.2 1344 6000 12.8TB U.2 + 51b7 7500 PRO NVMe SSD + 51b8 7500 MAX NVMe SSD + 51b9 6500 ION NVMe SSD 51c0 7400 PRO NVMe SSD 1028 2162 EC NVMe OPAL 7400 RI M.2 480GB 1028 2163 EC NVMe OPAL 7400 RI M.2 960GB @@ -17689,6 +17798,7 @@ 5411 2450 NVMe SSD [HendrixV] (DRAM-less) 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD + 5416 2550 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc 1347 Odetics @@ -17727,8 +17837,97 @@ 1355 Kratos Analytical Ltd 1356 The Logical Co 1359 Prisa Networks -135a Brain Boxes - 0a61 UC-324 [VELOCITY RS422/485] +135a Brainboxes Ltd + 0841 UC-268 4 port RS-232 card + 0861 UC-257 2 port RS-232 + LPT card + 0862 UC-257 2 port RS-232 + LPT card + 0863 UC-257 2 port RS-232 + LPT card + 0881 UC-279 8 port RS-232 card + 08a1 UC-313 2 port RS-422/485 card + 08a2 UC-313 2 port RS-422/485 card + 08a3 UC-313 2 port RS-422/485 card + 08c1 UC-310 2 port RS-422/485 Opto Isolated card + 08e1 UC-302 2 port RS-232 card + 08e2 UC-302 2 port RS-232 card + 08e3 UC-302 2 port RS-232 card + 0901 UC-431 3 port RS-232 card + 0921 UC-420 3 + 1 port RS-232 card + 0981 UC-475 1 + 1 port RS-232 + LPT card + 0982 UC-475 1 + 1 port RS-232 + LPT card + 09a1 UC-607 2 port RS-232 card + 09a2 UC-607 2 port RS-232 card + 09a3 UC-607 2 port RS-232 card + 0a61 UC-324 1 port RS-422/485 card + 0a81 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a82 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a83 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0aa1 UC-246 1 port RS-232 card + 0aa2 UC-246 1 port RS-232 card + 0ac1 UP-189 Powered 2 port RS-232 card + 0ac2 UP-189 Powered 2 port RS-232 card + 0ac3 UP-189 Powered 2 port RS-232 card + 0b01 UC-346 4 port RS-422/485 card + 0b02 UC-346 4 port RS-422/485 card + 0b21 UP-200 Powered 2 port RS-232 card + 0b22 UP-200 Powered 2 port RS-232 card + 0b23 UP-200 Powered 2 port RS-232 card + 0ba1 UC-101 1 + 1 port RS-232 card + 0bc1 UC-203 1 + 1 port RS-232 + LPT card + 0bc2 UC-203 1 + 1 port RS-232 + LPT card + 0be1 UC-146 LPT card + 0be2 UC-146 LPT card + 0c01 UP-869 Powered 2 port RS-232 card + 0c02 UP-869 Powered 2 port RS-232 card + 0c03 UP-869 Powered 2 port RS-232 card + 0c21 UP-880 Powered 2 port RS-232 card + 0c22 UP-880 Powered 2 port RS-232 card + 0c23 UP-880 Powered 2 port RS-232 card + 0c41 UC-368 4 port RS-422/485 Opto Isolated card + 0ca1 UC-253 2 port RS-232 card + 0d21 UC-260 4 port RS-232 card + 0d41 UC-836 4 port RS-232 card + 0d60 IS-100 1 port RS-232 card + 0d80 IS-200 2 port RS-232 card + 0da0 IS-300 1 port RS-232 + LPT card + 0dc0 IS-400 4 port RS-232 card + 0de0 IS-500 LPT card + 0e41 PX-279 8 port RS-232 card + 0e61 UC-414 3 + 1 port RS-232 + LPT card + 4000 PX-420 3 + 1 port RS-232 card + 4001 PX-431 3 port RS-232 card + 4002 PX-820 Powered 3 + 1 port RS-232 card + 4003 PX-831 Powered 3 port RS-232 card + 4004 PX-235 1 port RS-232 card + 4005 PX-101 1 + 1 port RS-232 card + 4006 PX-257 1 + 1 port RS-232 + LPT card (Serial port) + 4007 PX-257 1 + 1 port RS-232 + LPT card (LPT port) + 4008 PX-835 Powered 1 port RS-232 card + 4009 PX-857 Powered 2 port RS-232 card + 400a PX-260 4 port RS-232 card + 400b PX-320 1 port RS-422/485 card + 400c PX-313 2 port RS-422/485 card + 400e PX-310 2 port RS-422/485 Opto Isolated card + 400f PX-346 4 port RS-422/485 card + 4010 PX-368 4 port RS-422/485 Opto Isolated card + 4011 PX-420 3 + 1 port RS-232 card + 4012 PX-431 3 port RS-232 card + 4013 PX-820 Powered 3 + 1 port RS-232 card + 4014 PX-831 Powered 3 port RS-232 card + 4015 PX-257 2 port RS-232 card + 4016 PX-235 1 port RS-232 card + 4017 PX-835 Powered 1 port RS-232 card + 4018 PX-857 Powered 2 port RS-232 card + 4019 PX-101 1 + 1 port RS-232 card + 401c PX-146 LPT card + 401d PX-475 1 port RS-232 + LPT card (Serial port) + 401e PX-803 Powered 1 + 1 port RS-232 card + 401f PX-475 1 port RS-232 + LPT card (LPT port) + 4027 IX-100 1 port RS-232 card + 4028 IX-200 2 port RS-232 card + 4029 IX-400 4 port RS-232 card + 402a IX-500 LPT card + 402c PX-263 4 port RS-232 + LPT card + 4100 PX-272 4 + 1 port RS-232 + LPT card 135b Giganet Inc 135c Quatech Inc 0010 QSC-100 @@ -17738,12 +17937,19 @@ 0050 ESC-100D 0060 ESC-100M 00f0 MPAC-100 Synchronous Serial Card (Zilog 85230) + 0120 QSCP-100 + 0130 DSCP-100 + 0140 QSCP-200/300 + 0150 DSCP-200/300 0170 QSCLP-100 0180 DSCLP-100 + 0181 DSC-100 0190 SSCLP-100 01a0 QSCLP-200/300 01b0 DSCLP-200/300 + 01b1 DSC-200/300 01c0 SSCLP-200/300 + 01e0 ESC(LP)-100 0258 DSPSX-200/300 135d ABB Network Partner AB 135e Sealevel Systems Inc @@ -18233,6 +18439,7 @@ 13fc Computer Peripherals International 13fd Micro Science Inc 13fe Advantech Co. Ltd + 0071 PCIE-1761H, 8-ch Relay and 8-ch Isolated Digital Input Card 1240 PCI-1240 4-channel stepper motor controller card 1600 PCI-16xx series PCI multiport serial board (function 0) # This board has two PCI functions, appears as two PCI devices @@ -19391,9 +19598,9 @@ 144d a801 SM963 2.5" NVMe PCIe SSD a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 - 144d a801 SSD 970 EVO + 144d a801 SSD 970 EVO/PRO 1d49 403b Thinksystem U.2 PM983 NVMe SSD - a809 NVMe SSD Controller 980 + a809 NVMe SSD Controller 980 (DRAM-less) a80a NVMe SSD Controller PM9A1/PM9A3/980PRO 0128 215a DC NVMe PM9A3 RI U.2 960GB 0128 215b DC NVMe PM9A3 RI U.2 1.92TB @@ -19413,9 +19620,12 @@ 1028 2276 DC NVMe PM9A3 RI 110M.2 960GB 1028 2277 DC NVMe PM9A3 RI 110M.2 1.92TB 1028 512d DC NVMe PM9A3 RI U.2 7.68TB + 144d a801 SSD 980 PRO 144d a813 General DC NVMe PM9A3 - a80b NVMe SSD Controller PM9B1 +# Actually 88SS1322 according to techpowerup + a80b NVMe SSD Controller PM9B1 (DRAM-less) a80c NVMe SSD Controller S4LV008[Pascal] + a80d NVMe SSD Controller PM9C1a a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -19658,9 +19868,18 @@ 14a2 Millennium Engineering Inc 14a3 Maverick Networks 14a4 Lite-On Technology Corporation + 2100 CA1-8D128 NVMe SSD + 2200 CX2-8B256, CX2-8B512 NVMe SSD + 22a0 EP2-KB960 NVMe SSD 22f1 M8Pe Series NVMe SSD + 2300 CA3-8D256, CA3-8D512 NVMe SSD + 23f1 M9PeG, M9PeGN, M9PeY NVMe SSD + 2f00 CAZ-82512 NVMe SSD + 3500 CA5-8D512 NVMe SSD # Wrong vendor ID used 4318 Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller + 5100 CB1-SD256, CB1-SD512 NVMe SSD + 9100 CL1-3D256, CL1-8D512 NVMe SSD (DRAM-less) 14a5 XIONICS Document Technologies Inc 14a6 INOVA Computers GmBH & Co KG 14a7 MYTHOS Systems Inc @@ -19729,12 +19948,14 @@ 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter 7615 MT7615E 802.11ac PCI Express Wireless Network Adapter 7630 MT7630e 802.11bgn Wireless Network Adapter + 7650 MT7650 802.11ac # MT7612E too? 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter 7916 MT7905D/MT7975 # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter + 1a3b 5300 ASUS PCE-AXE59BT 7961 MT7921 802.11ax PCI Express Wireless Network Adapter 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -19980,8 +20201,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC - 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC - 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC + 14e4 d166 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d366 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20542,16 +20763,16 @@ 4360 BCM4360 802.11ac Wireless Network Adapter 4365 BCM43142 802.11b/g/n 1028 0016 Wireless 1704 802.11n + BT 4.0 - 43a0 BCM4360 802.11ac Wireless Network Adapter - 43a1 BCM4360 802.11ac Wireless Network Adapter - 43a2 BCM4360 802.11ac Wireless Network Adapter + 43a0 BCM4360 802.11ac Dual Band Wireless Network Adapter + 43a1 BCM4360 802.11ac 2,4G Wireless Network Adapter + 43a2 BCM4360 802.11ac 5G Wireless Network Adapter 43a3 BCM4350 802.11ac Wireless Network Adapter # Manufactured by Foxconn for Lenovo 17aa 075a 00JT494 43a9 BCM43217 802.11b/g/n 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter - 43b1 BCM4352 802.11ac Wireless Network Adapter + 43b1 BCM4352 802.11ac Dual Band Wireless Network Adapter 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC @@ -20577,12 +20798,14 @@ 441f BCM4361 802.11ac Dual-Band Wireless Network Controller 4420 BCM4361 802.11ac 2.4 GHz Wireless Network Controller 4421 BCM4361 802.11ac 5 GHz Wireless Network Controller - 4425 BRCM4378 Wireless Network Adapter + 4425 BCM4378 802.11ax Dual Band Wireless Network Adapter 4430 BCM44xx CardBus iLine32 HomePNA 2.0 4432 BCM4432 CardBus 10/100BaseT + 4433 BCM4387 802.11ax Dual Band Wireless LAN Controller 4464 BCM4364 802.11ac Wireless Network Adapter # brcmfmac reports it as BCM4377/4 but macOS drivers call it BCM4377b 4488 BCM4377b Wireless Network Adapter + 449d BCM43752 802.11ax Dual Band Wireless LAN Controller 4610 BCM4610 Sentry5 PCI to SB Bridge 4611 BCM4610 Sentry5 iLine32 HomePNA 1.0 4612 BCM4610 Sentry5 V.90 56k Modem @@ -20900,6 +21123,10 @@ 17de 08a6 KWorld/VStream XPert DVB-T 17de 08b2 KWorld DVB-S 100 17de a8a6 digitalnow DNTV Live! DVB-T + 1805 0111 PICOLO Jet-X Video + 1805 0112 PICOLO Jet-X Video + 1805 0113 PICOLO Jet-X Video + 1805 0114 PICOLO Jet-X Video 1822 0025 digitalnow DNTV Live! DVB-T Pro 185b e000 VideoMate X500 18ac d500 FusionHDTV 5 Gold @@ -20928,6 +21155,10 @@ 14f1 0187 Conexant DVB-T reference design 17de 08a1 XPert DVB-T PCI BDA DVBT 23880 Transport Stream Capture 17de 08a6 KWorld/VStream XPert DVB-T + 1805 0111 PICOLO Jet-X Jpeg + 1805 0112 PICOLO Jet-X Jpeg + 1805 0113 PICOLO Jet-X Jpeg + 1805 0114 PICOLO Jet-X Jpeg 18ac d500 DViCO FusionHDTV5 Gold 18ac d810 DViCO FusionHDTV3 Gold-Q 18ac d820 DViCO FusionHDTV3 Gold-T @@ -20940,6 +21171,10 @@ 0070 6902 WinTV HVR-4000-HD 0070 9002 Nova-T DVB-T Model 909 0070 9402 WinTV-HVR1100 DVB-T/Hybrid + 1805 0111 PICOLO Jet-X Control + 1805 0112 PICOLO Jet-X Control + 1805 0113 PICOLO Jet-X Control + 1805 0114 PICOLO Jet-X Control 7063 5500 pcHDTV HD-5500 8811 CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port] 0070 3400 WinTV 34604 @@ -21283,6 +21518,8 @@ 0001 Eagle Cluster Manager 0002 Osprey Cluster Manager 0003 Harrier Cluster Manager + 0371 Cassini 2 [Slingshot 400Gb] + 0372 Cassini 2 [Slingshot 400Gb] SR-IOV VF a01d FC044X Fibre Channel HBA 1591 ARN 1592 Syba Tech Ltd @@ -21627,10 +21864,10 @@ 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD - 5003 WD Blue SN500 / PC SN520 NVMe SSD - 5004 PC SN520 NVMe SSD - 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD + 5003 WD Blue SN500 / PC SN520 x2 M.2 2280 NVMe SSD + 5004 PC SN520 x2 M.2 2230 NVMe SSD + 5005 PC SN520 x2 M.2 2242 NVMe SSD + 5006 SanDisk Extreme Pro / WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD @@ -21639,17 +21876,18 @@ 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5014 WD PC SN540 / Green SN350 NVMe SSD 1 TB (DRAM-less) 5015 PC SN740 NVMe SSD (DRAM-less) 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD - 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD + 5019 WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD + 501a SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less) 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) + 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH @@ -21673,7 +21911,11 @@ 117c 0022 Celerity FC-42XS Fibre Channel Adapter 117c 0025 Celerity FC-44ES Fibre Channel Adapter 117c 0026 Celerity FC-42ES Fibre Channel Adapter + 0b01 82350B PCI GPIB 1100 E8001-66442 PCI Express CIC + 1218 82351A PCI Express GPIB + 12d6 82350C PCI GPIB + 12d7 82351B PCI Express GPIB 2922 64 Bit, 133MHz PCI-X Exerciser & Protocol Checker 2928 64 Bit, 66MHz PCI Exerciser & Analyzer 2929 64 Bit, 133MHz PCI-X Analyzer & Exerciser @@ -21927,6 +22169,11 @@ 165f Linux Media Labs, LLC 1020 LMLM4 MPEG-4 encoder 1661 Worldspace Corp. +1665 EDAX Inc +# P/N 4035.006.19720 + 1973 DPP-II FR2 Board +# P/N 4035.065.20000 + 2000 SG-IIP Board 1668 Actiontec Electronics Inc 0100 Mini-PCI bridge # Formerly SiByte, Inc. @@ -22861,6 +23108,7 @@ 17d5 7831 X3120 Dual Port 10GBase-CR 17db Cray Inc 0101 XT Series [Seastar] 3D Toroidal Router + 0501 Cassini 1 [Slingshot 200Gb] 17de KWorld Computer Co. Ltd. 17df Dini Group 1864 Virtex4 PCI Board w/ QL5064 Bridge [DN7000K10PCI/DN8000K10PCI/DN8000K10PSX/NOTUS] @@ -22978,6 +23226,35 @@ 1804 Ralink corp. (wrong ID) 3060 RT3060 Wireless 802.11n 1T/1R 1805 Euresys S.A. + 0201 PICOLO Alert PCI + 0202 PICOLO Diligent + 0204 PICOLO Alert-RC + 0205 PICOLO Alert PCIe + 0206 PICOLO Diligent Plus PCIe + 0207 PICOLO Alert-RC PCIe + 0300 GRABLINK Expert 2 + 0301 GRABLINK Quickpack ColorScan + 0302 GRABLINK Value cPCI + 0303 GRABLINK Expert 2 cPCI + 0305 GRABLINK Avenue + 0306 GRABLINK Quickpack CFA + 0307 GRABLINK Express + 0308 GRABLINK Quickpack CFA PCIe + 0309 GRABLINK Quickpack CFA PCIe (Recovery) + 030a GRABLINK Full + 030b GRABLINK Full (Recovery) + 030c GRABLINK DualBase + 030d GRABLINK DualBase (Recovery) + 030e GRABLINK Base + 030f GRABLINK Base (Recovery) + 0310 GRABLINK Full XR + 0311 GRABLINK Full XR (Recovery) + 0401 DOMINO Iota + 0402 DOMINO Alpha 2 + 0403 DOMINO Harmony + 0404 DOMINO Melody + 0407 DOMINO Symphony + 0408 DOMINO Symphony PCIe 1809 Lumanate, Inc. 180c IEI Integration Corp 1813 Ambient Technologies Inc @@ -23710,11 +23987,13 @@ 5007 E7 NVMe Controller 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller - 5013 PS5013 E13 NVMe Controller + 5013 PS5013-E13 PCIe3 NVMe Controller (DRAM-less) + 5015 PS5015-E15 PCIe3 NVMe Controller (DRAM-less) 5016 E16 PCIe4 NVMe Controller 5018 E18 PCIe4 NVMe Controller 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) + 5026 PS5026-E26 PCIe5 NVMe Controller 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24246,6 +24525,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0011 QEMU PVPanic device 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine @@ -24291,6 +24571,7 @@ 1028 2151 BOSS-N1 Modular ET 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter + 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 @@ -24380,6 +24661,12 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 2700 Ultrastar DC SN650 NVMe SSD + 2701 Ultrastar DC SN650 NVMe SSD + 2702 Ultrastar DC SN650 NVMe SSD + 2720 Ultrastar DC SN650 NVMe SSD + 2721 Ultrastar DC SN650 NVMe SSD + 2722 Ultrastar DC SN655 NVMe SSD 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD @@ -24500,6 +24787,10 @@ 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD +# 2TB + 5021 FireCuda 520 SSD +# 1TB + 5026 FireCuda 540 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -24559,6 +24850,7 @@ 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH + 0002 CAN-IB100/PCIe 0003 CAN-IB200/PCIe 1bef Lantiq 0011 MIPS SoC PCI Express Port @@ -24566,6 +24858,7 @@ 0001 SentinelEX 7011 RX0xxx 1bf5 Greenliant + 1000 G7200 series U.2 NVMe SSD 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24699,6 +24992,8 @@ 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive 284a PE8110 Series NVMe Solid State Drive 2a49 PE9110 Series NVMe Solid State Drive + 2a59 PE9010 Series NVMe Solid State Drives + 2b59 PS10x0 Series NVMe Solid State Drives 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24721,11 +25016,18 @@ 1c5f 0b40 NVMe SSD PBlaze6 6530 7680G AIC 1c5f 0b41 NVMe SSD PBlaze6 6530 7680G 2.5" U.2 1c5f 0b47 NVMe SSD PBlaze6 6630 7680G 2.5" U.2 + 1c5f 1320 NVMe SSD PBlaze6 6531 1920G AIC 1c5f 1321 NVMe SSD PBlaze6 6531 1920G 2.5" U.2 + 1c5f 1330 NVMe SSD PBlaze6 6531 3840G AIC 1c5f 1331 NVMe SSD PBlaze6 6531 3840G 2.5" U.2 + 1c5f 1340 NVMe SSD PBlaze6 6531 7680G AIC 1c5f 1341 NVMe SSD PBlaze6 6531 7680G 2.5" U.2 + 1c5f 1421 NVMe SSD PBlaze6 6541 1920G 2.5" U.2 + 1c5f 1427 NVMe SSD PBlaze6 6641 1920G 2.5" U.2(dual port) 1c5f 1431 NVMe SSD PBlaze6 6541 3840G 2.5" U.2 + 1c5f 1437 NVMe SSD PBlaze6 6641 3840G 2.5" U.2(dual port) 1c5f 1441 NVMe SSD PBlaze6 6541 7680G 2.5" U.2 + 1c5f 1447 NVMe SSD PBlaze6 6641 7680G 2.5" U.2(dual port) 1c5f 4b20 NVMe SSD PBlaze6 6536 1600G AIC 1c5f 4b21 NVMe SSD PBlaze6 6536 1600G 2.5" U.2 1c5f 4b25 NVMe SSD PBlaze6 6536 1600G E1.S @@ -24737,11 +25039,18 @@ 1c5f 4b40 NVMe SSD PBlaze6 6536 6400G AIC 1c5f 4b41 NVMe SSD PBlaze6 6536 6400G 2.5" U.2 1c5f 4b47 NVMe SSD PBlaze6 6636 6400G 2.5" U.2 + 1c5f 5320 NVMe SSD PBlaze6 6537 1600G AIC 1c5f 5321 NVMe SSD PBlaze6 6537 1600G 2.5" U.2 + 1c5f 5330 NVMe SSD PBlaze6 6537 3200G AIC 1c5f 5331 NVMe SSD PBlaze6 6537 3200G 2.5" U.2 + 1c5f 5340 NVMe SSD PBlaze6 6537 6400G AIC 1c5f 5341 NVMe SSD PBlaze6 6537 6400G 2.5" U.2 + 1c5f 5421 NVMe SSD PBlaze6 6547 1600G 2.5" U.2 + 1c5f 5427 NVMe SSD PBlaze6 6647 1600G 2.5" U.2(dual port) 1c5f 5431 NVMe SSD PBlaze6 6547 3200G 2.5" U.2 + 1c5f 5437 NVMe SSD PBlaze6 6647 3200G 2.5" U.2(dual port) 1c5f 5441 NVMe SSD PBlaze6 6547 6400G 2.5" U.2 + 1c5f 5447 NVMe SSD PBlaze6 6647 6400G 2.5" U.2(dual port) 003d PBlaze5 920/926 1c5f 0a30 NVMe SSD PBlaze5 920 3840G AIC 1c5f 0a31 NVMe SSD PBlaze5 920 3840G 2.5" U.2 @@ -24764,11 +25073,28 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 0431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c31 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c41 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 0c51 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 1430 NVMe SSD PBlaze7 7940 3840G AIC *** 479 LINES SKIPPED *** From nobody Mon Jan 22 09:41:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQFq3Gclz57X8m; Mon, 22 Jan 2024 09:41: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 4TJQFq32XWz4NL7; Mon, 22 Jan 2024 09:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KrMULZhJRsoG/TtwANPHyR42QbPIXMpTJuzoMHAiuY=; b=nG/GiJJct1u5FG3LJAAXE1YFEXKswslqbvbxRlblT2D6n4+NuUtPRT/Jhn1tSephVFeAaT kpijvrcyEPPTfUnqvK9+pB/lEWtCHU+ZoqkmhNvXiqcFoZ2NX5hSSmQY1Oo0oUP2BE+ylY d8r7qHPrajUe7J3DKtFzFjY95BsJXTLQD2hqY+96+q/HwRttYcl12cJe4+vSgjT6JvjVAy GHBTkoI7r1WvfNSiEqdXvR6mczS3oomIlbUOuFPUu0ymAzeZ/gL9RvSI6/zcrfvtYfptJq f1Tl7PXyeGQjiV4hmY6SKwXV8f3mXA7h5gLvhmdxvnWlWb3HWidAw1OfJzHpQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KrMULZhJRsoG/TtwANPHyR42QbPIXMpTJuzoMHAiuY=; b=hLG1B0YKBbf1BGH1hV74TwfvhwhZaySeYe8IFh936WEo3OEqw9PTjD4QLjTYvysWMgqnRS ahhIbozvbYsJC3cWqTRgk5Ru4i92QeVDbV6AShROi8z5uqkhGHnLNMdrW4oWjhO8beBsmO s/ry2RPfQ+ftJWW2XzBT9dFweU3nRtqxXEHOVYhOttAhRZmAD7dPe4/u00Au43jntbUoaK ZmIy8HgZAH7TfxW/szb3DLOuStB0XYQnUolUWLflqRyHW6akCcNGaqjrroUrwp/HpDaGrs eSVvfL4J37aD0EIp6QfQmj4J59UHfuM4QZOA8LDvaXNP3DJGhfxf5Ypu+Uv0hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916463; a=rsa-sha256; cv=none; b=wjCQxGt/nk8IDxEYeRSZzwNufozgmtzq+W80nduF5AtmdsmcmVpezZz/2Yli30jXgbrnxI uweWO43R10g/5u/C+c6TzbD7uUpk6ebd8oq6wD8qaceDKwD0j4d/okzyxr+gh0wMIrR9lZ qBvV2S3BJGcmoj/+cv1LRNC9qXOTN8SdAsxIfGt44UGswftxgp562/9gY4Up/nyoXnBjCG E150YkwC/uwztRrq/YekwSVHLnfad+0I/MnYB0HZ0iUwqhwXTLfP1V/g27wgVTACD9xv23 vLWhOsVMf6lt9MP1XkvIf8WTpT5tytGbh60PcGnYtwjZx5HybdgSY7MzgkJw3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQFq1pczzwXn; Mon, 22 Jan 2024 09:41: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 40M9f31G019746; Mon, 22 Jan 2024 09:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9f3k1019743; Mon, 22 Jan 2024 09:41:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:41:03 GMT Message-Id: <202401220941.40M9f3k1019743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d99a15bf6f1c - stable/13 - pci_vendors: update to 2023-11-11 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d99a15bf6f1c46e49d93aa8ad4e28dfaf3791c3a Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d99a15bf6f1c46e49d93aa8ad4e28dfaf3791c3a commit d99a15bf6f1c46e49d93aa8ad4e28dfaf3791c3a Author: Baptiste Daroussin AuthorDate: 2023-12-04 10:51:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:40:56 +0000 pci_vendors: update to 2023-11-11 (cherry picked from commit 01e286b54190620ceec85ef865a51eb79b5d81c0) --- share/misc/pci_vendors | 580 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 500 insertions(+), 80 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 50115d979327..bad1d0bd066b 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.09.22 -# Date: 2023-09-22 03:15:02 +# Version: 2023.11.11 +# Date: 2023-11-11 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,8 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] - f1ab P41 Plus NVMe SSD (DRAM-less) - f1ac P44 Pro NVMe SSD + f1ab P41 Plus NVMe SSD (DRAM-less) [Echo Harbor] + f1ac P44 Pro NVMe SSD [Hollywood Beach] 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -773,6 +773,9 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front + 1028 22cb PERC H365i Front + 1028 22cc PERC H965i Front + 1028 22cd HBA465i Front 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -816,6 +819,8 @@ 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter # 9700 16 external port Storage controller 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter + 1028 22d2 PERC H975i Front + 1028 22d3 PERC H975i Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1055,6 +1060,7 @@ 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0703 ThinkSystem M.2 RAID B540d-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1201,7 +1207,7 @@ 103c 8b17 ProBook 445 G9/455 G9 [Ryzen 7 Integrated Radeon GPU] 15ff Fenghuang [Zhongshan Subor Z+] 1607 Arden - 1636 Renoir + 1636 Renoir [Radeon RX Vega 6 (Ryzen 4000/5000 Mobile Series)] 1637 Renoir Radeon High Definition Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 @@ -1215,6 +1221,8 @@ 1681 Rembrandt [Radeon 680M] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s + 1900 Phoenix3 + 1901 Phoenix4 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 3151 RV380 GL [FireMV 2400] @@ -3944,6 +3952,7 @@ 1849 5236 RX 6650 XT Challenger D OC 73f0 Navi 33 [Radeon RX 7600M XT] 73ff Navi 23 [Radeon RX 6600/6600 XT/6600M] + 1462 5021 MSI RX 6600XT MECH 2X 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB @@ -3960,6 +3969,7 @@ 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 1002 0e3b RX 7900 GRE [XFX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] @@ -4815,6 +4825,7 @@ 1014 04fb PCIe3 x16 20GB Cache 12Gb Quad SAS RAID+ Adapter(580B) 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A) 04ed Internal Shared Memory (ISM) virtual PCI device + 0611 4769 Cryptographic Adapter 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -5281,7 +5292,7 @@ 1646 VanGogh IOMMU 1647 VanGogh PCIe GPP Bridge 1648 VanGogh Internal PCIe GPP Bridge to Bus - 1649 VanGogh PSP/CCP + 1649 Family 19h PSP/CCP 164f Milan IOMMU 1650 Milan Data Fabric; Function 0 1651 Milan Data Fabric; Function 1 @@ -8439,6 +8450,7 @@ 764d PXI-2521 764e PXI-2522 764f PXI-2523 + 7652 PXIe-4080 7654 PXI-2796 7655 PXI-2797 7656 PXI-2798 @@ -8453,7 +8465,14 @@ 76a3 PXIe-6535B 76a4 PXIe-6536B 76a5 PXIe-6537B + 76d8 PXIe-4081 + 76d9 PXIe-4082 + 77a8 PXIe-6375 783e PXI-8368 + 7882 PXIe-6376 + 7883 PXIe-6378 + 799e PXIe-6386 + 799f PXIe-6396 9020 PXI-2501 9030 PXI-2503 9040 PXI-2527 @@ -8748,6 +8767,8 @@ 13e9 0070 Win/TV (Video Section) 036e Bt878 Video Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 + 0000 0004 Euresys PICOLO Pro 3E 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8768,6 +8789,23 @@ 14f1 0002 Bt878 Mediastream Controller PAL BG 14f1 0003 Bt878a Mediastream Controller PAL BG 14f1 0048 Bt878/832 Mediastream Controller + 1805 0101 Euresys PICOLO Tetra + 1805 0102 Euresys PICOLO Tetra + 1805 0103 Euresys PICOLO Tetra + 1805 0104 Euresys PICOLO Tetra + 1805 0105 Euresys PICOLO Tetra + 1805 0106 Euresys PICOLO Tetra + 1805 0107 Euresys PICOLO Tetra + 1805 0108 Euresys PICOLO Tetra + 1805 0201 Euresys PICOLO Tetra-X + 1805 0202 Euresys PICOLO Tetra-X + 1805 0203 Euresys PICOLO Tetra-X + 1805 0204 Euresys PICOLO Tetra-X + 1805 0401 Euresys PICOLO Tymo + 1805 0402 Euresys PICOLO Tymo + 1805 0403 Euresys PICOLO Tymo + 1805 0404 Euresys PICOLO Tymo + 1805 1001 Euresys PICOLO Junior 4 1822 0001 VisionPlus DVB card 1851 1850 FlyVideo'98 - Video 1851 1851 FlyVideo II @@ -8843,6 +8881,8 @@ 1852 1852 FlyVideo'98 (with FM Tuner) 0878 Bt878 Audio Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 (Audio Section) + 0000 0004 Euresys PICOLO Pro 3E (Audio Section) 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8865,6 +8905,23 @@ 14f1 0002 Bt878 Video Capture (Audio Section) 14f1 0003 Bt878 Video Capture (Audio Section) 14f1 0048 Bt878 Video Capture (Audio Section) + 1805 0101 Euresys PICOLO Tetra (Audio Section) + 1805 0102 Euresys PICOLO Tetra (Audio Section) + 1805 0103 Euresys PICOLO Tetra (Audio Section) + 1805 0104 Euresys PICOLO Tetra (Audio Section) + 1805 0105 Euresys PICOLO Tetra (Audio Section) + 1805 0106 Euresys PICOLO Tetra (Audio Section) + 1805 0107 Euresys PICOLO Tetra (Audio Section) + 1805 0108 Euresys PICOLO Tetra (Audio Section) + 1805 0201 Euresys PICOLO Tetra-X (Audio Section) + 1805 0202 Euresys PICOLO Tetra-X (Audio Section) + 1805 0203 Euresys PICOLO Tetra-X (Audio Section) + 1805 0204 Euresys PICOLO Tetra-X (Audio Section) + 1805 0401 Euresys PICOLO Tymo (Audio Section) + 1805 0402 Euresys PICOLO Tymo (Audio Section) + 1805 0403 Euresys PICOLO Tymo (Audio Section) + 1805 0404 Euresys PICOLO Tymo (Audio Section) + 1805 1001 Euresys PICOLO Junior 4 (Audio Section) 1822 0001 VisionPlus DVB Card 18ac d500 DViCO FusionHDTV5 Lite 270f fc00 Digitop DTT-1000 @@ -8991,6 +9048,10 @@ 1147 VScom 020 2 port parallel adaptor 2000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge 10b5 9030 ATCOM AE400P Quad E1 PCI card + 2300 Euresys DOMINO Gamma + 2374 Euresys DOMINO Alpha + 2491 Euresys GRABLINK Value + 2493 Euresys GRABLINK Expert 2540 IXXAT CAN-Interface PC-I 04/PCI 2724 Thales PCSM Security Card 3376 Cosateq 4 Port CAN Card @@ -9106,6 +9167,7 @@ e1c5 0006 TA1-PCI4 9036 9036 9050 PCI <-> IOBus Bridge + 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended 10b5 1169 Wasco OPTOIO32standard 32 digital in, 32 digital out @@ -9117,6 +9179,7 @@ 10b5 2905 Alpermann+Velte PCI TS: Time Synchronisation Board 10b5 3196 Goramo PLX200SYN sync serial card 10b5 9050 PCI-I04 PCI Passive PC/CAN Interface + 11a9 5334 PDS4 12fe 0001 CAN-PCI/331 CAN bus controller 1369 8901 PCX11+ PCI 1369 8f01 VX222 @@ -9542,6 +9605,7 @@ 10be Tseng Labs International Co. 10bf Most Inc 10c0 Boca Research Inc. + 9135 iX3D Ultimate Rez 10c1 ICM Co., Ltd. 10c2 Auspex Systems Inc. 10c3 Samsung Semiconductors, Inc. @@ -12778,16 +12842,20 @@ 2331 GH100 [H100 PCIe] 2336 GH100 [H100] 2337 GH100 [H100 SXM5 64GB] + 2338 GH100 [H100 SXM5 96GB] 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] 233d GH100 [H100 96GB] 2342 GH100 [GH200 120GB] 2343 GH100 2345 GH100 [GH200 480GB] + 23b0 GH100 + 23f0 GH100 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] 2460 GA103M [GeForce RTX 3080 Ti Laptop GPU] + 2480 GA104 [Reserved Dev ID A] 2482 GA104 [GeForce RTX 3070 Ti] 2483 GA104 2484 GA104 [GeForce RTX 3070] @@ -12816,6 +12884,7 @@ 24ba GA104GLM [RTX A4500 Laptop GPU] 24bb GA104GLM [RTX A3000 Laptop GPU] 24bf GA104 [GeForce RTX 3070 Engineering Sample] + 24c0 GA104 [Initial Dev ID B] 24c7 GA104 [GeForce RTX 3060 8GB] 24c8 GA104 [GeForce RTX 3070 GDDR6X] 24c9 GA104 [GeForce RTX 3060 Ti GDDR6X] @@ -12843,6 +12912,7 @@ 2571 GA106 [RTX A2000 12GB] 2582 GA107 [GeForce RTX 3050 8GB] 2583 GA107 [GeForce RTX 3050 4GB] + 2584 GA107 [GeForce RTX 3050 6GB] 25a0 GA107M [GeForce RTX 3050 Ti Mobile] 25a2 GA107M [GeForce RTX 3050 Mobile] 25a3 GA107 @@ -12881,6 +12951,7 @@ 26b8 AD102GL [L40G] 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] + 2703 AD103 [GeForce RTX 4080 SUPER] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] @@ -12891,6 +12962,7 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b1 AD104GL [RTX 4500 Ada Generation] 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] @@ -13074,6 +13146,7 @@ 2011 Q-Motion Video Capture/Edit board 4750 S5930 [Matchmaker] 5920 S5920 + 801d Roper Scientific PCI TAXI interface 8043 LANai4.x [Myrinet LANai interface chip] 8062 S5933_PARASTATION 807d S5933 [Matchmaker] @@ -13147,6 +13220,7 @@ 1028 06e6 Latitude 11 5175 2-in-1 1028 09be Latitude 7410 1028 0b10 Precision 3571 + 1028 0c06 Precision 3580 17aa 224f ThinkPad X1 Carbon 5th Gen 5260 RTS5260 PCI Express Card Reader 5261 RTS5261 PCI Express Card Reader @@ -13160,6 +13234,7 @@ 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) + 5772 RTS5772DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -13342,13 +13417,17 @@ 8813 RTL8813AE 802.11ac PCIe Wireless Network Adapter 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter 8852 RTL8852AE 802.11ax PCIe Wireless Network Adapter + a85a RTL8852AE WiFi 6 802.11ax PCIe Adapter b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 17aa b736 Z50-75 + b821 RTL8821CE PCIe 802.11ac Wireless Network Controller b822 RTL8822BE 802.11a/b/g/n/ac WiFi adapter 103c 831b Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported) 17aa 5124 ThinkPad E595 17aa b023 ThinkPad E595 + b852 RTL8852BE PCIe 802.11ax Wireless Network Controller + b85b RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R] c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter c822 RTL8822CE 802.11ac PCIe Wireless Network Adapter c82f RTL8822CE 802.11ac PCIe Wireless Network Adapter @@ -13379,6 +13458,8 @@ 500c Alveo U280 XDMA Platform 5020 Alveo U50 XMDA Platform 505c Alveo U55C + 5074 Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card + 5084 Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter 6987 SmartSSD 6988 SmartSSD 7011 7-Series FPGA Hard PCIe block (AXI/debug) @@ -15366,7 +15447,7 @@ 1179 0021 KIOXIA CD5 series SSD 1d49 4039 Thinksystem U.2 CM5 NVMe SSD 1d49 403a Thinksystem AIC CM5 NVMe SSD - 0113 BG3 NVMe SSD Controller + 0113 BG3 x2 NVMe SSD Controller (DRAM-less) 1179 0001 Toshiba KBG30ZMS128G 128GB NVMe SSD 0115 XG4 NVMe SSD Controller 0116 XG5 NVMe SSD Controller @@ -15686,6 +15767,8 @@ 000b ATP867-B 000d ATP8620 000e ATP8620 + 0011 ATP865-B + 1191 0011 ACARD AEC-6280 8002 AEC6710 SCSI-2 Host Adapter 8010 AEC6712UW SCSI 8020 AEC6712U SCSI @@ -15949,7 +16032,7 @@ 6281 88F6281 [Kirkwood] ARM SoC # This device ID was used for earlier chips. 6381 MV78xx0 [Discovery Innovation] ARM SoC - 6440 88SE6440 SAS/SATA PCIe controller + 6440 88SE63x0 x1, 88SE6440 x4 PCIe SAS/SATA 3Gb/s RAID controller 6450 64560 System Controller 6460 MV64360/64361/64362 System Controller 6480 MV64460/64461/64462 System Controller @@ -15960,7 +16043,7 @@ 6820 88F6820 [Armada 385] ARM SoC 6828 88F6828 [Armada 388] ARM SoC 6920 88F6920 [Armada 390] ARM SoC - 7042 88SX7042 PCI-e 4-port SATA-II + 7042 88SX7042 PCIe 4-port SATA-II controller 16b8 434b Tempo SATA E4P 7810 MV78100 [Discovery Innovation] ARM SoC 7820 MV78200 [Discovery Innovation] ARM SoC @@ -16426,9 +16509,9 @@ 13f7 1394 OHCI Compliant Host Controller 6729 OZ6729 673a OZ6730 - 6832 OZ6832/6833 CardBus Controller - 6836 OZ6836/6860 CardBus Controller - 6872 OZ6812 CardBus Controller + 6832 OZ6832/6833 CardBus Controller [Saturn] + 6836 OZ6836/6860 CardBus Controller [Mercury] + 6872 OZ6812 CardBus Controller [Challenger] 6925 OZ6922 CardBus Controller 6933 OZ6933/711E1 CardBus/SmartCardBus Controller 1025 1016 Travelmate 612 TX @@ -16602,6 +16685,7 @@ 00a3 VisionLink F4 00a9 VisionLink CLS 00ab PCIe8g3 A5 10G + 00b5 PCIe8 RFx SDR 123e Simutech, Inc. # nee C-Cube Microsystems / acquired by Magnum Semiconductor 123f LSI Logic @@ -16834,6 +16918,8 @@ 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers + 2269 SM2269XT (DRAM-less) NVMe SSD Controller + 8366 SM8366 NVMe SSD Controller [MonTitan] 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17461,11 +17547,18 @@ 0035 PCI-DAS64/M1/16 0036 PCI-DAS64/M2/16 0037 PCI-DAS64/M3/16 + 004b PCI-MDB64 004c PCI-DAS1000 004d PCI-QUAD04 0052 PCI-DAS4020/12 0053 PCIM-DDA06/16 0054 PCI-DIO96 + 0055 CPCI-DIO24H + 0056 PCIM-DAS1602/16 + 0057 PCI-DAS3202/16 + 0059 PCI-QUAD-AC5 + 005a CPCI-DIO96H + 005b CPCI-DIO48H 005d PCI-DAS6023 005e PCI-DAS6025 005f PCI-DAS6030 @@ -17478,10 +17571,23 @@ 0066 PCI-DAS6052 0067 PCI-DAS6070 0068 PCI-DAS6071 + 006e PCI-CTR10 006f PCI-DAS6036 0070 PCI-DAC6702 + 0071 PCI-DAC6703 + 0074 PCI-CTR20HD + 0077 PCI-DIO24/LP 0078 PCI-DAS6013 0079 PCI-DAS6014 + 007b PCIM-DAS16JR/16 + 007e PCI-DIO24/S + 00a5 PCI-2511 + 00a6 PCI-2513 + 00a7 PCI-2515 + 00a8 PCI-2517 + 00be PCI-QUAD05 + 00da PCIe-DIO96H + 00db PCIe-DIO24 0115 PCIe-DAS1602/16 1308 Jato Technologies Inc. 0001 NetCelerator Adapter @@ -17643,6 +17749,9 @@ 1344 4000 3.2TB U.2 1344 5000 6.4 TB U.2 1344 6000 12.8TB U.2 + 51b7 7500 PRO NVMe SSD + 51b8 7500 MAX NVMe SSD + 51b9 6500 ION NVMe SSD 51c0 7400 PRO NVMe SSD 1028 2162 EC NVMe OPAL 7400 RI M.2 480GB 1028 2163 EC NVMe OPAL 7400 RI M.2 960GB @@ -17689,6 +17798,7 @@ 5411 2450 NVMe SSD [HendrixV] (DRAM-less) 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD + 5416 2550 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc 1347 Odetics @@ -17727,8 +17837,97 @@ 1355 Kratos Analytical Ltd 1356 The Logical Co 1359 Prisa Networks -135a Brain Boxes - 0a61 UC-324 [VELOCITY RS422/485] +135a Brainboxes Ltd + 0841 UC-268 4 port RS-232 card + 0861 UC-257 2 port RS-232 + LPT card + 0862 UC-257 2 port RS-232 + LPT card + 0863 UC-257 2 port RS-232 + LPT card + 0881 UC-279 8 port RS-232 card + 08a1 UC-313 2 port RS-422/485 card + 08a2 UC-313 2 port RS-422/485 card + 08a3 UC-313 2 port RS-422/485 card + 08c1 UC-310 2 port RS-422/485 Opto Isolated card + 08e1 UC-302 2 port RS-232 card + 08e2 UC-302 2 port RS-232 card + 08e3 UC-302 2 port RS-232 card + 0901 UC-431 3 port RS-232 card + 0921 UC-420 3 + 1 port RS-232 card + 0981 UC-475 1 + 1 port RS-232 + LPT card + 0982 UC-475 1 + 1 port RS-232 + LPT card + 09a1 UC-607 2 port RS-232 card + 09a2 UC-607 2 port RS-232 card + 09a3 UC-607 2 port RS-232 card + 0a61 UC-324 1 port RS-422/485 card + 0a81 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a82 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a83 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0aa1 UC-246 1 port RS-232 card + 0aa2 UC-246 1 port RS-232 card + 0ac1 UP-189 Powered 2 port RS-232 card + 0ac2 UP-189 Powered 2 port RS-232 card + 0ac3 UP-189 Powered 2 port RS-232 card + 0b01 UC-346 4 port RS-422/485 card + 0b02 UC-346 4 port RS-422/485 card + 0b21 UP-200 Powered 2 port RS-232 card + 0b22 UP-200 Powered 2 port RS-232 card + 0b23 UP-200 Powered 2 port RS-232 card + 0ba1 UC-101 1 + 1 port RS-232 card + 0bc1 UC-203 1 + 1 port RS-232 + LPT card + 0bc2 UC-203 1 + 1 port RS-232 + LPT card + 0be1 UC-146 LPT card + 0be2 UC-146 LPT card + 0c01 UP-869 Powered 2 port RS-232 card + 0c02 UP-869 Powered 2 port RS-232 card + 0c03 UP-869 Powered 2 port RS-232 card + 0c21 UP-880 Powered 2 port RS-232 card + 0c22 UP-880 Powered 2 port RS-232 card + 0c23 UP-880 Powered 2 port RS-232 card + 0c41 UC-368 4 port RS-422/485 Opto Isolated card + 0ca1 UC-253 2 port RS-232 card + 0d21 UC-260 4 port RS-232 card + 0d41 UC-836 4 port RS-232 card + 0d60 IS-100 1 port RS-232 card + 0d80 IS-200 2 port RS-232 card + 0da0 IS-300 1 port RS-232 + LPT card + 0dc0 IS-400 4 port RS-232 card + 0de0 IS-500 LPT card + 0e41 PX-279 8 port RS-232 card + 0e61 UC-414 3 + 1 port RS-232 + LPT card + 4000 PX-420 3 + 1 port RS-232 card + 4001 PX-431 3 port RS-232 card + 4002 PX-820 Powered 3 + 1 port RS-232 card + 4003 PX-831 Powered 3 port RS-232 card + 4004 PX-235 1 port RS-232 card + 4005 PX-101 1 + 1 port RS-232 card + 4006 PX-257 1 + 1 port RS-232 + LPT card (Serial port) + 4007 PX-257 1 + 1 port RS-232 + LPT card (LPT port) + 4008 PX-835 Powered 1 port RS-232 card + 4009 PX-857 Powered 2 port RS-232 card + 400a PX-260 4 port RS-232 card + 400b PX-320 1 port RS-422/485 card + 400c PX-313 2 port RS-422/485 card + 400e PX-310 2 port RS-422/485 Opto Isolated card + 400f PX-346 4 port RS-422/485 card + 4010 PX-368 4 port RS-422/485 Opto Isolated card + 4011 PX-420 3 + 1 port RS-232 card + 4012 PX-431 3 port RS-232 card + 4013 PX-820 Powered 3 + 1 port RS-232 card + 4014 PX-831 Powered 3 port RS-232 card + 4015 PX-257 2 port RS-232 card + 4016 PX-235 1 port RS-232 card + 4017 PX-835 Powered 1 port RS-232 card + 4018 PX-857 Powered 2 port RS-232 card + 4019 PX-101 1 + 1 port RS-232 card + 401c PX-146 LPT card + 401d PX-475 1 port RS-232 + LPT card (Serial port) + 401e PX-803 Powered 1 + 1 port RS-232 card + 401f PX-475 1 port RS-232 + LPT card (LPT port) + 4027 IX-100 1 port RS-232 card + 4028 IX-200 2 port RS-232 card + 4029 IX-400 4 port RS-232 card + 402a IX-500 LPT card + 402c PX-263 4 port RS-232 + LPT card + 4100 PX-272 4 + 1 port RS-232 + LPT card 135b Giganet Inc 135c Quatech Inc 0010 QSC-100 @@ -17738,12 +17937,19 @@ 0050 ESC-100D 0060 ESC-100M 00f0 MPAC-100 Synchronous Serial Card (Zilog 85230) + 0120 QSCP-100 + 0130 DSCP-100 + 0140 QSCP-200/300 + 0150 DSCP-200/300 0170 QSCLP-100 0180 DSCLP-100 + 0181 DSC-100 0190 SSCLP-100 01a0 QSCLP-200/300 01b0 DSCLP-200/300 + 01b1 DSC-200/300 01c0 SSCLP-200/300 + 01e0 ESC(LP)-100 0258 DSPSX-200/300 135d ABB Network Partner AB 135e Sealevel Systems Inc @@ -18233,6 +18439,7 @@ 13fc Computer Peripherals International 13fd Micro Science Inc 13fe Advantech Co. Ltd + 0071 PCIE-1761H, 8-ch Relay and 8-ch Isolated Digital Input Card 1240 PCI-1240 4-channel stepper motor controller card 1600 PCI-16xx series PCI multiport serial board (function 0) # This board has two PCI functions, appears as two PCI devices @@ -19391,9 +19598,9 @@ 144d a801 SM963 2.5" NVMe PCIe SSD a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 - 144d a801 SSD 970 EVO + 144d a801 SSD 970 EVO/PRO 1d49 403b Thinksystem U.2 PM983 NVMe SSD - a809 NVMe SSD Controller 980 + a809 NVMe SSD Controller 980 (DRAM-less) a80a NVMe SSD Controller PM9A1/PM9A3/980PRO 0128 215a DC NVMe PM9A3 RI U.2 960GB 0128 215b DC NVMe PM9A3 RI U.2 1.92TB @@ -19413,9 +19620,12 @@ 1028 2276 DC NVMe PM9A3 RI 110M.2 960GB 1028 2277 DC NVMe PM9A3 RI 110M.2 1.92TB 1028 512d DC NVMe PM9A3 RI U.2 7.68TB + 144d a801 SSD 980 PRO 144d a813 General DC NVMe PM9A3 - a80b NVMe SSD Controller PM9B1 +# Actually 88SS1322 according to techpowerup + a80b NVMe SSD Controller PM9B1 (DRAM-less) a80c NVMe SSD Controller S4LV008[Pascal] + a80d NVMe SSD Controller PM9C1a a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -19658,9 +19868,18 @@ 14a2 Millennium Engineering Inc 14a3 Maverick Networks 14a4 Lite-On Technology Corporation + 2100 CA1-8D128 NVMe SSD + 2200 CX2-8B256, CX2-8B512 NVMe SSD + 22a0 EP2-KB960 NVMe SSD 22f1 M8Pe Series NVMe SSD + 2300 CA3-8D256, CA3-8D512 NVMe SSD + 23f1 M9PeG, M9PeGN, M9PeY NVMe SSD + 2f00 CAZ-82512 NVMe SSD + 3500 CA5-8D512 NVMe SSD # Wrong vendor ID used 4318 Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller + 5100 CB1-SD256, CB1-SD512 NVMe SSD + 9100 CL1-3D256, CL1-8D512 NVMe SSD (DRAM-less) 14a5 XIONICS Document Technologies Inc 14a6 INOVA Computers GmBH & Co KG 14a7 MYTHOS Systems Inc @@ -19729,12 +19948,14 @@ 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter 7615 MT7615E 802.11ac PCI Express Wireless Network Adapter 7630 MT7630e 802.11bgn Wireless Network Adapter + 7650 MT7650 802.11ac # MT7612E too? 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter 7916 MT7905D/MT7975 # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter + 1a3b 5300 ASUS PCE-AXE59BT 7961 MT7921 802.11ax PCI Express Wireless Network Adapter 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -19980,8 +20201,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC - 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC - 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC + 14e4 d166 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d366 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20542,16 +20763,16 @@ 4360 BCM4360 802.11ac Wireless Network Adapter 4365 BCM43142 802.11b/g/n 1028 0016 Wireless 1704 802.11n + BT 4.0 - 43a0 BCM4360 802.11ac Wireless Network Adapter - 43a1 BCM4360 802.11ac Wireless Network Adapter - 43a2 BCM4360 802.11ac Wireless Network Adapter + 43a0 BCM4360 802.11ac Dual Band Wireless Network Adapter + 43a1 BCM4360 802.11ac 2,4G Wireless Network Adapter + 43a2 BCM4360 802.11ac 5G Wireless Network Adapter 43a3 BCM4350 802.11ac Wireless Network Adapter # Manufactured by Foxconn for Lenovo 17aa 075a 00JT494 43a9 BCM43217 802.11b/g/n 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter - 43b1 BCM4352 802.11ac Wireless Network Adapter + 43b1 BCM4352 802.11ac Dual Band Wireless Network Adapter 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC @@ -20577,12 +20798,14 @@ 441f BCM4361 802.11ac Dual-Band Wireless Network Controller 4420 BCM4361 802.11ac 2.4 GHz Wireless Network Controller 4421 BCM4361 802.11ac 5 GHz Wireless Network Controller - 4425 BRCM4378 Wireless Network Adapter + 4425 BCM4378 802.11ax Dual Band Wireless Network Adapter 4430 BCM44xx CardBus iLine32 HomePNA 2.0 4432 BCM4432 CardBus 10/100BaseT + 4433 BCM4387 802.11ax Dual Band Wireless LAN Controller 4464 BCM4364 802.11ac Wireless Network Adapter # brcmfmac reports it as BCM4377/4 but macOS drivers call it BCM4377b 4488 BCM4377b Wireless Network Adapter + 449d BCM43752 802.11ax Dual Band Wireless LAN Controller 4610 BCM4610 Sentry5 PCI to SB Bridge 4611 BCM4610 Sentry5 iLine32 HomePNA 1.0 4612 BCM4610 Sentry5 V.90 56k Modem @@ -20900,6 +21123,10 @@ 17de 08a6 KWorld/VStream XPert DVB-T 17de 08b2 KWorld DVB-S 100 17de a8a6 digitalnow DNTV Live! DVB-T + 1805 0111 PICOLO Jet-X Video + 1805 0112 PICOLO Jet-X Video + 1805 0113 PICOLO Jet-X Video + 1805 0114 PICOLO Jet-X Video 1822 0025 digitalnow DNTV Live! DVB-T Pro 185b e000 VideoMate X500 18ac d500 FusionHDTV 5 Gold @@ -20928,6 +21155,10 @@ 14f1 0187 Conexant DVB-T reference design 17de 08a1 XPert DVB-T PCI BDA DVBT 23880 Transport Stream Capture 17de 08a6 KWorld/VStream XPert DVB-T + 1805 0111 PICOLO Jet-X Jpeg + 1805 0112 PICOLO Jet-X Jpeg + 1805 0113 PICOLO Jet-X Jpeg + 1805 0114 PICOLO Jet-X Jpeg 18ac d500 DViCO FusionHDTV5 Gold 18ac d810 DViCO FusionHDTV3 Gold-Q 18ac d820 DViCO FusionHDTV3 Gold-T @@ -20940,6 +21171,10 @@ 0070 6902 WinTV HVR-4000-HD 0070 9002 Nova-T DVB-T Model 909 0070 9402 WinTV-HVR1100 DVB-T/Hybrid + 1805 0111 PICOLO Jet-X Control + 1805 0112 PICOLO Jet-X Control + 1805 0113 PICOLO Jet-X Control + 1805 0114 PICOLO Jet-X Control 7063 5500 pcHDTV HD-5500 8811 CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port] 0070 3400 WinTV 34604 @@ -21283,6 +21518,8 @@ 0001 Eagle Cluster Manager 0002 Osprey Cluster Manager 0003 Harrier Cluster Manager + 0371 Cassini 2 [Slingshot 400Gb] + 0372 Cassini 2 [Slingshot 400Gb] SR-IOV VF a01d FC044X Fibre Channel HBA 1591 ARN 1592 Syba Tech Ltd @@ -21627,10 +21864,10 @@ 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD - 5003 WD Blue SN500 / PC SN520 NVMe SSD - 5004 PC SN520 NVMe SSD - 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD + 5003 WD Blue SN500 / PC SN520 x2 M.2 2280 NVMe SSD + 5004 PC SN520 x2 M.2 2230 NVMe SSD + 5005 PC SN520 x2 M.2 2242 NVMe SSD + 5006 SanDisk Extreme Pro / WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD @@ -21639,17 +21876,18 @@ 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5014 WD PC SN540 / Green SN350 NVMe SSD 1 TB (DRAM-less) 5015 PC SN740 NVMe SSD (DRAM-less) 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD - 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD + 5019 WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD + 501a SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less) 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) + 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH @@ -21673,7 +21911,11 @@ 117c 0022 Celerity FC-42XS Fibre Channel Adapter 117c 0025 Celerity FC-44ES Fibre Channel Adapter 117c 0026 Celerity FC-42ES Fibre Channel Adapter + 0b01 82350B PCI GPIB 1100 E8001-66442 PCI Express CIC + 1218 82351A PCI Express GPIB + 12d6 82350C PCI GPIB + 12d7 82351B PCI Express GPIB 2922 64 Bit, 133MHz PCI-X Exerciser & Protocol Checker 2928 64 Bit, 66MHz PCI Exerciser & Analyzer 2929 64 Bit, 133MHz PCI-X Analyzer & Exerciser @@ -21927,6 +22169,11 @@ 165f Linux Media Labs, LLC 1020 LMLM4 MPEG-4 encoder 1661 Worldspace Corp. +1665 EDAX Inc +# P/N 4035.006.19720 + 1973 DPP-II FR2 Board +# P/N 4035.065.20000 + 2000 SG-IIP Board 1668 Actiontec Electronics Inc 0100 Mini-PCI bridge # Formerly SiByte, Inc. @@ -22861,6 +23108,7 @@ 17d5 7831 X3120 Dual Port 10GBase-CR 17db Cray Inc 0101 XT Series [Seastar] 3D Toroidal Router + 0501 Cassini 1 [Slingshot 200Gb] 17de KWorld Computer Co. Ltd. 17df Dini Group 1864 Virtex4 PCI Board w/ QL5064 Bridge [DN7000K10PCI/DN8000K10PCI/DN8000K10PSX/NOTUS] @@ -22978,6 +23226,35 @@ 1804 Ralink corp. (wrong ID) 3060 RT3060 Wireless 802.11n 1T/1R 1805 Euresys S.A. + 0201 PICOLO Alert PCI + 0202 PICOLO Diligent + 0204 PICOLO Alert-RC + 0205 PICOLO Alert PCIe + 0206 PICOLO Diligent Plus PCIe + 0207 PICOLO Alert-RC PCIe + 0300 GRABLINK Expert 2 + 0301 GRABLINK Quickpack ColorScan + 0302 GRABLINK Value cPCI + 0303 GRABLINK Expert 2 cPCI + 0305 GRABLINK Avenue + 0306 GRABLINK Quickpack CFA + 0307 GRABLINK Express + 0308 GRABLINK Quickpack CFA PCIe + 0309 GRABLINK Quickpack CFA PCIe (Recovery) + 030a GRABLINK Full + 030b GRABLINK Full (Recovery) + 030c GRABLINK DualBase + 030d GRABLINK DualBase (Recovery) + 030e GRABLINK Base + 030f GRABLINK Base (Recovery) + 0310 GRABLINK Full XR + 0311 GRABLINK Full XR (Recovery) + 0401 DOMINO Iota + 0402 DOMINO Alpha 2 + 0403 DOMINO Harmony + 0404 DOMINO Melody + 0407 DOMINO Symphony + 0408 DOMINO Symphony PCIe 1809 Lumanate, Inc. 180c IEI Integration Corp 1813 Ambient Technologies Inc @@ -23710,11 +23987,13 @@ 5007 E7 NVMe Controller 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller - 5013 PS5013 E13 NVMe Controller + 5013 PS5013-E13 PCIe3 NVMe Controller (DRAM-less) + 5015 PS5015-E15 PCIe3 NVMe Controller (DRAM-less) 5016 E16 PCIe4 NVMe Controller 5018 E18 PCIe4 NVMe Controller 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) + 5026 PS5026-E26 PCIe5 NVMe Controller 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24246,6 +24525,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0011 QEMU PVPanic device 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine @@ -24291,6 +24571,7 @@ 1028 2151 BOSS-N1 Modular ET 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter + 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 @@ -24380,6 +24661,12 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 2700 Ultrastar DC SN650 NVMe SSD + 2701 Ultrastar DC SN650 NVMe SSD + 2702 Ultrastar DC SN650 NVMe SSD + 2720 Ultrastar DC SN650 NVMe SSD + 2721 Ultrastar DC SN650 NVMe SSD + 2722 Ultrastar DC SN655 NVMe SSD 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD @@ -24500,6 +24787,10 @@ 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD +# 2TB + 5021 FireCuda 520 SSD +# 1TB + 5026 FireCuda 540 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -24559,6 +24850,7 @@ 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH + 0002 CAN-IB100/PCIe 0003 CAN-IB200/PCIe 1bef Lantiq 0011 MIPS SoC PCI Express Port @@ -24566,6 +24858,7 @@ 0001 SentinelEX 7011 RX0xxx 1bf5 Greenliant + 1000 G7200 series U.2 NVMe SSD 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24699,6 +24992,8 @@ 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive 284a PE8110 Series NVMe Solid State Drive 2a49 PE9110 Series NVMe Solid State Drive + 2a59 PE9010 Series NVMe Solid State Drives + 2b59 PS10x0 Series NVMe Solid State Drives 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24721,11 +25016,18 @@ 1c5f 0b40 NVMe SSD PBlaze6 6530 7680G AIC 1c5f 0b41 NVMe SSD PBlaze6 6530 7680G 2.5" U.2 1c5f 0b47 NVMe SSD PBlaze6 6630 7680G 2.5" U.2 + 1c5f 1320 NVMe SSD PBlaze6 6531 1920G AIC 1c5f 1321 NVMe SSD PBlaze6 6531 1920G 2.5" U.2 + 1c5f 1330 NVMe SSD PBlaze6 6531 3840G AIC 1c5f 1331 NVMe SSD PBlaze6 6531 3840G 2.5" U.2 + 1c5f 1340 NVMe SSD PBlaze6 6531 7680G AIC 1c5f 1341 NVMe SSD PBlaze6 6531 7680G 2.5" U.2 + 1c5f 1421 NVMe SSD PBlaze6 6541 1920G 2.5" U.2 + 1c5f 1427 NVMe SSD PBlaze6 6641 1920G 2.5" U.2(dual port) 1c5f 1431 NVMe SSD PBlaze6 6541 3840G 2.5" U.2 + 1c5f 1437 NVMe SSD PBlaze6 6641 3840G 2.5" U.2(dual port) 1c5f 1441 NVMe SSD PBlaze6 6541 7680G 2.5" U.2 + 1c5f 1447 NVMe SSD PBlaze6 6641 7680G 2.5" U.2(dual port) 1c5f 4b20 NVMe SSD PBlaze6 6536 1600G AIC 1c5f 4b21 NVMe SSD PBlaze6 6536 1600G 2.5" U.2 1c5f 4b25 NVMe SSD PBlaze6 6536 1600G E1.S @@ -24737,11 +25039,18 @@ 1c5f 4b40 NVMe SSD PBlaze6 6536 6400G AIC 1c5f 4b41 NVMe SSD PBlaze6 6536 6400G 2.5" U.2 1c5f 4b47 NVMe SSD PBlaze6 6636 6400G 2.5" U.2 + 1c5f 5320 NVMe SSD PBlaze6 6537 1600G AIC 1c5f 5321 NVMe SSD PBlaze6 6537 1600G 2.5" U.2 + 1c5f 5330 NVMe SSD PBlaze6 6537 3200G AIC 1c5f 5331 NVMe SSD PBlaze6 6537 3200G 2.5" U.2 + 1c5f 5340 NVMe SSD PBlaze6 6537 6400G AIC 1c5f 5341 NVMe SSD PBlaze6 6537 6400G 2.5" U.2 + 1c5f 5421 NVMe SSD PBlaze6 6547 1600G 2.5" U.2 + 1c5f 5427 NVMe SSD PBlaze6 6647 1600G 2.5" U.2(dual port) 1c5f 5431 NVMe SSD PBlaze6 6547 3200G 2.5" U.2 + 1c5f 5437 NVMe SSD PBlaze6 6647 3200G 2.5" U.2(dual port) 1c5f 5441 NVMe SSD PBlaze6 6547 6400G 2.5" U.2 + 1c5f 5447 NVMe SSD PBlaze6 6647 6400G 2.5" U.2(dual port) 003d PBlaze5 920/926 1c5f 0a30 NVMe SSD PBlaze5 920 3840G AIC 1c5f 0a31 NVMe SSD PBlaze5 920 3840G 2.5" U.2 @@ -24764,11 +25073,28 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 0431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c31 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c41 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 0c51 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 1430 NVMe SSD PBlaze7 7940 3840G AIC *** 479 LINES SKIPPED *** From nobody Mon Jan 22 14:29:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJXfF5973z5817n; Mon, 22 Jan 2024 14:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJXfF4htbz49sH; Mon, 22 Jan 2024 14:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705933749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cg0FMp8wfAdzUp2qwtpaNwjykT+QRPcmjIwp9jhqQT8=; b=dyOwPDBVdo7upB7/RuEUcavauTxmFGtcmvnUxjJ8lvQ3N6D4ReD19NYqfxrsbZFdzLFpWh as2n/a1fQmaH5s/3BsmfH/FpMR5EJyXcojjlqGJudVDrJQXXEqt8mQfzdRhrL1hJFfZdRW Npu5sqtYgNT7x2NTTXwAWBnOV/8h8ZdC1kWloP4YPWp98+GaxpCKR4p2Irg/+O9OJTqMk4 4OGDidMiPkpRFerOMHgQFI4A2MvLDglw4zGPfdD4TM9hbdKe1z40tAqeR1s9AP1Yl00+Nd XN+53F8DHF/c+Q0b7iyQsOXZIV5rtLFu2ON22em/K8Ihxut7FS3Rsi1oF1bsgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705933749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cg0FMp8wfAdzUp2qwtpaNwjykT+QRPcmjIwp9jhqQT8=; b=j9tZEqAWHXI1UFIw+4BZuOIPlYEn7WrtJWmPhIQ+7dFpqu0p7xpas+TgkCvroOKAMRI0fb HftFVy5OsOei1TZDZkDcWVO/NsxOehBj6X/i7nSRVPAdz3EDl9yJWrQWiOMCFkOEc8hCOR xbDZWrvAn0OYUk+JvXObbMqJP9dtwK/YqQLkaValz13S9bMUkvJp78I2tf4qEH3oOJuIx8 J7241lSIFkmO4pW8PjlKIW5ou9NGQ4aK+mjs1lrtrD5y7YfhhBtQj/d6uU6TYoB/12+BvT fVBbH1YgLW+3toxu687tVzy9mrCToZIwoNUMc1Fj20s+MZUAgYwfUUKIjVXt+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705933749; a=rsa-sha256; cv=none; b=auvlWbh9Cvi7wyAOuewcPTsPY1R5ipGYH9n7lnFLOoAWxRQM8KX4L0r27lmQM9YjqH17PZ 3giU7S6gvg+i1BRxE8SGvXdCY/6r4fo5uKGmyULqTMzEPLWAjK+WsUUkAfJWO4fXDC1RAt cT7YUvD6wWhxRnX90WE/WNhSGK1iYYSke3uh0TwK9clUZjRSqL/cCRcWF/U7XGC5G5P/00 uMkzd9lybnkN6Lx7bK3Aa+2hrt7qftCvbCVwD3bqtxSSdV1CMLNqI9pg2oFJk1PZwxr5Gc Co7GYbupEosfCRlTkZL+CbcMKG14v1ylGSKTnwO1QYsuTyvLAhfKi202RDHp3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJXfF3lxfz15Dy; Mon, 22 Jan 2024 14:29: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 40MET9qi001233; Mon, 22 Jan 2024 14:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MET9eJ001230; Mon, 22 Jan 2024 14:29:09 GMT (envelope-from git) Date: Mon, 22 Jan 2024 14:29:09 GMT Message-Id: <202401221429.40MET9eJ001230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d8d0ecd9739d - stable/13 - makefs: Handle missing link keyword in mtree spec List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 commit d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 Author: Stéphane Rochoy AuthorDate: 2023-09-21 07:14:20 +0000 Commit: Ed Maste CommitDate: 2024-01-22 14:28:57 +0000 makefs: Handle missing link keyword in mtree spec PR: 241178 Reviewed by: emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/850 (cherry picked from commit d26c1a0f8bceb6748436fe3fc57bac3ef8179dd3) (cherry picked from commit be31bd59895e57fb7359de870ea3ecc19e3d1ae1) --- usr.sbin/makefs/mtree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index 688ce81e733d..1fe2eb4097b2 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -740,7 +740,10 @@ read_mtree_keywords(FILE *fp, fsnode *node) type = S_IFREG; } else if (node->type != 0) { type = node->type; - if (type == S_IFREG) { + if (type == S_IFLNK && node->symlink == NULL) { + mtree_error("%s: link type requires link keyword", node->name); + return (0); + } else if (type == S_IFREG) { /* the named path is the default contents */ node->contents = mtree_file_path(node); } From nobody Mon Jan 22 14:33:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJXlQ3wVHz58203; Mon, 22 Jan 2024 14:33: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 4TJXlQ3M5Gz4F4y; Mon, 22 Jan 2024 14:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705934018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJbezc6jyp9DCmq1KfnMKhzHHCQkjz5OHTjHr1uq/Y4=; b=vFfPgOKuDHja5cF7nayeifjWEFFTX75X767D+fJNPYm+66euMN1l9CwfmfluzHHpoam5zb QGEWV9D9ktga/RKXISG+T1drCRttmu8Re6DxZzmlsLtGbE1T2z+7xMZIuwHGVhNZlcwU1M worV73jIwtkgFVUnB+CLLW/tDpj7sH5eIT73vXY6lofA+JE/5F7nYp07/cWpqja4lvpadO r21jlBhD6UIJI5db010O870y8loSb1aSwdUm+0jGEWHLhyDkZgvNsTMIJYuWnlOTIi1yy5 57R50nVrm0t//OZgpItz33P1ycf1whNnynXt31MT8GgTJer55QLGoYnbrZlxgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705934018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJbezc6jyp9DCmq1KfnMKhzHHCQkjz5OHTjHr1uq/Y4=; b=WJ7M4z4SndKY6Z39nrwalu2Z/dJCkrxZ3FhpJPq6MV2IxJV7mUVUbur8oeJhX8QFKNAdMo xMC7YHDm7FhQq0Qoqbp8jGLcX7nQpAQTvYaCSi3UMJ1TxRAvu/zxGpUhahvza+fgnI7m8/ LJJ4+CAHkLa9HoTDU0RyvhA6ctlj29AmO/YMd0JZRX1+knte39n98fJk/EiyPIQqBwq1s6 aCRAxRR/yJoL+omGmu9Ir2UQq1z3OuIGrkB0J+f11jOmTYMQCUTiO4dyRBmMUSuUWb4loR SDlHnS13dqCB+qwsPsAw5deeXTCBaeIBpZv+QegQelnrDwN9XpPx9xERoR8icw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705934018; a=rsa-sha256; cv=none; b=Mh3a3LqQjReNF1ONFhsXaIZFGFFDn/50y7dxT9SOYO11b2bGO/CaRHLYkk5kKuCIRgVSWM 7S99BkHXcA1DEQC67Tg5DBW8loQJONqAQP2hxtbgWw3vBBOz0SSEodfm2ZIvY/h+qxrgMn WSgmwdIHRMN/rAeslmyxbEOjGf+/w4MfQtJsn0djbqHWcw+nSMkzbPJo8KAQUooEtgpCVQ 9QsjskysQ3JhoRy3Wc+7+uAI6AKQB+D+FQsXAFrQEr3FInm2RjIvFWF2K0mHVFDDJvxxwe H3lijofacYUZxOS9cR0s22GxxpiCNTz3nhM5EQ1QEYUdo/KKcB21JnaEE4SP0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJXlQ2QqQz15JH; Mon, 22 Jan 2024 14:33: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 40MEXcPT016964; Mon, 22 Jan 2024 14:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MEXclV016961; Mon, 22 Jan 2024 14:33:38 GMT (envelope-from git) Date: Mon, 22 Jan 2024 14:33:38 GMT Message-Id: <202401221433.40MEXclV016961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1614823a499a - stable/13 - release/oci.conf: add missing vm_extra_pre_umount() steps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 commit 1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 Author: Ed Maste AuthorDate: 2023-05-24 15:45:29 +0000 Commit: Ed Maste CommitDate: 2024-01-22 14:33:06 +0000 release/oci.conf: add missing vm_extra_pre_umount() steps vm.subr's default vm_extra_pre_umount removes /qemu and /etc/resolv.conf. When vm_extra_pre_umount is overridden these steps need to be performed in the cloud-specific conf file. PR: 271602 Reviewed by: dch, lwhsu Event: Kitchener-Waterloo Hackathon 202305 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40257 (cherry picked from commit ae60012e46ecfe59a3506b903e685b6a3347807b) --- release/tools/oci.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release/tools/oci.conf b/release/tools/oci.conf index 7260cd24defd..47231d65d79b 100644 --- a/release/tools/oci.conf +++ b/release/tools/oci.conf @@ -90,5 +90,10 @@ EOF touch ${DESTDIR}/firstboot + if ! [ -z "${QEMUSTATIC}" ]; then + rm -f ${DESTDIR}/${EMULATOR} + fi + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } From nobody Mon Jan 22 15:49:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJZQs0xGwz57fmg; Mon, 22 Jan 2024 15:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJZQs0Mfhz4NlB; Mon, 22 Jan 2024 15:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=212154dIxDoYbSClHorq1WRpuYpdQSU2lnPwvPZ6UVE=; b=hqo+W/SO8qs/Q2yHTRN39dKyMfMm8Cf78arjcz/Zi4QdRd2vYMzP9w676MpXeOdXlO04x3 DPWqi9XAhRAcAfwdI9Yp2P6qOIYEQBuzgQEY+4dVSl1R+h8yR7Wu4xlwbI7gqjzUX0fV37 HKzxeNV8YFikAKZ/38hYssahqlCNkRxqUOJzAQmmDHEEdHXfuq9hUhO8ijm9OUT1Hrwu7y 5MkOrANgpXP1XL7yL1dWithkcSdvrsRn3DSKmaPfu8p2mSnv7LpNooIyuMdgXnZQMWpmtQ tNyGbjL3ApvMZlM892Nawe/MXYuOq3wicekPaATPRz9O2/FGZ7CRYSRpoajiBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=212154dIxDoYbSClHorq1WRpuYpdQSU2lnPwvPZ6UVE=; b=FD/oP2cDOWxbCj+UNti93O12PzzL2kolXRTtCtGrWU6D+3SSgo9g2q95jCOWV8PojktlXj azftgOF/T9G0ghyQ3H22+VLyK+pwWomo6jCqhPE1mVRgDLvSqyG1nakQ7KFJXCPnql+KFP AQ/10eFRp1YAWVDMXdwVkynq9oNi1n6ANClPo8F1X3+ulACETdmxXThOYF+C/8f3lUGtQZ aH5w9o6xbENCRjBt5F37GiRLcv9O0OrP3tWE/cGVIK8BoQnMaVFssiVh4RTYkUQgW+0Ejj 3ebFjqz/bOd/j8xegtKqRnV6LM31+Ln3/aAGIG8eurREJIjDaFQ10v0JVqZZzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705938565; a=rsa-sha256; cv=none; b=fnDxlwCG0Xa9yVx/A0Fo+CGlZJz0u1fWZ47nydZWvEj85JpK77fdFtRqivxXq9MmJV76lw g93kvG2lDFQzoUcrNTJzX4lliA/pBs+q4RoOkP1bMnWbd2Fn1HiKtjwIdAv1hb4OtVx24l iQUFoFjw+B6+IXT0NVHTGZc5fZUPtff5wHuS24f5WYVdAKRqL3LMu9ixatA+w2dboab5tH 7qFB+aPI5RgRImPJaZ8dgVS7gAjNXJo8HwaIILvn9zrKd4PV0qpSfAx9tF2adH73d6sBCT HLFQi5Uv97GAtpPIpZp3YPrm7VkVSqxgqj0+Pr58frm3CAGyy3dPvjXEHu8Urg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJZQr6XG8z17HY; Mon, 22 Jan 2024 15:49: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 40MFnOie034985; Mon, 22 Jan 2024 15:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFnOoH034982; Mon, 22 Jan 2024 15:49:24 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:49:24 GMT Message-Id: <202401221549.40MFnOoH034982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: c7db2e15e404 - stable/14 - kerberos: Fix numerous segfaults when using weak crypto List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c7db2e15e4045e1daba939bb151fc5878f791c7b Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c7db2e15e4045e1daba939bb151fc5878f791c7b commit c7db2e15e4045e1daba939bb151fc5878f791c7b Author: Cy Schubert AuthorDate: 2023-12-06 15:30:05 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 15:48:51 +0000 kerberos: Fix numerous segfaults when using weak crypto Weak crypto is provided by the openssl legacy provider which is not load by default. Load the legacy providers as needed. When the legacy provider is loaded into the default context the default provider will no longer be automatically loaded. Without the default provider the various kerberos applicaions and functions will abort(). This is the second attempt at this patch. Instead of linking secure/lib/libcrypto at build time we now link it at runtime, avoiding buildworld failures under Linux and MacOS. This is because TARGET_ENDIANNESS is undefined at pre-build time. PR: 272835 Tested by: netchild Joerg Pulz (previous version) (cherry picked from commit 476d63e091c2e663b51d18acf6acb282e1f22bbc) --- crypto/heimdal/lib/kadm5/create_s.c | 4 ++ crypto/heimdal/lib/kadm5/kadm5_locl.h | 1 + crypto/heimdal/lib/krb5/context.c | 4 ++ crypto/heimdal/lib/krb5/crypto.c | 3 + crypto/heimdal/lib/krb5/salt.c | 5 ++ crypto/heimdal/lib/roken/version-script.map | 1 + kerberos5/include/crypto-headers.h | 4 ++ kerberos5/include/fbsd_ossl_provider.h | 4 ++ kerberos5/lib/libroken/Makefile | 8 ++- kerberos5/lib/libroken/fbsd_ossl_provider_load.c | 77 ++++++++++++++++++++++++ 10 files changed, 109 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/kadm5/create_s.c b/crypto/heimdal/lib/kadm5/create_s.c index 1033ca103239..267e9bbda2a0 100644 --- a/crypto/heimdal/lib/kadm5/create_s.c +++ b/crypto/heimdal/lib/kadm5/create_s.c @@ -169,6 +169,10 @@ kadm5_s_create_principal(void *server_handle, ent.entry.keys.len = 0; ent.entry.keys.val = NULL; + ret = fbsd_ossl_provider_load(); + if (ret) + goto out; + ret = _kadm5_set_keys(context, &ent.entry, password); if (ret) goto out; diff --git a/crypto/heimdal/lib/kadm5/kadm5_locl.h b/crypto/heimdal/lib/kadm5/kadm5_locl.h index 68b6a5ebf024..63b367ab7e21 100644 --- a/crypto/heimdal/lib/kadm5/kadm5_locl.h +++ b/crypto/heimdal/lib/kadm5/kadm5_locl.h @@ -79,5 +79,6 @@ #include #include #include "private.h" +#include "fbsd_ossl_provider.h" #endif /* __KADM5_LOCL_H__ */ diff --git a/crypto/heimdal/lib/krb5/context.c b/crypto/heimdal/lib/krb5/context.c index 86bfe539b974..681bc9a0982f 100644 --- a/crypto/heimdal/lib/krb5/context.c +++ b/crypto/heimdal/lib/krb5/context.c @@ -392,6 +392,10 @@ krb5_init_context(krb5_context *context) } HEIMDAL_MUTEX_init(p->mutex); + ret = fbsd_ossl_provider_load(); + if(ret) + goto out; + p->flags |= KRB5_CTX_F_HOMEDIR_ACCESS; ret = krb5_get_default_config_files(&files); diff --git a/crypto/heimdal/lib/krb5/crypto.c b/crypto/heimdal/lib/krb5/crypto.c index 67ecef62e875..6ee22609a4d5 100644 --- a/crypto/heimdal/lib/krb5/crypto.c +++ b/crypto/heimdal/lib/krb5/crypto.c @@ -2054,6 +2054,9 @@ krb5_crypto_init(krb5_context context, *crypto = NULL; return ret; } + ret = fbsd_ossl_provider_load(); + if (ret) + return ret; (*crypto)->key.schedule = NULL; (*crypto)->num_key_usage = 0; (*crypto)->key_usage = NULL; diff --git a/crypto/heimdal/lib/krb5/salt.c b/crypto/heimdal/lib/krb5/salt.c index 5e4c8a1c8572..2b1fbee80ab6 100644 --- a/crypto/heimdal/lib/krb5/salt.c +++ b/crypto/heimdal/lib/krb5/salt.c @@ -43,6 +43,8 @@ krb5_salttype_to_string (krb5_context context, struct _krb5_encryption_type *e; struct salt_type *st; + (void) fbsd_ossl_provider_load(); + e = _krb5_find_enctype (etype); if (e == NULL) { krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, @@ -75,6 +77,8 @@ krb5_string_to_salttype (krb5_context context, struct _krb5_encryption_type *e; struct salt_type *st; + (void) fbsd_ossl_provider_load(); + e = _krb5_find_enctype (etype); if (e == NULL) { krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, @@ -196,6 +200,7 @@ krb5_string_to_key_data_salt_opaque (krb5_context context, enctype); return KRB5_PROG_ETYPE_NOSUPP; } + (void) fbsd_ossl_provider_load(); for(st = et->keytype->string_to_key; st && st->type; st++) if(st->type == salt.salttype) return (*st->string_to_key)(context, enctype, password, diff --git a/crypto/heimdal/lib/roken/version-script.map b/crypto/heimdal/lib/roken/version-script.map index 72d2ea7e4f7c..bb2139ed74cc 100644 --- a/crypto/heimdal/lib/roken/version-script.map +++ b/crypto/heimdal/lib/roken/version-script.map @@ -13,6 +13,7 @@ HEIMDAL_ROKEN_1.0 { ct_memcmp; err; errx; + fbsd_ossl_provider_load; free_getarg_strings; get_default_username; get_window_size; diff --git a/kerberos5/include/crypto-headers.h b/kerberos5/include/crypto-headers.h index 3ae0d9624ffd..2cc870642964 100644 --- a/kerberos5/include/crypto-headers.h +++ b/kerberos5/include/crypto-headers.h @@ -17,5 +17,9 @@ #include #include #include +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +#include +#include "fbsd_ossl_provider.h" +#endif #endif /* __crypto_headers_h__ */ diff --git a/kerberos5/include/fbsd_ossl_provider.h b/kerberos5/include/fbsd_ossl_provider.h new file mode 100644 index 000000000000..013983ca9f83 --- /dev/null +++ b/kerberos5/include/fbsd_ossl_provider.h @@ -0,0 +1,4 @@ +#ifndef __fbsd_ossl_provider_h +#define __fbsd_ossl_provider_h +int fbsd_ossl_provider_load(void); +#endif diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index 0c46ba6c4cb5..ca6d090e64f0 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -74,9 +74,13 @@ SRCS= base64.c \ vis.c \ warnerr.c \ write_pid.c \ - xfree.c + xfree.c \ + fbsd_ossl_provider_load.c -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${SRCTOP}/kerberos5/include \ + -I${KRB5DIR}/lib/krb5 \ + -I${SRCTOP}/crypto/openssl/include -I. CLEANFILES= roken.h diff --git a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c new file mode 100644 index 000000000000..497b32124f96 --- /dev/null +++ b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c @@ -0,0 +1,77 @@ +#include +#include +#include +#include +#include + +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +static void fbsd_ossl_provider_unload(void); +static void print_dlerror(char *); +static OSSL_PROVIDER *legacy; +static OSSL_PROVIDER *deflt; +static int providers_loaded = 0; +static OSSL_PROVIDER * (*ossl_provider_load)(OSSL_LIB_CTX *, const char*) = NULL; +static int (*ossl_provider_unload)(OSSL_PROVIDER *) = NULL; +static void *crypto_lib_handle = NULL; + +static void +fbsd_ossl_provider_unload(void) +{ + if (ossl_provider_unload == NULL) { + if (!(ossl_provider_unload = (int (*)(OSSL_PROVIDER*)) dlsym(crypto_lib_handle, "OSSL_PROVIDER_unload"))) { + print_dlerror("Unable to link OSSL_PROVIDER_unload"); + return; + } + } + if (providers_loaded == 1) { + (*ossl_provider_unload)(legacy); + (*ossl_provider_unload)(deflt); + providers_loaded = 0; + } +} + +static void +print_dlerror(char *message) +{ + char *errstr; + + if ((errstr = dlerror()) != NULL) + fprintf(stderr, "%s: %s\n", + message, errstr); +} +#endif + +int +fbsd_ossl_provider_load(void) +{ +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) + if (crypto_lib_handle == NULL) { + if (!(crypto_lib_handle = dlopen("/usr/lib/libcrypto.so", + RTLD_LAZY|RTLD_GLOBAL))) { + print_dlerror("Unable to load libcrypto.so"); + return (EINVAL); + } + } + if (ossl_provider_load == NULL) { + if (!(ossl_provider_load = (OSSL_PROVIDER * (*)(OSSL_LIB_CTX*, const char *)) dlsym(crypto_lib_handle, "OSSL_PROVIDER_load"))) { + print_dlerror("Unable to link OSSL_PROVIDER_load"); + return(ENOENT); + } + } + + if (providers_loaded == 0) { + if ((legacy = (*ossl_provider_load)(NULL, "legacy")) == NULL) + return (EINVAL); + if ((deflt = (*ossl_provider_load)(NULL, "default")) == NULL) { + (*ossl_provider_unload)(legacy); + return (EINVAL); + } + if (atexit(fbsd_ossl_provider_unload)) { + fbsd_ossl_provider_unload(); + return (errno); + } + providers_loaded = 1; + } +#endif + return (0); +} From nobody Mon Jan 22 15:49:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJZQt35wDz57fYd; Mon, 22 Jan 2024 15:49: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 4TJZQt1LKlz4NZb; Mon, 22 Jan 2024 15:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4Pw4RC+95vPEvHO014EYye/ZBB/kWc9G1ojDwbJ+Fw=; b=q/dizOBySRoRCnZrsjpII345Rq3bRhEcXSr8McQAqE4sKiJit666amA2SEM7BeTQNPqTvR S08nizPCccS4gP6JCtX8ZBxuX1XThkYmxPqCUxUIb0z1B9e2vh6f5H2MjK15qPlMvoa4iy 31ij4EQbNOK5TNmbUSV+q7Y0I4FW7//uLXw1tH+em5HmkjT+PhIupUv1Jr3hsSqqGgjPX6 Oca8I50dpQ3ZSj7ve1vJmUDzup1JA5W2VYTHxT/5+1CFlemx5jKseQ2G2VjppQetqunGz1 g8OUBWvOFyuge1BtNNWoenBwRrJSs/5L+eVfI41ruEA+29LNefGWuVtg/9c1DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4Pw4RC+95vPEvHO014EYye/ZBB/kWc9G1ojDwbJ+Fw=; b=SGKHDGfCAqSM1TWGIMeLt5+8sm48D6oHXqBC1JOSbjz9Bvp9LCpGwRM/5B2bdZrAzSr5qA RTlJxDFdLZpSUjk1jkmo8oIGnUa+W87UMmcyWA+tv56mweGS/mcsy1b+ANq99VQfvgqrve nMdWRi6sbae9p/DSfZAfHRvW/f8wil+z3D+n0b89ee1IrMZCwzX/ZvWGnlS2DF85azEcAC JWPgF9FvXUVYnvRwldxHt+q/dBQZ5RS6VbGa01aOHCBl7jrW696++hSR41hVirJHzIGwc6 M17LCL+Xio7yNG+3q08cpVaW9h+NRzrfec4l9TqSuGGkWaXrXSb0EltPNtKUwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705938566; a=rsa-sha256; cv=none; b=pNgnvaRchdx3sstQccgHFqTWrF9vEroqF0FKcEqXvMrMtzFcCynC7zwRnsFxvYvL2Cn3Iu g0sC/5mUSr5xAYavHwiDl9DFFtum5pJEP/XpJ5JYnKlnZdZxHmCZ6CsBl1bkeIYryTMT3D Mgvwo3P0ZJrFhVkFkZhkFUhHP0JcdWL1Ldn1RSLEZMxnGRsDe2HI4O/DrMMRzzFib6TRRW GGf5GoqUuIN4pSX9HDSHmkwfk7XFK3eDfkFvkqGqxozYSKQ1BhcWBWJd7sqtgmkXtw2JWk vEmpt6ea71dI/RB6C98fiveAbk+qWFR9c5h/JfkfuPXAQ06JAMDxeCCP3qPfnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJZQt0QhNz16my; Mon, 22 Jan 2024 15:49: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 40MFnPTO035039; Mon, 22 Jan 2024 15:49:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFnPYF035036; Mon, 22 Jan 2024 15:49:25 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:49:25 GMT Message-Id: <202401221549.40MFnPYF035036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 17e941a0c88c - stable/14 - kerberos5: Mitigate the possibility of using an old libcrypto List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17e941a0c88cac2d8cd28d6614448adbd65d4b72 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=17e941a0c88cac2d8cd28d6614448adbd65d4b72 commit 17e941a0c88cac2d8cd28d6614448adbd65d4b72 Author: Cy Schubert AuthorDate: 2024-01-18 08:22:20 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 15:49:05 +0000 kerberos5: Mitigate the possibility of using an old libcrypto By using the full library name (libcrypto.so.30) we avoid the exposure of using an old, possibly vulnerable, library. Reported by: jrtc27 Fixes: 476d63e091c2 (cherry picked from commit 0990136ed1753ac7837206f9c5f4b83ccff6c405) --- kerberos5/lib/libroken/fbsd_ossl_provider_load.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c index 497b32124f96..2328041bc166 100644 --- a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c +++ b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c @@ -5,6 +5,7 @@ #include #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +#define CRYPTO_LIBRARY "/lib/libcrypto.so.30" static void fbsd_ossl_provider_unload(void); static void print_dlerror(char *); static OSSL_PROVIDER *legacy; @@ -46,7 +47,7 @@ fbsd_ossl_provider_load(void) { #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) if (crypto_lib_handle == NULL) { - if (!(crypto_lib_handle = dlopen("/usr/lib/libcrypto.so", + if (!(crypto_lib_handle = dlopen(CRYPTO_LIBRARY, RTLD_LAZY|RTLD_GLOBAL))) { print_dlerror("Unable to load libcrypto.so"); return (EINVAL); From nobody Mon Jan 22 16:42:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJbcL1mNSz57lm4; Mon, 22 Jan 2024 16:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJbcL1K88z4Wrv; Mon, 22 Jan 2024 16:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVRvYRmra4qQ8IfNq5HvmJsigMkJVYVnXsEB+ElWnAo=; b=G3wBK942Imz9TRsHVu0+XnL7gDP7GAoIriMPYavtCdUsUm9BkyupCAHqyYROw37JXm6XaP LmMp+rKo5cB1PsQDGq1iAEGL8KESmmTB3aCY/rFkAQNLdVoRKSeAejviPMD0D0VIg9k8Bp vJ4tsyrw4r7T9W727jXPGIuam0V17nMM4Jxw6o2vZpHDHXef5BiKIG+w6c2Y9+B+BM3m81 1vt+rqTuedmoDxttgDn/AqrtiG6epB+MImFnhA8330WbgdSAxR2JvHpIC8jLrFroqFbV8O Ha3qvST4G6kEVcaiVoRNC3FMb+TlF/PQV7K8GKwS8qJvbiTk7ZvIU6CbI1TT8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVRvYRmra4qQ8IfNq5HvmJsigMkJVYVnXsEB+ElWnAo=; b=EAlKdc0RjZl+DG5pLcTCw3B739IdfNOPJQexk8AhKzVJocZvgp6BIZm2/pRE2XEHqFgi4J 3L9nrKzrDpE4M4xDuYmvgDwT1Oxzu6fvV0aVxXQMKESDfF2/bXlipuoN4JmgxyUSVdicEV lf29gtH54861opBYez4bV7Dk15OM6Z0tEvvmAs3jsQCQHv8h7ZmOnprZHGpIm0kP/CBU8Z f2uUhwwDdYEMkiJBry3VxUh8XiqDNFgcYXFE5pZJ36wskjnuZxgn5qBWWapSIowEOlFBmT 7OWULukIPw6viP8ZDjIdTBFzBX+frq87H2KTCOU7TTJnl0mPdOLWt5YhLtLUbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705941762; a=rsa-sha256; cv=none; b=r8AKkpXwqdICuAgiQj6XKILJJadslZAOo8GxY1KnD9WmeXGnc8eqjVLVTBeEeWXWvp+ZbQ hl0+qZCDAccO+LFJMbuQQlYRq7BIEiH2KOO48ht3jhxmx2/OJWMM2wIu1/eff6W2DuVmdz gfnRWmFuZIWTcFn20A62GsYMRsPgp0ZJWpqOA6ZaVg2f7LD9Acs351TgCIGOTNDr1SQQq1 ZajAU9m235wEuGKGN/w0oo0ZPNx9ymwcJ4NavzWrqmGRjEORJv9oT3M357rdizoBNxaGKu RTzvBtEEB2jogxT3AT96/x9VNDfxY4B7cTzyVq4IcT3JF6/8bDsfzEHDNZ2ctw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJbcL0N5Jz18bT; Mon, 22 Jan 2024 16:42: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 40MGgfb9036354; Mon, 22 Jan 2024 16:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MGgfS5036351; Mon, 22 Jan 2024 16:42:41 GMT (envelope-from git) Date: Mon, 22 Jan 2024 16:42:41 GMT Message-Id: <202401221642.40MGgfS5036351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 7e88d8fec4e8 - stable/14 - route: error on IPv4 network routes with incorrect destination List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7e88d8fec4e8adc258378c7a68adf6cef1da8ad4 Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=7e88d8fec4e8adc258378c7a68adf6cef1da8ad4 commit 7e88d8fec4e8adc258378c7a68adf6cef1da8ad4 Author: Mike Karels AuthorDate: 2024-01-15 21:14:54 +0000 Commit: Mike Karels CommitDate: 2024-01-22 16:42:16 +0000 route: error on IPv4 network routes with incorrect destination Route destinations like 10/8 are most likely intended as a shorthand for 10.0.0.0/8, but instead it means 0.0.0.10/8, which includes only bits in the host part of the mask, and hence adds a route to 0.0.0.0/8. In 12.x, there was code to "do what I mean", which was removed as part of a cleanup of old network class remnants. Given that we have gone this long without that code, do not restore that behavior. Instead, detect the issue and produce an error. Specifically, if there are no dots in a numeric IPv4 address, the mask is specified with CIDR notation (using a slash), and there are bits set in the host part, produce an error like this for 10/8: route: malformed address, bits set after mask; 10 means 0.0.0.10 PR: 258874 Reviewed by: melifaro, emaste Differential Revision: https://reviews.freebsd.org/D43384 (cherry picked from commit b9e8ae1d8a424194b4e185359da4ded163f24f4e) --- sbin/route/route.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sbin/route/route.c b/sbin/route/route.c index 3913bdc9e6af..7cf2bf842559 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1342,6 +1342,9 @@ getaddr(int idx, char *str, int nrflags) q = strchr(str,'/'); if (q != NULL && idx == RTAX_DST) { /* A.B.C.D/NUM */ + struct sockaddr_in *mask; + uint32_t mask_bits; + *q = '\0'; if (inet_aton(str, &sin->sin_addr) == 0) errx(EX_NOHOST, "bad address: %s", str); @@ -1351,6 +1354,20 @@ getaddr(int idx, char *str, int nrflags) errx(EX_NOHOST, "bad mask length: %s", q + 1); inet_makemask((struct sockaddr_in *)&so[RTAX_NETMASK],masklen); + + /* + * Check for bogus destination such as "10/8"; heuristic is + * that there are bits set in the host part, and no dot + * is present. + */ + mask = ((struct sockaddr_in *) &so[RTAX_NETMASK]); + mask_bits = ntohl(mask->sin_addr.s_addr); + if ((ntohl(sin->sin_addr.s_addr) & ~mask_bits) != 0 && + strchr(str, '.') == NULL) + errx(EX_NOHOST, + "malformed address, bits set after mask;" + " %s means %s", + str, inet_ntoa(sin->sin_addr)); return (0); } if (inet_aton(str, &sin->sin_addr) != 0) From nobody Mon Jan 22 16:43:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJbcl2fWMz57lW4; Mon, 22 Jan 2024 16:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJbcl27L8z4XCJ; Mon, 22 Jan 2024 16:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TUt0mu4Gghk0b6KyQ1GwtXeUCDCgbWI/pOP5AydS/A=; b=KvzP+c+Es/YsAlznrbkeROfU9RBLWjqewZLn8ME0WrgSvFP1BrdLFgFzOYQyYe+g256jHv MpYOsrVORrnPGSG/9xpSmon1ZjIP3cJCgL4CQwvmACDt2GSX5XbNsQ8barHUWtgFhJQVVf 7OGxFeK2YU7QodDyEX+jsP/Y1sGMqgr1o3pEO/It1ft0+fpLHZbLIQoOas2Q8o197hXPDZ ng5ehaEQ7TaY9vNWZ7UtVSjVfVwoHhG5w3rYC0a7BCTO2b5dtjejpnYLg/ulieI5aMFCyR AriRsGNMQR4Zc1mQGCspEXEncmmbrGsEFblgGaayunZ3VRXHuj8xLoTDuJztZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TUt0mu4Gghk0b6KyQ1GwtXeUCDCgbWI/pOP5AydS/A=; b=NrHoHa/8Qxd28AmBlGGINO/ibEbCnWIpbPIdJTGX3aQ3vIDDRyuAOH/lTAuPezHQrWQdHq XVnMcISpaPV0lnlmpophOwI+UJqHdKcRd8VGN0QyyMeIscl2q85ws76aUj5a6HSosTPpS/ FqAmJkTZBgJpaOrMNbKZOgOny5ZndIH4HSB85jUaZu1GhmLDmav0d4V1adi/1A7Ufvdksj u2aAjkip8vvcFwH20C5CrPXHryPg2uK8KHJhC5wAffqJjg4ENUGgUGJyo0tdPIbPVio/eV jqqDNtqpGkb5qZIX6DWm0MEGYN9OhYOwF3UADRtz37xdUrpDdLE7bBI48VIhSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705941783; a=rsa-sha256; cv=none; b=A73XaEoXXN+jKmHn61jz2I7boMBlap9LGHPnxbK4ecyg541z6WPM2takcDOkfXvvOxkCaU hA4Hkbb9c25KanqyuUlX+IW10/sO1UiQ3sSGi6/YfXyqA2eVXi3+vRZ7fD8j4fHh8KXIAP a23jCQ25mNuZgctLm02TRZzBiRcs4KCd2hvHqNrw5AplI8D+S4mXCfh3uFP4HSxLDru9Ag wg/91DTrAM4t6RjXLmSVaUvpki0Ci+BdyLnQ6Sx+vGPrOB/wY169bo2J6IkGE2SIR795/U y0jqZeQmVuH2tDXx9dFXJjzBj84aNFBESNPyPYal0fW6jzld++7F1wnLalSLjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJbcl1BRZz18Xy; Mon, 22 Jan 2024 16:43: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 40MGh3GM036562; Mon, 22 Jan 2024 16:43:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MGh3Qq036559; Mon, 22 Jan 2024 16:43:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 16:43:03 GMT Message-Id: <202401221643.40MGh3Qq036559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 74e52718aa73 - stable/13 - route: error on IPv4 network routes with incorrect destination List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74e52718aa737deb2477350b16697def98259836 Auto-Submitted: auto-generated The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=74e52718aa737deb2477350b16697def98259836 commit 74e52718aa737deb2477350b16697def98259836 Author: Mike Karels AuthorDate: 2024-01-15 21:14:54 +0000 Commit: Mike Karels CommitDate: 2024-01-22 16:42:52 +0000 route: error on IPv4 network routes with incorrect destination Route destinations like 10/8 are most likely intended as a shorthand for 10.0.0.0/8, but instead it means 0.0.0.10/8, which includes only bits in the host part of the mask, and hence adds a route to 0.0.0.0/8. In 12.x, there was code to "do what I mean", which was removed as part of a cleanup of old network class remnants. Given that we have gone this long without that code, do not restore that behavior. Instead, detect the issue and produce an error. Specifically, if there are no dots in a numeric IPv4 address, the mask is specified with CIDR notation (using a slash), and there are bits set in the host part, produce an error like this for 10/8: route: malformed address, bits set after mask; 10 means 0.0.0.10 PR: 258874 Reviewed by: melifaro, emaste Differential Revision: https://reviews.freebsd.org/D43384 (cherry picked from commit b9e8ae1d8a424194b4e185359da4ded163f24f4e) --- sbin/route/route.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sbin/route/route.c b/sbin/route/route.c index c0452e71811e..c48a39b490dd 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1309,6 +1309,9 @@ getaddr(int idx, char *str, int nrflags) q = strchr(str,'/'); if (q != NULL && idx == RTAX_DST) { /* A.B.C.D/NUM */ + struct sockaddr_in *mask; + uint32_t mask_bits; + *q = '\0'; if (inet_aton(str, &sin->sin_addr) == 0) errx(EX_NOHOST, "bad address: %s", str); @@ -1318,6 +1321,20 @@ getaddr(int idx, char *str, int nrflags) errx(EX_NOHOST, "bad mask length: %s", q + 1); inet_makemask((struct sockaddr_in *)&so[RTAX_NETMASK],masklen); + + /* + * Check for bogus destination such as "10/8"; heuristic is + * that there are bits set in the host part, and no dot + * is present. + */ + mask = ((struct sockaddr_in *) &so[RTAX_NETMASK]); + mask_bits = ntohl(mask->sin_addr.s_addr); + if ((ntohl(sin->sin_addr.s_addr) & ~mask_bits) != 0 && + strchr(str, '.') == NULL) + errx(EX_NOHOST, + "malformed address, bits set after mask;" + " %s means %s", + str, inet_ntoa(sin->sin_addr)); return (0); } if (inet_aton(str, &sin->sin_addr) != 0) From nobody Mon Jan 22 17:30:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfw48fGz57r9r; Mon, 22 Jan 2024 17:30: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 4TJcfw3G4nz4fR6; Mon, 22 Jan 2024 17:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmGzaSASlQXsIeCbZigD8D6l56u1wFa0HJ5PJY6FVxk=; b=kauRvwO0Oh1W39Uk1eslFjR44D72o3cSx1S1u2V8C+KyI3+ErTANCbQBpXH3y7KOTwUEG2 6X3dJQrjn9VmM6ydUMkdKmpa2Fb15K6FjLpKFmlLoVUowtBahZI/7C2o7lF8E6LzTXWpMd ZDhA1fNCZrjuRjer59U7c+gcQ9JDCd1e9m7R17s0rvlcxLn1xqn8leti6O7sONF7aCOfix YDM0pkmn3Q7I1++50l7WTTVlUEg8J17CnodrFtBcxQbaoS6rr/StBge3Io7mKyZNiRUwKC 0jszFzLQgpNClqKgpoT08PR0O8F9TGzuKD4j1sqQKbbdaPMY983V+DfUFq7cEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmGzaSASlQXsIeCbZigD8D6l56u1wFa0HJ5PJY6FVxk=; b=blMKL8sU9PZZuemhmx4i7oVtK5SaKIkWG782VY3q95lypYffJvVdlYf5L69GN6B2qSf0D5 naH/YAQpO04qwA2scfhZRIH5vj1+565w+P1qlPZ2z+z9/aoMX+c/pJTstGnxzTfV7+zBVn gHO31uBaiqxHxQQ7m6jJalz/LDYdZHti3mOhrF5dbb1a4Cl/L6m+rjBL/id5emYpSdPmgG D3bO7m5RYaoOpqJqbuq5eftDlnJlTCslRUXmWRgq0VqfqSRy6wPRY2WG6Zow78zB7OgdZE gLmS0YETPKX/rn56uO37i9uGkTHhV3/oLcl1tEkjw9lqrt/KxWUovHv3CfZMjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944600; a=rsa-sha256; cv=none; b=IO0bU0hhrIqnh75vxgn5fU3mLUZObvGA90sDey3M1Dlu0nPLJf6cRTme40e6J+aiY0GPx4 FhozhaGAUcU+XaqACxD0vp2dYwojZxwMcBp9GNk3Vk748gDAElMbVikj49/kWU6toaA1tF BHbiIMzVcMYEkt4r4jVfcEEVs+N+E+xxmeb9+wtvufSjDQ7HUlSkqCNC4J1jCdcIUJ/BAG jIZ2YQeKdF3b+RQTJAKMYZaTLqve6/G9oiH77zcc0PNcr4Wesm/XBeNwnG/c75QqYJOsnb SxA8znG65/OVBg6ex0VuLeDW8HBkBPMdgB0eZ2O6hOTR6AqbkXW7NrPBgGQjcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfw2K2gz19pB; Mon, 22 Jan 2024 17:30: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 40MHU0mg006500; Mon, 22 Jan 2024 17:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU0o9006475; Mon, 22 Jan 2024 17:30:00 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:00 GMT Message-Id: <202401221730.40MHU0o9006475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3299277af825 - stable/14 - bhyveload: hold /boot and do relative lookups for the loader List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3299277af8257c4a1cd59b3d813fcacbbe358ca9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3299277af8257c4a1cd59b3d813fcacbbe358ca9 commit 3299277af8257c4a1cd59b3d813fcacbbe358ca9 Author: Kyle Evans AuthorDate: 2024-01-03 22:17:59 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:37 +0000 bhyveload: hold /boot and do relative lookups for the loader The next change will push bhyveload into capability mode right after we allocate vcpu state, before we've setup or entered the loader, to limit the surface area that a rogue loader script can touch. With an explicit -l loader, we don't need to preopen /boot because changing interpreters isn't allowed. We'll just dlopen() entirely in advance in that case to eliminate some complexity. Reviewed by: allanjude (earlier version), markj (cherry picked from commit bf7c4fcbbb05ff99afde0744d013feeb35d77191) (cherry picked from commit 67082f077f39d9c7b7bd561c14622e6f3ef23681) --- usr.sbin/bhyveload/bhyveload.c | 73 +++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 4c1dbd583e1f..7503598ba94b 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -94,11 +94,9 @@ static int ndisks; static int consin_fd, consout_fd; static int hostbase_fd = -1; -static int need_reinit; - static void *loader_hdl; static char *loader; -static int explicit_loader; +static int explicit_loader_fd = -1; static jmp_buf jb; static char *vmname, *progname; @@ -618,7 +616,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) * not try to pivot to a different loader on them. */ free(loader); - if (explicit_loader == 1) { + if (explicit_loader_fd != -1) { perror("requested loader interpreter does not match guest userboot"); cb_exit(NULL, 1); } @@ -627,9 +625,8 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) cb_exit(NULL, 1); } - if (asprintf(&loader, "/boot/userboot_%s.so", interp_req) == -1) + if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - need_reinit = 1; longjmp(jb, 1); } @@ -744,13 +741,38 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); } +static void +loader_open(int bootfd) +{ + int fd; + + if (loader == NULL) { + loader = strdup("userboot.so"); + if (loader == NULL) + err(EX_OSERR, "malloc"); + } + + assert(bootfd >= 0 || explicit_loader_fd >= 0); + if (explicit_loader_fd >= 0) + fd = explicit_loader_fd; + else + fd = openat(bootfd, loader, O_RDONLY | O_RESOLVE_BENEATH); + if (fd == -1) + err(EX_OSERR, "openat"); + + loader_hdl = fdlopen(fd, RTLD_LOCAL); + if (!loader_hdl) + errx(EX_OSERR, "dlopen: %s", dlerror()); +} + int main(int argc, char** argv) { void (*func)(struct loader_callbacks *, void *, int, int); uint64_t mem_size; - int opt, error, memflags; + int bootfd, opt, error, memflags, need_reinit; + bootfd = -1; progname = basename(argv[0]); memflags = 0; @@ -787,7 +809,9 @@ main(int argc, char** argv) loader = strdup(optarg); if (loader == NULL) err(EX_OSERR, "malloc"); - explicit_loader = 1; + explicit_loader_fd = open(loader, O_RDONLY); + if (explicit_loader_fd == -1) + err(EX_OSERR, "%s", loader); break; case 'm': @@ -830,6 +854,18 @@ main(int argc, char** argv) exit(1); } + /* + * If we weren't given an explicit loader to use, we need to support the + * guest requesting a different one. + */ + if (explicit_loader_fd == -1) { + bootfd = open("/boot", O_DIRECTORY | O_PATH); + if (bootfd == -1) { + perror("open"); + exit(1); + } + } + vcpu = vm_vcpu_open(ctx, BSP); /* @@ -837,7 +873,12 @@ main(int argc, char** argv) * cb_swap_interpreter will swap out loader as appropriate and set * need_reinit so that we end up in a clean state once again. */ - setjmp(jb); + if (setjmp(jb) != 0) { + dlclose(loader_hdl); + loader_hdl = NULL; + + need_reinit = 1; + } if (need_reinit) { error = vm_reinit(ctx); @@ -854,19 +895,7 @@ main(int argc, char** argv) exit(1); } - if (loader == NULL) { - loader = strdup("/boot/userboot.so"); - if (loader == NULL) - err(EX_OSERR, "malloc"); - } - if (loader_hdl != NULL) - dlclose(loader_hdl); - loader_hdl = dlopen(loader, RTLD_LOCAL); - if (!loader_hdl) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); if (!func) { printf("%s\n", dlerror()); From nobody Mon Jan 22 17:30:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfx4kyzz57r86; Mon, 22 Jan 2024 17:30: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 4TJcfx3q43z4f6c; Mon, 22 Jan 2024 17:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nEUQo96bZSG1oMTUedpjSciOL+3N/3ulHw/5FpZmP8w=; b=lVIkcdvORdudLPN9f2sfXqrJvJvaqnXI7cpEh017FQeq1vpR4vpWufnIrCRGzpi2eireIz v/mBTV9ZSRB/CWT+S/EZhgl5lZGfSPvtUkXuxoGrcXHNkx0vyMTcyie3MpOw+vds71zinh hU+Qu46f6AbFy4TAJXxsqR0B8q8leUVIpR5loQEKQNT4uJpZcGqU8HkEZXpsEfGZh2Bs18 7jBffAFFt8t4EgkYfnkcaWNr5ig57hXolt3QoNRKDpdvtcGQLqbnonXrJ5urKYSLWmHyFM btIWEqnx2LPYI3kYBL6kAGz6hYEVS4Y+H7REGNMHg+n2gcz5/66Kjf23cPiCgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nEUQo96bZSG1oMTUedpjSciOL+3N/3ulHw/5FpZmP8w=; b=XAvgxLNttaUR6HPxDa+QTWrRRIyYI9TBOD8Sbu/68lwM30luWNZfixj4hwBB7y3cw6ARTi HcTIddpghZMeVrBhWG2Y5riYRYlTDa8zGUrbsKfD7zRYIXXZL90dIYSgT3BMKevDwsZmbw qP+2cbX6ynYtm0vbCbRF6twpr1QZn8/A1latp8sSbzeV2rEZmxy/s2qDOK0Bra/xOPr+GQ iWsGvyy7ZLGwM3sPlxUq6F8p3CfOGHOy0/DQgz/fsI/tLSy2wThDzruX1imwtrI4l8NlQ+ IJB1C/qQtVc5XMqVJStOnh+xHUuLsMIwKudxr9B8JFM0KH1IX+CdI0F1XJQQuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944601; a=rsa-sha256; cv=none; b=ABTPdRoonaxGDw4745WNyN7iRtQJXgqaxxySG5o7IGb/PZuAmkUFaKx71yAR+6vksE+ONs Fvytbh4Hkodb8hWMs62LNvmJy216UknRJgnHqQmdaPhcNIkC8UGj5omK0nNFhOp1LLpTsO sG/Obp3W8RFyYs/sP75gtOq7hYIC5aghUG8KqS5/NbgiQ0nkBqcS1WO+C0io6WvK68pJ8U vpfp250Icy7+z8oHp7CFgV0AAimeoi9K1LoEROb1h2EL9/xvLv6OMb/q66D0w15NusbvJ4 TZWXao9jwV0X8waWoB7hZ5UxkZXUZuWiPAx2WokfKHeikCNHuhmRKaNR33oevw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfx2whLz19rc; Mon, 22 Jan 2024 17:30: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 40MHU1Ct007937; Mon, 22 Jan 2024 17:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU1KC007932; Mon, 22 Jan 2024 17:30:01 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:01 GMT Message-Id: <202401221730.40MHU1KC007932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 097d8306bfba - stable/14 - bhyveload: enter capability mode after we setup the vcpu List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 097d8306bfba66ef1ceb4e74ab7e0fbf30489c52 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=097d8306bfba66ef1ceb4e74ab7e0fbf30489c52 commit 097d8306bfba66ef1ceb4e74ab7e0fbf30489c52 Author: Kyle Evans AuthorDate: 2024-01-03 22:18:00 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:48 +0000 bhyveload: enter capability mode after we setup the vcpu Reviewed by: allanjude (earlier version), emaste, markj (cherry picked from commit 8bf0882e186effbd3d742ce17613cf9dfb81ce0c) --- usr.sbin/bhyveload/bhyveload.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 7503598ba94b..d4f930e8cc76 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -78,6 +78,7 @@ #include #include +#include #include #include "userboot.h" @@ -868,6 +869,12 @@ main(int argc, char** argv) vcpu = vm_vcpu_open(ctx, BSP); + caph_cache_catpages(); + if (caph_enter() < 0) { + perror("caph_enter"); + exit(1); + } + /* * setjmp in the case the guest wants to swap out interpreter, * cb_swap_interpreter will swap out loader as appropriate and set From nobody Mon Jan 22 17:30:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfz04rlz57r3T; Mon, 22 Jan 2024 17:30: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 4TJcfy4V9Kz4fRB; Mon, 22 Jan 2024 17:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srUAzh/SHgKzRakG2hGAi8oiDPGi9S9okXiS+HdzYm4=; b=AoKLuU0YLiJ6LYf1FRQsyZ1WEhe0IwIt7z4w6dqJLH6IakxuiwVYFMl009pc0Sz0PE9JiT rpJTVUv8qx5xAx26rl+Gk0ui1xlxddYc5qtQrniMOEJBazbozmEkNAuaCbqPNX4884BalG YHDEdIG8eU2lCTTHnuIfwNMb8Wx6eDwVxRBHkU1Z354yS5YVtnt/n/fKRbrdoUzrKduICH 7+XKYTLWEWEX/uS6mM3j45YJr/TZeGtn5IMml7F/8SMRmq4TjEXhltv3+1MdX0Z8J8L9pL r1Q0y9F78pqKcd3IKm0Sy8wQ03VUfZQg4ni/qmaSUgAqO9SDkV/sYjuNJTu4sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srUAzh/SHgKzRakG2hGAi8oiDPGi9S9okXiS+HdzYm4=; b=YlanAAVlO3qnCzalGmrcts7kLs+3yPGWcn8GWwdYRZZK/nHwa2YRHNI2mlB0f+TD8Rabt/ x1GxwkpiB/ybgzWyFXsfDmh9Fqld8B8Uuh6uOzDDVLHG3zcBS3UJqLyO1TnaZlq6VlJjrM uM3DLHu3U7OjQ5W6CZycPAgt5M4n0GfoixxE2EmNtnWUP9Ddysr/pL3gUcTyPMFtIFPuEf UdEKP+en0BZvC6u55jmiQ0S7myHwGNgtNlKOk1kfPcULhtelVSysD3riipTDGF9JROVoEM uhJtLATZgh0I3U4DDiyty/vFwtoPPWJpmfDAMYFeZL6pbphZ2m+dmSjGBVdTwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944602; a=rsa-sha256; cv=none; b=JHyp5GZCiDw9hGhGCYJa/0+4vuNZwEt3MbR8FT5JZdg4tUqw+UxbOI/TofvspLEkJDZ7MF mAis0AnhHgNLxt07kf76jNQaI4nCKhslOmYYGhv2BZQsgo8p6rqxTKlxQGEIN1Vrt50CzK DJJk6/LZKqI8z7vJr5B6Opmlz20ebgHFLjMtR2SvFyhltQ01quWU/sChikJhyz8Nk/7cg5 lghffe+p0I7ZJP4XJAGT5wGhQYPD89u3ZrYCxhyZoKi0NUdy9cug+0a+cW1l/za+6OO1Ck djVqWnFGlSHhWR5wZLQBB1toGIeIcq1Xrj7Mn9C/WKHoEIwOl+PUtLyho7FR9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfy3W6Lz19kQ; Mon, 22 Jan 2024 17:30: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 40MHU2gU008238; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU271008234; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:02 GMT Message-Id: <202401221730.40MHU271008234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4bd568bd759b - stable/14 - bhyveload: limit rights on the dirfds we create List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bd568bd759bfd632425ee13e5e4e83b6a935525 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd568bd759bfd632425ee13e5e4e83b6a935525 commit 4bd568bd759bfd632425ee13e5e4e83b6a935525 Author: Kyle Evans AuthorDate: 2024-01-05 06:21:14 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:52 +0000 bhyveload: limit rights on the dirfds we create In neither case do we need write access to the directories we're working with; userboot doesn't support fo_write on the host device, and the bootfd is only ever needed for loader loading. This improves on 8bf0882e18 ("bhyveload: enter capability mode [...]") so that arbitrary code in the loader can't open writable fds to either of the directories we need to maintain access to. Reviewed by: imp (cherry picked from commit c067be72e835e469518ec985b6cc4e475c378944) (cherry picked from commit f9b17005bf8f1a30e2a74a3e66c92e34aa87f9bf) --- usr.sbin/bhyveload/bhyveload.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index d4f930e8cc76..16131dacecaa 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -734,12 +734,17 @@ usage(void) static void hostbase_open(const char *base) { + cap_rights_t rights; if (hostbase_fd != -1) close(hostbase_fd); hostbase_fd = open(base, O_DIRECTORY | O_PATH); if (hostbase_fd == -1) err(EX_OSERR, "open"); + + if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, + CAP_LOOKUP, CAP_READ)) < 0) + err(EX_OSERR, "caph_rights_limit"); } static void @@ -860,11 +865,24 @@ main(int argc, char** argv) * guest requesting a different one. */ if (explicit_loader_fd == -1) { + cap_rights_t rights; + bootfd = open("/boot", O_DIRECTORY | O_PATH); if (bootfd == -1) { perror("open"); exit(1); } + + /* + * bootfd will be used to do a lookup of our loader and do an + * fdlopen(3) on the loader; thus, we need mmap(2) in addition + * to the more usual lookup rights. + */ + if (caph_rights_limit(bootfd, cap_rights_init(&rights, + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { + perror("caph_rights_limit"); + exit(1); + } } vcpu = vm_vcpu_open(ctx, BSP); From nobody Mon Jan 22 17:30:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfz3NhTz57qsb; Mon, 22 Jan 2024 17:30: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 4TJcfz1MBGz4fWg; Mon, 22 Jan 2024 17:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UPXUkfNcTja/ct9jUKp+nCXPc2Pweb7d4wWQ8J1Lyp4=; b=Lc6SsO2d39C9a20K/BGn5ZmkGKQXbpFntG++Vkt+9/0FtT8koEPUhNPdg++Rfj4zmJjOx2 PlD2vCDfVnNDz1C7Sdf6PWyeHQuu2L4T/a1jH+NBHhIYYrAw6ieg9MlS3j0QosE5wPUQhr ATcOOV78fDF6pG/YWVsSNmmQY0BA2LF1LFZZh+ZHPJNhliQaV2doS3ZDmS0qx6p2cMT7UX YExS2J9L2QFJ0CVkZH+VcFqWnM2shPyPmUsuAD0u/CXqBydC+d9IuJSrK9HZVkL6trJV8X fuyPQcDJ0aXMY7Kq05ZlVIVWKWJslOeJYzUXRjXx9ZmTAUt6aO+tSYo81/2/bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UPXUkfNcTja/ct9jUKp+nCXPc2Pweb7d4wWQ8J1Lyp4=; b=HljoEP0xO0BkhZiRqArjVjP/fh/0oNk96+ZcraIOLdRQ1rnrxK6C7DmznNZovniVSFK0/x l5oLVKpdv4NISxLCtjUKaPEL61hHRyc1OnTr6lIB/NrtvbARN5P6a0wLJgR3+wBd5yGXnb U1ZS89InpzfdAmKJcfMNbfHNpoCcq0MK7+ymw/Ubz/XuqWbSU44w6Z87NSNIFkxiKeoGWM Sv0Vl9Eqt54ZkvpIfufvQ5GeUB/iiPY4GrHVCqf/8Jrpn6gR7pbtp/8k3yC1QHSz7tBu8s 74RyoXCIVhzOvph8VszJwN7pedxuNxcVS1YWdleJJfnVrOxDJd0tKtqnAKTKhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944603; a=rsa-sha256; cv=none; b=KvAEOfu7kqMeJWg1V3uyqMsXk45Fijchh1CFp+PmZZJgTvVpNQySy+pr4rUy+qKDrpf1OP Uc2ZuW+lPkWquxvYRkdsartI+lgqSWCZwkPSjoCgcU+fsZpHpUeRPy7SbjcupsU//bksNW ze6rdQsW1V8FGRxu5KTEkc5GSE/fwz8r98detXfkOhOOBSF+TaaBR6erDlzFtAcUtvqLUH Zh3iK3UmELc2C0z2VECvx1zU3notxENEXLyMIIz+S/J+dJkFLdlX9Ja3XwsmyfhwB9/ZM7 XSqrPAnfWTgRc6Hx93N7Pzxm/VfgK1AmSi4mNBs4zbuUPRt/CHRkAzwjFLEPdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfz0Sq3z19pC; Mon, 22 Jan 2024 17:30: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 40MHU2ou008492; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU2g6008488; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:02 GMT Message-Id: <202401221730.40MHU2g6008488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b7390f6f8412 - stable/13 - bhyveload: hold /boot and do relative lookups for the loader List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b7390f6f8412fe46413b7fba6d3e74709d8e21e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b7390f6f8412fe46413b7fba6d3e74709d8e21e2 commit b7390f6f8412fe46413b7fba6d3e74709d8e21e2 Author: Kyle Evans AuthorDate: 2024-01-03 22:17:59 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:48 +0000 bhyveload: hold /boot and do relative lookups for the loader The next change will push bhyveload into capability mode right after we allocate vcpu state, before we've setup or entered the loader, to limit the surface area that a rogue loader script can touch. With an explicit -l loader, we don't need to preopen /boot because changing interpreters isn't allowed. We'll just dlopen() entirely in advance in that case to eliminate some complexity. Reviewed by: allanjude (earlier version), markj (cherry picked from commit bf7c4fcbbb05ff99afde0744d013feeb35d77191) (cherry picked from commit 67082f077f39d9c7b7bd561c14622e6f3ef23681) --- usr.sbin/bhyveload/bhyveload.c | 73 +++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 797f8b88dad2..c11b1814cfc7 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -94,11 +94,9 @@ static int ndisks; static int consin_fd, consout_fd; static int hostbase_fd = -1; -static int need_reinit; - static void *loader_hdl; static char *loader; -static int explicit_loader; +static int explicit_loader_fd = -1; static jmp_buf jb; static char *vmname, *progname; @@ -615,7 +613,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) * not try to pivot to a different loader on them. */ free(loader); - if (explicit_loader == 1) { + if (explicit_loader_fd != -1) { perror("requested loader interpreter does not match guest userboot"); cb_exit(NULL, 1); } @@ -624,9 +622,8 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) cb_exit(NULL, 1); } - if (asprintf(&loader, "/boot/userboot_%s.so", interp_req) == -1) + if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - need_reinit = 1; longjmp(jb, 1); } @@ -741,13 +738,38 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); } +static void +loader_open(int bootfd) +{ + int fd; + + if (loader == NULL) { + loader = strdup("userboot.so"); + if (loader == NULL) + err(EX_OSERR, "malloc"); + } + + assert(bootfd >= 0 || explicit_loader_fd >= 0); + if (explicit_loader_fd >= 0) + fd = explicit_loader_fd; + else + fd = openat(bootfd, loader, O_RDONLY | O_RESOLVE_BENEATH); + if (fd == -1) + err(EX_OSERR, "openat"); + + loader_hdl = fdlopen(fd, RTLD_LOCAL); + if (!loader_hdl) + errx(EX_OSERR, "dlopen: %s", dlerror()); +} + int main(int argc, char** argv) { void (*func)(struct loader_callbacks *, void *, int, int); uint64_t mem_size; - int opt, error, memflags; + int bootfd, opt, error, memflags, need_reinit; + bootfd = -1; progname = basename(argv[0]); memflags = 0; @@ -784,7 +806,9 @@ main(int argc, char** argv) loader = strdup(optarg); if (loader == NULL) err(EX_OSERR, "malloc"); - explicit_loader = 1; + explicit_loader_fd = open(loader, O_RDONLY); + if (explicit_loader_fd == -1) + err(EX_OSERR, "%s", loader); break; case 'm': @@ -827,12 +851,29 @@ main(int argc, char** argv) exit(1); } + /* + * If we weren't given an explicit loader to use, we need to support the + * guest requesting a different one. + */ + if (explicit_loader_fd == -1) { + bootfd = open("/boot", O_DIRECTORY | O_PATH); + if (bootfd == -1) { + perror("open"); + exit(1); + } + } + /* * setjmp in the case the guest wants to swap out interpreter, * cb_swap_interpreter will swap out loader as appropriate and set * need_reinit so that we end up in a clean state once again. */ - setjmp(jb); + if (setjmp(jb) != 0) { + dlclose(loader_hdl); + loader_hdl = NULL; + + need_reinit = 1; + } if (need_reinit) { error = vm_reinit(ctx); @@ -849,19 +890,7 @@ main(int argc, char** argv) exit(1); } - if (loader == NULL) { - loader = strdup("/boot/userboot.so"); - if (loader == NULL) - err(EX_OSERR, "malloc"); - } - if (loader_hdl != NULL) - dlclose(loader_hdl); - loader_hdl = dlopen(loader, RTLD_LOCAL); - if (!loader_hdl) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); if (!func) { printf("%s\n", dlerror()); From nobody Mon Jan 22 17:30:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfz5pMRz57r6T; Mon, 22 Jan 2024 17:30: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 4TJcfz4ykGz4f6t; Mon, 22 Jan 2024 17:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6d/BZFWchlz1MyCAENYTn281nVx3WR7GhLN0oTaZWgQ=; b=TRqTvgbyY6eCkBC7iEzfqzk5K1YVGQmX5ppDSCriZwB9wDE5N/PVDmr7n5AnUxMh518I4i 7+EOCAQMlPamtFUlojU8L/VzvXCvAH+aleoxynfymPFq2a1FjwsRor6o23qtySeGslb2QP Q4L4rNljSExoNxMnmhHF1FYwp60NX2C0lOCh+slX2njzbRBDkZ4QEOQiDANJw610QKxWYT 8nyZ5nkh/2/uBsNSNcZ8tNVutXEIlz17DooyfzAfWYaqksX6crA8GLvQWsycpDpdiqUnQP tdq3Xr07OxsXF1XSBdCb3GTwaIKN97yE2ZqUCUICMbwZ7feWMCl/t4yPNd0Xhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6d/BZFWchlz1MyCAENYTn281nVx3WR7GhLN0oTaZWgQ=; b=w6mbxo4AWQkSi6PyDfDRC307gTt6DhHC6eKOxcfCVbaTgItRv+bWjyL7ElP2upWbmok870 5KMWtmFF7iHOJwpO0Dy2DQm92tt9jnxS4GyAFcNMpjY2y15/6+iB0ll+Z8FRzkKvQcKBY2 JUomjkctaeRTqz/8OyGQ8WpE2mAP4MgMJKSQybMyDHGufIfdb/jOTNGf41vQlla3TSRowC yy52VJnoXBZ45ROuyJ2C4lQtD4lBpErZn4YJoVwuHXhWH+HisbszqYmQvIwEVYqMD4LaMT +/6kRIrYy6w0ssvQRkPqW+HVKB8SI0xV7CoyIy7mPNl5oztarae8wMoUNYBcjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944603; a=rsa-sha256; cv=none; b=yg6cyQkFXf1t9SwHms7Q3oBjeXG6jrJYqvY0exbtCzoErUjopI+Yb7Dh8vBeBL0WpzRHU8 vjnXE/pUDUdhaNROt9RX56yqLa5EccUmfTohYoxXMiIsx6JK1oo4DgSWlRTw3LgScj9vjT d5R1zQVUYhKe4sOKXXjlKR15Ql1TznDBcL/2At4rs/A4tWlvNhxVos8ihSM2SUVFGAIz2w 0jS9alrbwmUdCBKGYC5kSz0C2SOGZhattzPS/9/I8P6LqhkV5LzPnbhjngfvYx6BrBV01I aA2tmXSI32lqcAy8orgrS4Wj8rLtYMWH5XhtgPPCkMXB1KIQOdnaieqjnkp+Mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfz44qtz19Zg; Mon, 22 Jan 2024 17:30: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 40MHU3VZ008648; Mon, 22 Jan 2024 17:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU3m0008644; Mon, 22 Jan 2024 17:30:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:03 GMT Message-Id: <202401221730.40MHU3m0008644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3b01995df47a - stable/14 - bhyveload: support guest rebooting from the loader List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b01995df47a0184ecbb6777b88a3a0bd3c6797c Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3b01995df47a0184ecbb6777b88a3a0bd3c6797c commit 3b01995df47a0184ecbb6777b88a3a0bd3c6797c Author: Kyle Evans AuthorDate: 2024-01-05 06:21:15 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:58 +0000 bhyveload: support guest rebooting from the loader userboot has a EXIT_REBOOT code that it uses when the 'reboot' loader command is executed. Use that and longjmp back to reinit the VM entirely with a reboot request. This fixes the 'reboot' option in the loader menu to actually reboot rather than shutdown the VM. The JMP_* constants are introduced to keep track of why we're doing a longjmp, though they aren't currently used. We'll notably still do a complete reload of the interpreter to give the rebooted VM that new loader smell. It just seemed forward thinking to just keep track of the different setjmp points. While we're here, we don't actually need to keep the fd we passed to fdlopen(3), so let's avoid leaking it. Reviewed by: markj (cherry picked from commit 24cd5c26fe3ef7181e85467d9d55afbd76af5a2c) --- usr.sbin/bhyveload/bhyveload.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 16131dacecaa..4f16f58bfc9f 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -89,6 +89,16 @@ #define NDISKS 32 +/* + * Reason for our loader reload and reentry, though these aren't really used + * at the moment. + */ +enum { + /* 0 cannot be allocated; setjmp(3) return. */ + JMP_SWAPLOADER = 0x01, + JMP_REBOOT, +}; + static struct termios term, oldterm; static int disk_fd[NDISKS]; static int ndisks; @@ -543,6 +553,8 @@ cb_exit(void *arg __unused, int v) { tcsetattr(consout_fd, TCSAFLUSH, &oldterm); + if (v == USERBOOT_EXIT_REBOOT) + longjmp(jb, JMP_REBOOT); exit(v); } @@ -628,7 +640,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - longjmp(jb, 1); + longjmp(jb, JMP_SWAPLOADER); } static struct loader_callbacks cb = { @@ -769,6 +781,8 @@ loader_open(int bootfd) loader_hdl = fdlopen(fd, RTLD_LOCAL); if (!loader_hdl) errx(EX_OSERR, "dlopen: %s", dlerror()); + if (fd != explicit_loader_fd) + close(fd); } int From nobody Mon Jan 22 17:30:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg11KByz57rDL; Mon, 22 Jan 2024 17:30: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 4TJcg06Sfyz4fRd; Mon, 22 Jan 2024 17:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=el+TpVZQK9toXcdwvD0Ueel3dNptOHJRHefBcXudwFk=; b=IE0vha4iJpr4HvXH3iBo9fNNGlAe2Bixm/cP/sznPgA57o1XUsaF5nlkK8f6oDMxBuzpzE 7py5j2jRpJs9qAYkkhAR5cxkFjkHiFKSZdzatrRDUpYKeFUhIIGp2hf8f1dkYnUj/pZLeg nAAflQPMrM2ehOoZjOV7x04mA/n1+mtHmuePf7XyaNen7g3iOwZVMCHxjjWQ31IIzHk+KD bCTvckemiLvGIBLQFcD0gVj3DnnFPekY3s03Kms6i384JRqCq7AH6WUBbaPKC3u7cl43rv Wo9cHU9LZfDerMGVS9wjoEdEnh6JdRRHAVeHJwJxFEZHIJrSPYhaqBjg80++pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=el+TpVZQK9toXcdwvD0Ueel3dNptOHJRHefBcXudwFk=; b=cHoQHZ4jdbKyUc4JdtYrFoHOOrRYAreORNF5V5hBABc9LNRo5RnT+sczWVJklAi1YATpDm TktNGthnnEBaKl6+TBFP3KKGDchatkuDk7GQ15gTUB1ozZtwgQnDVASVyzU1EasBA9yUOC 8rBr12VLcsECA9SCeru9vceCX1M2gSOyVy1706F7UgwqOXuy7SvFuWFu7ebDFG3TaYlxUj 6Ew1/Il88XoyXgKtre/jpZslBGjnNfe53+QHulvbra6+KyfhlGOUIHQYGYzgfo5eSjUYco /Spyr8xpgosiddrmBtxF2ERxxRSrADbzcuhPI7HE/D+vd8tXfGdn56/9cHd2UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944604; a=rsa-sha256; cv=none; b=DZSrge41osQkk5qiSCgz9XoWPs0i2SSEn1oywvAX9ME+qDnLWWly09/7b0C+QsEuyVl5en KwlceZrFYXZpyyoJfjqx/6vML7r4Iq7UmiDyyXtQ80kNjsa0+j2nCD8WLR36z3Z4TXiv2Y ewlqBcHMJUAhmTvcquIgKwReGQ7lC4uSP8Bhf5StdlrvaSjdzH1dX2ZrEuBYU11ux2BM+o q3+ZUG6o4NTA0ISfMKaobiKDHTcHisdD1rui0GJxpUI8/sU2tUMTIHXpSxeF+GfmoPc3rm 7Os6pcTq6xQvZCzgx7ygNAXaKo8bHGO1BeZYETbzWzf7QY2N8tM4mmRRA8+c4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg04wvCz19PS; Mon, 22 Jan 2024 17:30: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 40MHU4K0008985; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU4xg008980; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:04 GMT Message-Id: <202401221730.40MHU4xg008980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7b74346b7d34 - stable/14 - bhyveload: make error printing consistent List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b74346b7d3463a7f5c8d8464830e18b48ca3c2c Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7b74346b7d3463a7f5c8d8464830e18b48ca3c2c commit 7b74346b7d3463a7f5c8d8464830e18b48ca3c2c Author: Kyle Evans AuthorDate: 2024-01-08 17:49:40 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:19:09 +0000 bhyveload: make error printing consistent Previously we used a mix of perror(3) + exit(3) and err(3); standardize on the latter instead. This does remove one free() in an error path, because we're decidedly leaking a lot more than just the loader name there (loader handle, vcpu, vmctx...) anyways. Reviewed by: markj (cherry picked from commit a4a838a31ac24e19c8ee68d45cf5234615d0b958) --- usr.sbin/bhyveload/bhyveload.c | 49 ++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 4f16f58bfc9f..4d89393424f4 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -861,18 +861,14 @@ main(int argc, char** argv) need_reinit = 0; error = vm_create(vmname); if (error) { - if (errno != EEXIST) { - perror("vm_create"); - exit(1); - } + if (errno != EEXIST) + err(1, "vm_create"); need_reinit = 1; } ctx = vm_open(vmname); - if (ctx == NULL) { - perror("vm_open"); - exit(1); - } + if (ctx == NULL) + err(1, "vm_open"); /* * If we weren't given an explicit loader to use, we need to support the @@ -882,10 +878,8 @@ main(int argc, char** argv) cap_rights_t rights; bootfd = open("/boot", O_DIRECTORY | O_PATH); - if (bootfd == -1) { - perror("open"); - exit(1); - } + if (bootfd == -1) + err(1, "open"); /* * bootfd will be used to do a lookup of our loader and do an @@ -893,19 +887,15 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { - perror("caph_rights_limit"); - exit(1); - } + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + err(1, "caph_rights_limit"); } vcpu = vm_vcpu_open(ctx, BSP); caph_cache_catpages(); - if (caph_enter() < 0) { - perror("caph_enter"); - exit(1); - } + if (caph_enter() < 0) + err(1, "caph_enter"); /* * setjmp in the case the guest wants to swap out interpreter, @@ -921,26 +911,19 @@ main(int argc, char** argv) if (need_reinit) { error = vm_reinit(ctx); - if (error) { - perror("vm_reinit"); - exit(1); - } + if (error) + err(1, "vm_reinit"); } vm_set_memflags(ctx, memflags); error = vm_setup_memory(ctx, mem_size, VM_MMAP_ALL); - if (error) { - perror("vm_setup_memory"); - exit(1); - } + if (error) + err(1, "vm_setup_memory"); loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); - if (!func) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + if (!func) + errx(1, "dlsym: %s", dlerror()); tcgetattr(consout_fd, &term); oldterm = term; From nobody Mon Jan 22 17:30:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg05Z6mz57r3Y; Mon, 22 Jan 2024 17:30: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 4TJcg01yLTz4fcT; Mon, 22 Jan 2024 17:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMJvzmY3p5mhc4f3QiKTSS1aa+s8enZPc943vjwIMTk=; b=wmaHMFPa1ZugNbZzwq//amyU2O6LiAFX9VQoSOXZB508FOD7wog4ojODAXEkLQYHX8/4tT Ws8yFFRjveLIE5WJnAyhQMxYUQOS6zWwThC3qFxa+4blN3B6TBwm5jRU0cHFD+ElBARHPu gQ0ifRlHXeCcIePMYcD6/YsIWs3O7j72nD608BDDBgObCN1kIgJOH+++LEQoVyh4YythRP XOF1KGnd7gA8fcKyrHaRnP5RtKJrdLb9dIn3VXQYFLwqQAPTtOmfxymeJq6aqJ+zaeE+Ig y1g3a5Y54C76om9xDdIZQ42Gad+EbjVF3i3ulkTGluCujNFb9y+0m0jZ2drIAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMJvzmY3p5mhc4f3QiKTSS1aa+s8enZPc943vjwIMTk=; b=awYyXl4P9GFXwQeV2tx4hRQXIY/FSbV8jk6Mj4FPMVZZ4FLT9tdKeX0CNci++it6x4uPmY iI82jHdI/hM3IAyLcO4Ah+zjjcCymJEX/lK4VLQvH24h3rwwsIGH25UiEbUAyKwIyMvU8t uXi3Q7fyGD33UPG4kg4k9iSqkT5YWvDVRgjzAvFbSOqLDxBUiH5Xe586c7eTArO/pnjPLc w5BQbTP1lngpLGOyom9K9l1GBSFYwk+zF22/lkKQbSAahlzXpGTUNzhGiBEHqfc94dbXgD VN0UGuMPsD9ENT3qnAW8nPbjttPSjCQYYogmqz7mpy+XcXsGYhZHBeJ2QFFhxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944604; a=rsa-sha256; cv=none; b=CYxAu17dcUiFgWMou+5cj57HFHJEdi5SwmdyWKxcpBsJX0dhfKnwtKHRQR9ZaQwt6O/o1h SDbjNWQVeql1X1Vd4++rIUhawReOwgYdTQ4CKf12zXREvLxhuRKDygcmrXR1hLAMGFNO2S XcNlj41FXjz9amk1glRavH4aFgYHCyMADMkuI8j3BUYAVS4gB0N5wGGO1A7oN8W0S6Shyi ajSpYUMn6YZF5eoHuH64ptDN6J52WU1hfZ76V7ot+SzMIWGbpZExQEXeIy9twDH+pHWybi atwV7Ylo48sJvv/pmrljlU98rqj2rH/Wv4nPzGel2H6DYN7ItbhHubTBlDLr7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg014R6z19Zh; Mon, 22 Jan 2024 17:30: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 40MHU4fJ008826; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU4po008823; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:04 GMT Message-Id: <202401221730.40MHU4po008823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: c6989de2e700 - stable/13 - bhyveload: enter capability mode after we setup the vcpu List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c6989de2e7007ab4ddca92bf4f3f8eca9c50c6b7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c6989de2e7007ab4ddca92bf4f3f8eca9c50c6b7 commit c6989de2e7007ab4ddca92bf4f3f8eca9c50c6b7 Author: Kyle Evans AuthorDate: 2024-01-03 22:18:00 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: enter capability mode after we setup the vcpu Reviewed by: allanjude (earlier version), emaste, markj (cherry picked from commit 8bf0882e186effbd3d742ce17613cf9dfb81ce0c) --- usr.sbin/bhyveload/bhyveload.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index c11b1814cfc7..86f046a0a0c9 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -78,6 +78,7 @@ #include #include +#include #include #include "userboot.h" @@ -863,6 +864,12 @@ main(int argc, char** argv) } } + caph_cache_catpages(); + if (caph_enter() < 0) { + perror("caph_enter"); + exit(1); + } + /* * setjmp in the case the guest wants to swap out interpreter, * cb_swap_interpreter will swap out loader as appropriate and set From nobody Mon Jan 22 17:30:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg21Lwrz57r6c; Mon, 22 Jan 2024 17:30: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 4TJcg16Ndcz4fZY; Mon, 22 Jan 2024 17:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cciZMWXAiZ3KauEX/4O33zW0bkcqY/ORFZJ85NcDb6M=; b=NT36BCGCL2illYP39PtMh/h/mflY8q9sa90RlNo1KM+VvmX12FGO1+0wRbq0YrDo4MyngB o/ZE2Zv1rgU1CwYUuLt0wdQulb8iMQ7JR4ZFCIA5F21hWsRYzExOgdslRedRs6tuITo1f1 Ke/WOQ8cc5lrCyHCkszHkh4iiysQYNN83VPgo5qFYKisRqKf9DRwZgQieImixzReUhFw3V xzmKkA4/IUdU0DPUk1A1MIps1HYEnLFUEWkuG2w/z/bwvZoOyWGxAI4q+JGaWD9OpFuViz 1EDYd4sK27T+MQCSDA70rxKe1hvB/xfk9cW4hvXI2tW+SIXTr7wdV9RH4qsAkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cciZMWXAiZ3KauEX/4O33zW0bkcqY/ORFZJ85NcDb6M=; b=ejPB00HPPUaoRPorqWggSs2NvMn3Rpr1TXMCqzcIQS13iLfYl2QW0GGItIQuutEWj91u51 8rXzRLpAL9p5YQz03K3Qfm5RAc7Vy23ADzXcJml84UnTtFmY1PbybzcATibsebZsm/oooe mhhX53amQUE+CI3XJom06PbK/NmJacnHoyybZL84yM/5KHmScpSBnZi7lcqRuTGDH5sH9I LTw8jzZer4UNPc/oCSGPQe/O1TUAHPWuWUkz/hH6As14ckkoOa0cmTGZAo/nVU9URzx1t4 8L35VX8Lh/piILfXoifa9S2rDRMkG2/1X1Y2u8VODG4Mm/iKVprKayEltj+yTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944605; a=rsa-sha256; cv=none; b=YhYZjRAZ/it9p4p9cKgupL4RaFdoNCL8K/PKn8MdmphOWmoWBKqi9knD7RWiRgrOpGLkvf euPrNFg/KPb6BKPv4wDOqk+gI8B0a4q4hZxmazL/kyIOi1Y0Ba7swGsr6Ax49xdSiKLI3P /QX5M9GincLJ9G50JzjSabqHSCePvmnsWE/TFY3/rHm5Hbd1xwu6jpRTqGgVHbYJZMgL35 Yx9tNtly93UyXuRscxuGTiIa4wYoHF5J8F/4Oxp6H6HL9NVRyurXobMXjh/0XQzFXMhfad S9RALbNEEq/qCJQ4EDmvE8R1shiT085TWGMUj2lCf8nt9vIcnMoa5zP/C7GI6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg15VLcz19PT; Mon, 22 Jan 2024 17:30: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 40MHU5iY009322; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU5fv009318; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:05 GMT Message-Id: <202401221730.40MHU5fv009318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a95fbd3da860 - stable/14 - bhyveload: add CAP_SEEK to our dirfd rights List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a95fbd3da860dc9db776c5cb0acd064aff5c1610 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a95fbd3da860dc9db776c5cb0acd064aff5c1610 commit a95fbd3da860dc9db776c5cb0acd064aff5c1610 Author: Kyle Evans AuthorDate: 2024-01-09 03:08:16 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:19:14 +0000 bhyveload: add CAP_SEEK to our dirfd rights In the case of hostbase_fd, this is infact a bug fix; we have a seek callback that the host: filesystem may use in loader, and we really don't have a good excuse to break it. bootfd-derived fds will only be used with fdlopen(3) and rtld doesn't seem to need pread / lseek at all for it today, but there's no reason to break if it finds a good reason to later. Suggested by: markj (cherry picked from commit cef5e56f3fea33d6c421276af49f2967453ad4ff) --- usr.sbin/bhyveload/bhyveload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 4d89393424f4..5250e2120938 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -755,7 +755,7 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, - CAP_LOOKUP, CAP_READ)) < 0) + CAP_LOOKUP, CAP_PREAD)) < 0) err(EX_OSERR, "caph_rights_limit"); } @@ -887,7 +887,7 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_PREAD)) < 0) err(1, "caph_rights_limit"); } From nobody Mon Jan 22 17:30:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg13dDgz57qsf; Mon, 22 Jan 2024 17:30: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 4TJcg12Jkzz4fRq; Mon, 22 Jan 2024 17:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwTsK5POItYwynC+9ru1deM+Eb9lcbhi+gZD7IDk+Nc=; b=gEYOqBELTfHXbCMKYF0cBTCPvBlBpskIuNiRBpIiHICM3F+KYPUVxbP8rT2WZCmZT77Qxi iRxPGSmP5IMSPECqFJkfCl5K5oljw+iQLGCFWyFCMmp+kxNhgd4wLbPeNISB4s9KpTX8Nl BISRmObpv2d0xxUlT4lYGa/lkGxwmtQ4hGZ/NSzKqUVwBD09W2FTva14O5YftC+WzE84Uz iOGWinAWXgoUOLL8P7YZLwU9fnNfU2q22XC2dhBokXBgP/aXp7DaNv1DE/GXtElcdWHuy4 BqBBpsc71/SU5hKdjJQmPhrDUNQShTKLddCyHqEUTVGuzHMjffpgUuuDTq9TLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwTsK5POItYwynC+9ru1deM+Eb9lcbhi+gZD7IDk+Nc=; b=lg5FhKP3t2/my0gxGbZYt+KwabNXIiOQe+Z/6xLsEAdbWPYXy+cl3pKWf0NZNLMFVLIDxu u04Fndw7p0eczXfqK9DBNM8v4UkUoTVYWM/iaBi3rdrOSHfsdeLl6AsRXr79+kc4PkYXl/ ZiLuEfOsaobCA7J4ictK5PyVyKJ+jmhJfW1d7GNALo9QIIEumnU9cHswB3VJIrcyDKBYin C73FAcRpw7xN6LOd/R0ophUyL2w0jLWW9tGDfUhFCOA7BFOGPQB4ljUPXSV9SoJ8yHN76u WGP+DOrvmBm73cVzhKB62NTbY+u0VcFwpltcgZBSkKrq0kSM3Z0U1l4QStm1TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944605; a=rsa-sha256; cv=none; b=R4iajkpZMs22IjPgnsd1Cz9r8zFN8LZKHviN3a65IAZb49D1Y9XhJsrAnRuJPejcY9+ZPI 0T+dnJNGhCUw9qDQFW93qZMNDnXSnPT7Xx3Tz0v/mAKSXiCNuxPtAdzxMNaNACW+oR88hO Sz079TyThEhfFv25P5E/GLvJITfTmkmuEMLKZklz7zOEYIosGvBrbA2BJ3faOi/+W0wn3X GZCWMajzN9CgYfZxzofKNi48IGyQthPkW2u2RzBZ4KY88+hz/db9Nq7r4Y+xmYlrWRyPoY H1CjphuUINrHWS8Oh3aYm2nbLW0XF6PQ9vLs2YA8d6B6rER4L3s4U5IEXYCNhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg11QRgz19Zj; Mon, 22 Jan 2024 17:30: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 40MHU502009156; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU5wR009150; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:05 GMT Message-Id: <202401221730.40MHU5wR009150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 20e06202f126 - stable/13 - bhyveload: limit rights on the dirfds we create List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 20e06202f126b52fd9718e611e4b42ea43908fb5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=20e06202f126b52fd9718e611e4b42ea43908fb5 commit 20e06202f126b52fd9718e611e4b42ea43908fb5 Author: Kyle Evans AuthorDate: 2024-01-05 06:21:14 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: limit rights on the dirfds we create In neither case do we need write access to the directories we're working with; userboot doesn't support fo_write on the host device, and the bootfd is only ever needed for loader loading. This improves on 8bf0882e18 ("bhyveload: enter capability mode [...]") so that arbitrary code in the loader can't open writable fds to either of the directories we need to maintain access to. Reviewed by: imp (cherry picked from commit c067be72e835e469518ec985b6cc4e475c378944) (cherry picked from commit f9b17005bf8f1a30e2a74a3e66c92e34aa87f9bf) --- usr.sbin/bhyveload/bhyveload.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 86f046a0a0c9..d4f282bcc178 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -731,12 +731,17 @@ usage(void) static void hostbase_open(const char *base) { + cap_rights_t rights; if (hostbase_fd != -1) close(hostbase_fd); hostbase_fd = open(base, O_DIRECTORY | O_PATH); if (hostbase_fd == -1) err(EX_OSERR, "open"); + + if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, + CAP_LOOKUP, CAP_READ)) < 0) + err(EX_OSERR, "caph_rights_limit"); } static void @@ -857,11 +862,24 @@ main(int argc, char** argv) * guest requesting a different one. */ if (explicit_loader_fd == -1) { + cap_rights_t rights; + bootfd = open("/boot", O_DIRECTORY | O_PATH); if (bootfd == -1) { perror("open"); exit(1); } + + /* + * bootfd will be used to do a lookup of our loader and do an + * fdlopen(3) on the loader; thus, we need mmap(2) in addition + * to the more usual lookup rights. + */ + if (caph_rights_limit(bootfd, cap_rights_init(&rights, + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { + perror("caph_rights_limit"); + exit(1); + } } caph_cache_catpages(); From nobody Mon Jan 22 17:30:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg31Qd7z57r8M; Mon, 22 Jan 2024 17:30: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 4TJcg26jYcz4fXK; Mon, 22 Jan 2024 17:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ih6srkR6ag6qkTyUmzkx20wPJV5ZBMLhXz8e2WfsMrw=; b=PRTOZpYYMpQ556ZD9c257w0EGRHcPyoIkBlZSzmL3Md2OE9lGpPyb5xYNE/AgIOpGpY3L+ prnZfn7pCAWBlZlrQo5LVjw6nUkoo3D1R6RF4chEdPwKAHozWl/eXF09AGKHbif0ExN0dE +SmvomWfpyUlz/wGy8ae8DdDDZEbTbO/H3q7xF8GPWU6Br7h78ywgVzlA1FlSJRAI49vtE Zef/l/PoGhXNxV4ryDPFHF50W6VRyX9OHs6bjxSMMltidMbb6TGbb5W/quYQ3ch8mW7cmZ c+s9fKKwSyrp87ddNDABbeGELGeXha9vYVZ12nACISCkJtSJj0q/dZVHDbXu2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ih6srkR6ag6qkTyUmzkx20wPJV5ZBMLhXz8e2WfsMrw=; b=ujeWCpOXELTMnV61bVqwdk0mDfsRF+Kh/DV9nKcAaEAAzki7YUsxnQ0gtOpifk6ssmqGgi UyYq4h0R6CEBWpqMErk1Fa4F2aBAofGEJk7GJ+JcW0HerC1Ft7Grs2HGZbCxbNOzrN8I90 R6nMf8+DMi2SAihxW5CmHB33fL1+z6bXdfenn89s15oifZWkLCR+dQJqaZbzSamsWA4wGh jmYvpr2HFDJYg0xFJxkwy0eFdmMWUfc1Gyirle6ge4jG5atsBDPy7PCqmyzJ9xiqUnsOlu 3FiqZXdEYN9NhRGrEocz+9ugvHCLIEYTYy/YfvVLno0R6vUQz008gaRY3nAVaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944606; a=rsa-sha256; cv=none; b=b7Xf98oap7Er2RKMSxo+XfJ1LHzwUkpL/V9FOZk5cCGTV83qh2LQOwRUDQdQsUFm/76CSp 4swQYLGnA4ujn6H11TZk822g/IcjwAcNTmOsx+bw4wRxnfSKahwF7n1ZsipU73giUPRfkE fiMyA4Z9xUusxKM8+ZD/T58S6E2huY7lEzPiLx7E6VFqs+YUSoTbWCcRFuDYQPlP1FoS+D 4btkcQNFHd9tXOqjcYSEYEOdkBpbia7xK60+ONFmmcTnWCFv1li9fTqASspGICvFjKpacV /ya522NhY8g6he+xyC6S5nx8hp7QXewdxcn8Jx40nS97wE/N1ddbkUWJhg3Hsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg25pt0z19PV; Mon, 22 Jan 2024 17:30: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 40MHU6ok009643; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU6n8009639; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:06 GMT Message-Id: <202401221730.40MHU6n8009639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: dee3902d1eda - stable/14 - bhyveload(8): document some SECURITY CONSIDERATIONS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: dee3902d1edac299d2258b007f245dd91d43d02c Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dee3902d1edac299d2258b007f245dd91d43d02c commit dee3902d1edac299d2258b007f245dd91d43d02c Author: Kyle Evans AuthorDate: 2024-01-12 19:57:53 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:19:18 +0000 bhyveload(8): document some SECURITY CONSIDERATIONS The situation is improved now that we're running in a sandbox, but there is still some host machine access that could be concerning depending on the context. These concerns may be somewhat mitigated by the fact that the host machine usually provides the loader binary, even when the guest image is providing the loader scripts -- they only bring the lua scripts, and they have to be able to execute arbitrary syscalls rather than the interfaces provided by libsa(3). Reviewed by: jhb, markj (cherry picked from commit 5df041c4bbf70d549b055f332630925295ad5aaf) --- usr.sbin/bhyveload/bhyveload.8 | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.8 b/usr.sbin/bhyveload/bhyveload.8 index edeb8ee938f4..54e326e49c8c 100644 --- a/usr.sbin/bhyveload/bhyveload.8 +++ b/usr.sbin/bhyveload/bhyveload.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 24, 2016 +.Dd January 12, 2024 .Dt BHYVELOAD 8 .Os .Sh NAME @@ -171,3 +171,43 @@ at NetApp Inc with a lot of help from can only load .Fx as a guest. +.Sh SECURITY CONSIDERATIONS +Note that in some configurations, +.Nm +will execute guest loader scripts in the context of the host machine. +Note, however, that +.Nm +will enter a +.Xr capsicum 4 +sandbox before it loads the +.Ar os-loader +or executes any loader scripts. +On the host filesystem, the sandbox will only have access to the path specified +by the +.Fl h +flag, the contents of the +.Pa /boot +directory if +.Fl l +was not specified, and the chosen console device. +.Pp +Note that the guest loader scripts are already subject to some limitations that +are not relaxed simply because we are running in userland. +For instance, any I/O on the loader's +.Dq host +device that can be done in loader scripts is limited to the interface that +.Nm +provides, which itself will restrict paths that can be touched to those within +a specified +.Fl h +directory, if any. +Access to files within +.Pa /boot +inside the sandbox would require arbitrary code execution in userboot, and +userboot is usually provided by the host machine rather than anything that is +a part of the guest image. +All access to the +.Fl h +directory as well as +.Pa /boot +is strictly read-only in the sandbox. From nobody Mon Jan 22 17:30:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg26KYnz57rDM; Mon, 22 Jan 2024 17:30: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 4TJcg23MWvz4fTt; Mon, 22 Jan 2024 17:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J94xTE78ii2gYU0wljEpsDBOdOU2Z716qxykqgQcpYg=; b=na1oV0E1hUEFpNN1fppTenvnKZ5feuoxG7vtb8eaMH0l83Jo+dG9kqXHl9SOUjv2SqMNEb 2IzZ2b42inS/18Hzrc+66auv7Zs66GCFJcK0V7tVlufVhl2ey61AStM0/p2fe9diZchB2H PiNgcrfmWbuRB1PS1/h1CImm9Dq8bv+LZXrkuhfEHez9J4YTmr1RKrJP/z2k95hPU1vq7M FkrNyzGdZYm3wWK2iwj1nQ5iBn94Q97C1Wl8V7EVGVx6W8arFQgkyjoLLmikBpw4/j8D66 lLGgwLiFA5RZCFpTNIAhnKwvpDS3r5yw7ZDxtN23Kx0roBZn2vMqrZkzlsZRWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J94xTE78ii2gYU0wljEpsDBOdOU2Z716qxykqgQcpYg=; b=X+0qu1Bbn50AxAFX0zL4mbNgxuGIYbXtD86+NdoiUoxO1qpJoXDDcv0j3H1XLUePJyK/qI ZN/U6DmVfAlHoJUxEK0b3G8HBrL2uS5eW3kM58YsUZxDdNLJSqapym8GDq27w5VSkAmmpB A/+tuX6KW+cKeqeB9WpzNV0+SVF/lcBBgZd0K2FIwIy4YmKitA3kGEFrb9AWTtbcM2dZUD HnngN93xCvoI9ttks6j155a1Z4a6XzVch/FZZjQuVbyEGGhnIlbHM6Eh4J4xa3fYdWQ9gS huGZP1DaVVvbrT6cxwutNocNVVCsmeEt3wrN8EUSMVoHGKRkR+4rQ/zG2wgLtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944606; a=rsa-sha256; cv=none; b=Igr4T1ctIFCvzgUG+kW8ve8b5jXJavJw18MMSN5/837+S8tt0v9svPE1fwD80muDUD7SYa GPTU7Oo1D0HQtGt4ATSDR/hu9StiU3xL6T4FyC+3htrnrE6LTw01tuMtO6dkb81vQYSm5z GflRh78FdiOzwDv5M6LVMD2HD97/YNFwTjE7c9vHrdTXN+q65fdd4VtVaJHXPSsZ+KE0dg fJMyL7YVcNKZ6Rs27PhgtNcbskNRbFe5JTffow5e7n+I4ryfu037FEINcG76pGBYQmH2xL wjNbde8t3RptIIk6ZjGn3f5qDEUs27CgKkL2Zc7bZJN6ZKccROVWvqhqlU4MWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg222cPz19lt; Mon, 22 Jan 2024 17:30: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 40MHU6JX009488; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU6Ua009483; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:06 GMT Message-Id: <202401221730.40MHU6Ua009483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 482ab31c64cd - stable/13 - bhyveload: support guest rebooting from the loader List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 482ab31c64cd6da8f1044eaef87212581dc4884d Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=482ab31c64cd6da8f1044eaef87212581dc4884d commit 482ab31c64cd6da8f1044eaef87212581dc4884d Author: Kyle Evans AuthorDate: 2024-01-05 06:21:15 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: support guest rebooting from the loader userboot has a EXIT_REBOOT code that it uses when the 'reboot' loader command is executed. Use that and longjmp back to reinit the VM entirely with a reboot request. This fixes the 'reboot' option in the loader menu to actually reboot rather than shutdown the VM. The JMP_* constants are introduced to keep track of why we're doing a longjmp, though they aren't currently used. We'll notably still do a complete reload of the interpreter to give the rebooted VM that new loader smell. It just seemed forward thinking to just keep track of the different setjmp points. While we're here, we don't actually need to keep the fd we passed to fdlopen(3), so let's avoid leaking it. Reviewed by: markj (cherry picked from commit 24cd5c26fe3ef7181e85467d9d55afbd76af5a2c) --- usr.sbin/bhyveload/bhyveload.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index d4f282bcc178..f2a91f95ce89 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -89,6 +89,16 @@ #define NDISKS 32 +/* + * Reason for our loader reload and reentry, though these aren't really used + * at the moment. + */ +enum { + /* 0 cannot be allocated; setjmp(3) return. */ + JMP_SWAPLOADER = 0x01, + JMP_REBOOT, +}; + static struct termios term, oldterm; static int disk_fd[NDISKS]; static int ndisks; @@ -542,6 +552,8 @@ cb_exit(void *arg __unused, int v) { tcsetattr(consout_fd, TCSAFLUSH, &oldterm); + if (v == USERBOOT_EXIT_REBOOT) + longjmp(jb, JMP_REBOOT); exit(v); } @@ -625,7 +637,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - longjmp(jb, 1); + longjmp(jb, JMP_SWAPLOADER); } static struct loader_callbacks cb = { @@ -766,6 +778,8 @@ loader_open(int bootfd) loader_hdl = fdlopen(fd, RTLD_LOCAL); if (!loader_hdl) errx(EX_OSERR, "dlopen: %s", dlerror()); + if (fd != explicit_loader_fd) + close(fd); } int From nobody Mon Jan 22 17:30:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg3627Pz57r3d; Mon, 22 Jan 2024 17:30: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 4TJcg33hvQz4fp6; Mon, 22 Jan 2024 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfmET8QvefD6cSx3ca5zBHpgq1mDX6OZdaW+ATp9CBQ=; b=YM91kXAbBCObMDmFVV94tXBD2sG4AJss2O+2e30/8Ne8X03p/BqVJKzW7Ibp9RI6IHLfoT 41zxwhaqx8l9g3dxDZiSf+X+jVWn0c+Ne+F4THhr1SRkaCb99l8BSN2CY8hmHy6YNvTE9X hcxDCOImGNbZqq7kfihrguEpaBtuIYugcVgw+VJ8jPMrWXn+ChXA9dOzfF3sLhR0rswJIn B7j71eSUH2Hdos3bbe8uNqzDJIk6ySGG/Ul6bqM8MUSEf+B4L4WmPBzNBer3w8hS3DqCO0 q9mZGsBdozU0e5jqROqpxqtoWpPKVz5rwEPjYgKomnDsnXoebuW08KCbQWx+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfmET8QvefD6cSx3ca5zBHpgq1mDX6OZdaW+ATp9CBQ=; b=pSoVV5ex4Y1TFUylGY6I8WQsdkrLErh+TGEl132xf3P82YMT1tz/Xo4hd7aEnMp7UVN5kc oSoMjDVnIwOaftWwnCnwHQn3jkw0lawD0h/6kNUetSR9I6X0XNPktqVN+Z+AgsPu6XmO+w smx9vFFIs4lhHVkl3N0c85sUtmxLIaiY+qVxXUeiAUUaYzoDm/C0tzsYrCHBSGA1VE2/cx 8+lCYOIMGLYAiR4WDWshdHr7mVFJR1GMbwib55g+OfCPvGU5uWkuji5weuHDjUeOCHyT+m PJXyREPe2nQCEBMcMKBZNgtx5jKnoHige7OEpk4H5DQw2ek1vdUCA15/BjI8PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944607; a=rsa-sha256; cv=none; b=dSNLx7JeAFh0rgUpPce/7rVIVynvigGCJKTdZVuS3AAfViFlVVkpYdE80UIgWRT2DEhPWP gz5R3wIW8a1AAs0jPB6tW/S55BRK8b3OEQdO7KRZed3ZytvGnPSIW3weZZM3Th2UY5Wahw v8bQ9EGdEHTRekiAbtiPaXskMuWtb476Cn8ghMIGKirsVnkMfJs144IjAYUgg2rTWMQTKy CwdD4D5mlcRkoehFwlHYmEPO0RyLyrTTLMKC8tzD67n58f4xsXyAmTQrxCw0TbysNmYq5t Em1Jqri6w2LpfEJk9lVm1mFjpzD9Ws3zg7sUy4uLg6AOwYJVCrmBTCCLnlFpwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg32nqyz19lv; Mon, 22 Jan 2024 17:30: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 40MHU7On009801; Mon, 22 Jan 2024 17:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU7dR009798; Mon, 22 Jan 2024 17:30:07 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:07 GMT Message-Id: <202401221730.40MHU7dR009798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 979c1cdb405d - stable/13 - bhyveload: make error printing consistent List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 979c1cdb405d3d219b2b5b7b3d4480fd876e78e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=979c1cdb405d3d219b2b5b7b3d4480fd876e78e2 commit 979c1cdb405d3d219b2b5b7b3d4480fd876e78e2 Author: Kyle Evans AuthorDate: 2024-01-08 17:49:40 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: make error printing consistent Previously we used a mix of perror(3) + exit(3) and err(3); standardize on the latter instead. This does remove one free() in an error path, because we're decidedly leaking a lot more than just the loader name there (loader handle, vcpu, vmctx...) anyways. Reviewed by: markj (cherry picked from commit a4a838a31ac24e19c8ee68d45cf5234615d0b958) --- usr.sbin/bhyveload/bhyveload.c | 49 ++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index f2a91f95ce89..0c37bd6989e4 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -858,18 +858,14 @@ main(int argc, char** argv) need_reinit = 0; error = vm_create(vmname); if (error) { - if (errno != EEXIST) { - perror("vm_create"); - exit(1); - } + if (errno != EEXIST) + err(1, "vm_create"); need_reinit = 1; } ctx = vm_open(vmname); - if (ctx == NULL) { - perror("vm_open"); - exit(1); - } + if (ctx == NULL) + err(1, "vm_open"); /* * If we weren't given an explicit loader to use, we need to support the @@ -879,10 +875,8 @@ main(int argc, char** argv) cap_rights_t rights; bootfd = open("/boot", O_DIRECTORY | O_PATH); - if (bootfd == -1) { - perror("open"); - exit(1); - } + if (bootfd == -1) + err(1, "open"); /* * bootfd will be used to do a lookup of our loader and do an @@ -890,17 +884,13 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { - perror("caph_rights_limit"); - exit(1); - } + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + err(1, "caph_rights_limit"); } caph_cache_catpages(); - if (caph_enter() < 0) { - perror("caph_enter"); - exit(1); - } + if (caph_enter() < 0) + err(1, "caph_enter"); /* * setjmp in the case the guest wants to swap out interpreter, @@ -916,26 +906,19 @@ main(int argc, char** argv) if (need_reinit) { error = vm_reinit(ctx); - if (error) { - perror("vm_reinit"); - exit(1); - } + if (error) + err(1, "vm_reinit"); } vm_set_memflags(ctx, memflags); error = vm_setup_memory(ctx, mem_size, VM_MMAP_ALL); - if (error) { - perror("vm_setup_memory"); - exit(1); - } + if (error) + err(1, "vm_setup_memory"); loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); - if (!func) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + if (!func) + errx(1, "dlsym: %s", dlerror()); tcgetattr(consout_fd, &term); oldterm = term; From nobody Mon Jan 22 17:30:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg46Qflz57r1N; Mon, 22 Jan 2024 17:30: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 4TJcg44GnLz4fgq; Mon, 22 Jan 2024 17:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQ86veFXXO+w8etiFrjOoWiptnGGT1GZb/eKPoRz90o=; b=ur5ZJ47aQs1sEMD9uyhcVLZ9pPuea8dO8ib636tDB5UY6PhWl36aqorpQBCXw5JfewBGox z/wgnVL8veJQiIST5ZrmBlfirIpwgIeA0yT8ZKGNhlqFLGOYWNpCujyKAk04dV4VXfqfvj roE0UuxkJhKAvXwLivgRPy28/SMhkYqijnI1mJwtTpy31NRe8pOMmXDhorxBVGWOxx4HZ0 dpK4L7WnkGW91mEfWCdnWCaTma63uR/p0rahHKWr8rTyfPYxNhzO1dLDU9+cHU8a28lZlU lAr6u+Tx1joLDKhMwlF1hpLC+V0/j01cffJeekLwVACJ3E82U65SbnGKe9z55w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQ86veFXXO+w8etiFrjOoWiptnGGT1GZb/eKPoRz90o=; b=e/887DbLRvXHYuuSVRVekxVRV0sMsjbJdkHn/mHmTuS5EWgaaeLSRvULN7nr5GVZChaYsN AYjaVFfB+fdDPQ0A+hQqmrkDMYAyGge/15yQg1pbzdvCHv4p05NV1h0XgUvLR9Rjf1gn2p PZ54vy6uNaqRAQTzLfrh8GrbU6mPkIju0EdHhDBXyqsM/mYHzS+AJsA2insqiBT6w7r3Aw JfT5fxeUpMz4JaTRVn1LJ69Lpfsg9oQqwKEXP2+Fp6yuj52K4JCllzLim6a3FPIqVGClMM CIMUVpfEEvxdBSnw4z9T6G8xVK4EqMKJtiCNqmxFog6L1SxiS8DDxVWcTRTsYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944608; a=rsa-sha256; cv=none; b=VC0EZzPsPZvNrpLoIdPgx4ThtHBZewQPjTW21LHvTG1rw4OY9n+SsvHNaN/ZPob4AgHUAI 5rPq/628dnRQc2FRNhY3LvhR/LOHRCIySOmavI1tYs1cL1Hmn0396hDMtFXArdnA9xtTEM jvVgYRpoyynUJwH0HqRkKrj3MS6i5FFz+gqSZFTiPudfYovqQLijxq2Qotz1Wb7RCOdxxY KkLer5V14uf1TF4MtZk+KGofQ5YCB0P9EiqmI+yl8/VhEV5eVhliM36HdmEsiNioUeFWo+ vBNFTFNRgeQgQBc261bzKuSrliZzJkvN3G4u1/mZeM9aOR+WnEQ9pyXvcVLibg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg43NQQz19PW; Mon, 22 Jan 2024 17:30: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 40MHU8xu010133; Mon, 22 Jan 2024 17:30:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU8tS010129; Mon, 22 Jan 2024 17:30:08 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:08 GMT Message-Id: <202401221730.40MHU8tS010129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6b23df1a398f - stable/13 - bhyveload: add CAP_SEEK to our dirfd rights List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b23df1a398ff29db25fc988857d846a879f277a Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b23df1a398ff29db25fc988857d846a879f277a commit 6b23df1a398ff29db25fc988857d846a879f277a Author: Kyle Evans AuthorDate: 2024-01-09 03:08:16 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:53 +0000 bhyveload: add CAP_SEEK to our dirfd rights In the case of hostbase_fd, this is infact a bug fix; we have a seek callback that the host: filesystem may use in loader, and we really don't have a good excuse to break it. bootfd-derived fds will only be used with fdlopen(3) and rtld doesn't seem to need pread / lseek at all for it today, but there's no reason to break if it finds a good reason to later. Suggested by: markj (cherry picked from commit cef5e56f3fea33d6c421276af49f2967453ad4ff) --- usr.sbin/bhyveload/bhyveload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 0c37bd6989e4..dbc4240eaa8a 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -752,7 +752,7 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, - CAP_LOOKUP, CAP_READ)) < 0) + CAP_LOOKUP, CAP_PREAD)) < 0) err(EX_OSERR, "caph_rights_limit"); } @@ -884,7 +884,7 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_PREAD)) < 0) err(1, "caph_rights_limit"); } From nobody Mon Jan 22 17:30:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg601XWz57r6p; Mon, 22 Jan 2024 17:30: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 4TJcg54pXgz4fpb; Mon, 22 Jan 2024 17:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKxhu5+RhO4C0Yj+NVPRa9DnqWF/LKu+tjHvS2n/H84=; b=bPXBbxjUpQk0sljTDDPMiMfJ4k6fKwbuUJnRKC+fyvy5a99qdsfTFpH3jJqB8Yo212gQtQ w1onjxLxk5OkYtmXjq/Y20WQCbEvDaJ05esA67rDJLFSGUhILE6352+hRAG9FY2Y4lGU4W fajDKU4SeI/6BpxSVBtc+8LAVOiTbKKYbvYyRnY4AeY+tG72tSYTF0eDnOkSVKaz+skZYK 04gwGBaRucipmDH3Ao0lRjGwUuGvGxX2nSDKnJUpKb+QzY0iflqMc1T3jXQ6peST9r3+YM 14yNJABDeS4gvcKNlmqyQ9J3fNjiXSwy0W+s5Sn7L8xg4Kl/dg41q5D7pzA1gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKxhu5+RhO4C0Yj+NVPRa9DnqWF/LKu+tjHvS2n/H84=; b=gWQCPawQwTtu65Pi4Z9zIZcSzZtEIa+PIWuVA7p8fxpA7qtAHKevNMIECPL8jJKP6oY46e QLu4tLfw+BUuaR83l22dK6wTGHoa05zoiCOHtVmdN2Ds6KAwqoqysDAvdC9y29hEiiSDFe s6MAqlyTJt9dcbVMVa6MXT15B6mQWvxdBtxKou3ycXwAOPg4TZGiIRXmsHfdXHqTlLMN42 qhneRrG0UObdUlI1lL115p4tDjvwrP8VGCHNm5xxR7zxJmPKXk27V621cWP9LocJsr+Asc 0yWCUmIJH/KZHbG2zVKMa+ehD3M+/PQfg56BV/rJghv8AWkg3B66vqY2k8yLRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944609; a=rsa-sha256; cv=none; b=nXM0m+mNRvkpLEKdRz4SZuiFXeazZp156n0SC3AIfk9rOdbKK8cdQ/XIvqLQZ7LqE876ni 31kdGKirc5wu0JzD9+6vCj+Td5jUCQ7/ymLLs8r2PE3sdRliNUBia0AN1viPnPYX1L/QvR eC9viKfmCPHlOHCrma7ytSaJoVUZsg9Utk7vqs5msXRc1VBx9fXXM+5KRsD59J+e+6C2hk YbwkH+JNttgCLO+8mHuDD4VrC4tG3sK1uNaHYu/lyQ+7OOhsoF8BkclvDKWeIjqruc/YQu 0YST/Svsj+MpCD4aKKlFp16XhFy1zuvyQn/WCu8BRyTtpodlo6J/1/IR3r7CzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg53wYxz19kR; Mon, 22 Jan 2024 17:30: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 40MHU9vN010615; Mon, 22 Jan 2024 17:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU9qq010606; Mon, 22 Jan 2024 17:30:09 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:09 GMT Message-Id: <202401221730.40MHU9qq010606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7b48fa60a578 - stable/13 - bhyveload(8): document some SECURITY CONSIDERATIONS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b48fa60a578a97d5d945290ba09ccc505f6bc8c Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7b48fa60a578a97d5d945290ba09ccc505f6bc8c commit 7b48fa60a578a97d5d945290ba09ccc505f6bc8c Author: Kyle Evans AuthorDate: 2024-01-12 19:57:53 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:53 +0000 bhyveload(8): document some SECURITY CONSIDERATIONS The situation is improved now that we're running in a sandbox, but there is still some host machine access that could be concerning depending on the context. These concerns may be somewhat mitigated by the fact that the host machine usually provides the loader binary, even when the guest image is providing the loader scripts -- they only bring the lua scripts, and they have to be able to execute arbitrary syscalls rather than the interfaces provided by libsa(3). Reviewed by: jhb, markj (cherry picked from commit 5df041c4bbf70d549b055f332630925295ad5aaf) --- usr.sbin/bhyveload/bhyveload.8 | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.8 b/usr.sbin/bhyveload/bhyveload.8 index edeb8ee938f4..54e326e49c8c 100644 --- a/usr.sbin/bhyveload/bhyveload.8 +++ b/usr.sbin/bhyveload/bhyveload.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 24, 2016 +.Dd January 12, 2024 .Dt BHYVELOAD 8 .Os .Sh NAME @@ -171,3 +171,43 @@ at NetApp Inc with a lot of help from can only load .Fx as a guest. +.Sh SECURITY CONSIDERATIONS +Note that in some configurations, +.Nm +will execute guest loader scripts in the context of the host machine. +Note, however, that +.Nm +will enter a +.Xr capsicum 4 +sandbox before it loads the +.Ar os-loader +or executes any loader scripts. +On the host filesystem, the sandbox will only have access to the path specified +by the +.Fl h +flag, the contents of the +.Pa /boot +directory if +.Fl l +was not specified, and the chosen console device. +.Pp +Note that the guest loader scripts are already subject to some limitations that +are not relaxed simply because we are running in userland. +For instance, any I/O on the loader's +.Dq host +device that can be done in loader scripts is limited to the interface that +.Nm +provides, which itself will restrict paths that can be touched to those within +a specified +.Fl h +directory, if any. +Access to files within +.Pa /boot +inside the sandbox would require arbitrary code execution in userboot, and +userboot is usually provided by the host machine rather than anything that is +a part of the guest image. +All access to the +.Fl h +directory as well as +.Pa /boot +is strictly read-only in the sandbox. From nobody Mon Jan 22 18:05:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdRN0WLsz57v6s; Mon, 22 Jan 2024 18:05: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 4TJdRM6m16z4nXS; Mon, 22 Jan 2024 18:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awDVNGzV5WnnusoxNiXRgaYoRjNTXNm65tkWuj86yVM=; b=DYMLH4d+2f0y6TEboZzDJTJkDYwKxsBo6aNQez+TtO1lskgL+eevEI49c0+CcI2W1nwy+i WW4trbbOKoB7qr5hw80zYj9XpPl9qncoMDidMwW6lcdsX10SAL7aZUg9qREBP5VA3DSCs4 HYQG2nrvq//mAbWlPeBHWidOukFuTLmawiJVfWpik8eYmNZkAggmtcHJRs1GiJqGvSyDae mkrtHjZeAqoE0UGGXknMhdd2Z8e4EcBCnovSMslCw7BLZpIVCkMtD8ROBUbjPKgo2gZ720 5mAtsNobHLz9JWcBN6Cq3aC1Fee9FtLtkaDeJbDg+85qWgJuIvNXR9zBgmQkog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awDVNGzV5WnnusoxNiXRgaYoRjNTXNm65tkWuj86yVM=; b=iVzQFQqmb7AKIhx7CqzIj88ok61DFtdfpMDYKJyEGJ7mme+qtt9QKHga91Ryafwg8xdvFh RlpTaTolSJl4FJbDlEu6QCEBorc66/XP5t9U8f2Lm+Ms3AMknN4AiY5jJItEkBkVchRygc t9H9y4DafFIHW6EuqUMIwh/Q803gNpTq09dAYxzRQqVJCyM7aOq3AlSaQJ46ieTdGlwTGB Ryn0qftBCRstjGF7Nbs4Yd3yzrCQqMmdvceq14wZWDZ9VhXVkocDQqOeJM1iO+fueellBI 5d5GvLbaH3jvdyN6OXvFYzDxb0zjTZUc2pRWo6qik/CErqqGOsqih+5KQESbAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705946703; a=rsa-sha256; cv=none; b=jPtZ1u8khxM0F3+Bpn7ebmOApTjnRdab1zZTBA6DSV0gWvDgyo7bC/KtBourdFyT3mM5mC TLBYtSv9zXVl+oo5UG/j+fKqNJKuQ+0mQUwlmX2KeF3Hq9y822TB85vB0wRyYCy2ivYblL nEp1hYCed2+M28/UsmFQrXafYHWdC3KhOolGQO7wRKUJexMnc2fZfxLzilMefj2IBk2KgB 6BlKOra93MR5dnDVALwgiNQMF+eDzkaMwF5gdhPfknOSjCyAU4eMagKdqup92thB0lb4qm qH0VhaQF9FbScZx+vHxlnblz3WcCECnnMjLF/PRO9tr0yU9uJmTnQH9ytd3pFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdRM5pjYz1BN8; Mon, 22 Jan 2024 18:05: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 40MI53q3075731; Mon, 22 Jan 2024 18:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MI53en075728; Mon, 22 Jan 2024 18:05:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:05:03 GMT Message-Id: <202401221805.40MI53en075728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c738eac52e05 - stable/14 - arm64: fix db_read_bytes() for size == 8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c738eac52e05204e443841cf1ae6cce32c6a7525 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c738eac52e05204e443841cf1ae6cce32c6a7525 commit c738eac52e05204e443841cf1ae6cce32c6a7525 Author: Mitchell Horne AuthorDate: 2024-01-17 16:45:41 +0000 Commit: Mitchell Horne CommitDate: 2024-01-22 18:04:26 +0000 arm64: fix db_read_bytes() for size == 8 There is a mistake in the cast, resulting in a truncated read to tmp64. Switch from int to uint64_t, and adjust the other casts for clarity. Add a comment explaining why we do this at all. Reported by: dfr Reviewed by: dfr, mmel, emaste, jhb (all a previous version) PR: 276406 Fixes: a67687fcd8f5 ("Use native-sized accesses when accessing memory from kdb") Differential Revision: https://reviews.freebsd.org/D43479 (cherry picked from commit 9c2e1a54f71a399fc4645c4b8bed044705629143) --- sys/arm64/arm64/db_interface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/db_interface.c b/sys/arm64/arm64/db_interface.c index 24ce0327e086..01bbd7835450 100644 --- a/sys/arm64/arm64/db_interface.c +++ b/sys/arm64/arm64/db_interface.c @@ -125,14 +125,20 @@ db_read_bytes(vm_offset_t addr, size_t size, char *data) if (ret == 0) { src = (const char *)addr; + + /* + * Perform a native-sized memory access, if possible. This + * enables reading from MMIO devices that don't support single + * byte access. + */ if (size == 8 && (addr & 7) == 0) { - tmp64 = *((const int *)src); + tmp64 = *((const uint64_t *)src); src = (const char *)&tmp64; } else if (size == 4 && (addr & 3) == 0) { - tmp32 = *((const int *)src); + tmp32 = *((const uint32_t *)src); src = (const char *)&tmp32; } else if (size == 2 && (addr & 1) == 0) { - tmp16 = *((const short *)src); + tmp16 = *((const uint16_t *)src); src = (const char *)&tmp16; } while (size-- > 0) From nobody Mon Jan 22 18:07:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdVQ3hYgz57vFp; Mon, 22 Jan 2024 18:07: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 4TJdVQ2v5Pz4p2B; Mon, 22 Jan 2024 18:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akURnw2c+uxX1XGLJnMIlCsfLqODKEbEywBfH955GMM=; b=Z44joHIC/n+I+r4I4vk0j/uFphvXi47o354jKj997q8hmUD1a3M9DcoocAH8Wk6uLGtSa8 wHT4GDlb2vQdcodX+dpwtcMrG/4vKvbjOxFEmaSotoUHlX9GbEqSyjeeXF71YHAJJ8E+xY GcBo+iRMc/7xskTPEooYpT62jEnhG/LKgi//e+UCA3xUZvlvefAALU+rrwlIBwQ2U/n6Ft bGBLyT/o0SlaBe3pHE5lneViaBMnI+9p6DqhIOPSh+8XHZLlfLBxGK33VMJy9IWpx3Y96q H3uTaZBsYZt0BR//IsK3zRzhZwQHwsiHydIOqN0m+AfReVbNxWXoLJ+a2c38aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akURnw2c+uxX1XGLJnMIlCsfLqODKEbEywBfH955GMM=; b=nkiPXvIdpYm1mZveTqmuzT7bU9MXtk4b7QI23C4pq7FzmT8ywRQliCn5ZOAj/q92+GWPaq 1h3X/5aBzze6ApyYTgRca/7ud1ONTjjcWFIXzsbQNJ9jEKhYolrLY88tKsLctNEsKMmBHX 8Y7TN+Z9QPGyPE1rJUKqgQYaBz7+v+45aeJHMf3OVZ0WYWH5+QjCMjVHZbdoumZ5m0O4Ho FyTfXb1KNO4kTGLWW/AqWOfjVcAtrtbzwQ4AGKPyUAL6aNmhuBOWyzkvH3YUhkep6DcyeD EiXZIhfymKH5mKNjFB6fVznWO31827gDGi1UvcQuhcZIm0ZsmLrV6Q0PGOtw6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705946862; a=rsa-sha256; cv=none; b=JIeIsGk8YA7skZck67THOikt8i1qDe3RiItqHs6rgGe9qI//iV7YX/L0jXD3OFB1oisouh oHokF8IyDsK3+nX1uQEbCMauTrTspNdOmxAnLqXXqQxhYC7y7kzFY70MhEjOt86qEWF/Tn aLxXiJlieWRPQC+y4UzI8rwfZLq6VMmuBolIAKSvfw7nuMLck+SgCN9hb/iVio90hpj93l 58Yj17RX+lMntlXjmDyHd019B9+bGUOV2NbkoyMH6oz6+BlD8bNS3aWkjlwR8x4jKoIlcN qricS5BNCAbCN52AyHnH5672bzIqv5okLWqCT/qAD7ldzx6395JZn/FjwAlZSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdVQ1yzvz1Bl0; Mon, 22 Jan 2024 18:07: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 40MI7gZ6076200; Mon, 22 Jan 2024 18:07:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MI7gDE076197; Mon, 22 Jan 2024 18:07:42 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:07:42 GMT Message-Id: <202401221807.40MI7gDE076197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 4057fb12a1d7 - stable/13 - arm64: fix db_read_bytes() for size == 8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4057fb12a1d7147b85062ad9f3916138c3956cf3 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4057fb12a1d7147b85062ad9f3916138c3956cf3 commit 4057fb12a1d7147b85062ad9f3916138c3956cf3 Author: Mitchell Horne AuthorDate: 2024-01-17 16:45:41 +0000 Commit: Mitchell Horne CommitDate: 2024-01-22 18:05:27 +0000 arm64: fix db_read_bytes() for size == 8 There is a mistake in the cast, resulting in a truncated read to tmp64. Switch from int to uint64_t, and adjust the other casts for clarity. Add a comment explaining why we do this at all. Reported by: dfr Reviewed by: dfr, mmel, emaste, jhb (all a previous version) PR: 276406 Fixes: a67687fcd8f5 ("Use native-sized accesses when accessing memory from kdb") Differential Revision: https://reviews.freebsd.org/D43479 (cherry picked from commit 9c2e1a54f71a399fc4645c4b8bed044705629143) --- sys/arm64/arm64/db_interface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/db_interface.c b/sys/arm64/arm64/db_interface.c index 0c369ba87709..65af5395500e 100644 --- a/sys/arm64/arm64/db_interface.c +++ b/sys/arm64/arm64/db_interface.c @@ -125,14 +125,20 @@ db_read_bytes(vm_offset_t addr, size_t size, char *data) if (ret == 0) { src = (const char *)addr; + + /* + * Perform a native-sized memory access, if possible. This + * enables reading from MMIO devices that don't support single + * byte access. + */ if (size == 8 && (addr & 7) == 0) { - tmp64 = *((const int *)src); + tmp64 = *((const uint64_t *)src); src = (const char *)&tmp64; } else if (size == 4 && (addr & 3) == 0) { - tmp32 = *((const int *)src); + tmp32 = *((const uint32_t *)src); src = (const char *)&tmp32; } else if (size == 2 && (addr & 1) == 0) { - tmp16 = *((const short *)src); + tmp16 = *((const uint16_t *)src); src = (const char *)&tmp16; } while (size-- > 0) From nobody Mon Jan 22 18:22:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdqq39Ytz57wh6; Mon, 22 Jan 2024 18:22: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 4TJdqq0wZSz4sP3; Mon, 22 Jan 2024 18:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtY0u+oduQ7z40+qDfHuBKdEV4jWFdLEaspv5KkyzQs=; b=rYMLnVu4xYOhHLxStqU62dc06t2/Ryg+k/xo4TA3v2HRTl7/EMkZfov8hwjID9zjEZysof bUiASbCvyRXJAd+bikDmgJWv4LmUzQ3L3Tq35QX1tEN7BVHAXu1XKZkGsbhiQJEGzIUvTd 29ARSqBIvq+gZBHhAmxlWfjfeeoMQh0ueJyo6UOM5osWzt+8JYxFMIGvncXmNdLVsEvWnS 8utL0z8K35V3oHbCHCrh9IYggj8BbmPVC9IJi/KkOFdF6jLlNlLvo9b7qzAs2efvPuTt/z 4oFKVP0m7vwNG+DyI5eg2ZHQh/UR/hEiCu8aQAVEIrkAjZ+e+WOrhB+p7wcTsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtY0u+oduQ7z40+qDfHuBKdEV4jWFdLEaspv5KkyzQs=; b=pPgplmuzlmT1It2eKuBFPJCPYQd2Vw5Pr5MF61XHhiU6Amsrs1uYFihX0l91bCDgHZx9da k/Xn3ZBK+5F8eJIArOXqkdKAj7EN5aH1et7KxY6eGXPcZ/ipKNLA60neAxr19KiTAixUMO UYzgYLAWRFRgMDOOPA+JkfIkHX+1hyBGvVsmOztddLvZ5zaGIS894CsLIJhJdGqy1NHvXK Nt+xp2hEArgtcr0286ibComG7BWDIUgj2aR8vKW1+xsEugycmBUvp6Irr1NBEy+OgaGRjG zSlibJsQejOFQ6405XbuiMGPX2M4MP7y+WuWWBBwPQ4h+hoFHEICEw3V0ZOcIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705947767; a=rsa-sha256; cv=none; b=Et/l7d+2nk112w+2o227Vje+OaBjFo1fjXItITytKAmTAPqXwoYbs4u9dubOepmT8uMdkO wrML3MIIvqzx1fV2tqVFgxoiE+DR/teSyjqU9sQHl1lqKu5SoncgPT3P52TkTJT0wA9NXH kXp3BoruLFJgbdAh+CWhiZLjcboxVTppn12Waascaa8pIa9eQiQEQ/foHyhSYAGmjbAiH6 kVjKE3P2ajkmgxY5H2YToZXQiR8B4XB0DNiNr3zevG4KYDtcOI3QgDIZdBj64pkN0+SdII anB+nLnK+HwrdJWaLybyj2sP+5hajTx9SbD4xUeeqXDKegb19W09yAt/rIhlTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdqq01Vrz1CHS; Mon, 22 Jan 2024 18:22: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 40MIMkFq009843; Mon, 22 Jan 2024 18:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIMkhu009840; Mon, 22 Jan 2024 18:22:46 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:22:46 GMT Message-Id: <202401221822.40MIMkhu009840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 166bc357c6a4 - stable/13 - routing: plug mbuf leak for the packets hitting IPv6 blackhole route List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 166bc357c6a4813e7c03ecaea54d7ef6508e7132 Auto-Submitted: auto-generated The branch stable/13 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=166bc357c6a4813e7c03ecaea54d7ef6508e7132 commit 166bc357c6a4813e7c03ecaea54d7ef6508e7132 Author: Alexander V. Chernikov AuthorDate: 2023-05-17 09:06:04 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-22 18:21:34 +0000 routing: plug mbuf leak for the packets hitting IPv6 blackhole route Reported by: Dmitriy Smirnov Tested by: Dmitriy Smirnov MFC after: 1 day (cherry picked from commit b50e1465e88dcf5f6f008892d802df010e7029d1) --- sys/netinet6/ip6_forward.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 7415c72d9aea..8c5748533a77 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -196,9 +196,12 @@ again: if (nh->nh_flags & (NHF_BLACKHOLE | NHF_REJECT)) { IP6STAT_INC(ip6s_cantforward); - if ((nh->nh_flags & NHF_REJECT) && (mcopy != NULL)) { - icmp6_error(mcopy, ICMP6_DST_UNREACH, - ICMP6_DST_UNREACH_REJECT, 0); + if (mcopy != NULL) { + if (nh->nh_flags & NHF_REJECT) { + icmp6_error(mcopy, ICMP6_DST_UNREACH, + ICMP6_DST_UNREACH_REJECT, 0); + } else + m_freem(mcopy); } goto bad; } From nobody Mon Jan 22 18:45:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJfKx70Bzz57yx5; Mon, 22 Jan 2024 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJfKx6L3cz4v2Q; Mon, 22 Jan 2024 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3e8e0SqRX+sTEw+ITC4hGuVPCGPT41qVM8XEn5KquHY=; b=DNcQ/9ccbx0u1RkYDgIBX/oQm3LWIhIeyyxBcVkv3AInYa/Szs2u5BkNonZqQXuysyPiJi GJyfAFbYztqYD7x8WzfkFybUNNZihs/naxtvSMbts5xlqVaBOPdGxWTMTFfLG4GW0Q1MY5 N5Cb3IuaENOVwA32twWWNWz8KB2iAWcfQdvT/att5vYcCHL8J5kcCKx2DLgDnnAmt6sOlr /1k8hrCMKD9EhkedEhguMYdrEf1zghYyPj58h9OufrnqKsXi3e9h5LiPRYTmf4rg00FPoY obV12aNrwZWsXp8MkiAwhtTCIJAdrWCL8UBv6MMyT3dl5FPYgRQAy5JgswzdTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3e8e0SqRX+sTEw+ITC4hGuVPCGPT41qVM8XEn5KquHY=; b=eKJtMdX0umS9UTjorjcb8S9kom5PVrTC4KFmuy7KpXwlujqkS7I9k/lWbApqZmvxjW/qm0 gIdXh0WzfdmIFuznnpnUU8HU/KtQrhcli2J1dEzijLcv9c+RZrQxxIoPjbbRR8BKC1136V t4R7e7jHGmo7xZdMHhUGKSKUEYp46RorpmV1kmvYfzrSTbJ8GBYa7RhGsJUQYy+v0nETC4 SKGRkOacQ6rInpKHyg7myaaIrPu8ssEo9KVJdV6Q7glbK52SboH5QGK77Dt20/DUKEdLZC /c38ZdpsD3d7I+UgyOTKyDniBpueI00gn4NNXkRaBTtnBbScnpMii+wcs4YcBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705949125; a=rsa-sha256; cv=none; b=gpDRbtVTaUd2jnrK8CeEojy2VAk4MY0dRhvFCsuoOm7mTiffrIak010r0312QzLIVSLApJ d1c0HiwzEZV+jqretPLW5Gy2FjNSgCWOZVocP2BpCtI5kQeR+hnIvQjfvr7eEAI8Q9qslQ ef8gHVdLy62qMBHSHIfWXSZ63NTlm3Fb+lnJLkLiOlztnauCltHgoZxQExKm9zL9OgE2bs U+wH60BCUAJI8qPp3o/q0o/L3yHem5RYSUfg+mRmfTY609Jf0ACsgmZea8dQAcwUx8Eo1m V7vk0JkjDhngD7y1b62UtvnGpXPIpckFpJgdeTATHAUzRboSnbLoe6iWfLrRKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJfKx5NPdz1Cjc; Mon, 22 Jan 2024 18:45:25 +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 40MIjPaN042760; Mon, 22 Jan 2024 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIjPNl042757; Mon, 22 Jan 2024 18:45:25 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:45:25 GMT Message-Id: <202401221845.40MIjPNl042757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3e27fcf05793 - stable/13 - inpcb: Remove NULL checks of credential references List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3e27fcf057937ef93258dc4f8e67a308e02f349c Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e27fcf057937ef93258dc4f8e67a308e02f349c commit 3e27fcf057937ef93258dc4f8e67a308e02f349c Author: Mark Johnston AuthorDate: 2022-11-02 17:03:41 +0000 Commit: Mark Johnston CommitDate: 2024-01-22 18:45:03 +0000 inpcb: Remove NULL checks of credential references Some auditing of the code shows that "cred" is never non-NULL in these functions, either because all callers pass a non-NULL reference or because they unconditionally dereference "cred". So, let's simplify the code a bit and remove NULL checks. No functional change intended. Reviewed by: glebius MFC after: 1 week Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37025 (cherry picked from commit ac1750dd143e53225c518bc1ca0462c3fffe10f6) --- sys/netinet/in_pcb.c | 27 ++++++++++++--------------- sys/netinet6/in6_pcb.c | 10 ++++------ 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 61079db56bdb..3f4ad6752aae 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1154,11 +1154,12 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, NET_EPOCH_ASSERT(); KASSERT(laddr != NULL, ("%s: laddr NULL", __func__)); + /* * Bypass source address selection and use the primary jail IP * if requested. */ - if (cred != NULL && !prison_saddrsel_ip4(cred, laddr)) + if (!prison_saddrsel_ip4(cred, laddr)) return (0); error = 0; @@ -1203,7 +1204,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, goto done; } - if (cred == NULL || !prison_flag(cred, PR_IP4)) { + if (!prison_flag(cred, PR_IP4)) { laddr->s_addr = ia->ia_addr.sin_addr.s_addr; goto done; } @@ -1244,7 +1245,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, struct ifnet *ifp; /* If not jailed, use the default returned. */ - if (cred == NULL || !prison_flag(cred, PR_IP4)) { + if (!prison_flag(cred, PR_IP4)) { ia = (struct in_ifaddr *)nh->nh_ifa; laddr->s_addr = ia->ia_addr.sin_addr.s_addr; goto done; @@ -1305,7 +1306,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, if (ia == NULL) ia = ifatoia(ifa_ifwithaddr(sintosa(&dst))); - if (cred == NULL || !prison_flag(cred, PR_IP4)) { + if (!prison_flag(cred, PR_IP4)) { if (ia == NULL) { error = ENETUNREACH; goto done; @@ -1421,8 +1422,7 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam, faddr = IA_SIN(CK_STAILQ_FIRST(&V_in_ifaddrhead))->sin_addr; IN_IFADDR_RUNLOCK(&in_ifa_tracker); - if (cred != NULL && - (error = prison_get_ip4(cred, &faddr)) != 0) + if ((error = prison_get_ip4(cred, &faddr)) != 0) return (error); } else if (faddr.s_addr == (u_long)INADDR_BROADCAST) { IN_IFADDR_RLOCK(&in_ifa_tracker); @@ -1450,10 +1450,9 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam, ifp = imo->imo_multicast_ifp; IN_IFADDR_RLOCK(&in_ifa_tracker); CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { - if ((ia->ia_ifp == ifp) && - (cred == NULL || + if (ia->ia_ifp == ifp && prison_check_ip4(cred, - &ia->ia_addr.sin_addr) == 0)) + &ia->ia_addr.sin_addr) == 0) break; } if (ia == NULL) @@ -2006,9 +2005,8 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, /* * Found? */ - if (cred == NULL || - prison_equal_ip4(cred->cr_prison, - inp->inp_cred->cr_prison)) + if (prison_equal_ip4(cred->cr_prison, + inp->inp_cred->cr_prison)) return (inp); } } @@ -2039,9 +2037,8 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, */ CK_LIST_FOREACH(inp, &phd->phd_pcblist, inp_portlist) { wildcard = 0; - if (cred != NULL && - !prison_equal_ip4(inp->inp_cred->cr_prison, - cred->cr_prison)) + if (!prison_equal_ip4(inp->inp_cred->cr_prison, + cred->cr_prison)) continue; #ifdef INET6 /* XXX inp locking */ diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index a153b06a7435..6d7c1d4b65b5 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -764,9 +764,8 @@ in6_pcblookup_local(struct inpcbinfo *pcbinfo, struct in6_addr *laddr, IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) && inp->inp_lport == lport) { /* Found. */ - if (cred == NULL || - prison_equal_ip6(cred->cr_prison, - inp->inp_cred->cr_prison)) + if (prison_equal_ip6(cred->cr_prison, + inp->inp_cred->cr_prison)) return (inp); } } @@ -797,9 +796,8 @@ in6_pcblookup_local(struct inpcbinfo *pcbinfo, struct in6_addr *laddr, */ CK_LIST_FOREACH(inp, &phd->phd_pcblist, inp_portlist) { wildcard = 0; - if (cred != NULL && - !prison_equal_ip6(cred->cr_prison, - inp->inp_cred->cr_prison)) + if (!prison_equal_ip6(cred->cr_prison, + inp->inp_cred->cr_prison)) continue; /* XXX inp locking */ if ((inp->inp_vflag & INP_IPV6) == 0) From nobody Mon Jan 22 18:45:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJfKz0MPXz57yx9; Mon, 22 Jan 2024 18:45: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 4TJfKy6v7Zz4vD6; Mon, 22 Jan 2024 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IA8WbfLNYxZ/j/lYMPZqSt07JkULneoas8h4OUCsRZs=; b=CPvEKXljzn11hnoYbR0Uy6nqFtt1sl76eHHCM5wjl4a9TlS+Ukmc4tMRm7EgaZII7inWAk w4+ozfqE6LjETlb2HWbU1z1mf64POJOOnnhz7JNO2MqgqNAY6ZFb40oTVI0soGipjfgKcM W8Dn2QbM/T+uwEmcNyClKhA67e46Er0NY6nCGNJD+dsRm77POvWSwyU9fSvZvdqFOiFqVS Ojm6YV1Okpd/FFuoFanqzi+b9jWf4Sc9Ss/4AcY2vtcZzOfBPe+QI5dgFlKl7bpNjEKuQo myj6I+QE1w7xZVck6NUM0IU9SLehm5Ykzxe6Ad5T+DaRK0zfXdTTKj2JvsDgsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IA8WbfLNYxZ/j/lYMPZqSt07JkULneoas8h4OUCsRZs=; b=N8fVFiaJbEwBbDKfgR7Hoj6ZfuWplEhygQ4mrlwlx6HcuHLT8f/JOP3UA8xjAvPBa6GqEC khK+2CSz24SE9awGS8ljww6B+y5L0ktW5iXjC9ffp0tLj2WXbhtIvkYNrhRqS600tmmWDU 1oO05c4J8JUFPuhLy6ZnQzreDnNimR2shg0gatyj7Z9k5v+/rhcyxIJv5sN7RFAl3JLR5i oBtkDQy8AHoZ2H5nWP9VUqf+e+j8cmAWV7WUN+k1gmYCUNNX9Z7tr6+5xMeZ6qLn7rd5MQ tISPScfAL7hxUron/m6P5yyYBY/0ijVEKWlBju/X4p8PKNSwTDBanWB5CELfpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705949127; a=rsa-sha256; cv=none; b=yHtONoaB1lQ9yfYQsPut3L8eN1VRKReUp45vZ9b8ahTy7nubYkrpUaax6PGdMyO+56b3Jh YjJLB34TBdIO8CWhmktlmv02A3ZBoMGmCz4QDfKknLxYAh38JXtiaoAd2xC7VEz9yR3bAA ncAw7n07zmjTAjudcZPGl85nuAOMMIRQ168wB1iL48Ic8MD+EtzmnOkDnNis+e+Pnz/czH yTHNzrJNRx6stZFACkh/XJmblZAgUuB347MXHTVp8NC2N8fqnjRxW7J4n7+iCTXHkW/gXQ 8gWU9YLJK/NVLjbQ3F7Ya7Fb9ikTBnv47lkxDi84waEqq+VVBf4v8P3wfbgOIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJfKy61BJz1CXr; Mon, 22 Jan 2024 18:45: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 40MIjQ1g042823; Mon, 22 Jan 2024 18:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIjQII042821; Mon, 22 Jan 2024 18:45:26 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:45:26 GMT Message-Id: <202401221845.40MIjQII042821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0ea32f0e8376 - stable/13 - inpcb: Remove a PCB from its LB group upon a subsequent error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0ea32f0e83769ca1c6ebc40fb0a3a0e64a24e7a0 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea32f0e83769ca1c6ebc40fb0a3a0e64a24e7a0 commit 0ea32f0e83769ca1c6ebc40fb0a3a0e64a24e7a0 Author: Mark Johnston AuthorDate: 2022-11-02 17:05:14 +0000 Commit: Mark Johnston CommitDate: 2024-01-22 18:45:03 +0000 inpcb: Remove a PCB from its LB group upon a subsequent error If a memory allocation failure causes bind to fail, we should take the inpcb back out of its LB group since it's not prepared to handle connections. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37027 (cherry picked from commit a152dd863418638c3eb08b5c101b10b82f8072f5) --- sys/netinet/in_pcb.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 3f4ad6752aae..3f8db305d3c9 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2646,7 +2646,6 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbport *phd; u_int32_t hashkey_faddr; - int so_options; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2671,13 +2670,10 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) * Add entry to load balance group. * Only do this if SO_REUSEPORT_LB is set. */ - so_options = inp_so_options(inp); - if (so_options & SO_REUSEPORT_LB) { - int ret = in_pcbinslbgrouphash(inp, M_NODOM); - if (ret) { - /* pcb lb group malloc fail (ret=ENOBUFS). */ - return (ret); - } + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { + int error = in_pcbinslbgrouphash(inp, M_NODOM); + if (error != 0) + return (error); } /* @@ -2687,13 +2683,16 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) if (phd->phd_port == inp->inp_lport) break; } + /* * If none exists, malloc one and tack it on. */ if (phd == NULL) { phd = malloc(sizeof(struct inpcbport), M_PCB, M_NOWAIT); if (phd == NULL) { - return (ENOBUFS); /* XXX */ + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); + return (ENOMEM); } bzero(&phd->phd_epoch_ctx, sizeof(struct epoch_context)); phd->phd_port = inp->inp_lport; From nobody Mon Jan 22 18:45:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJfL01GYbz5804G; Mon, 22 Jan 2024 18:45: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 4TJfL0101hz4v7b; Mon, 22 Jan 2024 18:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BV8eFF6BpWiGs3l2Sec+BZaqdTieQBOdmXw9iMlkIZM=; b=JYDstxyC9kJGaqgX49obMrj/wgftRuPi0CWBYpweJ+97GJbbX2oI3lFW/GWcz2U8WgtHCh GK2EvI8q9umWLwgPfJOIyM9DyFa7RinVdbeA3Cn3nFIjyX/UsYAXmZGqCyuzLYD/tzyws9 9O1ai6dbDEn5LJpE9BJSLjE5njodM/OihPOn/ulJmNfOafxP/sHGpVekqCj3IESOSclnEP rdmZS38ZeCXYtyMaGrwvx7YhbASy9GrMEG/Bk+pX7jSymOlnx6yZixiAuwZ6/D42IKG99t c0XqKZavZDwf7JnSQbRf6xMM1yaa0uMeVC0fE/huHEN+4DhLv+kXDIkPErXmJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BV8eFF6BpWiGs3l2Sec+BZaqdTieQBOdmXw9iMlkIZM=; b=SCAttQXknVLAnlNswbticcaGalNwD32kSY2d7i3Jd1pOOEXMDGZVIlSPfOhg4UxaBEe7dQ IZ/zvrUXEVYtPvFjxdtlsRbRNu30KrvATlGNapA03m4W1eHRQHSZeCof2gsTQr/aUEAlNB e51AjmoX+9on+gM8X6L9GFdR6db+rfZj1BYuBAsaA7Wd9H/XV7ie7Yc7iTCMdO3tPZSZmN ylRX2VuxXLGUM+jvAYbiWhHcFF22VGhV7wmxv0wmow6tpDNX5q9g3c2aMrc6nI2wIOEQJK 5Z5AMOPRH9B1iKCMgExjDhdtqDSrhJP2cj8qCtUI8oxuEd0Mjd2m6k7nSAbtQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705949128; a=rsa-sha256; cv=none; b=yCmW0YgK/y4shvN18P8q437rlKYhmfYDbCOphM++kdTSpzZF8z33Sp/BOxVtO+5tZvBB0D 3eJumNPpjdmyQfwL3913R9oXGmBqYS0v4LS9zyPdYdpMDCbADy0qxeHrlB9cmMq1I2tURa Zc5OolmglB8vlsFL087IgSqIJ0DNGFPR6JTMtk3GqEtw+LDTzvoZoaoUIFhmz21IYQIXR5 bPptXC5+Qb/LFw/ZMh8qr749FSBbj0CrwRZI/mTB9/yzccWyyp5oJvZrVGuSGGKKqQ+8Qi vRWKcJW6YA5nUcntPhapNXCEEuAVNeUxZEngwnHeWJFxHe37aYZYt/1TEIu7Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJfL000cpz1CXs; Mon, 22 Jan 2024 18:45: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 40MIjRm0042874; Mon, 22 Jan 2024 18:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIjRij042871; Mon, 22 Jan 2024 18:45:27 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:45:27 GMT Message-Id: <202401221845.40MIjRij042871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 535984471641 - stable/13 - inpcb: Allow SO_REUSEPORT_LB to be used in jails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 535984471641c9435854ed23a80e49a8bf0e53b0 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=535984471641c9435854ed23a80e49a8bf0e53b0 commit 535984471641c9435854ed23a80e49a8bf0e53b0 Author: Mark Johnston AuthorDate: 2022-11-02 17:08:07 +0000 Commit: Mark Johnston CommitDate: 2024-01-22 18:45:03 +0000 inpcb: Allow SO_REUSEPORT_LB to be used in jails Currently SO_REUSEPORT_LB silently does nothing when set by a jailed process. It is trivial to support this option in VNET jails, but it's also useful in traditional jails. This patch enables LB groups in jails with the following semantics: - all PCBs in a group must belong to the same jail, - PCB lookup prefers jailed groups to non-jailed groups This is a straightforward extension of the semantics used for individual listening sockets. One pre-existing quirk of the lbgroup implementation is that non-jailed lbgroups are searched before jailed listening sockets; that is preserved with this change. Discussed with: glebius MFC after: 1 month Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37029 (cherry picked from commit d93ec8cb1324d04d7cae19fb7fa98ade2ff33c80) --- sys/netinet/in_pcb.c | 126 ++++++++++++++++++++++++++++--------------------- sys/netinet/in_pcb.h | 3 +- sys/netinet6/in6_pcb.c | 99 +++++++++++++++++++++++--------------- 3 files changed, 136 insertions(+), 92 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 3f8db305d3c9..001fd735cb4c 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -254,8 +254,8 @@ SYSCTL_COUNTER_U64(_net_inet_ip_rl, OID_AUTO, chgrl, CTLFLAG_RD, */ static struct inpcblbgroup * -in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, u_char vflag, - uint16_t port, const union in_dependaddr *addr, int size, +in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, struct ucred *cred, + u_char vflag, uint16_t port, const union in_dependaddr *addr, int size, uint8_t numa_domain) { struct inpcblbgroup *grp; @@ -263,8 +263,9 @@ in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, u_char vflag, bytes = __offsetof(struct inpcblbgroup, il_inp[size]); grp = malloc(bytes, M_PCB, M_ZERO | M_NOWAIT); - if (!grp) + if (grp == NULL) return (NULL); + grp->il_cred = crhold(cred); grp->il_vflag = vflag; grp->il_lport = port; grp->il_numa_domain = numa_domain; @@ -280,6 +281,7 @@ in_pcblbgroup_free_deferred(epoch_context_t ctx) struct inpcblbgroup *grp; grp = __containerof(ctx, struct inpcblbgroup, il_epoch_ctx); + crfree(grp->il_cred); free(grp, M_PCB); } @@ -298,7 +300,7 @@ in_pcblbgroup_resize(struct inpcblbgrouphead *hdr, struct inpcblbgroup *grp; int i; - grp = in_pcblbgroup_alloc(hdr, old_grp->il_vflag, + grp = in_pcblbgroup_alloc(hdr, old_grp->il_cred, old_grp->il_vflag, old_grp->il_lport, &old_grp->il_dependladdr, size, old_grp->il_numa_domain); if (grp == NULL) @@ -357,12 +359,6 @@ in_pcbinslbgrouphash(struct inpcb *inp, uint8_t numa_domain) INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); - /* - * Don't allow jailed socket to join local group. - */ - if (inp->inp_socket != NULL && jailed(inp->inp_socket->so_cred)) - return (0); - #ifdef INET6 /* * Don't allow IPv4 mapped INET6 wild socket. @@ -377,17 +373,19 @@ in_pcbinslbgrouphash(struct inpcb *inp, uint8_t numa_domain) idx = INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_lbgrouphashmask); hdr = &pcbinfo->ipi_lbgrouphashbase[idx]; CK_LIST_FOREACH(grp, hdr, il_list) { - if (grp->il_vflag == inp->inp_vflag && + if (grp->il_cred->cr_prison == inp->inp_cred->cr_prison && + grp->il_vflag == inp->inp_vflag && grp->il_lport == inp->inp_lport && grp->il_numa_domain == numa_domain && memcmp(&grp->il_dependladdr, &inp->inp_inc.inc_ie.ie_dependladdr, - sizeof(grp->il_dependladdr)) == 0) + sizeof(grp->il_dependladdr)) == 0) { break; + } } if (grp == NULL) { /* Create new load balance group. */ - grp = in_pcblbgroup_alloc(hdr, inp->inp_vflag, + grp = in_pcblbgroup_alloc(hdr, inp->inp_cred, inp->inp_vflag, inp->inp_lport, &inp->inp_inc.inc_ie.ie_dependladdr, INPCBLBGROUP_SIZMIN, numa_domain); if (grp == NULL) @@ -2084,15 +2082,20 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, } #undef INP_LOOKUP_MAPPED_PCB_COST +static bool +in_pcblookup_lb_numa_match(const struct inpcblbgroup *grp, int domain) +{ + return (domain == M_NODOM || domain == grp->il_numa_domain); +} + static struct inpcb * in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, const struct in_addr *laddr, uint16_t lport, const struct in_addr *faddr, - uint16_t fport, int lookupflags, int numa_domain) + uint16_t fport, int lookupflags, int domain) { - struct inpcb *local_wild, *numa_wild; const struct inpcblbgrouphead *hdr; struct inpcblbgroup *grp; - uint32_t idx; + struct inpcblbgroup *jail_exact, *jail_wild, *local_exact, *local_wild; INP_HASH_LOCK_ASSERT(pcbinfo); @@ -2100,17 +2103,15 @@ in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, INP_PCBPORTHASH(lport, pcbinfo->ipi_lbgrouphashmask)]; /* - * Order of socket selection: - * 1. non-wild. - * 2. wild (if lookupflags contains INPLOOKUP_WILDCARD). - * - * NOTE: - * - Load balanced group does not contain jailed sockets - * - Load balanced group does not contain IPv4 mapped INET6 wild sockets + * Search for an LB group match based on the following criteria: + * - prefer jailed groups to non-jailed groups + * - prefer exact source address matches to wildcard matches + * - prefer groups bound to the specified NUMA domain */ - local_wild = NULL; - numa_wild = NULL; + jail_exact = jail_wild = local_exact = local_wild = NULL; CK_LIST_FOREACH(grp, hdr, il_list) { + bool injail; + #ifdef INET6 if (!(grp->il_vflag & INP_IPV4)) continue; @@ -2118,27 +2119,47 @@ in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, if (grp->il_lport != lport) continue; - idx = INP_PCBLBGROUP_PKTHASH(faddr->s_addr, lport, fport) % - grp->il_inpcnt; + injail = prison_flag(grp->il_cred, PR_IP4) != 0; + if (injail && prison_check_ip4_locked(grp->il_cred->cr_prison, + laddr) != 0) + continue; + if (grp->il_laddr.s_addr == laddr->s_addr) { - if (numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain) { - return (grp->il_inp[idx]); - } else { - numa_wild = grp->il_inp[idx]; + if (injail) { + jail_exact = grp; + if (in_pcblookup_lb_numa_match(grp, domain)) + /* This is a perfect match. */ + goto out; + } else if (local_exact == NULL || + in_pcblookup_lb_numa_match(grp, domain)) { + local_exact = grp; + } + } else if (grp->il_laddr.s_addr == INADDR_ANY && + (lookupflags & INPLOOKUP_WILDCARD) != 0) { + if (injail) { + if (jail_wild == NULL || + in_pcblookup_lb_numa_match(grp, domain)) + jail_wild = grp; + } else if (local_wild == NULL || + in_pcblookup_lb_numa_match(grp, domain)) { + local_wild = grp; } - } - if (grp->il_laddr.s_addr == INADDR_ANY && - (lookupflags & INPLOOKUP_WILDCARD) != 0 && - (local_wild == NULL || numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain)) { - local_wild = grp->il_inp[idx]; } } - if (numa_wild != NULL) - return (numa_wild); - return (local_wild); + if (jail_exact != NULL) + grp = jail_exact; + else if (jail_wild != NULL) + grp = jail_wild; + else if (local_exact != NULL) + grp = local_exact; + else + grp = local_wild; + if (grp == NULL) + return (NULL); +out: + return (grp->il_inp[INP_PCBLBGROUP_PKTHASH(faddr->s_addr, lport, fport) % + grp->il_inpcnt]); } #ifdef PCBGROUP @@ -2424,16 +2445,6 @@ in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr, if (tmpinp != NULL) return (tmpinp); - /* - * Then look in lb group (for wildcard match). - */ - if ((lookupflags & INPLOOKUP_WILDCARD) != 0) { - inp = in_pcblookup_lbgroup(pcbinfo, &laddr, lport, &faddr, - fport, lookupflags, numa_domain); - if (inp != NULL) - return (inp); - } - /* * Then look for a wildcard match, if requested. */ @@ -2445,6 +2456,15 @@ in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr, struct inpcb *jail_wild = NULL; int injail; + /* + * First see if an LB group matches the request before scanning + * all sockets on this port. + */ + inp = in_pcblookup_lbgroup(pcbinfo, &laddr, lport, &faddr, + fport, lookupflags, numa_domain); + if (inp != NULL) + return (inp); + /* * Order of socket selection - we always prefer jails. * 1. jailed, non-wild. @@ -2791,8 +2811,8 @@ in_pcbremlists(struct inpcb *inp) INP_HASH_WLOCK(pcbinfo); - /* XXX: Only do if SO_REUSEPORT_LB set? */ - in_pcbremlbgrouphash(inp); + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); CK_LIST_REMOVE(inp, inp_hash); CK_LIST_REMOVE(inp, inp_portlist); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index a1ec40d21194..331635fa94fb 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -564,9 +564,10 @@ struct inpcbgroup { struct inpcblbgroup { CK_LIST_ENTRY(inpcblbgroup) il_list; struct epoch_context il_epoch_ctx; + struct ucred *il_cred; uint16_t il_lport; /* (c) */ u_char il_vflag; /* (c) */ - u_int8_t il_numa_domain; + uint8_t il_numa_domain; uint32_t il_pad2; union in_dependaddr il_dependladdr; /* (c) */ #define il_laddr il_dependladdr.id46_addr.ia46_addr4 diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6d7c1d4b65b5..ee32fbbf1688 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -897,15 +897,20 @@ in6_rtchange(struct inpcb *inp, int errno __unused) return inp; } +static bool +in6_pcblookup_lb_numa_match(const struct inpcblbgroup *grp, int domain) +{ + return (domain == M_NODOM || domain == grp->il_numa_domain); +} + static struct inpcb * in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, const struct in6_addr *laddr, uint16_t lport, const struct in6_addr *faddr, - uint16_t fport, int lookupflags, uint8_t numa_domain) + uint16_t fport, int lookupflags, uint8_t domain) { - struct inpcb *local_wild, *numa_wild; const struct inpcblbgrouphead *hdr; struct inpcblbgroup *grp; - uint32_t idx; + struct inpcblbgroup *jail_exact, *jail_wild, *local_exact, *local_wild; INP_HASH_LOCK_ASSERT(pcbinfo); @@ -913,17 +918,15 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, INP_PCBPORTHASH(lport, pcbinfo->ipi_lbgrouphashmask)]; /* - * Order of socket selection: - * 1. non-wild. - * 2. wild (if lookupflags contains INPLOOKUP_WILDCARD). - * - * NOTE: - * - Load balanced group does not contain jailed sockets. - * - Load balanced does not contain IPv4 mapped INET6 wild sockets. + * Search for an LB group match based on the following criteria: + * - prefer jailed groups to non-jailed groups + * - prefer exact source address matches to wildcard matches + * - prefer groups bound to the specified NUMA domain */ - local_wild = NULL; - numa_wild = NULL; + jail_exact = jail_wild = local_exact = local_wild = NULL; CK_LIST_FOREACH(grp, hdr, il_list) { + bool injail; + #ifdef INET if (!(grp->il_vflag & INP_IPV6)) continue; @@ -931,26 +934,47 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, if (grp->il_lport != lport) continue; - idx = INP_PCBLBGROUP_PKTHASH(INP6_PCBHASHKEY(faddr), lport, - fport) % grp->il_inpcnt; + injail = prison_flag(grp->il_cred, PR_IP6) != 0; + if (injail && prison_check_ip6_locked(grp->il_cred->cr_prison, + laddr) != 0) + continue; + if (IN6_ARE_ADDR_EQUAL(&grp->il6_laddr, laddr)) { - if (numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain) { - return (grp->il_inp[idx]); + if (injail) { + jail_exact = grp; + if (in6_pcblookup_lb_numa_match(grp, domain)) + /* This is a perfect match. */ + goto out; + } else if (local_exact == NULL || + in6_pcblookup_lb_numa_match(grp, domain)) { + local_exact = grp; + } + } else if (IN6_IS_ADDR_UNSPECIFIED(&grp->il6_laddr) && + (lookupflags & INPLOOKUP_WILDCARD) != 0) { + if (injail) { + if (jail_wild == NULL || + in6_pcblookup_lb_numa_match(grp, domain)) + jail_wild = grp; + } else if (local_wild == NULL || + in6_pcblookup_lb_numa_match(grp, domain)) { + local_wild = grp; } - else - numa_wild = grp->il_inp[idx]; - } - if (IN6_IS_ADDR_UNSPECIFIED(&grp->il6_laddr) && - (lookupflags & INPLOOKUP_WILDCARD) != 0 && - (local_wild == NULL || numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain)) { - local_wild = grp->il_inp[idx]; } } - if (numa_wild != NULL) - return (numa_wild); - return (local_wild); + + if (jail_exact != NULL) + grp = jail_exact; + else if (jail_wild != NULL) + grp = jail_wild; + else if (local_exact != NULL) + grp = local_exact; + else + grp = local_wild; + if (grp == NULL) + return (NULL); +out: + return (grp->il_inp[INP_PCBLBGROUP_PKTHASH(INP6_PCBHASHKEY(faddr), lport, fport) % + grp->il_inpcnt]); } #ifdef PCBGROUP @@ -1199,16 +1223,6 @@ in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in6_addr *faddr, if (tmpinp != NULL) return (tmpinp); - /* - * Then look in lb group (for wildcard match). - */ - if ((lookupflags & INPLOOKUP_WILDCARD) != 0) { - inp = in6_pcblookup_lbgroup(pcbinfo, laddr, lport, faddr, - fport, lookupflags, numa_domain); - if (inp != NULL) - return (inp); - } - /* * Then look for a wildcard match, if requested. */ @@ -1217,6 +1231,15 @@ in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in6_addr *faddr, struct inpcb *jail_wild = NULL; int injail; + /* + * First see if an LB group matches the request before scanning + * all sockets on this port. + */ + inp = in6_pcblookup_lbgroup(pcbinfo, laddr, lport, faddr, + fport, lookupflags, numa_domain); + if (inp != NULL) + return (inp); + /* * Order of socket selection - we always prefer jails. * 1. jailed, non-wild. From nobody Tue Jan 23 06:43:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH06cRgz57Njj; Tue, 23 Jan 2024 06:43: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 4TJyH066c3z4YHf; Tue, 23 Jan 2024 06:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8w5+xr93lIvBiC+0ZBNrveNAcCRRxA76KM8qDe3gyE=; b=RMhyJjAC+Nxc2HtB1lvxwpy+/SM7Nn//KygqU+V08qy4s+GkhdiQnbGmCC5nHT6CT1umtN ZsLVghJTgcTTqWWnPh8UIx/lHZhQZPDpjyv5LL062QjCqm0fcNWWL3mMxN5VyhBaenyeqW iIu2mgxVaMTtZJKhwB9crV50m5qZdfL2pc3Nzo88ewH5Vc+1uq7ydRnJ2L6eMIR1NaWaCK 753R7Gw+J0W0R1m/krcySkpSy/IrC41Zjg40bwDKinjcouIUbLI+iNTGOLV7PoHUxXT9fW lFHJw5sW3b4hUXC0fRjy9+uG5kidqz7cCKK9C6ST5nZDO/lq1iIuG0ifbZmaSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8w5+xr93lIvBiC+0ZBNrveNAcCRRxA76KM8qDe3gyE=; b=G8Yth1zhjrOjK6ljVSVTTRaVm75BtGdzO8Af4kgX6rRU1cnjEat8zMLtFdJyq8Rtnc+5XB v0BoNN8Denic5VUncsVxwMTh8rwSJ//iMcvPFXJi8Bj9jvgPhPt+n7A4+XhESdF5TLkQYh Xq/EZyajjub2nnvERcecfu6TaXM9AtI3anBRTxm5QYvbCHzAKFIHLITamls1l9CToM7yzq k05pHMbnIWE++VOaHL1xCeDYWnTX/uB3gkCI3a++wf0IetzvCO2f6nHz0yrwEoo/5lBr5N 5ws4bR0gTmDKXZKu7T4lkz8sj3q/dB06acQHaZJDbxOGdg2Mxx7Ci4vNCmEqGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992236; a=rsa-sha256; cv=none; b=FGuQSxRQfe/F6vD8zenxtfCXBfYus0DfWzclk/Txa9ANch06kFkeoGYTWuK5LkKdPAx52A 9FHOrQmC7KIDkD3nYg4EKcqT3FENaR7yGsrfQ0XaC6hSLUX8E300QZ6B0z15uUic0k1Tjx xtGLE1vtjsiyGRvH4N3X556qen6jfOLgu/7w3BaSYUea8UcY1+fsRJp6YvNqDdqx5tu8pr lZ3gDuryGpUXOFqde8KG1W3u5KUYuiyHGDDPbauX4uhJo4KYokWQwGPVBXvVO0R3JtpVgq 6XGXhNimIhaSdM3sTJVZQ96eK1NToZVZ9sxJwrsRK5oq0eidWiBNWCMPrV8RrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH059DGzKHd; Tue, 23 Jan 2024 06:43: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 40N6huXR056311; Tue, 23 Jan 2024 06:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6hu5B056308; Tue, 23 Jan 2024 06:43:56 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:43:56 GMT Message-Id: <202401230643.40N6hu5B056308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9509e32f9e33 - stable/14 - _umtx_op.2: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9509e32f9e33bccf1899ebc2638a1c4cf0b43a65 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9509e32f9e33bccf1899ebc2638a1c4cf0b43a65 commit 9509e32f9e33bccf1899ebc2638a1c4cf0b43a65 Author: Gordon Bergling AuthorDate: 2024-01-20 16:26:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:40:33 +0000 _umtx_op.2: Fix a typo in the manual page - s/interpeted/interpreted/ (cherry picked from commit b2ec175fcaac90fc6a1caf066656eaa092f32611) --- lib/libc/sys/_umtx_op.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libc/sys/_umtx_op.2 index 9c0f1f425e47..60f90c32ba35 100644 --- a/lib/libc/sys/_umtx_op.2 +++ b/lib/libc/sys/_umtx_op.2 @@ -424,7 +424,7 @@ regardless of the kind of backing memory. Only the address of the start byte of the variable specified as key is important for determining corresponding sleep queue. The size of the variable does not matter, so, for example, sleep on the same -address interpeted as +address interpreted as .Vt uint32_t and .Vt long From nobody Tue Jan 23 06:43:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH20sT9z57Nlj; Tue, 23 Jan 2024 06:43: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 4TJyH20MJfz4YbH; Tue, 23 Jan 2024 06:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLtlFjBfaaW/AdoEY7zDbIuRcSAzoICE4ckdErMFDsM=; b=XKZaQydkLNn0mkDTrI9jXnyeyeofp1BDxZllo9c98r+Xs3AO+LNBpolxkSpprvca/xiOcF BliCGDAfhfX0h7Y/BiCHxIwcRtKZZJVTgeyIEwa6HCPYdtlTNOyR9K+Fz1iSIqnuHWhWz2 9Zto8XYzKf2GDkCmM1BjeszuCfcfa+ezBNLzxE24D26dC6sEaLGMbtJ9XSPkxG1TWSmCga 5V2fb5rqiwuJvSbYqYBbwJCHZLJQMLIjKvT6HmVmHDBHkIjXGNzQWQClRfQA4VM6pgRUtK lt2y46PSYyFfYWShUWErBVNt0zONDrYuigDUP386y9nUfhqYCPCS8yJY3blSvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLtlFjBfaaW/AdoEY7zDbIuRcSAzoICE4ckdErMFDsM=; b=nluz7UCHcJYUZVU1l1ow9d0nOBCdq1IL4p1gr+1LGNyObv156/GcZ+epugJ11A8La8AIM5 I6iLiQzlxTmeYPFn9NUGInaJg5lzcO5dugPqPHlvgINgNS8P9cIxEXDhXhg1ulP3brklpD Fnak3Sb6yaXhW85JFI35sq6g1S5i8Wvahxp9ug48uCUTqPtLV1afxyrY5PiaDKOVW2MsKc noFaL/7P9VANFlbRJrK4vvjrNgagpEeBxfQ6WImXWK5KQkrcDTRl3cZ6d8KEbouHgEVfTb HRcqEaGf0fYG+AF1NrGavUGNPAQgBfUtdWVWKWWViMLddbnGWZLLAu6zJr5vVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992238; a=rsa-sha256; cv=none; b=WJyeYV8zxE6DAxL9pEZIu9+QPJPvBGdQzFwXm0b4iYsG06iibVp1yN5C040ckiQkB2BirM bJ2PSeWvFPOHmb8MWWKqs7xrkpl9RiJrPPsdZ0oQXxxYOXh9wRQZT7UkQ79VeeL/LtrBgg jWLZuFhOncnPKOiLZIk5xhwv38hzhIeklPouHdXBGRnRvihKpLUY5OeTajG5fVovU/UQSG Zlx1OaoFtZIyAHDYiPz6hB5zuTUHzrQ5JOW/e+jN5ZWDz2t0h4KPykNRIsLSxP7PlhLVfm bQM4pu9RkmIOTZYxuea15zM5EYest4dmS+YpsctBCgObnxlqYJOYKIHi5rUWaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH16SbyzKBD; Tue, 23 Jan 2024 06:43: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 40N6hv9K056365; Tue, 23 Jan 2024 06:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6hvrA056362; Tue, 23 Jan 2024 06:43:57 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:43:57 GMT Message-Id: <202401230643.40N6hvrA056362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c065e2673c38 - stable/14 - atse(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c065e2673c38fe786b9dc654da1163b92030091b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c065e2673c38fe786b9dc654da1163b92030091b commit c065e2673c38fe786b9dc654da1163b92030091b Author: Gordon Bergling AuthorDate: 2024-01-20 16:35:51 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:40:48 +0000 atse(4): Fix a typo in a source code comment - s/addresss/address/ (cherry picked from commit 2b1e4e5be3047411df5e4d5442aa7de6489a0309) --- sys/dev/altera/atse/if_atse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c index bd252693e6df..923292484207 100644 --- a/sys/dev/altera/atse/if_atse.c +++ b/sys/dev/altera/atse/if_atse.c @@ -580,7 +580,7 @@ atse_get_eth_address(struct atse_softc *sc) sc->atse_eth_addr[4] = atse_ethernet_option_bits[8]; sc->atse_eth_addr[5] = atse_ethernet_option_bits[9]; - /* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */ + /* Handle factory default ethernet address: 00:07:ed:ff:ed:15 */ if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 && sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff && sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) { From nobody Tue Jan 23 06:43:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH31QNCz57P5k; Tue, 23 Jan 2024 06:43: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 4TJyH30s03z4YR8; Tue, 23 Jan 2024 06:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0eHpTl01aVGh3tujFsOeEzWtONGMWWPursrH91dnkY=; b=pz8rSbOW5evI1zc7Fjpw4APSwU+3vxpvZ58CHh+hBoZEHWj4HjsEG8jUTJyfQI6WsqYe6u UDDCgRIiJaGa+hIQlRcot/yqKWDF0aP63lHkZf7ShMAb5zkPUE64i59Olc1BJggYrdc5pH i7YB7RDMjQhOv8ys51dLAWgJbF/BPw7yVUuyWBKVuuBuC/WYF7awPy3RaZGxgQlxl9fz9E B4+1drCzykXN93rT5H+z+5cptY10ycdwotc7AFR0+O7CD+1TCYPJAUPfCmA4ebOTlosVK2 jXANNJidC0lguuGcQaf5DKl8mIMT5TQfZK0JFiQHHXglCH4Y7MtRIpCb0UkO2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0eHpTl01aVGh3tujFsOeEzWtONGMWWPursrH91dnkY=; b=ltBml5kEw7ZuWCb+ZLKA49yYx4Ee7nIyiPw/RTYv40HwlUSCgUNXIEWVKlXjSp/N1Owy6Z 9ezHNcaNwFNorSltffFo09okEBD/nCzEZOGwttfL6jjEGGvf+I1cBM4cwUskcmz787IYvm odwY45weNlz2Sl2k7wFhCLqXX+sfQwTjO94lEcKYARQfubjCtcvQhAd1xMM+2H3EryJaWS OEki4pX8JRbqOJgl4/s4YsizpaOWdqkxuDS1hdM4Cx8ggdK8bfl0iaIphyeamDW7ccrAQi +ZhZljKLD9q39kloNe94z8PSnPXYZC+iPR4vTMaSAorKM88sir3U79uEJbmSUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992239; a=rsa-sha256; cv=none; b=T1ZPuvxZX+LpXo6z8c+Spc0Mm7vel7Pq2YrZEc/CwtA7uNdjskpXH6Uyhxqce+rr4TbMLc cr6AvOn5wFdUY70tO2zDapAU73Ku7ZBu8jY5QKEwkvYjIHAXINwQm6u2eyPRMOwwYniqnC azPkYSaq/sqI3H4sitN1/HdYSsfXlpDzvGM185lSCxRs+HicaE4QpH9h0TV4dpSmBPLP+x vEAhCn0XoIio37PJRDBdCPzeljMQBlNDfnoePeV8RiC7DuINCl00puRoiIEl7SBzUgEmN9 MxyVUma3b1uiOe+dm/42CZD4i+0k4xFBqARL9/74yC7F/3gfVJHy4OyTri0puA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH271FLzKHf; Tue, 23 Jan 2024 06:43: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 40N6hw2q056424; Tue, 23 Jan 2024 06:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6hwAv056421; Tue, 23 Jan 2024 06:43:58 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:43:58 GMT Message-Id: <202401230643.40N6hwAv056421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bad1f5985710 - stable/14 - net: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: bad1f59857105910e99637832c258c8b092fd868 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bad1f59857105910e99637832c258c8b092fd868 commit bad1f59857105910e99637832c258c8b092fd868 Author: Gordon Bergling AuthorDate: 2024-01-20 16:28:12 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:03 +0000 net: Fix two typos in source code comments - s/strucutres/structures/ (cherry picked from commit a2fcd3af5c8ad43e8d2c7b89f7bbe3edf2f22e2a) --- sys/net/if.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.h b/sys/net/if.h index 4d5f4789599f..4c3cfd06ca03 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -338,7 +338,7 @@ struct if_msghdr { * extensible after ifm_data_off or within ifm_data. Both the if_msghdr and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct if_msghdrl given a pointer to struct if_msghdrl. */ #define IF_MSGHDRL_IFM_DATA(_l) \ @@ -380,7 +380,7 @@ struct ifa_msghdr { * extensible after ifam_metric or within ifam_data. Both the ifa_msghdrl and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct ifa_msghdrl given a pointer to struct ifa_msghdrl. */ #define IFA_MSGHDRL_IFAM_DATA(_l) \ From nobody Tue Jan 23 06:44:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH433q9z57P2L; Tue, 23 Jan 2024 06:44: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 4TJyH41ylTz4Yh6; Tue, 23 Jan 2024 06:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V37TQ1UUM+nmBY9glk4E8SXiewd674K6L3my1twAcVU=; b=dlUtGOjt6N7yc+9i9uK+LaMAEf7ICOchust/7NHBZiv4koLQek7kE89PmoWMY7qmj7tZVc 1U1uwbX36cB6HS6BpH+uIX2m7OClNLsBfaN3R5zXjXFl5njwLHRCYRpvQMEj1kg5MK9NhS bOtskeC8Le+Gl4naLhEWVVMvLYHqfU2rCGrHIi0ermV/DKNSfEnL4Wc/7Gm71Bxo/5Rd4u ohPq1X0rgGG6onV7KwbBwOC3eONEpYtmHJjWXUHB0CxmjDNncYCIdvI4RSKBrXA2NKcGZK do2pNpj3d/vpXlatu4Fs32PMfnnbHfp7U+aYIAeXMCevbQPIfPXLKjpCzsjR5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V37TQ1UUM+nmBY9glk4E8SXiewd674K6L3my1twAcVU=; b=RxpSBpVtZhNT/+Q2LfewyzRmQtC81XI/8BbV5vrBxmCSHpObADpGiprwwSa4xzo9o3Tm87 63zkBbEeN/6799sw6bygu5wWJXF7iWOEFqHkvp9Dec6Ax/jl58+bCYLS3i8quK0EVqV+hl XK+82CAbNhSZrLA9eenFTdJKVsPWpm93gpaSJ6tubBdJC3QfniliaO0BUoTi2DZKfu2VNj okHHstUfr9pfGZg3YQEfxq/Tg0MtY+uby0WAbeVgI0WuO8T8K3wf56xd3/LTCspXStGkqw Y6mtGLGkGqWJ5VE8vWAm90CIovPoLs6H/9MUKKN/27U412wWsZges+qjL/ZXKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992240; a=rsa-sha256; cv=none; b=Ey7lMvxkMiRf1tU1i28cGMEdWAHprpdT8xeyCnUR4Yhu3IfuH5yjbRTis+rKuPZUkBI76p Ob7VLnpndj2HBwPqszx/6CEIs6asoY3vK3+AE1QtrpZivu7nOchbVxpwlwNlmOEb2dzCBP ZwUuwggHf5qjqjC4Ag4pEC4onr9kvPb1XIRSHDN0VR3UVhx7QtTfbMx/ukvxhV7FzCazeO uFYDof25+sCOpL44AbiJ9cGhef4tKk56n+sMrJ1H+TFtzeduMrefQuFd/997E9rsPhuKdQ zYpFUKLN0iKuCYSQeh62IgKN6F91S/MBoUxT8N8l2e1y8M8iYDANJYMm1z/shQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH40sLWzKHg; Tue, 23 Jan 2024 06:44: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 40N6i0Np056504; Tue, 23 Jan 2024 06:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i0If056500; Tue, 23 Jan 2024 06:44:00 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:00 GMT Message-Id: <202401230644.40N6i0If056500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: de3e802b9d13 - stable/14 - netgraph: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: de3e802b9d13009ea9baa4245f0c6a8451d3bc3e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=de3e802b9d13009ea9baa4245f0c6a8451d3bc3e commit de3e802b9d13009ea9baa4245f0c6a8451d3bc3e Author: Gordon Bergling AuthorDate: 2024-01-20 16:22:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:16 +0000 netgraph: Fix two typos in source code comments - s/bascially/basically/ - s/simpliest/simplest/ (cherry picked from commit 7037ebe63dd1a2ff2a818359c58ca24b6d44388a) --- sys/netgraph/ng_sample.h | 2 +- sys/netgraph/ng_tag.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h index 994f322cf05a..f7f7cb417626 100644 --- a/sys/netgraph/ng_sample.h +++ b/sys/netgraph/ng_sample.h @@ -73,7 +73,7 @@ struct ngxxxstat { /* * This is used to define the 'parse type' for a struct ngxxxstat, which - * is bascially a description of how to convert a binary struct ngxxxstat + * is basically a description of how to convert a binary struct ngxxxstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c index ea84148e59ef..31417417c0ed 100644 --- a/sys/netgraph/ng_tag.c +++ b/sys/netgraph/ng_tag.c @@ -258,7 +258,7 @@ NETGRAPH_INIT(tag, &typestruct); * One could ask why to have this structures at all when we have * ng_tag_hookinfo initialized to zero and don't need in and out structures * at all to operate. Unfortunatelly, we have to return thisHook field - * in response to messages so the fastest and simpliest way is to have + * in response to messages so the fastest and simplest way is to have * this default structures and initialize thisHook once at hook creation * rather than to do it on every response. */ From nobody Tue Jan 23 06:44:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH53v9Pz57Nll; Tue, 23 Jan 2024 06:44: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 4TJyH52pSnz4Ybx; Tue, 23 Jan 2024 06:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ll59L38nLlyo/dFknWDSU/lp/rSVvoTPaFlAYlxY2M=; b=tWt7G+7VX7fRKtKPD5C0bRGu8E/XjkbsCvErf9Z7ZubmgUtYuUWnyw+yB0q/9SrkW6ttDW q1waLPmR1qo+f1Po3Kpzd3HOwH9bIRfrXkwbWUvJeWKe00t7Xm7n2P6821Bi/wVcJd8GKC O5+tHlMJXYZzy78C1Oor/8gejnCutzGDyjwGw2lbheKxHN06LGik6N+jTP4QgxJ2n4E1Im BPeH3n1Y2iK86UoREczctHso8Tbx9zMZNBPlBChELYarP3H6efE2ORbsh2NLtoXZc+8G9t Flr+PdzZ9HeqEMvipmcw91BenHT/rWFwKO/OLE9yDDRuQGvg1RuwD6JeGk2yNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ll59L38nLlyo/dFknWDSU/lp/rSVvoTPaFlAYlxY2M=; b=cv3rfUk8IoqY3I48LsuKeSrM4xsA3U94OJKLh2PenJKQl4JJaGAVpdUALt6STjNOmY7HId 6gp/JaGHkfJebp5h5o6fvbvr+1nKan/+Zng/07S9Q/DEWzO+tiQOSewGPqt3urOJYOXR8c gAn0hf7g0LLb6bvQ/87B+7RkMKwoX+r6KXgE59RPCWamjfKUBWKzaunIeX/U71qQGY0nCY 7YtxvJ/lMOFfz0+JtSFmkF88G3XZqu2wbB1upN/7Zik45DlU3VEc1da1rA/+01gsnehvDT p2h+joVrB8O5kKkMyrCsDAJ92035gqKLjyNSkkSjnlkOs9/Lxb7gvGl7nr2eoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992241; a=rsa-sha256; cv=none; b=Dplvaq18m4PQlRwbrTCr3aPDmP8QJMHpyOHGTq7VK2AB1QbbALyEat0QW6qhMyq9RD/BUl Ie0p1+gsxX6oECvw++AGnnYRerKbj/bQASIU251j49ToWpcmvHHfzb/DzHNbapaVpLte/S 3f6wNtR5N5OSZW/OxAVU1xXUWcNc2xnBwIdjy0FTWmh4nZ6ZkwNmk2YUwKABx0o1ANH3ib kyI2x/+TKow0Hwh2XH+Fn5OXijA3CPtwp0Nz85mpYNoxY5J5skuo1SoPdWhhkcm3hQLHYQ rYBlHQJnTpKEOsm8PA/t8EFTSOm0xXmUhVFip+KbSXGl3KzFlh7UHdkBkWSwKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH51wfWzKVC; Tue, 23 Jan 2024 06:44: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 40N6i1Uq056559; Tue, 23 Jan 2024 06:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i1NV056556; Tue, 23 Jan 2024 06:44:01 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:01 GMT Message-Id: <202401230644.40N6i1NV056556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2eaee65182be - stable/14 - netpfil: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2eaee65182be345c1962ea58c593556f8f33f44b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2eaee65182be345c1962ea58c593556f8f33f44b commit 2eaee65182be345c1962ea58c593556f8f33f44b Author: Gordon Bergling AuthorDate: 2024-01-20 16:30:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:33 +0000 netpfil: Fix two typos in source code comments - s/withing/within/ (cherry picked from commit 938918a9f478e94fbe65ba84510e4755024560be) --- sys/netpfil/ipfw/ip_fw_dynamic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c index 5b756cd4c980..283032048845 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -2456,7 +2456,7 @@ dyn_send_keepalive_ipv4(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv4[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || @@ -2563,7 +2563,7 @@ dyn_send_keepalive_ipv6(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv6[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || From nobody Tue Jan 23 06:44:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH65smZz57Nk0; Tue, 23 Jan 2024 06:44: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 4TJyH63v3tz4YWQ; Tue, 23 Jan 2024 06:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI+4aZjrU5x55PksprrG7ddboR2HDVRqAJ2h9lTphL4=; b=P9Zig03jjGx2YrJEwJxsA7e1gQCxC11KGwicfJ6dff83PxVJOh0jeyl1ZDY9nlhue+kODW ZsUof6w+10I1/8KmB4RAeQZ8O0J52Egz5FtxlBS/ZFvJHyyAdNBntW6m3Av8HC81e4A4bO YS+Domi52abd2B7CiZ7fjf1B8Lp1P+GzHyFc4YLBvG2TMLwxY5vEGazae72nALvox1y/Hw lessDfOY3V65dZEpQ7uu4ThtlUE/AqDl/0AM7yHElwx0wEQeWLPsvz8wTxeowQY3b2bNLE X+v3kmsevnlG3De8SqC1Jpwi+Y3tQym8XocC2VTJBcQ6Wu6geEPP01VXkPal1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI+4aZjrU5x55PksprrG7ddboR2HDVRqAJ2h9lTphL4=; b=ZrQPQ4ucvmwjV6jpATP95mWGZraoYRu0QG46MoIegNDS0wTH03KaAixEskY/1EnJFsObQp BHAyidKFWmYsAPF4QvkVhHEdndu7JUiqSrjNW+TRSAaeqS325GsTEGvXgpAII6Q7ac4Qhb IjG2yNnvvkXyQsO97fehRj5pAgj+cM4Q9b2OhsNbcFkHi+ydo6EMV92jPrxqC3isfJYJiF cQqg503ptoU0hU4/3Ckb8jpNojtUdodziUBgZ4/wbuuQHxUmjZ7mo+C5x9l45ifKW18sfs uL+IdTWDgQd6ZvoOEF5w1CzaH8PZxLQQ3mnDTsL+r+EgJ9NpRs/tZQ8zmiBkrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992242; a=rsa-sha256; cv=none; b=AKgV13hwmzELqhP+YSzHPn3j0hqRRkzbVAD0wqqx3t2mtXJuUW1MbJVqkdqYZkoVqXyLki kD571Yn4AxTp6USrPavEYrYEu1ytpmcRix9X+0us2GoHU/z6ibJ+FoFeJ1xz9/bMsK8QkM spgX4tF4dy+g1PDtcfilJ4IpbLpe72z8sXy6bTSfRwU5uqY1evoGvXDcZUJ0iJ+u+j6Ilo PW2M9sAUp6I7HM2huvNBEo9s0mj9Z46O53hvhUL5stH5JbcGy69T9ZaiUuiMU2waQDUoE9 UbSmua/qNLMEbYUaeAcMV27MkySEImPD44C3BJP1kbDRMtNE4WqiCvnTJXRweg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH630Z2zKFP; Tue, 23 Jan 2024 06:44: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 40N6i2ji056613; Tue, 23 Jan 2024 06:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i2LT056610; Tue, 23 Jan 2024 06:44:02 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:02 GMT Message-Id: <202401230644.40N6i2LT056610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 788c5cebec16 - stable/14 - vmware: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 788c5cebec16910aa2659b4d91970e362498f17e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=788c5cebec16910aa2659b4d91970e362498f17e commit 788c5cebec16910aa2659b4d91970e362498f17e Author: Gordon Bergling AuthorDate: 2024-01-20 16:33:27 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:49 +0000 vmware: Fix a typo in a source code comment - s/withing/within/ (cherry picked from commit 623848af604116aa33bc8a66d2ac45b4cbaccfd8) --- sys/dev/vmware/vmci/vmci_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vmware/vmci/vmci_defs.h b/sys/dev/vmware/vmci/vmci_defs.h index cfa302ad11aa..466712c41cee 100644 --- a/sys/dev/vmware/vmci/vmci_defs.h +++ b/sys/dev/vmware/vmci/vmci_defs.h @@ -259,7 +259,7 @@ static const struct vmci_handle VMCI_INVALID_HANDLE = {VMCI_INVALID_ID, #define VMCI_ERROR_QUEUEPAIR_NOT_READY (-40) #define VMCI_ERROR_WOULD_BLOCK (-41) -/* VMCI clients should return error code withing this range */ +/* VMCI clients should return error code within this range */ #define VMCI_ERROR_CLIENT_MIN (-500) #define VMCI_ERROR_CLIENT_MAX (-550) From nobody Tue Jan 23 06:44:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH76x0Dz57P2W; Tue, 23 Jan 2024 06:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJyH74yTBz4Yhp; Tue, 23 Jan 2024 06:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBao0SPE2KsVKQ1Fsg8zAzYPPO/OeKuJPjHL9L1ZKfY=; b=JtnIEOMfq2cCREaMXt1/l9E9XYkpyxoM7E7jf3OVBLkJ+ZxF/Q+ffTsHzWCAlMhEVcJexX 6t9FBAqb66Rpe9o61uFLos3NB3bWqpnGb8oVeY2a8dyxbmivoRzGTEH/WEnRRB6nAEJoYd KEsVwfjOfjnR7iqlKt8PaCnjAYfCw6mGNbzeTSmwKbjGAGHhQsGPbTzUrV3qzbc++TU7fC +1vP1L7lt9aW7u6hxmFnYOoKTtLzUtjU4Kyyd8LVnfZUYQZ6lOj2LsQK2P0XpCuN5/yiJm 0C5UPzIDoHgRnLCDeDR+iXZF2Hsr+xIEeeSvv7t7fD/yJ5UtetwWyg8S2dK07Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBao0SPE2KsVKQ1Fsg8zAzYPPO/OeKuJPjHL9L1ZKfY=; b=AcQKjQDZN4ulrG356xqHxDplggIYiFkUkTBmB7TVLiVzIFO1EGZwuW8ZNsK5OPh12gYvso KJ9MmyflGZJqA4CXFDoh0AJ7NpLDK/eOZZUPOacoWTPJwzNMlqF0pAnEasvUnuS8AbHUDe urLT8NyK+KCd+oApXCZdWGXagz7Lo/JT8uw5mOdDZw50lhL2PsSt7hX6CKFvMKzITj/9A3 357ejvamAWPUTK/xJNuapwpDGa5sNAqGkx8LcgslSu7QZY5v98sb3w0LH+QDiErnmsZuDS PvGTTvmEEp1qLXi0xTBD60klftV/olL58ag7gWNXlZ7jf7cret8LZ40m+thSkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992243; a=rsa-sha256; cv=none; b=tnGZHrXdJDD0+VRha6gujT+1x/RM8+lvUtYi5QGs+C6IBNTaYJmM838+IQCXBpkfpCmIaq 8RzGCabM43CMxphZUbqx0l75kM69+yuuvFW+A26Mk2OHZhWvgTUIl0HgZh39GfTLqtH848 Ekd159os2lti4g3GbznVOjYr+kWGQMTukMwGzgZoJgfrsl6fPbQnKBNa+6LG/0LWdffczY Ssw2xppANlYwtvGqfdW28p5WlF5W2ZcHVr53x8o21d7/lRgdezP0ackuBQTKVbXb7PqA6d kPft9L1eiNEiJwrXyX3xyi6XZmcGe9ZvGAzJnZsHRTpfAgSnYS5LGS/AjfQTTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH7449RzKVD; Tue, 23 Jan 2024 06:44: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 40N6i3MA056667; Tue, 23 Jan 2024 06:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i37w056664; Tue, 23 Jan 2024 06:44:03 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:03 GMT Message-Id: <202401230644.40N6i37w056664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4aed20f6377e - stable/14 - usb: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4aed20f6377e6ed1f4f881930d5a28102ac5be3c Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4aed20f6377e6ed1f4f881930d5a28102ac5be3c commit 4aed20f6377e6ed1f4f881930d5a28102ac5be3c Author: Gordon Bergling AuthorDate: 2024-01-20 16:32:20 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:03 +0000 usb: Fix two typos in source code comments - s/bascially/basically/ - s/assistence/assistance/ (cherry picked from commit f5e3329a5a480aa1b2904106b2fdfd999439455b) --- sys/dev/usb/misc/udbp.h | 2 +- sys/dev/usb/serial/uftdi_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/misc/udbp.h b/sys/dev/usb/misc/udbp.h index eb2c27d5f9ef..a12cc739ef80 100644 --- a/sys/dev/usb/misc/udbp.h +++ b/sys/dev/usb/misc/udbp.h @@ -63,7 +63,7 @@ struct ngudbpstat { /* * This is used to define the 'parse type' for a struct ngudbpstat, which - * is bascially a description of how to convert a binary struct ngudbpstat + * is basically a description of how to convert a binary struct ngudbpstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/dev/usb/serial/uftdi_reg.h b/sys/dev/usb/serial/uftdi_reg.h index 80936f80b6fa..19794413cf2f 100644 --- a/sys/dev/usb/serial/uftdi_reg.h +++ b/sys/dev/usb/serial/uftdi_reg.h @@ -8,7 +8,7 @@ * USB on the other. * * Thanx to FTDI (http://www.ftdi.co.uk) for so kindly providing details - * of the protocol required to talk to the device and ongoing assistence + * of the protocol required to talk to the device and ongoing assistance * during development. * * Bill Ryder - bryder@sgi.com of Silicon Graphics, Inc. is the original From nobody Tue Jan 23 06:44:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH91zrPz57P2X; Tue, 23 Jan 2024 06:44: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 4TJyH8622sz4YWh; Tue, 23 Jan 2024 06:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBADU383KqDnGD78hGPXjkH5WdujNplH+84fWof48k4=; b=aZuV28mXre6nH+JMckXEx+0qjilzbhb8wbLSlvDlouXZCWNN2f41WXjoenLq7/KXx+izje tJSulBd1kQ16CZ5zfuJFVjaa8DUZ9Aj9iNUVsyBh2n0mEgY9bqLDr52wZt41gdvCkBPFbq 5Q9WmyOyjSgbi6EleL19G5o1q5hn1TXCvAUjltFodoo5i0FAh4W9rgeCcvgSS6zA2ljDSg daI+tklecHOST0tIDaBMeCxf0HxLSMR1uVIFfDJj5QQeJV7jhc4n2K7mdHEUhDs7pFwhKH YJEhiR7VUZf7K+SBftswljdzPlyg1a2GGcxpnnULudwjyzyal3DzYoYJbAyXWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBADU383KqDnGD78hGPXjkH5WdujNplH+84fWof48k4=; b=QYrvhJp+g35Sf/Gj5bWEtEmfox+LwmlY9RbcKAXaj/JIrH/R/DFJIPlDJz48CAnB4Jccl/ V+OJNUsKoFZyPAdzL6jnOnA7W9tyGKnbvXOPr93+fJDp3Dsb2Ie6WBwmYvAFserG/6dlUE Kmx1baFFtEeZkACMd0NyBqL347N6TilUSoEgvQW38KM0bl8xGZ92L3xRavkQNtbpaXXhXv cMJHIFa02SYawgJsYRylmDm4WhgE3Bg47+KM6q6eKZnMLIfkjtSDxWU25w0Ayp2bLL6QYf 6J08Ye3qExXTO1/AhOaBBDqn7X+A6v8AQ1Otve4do3hPXX/XramIRroNKklHLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992244; a=rsa-sha256; cv=none; b=O5/3XUJFyBzVEM08MCJ+p2MHTcYWMyEQfJsrwKEF6Yp4YrUcZcMdPUTlbdVaM2aYarZWR8 oUwOqfypU8yip1iSg2dIoT9JIhM8KDEBQZL+J6KIn9sIISl3k9R4bWCx9nqbzeGNG4QZ51 /oGgc2mvWvTssgMgRvywqyUVnL1OZhJx0qMdHJyqk03XtjzigSycVp1qfn708winUe5skD dSDb2TtjuapXX4+JDGEeC/eZyzAKLCaknQwz0lFwf921VoPS8P6ude2ux04y1VvmNvL5A8 dRwQx4mQDm0NvCRU2AuyqcZ5M/qx9tVrX7Wdnf72lqwgQ7v2v05PRb52OYQzhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH858BgzKWD; Tue, 23 Jan 2024 06:44: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 40N6i4NE056722; Tue, 23 Jan 2024 06:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i4WL056719; Tue, 23 Jan 2024 06:44:04 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:04 GMT Message-Id: <202401230644.40N6i4WL056719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ae09f54c06f1 - stable/14 - ciss(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ae09f54c06f17feb594ace1a5852f39490270427 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ae09f54c06f17feb594ace1a5852f39490270427 commit ae09f54c06f17feb594ace1a5852f39490270427 Author: Gordon Bergling AuthorDate: 2024-01-20 16:34:25 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:18 +0000 ciss(4): Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit ced92d000a9435745ca2891734e6e37ab1c5e873) --- sys/dev/ciss/cissreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h index b9dc10fbf478..5fc06410eee8 100644 --- a/sys/dev/ciss/cissreg.h +++ b/sys/dev/ciss/cissreg.h @@ -691,7 +691,7 @@ struct ciss_bmic_id_table { /* * Below here I have no documentation on the rest of this data structure. It is * inferred from the opensource cciss_vol_status application. I assume that this - * data strucutre is 512 bytes in total size, do not exceed it. + * data structure is 512 bytes in total size, do not exceed it. */ u_int8_t bDdffVersion[4]; /* DDFF update engine version */ u_int16_t usMaxLogicalUnits; /* Maximum logical units supported */ From nobody Tue Jan 23 06:44:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHB2h0rz57NpS; Tue, 23 Jan 2024 06:44: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 4TJyHB002Cz4YZW; Tue, 23 Jan 2024 06:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWw+2NUac+Z9byl5l1MDk14o6J2q25KroK1lcP19Ff8=; b=woEEmQuJjn454WwdQe9kLtS0fJYKcqfKBwa6lGsVOnzY46v9aBtjDwEEtBQ8fkT9i2dUjx Vh+RqadeluKdrZpbWBuh01k4SD6nipWAf/MmV6XJd9fTGhypUe4ynjG5RVDHZ8Li8jKtI2 Kq2R06Z+qYbt+Lsa/7JNfTdUICF5tlRvzn2XIiicOj2xrFlsMeYSutCrqF5+YtxWL1Hi5O ZPx8Ehdux/c/IsbbvWK9CAXP99y29p7GW2InYSr938NkZZMB9DjmH/BnD/NWOBOdnQ1TSh 2AYrsbDHF+xSxyNCgbk589i8010rHD2vXzx9ji3qbiDA8yfZSmXqZFu4nKencg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWw+2NUac+Z9byl5l1MDk14o6J2q25KroK1lcP19Ff8=; b=HSYhnA/ekARKVHHEtcxCnAxTg2cl8si0BItqbvpoJ3xzwaQb5bCQ4NegBHSV1X03gqrMa3 +XSv2HbAyUzBXAguT4ijm3mE28eXO4Kju0OQ0pZsglCzTMEkd1Up05iDr4r815t9neZWAu S5jiTg2cxqme4+8ekkphf7rUbwe5OqTOzjmeZh1q7hSnk5oFUaewMhxTcNKBpqLql3WvsJ OK9FkB0FGjuCFkbWkPPahFmy1vW2MFFCiu7+gRAymX7XPZyEljxXG/5kPkKXJxiNc/yDUk LanBnJQW22VW5kfcPgj5Ak0tVIXkNqv7iOgHmIj7y3H2+xfgCX72zM12R3axYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992246; a=rsa-sha256; cv=none; b=QHvIxlh9SWMp0GUKwbNVFaFJHFUKTAnQxzo6PvIwSYsm2opub4c05eKwJDJXf8gHpCXOaZ 3RAUBjXCcC4cz5PxBEosXI4AAu9UFFdMXDeljYd1UfQH7WtKl10xKgrV0ij3nyShDJn41T x4GzXD6SrJcKh3AAzBwCSQB/9IXiu1L1W8SxlbXa6815+kRHxN+fd95b0cwsw53iHBPlUp LcrMjx23Tj/0f9kl7q3yOAhkd09RhknrxxF1tXfz0nivBJVfvQYiSIBR25rbKwPulyMBuC KM0XH7vqoG463q+BtbKqtg9Awez64H03y6bopgJDvyDiSLFLIE33ECgDpFuFfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH96CTgzKWF; Tue, 23 Jan 2024 06:44: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 40N6i5Cv056786; Tue, 23 Jan 2024 06:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i5RR056783; Tue, 23 Jan 2024 06:44:05 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:05 GMT Message-Id: <202401230644.40N6i5RR056783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 49e450f43d40 - stable/14 - tcp_hpts: Fix a typo of a function name in a comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 49e450f43d401d886787fedfb066216fbebac68b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=49e450f43d401d886787fedfb066216fbebac68b commit 49e450f43d401d886787fedfb066216fbebac68b Author: Gordon Bergling AuthorDate: 2024-01-20 16:29:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:31 +0000 tcp_hpts: Fix a typo of a function name in a comment - s/tcp_ouput/tcp_output/ (cherry picked from commit ef0ac0a1ad6750291b881203030384b7f7241efb) --- sys/netinet/tcp_hpts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 73e9997c060f..9d192b17c41a 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -47,7 +47,7 @@ * * tcp_hpts_insert(tp, HPTS_USEC_TO_SLOTS(550)); * - * The above would schedule tcp_ouput() to be called in 550 useconds. + * The above would schedule tcp_output() to be called in 550 useconds. * Note that if using this mechanism the stack will want to add near * its top a check to prevent unwanted calls (from user land or the * arrival of incoming ack's). So it would add something like: From nobody Tue Jan 23 06:44:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHC3NH5z57Nlw; Tue, 23 Jan 2024 06:44: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 4TJyHC1H7sz4Yd8; Tue, 23 Jan 2024 06:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ijYmwLJYDyn0lg9gD4KkGqQys3Nyq7PBWR68NmQ11c=; b=k+fXaOznYqjLIQr8kjdY+gSWtlgykqbrG0l8Pp/S9BD8tBVmrUJT0s+tzqxyly8k8oyPQ+ woFb6uW9fb1GyD0QQvAVDNxiFrG+6IIHEHxXkPpe7jsZpkRm5OAk//DHA4Jh1vN908cIZ7 1kcJYxKfqYo+vC7FRsENJSI/EahcqXLEsyghiRgt99/T8OtPCLkb597qzXCh3u4/B7n33G Ys64LM/UdbwcllUOrfKkJ+vNGpyPfqzX7GJJdSnNXP6W8ZAcPKHwq5cafEdYxk/gQ9CqCN P8GkV5YM89+bCz5sJ8tQmm4SYyQl7RXcDP3N6q91ohu+HQWOMyL6Q1TW6cXUPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ijYmwLJYDyn0lg9gD4KkGqQys3Nyq7PBWR68NmQ11c=; b=Iv6HpnXYAYIBGKVgWGKItTZ//ClUnrEHD4zuPs5IejDcSs70Ft9ijOT1lpP3syoyVpdwvZ IOqdulLo49jgdxcGZ0wZgHBD2y++diE1HJSn/kLi5m/aRbFbDGpYYSN+Somjm3O5GwdKeS F+BXfMHPL5hABOt/3ZXJ1LtS0mhIXaXU7KmP/0PEixPbibeKofxN9orYc1OdwoyiNMmRa9 TayY1jl/J39tQdYRLIRV+IYG1B/+A5F9V42vqGWDjRclL3GE0j/Ccl/HSQaxB8+K0OUwJg W2ocEpgktrbfanBpS0d9jx5H18YYoHMUxxtG1fdyYFcBl3TXYx4r0orQUg3tmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992247; a=rsa-sha256; cv=none; b=RIUglvMmzAC4uFTsmd0puvIJYTYONftTgSn6ZOawkHKTwDGi20nmbjVYW+KLYEQdrzT7gG 6hqs34Jxt/2QqHQ/iCVXROOoUcuAJP2GjKe3/UcyOheaXJ9EOeP/RLGN/2kxtc+hQXYRCW jAw1FtOLri5zqTKcH6IV3cn+8s8pKMxY6kQ3Q87J04d02TRBEWS0je8hhmbd82kW+1pcrV xjHBiG8y8pQtgyytj6A57ePeEuIXgfKH7fqm6FfIb9MVUb805MmPU6yHcc8mlNaHsZEnPs rsRspDz20wKcw/IcrHFTXTomQLw4FF9M4xS6mlv5ZhoaP+RzdnLhFkTUT7qxqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHC0NX1zKYZ; Tue, 23 Jan 2024 06:44: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 40N6i6ZU056840; Tue, 23 Jan 2024 06:44:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i6YW056837; Tue, 23 Jan 2024 06:44:06 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:06 GMT Message-Id: <202401230644.40N6i6YW056837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6e5c98c759b2 - stable/14 - PCI_IOV_INIT.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6e5c98c759b2149d0cf82081c97e5d7f8056e270 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6e5c98c759b2149d0cf82081c97e5d7f8056e270 commit 6e5c98c759b2149d0cf82081c97e5d7f8056e270 Author: Gordon Bergling AuthorDate: 2024-01-20 19:20:32 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:47 +0000 PCI_IOV_INIT.9: Fix a typo in the manual page - s/infrastucture/infrastructure/ (cherry picked from commit bce295fcbe533d46d2f600168403c7968599b86b) --- share/man/man9/PCI_IOV_INIT.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/PCI_IOV_INIT.9 b/share/man/man9/PCI_IOV_INIT.9 index 3e71a65e4132..66b1e693cedb 100644 --- a/share/man/man9/PCI_IOV_INIT.9 +++ b/share/man/man9/PCI_IOV_INIT.9 @@ -40,7 +40,7 @@ The .Fn PCI_IOV_INIT method is called by the PCI Single-Root I/O Virtualization (SR-IOV) -infrastucture when the user requests that SR-IOV be enabled on a Physical +infrastructure when the user requests that SR-IOV be enabled on a Physical Function (PF). The number of Virtual Functions (VFs) that will be created is passed to this method in the From nobody Tue Jan 23 06:44:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHD3fmcz57P2n; Tue, 23 Jan 2024 06:44: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 4TJyHD2RjXz4Ypv; Tue, 23 Jan 2024 06:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+EPmvFi4IpsOb6RAHuLrMR6G4kmNwY4WWXRRb5YoVo=; b=hGU19WTBGJUVHRYyUoA8++1Mat9h4gpDrKJMvD0N1zL0XwNe0pslSmv6VNadXUptWO8QGN nYg3WF7iMYoOzpSxuHYNkl4WPwY8aMRmC8Ih0IGcKkoacZS6Hkfq9zcH1DRZmXS3N63GQL hOtMDzv5QWhBPB2ooRFJoQ6ttc1yHhcvuMGHef+bIInlR3QRtUe9NpALLIFx/8tzFobU0W SEkruxs9vo+0eoVn5/Qsr4XXpPUo9N1EETEO2K9BH7Z0IwA97ftf1jihFF5XYFqbZ6x8BY 4RJcfYCdoX+OTO7Q/NSo8UL+S5qFbIbh20vKxYyq1z+sCmOKuHtysOgJmcFn5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+EPmvFi4IpsOb6RAHuLrMR6G4kmNwY4WWXRRb5YoVo=; b=Ro7RpBoif1ZAXMvozrGCXIwhZRkSXfjB02tPU+iQEv5n74Qxdloo/tl7tml3f2DArJnv03 GAnelWGIjWfAN9xXuH4C2RoyfKNxoCZpyBqTzLmQ/yT/lf5ZP19Wk0+J5dUu3NLri8uAFx 190V2ZzwhxZok+BTtROr1LNi2AbjFTR0+Qh+TdBH19IPjdZLQ2l+H1ayVHnHw6KjyDIK9o VWbNmKtWHZPzxPQtwna93jbUt4zIGsdoeD1LOrvRLWUNzyhU3ta/Rve8Kwt7MJYYlr4kWQ v6Xf9lbRPi/41Y3H796WErmPUXJkwR8+W4XR+sRUt4VSjg+SIwvj9a8HbJuStQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992248; a=rsa-sha256; cv=none; b=hMgtWNve/GXM7oh+aBmOD0nuirwNCPimpUEDitmRzliiCAe1XYz7rjChnFcaUJb0TDQzZj E229zffdbooT7L9/h2g/mq0ClWz/EShSJSG2HC6nF+mTduQmjm4bDf0AiiA/e9knESD1Z/ PAU0HCPJJjdNMrswJReBmATapiiysBRywGw70zSklqOvfct/4QIUsmizrRxLEQKrfxEqzB hGgSgkkuayKOW9vKOxbS0iiRTxEDgvAQT26bWwvFjQlE18YB6qrIe2BFBJo3unR5Nsa19P ek05zda4fSoaHpqXhQxxw4GzmYRsqJP9PsZ5Zrot20aTVLat5Lb2k3PuEcFauA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHD1SpvzKVF; Tue, 23 Jan 2024 06:44: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 40N6i8gZ056895; Tue, 23 Jan 2024 06:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i83S056892; Tue, 23 Jan 2024 06:44:08 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:08 GMT Message-Id: <202401230644.40N6i83S056892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d0f5ac0a72b8 - stable/14 - devfs(5): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d0f5ac0a72b8055a4f6a3c5b014e408cbfdc46dc Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f5ac0a72b8055a4f6a3c5b014e408cbfdc46dc commit d0f5ac0a72b8055a4f6a3c5b014e408cbfdc46dc Author: Gordon Bergling AuthorDate: 2024-01-20 16:25:45 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:43:09 +0000 devfs(5): Fix a typo in a source code comment - s/interpeted/interpreted/ (cherry picked from commit 7cf293536ebacc92150be12e0be928500e670610) --- sys/fs/devfs/devfs_rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 66fc00dfcb39..37d24577792d 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -45,7 +45,7 @@ * * A note on "special" identifiers: Ruleset 0 is the NULL, or empty, * ruleset; it cannot be deleted or changed in any way. This may be - * assumed inside the code; e.g., a ruleset of 0 may be interpeted to + * assumed inside the code; e.g., a ruleset of 0 may be interpreted to * mean "no ruleset". The interpretation of rule 0 is * command-dependent, but in no case is there a real rule with number * 0. From nobody Tue Jan 23 06:44:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHF4dbgz57P8H; Tue, 23 Jan 2024 06: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 4TJyHF3Qndz4Ys0; Tue, 23 Jan 2024 06: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=1705992249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nkUrNYg6NGPzamJH28+QB8vhUM7dGctwNO4KQruumhU=; b=HXtL3ueEIHrZJwuM/xbogEEivgJJ2ZvXGO3a0uSYviv7eOte9Cc4Q3UgxVK5SBZ3HCHLcL QRPHetiheDmpfa4r4VxG5WQJ86IrvU1z4DuHwB7YtczjQNP1IGg7e3RYBpKil6aMJq7IDd jLCeOJ/MdJEOYQtxq9J+8W078sk+879h3fIQ5SRMlTQeonMmZQHqR++Wy60cl07zVyfA6c ppA7ZcrKwnOLFNwWy80N/hE5yQ22nOW1/TNw7/qPUQI6Ihd2g9hsZ7HP1gRkUXgnnxAqhM 2Mzt33qAxTNvs04ZR4w944STuiLOTAbQaM36kFrPDsbjTLdFidSBiSNSomFpBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nkUrNYg6NGPzamJH28+QB8vhUM7dGctwNO4KQruumhU=; b=moWUZCBMgxzfqcDrndi9MWjJS4fQzQq5R0xdeCmkS+XAdVSn6AOeXb/yyUtEIpL2aGoTpW e7lR5toT+ABladBFng5cGTx1B71Na+xij40Xn37NcdkoTskUdjckDWoTxNCHktf/LclOc9 japM1P1+BZ5c9vHlXulzfrBEhoJN7q9bjN2a7WRm1DbCxNcpNS2Vm+BQBKQDbfeySukTn4 KehoB4HhAlQZNp0jztPgRRQSomFOSHkMpjDq24a9dp8XmT7Z4WbshrzQHm58HTX4ICsrV8 G5+0TqD4TiNJLlKgvVfnqYa1QAMMNihoYuOhJCuVcLpvjuheP7pL9ItVHWjnOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992249; a=rsa-sha256; cv=none; b=FyqxpvPQzXPMjFfNrdZ2NqxjC3iGpvIbdxX/zcr7vf6hu1Injgs4t2br/em/e5bWZUYTT9 D5uoNKPumsEWgJvEU7fDoawhMjEk56fhFnRCZ3KhzQXkrc3r22jRh11ou7EjCR693mj/8o A9+JxRV+Ty5RBHHmjc96ut79iYSoGe+sYlZnT3+iZg00uF6g2PPpR8STxn8vCj78KjwRmF 5uQdqaJSJFjhGljcRPqb//inK2PudcMAhxhcYZJH18JxepelLCHymgSm5mc1qhEf4pzbvL 5YL2hwNJUKXnUYX+SpCo4rXg+1Wz9M2FkiC9S9G/4cntL3gOvdEW9ilF0hZHhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHF2WmSzKVG; Tue, 23 Jan 2024 06: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 40N6i9fO056948; Tue, 23 Jan 2024 06: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 40N6i9lm056945; Tue, 23 Jan 2024 06:44:09 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:09 GMT Message-Id: <202401230644.40N6i9lm056945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c75648dc9b84 - stable/14 - sigfastblock.2: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c75648dc9b84298271985b9f681135404d9a6a14 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c75648dc9b84298271985b9f681135404d9a6a14 commit c75648dc9b84298271985b9f681135404d9a6a14 Author: Gordon Bergling AuthorDate: 2024-01-20 18:54:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:43:27 +0000 sigfastblock.2: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit a70008e95b907336bddbcc2aa9d567df6e3a41b6) --- lib/libc/sys/sigfastblock.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/sigfastblock.2 b/lib/libc/sys/sigfastblock.2 index 84ce6cd15090..72897191c4bc 100644 --- a/lib/libc/sys/sigfastblock.2 +++ b/lib/libc/sys/sigfastblock.2 @@ -129,7 +129,7 @@ The variable address passed to is not aligned naturally. The .Dv SIGFASTBLOCK_UNSETPTR -operation was attempted without prior successfull call to +operation was attempted without prior successful call to .Dv SIGFASTBLOCK_SETPTR . .It Bq Er EFAULT Attempt to read or write to the sigblock variable failed. From nobody Tue Jan 23 06:44:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHG5dZdz57Nly; Tue, 23 Jan 2024 06:44: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 4TJyHG4VFQz4Z0S; Tue, 23 Jan 2024 06:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRCAWJETIsmyadSvltPEoKfG/aUgppCit8sD7Kt0O4Q=; b=JhupGb6+WHJgVm+P6WkYWBr7LCrWNCRFTnsWqgdY7vIgUcfuHK4sKzBSK76JT38n9+4yzT w1L6rijZ06WxeW5Zhk+Vm9iIcNOk4PpoQZKnyb/nd+I0ptzLKgUlMzR7m3tl/dd1VwxW6j 3GfkCZtcBu5SdT2Bdxal3+ezSyv3U0PXaprMuvdqF61xtDu/OU8uU5avaJQFrA5hqV+kAx yMLMAVyMGW4BmG1WcVtyOsAjFZk9lx7LpF0nmsHokrramr15kKVfs7VK0IJOrB4tfblSw5 qIPcAa3po1eo258veRM74fcQM9S4F+dRpbMYIIjBYjoPJKmiv76PjhCUKooQIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRCAWJETIsmyadSvltPEoKfG/aUgppCit8sD7Kt0O4Q=; b=BUTYgOe1zzZkbp19NOdEXW0Vq8K/Xzy+vxJWXU97BEHFZmtAspoRj8wbJDMq5RB8VY7o+o qnmUJ1K4vwKKNgdXmUhErZA27LCy/RTkl633UNsGxp4fXlHfTgtIrlEab3IJjbp289BnAC qKrJ3yCIPIt9Nf7sfo9bLZ6m0nmrv1le334ZNebtOynmSGhjRiYd1y2w+A3DSh7prR3CIa ta5mmYFMe08P/9vb2iUYU67C3BXiKJRhOudqKWVEuElC7lzZJphHdBK7EsCY0+ECryh5E0 DaRLevg++aXWd5GdRjpENKVQi2VqfU8xPvcQESazzQU2gpY3lN5QxPX8QThbdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992250; a=rsa-sha256; cv=none; b=JZY7HLAQ30s6K2zaiM2gxpOv+K3cFX6Ge9mERynUlXlNiCqVSPXgmcjiz0M3/1kEI9fqoa Af112LK2kRRbA+dibStREtdi0ol+tLRNRT5iWkadjxGaWWSKL5IVZOtqVhPOXfb0Y8ZKIv G5oKaCBwNwzAqCaaJIJezVeuBfjXos0TJawf5Hu3DZXk1YY0KiimQwpOEMM6hNS+sz62wl nGvmh+fu/3Q8Z9hv90onAYI7NgTEt5whi8NJe2+i7z+seZHFerxIYpGbeg5ZKKzByvCw5l hX55DUKdBe+xsYcRzlOhTZxw0czGJMd4ZCDG+r7FgKSFOpozUBbBdscWgwe0EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHG3bKpzKBF; Tue, 23 Jan 2024 06:44: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 40N6iAho056999; Tue, 23 Jan 2024 06:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6iA8G056996; Tue, 23 Jan 2024 06:44:10 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:10 GMT Message-Id: <202401230644.40N6iA8G056996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7c44565e23a8 - stable/14 - pkru.3: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c44565e23a8315cc8be0218b4f7d632411cf688 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7c44565e23a8315cc8be0218b4f7d632411cf688 commit 7c44565e23a8315cc8be0218b4f7d632411cf688 Author: Gordon Bergling AuthorDate: 2024-01-20 18:55:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:43:42 +0000 pkru.3: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit 8593b5b2addf91987f81ebac0d8b2e51207e4793) --- lib/libc/x86/sys/pkru.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3 index 1785f93cf4b6..2bcb6a64baaa 100644 --- a/lib/libc/x86/sys/pkru.3 +++ b/lib/libc/x86/sys/pkru.3 @@ -106,7 +106,7 @@ and having length .Fa len . Starting address is truncated to the page start, and the end is rounded up to the end of the page. -After a successfull call, the range has the specified key assigned, +After a successful call, the range has the specified key assigned, even if the key is zero and it did not change the page table entries. .Pp The From nobody Tue Jan 23 06:48:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMk0xC0z57PXM; Tue, 23 Jan 2024 06:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJyMk0MPzz4ctG; Tue, 23 Jan 2024 06:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpEf3wtwTPBKMZ17c/7a+LcFaQzomEjDeZ//Tk8ByB8=; b=Lb5XM78zfXOCYGOCQZbTc+8TaMLGoClcb1uq4uuPPmwqG2HsauRn6YF+cTr5K7svfmcntf q2F2N0Hqax3T5CkGvOGsZdG/uToYK/Qj3KQ1bx8iHYzxhKcML1/5sdMtprcAPnE2me0t1M xLRK9b8K02q/jg7xUrBgesUY/KOESGDs4+L/pnpqHrERQfLAIy6OtK2wIdovVAyECcZvbx rL3eEwg63CLtba+6w6zlmjflLU4GKVNqDfTLWsQhicLtkpoc2NAufNS9cRh0NQzkAFXeuD JV2xQt9twcUNpfFuQCOCGjBwzbMQ5LloGOw2OB7WRB9nuT57kdeHC4BxTtceXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpEf3wtwTPBKMZ17c/7a+LcFaQzomEjDeZ//Tk8ByB8=; b=dlhb5U+Ya/wvLT0H8pZeVLnBJ7uABetWzVP3SluDC4rjNz9QWnN13noPk6MhRoadrSZw04 m44PRWnxEd0TXQNCbyTBLILc+4h/pECIEgZkyUqDrm2vPnmayf4zJJlYDpofaUeGjpXO4Z IrTRnVftrQGM8Px3Er1t043lVlqsnES/h3cFn1T1ol0yFve6BmhHcWnXr5U0q98surQrm7 36IS5lOsLS3u0B+sjBRaXt0PRrJclc5QcSY2wnmCkKNOv6BmgIQMgGL6gZDVa2/kKDFyvG /Z8EwQacCTso2yMFfKvB33wZTlMZ3eqKVGxl/HGX8otgU13aTuw7ph36jEodfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992482; a=rsa-sha256; cv=none; b=tmKX1yRFvXmuV9VC/Q1xyl0th6El94Wbp/X9EcNSsuqMBPRtBhcV2dHoI9T3ei4WF6eNuH Fmiq4F5vDIyDJ3xwSRFSha2WxymlFkLCHOxq8s54u3EO829/N8oa0+iy6uC22VILvhY5tI YNqzXKjyb4426guNaUuxkIlvYM/AwDBi0CIsUfLnPpaW2WYINkc7+hlKj3Gs9bS3CvEiCj hzFpDaGpth7lm/7spn+OjLi5awg9yt3mgTzirCub3EyciU6PnG8Dfw2q8iY1g85/IKKiZ1 XWeMXIvq4KeTtGjYNekcb0Y4+k0CMY7pf54TH+/WxqWJw1EjdwhPwnREs1lfsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMj6XrbzKYh; Tue, 23 Jan 2024 06: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 40N6m1vf057746; Tue, 23 Jan 2024 06: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 40N6m1lh057743; Tue, 23 Jan 2024 06:48:01 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:01 GMT Message-Id: <202401230648.40N6m1lh057743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ae6531f52f83 - stable/13 - pkru.3: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ae6531f52f8387bbcfa8014298db3472bc5348a9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ae6531f52f8387bbcfa8014298db3472bc5348a9 commit ae6531f52f8387bbcfa8014298db3472bc5348a9 Author: Gordon Bergling AuthorDate: 2024-01-20 18:55:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:45:32 +0000 pkru.3: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit 8593b5b2addf91987f81ebac0d8b2e51207e4793) --- lib/libc/x86/sys/pkru.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3 index 1785f93cf4b6..2bcb6a64baaa 100644 --- a/lib/libc/x86/sys/pkru.3 +++ b/lib/libc/x86/sys/pkru.3 @@ -106,7 +106,7 @@ and having length .Fa len . Starting address is truncated to the page start, and the end is rounded up to the end of the page. -After a successfull call, the range has the specified key assigned, +After a successful call, the range has the specified key assigned, even if the key is zero and it did not change the page table entries. .Pp The From nobody Tue Jan 23 06:48:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMl1rjtz57PRs; Tue, 23 Jan 2024 06: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 4TJyMl1KHhz4cng; Tue, 23 Jan 2024 06: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=1705992483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5AyWZV7yLNXHH9SQL2IG+3MGzFZ5+e8drhfsaCXcZSg=; b=naKprgCOdCSd77YJ7SV6N0TStMLwdsezG9nvUAds125pGXkcGxHUDS82VoX+geV82/Jauf lYil89aoRr4fP9EpXSZ8j9FQWH5fgKe/CpyoG9EHJMc7+YOWHlJsgnvq5uojipuQNEb1oG f10+qIemBwv+2TU3Y4v4jcnGs7L9olIQ+Wqbnag9XGqIMh6BApySpJldKBgoCRbzoq/y9k EfHyOb4HortSNS5G5wTdYl9/jXBb/Yahss8tiRFz3t8Cp7t/eCp/cUdBpoX1g159yHZpYb Kl586kmLuoU1HELgcJ1Umhw0WrOymVLwPqiSdisfpZz0ewcailsk2sNEoCmxjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5AyWZV7yLNXHH9SQL2IG+3MGzFZ5+e8drhfsaCXcZSg=; b=BlBaUrkHpbOOPuipmicJXB+iX6FIVD9nt6YDSEXxLWHNpambt/HIkqqrDkKZ2Q8FvkYP60 In79WZnYfOVNB2mbcu9w7sSCW8EMvsuszrbrn3gFKdhCyr6gOBQStTCtuic2vkd0f2RSLK HKSbG09+0GFiNBb6a8G94hSkST5YzKQfp6Nvq/RCmD2ltFtHn+gqIzqFx3COR1RTpLhTdh FXQW51Pnzhgto6GoZLLM3KXNw2enRRVszG0LBPKKOHksuK9/7zesN7uOeAFu2icau16eLM BiI7J5m9U2QyWK0BOU2PAm2b04azT3KgHIm2+vc3nSurbZy1PLmcToE/I9BrCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992483; a=rsa-sha256; cv=none; b=hhzBtvDIrMPMEPthAN1ZHGhM39Y/L72mAv9N4bBe4xGOGeLfUy5XjonHODRVGe8EYea/Fw rjqlUAO726olvYyVukXJQ0Tpt45U9h7dc84ODy/wtdI7U3V7q7u32G3kwSUJHSc6y3w7WT WC63IaDnzi2B2OjH7PWD568dzc9WytBVk8N2LD7L3J+yy1gYbFhTysGe7M6kuTpI2bfyKP plo4cMPWXR0Dz21abknljNZ9pQ1BRajHglAtAkj9Tkm8KIHyuXChNjfRdEwwa1d0JYH6e9 GcSuod/KvuW9+TAqhHEeO49KHs0A4Q2iPfoUde78+NymL5DUbKXbWK+mlDZ/Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMl0PjNzKYj; Tue, 23 Jan 2024 06:48: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 40N6m2gL057797; Tue, 23 Jan 2024 06: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 40N6m2LZ057794; Tue, 23 Jan 2024 06:48:02 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:02 GMT Message-Id: <202401230648.40N6m2LZ057794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4bd2aee6120e - stable/13 - sigfastblock.2: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4bd2aee6120edb8979bb57211a06f06406ad6407 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd2aee6120edb8979bb57211a06f06406ad6407 commit 4bd2aee6120edb8979bb57211a06f06406ad6407 Author: Gordon Bergling AuthorDate: 2024-01-20 18:54:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:45:41 +0000 sigfastblock.2: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit a70008e95b907336bddbcc2aa9d567df6e3a41b6) --- lib/libc/sys/sigfastblock.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/sigfastblock.2 b/lib/libc/sys/sigfastblock.2 index 84ce6cd15090..72897191c4bc 100644 --- a/lib/libc/sys/sigfastblock.2 +++ b/lib/libc/sys/sigfastblock.2 @@ -129,7 +129,7 @@ The variable address passed to is not aligned naturally. The .Dv SIGFASTBLOCK_UNSETPTR -operation was attempted without prior successfull call to +operation was attempted without prior successful call to .Dv SIGFASTBLOCK_SETPTR . .It Bq Er EFAULT Attempt to read or write to the sigblock variable failed. From nobody Tue Jan 23 06:48:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMm3ZRLz57PK5; Tue, 23 Jan 2024 06: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 4TJyMm27g8z4crK; Tue, 23 Jan 2024 06: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=1705992484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/jnsu2kvdLkrlOVlbSP+ztxk0MiJz4f/jW73bBTjJG4=; b=GdDf4cTDzGq8zmhFL3ZTz64KUm+P+URekhZW15vcRwM4S/6ms/RinQQA4sfWerpJLQYadY H6317Zy7y/EVd722SvsMBiJ9PkTs53PA2kdb62QGkBgTyzcNZWpsKkTzbGzGy0SRJxyz+/ PniSCEyhjDJ4Ahme2umrIjd5emoNCfIBtbyTpz4AwWgoZR4L8iSQD/Qp+Vq8kvNLKX6MFZ Iqjl58XQd9H3AbRb2Jl6b8xuws2ZI4s1NKAs3+kqvJEg79yqKYcQsNWw1W/0wY6lN2Qwqt hWvAeK6N/o/p09O1K2ci15+wpgkddNceM1CYYTneGr8VLrYAP41cKuKRPPtJWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/jnsu2kvdLkrlOVlbSP+ztxk0MiJz4f/jW73bBTjJG4=; b=EzfYcWcrm7XmV3eOZDTSMecRStYJ0kr8dTULZ1aQ/uTvFgKcPqYUVNpRdBtqfz5e9T8MIX uFy86HBqZDsAKLKkKtH+8sxvJSvabPtJyssFh0pf7rTaD84wznJNR33FCHJmpcdFI8mKsT MkrWRc0skVfjDkCL3HjgVbRvHPmModa1RX4vdEoA9dKKfideX2pDad+bC+KQg4eCi3jqIb bXUSLp24VpKb5B5C4a8o7JxVrE5T3XxC5O4FlGcTSJVSqWi/RqkClQedVCQM6YdVQyiO9z JgaEkz/8MP6DKZXHje2Ney8uxcpedK1KpGPY7Sw0U3HhrPy+QTfIXnArgQd+/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992484; a=rsa-sha256; cv=none; b=QND8gmDaVr3aSYgTltQrEUiCIqpoQdNLdGjCVLOGvamvK79KMJhcTk3XdY4HLw0G/5+Ipz MyeqgSLGuPltOZRyaABFOXFjDs5PxVMHYscUFyyP7H/FjTGy1uo6Tx76UX8i3TJd7yPeO6 fdl3FVtMxHYOklro2xdvNCJKZQXYiboeSZn8glbmqg59UvYE9ZmvR91U4vpvY5rm5RLh5x I3vY4A8EFQ794WmDJguqYoz+gdQJipPcy7HXNpn/pZueYYrH6ByKsZUjaIK8fV/a7CYAvd /akBOBL0DtaMkwIq//HdzoIFIOM4wh8Jtmut8nkAxReCE8EqKt8zUJhzJRy8HA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMm1BfPzKVK; Tue, 23 Jan 2024 06: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 40N6m4kX057855; Tue, 23 Jan 2024 06:48:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m4WS057852; Tue, 23 Jan 2024 06:48:04 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:04 GMT Message-Id: <202401230648.40N6m4WS057852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a17275e29f89 - stable/13 - devfs(5): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a17275e29f89d2ceb197787095eb93042631a55b Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a17275e29f89d2ceb197787095eb93042631a55b commit a17275e29f89d2ceb197787095eb93042631a55b Author: Gordon Bergling AuthorDate: 2024-01-20 16:25:45 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:45:52 +0000 devfs(5): Fix a typo in a source code comment - s/interpeted/interpreted/ (cherry picked from commit 7cf293536ebacc92150be12e0be928500e670610) --- sys/fs/devfs/devfs_rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 66fc00dfcb39..37d24577792d 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -45,7 +45,7 @@ * * A note on "special" identifiers: Ruleset 0 is the NULL, or empty, * ruleset; it cannot be deleted or changed in any way. This may be - * assumed inside the code; e.g., a ruleset of 0 may be interpeted to + * assumed inside the code; e.g., a ruleset of 0 may be interpreted to * mean "no ruleset". The interpretation of rule 0 is * command-dependent, but in no case is there a real rule with number * 0. From nobody Tue Jan 23 06:48:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMn57qBz57PPL; Tue, 23 Jan 2024 06: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 4TJyMn3Nmdz4cx5; Tue, 23 Jan 2024 06: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=1705992485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t46spG/HyJLOm/3GsIaapEPE0xqNCtQ1ABgytSbQvzg=; b=m9qzxaON7u/PED6I4iWLyYARKtfGhMI06LfJ99Yw/JheCt6ysR8wF7uWNp5x/IPAx06gEn 59zBNqrgI6M1nbTxz/rHtz3hVs+YsztBl3gZbOX89xS+1xUeXLODhUJObPQLI/0hZNdNYT VMC8edFzLCZJCJA+tNfkn0S5wut7vgYS4Qi/BuSQMRmwg4kOWFnZPibD0WFUGO1w4P82m2 AX9g1xrTcEhYaT10K8ZjzGxUvdaGBl7qNyEaf7WcmyXSNtAHB6l/oovfx6Dag2ewOYsQ2g F+Y9rxeMG0cin7eT2XJw0KRd64Eca4gmwbAsduVUC5jwAhvqKT/jtUe0h0n7Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t46spG/HyJLOm/3GsIaapEPE0xqNCtQ1ABgytSbQvzg=; b=b/WXTEmjB00owM7yK7IJ9iO71mpyDqXk8zLyYxWrf3jPW/HuR10lUEfPbcEq6OjPweK+RM s5DsN+mTS93YVUUuPxeoIQp+tCDVKPBmeQ+P5yuAWN9Eq0gQBJdv3L1Q/0PZDcDJ3wZcav G9ca1AstGEAuauNjY8AS+0//9XB9Ou57DFrnLyto54w61FGpFneRuTe5QJ144S7Bm6ZpLc 68e3l8ttXGXKOUI9A4Q7ZPQECVxa6IqicsY2PzG2v1oR/wcvZYtqGsrDKB3ckFPUkTg+aj 27oTByXGL/3R+s4nKSDL6RfrrYLmqrulUo0giUg/uciARJvokeylgVsAayl7xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992485; a=rsa-sha256; cv=none; b=W999c3/zz8mMO3DM3jeS/CnmmvjvNUkDn2dc/QPB1GcJt7m+9iD+YLqEh/rF1gJPUGFSlM p1Z3WqDRVhvjSBFVpEbxP6uS6VZXNH5xRvU2y0eMSavQmMYlGUHrDECrI+Iv6n0NT/1IcO q5idgurCi69nwVu6ccFdMsRP0jbKSp4LaWl+ZHUgrZ4unQd2BJ3PGURDlStTRmw2zlokhA PvjQz0Iuw83HI/4aZiwluXcb5zZ5jsXH4ihiTLgAbSlIuPOCQTozvuVLK8hXeVkqTZniWc zzFDHQ9lNANJK1n2yOfXA8rL9TF48xGIiBBUKhRzX2n5nJrwb5jOp7ggrWjvKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMn2T1LzKFQ; Tue, 23 Jan 2024 06: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 40N6m59M057910; Tue, 23 Jan 2024 06: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 40N6m50h057907; Tue, 23 Jan 2024 06:48:05 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:05 GMT Message-Id: <202401230648.40N6m50h057907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d04d50c839d1 - stable/13 - PCI_IOV_INIT.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d04d50c839d1944bacfecca536d908adb05b916e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d04d50c839d1944bacfecca536d908adb05b916e commit d04d50c839d1944bacfecca536d908adb05b916e Author: Gordon Bergling AuthorDate: 2024-01-20 19:20:32 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:03 +0000 PCI_IOV_INIT.9: Fix a typo in the manual page - s/infrastucture/infrastructure/ (cherry picked from commit bce295fcbe533d46d2f600168403c7968599b86b) --- share/man/man9/PCI_IOV_INIT.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/PCI_IOV_INIT.9 b/share/man/man9/PCI_IOV_INIT.9 index 3e71a65e4132..66b1e693cedb 100644 --- a/share/man/man9/PCI_IOV_INIT.9 +++ b/share/man/man9/PCI_IOV_INIT.9 @@ -40,7 +40,7 @@ The .Fn PCI_IOV_INIT method is called by the PCI Single-Root I/O Virtualization (SR-IOV) -infrastucture when the user requests that SR-IOV be enabled on a Physical +infrastructure when the user requests that SR-IOV be enabled on a Physical Function (PF). The number of Virtual Functions (VFs) that will be created is passed to this method in the From nobody Tue Jan 23 06:48:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMp6DJJz57PHJ; Tue, 23 Jan 2024 06:48: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 4TJyMp49tHz4d2n; Tue, 23 Jan 2024 06:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltfwmXbaN/cCCa9vJtLwHe+D649haiues2wIXsy341g=; b=cVaTe2sAxCDtsM5AA83WHd/kNg9yAHmMiSTuoaFqVAapwupltdOpNunHkzE2hI9LpaEg6x zhyNhz0Ryk5hT+dfyF5ZBUyFzryO2v9/BCZiG+moAuyca1IpwjRyyAIVSzn3m9BX5i4hmH zJJ9gzj1hxQb7zldt4THNvvU1+3Bax4S7MxQ0iA2AX1PnJgl5/Ve7ZT3t9gcuSppYYyDH0 Zbu8i9x6GC/XQRPZLKjVDrCp5nQz5yTC5/yXoCYCpcaBu7TWTFMp49CyOxsnOfr5gQaCeT eagMPN3Guv0LGMDYNIxxElDJEQpZ4F3o4U+AOM2rEHXVdfRe99Pr8H94Z2Y01g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltfwmXbaN/cCCa9vJtLwHe+D649haiues2wIXsy341g=; b=DCy/1UzgCGxMP0FiF1ZF4SXd2Fv7kc0VWv+nhcBqJiiCzv9hCu4TM27Un2mMsAuPNQvCVU /6+MrM2WrwZZu5l/+rvdFfozvySgqk7570Cj6YKW0hpjUjP/P5pucq4UxZbqiHxQJ64zeR HgzZO3oJUr9Tw8OEJSe3foZYSknxMeCm6gXQbKGP/WcIDdotXOj0o2+l/y/c5Qcex2heqM eJfob3fKMIZuG1VFfscugo8xlrc3GEmukgKBxWBZimaHDsoVqYilatWpwGge36nYX6p78S mV7PxiE7zAoITwVUCqCPqQiin+QcyZCMFwPngUfH23nYDXqnWfbEP3yek32dFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992486; a=rsa-sha256; cv=none; b=V5KKninyYs9f5Le6OHn0A/MyJplZ/4IjGxUVNpyb++Rui4ZHww9l4YBMxs0fwEBGKf+GLr hBm9c5bbLaJkPZHzAEYiCze6nhQUkgDSzHmYOfw7ExRYc+SwfZ4hLQuxciTLMDKPivqR8g pUMueyxCU/r/aHIRwQK7zL8numMdqzAIGKra5EdPBVPueN3aGDtvTdC8mXVhX6Rdzig1uF GFivSgtmSg3UmMQqFOHgYIcX9pjmcBW3p+A+k9jber1uc9ehJg0L/XmQSdZK3BB1LlU0WM Yn+58W8rzsRyjz6DOOkxEVah13kqQYFj84NagKtBE44NL2i2+rbJWkYC2Fb8bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMp30rCzKFR; Tue, 23 Jan 2024 06:48: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 40N6m6fC057972; Tue, 23 Jan 2024 06:48:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m6VP057969; Tue, 23 Jan 2024 06:48:06 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:06 GMT Message-Id: <202401230648.40N6m6VP057969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 95847cc26f79 - stable/13 - tcp_hpts: Fix a typo of a function name in a comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 95847cc26f798beff413024e7daaab03f7eaacf9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=95847cc26f798beff413024e7daaab03f7eaacf9 commit 95847cc26f798beff413024e7daaab03f7eaacf9 Author: Gordon Bergling AuthorDate: 2024-01-20 16:29:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:14 +0000 tcp_hpts: Fix a typo of a function name in a comment - s/tcp_ouput/tcp_output/ (cherry picked from commit ef0ac0a1ad6750291b881203030384b7f7241efb) --- sys/netinet/tcp_hpts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 5e59697b2bd7..18576e181b6f 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -48,7 +48,7 @@ * * tcp_hpts_insert(tp, HPTS_USEC_TO_SLOTS(550)); * - * The above would schedule tcp_ouput() to be called in 550 useconds. + * The above would schedule tcp_output() to be called in 550 useconds. * Note that if using this mechanism the stack will want to add near * its top a check to prevent unwanted calls (from user land or the * arrival of incoming ack's). So it would add something like: From nobody Tue Jan 23 06:48:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMr1149z57PPR; Tue, 23 Jan 2024 06:48: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 4TJyMq5C4Lz4cxX; Tue, 23 Jan 2024 06:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euMuVYzfh9b4g11GZEcq+X1dG2ElATwzpN1R6v+ZCoU=; b=Y8pruSOcQoqt++yrOHFtr5qq3VmbnLMwTW1ZtTqq9n4qVqF+gbEUV2zwR8CCexdqHKLBkW CTo2219gygxv8KEGDp3kcjTXVRRMWhenFjfvHfbL48Iig3c9Wl567oANts8IVcZx9ZqKb6 b46nXXdI6FVsTsW1qf5CryjJ9vCn0dOT9nmfRAbQMjpXONgH2C7pSh7VLCTr8edOHBoK6I XYaCdqzsdjhn/Xm/xzJqESwyHRr0Aiu+35j2VLZzOq6kQVG7gphVKU9lC3hD/yWIOMHxZQ YxDijf5tHKWKD3yJ/Gl8xJarJvM0Ln8LD0Uk+3vwLbKjSkW+rh814x/J660r3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euMuVYzfh9b4g11GZEcq+X1dG2ElATwzpN1R6v+ZCoU=; b=n1ehl1MULRp1Zs99CCwJTzutKLCnuIP109xPVYEH8hw6k60AHFyGeNt4EY/ACLHwGbW/Cy 74vOCxd7XCxtHcEu2DgAG7q+ZSDYBhuygjL7qstKStKp6rYap3FOcD4qQKHbkS3wYaXcZy H3SVjEY98nmElAbfGlEP1kAxEPB9MM5R44QOUBMVdq6Kajk+joWp8Ye/SyEenM97RjFXgh 2nMgwRcJynset6xipEamOPiOi9nqihyEqJ6yHvCoDhqyuiz9ab51D5TfN4mOLWz1nCyGs1 T13dTRg/DxK23Bb84KHvoP2+4VLCL22T2exyoXQxNRXAM9kjG5zn89YbYO+Izg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992487; a=rsa-sha256; cv=none; b=vtSXqYzTwhmXYsU4ruLcFpgsPuh74z6nR6Hv6ZXILhuGHLdRB0kzXpy6FC3k6fCIYvBHz+ 9Ns8guysTMXPfUefJ9YKECO9ShjurVrYJRG26jqVWlyZCP30b0LaovS8w+XOIHSEX+doE1 J9RZJlpWtfrkF2J24ZkAuVpxiQvpoIhsKl7f13tjQBfB2Pbpc2Oi6k2eAdlZT2K6If/a23 qFMJNAQSKhIzQwvTwSGFlunNx9NrmD4vm5o98gB7pVFn1XsrPxiskI6glyNjWpRkXVgqJ/ PGZTiQa6jwfzVHbIFNY8e4u730cKAzNuNPuGpvxJ1ybldSW1xNVWXr9NZdTSGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMq4HzvzKYk; Tue, 23 Jan 2024 06:48: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 40N6m75f058026; Tue, 23 Jan 2024 06:48:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m7xF058023; Tue, 23 Jan 2024 06:48:07 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:07 GMT Message-Id: <202401230648.40N6m7xF058023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fd4ad6cd272f - stable/13 - ciss(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: fd4ad6cd272f851b9575d0e5419591e3bcf8e79e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fd4ad6cd272f851b9575d0e5419591e3bcf8e79e commit fd4ad6cd272f851b9575d0e5419591e3bcf8e79e Author: Gordon Bergling AuthorDate: 2024-01-20 16:34:25 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:31 +0000 ciss(4): Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit ced92d000a9435745ca2891734e6e37ab1c5e873) --- sys/dev/ciss/cissreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h index b9dc10fbf478..5fc06410eee8 100644 --- a/sys/dev/ciss/cissreg.h +++ b/sys/dev/ciss/cissreg.h @@ -691,7 +691,7 @@ struct ciss_bmic_id_table { /* * Below here I have no documentation on the rest of this data structure. It is * inferred from the opensource cciss_vol_status application. I assume that this - * data strucutre is 512 bytes in total size, do not exceed it. + * data structure is 512 bytes in total size, do not exceed it. */ u_int8_t bDdffVersion[4]; /* DDFF update engine version */ u_int16_t usMaxLogicalUnits; /* Maximum logical units supported */ From nobody Tue Jan 23 06:48:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMs0pyrz57PLw; Tue, 23 Jan 2024 06:48: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 4TJyMr6GcCz4ck7; Tue, 23 Jan 2024 06:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6otujZ72+WFLISqfzVZLLM5C8SWKVZIQTh9ErXF0qE=; b=Fkwp4NOcgBF3v7T212/V4B/1/YaYHBGnErDagF16/GzlQxJNwWKYP7H9sG0B1BF5sjiiYA KabXGNyxu8Hnr7WgzCP7HssjI4cBrS5eZTd6K9qVoXTPlvsyzlUVdewkEzTc+Xvu/IJvN7 3onJ8Bb07QiMGJR1C5Xp/Vc70nmIij4foRMQ+wbBwqwxap+CY/3zIMcqbuvYd4b/puwNlb 9Wfc5O8Y+Wrz90umkJYc8LFSNv+iprrbrRuBneHAedXXrtNV2LGmIY2HtGBhAtLuXMre8v FpHC4tVdlFpj8rRnGaBB2Y1CnND7YUh2yITl4S3dG1fl0YgSwM5+6uYimLzZXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6otujZ72+WFLISqfzVZLLM5C8SWKVZIQTh9ErXF0qE=; b=sPjtvja7/Y+djTId7pdT0CguKxUfavl08kiTaTnynremWeZKtT7VPkFNiPxKjt34hpUSMA LQqM66BdhoInP10oOy1Pwscvay4tuX444bOI3Kpz+nGf/T65ImNOwWBMTcsrNXpsGzlzea VSaknkiQ/ZokBhORtx99ccInJQA4QCdXxqFJ07gmvwjJQ7IRH6NDxg6jkhr/ZrJa5EAJCt COXc1hruPwsUbe3U1hEnF/VXvprbIWfoAyV9Jj75nWvWhih5hpiFUnHfN8BlpOq0ZgL7c3 asXj6Gxfqx+0wEI+mgKUJd07f6POhBmUUo3DdurMLiBT+d7Gipr1HFr+n1MfjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992488; a=rsa-sha256; cv=none; b=McbJXye75NcJJELjx4yhN0AJeUtYK8QF3AUqZ+crih4Qn5Ren71PO0FOsx7cNl1oXSHW/5 +E4A8X+N0jV3GdwYpnFIQU8po+X9Tuq/PBn31LLYe134YIBCUNYfr/xty67oa7tZDDwZeE y2eOVEkhYfYTVYtTnizSbvo8OGgE8SNcIdCfcgYNX03Yx49UPFD1WGAfjEOFZNlpDY0AEi jXG9pXllTfcV9pt8Q/Bhd0L1+K+ISlyosuBHLh0/wDeKnStm+ksayS6MgPRe4VCpRBB6MI IA9pX6Lvl55ycWzWnegfbcQxIYYTAa6JEO2wBpcoR/EjAjweLHVI15ox1Or0RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMr5MmGzKWJ; Tue, 23 Jan 2024 06:48: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 40N6m8Jo058077; Tue, 23 Jan 2024 06:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m8O4058074; Tue, 23 Jan 2024 06:48:08 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:08 GMT Message-Id: <202401230648.40N6m8O4058074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d4c871243f06 - stable/13 - usb: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d4c871243f0616d94fbbc6e174f89638367de832 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d4c871243f0616d94fbbc6e174f89638367de832 commit d4c871243f0616d94fbbc6e174f89638367de832 Author: Gordon Bergling AuthorDate: 2024-01-20 16:32:20 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:42 +0000 usb: Fix two typos in source code comments - s/bascially/basically/ - s/assistence/assistance/ (cherry picked from commit f5e3329a5a480aa1b2904106b2fdfd999439455b) --- sys/dev/usb/misc/udbp.h | 2 +- sys/dev/usb/serial/uftdi_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/misc/udbp.h b/sys/dev/usb/misc/udbp.h index eb2c27d5f9ef..a12cc739ef80 100644 --- a/sys/dev/usb/misc/udbp.h +++ b/sys/dev/usb/misc/udbp.h @@ -63,7 +63,7 @@ struct ngudbpstat { /* * This is used to define the 'parse type' for a struct ngudbpstat, which - * is bascially a description of how to convert a binary struct ngudbpstat + * is basically a description of how to convert a binary struct ngudbpstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/dev/usb/serial/uftdi_reg.h b/sys/dev/usb/serial/uftdi_reg.h index 80936f80b6fa..19794413cf2f 100644 --- a/sys/dev/usb/serial/uftdi_reg.h +++ b/sys/dev/usb/serial/uftdi_reg.h @@ -8,7 +8,7 @@ * USB on the other. * * Thanx to FTDI (http://www.ftdi.co.uk) for so kindly providing details - * of the protocol required to talk to the device and ongoing assistence + * of the protocol required to talk to the device and ongoing assistance * during development. * * Bill Ryder - bryder@sgi.com of Silicon Graphics, Inc. is the original From nobody Tue Jan 23 06:48:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMt27pNz57PPX; Tue, 23 Jan 2024 06:48: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 4TJyMs6snVz4cvm; Tue, 23 Jan 2024 06:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3bEXF7j4jgePIkQ2uvNHcuNQiHjJ6Oh1tKzMZ73UiWY=; b=JiR/nmtGPOa4PUFi2G1ysAKi9GZbJ+F92MiYD3mGTMBi5V7meILAx1eWOwn7Fd6DoAu8Jv +YW3Gi0YX/QMszsRMHsWnjTrK3OGzRQyhRncPAzMcgdDrWN9r4EyXA872s436qeKGY3eVr UyxM4+imWZxJrnzExKKdxdKpiGGxSABHPmRlQO9In5C+VM9mNLWByOR6mE3yCQQzrJCTHD 5oSCeHN8ohmuuje1ngAU2MdRag6dNPrtwSNTv+75FDuACScVd7wwYoRgV/LAHJv7yMwuh/ z5ZwQCnmdtH2gEkV4ffPz/asukOAoz2wjzjKXNHp7F6ilUXbFbLxuQ6gJFaBZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3bEXF7j4jgePIkQ2uvNHcuNQiHjJ6Oh1tKzMZ73UiWY=; b=tZkbJDuKDhyxL+RS2TFVGLh9J4f2ZYOVA9NAAMgACa1don5S5U2FGl+weSRCs6DDs3cWUH 4KBSNI8FA1DlHfp1Zn1EK4GKVimfyifDW22y8H9+bNYivaYJ794qIKLXVFVvHfNBb6dJSd /E/JbJXEXc21Jre5eDmYgAIJA3MLekqJA5TjyE0j5yFV2rom4tWcUMRHthupNWSDrFpien Qn1ZYUjjVGh5i4YYgoDp5wLWERgi363QvEAnU5pwdnElG1j3CaXpDbaWvPUUWoJ3KibJ73 lzXFy5QnvOVc7JByUQaS8OnEamDrntzoVyhJaT/Q2odU5nvwJ9l2xDJ9Zstvgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992490; a=rsa-sha256; cv=none; b=Af2rnDJotKhPbTunMVfRd0HbJZX/l2a2h1hoJDgP/NdKSbo0o6K2sM06rg/OSNBDsIY3T5 sEraHHA4woos/XKuQPzHD2QK+darxZkzKuEameg5jTPqf5eDXfluq/lzRuLens6gb8TQ2z qTPa1CyAaIJIXqh6tdXnIDKwg9sXrZrNreHS8XY2z5fOaqUAL67TqvkeScnnIgvDwevkYM dsU2InTjXaXbS9UkV83VtJgWFfmj2hERHbYfHmjybHQxXF3KfhX44MXqHsdPY4Jyel4+Rj WKXXBuG9LCcGPLQchkYRnXQfTeIynxIFR/2o3SZpXtgks8MTMMiqukbOHQP44w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMs5zcTzKBJ; Tue, 23 Jan 2024 06:48: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 40N6m9VZ058132; Tue, 23 Jan 2024 06:48:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m958058128; Tue, 23 Jan 2024 06:48:09 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:09 GMT Message-Id: <202401230648.40N6m958058128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 16f66b464e3b - stable/13 - vmware: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 16f66b464e3b4bf78954f674f4147d39cccbd596 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=16f66b464e3b4bf78954f674f4147d39cccbd596 commit 16f66b464e3b4bf78954f674f4147d39cccbd596 Author: Gordon Bergling AuthorDate: 2024-01-20 16:33:27 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:55 +0000 vmware: Fix a typo in a source code comment - s/withing/within/ (cherry picked from commit 623848af604116aa33bc8a66d2ac45b4cbaccfd8) --- sys/dev/vmware/vmci/vmci_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vmware/vmci/vmci_defs.h b/sys/dev/vmware/vmci/vmci_defs.h index cfa302ad11aa..466712c41cee 100644 --- a/sys/dev/vmware/vmci/vmci_defs.h +++ b/sys/dev/vmware/vmci/vmci_defs.h @@ -259,7 +259,7 @@ static const struct vmci_handle VMCI_INVALID_HANDLE = {VMCI_INVALID_ID, #define VMCI_ERROR_QUEUEPAIR_NOT_READY (-40) #define VMCI_ERROR_WOULD_BLOCK (-41) -/* VMCI clients should return error code withing this range */ +/* VMCI clients should return error code within this range */ #define VMCI_ERROR_CLIENT_MIN (-500) #define VMCI_ERROR_CLIENT_MAX (-550) From nobody Tue Jan 23 06:48:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMv3wxKz57PKH; Tue, 23 Jan 2024 06:48: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 4TJyMv0r0vz4csj; Tue, 23 Jan 2024 06:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUEjlyfutgaGl13j+4RiHmUEsisN+Mfip0A+vvN3iMI=; b=LC/paCUGSsZaE3DOEOSkC82WOX1zNuzIqtLXedfPk1YsUfNv4mIW9fTJV3HTa+kDZddDc/ fmz/6Is0TndDAzz8zjSoHdi9uwVYqBezlxTNC0zCIXFc6LpOvko+zv06KHWjo/Xq43VpOe mKfd7AGnwX6PGtI9ByosqB3rc5W+q+pctMZKowzkcb/wAVjgCL/ScQ/GZ+oKkPOQoWrpod LjRa6pqqt9hRZAmI28fWX3TwRmMo2Zmic6/gzitUfBYVpRARtIBb0OnZsQV8tgGzK/M5bf cJKoqWBsJwq+rjYCb8bfeWCLuP7jbmMwYrGGT6t6cMjLLcwyAn2h0DEdcrWPGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUEjlyfutgaGl13j+4RiHmUEsisN+Mfip0A+vvN3iMI=; b=V4fTNi1L/0NoR20l3uwSY6OUo0eHlZAZatZB5cmVkuppN6gx5HNbwCD5dFPy1nEdgs/eqz uatXgCkoFBuwlZDiWRD0ycO+771jac2wl87U05y+eUMDynvpbn0dzRxMzdxO2BuDRAeBok N4CIDLAoYr0+cXP3el2lA4U20gyFpoXlIuUkL6nbeadhyuCJec2ACjwZSolVdAfTgQsTIY PqmTgxDfaTqFaGl1KlfLYFv828z/ncv9fO/Hgs3HM0hd0P6c1dkAzHIu/n2oV329MNtMPy 1IgQ/12TH4171gVT3eezORuDPHXGpOLX+ddwAC1NhHFzepX8D8LeEe+Lk2C1OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992491; a=rsa-sha256; cv=none; b=vru+qNKa5QXDh7K17V72dO+2Wqc6XYeCJI0gqdDx4neX91l3xHb1tc+PPLRX8CgOzQdifp GyKzqADQFvrgcw92byGSIH+UfLFzimOvunhxJheVMU82vZXh/IrQgXbqERDT6RXLqI9M3E IKrjDaB516hP9uMFt5KXEE4i/TZURSpXdP769knHefg9N2Hmk75nJfCdfunFf7+bBbdJjj qlrMQulsjRw4UndoSHWS5QOkUfHx2NjvV0xaQw2rPodjSDVAdiRyDi/a5S3GYeHRb3h2+U vStKRtWW18jfidyRkYmIhORuDCI3bbkcuPxbI0Rgl2bx6ObiFeggrlDPRMhc1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMt73vrzKHh; Tue, 23 Jan 2024 06:48: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 40N6mA9T058188; Tue, 23 Jan 2024 06:48:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mAST058185; Tue, 23 Jan 2024 06:48:10 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:10 GMT Message-Id: <202401230648.40N6mAST058185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: da3ddd852917 - stable/13 - netpfil: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: da3ddd852917ff49b96a49f7b916aecf950ca323 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=da3ddd852917ff49b96a49f7b916aecf950ca323 commit da3ddd852917ff49b96a49f7b916aecf950ca323 Author: Gordon Bergling AuthorDate: 2024-01-20 16:30:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:07 +0000 netpfil: Fix two typos in source code comments - s/withing/within/ (cherry picked from commit 938918a9f478e94fbe65ba84510e4755024560be) --- sys/netpfil/ipfw/ip_fw_dynamic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c index 2196157090c1..29ffe4f320ab 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -2456,7 +2456,7 @@ dyn_send_keepalive_ipv4(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv4[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || @@ -2563,7 +2563,7 @@ dyn_send_keepalive_ipv6(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv6[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || From nobody Tue Jan 23 06:48:12 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMw3pD3z57PVZ; Tue, 23 Jan 2024 06:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJyMw1yrqz4cyQ; Tue, 23 Jan 2024 06:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rg3J+FTTDsuCwTgxtckQbtqEvF0r4pP4lSDNikFkSzA=; b=wa+smWL8S1JvOGcFAzT+cHylOefjJP53nrJkVlKwCtqKN+gtGk3P4wI0AdIDBVuQGghp9Y PTKXB11PHimyWFC9iA4MXuPA3WbFSmh4CuayIfPv/CqJP3X/lcMsi5TkQ58yFwqz4vgZWj oK/gV5z0/CZ2r++k218B23uEayXj0fESYXsPBYzXaJyWOTpZRvgc9l8FdIVwMZoaZzXnut KTzJv2BUfOMC6NMKO5vmOp7YIyioEeVNYHUSc5kAvjxiwPxz1rP7vrhThlTAats0ASDq+P YAMnmC6YLsBqWZV7OjzN2nzFLAYbp4/z0/njj4xat5lo8KuziCmhfV6qdQsvSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rg3J+FTTDsuCwTgxtckQbtqEvF0r4pP4lSDNikFkSzA=; b=vy6UmbscuuSy3NlxVA6iSWzVtFJYChpRA3ZdSKp8VdxRdKC8crjlGZlZ9DxvHAqZUodfnx Jy/1b3yEW3K6Z6nm8ENN0TySc99oUpQ4CLuOZyI6PfBWXN3izX4PakYxx02ZEUwaaufdVw ZWxRMerQYd/x5irKxLhrwAlRaXrFWs4kz7g9ed8L8CQPrBnsf1EdH7FvjDrGvW2Dgus4lU +PoF11uPDpEzDcaAkcG6GU6lUzF4M/1D48P0FLJ42bKTJoki74UbfYUSlIu+hwOmg9incS jBat0TqRj6IvNpLGgJdQzxmhFdL7MmRbvYH06A8bETcXG3lqEVw1/+O2sNGxRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992492; a=rsa-sha256; cv=none; b=fDzmxfYbFwjlGO30b8cjRzRTVQkYMTWKsdGHtjtMhUUAfURWL3aW2KhVyaQXRx/Cm756v4 VRIw7YuoPouAcJ7KTUOvRZyRqJjLj35e2jXFTkn65mZ03ciX115tk8spURj59KGsq8FylM Vn4i5oJgwXD3KU9K6E7e4gGewvzQsT2tInawdme6mVSmODDGYrcizwyogocc7kBTz2/hwM Xzihw/NP/EL7yAbPV6LbMkUKrLJomohGti5IEABsKdBko70/Bj0hgc56naY1UjbJXbLc44 D4Qm1WfKqZrCX7Kr7zLsG4Yhlt5Z+Rc1oDa3n0jce8rcLs1dBvvLkSKilzxSRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMw155vzKFS; Tue, 23 Jan 2024 06:48: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 40N6mC5n058240; Tue, 23 Jan 2024 06:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mCPT058237; Tue, 23 Jan 2024 06:48:12 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:12 GMT Message-Id: <202401230648.40N6mCPT058237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ab04ef09cfd7 - stable/13 - netgraph: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ab04ef09cfd7aa9c1c3c6437e82eb2eed0a88c77 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ab04ef09cfd7aa9c1c3c6437e82eb2eed0a88c77 commit ab04ef09cfd7aa9c1c3c6437e82eb2eed0a88c77 Author: Gordon Bergling AuthorDate: 2024-01-20 16:22:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:19 +0000 netgraph: Fix two typos in source code comments - s/bascially/basically/ - s/simpliest/simplest/ (cherry picked from commit 7037ebe63dd1a2ff2a818359c58ca24b6d44388a) --- sys/netgraph/ng_sample.h | 2 +- sys/netgraph/ng_tag.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h index 994f322cf05a..f7f7cb417626 100644 --- a/sys/netgraph/ng_sample.h +++ b/sys/netgraph/ng_sample.h @@ -73,7 +73,7 @@ struct ngxxxstat { /* * This is used to define the 'parse type' for a struct ngxxxstat, which - * is bascially a description of how to convert a binary struct ngxxxstat + * is basically a description of how to convert a binary struct ngxxxstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c index accbe2d8452f..cc8b0a8f7536 100644 --- a/sys/netgraph/ng_tag.c +++ b/sys/netgraph/ng_tag.c @@ -258,7 +258,7 @@ NETGRAPH_INIT(tag, &typestruct); * One could ask why to have this structures at all when we have * ng_tag_hookinfo initialized to zero and don't need in and out structures * at all to operate. Unfortunatelly, we have to return thisHook field - * in response to messages so the fastest and simpliest way is to have + * in response to messages so the fastest and simplest way is to have * this default structures and initialize thisHook once at hook creation * rather than to do it on every response. */ From nobody Tue Jan 23 06:48:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMx5TYSz57PM0; Tue, 23 Jan 2024 06:48: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 4TJyMx2rjfz4ct7; Tue, 23 Jan 2024 06:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a/VsBtFDf6xWgPsn66aHaon0rUGlKePfuB/jhYta8OQ=; b=RT8yjfNNYwslh6MFgF2IJc5Epmq9q+GoArcNyaU5GCWKM33UZkoqwIBVFLtBWhye66AMPa bZvqSfnAI4hFVxeg9wOjZWHlfI1mCuCMOjStnsWK++cn6oLJt20fKBqV0Dm5Nf93dYFJCK HAwmgMvloVa2OpUPv99XxgCTIlF0H9I17xAAaq32gXCdmi51XUG3C1+FuwEXq6ABBv/daA xl3+Ywh5DuZnI60LfSER9KmBQYQL6W++0Em4BDEBwZHA6kUGCpqJh8WH086tFSkUJZf3BS CY0ky/z4zGoWsISxAMr/numDih32YXaoXY/UoUkPv0DpvZw1ThdnRa6Fl37T/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a/VsBtFDf6xWgPsn66aHaon0rUGlKePfuB/jhYta8OQ=; b=fYQ3DO5Szx/Qmblz91hWlQhDrGrbqzlI6kk/Ht26GmYsG8z2h/1uzJSkQeIQk+B8RzZUWp KdV7nndJxOXkvRWtvapj2WLVhzLlSoRV6DiSxeJdbzADBUNATzxKu/l9FX2O28F+tl198E I7aMAmks9LBF82k0vBV1TCCNKPknM8AVtsius/9DNBwDfT2CZD74nhzNsgLeVI1r0a+phg h2N7DVZTBk9KQZAKGMpri7XZefC5O6tVpNqkXVShr7H8lQ7woa0slLT6gEuIY7aynkq6ab bWXX+LhttIpqZjbEf7Ma21moAjItd2pWd9glDKoumhNkyuPe3ehQFW9ftsOMKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992493; a=rsa-sha256; cv=none; b=X/YggUp7qojSMb2CauSfBd4TqXF8k3fq/8HfV6d8sgZaCVqQJCIlTcA68vAEF/2zalMspZ 5nEOCX8kueqcjsxdy8MzTfvmGOQa5BE3Jx46RTVjf7MRgv2z67ER0AT/Lz1nyGFS4CVwHF mmZDWnfS3ssFlRdOeo1hPzcZCwgHJSzEP2Oeme0cWI9jslHt5UvPmkWA8gh7y7wELqU+Xw mbxEHtDchveAGe94AE1qAaNDPucsY+xQqNYqnR1xjRdLUpxI8Im/HvLgi1ezvn7lSIoGLh YKwaTHh33Qa6dRbsSRx9XsX390BMa0QKd8vTo+SszuDeSXL07YkYX5wnJXXBPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMx1yN0zKVL; Tue, 23 Jan 2024 06:48: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 40N6mD90058291; Tue, 23 Jan 2024 06:48:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mD95058288; Tue, 23 Jan 2024 06:48:13 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:13 GMT Message-Id: <202401230648.40N6mD95058288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4a66b63e9dc4 - stable/13 - net: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4a66b63e9dc4e874a9a452b3e66d188be6db4f51 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4a66b63e9dc4e874a9a452b3e66d188be6db4f51 commit 4a66b63e9dc4e874a9a452b3e66d188be6db4f51 Author: Gordon Bergling AuthorDate: 2024-01-20 16:28:12 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:32 +0000 net: Fix two typos in source code comments - s/strucutres/structures/ (cherry picked from commit a2fcd3af5c8ad43e8d2c7b89f7bbe3edf2f22e2a) --- sys/net/if.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.h b/sys/net/if.h index 6916eb6e816f..c4fdf02c874e 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -286,7 +286,7 @@ struct if_msghdr { * extensible after ifm_data_off or within ifm_data. Both the if_msghdr and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct if_msghdrl given a pointer to struct if_msghdrl. */ #define IF_MSGHDRL_IFM_DATA(_l) \ @@ -328,7 +328,7 @@ struct ifa_msghdr { * extensible after ifam_metric or within ifam_data. Both the ifa_msghdrl and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct ifa_msghdrl given a pointer to struct ifa_msghdrl. */ #define IFA_MSGHDRL_IFAM_DATA(_l) \ From nobody Tue Jan 23 06:48:14 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMy5vJWz57PM1; Tue, 23 Jan 2024 06:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJyMy4FYgz4dHQ; Tue, 23 Jan 2024 06:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZuKy2m4fJ2kGUKkg6qQZWPrJE17np4xZtLt4qPHUGk=; b=POD8DP6+ftqNkNFxIc/5MPfp/+r5Uj8ZDV0vvT8fst/qDjbW7YTez38gETIzp19OwnOPWv keg9/WwM6KQ/0thhGiKI8tM/hIFwfAL6KH6/WqxVwhp7/6qsb6oka19tgKPMi0UaK5Qmkb 1rkyP2Nb7IJW6oI3UD1NW+UnI3eSOYDDYphmZ8v0NIQiJ7R6fdj6H22R6yI6r6X+23z69i dupDAqztgzUZGGI1Xg7ifm7l31ryO9ZWryCZUnBIkY8ZOksW1U1mQ8jRmA9VJJKE6o5Qqb whbwWDiQ9gzKhpD3keNE1l+SR1tZmX709IAvEhvplciA5PgP3dK3kK72ZddUWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZuKy2m4fJ2kGUKkg6qQZWPrJE17np4xZtLt4qPHUGk=; b=kWOuip/W9XfyGvmo8RQ2jpyq6Z4fYhEBrpSR+Ja+gsxxI2iDHUcvmY7a/Z7OrbSjXMGjF+ GPF3In7mkeW21I9PRVZ5+bYSLqP/sgUs+s7F68YM87T3tKgJhcx9aSabucP3mt/RF9Jtqz loAKAQGpATDM2oNf6m4DbldAexafdgVI3rJpWRQhFur9OGThk44A4xx4giKnM4Kb91qFOC RFMkbj42+vYN2AzXUpoemCkXB8AenDaNpjiDe37nBYbSqwSOXSGYxXsMlY1OMiHrcLDwB+ LckNHKT/5RUDFFIBypVFKLKTGEBHeXji8czUp76RlWGSfdAlCOzCjWiHeZmcFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992494; a=rsa-sha256; cv=none; b=mxnFqSkJcXuzBtjqOdWE6bu1mi43nuygbl9bBTqqGMY0VXOKZy0uYx92oCF+HdBs4w6S8M I2BKJLbbZyjPs/ABfGGdf+He99LFO78EC4QcjSceGNvab0vDc2kzU04Il36S6hW3p57I9I pxwRVvd0jH13fj0ATS7xuUaGOFa1YLDNkVK9QL22eSVO/+Xdlsu2DEeDr5fHPCX1FMNGCe dByxtfECv2dyBr+/ZwskIrlbdkigxJ0OkPoSN0LCLJI3q+uahfzblqpvf6lfwsrP1rGBtF 1Vwn9GpBwKKRbH00TQ/soGnO4JM7sBXhcZJr0C6kSg75UM1bcvRwlOA8p1ZQtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMy3Mw5zKHj; Tue, 23 Jan 2024 06:48: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 40N6mEJX058353; Tue, 23 Jan 2024 06:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mESQ058350; Tue, 23 Jan 2024 06:48:14 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:14 GMT Message-Id: <202401230648.40N6mESQ058350@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e184cd907e80 - stable/13 - atse(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e184cd907e80b4364c3d23b87e709d579d6eb89d Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e184cd907e80b4364c3d23b87e709d579d6eb89d commit e184cd907e80b4364c3d23b87e709d579d6eb89d Author: Gordon Bergling AuthorDate: 2024-01-20 16:35:51 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:43 +0000 atse(4): Fix a typo in a source code comment - s/addresss/address/ (cherry picked from commit 2b1e4e5be3047411df5e4d5442aa7de6489a0309) --- sys/dev/altera/atse/if_atse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c index 080c67174781..b13c1ca8c563 100644 --- a/sys/dev/altera/atse/if_atse.c +++ b/sys/dev/altera/atse/if_atse.c @@ -582,7 +582,7 @@ atse_get_eth_address(struct atse_softc *sc) sc->atse_eth_addr[4] = atse_ethernet_option_bits[8]; sc->atse_eth_addr[5] = atse_ethernet_option_bits[9]; - /* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */ + /* Handle factory default ethernet address: 00:07:ed:ff:ed:15 */ if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 && sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff && sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) { From nobody Tue Jan 23 06:48:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMz6m33z57PVh; Tue, 23 Jan 2024 06:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJyMz5PsQz4dF7; Tue, 23 Jan 2024 06:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V6mB12ERiKZnpcqE/BL1V6u+kXmT97gsgsCozUxN90=; b=GHa+wYThteiSftcTkGCVNHLwifeQYkr8WVFUf3FlEFMS+zW+iPiQXBGFgm2VdQUuiE5MIZ oKsE0cXNUtAst0mFlhVMwhe//umH+HqrkPsx0ugJuW6HQPuItoBkT06y8iudNsDyRSFUe9 kvst/oqX1m9xD6FPbi03Wx7v8/lAi8tAjPoCtkKuvK/aopkhiUX6H8lHI+K7Qfmm9p+55u cu4veHAF9GwoOeXZr/GYMzlhGc9wPUHoXqcUduCRfP88vR1IrFljN7nf6brE1RlDe65K0B io/3IXCR154eMGGNsy9AjCGILNvBBAtzz7QaR5iyt8K4n98M7JwKn6rulUzRRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V6mB12ERiKZnpcqE/BL1V6u+kXmT97gsgsCozUxN90=; b=tM6mdofZBpGOQuRrottRdEjZDIKG05GlPq1HnrnVRJhgFLSyN1W/bBCZ5enf2XTX1U16YS EXYbwsGFoztBL/ZxEygIvGNvhqqiVWunT6Y2mpmit50nIrBddjdQ//m7+VomLu72Z/zuwC 5Z6IkY8U9FPM3uZzhilCGZ5tjkhbiljEx/hIcYbGUGRR1F/vmqe11jqtr3iGLELqvZabvR oBOc21rCCJ9rpcpCnq965T/CYpgUGGZb5tyMZKfDJNudYwwWhyzkbUKCutSoRR4ywthdsF 1xvistGG9EVSMPbXymAzg+fckTbih+PeboksKfKDMbDtpjE+RQh21lnzCqOXag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992495; a=rsa-sha256; cv=none; b=sbFZLM8K+xPTrHaN3mj3ID8013H8SoHkmqbVvY0Pe5M1gLq4vhtcnzNKyBnbJXbcAhbL9f Urz9KAEfsGwg6NwYEFYnp6kSNPPAFOpNwH9FaTGs8RkEeOvNQV8iG6/Qn+jJ9DuvJhrzjG dN21kxjpGubIMHyFBIjVFHYvixx3bplZVzWMFyodVtD+8py9P9PAm6pRYpU3AgoZyC1WOM vQnRdveU2vltzncNWklQnJ5jtEhFE61ayq0YGAQw52U8XGRYLNeQZ1xYR+QQ7RxwPy/Ta9 9OoMeWffklmVLxOQIaxc49jB7HSSryvtTANWJTOPrVNHo9YGDahqtypGlh6/vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMz4WlVzKBL; Tue, 23 Jan 2024 06:48:15 +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 40N6mFBg058407; Tue, 23 Jan 2024 06:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mFun058403; Tue, 23 Jan 2024 06:48:15 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:15 GMT Message-Id: <202401230648.40N6mFun058403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: df6f381ac6d9 - stable/13 - _umtx_op.2: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: df6f381ac6d9a92a146cc2cb36e403dbc9bd1f7e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=df6f381ac6d9a92a146cc2cb36e403dbc9bd1f7e commit df6f381ac6d9a92a146cc2cb36e403dbc9bd1f7e Author: Gordon Bergling AuthorDate: 2024-01-20 16:26:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:54 +0000 _umtx_op.2: Fix a typo in the manual page - s/interpeted/interpreted/ (cherry picked from commit b2ec175fcaac90fc6a1caf066656eaa092f32611) --- lib/libc/sys/_umtx_op.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libc/sys/_umtx_op.2 index 9c0f1f425e47..60f90c32ba35 100644 --- a/lib/libc/sys/_umtx_op.2 +++ b/lib/libc/sys/_umtx_op.2 @@ -424,7 +424,7 @@ regardless of the kind of backing memory. Only the address of the start byte of the variable specified as key is important for determining corresponding sleep queue. The size of the variable does not matter, so, for example, sleep on the same -address interpeted as +address interpreted as .Vt uint32_t and .Vt long From nobody Wed Jan 24 12:05:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKjMT6JMrz58814; Wed, 24 Jan 2024 12:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKjMT5nTsz4NwD; Wed, 24 Jan 2024 12:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706097925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHocrKvq6D+K1dhdeYlcmEOqnk6UVJsnK8JtpP6nENA=; b=dpxQO3IRHCIf7hnhtY+aEm/Mi6X3LoFSeBq3RBs7Fz7itaRTMkn0HSbWltKcQR2Y+QXxvj jqLeiHKB2fazjWYGn7rP/ugLr/NWTRg7sGQbHG2n+grArxmPaLnwdZJRmG0uR9uYFsCAm3 /DXCCJbqN3C22VQLLkXTocPir6NgzyRGfHcskgLpy2FyQF07s68KC9c3DL1EhI6Yz8p8RX KojztUuklfyj0ikO2M9s5Zgy1t5eI2yyFcMQg3uI/vDWdc53U+Ad7j0XQr3m/PknV0YvNg KTN+QnMJc+7/9rpSnybqhwBvud6LmZoPgU3SUsV8E6yR5WUySndqaOCd0a22+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706097925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHocrKvq6D+K1dhdeYlcmEOqnk6UVJsnK8JtpP6nENA=; b=OA/qBqNKHloMxJ7CXpDgzNcWqu2cdYvkxMjkGbQn4jwDAFtxqnp1sHr19Q8uZM2A/xYfQT m59xI30uydMuM2Bj+hEyuojt0HFtipUosTCi4fdQHg9I1+cpbGP9QddAKUYNhq5FAdWq87 +4OPU2Gr8xzC48taqpcdsu+P/66viJ+kmzp+bLjzWCgwu0HMsE26AYb1Z5mpFGww+0vVj/ duoUj/joudMCj15dxoRjXhYBB3yipauhok+xocvr2wJ9yAklz5jH0Davl2OC+hajs4E7jR w6J3CCjHREBHug40Z0Ci6yq7Yx6IzSoD627GHQ3mZD5g0Eg7RpoeYSsz6QZVDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706097925; a=rsa-sha256; cv=none; b=eWY6zk3w6XJBNnJ8PhtKJggCc7F/7ZGC23BI4x5gJEqeXtsO4SN84HEecluSrpsivq59KP ndzcrL07uNYhlbklJy97Bnu6jzens6X8D8pH2c0MUT6bB/VcGE8LSctRdFH69cN6j+wODw l1Es8NOJTqVqil0x39p6TvU3PWCyoFRA6lm2C8x1g9WBWDp36lbl/b0wUnGiykhwFYxHEX L6WvL2z3zHFDuH9voiUHM8zzo/XKNpKZnql+KJA+5JL8uknoV8U/cTdb4oSX3eFYDSYg1G x1++hir/xZBnZP3p+LiNanpl6DPBfd7G3SU78yj8J1Jjm0x1SKcweCfpzyVBJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKjMT4rwMzDgn; Wed, 24 Jan 2024 12:05:25 +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 40OC5O3u032255; Wed, 24 Jan 2024 12:05:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OC5OFr032252; Wed, 24 Jan 2024 12:05:24 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:05:24 GMT Message-Id: <202401241205.40OC5OFr032252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yoshihiro Takahashi Subject: git: dd5dabe28483 - stable/14 - periodic: Fix periodic reports when log files are not compressed. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nyan X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd5dabe284831a40bb8ef4749b352c03bf9f4a44 Auto-Submitted: auto-generated The branch stable/14 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=dd5dabe284831a40bb8ef4749b352c03bf9f4a44 commit dd5dabe284831a40bb8ef4749b352c03bf9f4a44 Author: Yoshihiro Takahashi AuthorDate: 2024-01-10 11:48:56 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-01-24 12:04:50 +0000 periodic: Fix periodic reports when log files are not compressed. The modern zcat(1) is capable of handling compressed and uncompressed text files, so we can simply use zcat command. PR: 253168 Reviewed by: delphij MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43357 (cherry picked from commit 1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce) --- usr.sbin/periodic/etc/security/800.loginfail | 7 +------ usr.sbin/periodic/etc/security/900.tcpwrap | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 4329728f9505..c5a3a972aaa1 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -49,12 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - *.xz) xzcat -f $f;; - *.zst) zstdcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/auth.log ] && cat $LOG/auth.log } diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap index ae081ded6a95..55fa58f4df39 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -49,12 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - *.xz) xzcat -f $f;; - *.zst) zstdcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/messages ] && cat $LOG/messages } From nobody Wed Jan 24 12:09:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKjSb52Ghz588MM; Wed, 24 Jan 2024 12:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKjSb47CTz4P9k; Wed, 24 Jan 2024 12:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706098191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9S1mn+jl0WBGaiss+T2Aq6XBCzZUdbRhbeQEkEDtLY=; b=IB6mDLrynrQATdcKWlpbs85B39F3+qKtr+VzAYaBXeXzDqQoYp8Xsq0gUMfgBQGoYdqDzZ 1RRLWlTeoVxnLNdxbYyIq3YO3IDRWLfUDXLDl9mOnEKA0cl88NdXG2bTld/DhbYaYEvlIn p/UISAsXXjtYFqcWPeMhRnOpmqEeFcyMkKz4wPRpb4dHMth2xLMpVHJ/fYLkY+mpmbB/W3 gqJWwjfBRzPEZpjP2NEfhM9zcRDyAKUnYkRbTtqGMIldNi6blBG+ban2CChGHcfmDz4FrS S2C52jGdVyuUld5QZiGLaIWeGq4iOXjumemz3GQ6eyM6N//qAGJHwn8MqhwEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706098191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9S1mn+jl0WBGaiss+T2Aq6XBCzZUdbRhbeQEkEDtLY=; b=J3Bn+wlklf4g0x+SfUhTIleZekHdj+cWcEG8/s6gcz7WmIEKNV8Exl4CyOXNRgDHKJZmeM QpgNnmUujgmnEHo9p/8Lf4peygETUBBe96TW7BtVLr/yDdZbvQqyoTSx1R7xoVH483Bp0P MbTmBPig2t/MhabUPF/QSXcMICLK45KzvAlg0n6zfV38GuWkEU6XMf3wPZ0Yvn26y5aFFr ksscRfPJ2tXrue9oa86goMn/FPnaa0b4jT5U0X/eQAZjSPzPVNCrMpt1Q6O0p0+vqc/48p YwdvsmILJejEGaz11+iV6zK7XzPQQ8/dY+TJuaobqcKqXAqXLgqqRakkOY963w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706098191; a=rsa-sha256; cv=none; b=iJCIiG0TtgaRRjLL6wbojO32AkCRqE1Yq8TmFXG9SMdZXO3dOQPKA3U0DQ2hAoO2BJm6xD 1jTprbRWZysnfA1c5Tng4QnLKBmn11U1hyT1MgFtCB4uwo24yd6K8SwBBJGRuNCPQclr1X DWwvenourxd13e7FkU9uP3N7Dw/ngdWJegKCji8hLuo0DggJhf5biPot1rUacUYNZbjOFS jDnazDesbXDEOoT2uf3KhS8VgnrtCQKbbVJJ/nLzGq7ortVk7S0K3DPGm28Jk2D+OB2GyJ 1ZhGuPG2soBfnpUc5SUwWhBNfu7CNeatL0+wXNw3zSCuPBPaHiC3lJK4P00PcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKjSb3BFtz1CGh; Wed, 24 Jan 2024 12:09: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 40OC9p4f032979; Wed, 24 Jan 2024 12:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OC9pxY032976; Wed, 24 Jan 2024 12:09:51 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:09:51 GMT Message-Id: <202401241209.40OC9pxY032976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yoshihiro Takahashi Subject: git: f148fbe15373 - stable/13 - periodic: Fix periodic reports when log files are not compressed. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nyan X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f148fbe153738776c0e2263754e38cf7e0beb63e Auto-Submitted: auto-generated The branch stable/13 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=f148fbe153738776c0e2263754e38cf7e0beb63e commit f148fbe153738776c0e2263754e38cf7e0beb63e Author: Yoshihiro Takahashi AuthorDate: 2024-01-10 11:48:56 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-01-24 12:08:58 +0000 periodic: Fix periodic reports when log files are not compressed. The modern zcat(1) is capable of handling compressed and uncompressed text files, so we can simply use zcat command. PR: 253168 Reviewed by: delphij MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43357 (cherry picked from commit 1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce) --- usr.sbin/periodic/etc/security/800.loginfail | 5 +---- usr.sbin/periodic/etc/security/900.tcpwrap | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 713f4fed47bf..c5a3a972aaa1 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -49,10 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/auth.log ] && cat $LOG/auth.log } diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap index 132bc9865b18..55fa58f4df39 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -49,10 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/messages ] && cat $LOG/messages } From nobody Wed Jan 24 12:36:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKk3p2M9Yz58BNH; Wed, 24 Jan 2024 12:36: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 4TKk3p1v3Vz4Sk0; Wed, 24 Jan 2024 12:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706099814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOZ8H2zqwX4PgKoUm/gMkNiPWBGwqcm+aG6JkZ0xVhM=; b=MuydyEq3OM4sgZPlb8sw7CK3sg6PTwGoXA7LKvE1zzxIkFxUBOtBfjvg4w7Lzye3fhsHl/ b1o7SrlOhvJ7gUlB8JtlvbE2T1rdin1KYBpLMX5drPDB4U4+5CYYkEUhTsRbZYhNbsgA3I DE/4nFyxwr1/0T8itXMoXzffssjLJJuQITielvSh2Q9cmbgU7t0RwFE7Xno8YE/+kqGsWP B9QtsrKtt5r1ssNRtLqXvxlg9A8qXfQ1tYsv6j6UUZpEQ+5q5oELcL8RAj0yPyaccAkk0Y YAnkCUtGCHKnCLNYFTR39EKCEaQ5PF61nJXcWGo1cD6fQoWJ5aFCT1PldccqmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706099814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOZ8H2zqwX4PgKoUm/gMkNiPWBGwqcm+aG6JkZ0xVhM=; b=n2s7VsOzxEGqxdBITCBC+f4MTi36HlmGkcEFtpx89kYgzBZKEbyBgqGxl/BNvRYk2VGNcb d6gkTMvdMZjHwFRSp00zLy8hOuYvYHZsvNwM8h31gh2nzfA62kwMGE0pJFsOf6+2VzCYSy V/niAsUIzoHOW9wxYYt3ry59Cjt7B8SqvOihT+wDyGGzGrBY9Zcf7MKV+YEWvHe6pvjonm AmfNIcaT5pLJ+605M1pCiA6GZ/jwACjDcgSENZ9ArDssY1ha19m4U6ioQQlu+LwUtRkuKM ONZOkE159UlIsDdzySQ5zZ9P6mZSJEIvUI5BrOk1o0VCEh3hxpC5XRrbv0ORUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706099814; a=rsa-sha256; cv=none; b=tZX6GUgRbvJzbBVMErd/Y/hNdW90WVnRcgqrJEBKeaI2eaJvk+83dImWiWS2JWDDxCRkG9 bbT+EyJ3Q2HtE8Gxkk+Teh0+72UbYMEdU0VQKWUA7wGYaAL4AZ0qC8E/DHiOF3gGS+Zfh5 KOS5tq2KmbmVx6UGymzEA9LeCW0fYo3KpIkGgel6j4BbOP+y0bnuNP2QCzdTDDwletSGAn K9cAXyIZn66VkJ/DX6LFf0ZSVyvwEN9EQEoTVoyZs9w7HDadb0gG3OywBmvGE6oib3a/Lt iOB5piz69IpdTnoZFRMlbuI3ADs/CT9vLIf1312A/9FuXMtKBUeUO3oVJX83Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKk3p0yJlzF85; Wed, 24 Jan 2024 12:36: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 40OCasMb082051; Wed, 24 Jan 2024 12:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OCasuj082048; Wed, 24 Jan 2024 12:36:54 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:36:54 GMT Message-Id: <202401241236.40OCasuj082048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 33cd6211052c - stable/14 - mana: Fix TX CQE error handling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 33cd6211052c5add833150b2eff1bc0729651d3a Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=33cd6211052c5add833150b2eff1bc0729651d3a commit 33cd6211052c5add833150b2eff1bc0729651d3a Author: Wei Hu AuthorDate: 2024-01-17 09:19:35 +0000 Commit: Wei Hu CommitDate: 2024-01-24 12:36:13 +0000 mana: Fix TX CQE error handling For an unknown TX CQE error type (probably from a newer hardware), still free the mbuf, update the queue tail, etc., otherwise the accounting will be wrong. Also, TX errors can be triggered by injecting corrupted packets, so replace the mana_err to mana_dbg logging. Reported by: NetApp MFC after: 1 week Sponsored by: Microsoft (cherry picked from commit 516b5059705b6b8bbba28821dbe05964c128f9a9) --- sys/dev/mana/mana.h | 2 ++ sys/dev/mana/mana_en.c | 14 ++++++++------ sys/dev/mana/mana_sysctl.c | 6 ++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index ab394f3203ad..906b28eb56b6 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -137,6 +137,8 @@ struct mana_stats { counter_u64_t mbuf_alloc_fail; /* rx */ counter_u64_t alt_chg; /* tx */ counter_u64_t alt_reset; /* tx */ + counter_u64_t cqe_err; /* tx */ + counter_u64_t cqe_unknown_type; /* tx */ }; struct mana_txq { diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 812a42e51dfc..09de49a11010 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -1487,21 +1487,23 @@ mana_poll_tx_cq(struct mana_cq *cq) case CQE_TX_VPORT_DISABLED: case CQE_TX_VLAN_TAGGING_VIOLATION: sa_drop ++; - mana_err(NULL, + mana_dbg(NULL, "TX: txq %d CQE error %d, ntc = %d, " "pending sends = %d: err ignored.\n", txq_idx, cqe_oob->cqe_hdr.cqe_type, next_to_complete, txq->pending_sends); + counter_u64_add(txq->stats.cqe_err, 1); break; default: - /* If the CQE type is unexpected, log an error, - * and go through the error path. + /* If the CQE type is unknown, log a debug msg, + * and still free the mbuf, etc. */ - mana_err(NULL, - "ERROR: TX: Unexpected CQE type %d: HW BUG?\n", + mana_dbg(NULL, + "ERROR: TX: Unknown CQE type %d\n", cqe_oob->cqe_hdr.cqe_type); - return; + counter_u64_add(txq->stats.cqe_unknown_type, 1); + break; } if (txq->gdma_txq_id != completions[i].wq_num) { mana_dbg(NULL, diff --git a/sys/dev/mana/mana_sysctl.c b/sys/dev/mana/mana_sysctl.c index d03ebe44ab31..844a05040595 100644 --- a/sys/dev/mana/mana_sysctl.c +++ b/sys/dev/mana/mana_sysctl.c @@ -292,6 +292,12 @@ mana_sysctl_add_queues(struct mana_port_context *apc) SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, "alt_reset", CTLFLAG_RD, &tx_stats->alt_reset, "Reset to self txq"); + SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, + "cqe_err", CTLFLAG_RD, + &tx_stats->cqe_err, "Error CQE count"); + SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, + "cqe_unknown_type", CTLFLAG_RD, + &tx_stats->cqe_unknown_type, "Unknown CQE count"); /* RX stats */ rx_node = SYSCTL_ADD_NODE(ctx, queue_list, OID_AUTO, From nobody Wed Jan 24 13:04:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKkgY6Zj8z58DCq; Wed, 24 Jan 2024 13:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKkgY65Lfz4W7y; Wed, 24 Jan 2024 13:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXarlPDbG12rBEBJvJxExANZKtdcPMQZjFoa+JNZ6Yk=; b=sWXO77yqDPbHJQwppLcprnal88wrauttW9eT711nfp8x20kBzL7zGsl64EUaB5iIsz5wIR H4aOiitlYMLISJblAiUS9AEa3vPptMyeRwVmS9uFyDbW4+Yg8wq5vUhVth+P24MVNnq+Iv YI9QsiLChgnoO8E0UD1ATSmypYuMSWJUo1IOa3HqF6wFAYAE0yL6U7ZmSZ5oCuagaaKLcC MFtnQm3G+dUcgZ3rSDg1jcwM0hL0vHjbLjvHZXxENCRr/wZvEXx73+F3uauNYIse34gTOk JNJDYrWg2ihUnqeAftOwEwRHfxvi6lBIRrk7MtSGgOGjRNAAYkOcVKL0CUwvOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXarlPDbG12rBEBJvJxExANZKtdcPMQZjFoa+JNZ6Yk=; b=pPNFkNwR9JIQeGRA0FcRt0ek4Se2TRksokR9HewX1MyiKzl1+x7PLVJADfalHMBnKE+J+U hKJ/jyNyz3DqCpqPPIebHGG+VdP8m9uab/YlU8TBRKsG+Y3i0k907zuRat9JuAH5++DjM2 lI2TZGS66oUFAv2GN3m96S5x+RBa7uHKk4V1biw+wfvv9tuvax+xjuRlupuyuCWrU7wGSQ 0gPYfTX1jLTbLo3JA1QTQ3kdWwYEfDxlzQHL9E0LvfsOJfuk1egA7I+axt9i1x8LA1jDro bGZX4F+dtvwFr5AVAIcpsZh+fCfMnSO+qAv3eWgKyZUGBaOseHBLB7xYdFsM2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706101465; a=rsa-sha256; cv=none; b=DRoYf4laVJn9jiMaOCucQnV8DuxDKAf92ApyHfhJ8hXyoKN+o8miLL4qyy7yZ0SOQDEeno tKalm+gRIE3hYaKPtCWA41gjwogkMnpo+odBMDHNzCNeJwFfcgMzwdvrYryOM26vYY9Koi dc2ZWjsqaTUFZqCVNmwiBwW03JP8SYkk+n4PSuFlsZIjX1tQu2SNC41lPXpXYQVP8fliAv DCqLhBju9siq+FLKf/qfrLdgeCVYuqFMPAc74IFM1cleF+8TwqmRvg3SmlZeBOXbhVsAKw IXDoU65mhaI4EPu/8dgAmV9Byn3/FtopVsfxFijvim6cUgHzyxNWIRpx27761Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKkgY57R6zFRr; Wed, 24 Jan 2024 13:04:25 +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 40OD4PMo032829; Wed, 24 Jan 2024 13:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OD4P7u032827; Wed, 24 Jan 2024 13:04:25 GMT (envelope-from git) Date: Wed, 24 Jan 2024 13:04:25 GMT Message-Id: <202401241304.40OD4P7u032827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8788c3d3fa9d - stable/14 - sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8788c3d3fa9d217e0b4f2bb87a84fbd6e6aceac9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8788c3d3fa9d217e0b4f2bb87a84fbd6e6aceac9 commit 8788c3d3fa9d217e0b4f2bb87a84fbd6e6aceac9 Author: Konstantin Belousov AuthorDate: 2024-01-13 01:46:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:07 +0000 sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed (cherry picked from commit 38f5f2a4af5daeec7f13d39cad1ff4dc90da52d8) --- sys/vm/vm_object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index d3337c038113..76ae6118a756 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -2516,6 +2517,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) vm_page_t m; u_long sp; int count, error; + bool want_path; if (req->oldptr == NULL) { /* @@ -2534,6 +2536,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) count * 11 / 10)); } + want_path = !(swap_only || jailed(curthread->td_ucred)); kvo = malloc(sizeof(*kvo), M_TEMP, M_WAITOK | M_ZERO); error = 0; @@ -2585,7 +2588,8 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) freepath = NULL; fullpath = ""; vp = NULL; - kvo->kvo_type = vm_object_kvme_type(obj, swap_only ? NULL : &vp); + kvo->kvo_type = vm_object_kvme_type(obj, want_path ? &vp : + NULL); if (vp != NULL) { vref(vp); } else if ((obj->flags & OBJ_ANON) != 0) { From nobody Wed Jan 24 13:05:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKkhQ1X10z58Dfh; Wed, 24 Jan 2024 13:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKkhQ0v9Cz4WdX; Wed, 24 Jan 2024 13:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvHs4kPfN/R4BKg6u/Mh5GoPGcpoxjALJSpEZef9yY0=; b=QQdmw1I1oKoHDJQ7QC05F6cSTh3Z7bfZ2aE6uS9CeC4PIwRdbgnkRz6AAZKEWvkbSDWsGP up5Vq4DOMhYTYyEV+iO8ECt8dHSzukWFDH41YjOhkzpv8E1iWnnmuQAVu3MsXeN7VKMkrx kQRahnpnZ4NKS7aaYTUxgflmnWWYy00ucnd2a7s89rQhaq3OpsUiYxjwzYqYp3NxVG45G8 YwdlNOCxS1U6mq2zaucMbescU4p1f0iPIfearX29ABcplFjDoB9QONEFE3nTkt64BUMaDC 5zVQrCdfcmqDX5gw8IBqlowHE3xcxN589uVtQXheDFj/IeXZ53u0HBx1hBDT0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvHs4kPfN/R4BKg6u/Mh5GoPGcpoxjALJSpEZef9yY0=; b=CNvgTZmG8NvXung6siwPvtduXMWMX3CMjlz/sJPes1x0Ojb9Q9/yDXcBm6m+KLtf+HMuF3 cAI9BsC1J3N2T7X5kZKb8rzpjcnXBNtdpBll3ZjLu1LbzD0MDTwtPY0NeLJpxf/MCRjIMK EJEMvbggqgyRPh45DstLQrdgTuncEzrT64ip1kcv2mYeCCgQ0UzQCRC66nwD0D2r36fNal xE9/yYVlmbYGnde6r+tqatJcUoAXCV9FGYuM2TftB1bHB8pKOo1u34a8I/+D1f7dpbc2Fq YKyaIOjGCDOhWIzNa+pZm3uxPaA74y/qBLP0ywra96+4U8UmMFUdlmDVJPKgSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706101510; a=rsa-sha256; cv=none; b=LsXt5aQBkTaPdE8FeeHAqVtbasZ/mamNqhSR4xnA5dbCBqkCgGdrtjjVif1ShfbAx7Tza1 MAd+/lXkRAuUmURrS1POAp4kJU7TXCioK1EtQrsMNVXsq06ihKdHU6YXSqBeQOV4KO8nNh PuLba7+3tXjN+6QWtTCw4PbeG3kboI6lvDKkZdC+Dwf7QP1TOoJEUkDXCzzQOok5kT5PGw iaXgkW55dEdxB9ginw3XhU5pQUTOYzrPBwmjGFJTDpF3WMDPxf1z7B515IR9SX/ymAmyhY lP9PwM1ODcr+6BBiF/XCfVcqM2ngyuol1Ea6xtkZDi/3pYaQdkr38WRcM8sOog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKkhP74SJzG8d; Wed, 24 Jan 2024 13:05: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 40OD59SG033075; Wed, 24 Jan 2024 13:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OD59k2033073; Wed, 24 Jan 2024 13:05:09 GMT (envelope-from git) Date: Wed, 24 Jan 2024 13:05:09 GMT Message-Id: <202401241305.40OD59k2033073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5c4e6fd30bbc - stable/13 - sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c4e6fd30bbc859e06af1bdaa42eed32a5418b04 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4e6fd30bbc859e06af1bdaa42eed32a5418b04 commit 5c4e6fd30bbc859e06af1bdaa42eed32a5418b04 Author: Konstantin Belousov AuthorDate: 2024-01-13 01:46:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed (cherry picked from commit 38f5f2a4af5daeec7f13d39cad1ff4dc90da52d8) --- sys/vm/vm_object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 34d2de1ee875..6da30800896e 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -2559,6 +2560,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) vm_page_t m; u_long sp; int count, error; + bool want_path; if (req->oldptr == NULL) { /* @@ -2577,6 +2579,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) count * 11 / 10)); } + want_path = !(swap_only || jailed(curthread->td_ucred)); kvo = malloc(sizeof(*kvo), M_TEMP, M_WAITOK | M_ZERO); error = 0; @@ -2628,7 +2631,8 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) freepath = NULL; fullpath = ""; vp = NULL; - kvo->kvo_type = vm_object_kvme_type(obj, swap_only ? NULL : &vp); + kvo->kvo_type = vm_object_kvme_type(obj, want_path ? &vp : + NULL); if (vp != NULL) { vref(vp); } else if ((obj->flags & OBJ_ANON) != 0) { From nobody Wed Jan 24 19:44:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvY84h0Bz58bqY; Wed, 24 Jan 2024 19:44: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 4TKvY83xB5z44ym; Wed, 24 Jan 2024 19:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AefrWHx4+YKwckiUJto4mmEKZbFYixD4coM2EmjXCjo=; b=DTyFGLq5RAgdnb8SzlTu9LtRXjS1p9vLuzpR0XrBs2arFLoAtAQCuGqmvN8pFoPoffPeiz gaSKyYW0+2OBJTbIo2+904KcDOzziTufea0aT0aEyDd2LDu0nw1RrdQWoaz4OscJ3uVpr4 3qaQ8Rxfuvey2gvf+ODKt5EcQaFgkKasikzEYcHQiwQy+8Bef4y+BqvhSXZUt0TUUqlHtu 9W1j6OL8GKDAz+YIwdUxujeZbq3cYiuOOlO7qKqGZFLiMrraGzLReJSQiPfwfBNHsFEtNG vL1zsXJBVkWeNB29iJOhfKFDDCVNpYSCVQk3Wo4+ETa/sFmsfKNCgMRXAgI2Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AefrWHx4+YKwckiUJto4mmEKZbFYixD4coM2EmjXCjo=; b=gYDEVibwhmMI12HzU9q1ZrtR2FKa6DbCDXic2w+GS1JJqL97+xz5YposWSMZuOL5rM6zbZ Tz/Ov/Fg3nzw6E/D0yDdrdYywANfLTrhvMKKc9rejBhLTMCZbESZRQKEPVshVtNvovYZyX zL4oW9m2lUTT5xMH6eF+NtpTSaHejPAwTC6kmtdzAP5s/AfQMNi+mNVxAN4Db6A7d6H+vg Uy0NKAD8AxyO2qqpNvHrqURmTlRs/9bc6F3tRQDRb2r7RAd2egT4/VD+i7RjyaQKueC5KU ugYOp1C2Lm/n67sRejkmIOzMgo/YZ6gbmw7tYDUWR9t68oPVjtM30AZJL4eSyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125468; a=rsa-sha256; cv=none; b=JzPVwl/dEtdabWcm5nMSPq6cwPlir/4OyBDtZZsEXjmkxFLj2o1cYAjUzFFZ2VsNyFsTQQ NEweIWldpw+ZYoE0KP2Uov+0A7vRsVhn6lVo7HU/xQ7G9k9ckMcowmD2anEF+LN65Oigf0 6sP2P+97rAbDrc6T0+n7QvjGHCqctUkynmU9AT147ovf1k2fpfdKjTDK7FmT7xKcQiuCTS JvYdG8zO8tYn5rja0limPpsRCpuHpAc+7FWENu+S1Vpty37f+d+SQvDO2ss7yEtk/xNgcT PTqoA/UQOtfzeYiyJjNQHHdtu0fECaHI1bRYMHQdZyHfj7GagOLYvfyOyRr65Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvY82jJBzRgn; Wed, 24 Jan 2024 19:44: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 40OJiS8n004794; Wed, 24 Jan 2024 19:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiS8x004791; Wed, 24 Jan 2024 19:44:28 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:28 GMT Message-Id: <202401241944.40OJiS8x004791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 37728967ee5c - stable/14 - lib/libc/amd64/string/strcmp.S: add baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 37728967ee5c845f5af9d22377be10ffb62c90aa Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=37728967ee5c845f5af9d22377be10ffb62c90aa commit 37728967ee5c845f5af9d22377be10ffb62c90aa Author: Robert Clausecker AuthorDate: 2023-09-16 05:29:39 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:24 +0000 lib/libc/amd64/string/strcmp.S: add baseline implementation This is the most complicated one so far. The basic idea is to process the bulk of the string in aligned blocks of 16 bytes such that one string runs ahead and the other runs behind. The string that runs ahead is checked for NUL bytes, the one that runs behind is compared with the corresponding chunk of the string that runs ahead. This trades an extra load per iteration for the very complicated block-reassembly needed in the other implementations (bionic, glibc). On the flip side, we need two code paths depending on the relative alignment of the two buffers. The initial part of the string is compared directly if it is known not to cross a page boundary. Otherwise, a complex slow path to avoid crossing into unmapped memory commences. Performance-wise we beat bionic for misaligned strings (i.e. the strings do not share an alignment offset) and reach comparable performance for aligned strings. glibc is a bit better as it has a special kernel for AVX-512, where this stuff is a bit easier to do. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41971 (cherry picked from commit bca25680b91b3bea7faef615765806a04634eb23) --- lib/libc/amd64/string/strcmp.S | 299 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 292 insertions(+), 7 deletions(-) diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/amd64/string/strcmp.S index 437db7eca43a..eb354bd2af82 100644 --- a/lib/libc/amd64/string/strcmp.S +++ b/lib/libc/amd64/string/strcmp.S @@ -1,14 +1,33 @@ -/* - * Written by J.T. Conklin - * Public domain. +/*- + * Copyright (c) 2023, The FreeBSD Foundation + * + * SPDX-License-Expression: BSD-2-Clause + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Adapted from NetBSD's common/lib/libc/arch/x86_64/string/strcmp.S + * written by J.T. Conklin that was originally + * dedicated to the public domain. */ #include +#include + #if 0 RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $") #endif -ENTRY(strcmp) +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(strcmp) + ARCHFUNC(strcmp, scalar) + ARCHFUNC(strcmp, baseline) +ENDARCHFUNCS(strcmp) + +ARCHENTRY(strcmp, scalar) /* * Align s1 to word boundary. * Consider unrolling loop? @@ -39,7 +58,7 @@ ENTRY(strcmp) movabsq $0x8080808080808080,%r9 subq $8,%rsi - .align 4 + ALIGN_TEXT .Lword_loop: movq 8(%rdi),%rax addq $8,%rdi @@ -53,7 +72,7 @@ ENTRY(strcmp) testq %r9,%rdx je .Lword_loop - .align 4 + ALIGN_TEXT .Lbyte_loop: movb (%rdi),%al incq %rdi @@ -69,6 +88,272 @@ ENTRY(strcmp) movzbq %dl,%rdx subq %rdx,%rax ret -END(strcmp) +ARCHEND(strcmp, scalar) + +ARCHENTRY(strcmp, baseline) + /* check if either string crosses a page in the head */ + lea 15(%rdi), %r8d # end of head + lea 15(%rsi), %r9d + mov %edi, %eax + mov %esi, %edx + xor %edi, %r8d # bits that changed between first and last byte + xor %esi, %r9d + and $~0xf, %rdi # align heads to 16 bytes + and $~0xf, %rsi + or %r8d, %r9d # in either RSI or RDI + and $0xf, %eax # offset from alignment + and $0xf, %edx + pxor %xmm1, %xmm1 + test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + /* heads may cross page boundary, avoid unmapped loads */ + movdqa (%rdi), %xmm0 # load aligned heads + movdqa (%rsi), %xmm2 + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %edx, %ecx + shl %cl, %r9d # string head in XMM2 + movdqa %xmm0, -40(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -24(%rsp) + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + test %r8d, %r10d # NUL byte present in first string? + lea -40(%rsp), %r8 + cmovz %rdi, %r8 + test %r9d, %r11d # NUL byte present in second string? + lea -24(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rdx, 1), %xmm4 + jmp 1f + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rdx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + xor $0xffff, %r9d # mismatch or NUL byte? + jnz .Lhead_mismatch + + /* load head and second chunk */ + movdqa 16(%rdi), %xmm2 # load second chunks + movdqa 16(%rsi), %xmm3 + sub %rdx, %rax # is a&0xf >= b&0xf? + jb .Lswapped # if not, proceed with swapped operands + + neg %rax + movdqu 16(%rsi, %rax, 1), %xmm0 + sub %rdi, %rsi # express RSI as distance from RDI + lea (%rsi, %rax, 1), %rdx # point RDX to offset in second string + neg %rax + pcmpeqb %xmm3, %xmm1 # ... corresponding to RDI + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $16, %rdi + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d + jnz .Lmismatch + add $16, %rdi # advance aligned pointers + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rdi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb 16(%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rdi + test %r8d, %r8d + jnz .Lnul_found2 + xor $0xffff, %r9d # any mismatches? + jz 0b + + sub $16, %rdi # roll back second increment + + /* a mismatch has been found between RDX and RSI */ +.Lmismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rdi, %rdx # turn RDX from offset to pointer + movzbl (%rdx, %r9, 1), %ecx + movzbl (%rdi, %r9, 1), %eax + sub %ecx, %eax # difference of the mismatching chars + ret + + /* mismatch in true heads */ +.Lhead_mismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rax, %rdi # return to true heads + add %rdx, %rsi + movzbl (%rdi, %r9, 1), %eax # mismatching characters + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + ret + +.Lnul_found2: + sub $16, %rdi # roll back second increment + + /* a NUL has been found in RSI */ +.Lnul_found: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8w # adjust NUL mask to positions in RDI/RDX + xor $0xffff, %r9d # mask of mismatches + or %r8d, %r9d # NUL bytes also count as mismatches + jnz .Lmismatch + + /* + * (RDI) == (RSI) and NUL is past the string. + * Compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rdi, %rax, 1), %xmm0 + pcmpeqb (%rdi, %rsi, 1), %xmm0 + add %rdi, %rsi # restore RSI pointer + add %rax, %rdi # point RDI to chunk corresponding to (RSI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + ret + + /* + * If (a&0xf) < (b&0xf), we do the same thing but with swapped + * operands. I found that this performs slightly better than + * using conditional moves to do the swap branchless. + */ +.Lswapped: + movdqu 16(%rdi, %rax, 1), %xmm0 + sub %rsi, %rdi # express RDI as distance from RSI + lea (%rdi, %rax, 1), %rdx # point RDX to offset in RDI corresponding to RSI + neg %rax # make difference positive + pcmpeqb %xmm2, %xmm1 + pcmpeqb %xmm3, %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $16, %rsi # advance aligned pointers + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d + jnz .Lmismatchs + add $16, %rsi + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rsi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 # end of string in RSI? + pcmpeqb 16(%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rsi + test %r8d, %r8d + jnz .Lnul_found2s + xor $0xffff, %r9d # any mismatches? + jz 0b + + sub $16, %rsi # roll back second increment + + /* a mismatch has been found between RDX and RDI */ +.Lmismatchs: + tzcnt %r9d, %r9d # where is the mismatch? + add %rsi, %rdx # turn RDX from offset to pointer + movzbl (%rdx, %r9, 1), %eax + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax # difference of the mismatching chars + ret + +.Lnul_found2s: + sub $16, %rsi # roll back second increment + + /* a NUL has been found in RSI */ +.Lnul_founds: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8w # adjust NUL mask to positions in RDI/RDX + xor $0xffff, %r9d # mask of mismatches + or %r8d, %r9d # NUL bytes also count as mismatches + jnz .Lmismatchs + + /* + * (RDI) == (RSI) and NUL is past the string. + * Compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rsi, %rax, 1), %xmm0 + pcmpeqb (%rsi, %rdi, 1), %xmm0 + add %rsi, %rdi # restore RDI pointer + add %rax, %rsi # point RSI to chunk corresponding to (RDI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + ret +ARCHEND(strcmp, baseline) .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvY95RsFz58bdD; Wed, 24 Jan 2024 19:44: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 4TKvY94cMxz45LL; Wed, 24 Jan 2024 19:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8V8OwaIULZ0RVCXhwhKvRqVPeoTQDhj9g/lIYjn8Rk=; b=hFGZQdlckii6As9/3sIEDzyo7uQekx0RUw+om7bKfyqYNXMrs4/8OvBHPH/Qtr81JiZEbq dsh/ZN4aUWWQKOa9SDcNiJOMueJ1h1wVnbYxg/Q1Ojv9Wx2ePFIS3bzuk4tLAZXoVTwfOf mWbznvsyNbw/DbP5pxrngEiroCKSUMbAR/ARiVbp5Lr6gAvIqv0ief0QDG6AHuVdXrXRWS qe9PLVWaYLXgO0p3qfY0Lv8R63+XkcARvI51BsRrVGjzG0QteSB6GiWjN9XTtaCCmB6S9C JG8xu1+oEjjv13Ra7iZAjDE5QnVo5ENc8NSD8xSHQlmWuL483nxQHT8NfVmqpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8V8OwaIULZ0RVCXhwhKvRqVPeoTQDhj9g/lIYjn8Rk=; b=Ndcf1+KjnfnbgSIqG5DIWdgROZdYC5AsuqGYcqTerRTlE9xLMhq3LadEXPmb50zWlT6pWB JrEQTA38jKaRFBBoZfF0S8EaNfpwFijrgQ2wT88h8E0mCbVcCG2opjxaujLhvVbPdv+Q+6 j2b71BrMgRFslONqBfmwQdNp3kVZ90NQXEb6WIMqVwluli6LO2Ldd8aNFWb3Bo3BgHn6Gw yn+L76UD2Nfg6X3KHF81KyYfrPzwqYBUIajrzWUePWMBM7gS7wvlKUrUBr7a7lVRSWFZUz CsO+7i4uqx/jfdZ0ROICA/stXn/Qal3UQE3d9Be6zlZV2mrZrQHQiFKN5H4dqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125469; a=rsa-sha256; cv=none; b=Ezeax2CiFYwQKWwrnTJngUMYpC6IKvUS8zQEnRJXfXY0l+aj2ul7htcCtS4cvRFVqRfbDy G+obcZzz0oHhF8qotfiwZ8P5BfI2nRzBr4Lv1h1lZxJl5JVAH4Qwp0+5x/xgtqcjv/MaKe V490dV+/8koo0Y+jhNHMByCBwribdz6zZ1DwuSjeNTrmZpa98xAGfuKP/KCAbY3kbAgwmi aX0uNWVEBGv14M/KPanLSlPdAKhaanKb8tJCqTgpf6MzEauLOOLSiZJ+bQ7hUuHFhXIIF3 B8oEzqrogfopUUMzqTyKfto01Rmnqwf+JstaLTK2Ot7zuFKhq6VtbdrfDl0ZuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvY93ghMzSFL; Wed, 24 Jan 2024 19:44: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 40OJiTKP004846; Wed, 24 Jan 2024 19:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiTdm004843; Wed, 24 Jan 2024 19:44:29 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:29 GMT Message-Id: <202401241944.40OJiTdm004843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: d5782dbd011c - stable/14 - share/man/man7/simd.7: document new amd64 baseline strcmp() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d5782dbd011ca338a9da4c8d663c6897af7859e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d5782dbd011ca338a9da4c8d663c6897af7859e1 commit d5782dbd011ca338a9da4c8d663c6897af7859e1 Author: Robert Clausecker AuthorDate: 2023-09-25 06:18:06 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:24 +0000 share/man/man7/simd.7: document new amd64 baseline strcmp() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41971 (cherry picked from commit 47adb1e012643b8f32f6cf8c84cd50eb58f0f17a) --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 3fd8890c4f53..fc91ded85698 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 September 2, 2023 +.Dd September 25, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -68,7 +68,7 @@ Enhanced functions are present in the following architectures: .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 strcmp Ta Ta S Ta S1 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 From nobody Wed Jan 24 19:44:30 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYC05bSz58bY9; Wed, 24 Jan 2024 19:44: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 4TKvYB61kTz45LY; Wed, 24 Jan 2024 19:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JRNnz3DcSsS/vAnCfMtyhZbmFg/4iKKA29VR1nqd48k=; b=ZPbrOG8p+K0nrsrq7uPFv4flZ+KX835utNL2UsfXpt8divGaKTwEQAyv/6zObAfbUFRYK8 ohK47Kka98PoGxf2nAukox2vd6eI+8jAZlrLX68Yl52sb8EQ5yCb8sPPJafS3hSjDb2zYr 4z5ZdXJIf48gaD6QrijGtlsKgpzycjzkBNuAoC8q/v5jMBuPxVzMiCx/yqnjvTwjfkwrmV 6hYqeRR2d6XDkYHtw/YlU2s/oOdZAjwYXV9Sn9XJwJ7BdNhkYqw2BtwWrNyPIVcl43LXRk 3g7TrLLwhdC+OaRathbM+PfC3PrwY0t7x6iRCpZAg1r3Vx+qJ5joKK2/b6Expw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JRNnz3DcSsS/vAnCfMtyhZbmFg/4iKKA29VR1nqd48k=; b=U8qHYoO3jY89RPaHdVac2M+GjMd6NyJDI7JV9lyiS4oTO2tLkFx8HZej8vXA3FFyjpl0GH r+yRu15XhftYp3+z6mkJn+3eMSMwftFnXbyBigT7t1U0UL/NyenM4k/fUBgiL3JyoHBns4 hm+bcEGviGHWOf37ypUdIesdwxM+L8OPzu03pJQHZQL+Rpt0ZBNJ+dolVviQ4ff19AwuWU ap0fDAF8VH2Ldaw/5oH30Y/p25NJoQDg3H95wp044pOeRN5oP+Xb9y7IKj7LMCo2xCQjY4 rUT2G6UMt8ChvmXaCrAGO+aKyt+u1dxvdRlapTpAj4M0lnjHLxZe61+ZrQSu3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125470; a=rsa-sha256; cv=none; b=FdYamtsJZJYVHCPFRTpb7G9q9zdCUdJk6gVeMSfXqHVBIMk9SOcn1sjA4zgdfoOY8XEmM/ 5Gcx2+W/QPNCir35GS9YlHbKKjXlD3cpCrancDQxiD4cDDwyKz1nlXW8V1jRrf9hhGaIDg FQ0CbkGma/ee6KpccK0eqA4vVUR/TbGeglwyoiTUPt55XppJ9LRXoR9S6iQ5Okh+gy7x/S T7dr3di2imWhgwuVFc1/iFWs/ieWGAOM+k2Aa7rKyTZwaNkZ6HRCc+0uAEJjJ+4Vs0puAA j4Qcm7SaQ+ABopFnE9fXxkh3kCmUVdlWA763WfIYmuGQ3F0z9XSmf68gRoVyOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYB4glLzS8s; Wed, 24 Jan 2024 19:44: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 40OJiUFM004888; Wed, 24 Jan 2024 19:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiUdB004885; Wed, 24 Jan 2024 19:44:30 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:30 GMT Message-Id: <202401241944.40OJiUdB004885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 309b30ce8419 - stable/14 - lib/libc/amd64/string: implement strpbrk() through strcspn() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 309b30ce8419058b23b285d1c73549890fc174f5 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=309b30ce8419058b23b285d1c73549890fc174f5 commit 309b30ce8419058b23b285d1c73549890fc174f5 Author: Robert Clausecker AuthorDate: 2023-09-25 21:43:12 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:24 +0000 lib/libc/amd64/string: implement strpbrk() through strcspn() This lets us use our optimised strcspn() routine for strpbrk() calls. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41980 (cherry picked from commit f4fc317c364f2c81ad3d36763d8e5a60393ddbd1) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strcspn.S | 18 +++++++++------- lib/libc/amd64/string/strpbrk.c | 43 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 09bf7c8f251e..50c70007e99b 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -14,6 +14,7 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strnlen.c \ + strpbrk.c \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strcspn.S b/lib/libc/amd64/string/strcspn.S index 648635529e5b..7ebd7a847d67 100644 --- a/lib/libc/amd64/string/strcspn.S +++ b/lib/libc/amd64/string/strcspn.S @@ -33,13 +33,15 @@ #define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ -ARCHFUNCS(strcspn) - ARCHFUNC(strcspn, scalar) + .weak strcspn + .set strcspn, __strcspn +ARCHFUNCS(__strcspn) + ARCHFUNC(__strcspn, scalar) NOARCHFUNC - ARCHFUNC(strcspn, x86_64_v2) -ENDARCHFUNCS(strcspn) + ARCHFUNC(__strcspn, x86_64_v2) +ENDARCHFUNCS(__strcspn) -ARCHENTRY(strcspn, scalar) +ARCHENTRY(__strcspn, scalar) push %rbp # align stack to enable function call mov %rsp, %rbp sub $256, %rsp # allocate space for lookup table @@ -122,7 +124,7 @@ ARCHENTRY(strcspn, scalar) sub (%rsp), %rax # length of prefix before match leave ret -ARCHEND(strcspn, scalar) +ARCHEND(__strcspn, scalar) /* * This kernel uses pcmpistri to do the heavy lifting. @@ -134,7 +136,7 @@ ARCHEND(strcspn, scalar) * 17--32: two pcmpistri per 16 bytes of input * >=33: fall back to look up table */ -ARCHENTRY(strcspn, x86_64_v2) +ARCHENTRY(__strcspn, x86_64_v2) push %rbp mov %rsp, %rbp sub $256, %rsp @@ -389,6 +391,6 @@ ARCHENTRY(strcspn, x86_64_v2) 2: sub %rdi, %rax # number of characters preceding match leave ret -ARCHEND(strcspn, x86_64_v2) +ARCHEND(__strcspn, x86_64_v2) .section .note.GNU-stack,"",%progbits diff --git a/lib/libc/amd64/string/strpbrk.c b/lib/libc/amd64/string/strpbrk.c new file mode 100644 index 000000000000..87f587789991 --- /dev/null +++ b/lib/libc/amd64/string/strpbrk.c @@ -0,0 +1,43 @@ +/*- + * 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 + +size_t __strcspn(const char *, const char *); + +char * +strpbrk(const char *s, const char *charset) +{ + size_t loc; + + loc = __strcspn(s, charset); + + return (s[loc] == '\0' ? NULL : (char *)&s[loc]); +} From nobody Wed Jan 24 19:44:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYD2RMlz58bqc; Wed, 24 Jan 2024 19:44: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 4TKvYC6THgz45K8; Wed, 24 Jan 2024 19:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7t+kWDBwyG+dl3r4sM6NNzT19EmcGQWzZ/QRkY7xN3c=; b=qZLtbSyADQjMRWyYp2zVfmXiPyz5wn7SkdMS/3GAKd36f8UCtTzHJJ38TWWkPKSvaaCXX9 CPjNTpSk6Vt3gOhtdPJcX9NWb+y/Sv/nE3WmO2YT8XofWALsLr1hHoXf2izxMfztuHjepF neNniUbVLJBVXJelUNlT7ThJMkVCZ412+CKln4db4muRaO/opKp5rfN0FBe7V/jAoxg2q8 YSshjKF/9FaE+85B6oCqYwdWLjz6eCydVXdHgw3Gs4gHkE/jhzFHjBQIlqkqGpYKQEBoya swnqbBv0yl31VqCrez3YWbUdnEk6nRe63lOFJtaE4Hxrb8BIVMedXCZls/IzlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7t+kWDBwyG+dl3r4sM6NNzT19EmcGQWzZ/QRkY7xN3c=; b=B84iMquKhl4AfZTbJEt7A1z5oCELzzPVGKcVFazLo+5ITYoeA/KB5tTtExeVt1Srz5QgCd Jc82alehlt8DVCezkvAjXwGu7gs7Cg7UHjsZurqs8zVwFkPbJXoKW8F5Flwl0u5q+8fWkR WrYBnvzVdhCJpSANEVGPAQOdCm5EXvYuWd0xHbR1ZzobDnUOe7Y4ahIUKbQSz/0LlB6gHh TkoVgoUIKgaaNoQt44hA8BKYg1eHveHPwp/gdmUgS0cB2x+kJQzNwK++15aZgyKcPCUftd PDdLKejhNU0FlJj3DcMhVJnQipDyPeIjcfJJUgJCpGyzA5fwyRZxZxs32vWjlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125471; a=rsa-sha256; cv=none; b=YDsNVW8rpcGs7AtutAlJS0DjRzHVnPxxRqcA80xMDC/pZaSnBxbWIxXfrgeFro0LixfNjb dSltY8skyO5BuS/zwzTgC4R20H6sioo+RAe3y2Jq2LtuI5nymvcjkbzvuR9gAf2BD2McKo m+e2JSJfroN6bEMJipMG9Yvq6KkhzA25vfjfT0XdR9WzWkBTvmM4R2DA/UzejfsJajK44M xZDn3P3IAc2Jhiw5C2EXhfo1Onr0EQd2Uo1Lc08bkMGpuN9tRDhWezEyoLokTVVu3YNygD CwzAUhrctSac1hGoTc2UUKcpGAvZ78q9LOmzLrpBAF2AIbbgle8GRTgWimI3BA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYC5GgGzRkK; Wed, 24 Jan 2024 19:44: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 40OJiVnf004937; Wed, 24 Jan 2024 19:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiVRZ004934; Wed, 24 Jan 2024 19:44:31 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:31 GMT Message-Id: <202401241944.40OJiVRZ004934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f42eca44bdfb - stable/14 - share/man/man7/simd.7: document amd64 SIMD use for strpbrk() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f42eca44bdfba36f4a3dc004593117e079af4d92 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f42eca44bdfba36f4a3dc004593117e079af4d92 commit f42eca44bdfba36f4a3dc004593117e079af4d92 Author: Robert Clausecker AuthorDate: 2023-09-25 21:45:26 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 share/man/man7/simd.7: document amd64 SIMD use for strpbrk() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41980 (cherry picked from commit 8b60e1fdbefab1ffbc1b4222ae0a67e1d455fb45) --- share/man/man7/simd.7 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index fc91ded85698..cab48a01ead1 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -76,6 +76,7 @@ Enhanced functions are present in the following architectures: .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta Ta S +.It strpbrk Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 From nobody Wed Jan 24 19:44:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYF3Q85z58bqg; Wed, 24 Jan 2024 19:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYF0cLkz4550; Wed, 24 Jan 2024 19:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bN9hTyQ2FhluaaP6h6LIy6i/jYD1kNMvinZgdU3FDZk=; b=wDjpboQKEGb/SfOUkmxIMhdOcikGW70MuSug4/lgvN+v5JRy1o61Mwu5hLT7/T5hq3esko 3k54X2nDmvXijpglGXBj30ljtHcwUtwyUSef4hpBkPlQJHFC8gSb/E1v3lXzV+AdmuhwKS EQhq8WqpibOSx7D692nKikEVBOTHhpdWdJpzrWiV3ahiv/t6mE9IIUv6TOdT38/eImbe5/ JyUZaxnzTm2ZhaWsBfiI8JC36VRrwjX1aKaob2W/upWjq3mizLQ8OFYAe4Z9ncbNopFG0Y zx0c8pOQyHasTD6AO1hRYinMsCKYOy+Y/Pa9xOqKr4KBn2nCm5BKqTjb52wq7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bN9hTyQ2FhluaaP6h6LIy6i/jYD1kNMvinZgdU3FDZk=; b=O4+i9j80C5mVJGpqBmYZSPFb8Rpi6GfYcHHNG61dTW3A94w/5AfHxpXUOA9SYPQvFOHGID Ibu+9XTdhEi1EgDCYIDnyEFsO49m8n56eE+dxPZAPTDUsY6kSELDWb++2JcLyya0NFT5pA ObTn+g9E00DN5UGDd6JK2roPv5UtvaJ/n4JrLBOCasID4WyYxgtOSdJAVI8LEWdKIwrqUV 6VukBay1C7T5YOsgdivowyRk9UjzYKNc/1siZDd2Pm5WIVuJuenQf75neEfUHS2p6lxnZb lJij+V+H0sUHrhbupW+ob3xuAeXbeTpUr4zBvJ7mgvHk8tIDqcZRCVes6wQTyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125473; a=rsa-sha256; cv=none; b=x3nEKAEGw98QMV6GYv48Mgnl5+dZ97jh6RdGpi0Cbo3uSLImsZETe+uqdCGTjmg/3GzL62 40185+PmPfJ55ZG8mOgdoUTQVLXols6QY8ixOd+y21cMAuadSptm7N4Stz7A1KV3XVHnFX lEYR21EYjkmPIByC/wbmlF3pZvl3ZCfaRpcCv+mxqEZPI1vVtvitYGd0SFGaU2ov2avT8b GGQMYUNqfxIAkgsmiZF+qBIdjGxrqbiGdvFbjkc9RV+n8ol4KI/IE/Tx1lUiEyA7ImmgjW JQcyka3i/25j0DmXSrJ0UHCIMkEXkcFZA6tdl7hhLuOYmRe8eWGb/vYAtrIiDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYD6JqZzRy6; Wed, 24 Jan 2024 19:44: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 40OJiW9w004982; Wed, 24 Jan 2024 19:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiWk0004979; Wed, 24 Jan 2024 19:44:32 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:32 GMT Message-Id: <202401241944.40OJiWk0004979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 098997c5f05e - stable/14 - lib/libc/tests/string: add unit tests for strncmp(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 098997c5f05e157f2fae2787ec9a8b372156d487 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=098997c5f05e157f2fae2787ec9a8b372156d487 commit 098997c5f05e157f2fae2787ec9a8b372156d487 Author: Robert Clausecker AuthorDate: 2023-09-28 20:40:20 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 lib/libc/tests/string: add unit tests for strncmp(3) These are patterned after the previously added (D41970) strcmp tests, but are extended to check for various length conditions. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 (cherry picked from commit 459ddefcc9dcc010f6f7445285e61e2b6780379c) --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/strncmp_test.c | 165 +++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a090e1bd3463..5874f7b6b873 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memcmp_test ATF_TESTS_C+= memset_s_test +ATF_TESTS_C+= strncmp_test ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test diff --git a/lib/libc/tests/string/strncmp_test.c b/lib/libc/tests/string/strncmp_test.c new file mode 100644 index 000000000000..989c58bcfedf --- /dev/null +++ b/lib/libc/tests/string/strncmp_test.c @@ -0,0 +1,165 @@ +/*- + * 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 +#include +#include + +int (*volatile strncmp_fn)(const char *, const char *, size_t); + +static void +alignment_testcase(char *a, char *b, int want, size_t len) +{ + int res; + + res = strncmp_fn(a, b, len); + ATF_CHECK_MSG(want == (res > 0) - (res < 0), + "strcmp(%p \"%s\", %p \"%s\", %zu) = %d != %d", + (void *)a, a, (void *)b, b, len, res, want); +} + +static void +check_strncmp_alignments(char a[], char b[], + size_t a_off, size_t b_off, size_t len, size_t pos) +{ + char *a_str, *b_str, a_orig, b_orig; + + a[a_off] = '\0'; + b[b_off] = '\0'; + + a_str = a + a_off + 1; + b_str = b + b_off + 1; + + a_str[len] = '\0'; + b_str[len] = '\0'; + a_str[len+1] = 'A'; + b_str[len+1] = 'B'; + + a_orig = a_str[pos]; + b_orig = b_str[pos]; + + alignment_testcase(a_str, b_str, 0, len + 16); + alignment_testcase(a_str, b_str, 0, len + 1); + alignment_testcase(a_str, b_str, 0, len); + + if (pos < len) { + a_str[pos] = '\0'; + alignment_testcase(a_str, b_str, -1, len + 16); + alignment_testcase(a_str, b_str, -1, len + 1); + alignment_testcase(a_str, b_str, -1, len); + alignment_testcase(a_str, b_str, -1, pos + 1); + alignment_testcase(a_str, b_str, 0, pos); + a_str[pos] = a_orig; + + b_str[pos] = '\0'; + alignment_testcase(a_str, b_str, 1, len + 16); + alignment_testcase(a_str, b_str, 1, len + 1); + alignment_testcase(a_str, b_str, 1, len); + alignment_testcase(a_str, b_str, 1, pos + 1); + alignment_testcase(a_str, b_str, 0, pos); + b_str[pos] = b_orig; + } + + a_str[pos] = 'X'; + alignment_testcase(a_str, b_str, 1, len + 16); + alignment_testcase(a_str, b_str, 0, pos); + alignment_testcase(a_str, b_str, 1, pos + 1); + if (pos < len) { + alignment_testcase(a_str, b_str, 1, len); + alignment_testcase(a_str, b_str, 1, len + 1); + } + a_str[pos] = a_orig; + + b_str[pos] = 'X'; + alignment_testcase(a_str, b_str, -1, len + 16); + alignment_testcase(a_str, b_str, 0, pos); + alignment_testcase(a_str, b_str, -1, pos + 1); + if (pos < len) { + alignment_testcase(a_str, b_str, -1, len); + alignment_testcase(a_str, b_str, -1, len + 1); + } + b_str[pos] = b_orig; + + a[a_off] = '-'; + b[b_off] = '-'; + a_str[len] = '-'; + b_str[len] = '-'; + a_str[len+1] = '-'; + b_str[len+1] = '-'; +} + +ATF_TC(strncmp_alignments); +ATF_TC_HEAD(strncmp_alignments, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strncmp(3) with various alignments"); +} + +ATF_TC_BODY(strncmp_alignments, tc) +{ + size_t a_off, b_off, len, pos; + char a[64+16+16+3], b[64+16+16+3]; + + memset(a, '-', sizeof(a)); + memset(b, '-', sizeof(b)); + a[sizeof(a) - 1] = '\0'; + b[sizeof(b) - 1] = '\0'; + + for (a_off = 0; a_off < 16; a_off++) + for (b_off = 0; b_off < 16; b_off++) + for (len = 1; len <= 64; len++) + for (pos = 0; pos <= len; pos++) + check_strncmp_alignments(a, b, a_off, b_off, len, pos); +} + +ATF_TC(strncmp_null); +ATF_TC_HEAD(strncmp_null, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strncmp(3) with null pointers"); +} + +ATF_TC_BODY(strncmp_null, tc) +{ + alignment_testcase(NULL, NULL, 0, 0); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strncmp_fn = dlsym(dl_handle, "test_strncmp"); + if (strncmp_fn == NULL) + strncmp_fn = strncmp; + + ATF_TP_ADD_TC(tp, strncmp_alignments); + ATF_TP_ADD_TC(tp, strncmp_null); + + return atf_no_error(); +} From nobody Wed Jan 24 19:44:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYG3kDkz58bsv; Wed, 24 Jan 2024 19:44: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 4TKvYG10d9z45Pj; Wed, 24 Jan 2024 19:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6k6hI8oxvtMpbohVQWQmoOWiExD9V7YVKl+oEpmML0=; b=AP/UwY7F5uKfb80SocqnsQXd2ooE7mG2wOiQmqmiNcRr6vfsyW0hWHOHkRw9GrjBoyOlAc rEUo4+C6QkcbWeOIneEK1IazZhlrMpfFKPgYEbdKowNxln7cTSMJW9Dtft6CimLCVrG+jT EOhaq3+t3aysRhE+AMP/7kO+xkRRXI5I6SxtC20mEqPZGbLeSu0Gv5rAoenAxdClhUIl1N Ng0aTnXf9PWIIPF6B5xLfAS/Y0SDfgiCgZFhX0uOK8HvA8KsjJTLkARdRLUqH1yN+KHvKX r3cA1Miw/MPDp+n8LkfDOjg9JhNNPp4I+zRoTM4+Y4SiBEvktRgle6Q9B24A2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6k6hI8oxvtMpbohVQWQmoOWiExD9V7YVKl+oEpmML0=; b=tCwcwoWSzWKWq57mVY6dllOdJcSXrcVrWOpC3eRcCgjVdzEa4jcZFNOTD/cvkjaOawRZDL VXPPY7cQzbABLAcEA/JI5rC6lcqbVmT5BNQIEX9gKtLru5e8poTbmhx7t2VM8tqZDPjP3b R7brzzK+loa7DrB0rADXdVYEjlBIVDwNobfdm0nsmTMiB6AwjO6nSzezXTsnAcWfm6lzvT y6FKBzs4HeIP1p5wzJyNlDr38CIf2hedWokg6Bx07F9hQBLx9RCkwbzW/0kF8nHu21WRSX jCCYUHT7XSBZY2fHNuBfovlfY9O1DJcTEXLPEWxFqelR+zuoLcl7xyd4VGcR0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125474; a=rsa-sha256; cv=none; b=JbMjP5Wl9+mTLThrn0/10G7Iixcrq0p6uc2dQX8pewgu5hJu3oTO9OJ6LU5UCEtd5Tn/Xa yCQcXnmlkEM0I/viENSABCkZUmvzR1vc0a2xaCdMDLIEuozXMqkq4NGJzx/xGlcibGgoEy /tFRv65DBkE/EkoJrds7J2UAIzpae4GafhODS8iphb2UwGD5rps5jXmRCIq/BgeUrYoR/5 j4UHElpbm7aderMea9Zg2rQNbvqmixL7S1CreS5hxVuByXXdFU4Act6bWHkitQ+AAx4AO/ Hhvb1OqMO0YROU62ToMaiMYazeEkCgq1ewUo5rwJ2AndXrDHKpiCNOabxSLx8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYF72wkzRms; Wed, 24 Jan 2024 19:44: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 40OJiXUv005027; Wed, 24 Jan 2024 19:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiXxp005024; Wed, 24 Jan 2024 19:44:33 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:33 GMT Message-Id: <202401241944.40OJiXxp005024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 3a19fcb9fdbf - stable/14 - lib/libc/amd64/string: add strncmp scalar, baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a19fcb9fdbfd8bbc5955b14aba9bf481de2ad1a Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3a19fcb9fdbfd8bbc5955b14aba9bf481de2ad1a commit 3a19fcb9fdbfd8bbc5955b14aba9bf481de2ad1a Author: Robert Clausecker AuthorDate: 2023-09-27 22:46:04 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 lib/libc/amd64/string: add strncmp scalar, baseline implementation The scalar implementation is fairly straightforward and merely unrolled four times. The baseline implementation closely follows D41971 with appropriate extensions and extra code paths to pay attention to string length. Performance is quite good. We beat both glibc (except for very long strings, but they likely use AVX which we don't) and Bionic (except for medium-sized aligned strings, where we are still in the same ballpark). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 (cherry picked from commit 14289e973f5c941e4502cc2b11265e4b3072839a) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncmp.S | 488 +++++++++++++++++++++++++++++++++++++ 2 files changed, 489 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 50c70007e99b..51645ba3b8af 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcpy.c \ strcspn.S \ strlen.S \ + strncmp.S \ strnlen.c \ strpbrk.c \ strspn.S \ diff --git a/lib/libc/amd64/string/strncmp.S b/lib/libc/amd64/string/strncmp.S new file mode 100644 index 000000000000..932cf078bdfc --- /dev/null +++ b/lib/libc/amd64/string/strncmp.S @@ -0,0 +1,488 @@ +/*- + * 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 + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(strncmp) + ARCHFUNC(strncmp, scalar) + ARCHFUNC(strncmp, baseline) +ENDARCHFUNCS(strncmp) + +/* + * This is just the scalar loop unrolled a bunch of times. + */ +ARCHENTRY(strncmp, scalar) + xor %eax, %eax + sub $4, %rdx # 4 chars left to compare? + jbe 1f + + ALIGN_TEXT +0: movzbl (%rdi), %ecx + test %ecx, %ecx # NUL char in first string? + jz .L0 + cmpb (%rsi), %cl # mismatch between strings? + jnz .L0 + + movzbl 1(%rdi), %ecx + test %ecx, %ecx + jz .L1 + cmpb 1(%rsi), %cl + jnz .L1 + + movzbl 2(%rdi), %ecx + test %ecx, %ecx + jz .L2 + cmpb 2(%rsi), %cl + jnz .L2 + + movzbl 3(%rdi), %ecx + test %ecx, %ecx + jz .L3 + cmpb 3(%rsi), %cl + jnz .L3 + + add $4, %rdi # advance to next iteration + add $4, %rsi + sub $4, %rdx + ja 0b + + /* end of string within the next 4 characters */ +1: cmp $-4, %edx # end of string reached immediately? + jz .Leq + movzbl (%rdi), %ecx + test %ecx, %ecx + jz .L0 + cmpb (%rsi), %cl + jnz .L0 + + cmp $-3, %edx # end of string reached after 1 char? + jz .Leq + movzbl 1(%rdi), %ecx + test %ecx, %ecx + jz .L1 + cmpb 1(%rsi), %cl + jnz .L1 + + cmp $-2, %edx + jz .Leq + movzbl 2(%rdi), %ecx + test %ecx, %ecx + jz .L2 + cmpb 2(%rsi), %cl + jnz .L2 + + cmp $-1, %edx # either end of string after 3 chars, + jz .Leq # or it boils down to the last char + +.L3: inc %eax +.L2: inc %eax +.L1: inc %eax +.L0: movzbl (%rsi, %rax, 1), %ecx + movzbl (%rdi, %rax, 1), %eax + sub %ecx, %eax +.Leq: ret +ARCHEND(strncmp, scalar) + +ARCHENTRY(strncmp, baseline) + push %rbx + sub $1, %rdx # RDX--, so RDX points to the last byte to compare + jb .Lempty # where there any bytes to compare at all? + + lea 15(%rdi), %r8d # end of head + lea 15(%rsi), %r9d + mov %edi, %eax + mov %esi, %ebx + xor %edi, %r8d # bits that changed between first and last byte + xor %esi, %r9d + and $~0xf, %rdi # align heads to 16 bytes + and $~0xf, %rsi + or %r8d, %r9d + and $0xf, %eax # offset from alignment + and $0xf, %ebx + movdqa (%rdi), %xmm0 # load aligned heads + movdqa (%rsi), %xmm2 + pxor %xmm1, %xmm1 + cmp $16, %rdx # end of buffer within the first 32 bytes? + jb .Llt16 + + test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + + /* heads may cross page boundary, avoid unmapped loads */ + movdqa %xmm0, -32(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -16(%rsp) + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %ebx, %ecx + shl %cl, %r9d # string head in XMM2 + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + test %r8d, %r10d # NUL byte present in first string? + lea -32(%rsp), %r8 + cmovz %rdi, %r8 + test %r9d, %r11d # NUL byte present in second string? + lea -16(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rbx, 1), %xmm4 + jmp 1f + + /* rdx == 0 */ +.Lempty: + xor %eax, %eax # zero-length buffers compare equal + pop %rbx + ret + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rbx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + xor $0xffff, %r9d # mismatch or NUL byte? + jnz .Lhead_mismatch + + /* load head and second chunk */ + movdqa 16(%rdi), %xmm2 # load second chunks + movdqa 16(%rsi), %xmm3 + lea -16(%rdx, %rbx, 1), %rdx # account for length of RSI chunk + sub %rbx, %rax # is a&0xf >= b&0xf? + jb .Lswapped # if not, proceed with swapped operands + jmp .Lnormal + + /* buffer ends within the first 16 bytes */ +.Llt16: test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + /* heads may cross page boundary */ + movdqa %xmm0, -32(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -16(%rsp) + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %ebx, %ecx + shl %cl, %r9d # string head in XMM2 + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + lea (%rdx, %rax, 1), %ecx # location of last buffer byte in xmm0 + bts %ecx, %r10d # treat as if NUL byte present + lea (%rdx, %rbx, 1), %ecx + bts %ecx, %r11d + test %r8w, %r10w # NUL byte present in first string head? + lea -32(%rsp), %r8 + cmovz %rdi, %r8 + test %r9w, %r11w # NUL byte present in second string head? + lea -16(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rbx, 1), %xmm4 + jmp 1f + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rbx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + btr %edx, %r9d # induce mismatch in last byte of buffer + not %r9d # mismatch or NUL byte? + + /* mismatch in true heads */ + ALIGN_TEXT +.Lhead_mismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rax, %rdi # return to true heads + add %rbx, %rsi + movzbl (%rdi, %r9, 1), %eax # mismatching characters + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + + /* rax >= 0 */ + ALIGN_TEXT +.Lnormal: + neg %rax + movdqu 16(%rsi, %rax, 1), %xmm0 + sub %rdi, %rsi # express RSI as distance from RDI + lea (%rsi, %rax, 1), %rbx # point RBX to offset in second string + neg %rax # ... corresponding to RDI + pcmpeqb %xmm3, %xmm1 # NUL present? + pcmpeqb %xmm2, %xmm0 # Mismatch between chunks? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + mov $16, %ecx + cmp %rcx, %rdx # does the buffer end within (RDI,RSI,1)? + cmovb %edx, %ecx # ECX = min(16, RDX) + add $32, %rdi # advance to next iteration + bts %ecx, %r8d # mark end-of-buffer as if there was a NUL byte + test %r8w, %r8w # NUL or end of buffer found? + jnz .Lnul_found2 + xor $0xffff, %r9d + jnz .Lmismatch2 + sub $48, %rdx # end of buffer within first main loop iteration? + jb .Ltail # if yes, process tail + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rdi, %rbx, 1), %xmm0 # chunk of 2nd string corresponding to RDI + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rdi + test %r8d, %r8d + jnz .Lnul_found2 + xor $0xffff, %r9d + jnz .Lmismatch2 + sub $32, %rdx # end of buffer within next iteration? + jae 0b + + /* end of buffer will occur in next 32 bytes */ +.Ltail: movdqu (%rdi, %rbx, 1), %xmm0 # chunk of 2nd string corresponding to RDI + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + bts %edx, %r8d # indicate NUL byte at last byte in buffer + test %r8w, %r8w # NUL byte in first chunk? + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + sub $16, %edx # take first half into account + bts %edx, %r8d # indicate NUL byte at last byte in buffer + add $32, %rdi + +.Lnul_found2: + sub $16, %rdi + +.Lnul_found: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8d # adjust NUL mask to positions in RDI/RBX + not %r9d # mask of mismatches + or %r8w, %r9w # NUL bytes als count as mismatches + jnz .Lmismatch + + /* + * (RDI) == (RSI) and NUL is past the string. + * compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rdi, %rax, 1), %xmm0 + pcmpeqb (%rdi, %rsi, 1), %xmm0 + add %rdi, %rsi # restore RSI pointer + add %rax, %rdi # point RDI to chunk corresponding to (RSI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + +.Lmismatch2: + sub $16, %rdi + + /* a mismatch has been found between RBX and RSI */ +.Lmismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rdi, %rbx # turn RBX from offset into pointer + movzbl (%rbx, %r9, 1), %ecx + movzbl (%rdi, %r9, 1), %eax + sub %ecx, %eax + pop %rbx + ret + + /* rax < 0 */ + ALIGN_TEXT +.Lswapped: + movdqu 16(%rdi, %rax, 1), %xmm0 + sub %rsi, %rdi # express RDI as distance from RDI + lea (%rdi, %rax, 1), %rbx # point RBX to offset in first string + pcmpeqb %xmm2, %xmm1 # NUL present? + pcmpeqb %xmm3, %xmm0 # mismatch between chunks? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add %rax, %rdx # RDX points to buffer end in RSI + neg %rax # ... corresponding to RSI + mov $16, %ecx + cmp %rcx, %rdx # does the buffer end within (RSI,RDI,1)? + cmovb %edx, %ecx # ECX = min(16, RDX) + add $32, %rsi + bts %ecx, %r8d # mark end-of-buffer as if there was a NUL byte + test %r8w, %r8w # NUL or end of buffer found? + jnz .Lnul_found2s + xor $0xffff, %r9d + jnz .Lmismatch2s + sub $48, %rdx # end of buffer within first main loop iteration? + jb .Ltails # if yes, process tail + + ALIGN_TEXT +0: movdqu (%rsi, %rbx, 1), %xmm0 # chunk of 1st string corresponding to RSI + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RDI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 + pcmpeqb 16(%rsi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rsi + test %r8d, %r8d + jnz .Lnul_found2s + xor $0xffff, %r9d + jnz .Lmismatch2s + sub $32, %rdx # end of buffer within next iteration? + jae 0b + + /* end of buffer will occur in next 32 bytes */ +.Ltails: + movdqu (%rsi, %rbx, 1), %xmm0 # chunk of 1st string corresponding to RSI + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RDI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + bts %edx, %r8d # indicate NUL byte at laste byte in buffer + test %r8w, %r8w # NUL byte in first chunk? + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 + pcmpeqb 16(%rsi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + sub $16, %edx # take first half into account + bts %edx, %r8d # indicate NUL byte at laste byte in buffer + add $32, %rsi + +.Lnul_found2s: + sub $16, %rsi + +.Lnul_founds: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8d # adjust NUL mask to positions in RSI/RBX + not %r9d # mask of mismatches + or %r8w, %r9w # NUL bytes also count as mismatches + jnz .Lmismatchs + + movdqu (%rsi, %rax, 1), %xmm0 + pcmpeqb (%rsi, %rdi, 1), %xmm0 + add %rsi, %rdi # restore RDI pointer + add %rax, %rsi # point RSI to chunk corresponding to (RDI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + +.Lmismatch2s: + sub $16, %rsi + +.Lmismatchs: + tzcnt %r9d, %r9d # where is the mismatch? + add %rsi, %rbx # turn RBX from offset into pointer + movzbl (%rbx, %r9, 1), %eax + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + pop %rbx + ret +ARCHEND(strncmp, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYH50gxz58bYN; Wed, 24 Jan 2024 19:44: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 4TKvYH21lKz45ZQ; Wed, 24 Jan 2024 19:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKdCSygBEq8qsP2bXC2pu5KcLDi1oyWwet7AEgwweBs=; b=IYNc27tGdFBYe6VNMUfda6N2ccqScl6GLbEPE9OyI5wUv0y0U/QGGAROPZBHSMgIEEsfd8 OvZnBvmvymHDMkEgPqbYmK9CLTASlV4AXR3lRvJoyajmq1Dy4DFfiX7Usi7gdxr1jyc9K9 8qcHfHPLp2WXuhTZXByuVVIpmCW5irfTQYZJlzrYKLBc3wgKVj2T8G/M7Tx06gDV21bG9e cbQ0YbzXLt8XarZRWfVE2MzP2zjh/B7K14qjsrTu84eADSJuq97jFt0HK/jqYyMG3L0GYL 0/M4UJADsHR0WE1Lh2gTb2k+TnuV28IkOWqVGIjapl7UYGslpQDs2BghsXMtfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKdCSygBEq8qsP2bXC2pu5KcLDi1oyWwet7AEgwweBs=; b=soKJ+vyBR9Zn53zBwQkzzIHaAlNINKkAQFVQ9cuV9B+BhdPsZb0X17Oqrt+SzS4hq1Gy5d ji6M76Yc8UfI8vttlwuuNrzPKEXCcHSXqjZkgnxv0yyHuENbVvm988IyJVBORxFoDio4Vj ViazqTmm/IbPpMdBghHpHlyTapUl2YYjxkIRsE+Vtxu6Z2UPhmYZ0RYK4T2RgXWA0Jm5Z7 VQL7tD8MTSszXyytQQPr6UCpjPk3ZquMCUjR2Z8KuU/t/9wZHVocALxV3YVM0z8MNJ+TbG YDWlWTDkU8Hvy4FLMzkTKdCK2Vlkc715/XmxoYvzsDIm1PwTldKWqpI8PrUArg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125475; a=rsa-sha256; cv=none; b=PyqOF8sENqIjd4Dib3uI9rlq+bL1tjR9wopvvV+9wS4nMIqqhoq3jsTdqzgQeuXTQ6Bw0U 9i/JA5D79wUhTP/Rv+MsIjdSrz98kE/T4qE5W4asYZeYiRXDUBEm+LCmnYoRKb6narfv9Q 0uYJfBT0KAedHbZx00jT6yCALvVgxX340gVAyBHXgYYFeRNGuMpLP8R7uyqV7c+mjDISEd xzWhIrmYaPw3P59PN5NP/CD1SF7BhCipeAYvzXK4gYZ5VZW99U1KLhHf7VoWltrejJqgLX csAhcOpaZQslDRBgMv4bqri2B86Dn20diWA/rTXYAnuDEZu/Lyk+FzZfoq8WvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYH0lzlzSFM; Wed, 24 Jan 2024 19:44: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 40OJiZYm005075; Wed, 24 Jan 2024 19:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiZho005072; Wed, 24 Jan 2024 19:44:35 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:35 GMT Message-Id: <202401241944.40OJiZho005072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: fa6d214aa16e - stable/14 - share/man/man7/simd.7: document strncmp amd64 scalar, baseline implementations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: fa6d214aa16ed3f86b4f597fbdca9d606579e3b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fa6d214aa16ed3f86b4f597fbdca9d606579e3b2 commit fa6d214aa16ed3f86b4f597fbdca9d606579e3b2 Author: Robert Clausecker AuthorDate: 2023-10-08 02:46:36 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 share/man/man7/simd.7: document strncmp amd64 scalar, baseline implementations Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 (cherry picked from commit f5edd8450e5328c5b88977b4d00e780cdd744dea) --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index cab48a01ead1..39642429c1c4 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 September 25, 2023 +.Dd October 7, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -72,7 +72,7 @@ Enhanced functions are present in the following architectures: .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 strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta Ta S From nobody Wed Jan 24 19:44:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYJ4z1Pz58bt1; Wed, 24 Jan 2024 19:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYJ2NZYz45Mv; Wed, 24 Jan 2024 19:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oBMYe2IKvgEQ6CaUWofp0YNxjMc4o+XLZP4tpk6T0IE=; b=i1hH5h6JlsQ6mgFx9auFT3mUQdgqJ2yuw1Sbd3sW9v+/L9ODmWJnux1N+HMiF/1lpjDJaB OcSahkhGYCcqT4mW6hKWpSajRXvVbvnl4BuqSSziwhBoQB2KIm57/KTVSWNBptD3FrqIM9 0f3LqwxZyldXJuYfJq6yZjXkyXvKDpOPoVPllUlJ2zADrvSsgSVZFMUhUIXwjqrtfuw93o 0u9bVNZelZbp9Q1c9z/4zLPVT2lab702EX0dni/Nk/vHFCRwpdfiv1p6D9jrkbDuHmX3A4 xWm9eEOSBUyG5xwBrZM03zXLesKYWKqZpFdRfr0duipHJEAuoRudGhDmisv8ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oBMYe2IKvgEQ6CaUWofp0YNxjMc4o+XLZP4tpk6T0IE=; b=dQRu0X1Xpi2oPsMbO44rK2H95dX8ybFetgOHTXqZ+eh9jyvGeRtV88gWPBrEXsB8crF7mj ivbib59Fl6zNhCE1uSIZeWh99pCZQCBquRw3OGWwaRrHVilRuQl2Llklw96l7Qh0Cc06pt 5UsHCIkfQF08D4nWVKUqB9Zg5Qiiya/JJ6Ekis3A/iMlW32/QZdQCV0i4wt5hBmW+YFzKa E6HK2AK1RIyqAqg0bjeBOa5zt7SfrJGnobv+I67WIrAljnggZnFlH/nHXnwUrmGa+CR3Gr jQrlMIG0rWWH5jMCuFpGTbp6buIjB4SnEzwkXs0R1kYTrewmfHtJRTava9DuFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125476; a=rsa-sha256; cv=none; b=Xn3cLJn26kgqhMUjnzSqMPZnrtTMyeHH8ufz5yuTeANjEoou+tepVxarLaA5w54Bl9crjX eoRM4KtIBL21sOG3zUjgFfHttb9gnxhvSV365mqODglgxQUyIudwUK6tPoovpFkCqhHWsI WR6K2ycj01BQNbUF2swgwcCGBae8vwGxIV7PhIlMj/p0sF/eBbL7kQUluL9SfFXldzStU1 O+HCXLpohcuBHP59RdZoQLcWqkqlKSbQRXitqOlJB1EHfMwNYTCxpdCElknklaf2WLuiZQ 2RclD0XnfoW1f0nT695k/ZPdCXDXcfckG/2ODMTmt2SqAol3Y+q/qeLskwC74Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYJ1VvxzS8t; Wed, 24 Jan 2024 19:44: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 40OJiaj4005130; Wed, 24 Jan 2024 19:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiaFv005127; Wed, 24 Jan 2024 19:44:36 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:36 GMT Message-Id: <202401241944.40OJiaFv005127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 9b1a851e1ed0 - stable/14 - lib/libc/amd64/string: add strrchr scalar, baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b1a851e1ed04d38736011c227e8f9494acec681 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=9b1a851e1ed04d38736011c227e8f9494acec681 commit 9b1a851e1ed04d38736011c227e8f9494acec681 Author: Robert Clausecker AuthorDate: 2023-10-12 05:37:41 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 lib/libc/amd64/string: add strrchr scalar, baseline implementation The baseline implementation is very straightforward, while the scalar implementation suffers from register pressure and the need to use SWAR techniques similar to those used for strchr(). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42217 (cherry picked from commit 2ed514a220edbac6ca5ec9f40a3e0b3f2804796d) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strrchr.S | 209 +++++++++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 51645ba3b8af..2baa631fb3fa 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -16,6 +16,7 @@ MDSRCS+= \ strncmp.S \ strnlen.c \ strpbrk.c \ + strrchr.S \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strrchr.S b/lib/libc/amd64/string/strrchr.S new file mode 100644 index 000000000000..e397bbcd3478 --- /dev/null +++ b/lib/libc/amd64/string/strrchr.S @@ -0,0 +1,209 @@ +/*- + * 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 + + .weak rindex + .set rindex, strrchr + +ARCHFUNCS(strrchr) + ARCHFUNC(strrchr, scalar) + ARCHFUNC(strrchr, baseline) +ENDARCHFUNCS(strrchr) + +ARCHENTRY(strrchr, scalar) + mov %edi, %ecx + and $~7, %rdi # align to 8 byte + movzbl %sil, %esi # clear stray high bits + movabs $0x0101010101010101, %r8 + mov (%rdi), %rax # load first word + imul %r8, %rsi # replicate char 8 times + + /* + * Unaligned input: align to 8 bytes. Then proceed the same + * way as with aligned input, but prevent matches before the + * beginning of the string. This is achieved by oring 0x01 + * into each byte of the buffer before the string + */ + shl $3, %ecx + mov %r8, %r10 + shl %cl, %r10 # 0x01 where the string is + xor %r8, %r10 # 0x01 where it is not + neg %r8 # negate 01..01 so we can use lea + movabs $0x8080808080808080, %r9 + + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + or %r10, %rax # ensure str != 0 before string + or %r10, %rcx # ensure str^c != 0 before string + bswap %rcx # in reverse order, to find last match + mov %rdi, %r10 # location of initial mismatch (if any) + xor %r11, %r11 # initial mismatch (none) + add $8, %rdi # advance to next iteration + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jnz 1f # end of string? + + lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + mov %rcx, %r11 # remember mismatch in head + jmp 0f + + /* main loop unrolled twice */ + ALIGN_TEXT +3: lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + lea -8(%rdi), %rdx + cmovnz %rdx, %r10 # remember location of current mismatch + cmovnz %rcx, %r11 + +0: mov (%rdi), %rax # str + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + bswap %rcx # in reverse order, to find last match + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jnz 2f # end of string? + + lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + cmovnz %rdi, %r10 # remember location of current mismatch + cmovnz %rcx, %r11 + + mov 8(%rdi), %rax # str + add $16, %rdi + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + bswap %rcx + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jz 3b # end of string? + + /* NUL found */ +1: sub $8, %rdi # undo advance past buffer +2: lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + lea -1(%rax), %rdx + xor %rdx, %rax # mask of bytes in the string + bswap %rdx # in reverse order + and %rdx, %rcx # c found in the tail? + cmovnz %rdi, %r10 + cmovnz %rcx, %r11 + bswap %r11 # unreverse byte order + bsr %r11, %rcx # last location of c in (R10) + shr $3, %rcx # as byte offset + lea (%r10, %rcx, 1), %rax # pointer to match + test %r11, %r11 # was there actually a match? + cmovz %r11, %rax # if not, return null pointer + ret +ARCHEND(strrchr, scalar) + +ARCHENTRY(strrchr, baseline) + mov %edi, %ecx + and $~0xf, %rdi # align to 16 bytes + movdqa (%rdi), %xmm1 + movd %esi, %xmm0 + and $0xf, %ecx # offset from alignment + pxor %xmm2, %xmm2 + mov $-1, %edx + punpcklbw %xmm0, %xmm0 # c -> cc + shl %cl, %edx # bits corresponding to bytes in the string + punpcklwd %xmm0, %xmm0 # cc -> cccc + xor %r8, %r8 # address of latest match + mov $1, %esi # bit mask of latest match + mov %rdi, %r9 # candidate location for next match + add $16, %rdi # advance to next chunk + + /* check for match in head */ + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pshufd $0, %xmm0, %xmm0 # cccc -> cccccccccccccccc + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + and %edx, %ecx # c present in the string? + and %edx, %eax # NUL present in the string? + jnz .Lend2 + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa (%rdi), %xmm1 + test %ecx, %ecx # was there a match in the last iter.? + cmovnz %r9, %r8 # remember match if any + cmovnz %ecx, %esi + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + test %eax, %eax # end of string in first half? + jnz .Lend + + movdqa 16(%rdi), %xmm1 + test %ecx, %ecx # was there a match in the last iter.? + cmovnz %rdi, %r8 # remember match if any + cmovnz %ecx, %esi + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + lea 16(%rdi), %r9 + add $32, %rdi + test %eax, %eax # end of string in second half? + jz 0b + + ALIGN_TEXT +.Lend2: sub $16, %rdi +.Lend: lea -1(%rax), %edx + xor %edx, %eax # mask of bytes in the string + and %eax, %ecx # c found in the tail? + cmovnz %rdi, %r8 + cmovnz %ecx, %esi + bsr %esi, %esi # last location of c in (R8) + lea (%r8, %rsi, 1), %rax # pointer to match + ret +ARCHEND(strrchr, baseline) + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYK4xnMz58bqp; Wed, 24 Jan 2024 19:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYK3lCfz45Vf; Wed, 24 Jan 2024 19:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX5ZEsfLFw6tAQ7du+BUX0WvR2x8M/ZEmbNo8y+OSVY=; b=CclZVb7BgsHFtsXFFei1nQZIaxzYOUmFpsDoE5spOh3ba0e5qjHeXdZML7QXGS4ga7+U5l MhId/Vh434Sa2emNpGlErsRogVZcqRTpcLOkG90WU2Nidy+LwivPPtP+BGYH2nLI9/N8Gn +Au7g4uc+O4S1BYC3sLjsj0S4Fwnth+pkE4kOnbXzH7rMr84OFkkisEbw+GFX9lnhlzFvA vizf73GwsTydM71d2QAdbb9RNzkozbjnw/DDLlxDSkwn9YtE1MMbliBYf0sN68p0LCU2Io jV5D7PyhB/HPK/i2UccOUBuWi21MVrb9JbY0UuZUe6cFB4B0S2UxF01L6WReuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX5ZEsfLFw6tAQ7du+BUX0WvR2x8M/ZEmbNo8y+OSVY=; b=jjSV1VEEu3GzpPkwMML19R/eNYNHBkS0gyi3LiOZp8YQ1+omUomEAkcsiC0pKxjqjuJMuN p73dXoKvov/R3lHoNt1TP/Gj6+kw6JB79J2exB4tQlvFULbNCevaCApFTCsBH0mazdaG7O D730kyGRE3vSjH4iGk1oaspijYGv0xtNcpE+CGBcyyjOH6DztzUrN/KchtmKm2erQo0/ez jbSClBX/iEm00wfKyLmEZXAdjAGAJYxIlt63YC/dxcLM8fkkSxJvQJdP8jeG3BXvJmLlDN 7ZKEQS+6L+92Eva8O8vbBWGEHSH5k2HjSyXCjEZLRqbRDjmSQHOfDyp+0v8YyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125477; a=rsa-sha256; cv=none; b=HoPdimEmSGdUvHW9frTyyhYtAugBn/3WPTjnTri70nzCT1Eg9xgKAuoAfhkz3gU97muoqU TKHOipvYbzD0Q9edxs2q7fINctS3XD+axtIvZ+ED3dPUbowZk9xsmJvwJwKWT4UEb7VMna wsdC1K878+dnhzsyNJdDnrl6U/OrUZojpE3coqzuyHgBM/BjoBrnZ3yAoSVGJwGR71I84x +iIrtfTwO8xKygMoIRgbHndJ4aLaPaZDQt/o4NgiVrPbogLXNaZV3RRnO02W5rb65mG9G7 5wfMXUAE7gwuREM384U4vOJWkQFXgya3eIDwZwrrmKSECZoZJvnE6z3RlVGoiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYK2kZFzS6M; Wed, 24 Jan 2024 19:44: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 40OJib6n005180; Wed, 24 Jan 2024 19:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJib9e005176; Wed, 24 Jan 2024 19:44:37 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:37 GMT Message-Id: <202401241944.40OJib9e005176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: c105cd8426bb - stable/14 - share/man/man7/simd.7: document strrchr scalar, baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c105cd8426bb0e100a4023898635c66bcea50e1f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=c105cd8426bb0e100a4023898635c66bcea50e1f commit c105cd8426bb0e100a4023898635c66bcea50e1f Author: Robert Clausecker AuthorDate: 2023-10-12 22:31:55 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 share/man/man7/simd.7: document strrchr scalar, baseline implementation Also mention missing rindex() entry, which is provided through strrchr(). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42217 (cherry picked from commit dd1c2e887c1fa087bf15cbf7f0bdc35b7875bdd6) --- share/man/man7/simd.7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 39642429c1c4..4e5c078a6e95 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 October 7, 2023 +.Dd October 12, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -63,7 +63,7 @@ Enhanced functions are present in the following architectures: .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 rindex Ta S Ta Ta S1 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 @@ -75,7 +75,7 @@ Enhanced functions are present in the following architectures: .It strncmp Ta Ta S Ta S1 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 strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S From nobody Wed Jan 24 19:44:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYN0H9Yz58bdY; Wed, 24 Jan 2024 19:44: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 4TKvYM5QF8z45Xv; Wed, 24 Jan 2024 19:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqbZCI9ue6ac/L1WPu+RY3S4zGejaA/5wYynlDXc22A=; b=k+SAFvtQ1UyxzkcSlnL5dJTpyrAG1visV0aRgkamJM6iNM1Euz7+ir369z6/PzUnWizHIa cgj2rrjJjOJ/lGmvD3hDBH27Xyc2K64EwTPvrnyOfN94CGd52zBTa2QyLQgMB0CrCwd0IU tCCOfBXXmHEGstevNuEeadENQz3aYOV1D+Fbccardi7uZD0mkHexet1N4NSs1DqRIUendJ TCpXUtPBFofUClWUEcae7Um4YILeJ4E9R2YHFrAIXNDj0DxGdisNW0t7Yp3bR4LkkNID2V MWGel6PREUPoGvMAz1mUG44k99c4FfWD13R5UcLhFyoQtO3azvPqLPe7cOARng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqbZCI9ue6ac/L1WPu+RY3S4zGejaA/5wYynlDXc22A=; b=Vfem8tIDNFmrxY7eJY1lPm8ZxIrKsZc3ptOfjHowlBVEtYXThG5MbK9xnuzKr23Kxc5Pvr YpWKy/Fdw3lsTREvORhugAbNUGJznrefxn9Fe+5ZF8UEEH1elGdQGfm4RRTs8bCgooUrpw pWmU4sj/J4YQYRLFHHmL8PThtOqHSfezdP2t1YMt7sYWZ2V5vjH3MWaDg5ow/OxmqHPSA4 zyCHZJjxW5DL+1RGTqOJke9hylJqWc28f8CI0V8F+EYBG1Sb1+LUkf0YFw3sLCoAxSa3V3 P0boUYY142+CxOQu8F/h+7Lu8dlk44TZomGGA0COkAiEKX6hLndo1mezbqB2pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125479; a=rsa-sha256; cv=none; b=qqDKHoByKmjf92P5msTnZSc2NOz5TIk6JAlsvb/zQAgeOFw8z7MZXbJWnbjgoPxeG1QCE5 uDHXR87hjdEKVYdzJVqvPPnaR1o4jhiB+ahl4RLvQpQCXet/aLLqjA1AnAYnazx3eLFANA M+xZUpOEUrsPziPyEEHFJNV6BzGNv//F7yMsBJ5WVI42B5HMEMt3vVfeLyDuf52TchRjWK xgdz/fBIbCs7gBDPwQnZ8LrZ/eaX80IxT1GuoITmJEZ4fHh8qhuV+5JcImzso16MivDKFi +I+vrzrUTzTJ7Mf5eWBnGSKsdZ3AExAO5WlAr9pPPm5swSiVj42aBTXBCYbfGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYM4WsLzRmt; Wed, 24 Jan 2024 19:44: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 40OJidmF005277; Wed, 24 Jan 2024 19:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJid70005274; Wed, 24 Jan 2024 19:44:39 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:39 GMT Message-Id: <202401241944.40OJid70005274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 8dc035482310 - stable/14 - share/man/man7/simd.7: document amd64 SIMD use for strsep() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8dc0354823104385e8a0cb217264e07680e8fdfa Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc0354823104385e8a0cb217264e07680e8fdfa commit 8dc0354823104385e8a0cb217264e07680e8fdfa Author: Robert Clausecker AuthorDate: 2023-10-24 03:57:56 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 share/man/man7/simd.7: document amd64 SIMD use for strsep() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42346 (cherry picked from commit 75cb202698a65cb809eb2fea194a73e79c509d9c) --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 4e5c078a6e95..4437d025394f 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 October 12, 2023 +.Dd October 23, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -77,6 +77,7 @@ Enhanced functions are present in the following architectures: .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 +.It strsep Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 From nobody Wed Jan 24 19:44:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYM1SM5z58bbV; Wed, 24 Jan 2024 19:44: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 4TKvYL4d56z45mK; Wed, 24 Jan 2024 19:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrzbsZ93eGgsfc6aFhnRRVArk7y6epf+Y5mrwirMVyE=; b=LE/wdcWZpnHi2gcy9aDW7eJtuavF7RK+rXlOggzQlZm/RFYbqRzEnU8Y4yuOj1s0DEmPig yQ/YFxenexTQxhk70/vHa6/C/w9nmHaLGf4mUdg3IFRVVAef1Ef7ylHnzg+3vK3AwKt/Ap DeC01qy8wBySWs5mhiie3vny7ogzWWxp3+RF/RNWjZxRF8L9ddffatX/noWMgbltJfp0Q7 Me0g4dbohcMI7elDvtEyQMrueOcFw4iO12mUXfegxg4IdDiqEhcZahbF5OzHGco2VNl2YX hXr+pKiDAEclq0W6+o6GH7ALXExn1dENyS9ghN6Yyt8t3IKUin52j6ewaY5IsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrzbsZ93eGgsfc6aFhnRRVArk7y6epf+Y5mrwirMVyE=; b=SROpn8gVvQ31GIRgmj5tqm6WmOjE5xlWSdt/kJ+wJQoLaACxBF2lMZGxJK5g5hpKA2CYpz FJB2HSQxvcTvZjwXWyPLO1IUcFG7HvmRGvsc54mSOtRNBn4A+8F/L0Me5XeYoWdwwh6MPe lJ/6vI9SoeEjW2E82oU7tw8fImMGgAWwj9Xp6IW8y+dMDrqJWrIW1AVcZB/i1vrsvyddh4 /gI91LT5NP9TP+QBq34koFJ3aeFEBpKS7uqIiLUApKqKHyZopF/k75OE3ulyTvzmKMcG96 TBYabdQMYqVhetmsnlc2EBzSS5DwLxXxAJLa1DV47v35Z4lD2T/F+5zUMJhOPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125478; a=rsa-sha256; cv=none; b=NQ9cdT52xci+cty2KXpolf6PPXeaeLblSMhROHIQgqu0LKB1wGGAxg13HH4OpNBVEPjt93 12fZ2xUFE+03WXtnhq+Fu5m0KgsQC1xc8h2gNh3n6sUTNE2SSRrl1coxvnZchrVt4XMZkf jlkfuEjNwBPQYn4AmHfhzWX/o0zqHlha3kpC57JKK3F8kKFoNQWifBXhghteoye/J50dyG re5ybAZQlenz6SXUlY06MRjVxx8y+Fr1MVBZKtEk0TBa3thXkN6SRRkQXgpfkzpj9zN/bf zDU8NAyJNFYJiZEH4V2DrGHDkJKSZDqvSVxNPOfHJvexcj+TsS6V72ympGzlRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYL3kfnzRkL; Wed, 24 Jan 2024 19:44: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 40OJicuh005225; Wed, 24 Jan 2024 19:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJicwC005222; Wed, 24 Jan 2024 19:44:38 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:38 GMT Message-Id: <202401241944.40OJicwC005222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 265fb89aba2a - stable/14 - lib/libc/amd64/string: implement strsep() through strcspn() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 265fb89aba2a6504f0a055e47ce6a72b1eecacf1 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=265fb89aba2a6504f0a055e47ce6a72b1eecacf1 commit 265fb89aba2a6504f0a055e47ce6a72b1eecacf1 Author: Robert Clausecker AuthorDate: 2023-10-24 03:52:01 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 lib/libc/amd64/string: implement strsep() through strcspn() The strsep() function is basically strcspn() with extra steps. On amd64, we now have an optimised implementation of strcspn(), so instead of implementing the inner loop manually, just call into the optimised routine. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42346 (cherry picked from commit fd2ecd91aeeeab579c769c9a39f90b4bd4a493a9) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strsep.c | 57 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 2baa631fb3fa..ee396f98eccc 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -17,6 +17,7 @@ MDSRCS+= \ strnlen.c \ strpbrk.c \ strrchr.S \ + strsep.c \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strsep.c b/lib/libc/amd64/string/strsep.c new file mode 100644 index 000000000000..9fda56d7e135 --- /dev/null +++ b/lib/libc/amd64/string/strsep.c @@ -0,0 +1,57 @@ +/*- + * 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 + +size_t __strcspn(const char *, const char *); + +/* + * We have a fast strcspn() on amd64. Use it over a direct + * implementation of strsep for better performance. + */ +char * +strsep(char **stringp, const char *delim) +{ + size_t n; + char *s; + + s = *stringp; + if (s == NULL) + return (NULL); + + n = __strcspn(s, delim); + if (s[n] == '\0') + *stringp = NULL; + else { + s[n] = '\0'; + *stringp = s + n + 1; + } + + return (s); +} From nobody Wed Jan 24 19:44:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYP1cpvz58btB; Wed, 24 Jan 2024 19:44: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 4TKvYN6hk9z45kf; Wed, 24 Jan 2024 19:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egIk7kgjFoheXFbr6n3cMJ1WolElWdNzIdtzMaCEasg=; b=cELJb5P5nUcgazaMIEToiL/zepQRTMWX8gje580fn3y98d1UelEPol4gq9Ktkqwp6N8s0A cely93lJbCt9bANmT2HgryOgUyw32GX6mPTXQYPAJpwy+gU/oM3zY8kVxV7y5/TFnmIdjn sO2kJb3eW7Fe8/GiivxaOf/H9TaZFxNosSZe6L6r6fPebN9ilOwMIZ1xD7ibrADIrM4hx4 KJTOxEW1+9a08su1gZErPqVCUHkoO+VLxDtDwdt/lyU9xBXUzu1lCdTIOzqMr7m4EBHuyy +CgOeIntbmy9+FIFgMpYJfxYTaPiIK1xPNBtBmgZsQX0xfq8Ia2B6JATB0amQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egIk7kgjFoheXFbr6n3cMJ1WolElWdNzIdtzMaCEasg=; b=ykH2zQlRugvSJPD/7JJwH7cokem6+3DDZmm0mpM/C6q10HgwwKK7aKsxnAudDrWLsgr6aw NvrOCPMQOrX+j8SrqGJCECU+KiAOlN1CxMh9JPZC7+XzXF8Bh2b73Z+NhoF1/kn0/P0re2 8Yu7Y979HFdAs04bY0TRnG6RfW8FJbe/AOc9Qw3Nh2PwH67yLe+ovqVLjaniXhOTND3e/1 DhBvW+epGYr3EpTPIb3jOt91/1as9WAmhBvRc/jS/jW+eGNyWQ6ZGSgRtF338r+mlvorTN Cez8EvUudwKrB0esGjP+y5yxdNpkQ0ktpZFxq9jxikNiiIol6xYFn45/Y9NsHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125480; a=rsa-sha256; cv=none; b=eXjX1Avfun1kebv/5FP6uqUYHWon/fGi4NKd+R8QY8y9RXkYwac70K/YAO+nIfwfRPgIdv lj9J8/puqunvUnQhS/jGotTZ2MdT7KJWbb9WxvMyLziChTft/JwnCIKZrykwqbbMTFTt5g HHAAsFABI8wAd3Uj/mK0O2aYeqOwETHgy0MoT+1OsRvBh9GsMmDco7JwuD1093kTZD4pGS ZZ1nVKcrU5ogAuMjQmkhykyVPKHNhw963J4ol8j36icAeftO4I46qaboHYA20JtDTzAWZ6 DTqVMcyfchFuVm3dN9dMylPQsIuFLHYo5avfXH81yO50EoI57r5ijryjGPtnJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYN5pgzzRkM; Wed, 24 Jan 2024 19:44: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 40OJiexb005324; Wed, 24 Jan 2024 19:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJieKH005320; Wed, 24 Jan 2024 19:44:40 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:40 GMT Message-Id: <202401241944.40OJieKH005320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 438a1ff803a5 - stable/14 - lib/libc/tests/string/stpncpy_test.c: extend for upcoming SSE implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 438a1ff803a5d033b80b16880b2718f1402d904f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=438a1ff803a5d033b80b16880b2718f1402d904f commit 438a1ff803a5d033b80b16880b2718f1402d904f Author: Robert Clausecker AuthorDate: 2023-11-05 04:02:00 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 lib/libc/tests/string/stpncpy_test.c: extend for upcoming SSE implementation This adds additional unit tests validating the function for All possible alignment offsets of source and destination. Also extend the test to allow testing of an external stpncpy implementation, which greatly simplifies the development of custom implementations. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit 6fa9e7d8737548ef93c573387ce62402c368d486) --- lib/libc/tests/string/stpncpy_test.c | 99 +++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 14 deletions(-) diff --git a/lib/libc/tests/string/stpncpy_test.c b/lib/libc/tests/string/stpncpy_test.c index 8154237eb8c2..8574b2d591be 100644 --- a/lib/libc/tests/string/stpncpy_test.c +++ b/lib/libc/tests/string/stpncpy_test.c @@ -1,7 +1,11 @@ /*- * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were 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: @@ -27,12 +31,15 @@ #include #include #include +#include #include #include #include #include +static char *(*stpncpy_fn)(char *restrict, const char *restrict, size_t); + static char * makebuf(size_t len, int guard_at_end) { @@ -69,7 +76,7 @@ test_stpncpy(const char *s) dst = makebuf(bufsize, j); memset(dst, 'X', bufsize); len = (bufsize < size) ? bufsize : size - 1; - assert(stpncpy(dst, src, bufsize) == dst+len); + assert(stpncpy_fn(dst, src, bufsize) == dst+len); assert(memcmp(src, dst, len) == 0); for (x = len; x < bufsize; x++) assert(dst[x] == '\0'); @@ -78,33 +85,97 @@ test_stpncpy(const char *s) } } -ATF_TC_WITHOUT_HEAD(nul); -ATF_TC_BODY(nul, tc) +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) { + size_t i; + const char *res, *wantres; + const char *fail = NULL; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + src[srclen] = '\0'; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen+1] = ')'; + + memset(dest, 0xee, destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + wantres = dest + (srclen > destlen ? destlen : srclen); + res = stpncpy_fn(dest, src, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (strncmp(src, dest, destlen) != 0) + fail = "string not copied correctly"; + else if (res != wantres) + fail = "incorrect return value"; + else for (i = srclen; i < destlen; i++) + if (dest[i] != '\0') { + fail = "incomplete NUL padding"; + break; + } - test_stpncpy(""); + if (fail) + atf_tc_fail_nonfatal("%s\n" + "stpncpy(%p \"%s\", %p \"%s\", %zu) = %p (want %p)\n", + fail, dest, dest, src, src, destlen, res, wantres); } -ATF_TC_WITHOUT_HEAD(foo); -ATF_TC_BODY(foo, tc) +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) { - - test_stpncpy("foo"); + ATF_CHECK_EQ(stpncpy_fn(NULL, NULL, 0), NULL); } -ATF_TC_WITHOUT_HEAD(glorp); -ATF_TC_BODY(glorp, tc) +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) { + size_t i; + char buf[64+1]; - test_stpncpy("glorp"); + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + buf[i+1] = '\0'; + test_stpncpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+3+64]; /* 15 offsets + 64 max length + NUL + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 0; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); } ATF_TP_ADD_TCS(tp) { + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + stpncpy_fn = dlsym(dl_handle, "test_stpncpy"); + if (stpncpy_fn == NULL) + stpncpy_fn = stpncpy; - ATF_TP_ADD_TC(tp, nul); - ATF_TP_ADD_TC(tp, foo); - ATF_TP_ADD_TC(tp, glorp); + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); return (atf_no_error()); } From nobody Wed Jan 24 19:44:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYQ3Dpfz58bbW; Wed, 24 Jan 2024 19:44: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 4TKvYQ0bLWz45pq; Wed, 24 Jan 2024 19:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MGIoiRuXWQn9n/EV/T13VQjb6CURt3kLbRgQqJynBs0=; b=DNS87sXw72qXLIpqpTXbT42wSTt99ErIeph8s16Tk/c5I3JCfti/aF0xQJI5dH0Xu6wHIG JaXlAKyY+D5PXLzdkW/wXwuF0auAvYgjdVR2Oeg9IGvYMQlW+efp0FGP2vt5Y4P2vjCDxO WyDU6VYJCkRN1O7Ls4AfBWXkuYLUeY3RT8XrZg+xabLx57VtNBnHg4YZdbrFKImdyYw+bI 8zndIAurtgAN1+zhQcIA9a+BvYflCAv04+CXDarnP4C6LQVpFdnVkl+xJgz/U3KHbvRiTE h1VSuJ/AWxhQGU5tRvdGaSeLq7JXPwmzhMUEiEUf6iMAIwmzWwCG0CRmE3lmqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MGIoiRuXWQn9n/EV/T13VQjb6CURt3kLbRgQqJynBs0=; b=NkhuAEFOZmCyl0Ph8b1f2vlxgWMZd7sXJL8Lbn7Tg1P8T+kphFzaSApeZb5toFUkjd+yHe pUg7+xiw4zAyvxJ4NAwImv0nubXdXFaZDllD2GNQvQz5cF5pFljx/2hpb+YwBsuUDBBzKs ke/a5DD3+yK52Mq/B0q+IBB2oU6q5qDT1qs25Ir7Vwhsu0ePx2UF4RZovbTn3kwmmXT46E Y358IpOeUjbvTnt6d5X7dz7bPD66zIfulJo7xpNA0sOnr1sJAlJjMTykXMw1acO74/ET2P wozz0zuZ04ucLqVLbNWrCLKKiCdipHxRV/aD1WFPLUGHUEHJMMaxLDRtAezvhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125482; a=rsa-sha256; cv=none; b=KWTxGkVzsHDq5tMIs6yaBmA03hCGGoXtdRE2HFGakwdzmOyXOjVYCeLcgTTZEn5kNwLlLA p7aWbCjfHx6ga+9j1FWZaqumLgV7M2NIPLWcCAXDEIPbmw/83fsDtvIif4qP184OTMX1QG GSuCJ+vu5UoQO7rQ2dFdbSFJmHMvxKYQq9+9CxUlk5zMZKJixMFJ7u1QMIOzPkWkzeYeW1 H7HB/q/0IG5VVTfz/nuuuOiRE+/v43s6tYdfNPyElRndxKmFpH6BlngjRt1eDk0YjDTvBX nxD0xvkut/qRf3Xp5QpU8MJGaLNjVSAYIBjXobIvrn+5u9jj3dnvMBIMVVHf0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYP6pYkzRkN; Wed, 24 Jan 2024 19:44: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 40OJiftO005378; Wed, 24 Jan 2024 19:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJifLp005375; Wed, 24 Jan 2024 19:44:41 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:41 GMT Message-Id: <202401241944.40OJifLp005375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7527fecbfe0c - stable/14 - lib/libc/amd64/string: add stpncpy scalar, baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7527fecbfe0c7b8c9f8515ca92f9c936e687ec9d Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7527fecbfe0c7b8c9f8515ca92f9c936e687ec9d commit 7527fecbfe0c7b8c9f8515ca92f9c936e687ec9d Author: Robert Clausecker AuthorDate: 2023-10-30 03:15:46 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 lib/libc/amd64/string: add stpncpy scalar, baseline implementation This was surprisingly annoying to get right, despite being such a simple function. A scalar implementation is also provided, it just calls into our optimised memchr(), memcpy(), and memset() routines to carry out its job. I'm quite happy with the performance. glibc only beats us for very long strings, likely due to the use of AVX-512. The scalar implementation just calls into our optimised memchr(), memcpy(), and memset() routines, so it has a high overhead to begin with but then performs ok for the amount of effort that went into it. Still beats the old C code, except for very short strings. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit 90253d49db09a9b1490c448d05314f3e4bbfa468) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/stpncpy.S | 283 +++++++++++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index ee396f98eccc..cc8b0e825e3e 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -7,6 +7,7 @@ MDSRCS+= \ memmove.S \ memset.S \ stpcpy.S \ + stpncpy.S \ strcat.S \ strchrnul.S \ strcmp.S \ diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S new file mode 100644 index 000000000000..5ce0dd093a9e --- /dev/null +++ b/lib/libc/amd64/string/stpncpy.S @@ -0,0 +1,283 @@ +/* + * 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 + + .weak stpncpy + .set stpncpy, __stpncpy +ARCHFUNCS(__stpncpy) + ARCHFUNC(__stpncpy, scalar) + ARCHFUNC(__stpncpy, baseline) +ENDARCHFUNCS(__stpncpy) + +ARCHENTRY(__stpncpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + + push %rdx + push %rdi + push %rsi + push %rax # dummy push for alignment + + mov %rsi, %rdi + xor %esi, %esi + call CNAME(__memchr) # memchr(src, '\0', len) + pop %rcx # dummy pop + pop %rsi + mov -16(%rbp), %rdi + + test %rax, %rax # NUL found? + jz .Lfullcopy + + mov %rax, %rdx + sub %rsi, %rdx # copy until the NUL byte + add %rdx, -16(%rbp) # advance destination by string length + sub %rdx, -8(%rbp) # and shorten buffer size by string length + call CNAME(memcpy) + + pop %rdi + pop %rdx + xor %esi, %esi + pop %rbp + jmp CNAME(memset) # clear remaining buffer + +.Lfullcopy: + mov -8(%rbp), %rdx + call CNAME(memcpy) # copy whole string + add -8(%rbp), %rax # point to dest[n] + leave + ret +ARCHEND(__stpncpy, scalar) + + /* + * this mask allows us to generate masks of 16-n 0xff bytes + * followed by n 0x00 bytes by loading from .Lmask+n. + */ + .section .rodata +.Lmask: .quad 0xffffffffffffffff + .quad 0xffffffffffffffff + .quad 0x0000000000000000 + .quad 0x0000000000000000 + +/* stpncpy(char *restrict rdi, const char *rsi, size_t rdx) */ +ARCHENTRY(__stpncpy, baseline) +#define bounce (-3*16-8) /* location of on-stack bounce buffer */ + + test %rdx, %rdx # no bytes to copy? + jz .L0 + + mov %esi, %ecx + and $~0xf, %rsi # align source to 16 bytes + movdqa (%rsi), %xmm0 # load head + and $0xf, %ecx # offset from alignment + mov $-1, %r9d + lea -32(%rcx), %rax # set up overflow-proof comparison rdx+rcx<=32 + shl %cl, %r9d # mask of bytes belonging to the string + sub %rcx, %rdi # adjust RDI to correspond to RSI + pxor %xmm1, %xmm1 + movdqa %xmm0, bounce(%rsp) # stash copy of head on the stack + pcmpeqb %xmm1, %xmm0 + pmovmskb %xmm0, %r8d + + lea (%rdx, %rcx, 1), %r10 # buffer length from alignment boundary + add %rdx, %rax # less than 2 chunks (32 bytes) to play with? + jnc .Lrunt # if yes, use special runt processing + + movdqu %xmm1, -16(%rdi, %r10, 1) # clear final bytes of destination + and %r9d, %r8d # end of string within head? + jnz .Lheadnul + + movdqu (%rsi, %rcx, 1), %xmm2 # load head from source buffer + movdqu %xmm2, (%rdi, %rcx, 1) # an deposit + + add $16, %rsi + add $16, %rdi + sub $32, %r10 + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa (%rsi), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %r8d + test %r8d, %r8d + jnz 3f + + movdqu %xmm0, (%rdi) + cmp $16, %r10 # more than a full chunk left? + jbe 1f + + movdqa 16(%rsi), %xmm0 + add $32, %rdi # advance pointers to next chunk + add $32, %rsi + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %r8d + test %r8d, %r8d + jnz 2f + + movdqu %xmm0, -16(%rdi) + sub $32, %r10 # more than another full chunk left? + ja 0b + + sub $16, %rdi # undo second advancement + sub $16, %rsi + add $16, %r10d # restore number of remaining bytes + + /* 1--16 bytes left but string has not ended yet */ +1: pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi), %xmm1 # NUL byte in source tail? + pmovmskb %xmm1, %r8d + bts %r10d, %r8d # treat end of buffer as NUL + tzcnt %r8d, %r8d # where is the NUL byte? + movdqu (%rsi, %r8, 1), %xmm0 # load source tail before NUL + lea 16(%rdi, %r8, 1), %rax # point return value to NUL byte + # or end of buffer + movdqu %xmm0, (%rdi, %r8, 1) # store tail into the buffer + ret + +2: sub $16, %rdi # undo second advancement + sub $16, %rsi + sub $16, %r10 + + /* string has ended and buffer has not */ +3: tzcnt %r8d, %r8d # where did the string end? + lea .Lmask+16(%rip), %rcx + lea (%rdi, %r8, 1), %rax # where the NUL byte will be + neg %r8 + movdqu (%rcx, %r8, 1), %xmm1 # mask with FF where the string is, + # 00 where it is not + pand %xmm1, %xmm0 # mask out bytes after the string + movdqu %xmm0, (%rdi) # store masked current chunk + pxor %xmm1, %xmm1 + sub $16, %r10 # another full chunk left? + jbe 1f + + /* clear remaining destination buffer (tail has been cleared earlier) */ + ALIGN_TEXT +0: movdqu %xmm1, 16(%rdi) + cmp $16, %r10 + jbe 1f + + movdqu %xmm1, 32(%rdi) + add $32, %rdi + sub $32, %r10 + ja 0b + +1: ret + + /* at least two chunks to play with and NUL while processing head */ +.Lheadnul: + movdqu bounce(%rsp, %rcx, 1), %xmm0 # load start of source from stack + tzcnt %r8d, %r8d # find location of NUL byte + movdqu %xmm0, (%rdi, %rcx, 1) # deposit head in the destination + movdqu %xmm1, (%rdi, %r8, 1) # clear out following bytes + movdqu %xmm1, 16(%rdi) # clear out second chunk + lea (%rdi, %r8, 1), %rax # make RAX point to the NUL byte + + add $32, %rdi # advance past first two chunks + sub $32+16, %r10 # advance past first three chunks + jbe 1f # did we pass the end of the buffer? + + /* clear remaining destination buffer (tail has been cleared earlier) */ + ALIGN_TEXT +0: movdqu %xmm1, (%rdi) # clear out buffer chunk + cmp $16, %r10 + jbe 1f + + movdqu %xmm1, 16(%rdi) + add $32, %rdi + sub $32, %r10 + ja 0b + +1: ret + + /* 1--32 bytes to copy, bounce through the stack */ +.Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy + bts %r10d, %r8d # treat end of buffer as end of string + and %r9w, %r8w # end of string within first buffer? + jnz 0f # if yes, do not inspect second buffer + + movdqa 16(%rsi), %xmm0 # load second chunk of input + movdqa %xmm0, bounce+16(%rsp) # stash copy on stack + pcmpeqb %xmm1, %xmm0 # NUL in second chunk? + pmovmskb %xmm0, %r9d + shl $16, %r9d + or %r9d, %r8d # merge found NUL bytes into NUL mask + + /* end of string after one buffer */ +0: tzcnt %r8d, %r8d # location of last char in string + movdqu %xmm1, bounce(%rsp, %r8, 1) # clear bytes behind string + lea bounce(%rsp, %rcx, 1), %rsi # start of string copy on stack + lea (%rdi, %r8, 1), %rax # return pointer to NUL byte + + cmp $16, %edx # at least 16 bytes to transfer? + jae .L1631 + + mov (%rsi), %r8 # load string head + cmp $8, %edx # at least 8 bytes to transfer? + jae .L0815 + + cmp $4, %edx # at least 4 bytes to transfer? + jae .L0407 + + movzwl -2(%rsi, %rdx, 1), %esi # load last two bytes of string + mov %r8b, (%rdi, %rcx, 1) # store first byte + + cmp $2, %edx # at least 2 bytes to transfer? + jb .L1 + + mov %si, -2(%rdi, %r10, 1) # store last two bytes of string +.L1: ret + +.L1631: movdqu (%rsi), %xmm0 # load first 16 bytes of string + movdqu -16(%rsi, %rdx, 1), %xmm1 # load last 16 bytes of string + movdqu %xmm0, (%rdi, %rcx, 1) + movdqu %xmm1, -16(%rdi, %r10, 1) + ret + +.L0815: mov -8(%rsi, %rdx, 1), %rdx # load last 8 bytes of string + mov %r8, (%rdi, %rcx, 1) + mov %rdx, -8(%rdi, %r10, 1) + ret + +.L0407: mov -4(%rsi, %rdx, 1), %edx # load last four bytes of string + mov %r8d, (%rdi, %rcx, 1) + mov %edx, -4(%rdi, %r10, 1) + ret + + /* length 0 buffer: just return dest */ +.L0: mov %rdi, %rax + ret +ARCHEND(__stpncpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYR3yK7z58bdc; Wed, 24 Jan 2024 19:44: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 4TKvYR1h0Wz45Yv; Wed, 24 Jan 2024 19:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mwWIMsA8EW2p6ZJTe6rik4Nw5HAxOOWKM7iyAGNVZM=; b=umJZ808btVxoQ3CwWvD94u21YMBIiDXwPT8kBiWFoYzYQ2gBtfhIEHliLC2x2jGZxwVYHA AXyV14wNxroP3VfboIz0cTa0NSoE5MUpq4/gQOFF5SWStvW3JDi5ESCmmE+Qw5POkEG1p7 byfDwseUsKgnHTXGB4mdRZRKE0maMSw9IsrXiANtsoYRUtNEfpSH2Sa8oC/FLfQttinSA+ vunwOL+xh9vyheVppNgVBgThaQh3qhFzsWC/EClnpv1A/45cgPDGj5r62eZeejW+ni8e3X 7CSx+Q2exeiaPdRX8xA78btTMzscDAFjpoxoUzWLV+mZfyif1Qr3Zry9+U1rxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mwWIMsA8EW2p6ZJTe6rik4Nw5HAxOOWKM7iyAGNVZM=; b=YvxUJO/ITqpowus2V/P4xwxKnthxTKi5JzfzPhX7Z9wtmz8EqPmiJHvunhBKvDYl9pFIVA crT58i7q46P0CK1s5u/wqhH9OZbG84oQkqs5TVJ9olLMrAR+lqPndD3HwEjb9azX2b8Pe8 mGTvgA6NfkxGq4k0liYfgjGSgDCSyy4OCc+ewAzagBhS4L73nboAMnv9HRh9evtwVd19lG 1MDkm5LhMphZLPJp9ZsFLTCadpdxgTJ58EBa86MdRI8a0rmL3P9CT+09MRFR2M3UNzzosM 8iZSEV4hTU3xV7wH0+Y2WDm9E7cXW/p5YvuZB7M0SynbOALJtZdhE5tuRpZwNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125483; a=rsa-sha256; cv=none; b=rCeHVIGtHrD0FC4TEwtE4GCbUUnrngWvnc4PllkkYAvSYuQzgbKDmK21BEhErIztj9YyAf 3hZpoMbO5j5tKq0TI8bLM3M5aTD2JZKbpUzmIs374Y+iEOE97G4btHtI0M/UrTo1SYx57O qKcmPVuNHUxy6otB+S/knQ84S9ERdrl5c8GUo4qsYfFduEyOSsyKlzrs4sTEP1fY2b8qbg paQjDCXVF2cb9PcLvSw/GHMHLw52Uwv+IzIo0MuchZCiyI/7WoRsJ0eB+ik5fcoRdD7oMZ QnvXqZbIa9keGqDWbu1vtAE+vmdXr0p+8Si7wz3gZfTRsMB0G9vEdwQWVA9VQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYR0kGyzS8v; Wed, 24 Jan 2024 19:44: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 40OJihF5005423; Wed, 24 Jan 2024 19:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJihde005420; Wed, 24 Jan 2024 19:44:43 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:43 GMT Message-Id: <202401241944.40OJihde005420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 76f9afcdcfa4 - stable/14 - lib/libc/amd64/string: implement strncpy() by calling stpncpy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 76f9afcdcfa482d81d5f3017f29c087fe795bb4f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=76f9afcdcfa482d81d5f3017f29c087fe795bb4f commit 76f9afcdcfa482d81d5f3017f29c087fe795bb4f Author: Robert Clausecker AuthorDate: 2023-11-09 04:25:55 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 lib/libc/amd64/string: implement strncpy() by calling stpncpy() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit e19d46c808267f53455e96a28ff7654211523d2c) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncpy.c | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index cc8b0e825e3e..d982061e080b 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -15,6 +15,7 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strncmp.S \ + strncpy.c \ strnlen.c \ strpbrk.c \ strrchr.S \ diff --git a/lib/libc/amd64/string/strncpy.c b/lib/libc/amd64/string/strncpy.c new file mode 100644 index 000000000000..b3d868787fbe --- /dev/null +++ b/lib/libc/amd64/string/strncpy.c @@ -0,0 +1,41 @@ +/*- + * 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 + +char *__stpncpy(char *restrict, const char *restrict, size_t); + +char * +strncpy(char *restrict dst, const char *restrict src, size_t len) +{ + + __stpncpy(dst, src, len); + + return (dst); +} From nobody Wed Jan 24 19:44:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYS6GYgz58bqx; Wed, 24 Jan 2024 19:44: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 4TKvYS2ytrz45cH; Wed, 24 Jan 2024 19:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ8/mXJC7eYxiOFsFvhfPwakIMvznnGy2UkAmD2r1T8=; b=qRzX1yB0iHDwXRVpjqZ1ku5TutsAdPMYJs8PfYIW9uGotPjGC9MRy0eJVaEePbvaf8t3r8 7LZvCPHObxmoRMWEYpYSDz9ljAxxD8ETKbwf++aDhPCcAWkVOYAv0+Jv+1T/7SGMLPu3bj +Is1zYNHEh/KzWj+02FEwOEfclEaZxxgWwsna0/oFVQVX+MRCnehe2Qplmd6jfbgs/cYGE uZ3yVdxbYIGDLOFrWnl9xjopmAPbiMCVSEIxVb1nEaJoafhCnNXvPt446RgNXWbAwVPXQm QPf/gZSpRKho1HzOXxvvIDXsoVS1EGQvmqT/d01Ww+X4rViIU7UD4vobBf/ILA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ8/mXJC7eYxiOFsFvhfPwakIMvznnGy2UkAmD2r1T8=; b=tL2gPVTKDgHFNUj4OfGx8+p0ZL5z+xmIre1UZLdAarbZapBZJMxHG8cg76xhTxQg3Y8d/c G5kk3SEOvOCark3fUwc8XbrfOTUTzP+CiztJg1zED07L1As9AJ0Nwfx357ZEZil35ZB0++ UmQmGHGEUrJeYudwSL/pUfP0N1KZ+AVm+Dq7XTjZonvA0EKNQyUKm+fc+6qzfwCrJ7jF6a dHXNIioKn5c6rRlhIJsWyKcpIP70mBBnvCBZ8n8JEIa1K/TNPnr+efZ34xQ8NtQuX6Ftw2 uyshz1edlVHaZTDqFzyJEOxZF+lmLl56AivUS0sFMxucxMI3ejMP0xML2ObDcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125484; a=rsa-sha256; cv=none; b=Y9bePtbJOtJQAusqPXohiGAnMvba2f4liyLeE19wcfHq/mBEdtCEoxGtRvDlJEodmha7e7 rdC6dKAhw4qEO0iqlPSPUL86ctxA2g/sEh5dI34DsLYeETgbHr/VqeiP3OPXTbk1M8x13h +pHQm85RG2pU6Mwmqxl0hfPJpEcP1YxQrfYWsLPTVca3B5wFZVBuP3rlN/b6mYhLPyeVks C9/VQ4uK+AHPMBwPVG45wYf7bEJcMElVSSNLnjQnOvTg/X/veUuRln02IpASPJ7CQN4HDk qUskl95JQKD3fbSV41e/+F+ea2FHF8cO283wY2WT1+Ey3UaL88pyM5k6AYFbfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYS1rCKzRkP; Wed, 24 Jan 2024 19:44: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 40OJii24005466; Wed, 24 Jan 2024 19:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiiDZ005463; Wed, 24 Jan 2024 19:44:44 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:44 GMT Message-Id: <202401241944.40OJiiDZ005463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 57da891ad354 - stable/14 - share/man/man7/simd.7: document simd-enhanced strncpy, stpncpy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 57da891ad354455a057eaec3d7860f2c462c3e16 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=57da891ad354455a057eaec3d7860f2c462c3e16 commit 57da891ad354455a057eaec3d7860f2c462c3e16 Author: Robert Clausecker AuthorDate: 2023-11-09 04:39:11 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 share/man/man7/simd.7: document simd-enhanced strncpy, stpncpy Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit 75a9e2250656ff78ec1b0a124f282b925138ff51) --- share/man/man7/simd.7 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 4437d025394f..f3818c530af5 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 October 23, 2023 +.Dd November 8, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -65,6 +65,7 @@ Enhanced functions are present in the following architectures: .It memset Ta Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 +.It stpncpy 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 @@ -73,7 +74,7 @@ Enhanced functions are present in the following architectures: .It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta S1 Ta S -.It strncpy Ta Ta Ta Ta Ta S2 +.It strncpy Ta Ta Ta S1 Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 @@ -209,7 +210,7 @@ SIMD-enhanced functions were first added with for .Cm powerpc64 and with -.Fx 14.0 +.Fx 14.1 for .Cm amd64 . .Pp From nobody Wed Jan 24 19:44:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYT4XcZz58byN; Wed, 24 Jan 2024 19:44: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 4TKvYT3lymz45vx; Wed, 24 Jan 2024 19:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urA6C0nK8QWTGpAkMueLyumKoRFp00uR73vU36lsDgI=; b=wx+b8sRfgtHiUo4eQl9G8l+z+lYCSShQTop692MzwskDIjIpcJb6fwSWKBEdjxwO+4eY1n FuwJS3tSfy0JUrXKr5nqQxWnSn7V4rqjxjcAruG+OWZ9iHVFyfvKgs0/0AboWPDsp/UG54 qH91Y/kLbQswUgC7qFTVZf4V70lNGgjv+/+Vr/Vrud5CCutupR+72JEEyLQXUrgmlZpstU tYpjK/4f1JaOMbWu2g8uR7/tCr0XYkcy+hkSOKlJB9t8YJDDO3lMJx68i0Kk0XUOxqyP9+ hytaXXv/DwBC01QXrQkZhUngTL1+x/X+ILgjYwE7/zUEKuCm47H6YggquNAtzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urA6C0nK8QWTGpAkMueLyumKoRFp00uR73vU36lsDgI=; b=dRDC0IfjiOTxQ+SqcoeV0uIy2V2/OkXyJOrhhcmUSNB15iMlf/ypOViQa07wXqZkAuzKOP C8IbpgDh80K8fbMrzWx/hZeXzBvAYNrv/cgItndokoBecJQICG1Fdf8Y8agTxY5U51jgfq pLAZNLPoB4jNKTJN5ldHe9MtGwN8sWT7Tz3QaqFaWxX3oobPScLIYh1Qk3+k/ge3dOriWs 9KZxCnZEpoQVigyhpEAH9Z4P0mej8r1af7QtebhkEFZe0m8bwnhOxDpwihRCEzd0ABtT7p 7Bn9HpX+DiYX6EmcIICAX15RONEGhezA62RbNmK7nEkK7bMrOU0SkogeQQCvzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125485; a=rsa-sha256; cv=none; b=jXhq2/464V7Y/fypIBjf+kI9DPt27wCxriAOvEZzDC2xHyHQWBwBcJ+/qTBBQqF7CPmIqK lgS9pCWGFa18OjVmjnsbVo1l3ZT0ZrecM/r/OZEVKrm/bphYJOlsxLbVTDAHliaVW18N/o G3KYuy4JKEo4B7eL0f7rLNXvt9Vicj3Nqru//9JeETDhjWbc3jkDfaqIY9Kk5KfFTd4xrD VRNgHShOfdYCYq7hXsniEsGEGHgNNC1bstuwft7SZgEJZD68IyLpMl+LxOZJEa0Fy+It7e VU4If5xVyd/yWTzDpodPvcJa3aVWuXuxFIq3I4aevnU7fmvnLlZSU1P0DDgI0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYT2tLlzRmv; Wed, 24 Jan 2024 19:44: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 40OJijdK005508; Wed, 24 Jan 2024 19:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJijUO005506; Wed, 24 Jan 2024 19:44:45 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:45 GMT Message-Id: <202401241944.40OJijUO005506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7a605ba8f799 - stable/14 - lib/libc/amd64/string/strcat.S: enable use of SIMD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a605ba8f7996f38ba7b353a0120d84bae48da0f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7a605ba8f7996f38ba7b353a0120d84bae48da0f commit 7a605ba8f7996f38ba7b353a0120d84bae48da0f Author: Robert Clausecker AuthorDate: 2023-11-14 18:09:08 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 lib/libc/amd64/string/strcat.S: enable use of SIMD strcat has a bespoke scalar assembly implementation we inherited from NetBSD. While it performs well, it is better to call into our SIMD implementations if any SIMD features are available at all. So do that and implement strcat() by calling into strlen() and strcpy() if these are available. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Reviison: https://reviews.freebsd.org/D42600 (cherry picked from commit aff9143a242c0012b0195b3666e03fa3b7cd33e8) --- lib/libc/amd64/string/strcat.S | 47 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/amd64/string/strcat.S index 0834408acfb7..081e98840cee 100644 --- a/lib/libc/amd64/string/strcat.S +++ b/lib/libc/amd64/string/strcat.S @@ -1,6 +1,14 @@ -/* - * Written by J.T. Conklin - * Public domain. +/*- + * Copyright (c) 2023, The FreeBSD Foundation + * + * SPDX-License-Expression: BSD-2-Clause + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Adapted from NetBSD's common/lib/libc/arch/x86_64/string/strcat.S + * written by J.T. Conklin + * that was originally dedicated to the public domain */ #include @@ -8,7 +16,14 @@ RCSID("$NetBSD: strcat.S,v 1.4 2004/07/26 18:51:21 drochner Exp $") #endif -ENTRY(strcat) +#include "amd64_archlevel.h" + +ARCHFUNCS(strcat) + ARCHFUNC(strcat, scalar) + ARCHFUNC(strcat, baseline) +ENDARCHFUNCS(strcat) + +ARCHENTRY(strcat, scalar) movq %rdi,%rax movabsq $0x0101010101010101,%r8 movabsq $0x8080808080808080,%r9 @@ -161,6 +176,28 @@ ENTRY(strcat) .Ldone: ret -END(strcat) +ARCHEND(strcat, scalar) + +/* + * Call into strlen + strcpy if we have any SIMD at all. + * The scalar implementation above is better for the scalar + * case as it avoids the function call overhead, but pessimal + * if we could call SIMD routines instead. + */ +ARCHENTRY(strcat, baseline) + push %rbp + mov %rsp, %rbp + push %rsi + push %rbx + mov %rdi, %rbx # remember destination for later + call CNAME(strlen) # strlen(dest) + mov -8(%rbp), %rsi + lea (%rbx, %rax, 1), %rdi # dest + strlen(dest) + call CNAME(__stpcpy) # stpcpy(dest + strlen(dest), src) + mov %rbx, %rax # return dest + pop %rbx + leave + ret +ARCHEND(strcat, baseline) .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYV6Clmz58c25; Wed, 24 Jan 2024 19:44: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 4TKvYV4vwhz45r0; Wed, 24 Jan 2024 19:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=23ItC8K4WM+86cfnwIHUvEIjoPfDzecFKQZFUm9NdUc=; b=YVXmfTEO5eL4jJtwk19m7OLUKQgCmL426f5A/yp3cRrZd6T67/MsZKkftXuSQQzIB1ylaw g0JXZ0jdW1qPUue7MfZba1ct5/i3z/6PBaJPnsbB7iab1x+OkxitKYNDwuaSFj/Jd2IV63 SXkN070kMr4bwoEfeX8Bvl0jZ8S8X/hSjFe/K+Mr92P6WT3JKHfyMmm/EOBxyAsiSN474D vPw9Kz+6mzKKbt4kEhC0+77p+qVN7dpt0dSkmVyo3QJS84uqeNQS6M7E+NAGTI/uUawu3S Wpy38FuI4Rbse7xxxiLFtHP/7Ia4pDl2P/3W6Gg1tnPq3ejh+M7eH+t3PVBc8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=23ItC8K4WM+86cfnwIHUvEIjoPfDzecFKQZFUm9NdUc=; b=dHxP75TaPbYaIyR8jyNykfe1NNkRIs+VYzTxwjk9qTtIijg12Ywe9G7k5Eo8zUX2uVuNQd Mz6o/4vc+0xN177VZLPayldpt1fHgNB1xX/k5KOmjc9P/zn990ddp4qBA5xhCtAGKiP1Ql 0eZCY7MIByjlvxg6yaRoh1PyZSPEySZ04tTsB+G2gXX7abbVhQrPFU5aiRkLkbkdKmlZkr YAnHOrbgmDicu9/lKALV80GLw0DLjRlweBOqHIL3wueGb3+hsgebAtd6wqWLFcX47SyE6k Rn4YF9ARsVTJQvd8B0p6IjBenbyOH2GVe/h5+SCdkfmXsSjuCj/cWOhcKw4zyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125486; a=rsa-sha256; cv=none; b=gBStXSyQ16ewZXWnKfHWEm6yk3EBq6idJd0PxTiaxaCyRfq87v+LnAB5CR0QZJByK2Tyqd LLYY0DgCR7yRZ+IDRUq1eNzxhb8GNej4oU9f6EGo7kzQIMu4dvCmdPsFcc6fOmU4yKv4Gy AzO4OnYlEWoaMR83oBdyQ7PxxZLoMnbQztwWpFf/Y4ib3+gSIVBjFABvcxxtoPJswR8zkH qMX2GcjlOH5uaTjlaaIGNdNaH8j8vdyi9OUC/r0xb2QTjFSWh30+niGiM7GCxHoAaJYTVT 1P5dVAr3vIKra1UCWlDk4ovbPMSAKdMcxBrqJsFEEiJk22Wkkg0nxZTpsEqEnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYV40wXzRkQ; Wed, 24 Jan 2024 19:44: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 40OJikTY005554; Wed, 24 Jan 2024 19:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJik0M005551; Wed, 24 Jan 2024 19:44:46 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:46 GMT Message-Id: <202401241944.40OJik0M005551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 1f733be3cca4 - stable/14 - share/man/man7/simd.7: document SIMD-enhanced strcat List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f733be3cca4cac04ade21beb6aab04d66633d1e Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=1f733be3cca4cac04ade21beb6aab04d66633d1e commit 1f733be3cca4cac04ade21beb6aab04d66633d1e Author: Robert Clausecker AuthorDate: 2023-11-14 18:26:21 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 share/man/man7/simd.7: document SIMD-enhanced strcat Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42600 (cherry picked from commit c983825a77f276ab71a34baee0250d55a84f59fd) --- share/man/man7/simd.7 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index f3818c530af5..6ddf769b6d38 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 November 8, 2023 +.Dd November 14, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -48,7 +48,7 @@ the environment variable .Ev ARCHLEVEL can be used to override this mechanism. .Pp -Enhanced functions are present in the following architectures: +Enhanced functions are present for 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 @@ -66,7 +66,7 @@ Enhanced functions are present in the following architectures: .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 .It stpncpy Ta Ta Ta S1 -.It strcat Ta Ta Ta S Ta S +.It strcat Ta Ta Ta S1 Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 .It strcmp Ta Ta S Ta S1 Ta S @@ -217,7 +217,7 @@ for A .Nm manual page appeared in -.Fx 14.0 . +.Fx 14.1 . . .Sh AUTHOR .An Robert Clausecker Aq Mt fuz@FreeBSD.org From nobody Wed Jan 24 19:44:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYX0hHYz58byT; Wed, 24 Jan 2024 19:44: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 4TKvYW5vcwz4621; Wed, 24 Jan 2024 19:44:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+X6o871toTbokqNW2picFZv8G+NruOk6daUUMF9WPY=; b=Zd6SuFrEmKEI8zfiJmCp21CJEeM1G+ZJYX422UkdTCs4otUJJuVh3A4VzwIpFvDi8Ywifx bYyWLvHyC5s85Day+DsUrXQ8i2IuICj99xleLioRkRaMQAaJhqY/LCecAY91+BOe6+qj8K Q6Sx5IPxVt5yAd5MWWJ+UK2WDs2GdVRok8AvYLPF2K87B185TP6JB9QQ9Bxe7v4FnUnaNY CVsvcjyh+O9eAHl6PQb6rrgdXegatkoKoDwRBmGATt8gccL5QuC/Pqtfjen3z8SxfrC+mb bbNuiEAZdRbaG7AeQ+3WwQF8q3lidlHmEz7ai3vPzJ26RxgMmBguVrBHECag3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+X6o871toTbokqNW2picFZv8G+NruOk6daUUMF9WPY=; b=o+rUwJBiGtZZaDD0QzTlHTNwQkBd5bX1FD07r0K3VwoshrP+tVboSMJk//mfCYgSGLm+fG /o5uod2MuvkkJq3mKsc8Bnhy2fcL5kQciuxvF1Swjh8RriRKsjXtdTLRs2KO0N675BCGvj ni8h6dUusl7FgI46qU6os3Nf3tHImnoKOLMOOfB2k/LVvnstSg17NIVCU75ro0JkGnNLKg BXsfBbnrFahXL9iYq9x6uQeMTfY5Pi1S1C7053KwL6+HZEKrwebARhTBWz7HGTr2zytPTG d500Rxg24lKaWiMPMbwjGxBxiAu6YYYW/N7ASZvHiseoZrtRwxLLKewldnhljg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125487; a=rsa-sha256; cv=none; b=WenelLs9mqkq8suBmSQv6MyGoZ3az46MOzoXnVxuyKQDAwzUmNrptBcnBKWQYiF3nLmRmf LxJnC6mEVrDEDsGFqRumm/4wUcbRtUdSf4zdSt+TSUsMcQHrr/LZv1oBSzL7acckcWeA0u Y7+MlX/er8NjLqWy25BWLaoe2qgsz7v0ZKsb8Wj5QzbKomEAcFD/sq2TI04jHIl8EMvoHK Owl0Nz/Xgu2rcV1L/V0E6uD4/FxGyltLW5JnIFEQWvwmcjOHgG2xECc6d3gzFWaPP646eS oNUTTdVjDJDR1d6VZGTVxzXrziijIGUo9erbgjZyiAHCndCBc0mvh5hSzSGylw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYW50ydzS8w; Wed, 24 Jan 2024 19:44: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 40OJilTF005605; Wed, 24 Jan 2024 19:44:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJilnI005602; Wed, 24 Jan 2024 19:44:47 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:47 GMT Message-Id: <202401241944.40OJilnI005602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f5d63ae20d65 - stable/14 - lib/libc/tests/string: add unit test for strlcpy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f5d63ae20d653e12d3617704e6317e3c8c50b640 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f5d63ae20d653e12d3617704e6317e3c8c50b640 commit f5d63ae20d653e12d3617704e6317e3c8c50b640 Author: Robert Clausecker AuthorDate: 2023-11-09 18:08:23 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 lib/libc/tests/string: add unit test for strlcpy A straightforward derivation from the stpncpy unit test. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit f7098b8659923873a7c60b64cb68182e470786f9) --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/strlcpy_test.c | 183 +++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 5874f7b6b873..81e59ee65155 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -16,6 +16,7 @@ ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test +ATF_TESTS_C+= strlcpy_test ATF_TESTS_C+= strspn_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test diff --git a/lib/libc/tests/string/strlcpy_test.c b/lib/libc/tests/string/strlcpy_test.c new file mode 100644 index 000000000000..646bef42683e --- /dev/null +++ b/lib/libc/tests/string/strlcpy_test.c @@ -0,0 +1,183 @@ +/*- + * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were 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 +#include +#include +#include +#include +#include +#include + +#include + +size_t (*strlcpy_fn)(char *restrict, const char *restrict, size_t); + +static char * +makebuf(size_t len, int guard_at_end) +{ + char *buf; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; + + buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + assert(buf); + if (guard_at_end) { + assert(munmap(buf + alloc_size - page_size, page_size) == 0); + return (buf + alloc_size - page_size - len); + } else { + assert(munmap(buf, page_size) == 0); + return (buf + page_size); + } +} + +static void +test_strlcpy(const char *s) +{ + char *src, *dst; + size_t size, bufsize, x; + int i, j; + + size = strlen(s) + 1; + for (i = 0; i <= 1; i++) { + for (j = 0; j <= 1; j++) { + for (bufsize = 0; bufsize <= size + 10; bufsize++) { + src = makebuf(size, i); + memcpy(src, s, size); + dst = makebuf(bufsize, j); + memset(dst, 'X', bufsize); + assert(strlcpy_fn(dst, src, bufsize) == size-1); + assert(bufsize == 0 || strncmp(src, dst, bufsize - 1) == 0); + for (x = size; x < bufsize; x++) + assert(dst[x] == 'X'); + } + } + } +} + +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) +{ + size_t i; + size_t res, wantres; + const char *fail = NULL; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + src[srclen] = '\0'; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen+1] = ')'; + + memset(dest, '\xee', destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + wantres = srclen; + res = strlcpy_fn(dest, src, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (res != wantres) + fail = "incorrect return value"; + else if (destlen > 0 && strncmp(src, dest, destlen - 1) != 0) + fail = "string not copied correctly"; + else if (destlen > 0 && srclen >= destlen - 1 && dest[destlen-1] != '\0') + fail = "string not NUL terminated"; + else for (i = srclen + 1; i < destlen; i++) + if (dest[i] != '\xee') { + fail = "buffer mutilated behind string"; + break; + } + + if (fail) + atf_tc_fail_nonfatal("%s\n" + "strlcpy(%p \"%s\", %p \"%s\", %zu) = %zu (want %zu)\n", + fail, dest, dest, src, src, destlen, res, wantres); +} + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(strlcpy_fn(NULL, "foo", 0), 3); +} + +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) +{ + size_t i; + char buf[64+1]; + + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + buf[i+1] = '\0'; + test_strlcpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+3+64]; /* 15 offsets + 64 max length + NUL + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 0; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strlcpy_fn = dlsym(dl_handle, "test_strlcpy"); + if (strlcpy_fn == NULL) + strlcpy_fn = strlcpy; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); + + return (atf_no_error()); +} From nobody Wed Jan 24 19:44:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYY1ldWz58bdj; Wed, 24 Jan 2024 19:44: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 4TKvYX6m2yz45p2; Wed, 24 Jan 2024 19:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZdAIPnCPmAPlpe6KI8g+sCn+TYTYqUdqZym8Piib7I=; b=EJD3ranU9CcitNysgjFAuyFiYtnTHy9fnO85/so6DTU0gXg2JGUym1Schev79O6+eXzZFg qsvBaokn9zrC9uz0v5ldgDuVetcuQTEPeBxNvFjVGOTFlxEWKb3i0ksHbjKPKRAGTX5sy2 uyRr8Nz+4giKJ9+0GgZ8acWNjZIoU5AMCWJoDJzv7Q75PhE8X5ATLEyfwPBkPe8lFh6yVt zzGu/Z1JnzjymfmozFJt8zTTwzmM1TTi/6AjfazRmj4mEA1m8NRr45AXWFPkG6kruk93fC pHtjohs8aJO7um0cOQyRoHH9/nxlYi8cw2TQZHn/DDfMHX0csnk+qFj5ENaBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZdAIPnCPmAPlpe6KI8g+sCn+TYTYqUdqZym8Piib7I=; b=W3cH52CO/JHfEA9H/cB2TbwPHG7+WdTkdgzJmOAJat8vGJIWW0jzrJGmNxEgBvYpQm/+XL kDuE1Lka7HWkjhjnZY2VwbphkbpA5In4KkzkfeJNdVhYjH8Vg/obEzKCUVrq+dGwNnNBlv P6O5+tc/gL3LHqqvFWuQUygzb5ILDdJUmIo0c1/mFM5bzQUwcDr96/usiEafc0qj9k1uj5 XdxNLc5k2kKd96Bse8Xsmb75AYPXYSApNXyOTmCdBOr2xh83Fgq7KN1KX0EvHScbNU/xha OgxGAY5ogOidlJZZpeYmE7tRRoiwPUpBUG+P4/485WVYLjijz4DYjFyfjID4UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125488; a=rsa-sha256; cv=none; b=eiKkAbtDsi9y0n6NPtsZg1kwwNtPRSMZIG2ETV/Oll0KGYvyl1VWffKXmsYBUb6YryA4fP Z1HFbE7Q0t/ny1mzxIbI0JoZXI+Qq5Vn2P0HlJ9XnisgaVeK4GPeFr2wamm1JjFkCay62U cZ+edJfmAmcbp1kJGleLtG3Lx5bwxlzzBUlZNc0BMm056wzkYWajoMlkOfX7P3hPBsxr40 p1Snv62ouV25gvVTusu2662od693hUfGnfZLoZjLx/z6SkYDyQdxnlh5bXKlaHl385okYI B3h/cOumIGDjoT4GbezxcjUoaajFEabhus3BQKkrxUKvo3SAeN8D1fuEGXj+Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYX5tDYzRgp; Wed, 24 Jan 2024 19:44: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 40OJimaw005650; Wed, 24 Jan 2024 19:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJimW7005647; Wed, 24 Jan 2024 19:44:48 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:48 GMT Message-Id: <202401241944.40OJimW7005647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 903cb811ffe2 - stable/14 - lib/libc/amd64/string: add strlcpy scalar, baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 903cb811ffe2f3e68beccd8fef5208cf0e224770 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=903cb811ffe2f3e68beccd8fef5208cf0e224770 commit 903cb811ffe2f3e68beccd8fef5208cf0e224770 Author: Robert Clausecker AuthorDate: 2023-11-12 22:47:06 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 lib/libc/amd64/string: add strlcpy scalar, baseline implementation Somewhat similar to stpncpy, but different in that we need to compute the full source length even if the buffer is shorter than the source. strlcat is implemented as a simple wrapper around strlcpy. The scalar implementation of strlcpy just calls into strlen() and memcpy() to do the job. Perf-wise we're very close to stpncpy. The code is slightly slower as it needs to carry on with finding the source string length even if the buffer ends before the string. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit 74d6cfad54d676299ee5e4695139461876dfd757) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strlcpy.S | 281 +++++++++++++++++++++++++++++++++++++ 2 files changed, 282 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index d982061e080b..03bca498e116 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcmp.S \ strcpy.c \ strcspn.S \ + strlcpy.S \ strlen.S \ strncmp.S \ strncpy.c \ diff --git a/lib/libc/amd64/string/strlcpy.S b/lib/libc/amd64/string/strlcpy.S new file mode 100644 index 000000000000..2b32c6c78047 --- /dev/null +++ b/lib/libc/amd64/string/strlcpy.S @@ -0,0 +1,281 @@ +/* + * 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 + + .weak strlcpy + .set strlcpy, __strlcpy +ARCHFUNCS(__strlcpy) + ARCHFUNC(__strlcpy, scalar) + ARCHFUNC(__strlcpy, baseline) +ENDARCHFUNCS(__strlcpy) + +ARCHENTRY(__strlcpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + push %rsi + push %rbx + push %rdi + push %rdx + mov %rsi, %rdi + call CNAME(strlen) # strlen(src) + pop %rdx + pop %rdi + mov -8(%rbp), %rsi + mov %rax, %rbx # remember string length for return value + sub $1, %rdx # do not copy into the final byte of the buffer + jc 0f # skip copying altogether if buffer was empty + cmp %rax, %rdx # is the buffer longer than the input? + cmova %rax, %rdx # if yes, only copy the part that fits + movb $0, (%rdi, %rdx, 1) # NUL-terminate output buffer + call CNAME(memcpy) # copy string to output +0: mov %rbx, %rax # restore return value + pop %rbx + leave + ret +ARCHEND(__strlcpy, scalar) + +ARCHENTRY(__strlcpy, baseline) + sub $1, %rdx # do not count NUL byte in buffer length + jb .L0 # go to special code path if len was 0 + + mov %esi, %ecx + pxor %xmm1, %xmm1 + mov %rsi, %r9 # stash a copy of the source pointer for later + and $~0xf, %rsi + pcmpeqb (%rsi), %xmm1 # NUL found in head? + mov $-1, %r8d + and $0xf, %ecx + shl %cl, %r8d # mask of bytes in the string + pmovmskb %xmm1, %eax + and %r8d, %eax + jnz .Lhead_nul + + movdqa 16(%rsi), %xmm3 # load second string chunk + movdqu (%r9), %xmm2 # load unaligned string head + mov $32, %r8d + sub %ecx, %r8d # head length + length of second chunk + pxor %xmm1, %xmm1 + pcmpeqb %xmm3, %xmm1 # NUL found in second chunk? + + sub %r8, %rdx # enough space left for the second chunk? + jbe .Lhead_buf_end + + /* process second chunk */ + pmovmskb %xmm1, %eax + test %eax, %eax + jnz .Lsecond_nul + + /* string didn't end in second chunk and neither did buffer -- not a runt! */ + movdqa 32(%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + movdqu %xmm2, (%rdi) # deposit head into buffer + sub %rcx, %rdi # adjust RDI to correspond to RSI + movdqu %xmm3, 16(%rdi) # deposit second chunk + sub %rsi, %rdi # express RDI as distance from RSI + add $32, %rsi # advance RSI past first two chunks + sub $16, %rdx # enough left for another round? + jbe 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 3f + + movdqu %xmm0, (%rsi, %rdi) + movdqa 16(%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + cmp $16, %rdx # more than a full chunk left? + jbe 2f + + add $32, %rsi # advance pointers to next chunk + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 4f + + movdqu %xmm0, -16(%rsi, %rdi) + movdqa (%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + sub $32, %rdx + ja 0b + +1: sub $16, %rsi # undo second advancement + add $16, %edx + + /* 1--16 bytes left in the buffer but string has not ended yet */ +2: pcmpeqb %xmm1, %xmm0 # NUL byte encountered? + pmovmskb %xmm0, %r8d + mov %r8d, %eax + bts %edx, %r8d # treat end of buffer as end of string + tzcnt %r8d, %r8d # find tail length + add %rsi, %rdi # restore RDI + movdqu (%rsi, %r8, 1), %xmm0 # load string tail + movdqu %xmm0, (%rdi, %r8, 1) # store string tail + movb $0, 16(%rdi, %r8, 1) # NUL terminate + + /* continue to find the end of the string */ + test %eax, %eax # end of string already reached? + jnz 1f + + ALIGN_TEXT +0: pcmpeqb 32(%rsi), %xmm1 + pmovmskb %xmm1, %eax + pxor %xmm1, %xmm1 + test %eax, %eax + jnz 2f + + pcmpeqb 48(%rsi), %xmm1 + pmovmskb %xmm1, %eax + add $32, %rsi + pxor %xmm1, %xmm1 + test %eax, %eax + jz 0b + +1: sub $16, %rsi # undo second advancement +2: tzcnt %eax, %eax # where is the NUL byte? + sub %r9, %rsi + lea 32(%rsi, %rax, 1), %rax # return string length + ret + +4: sub $16, %rsi # undo second advancement + add $16, %rdx # restore number of remaining bytes + + /* string has ended but buffer has not */ +3: tzcnt %eax, %eax # find length of string tail + movdqu -15(%rsi, %rax, 1), %xmm0 # load string tail (incl. NUL) + add %rsi, %rdi # restore destination pointer + movdqu %xmm0, -15(%rdi, %rax, 1) # store string tail (incl. NUL) + sub %r9, %rsi # string length to current chunk + add %rsi, %rax # plus length of current chunk + ret + +.Lhead_buf_end: + pmovmskb %xmm1, %r8d + add $32, %edx # restore edx to (len-1) + ecx + mov %r8d, %eax + shl $16, %r8d # place 2nd chunk NUL mask into bits 16--31 + bts %rdx, %r8 # treat end of buffer as end of string + tzcnt %r8, %rdx # find string/bufer len from alignment boundary + sub %ecx, %edx # find actual string/buffer len + movb $0, (%rdi, %rdx, 1) # write NUL terminator + + /* continue to find the end of the string */ + test %eax, %eax # end of string already reached? + jnz 1f + + ALIGN_TEXT +0: pcmpeqb 32(%rsi), %xmm1 + pmovmskb %xmm1, %eax + pxor %xmm1, %xmm1 + test %eax, %eax + jnz 2f + + pcmpeqb 48(%rsi), %xmm1 + pmovmskb %xmm1, %eax + add $32, %rsi + pxor %xmm1, %xmm1 + test %eax, %eax + jz 0b + +1: sub $16, %rsi +2: tzcnt %eax, %eax + sub %r9, %rsi + lea 32(%rsi, %rax, 1), %rax # return string length + jmp .L0031 + +.Lsecond_nul: + add %r8, %rdx # restore buffer length + tzcnt %eax, %eax # where is the NUL byte? + lea -16(%rcx), %r8d + sub %r8d, %eax # string length + cmp %rax, %rdx # is the string shorter than the buffer? + cmova %rax, %rdx # copy only min(buflen, srclen) bytes + movb $0, (%rdi, %rdx, 1) # write NUL terminator +.L0031: cmp $16, %rdx # at least 16 bytes to copy (not incl NUL)? + jb .L0015 + + /* copy 16--31 bytes */ + movdqu (%r9), %xmm0 # load first 16 bytes + movdqu -16(%r9, %rdx, 1), %xmm1 # load last 16 bytes + movdqu %xmm0, (%rdi) + movdqu %xmm1, -16(%rdi, %rdx, 1) + ret + +.Lhead_nul: + tzcnt %eax, %eax # where is the NUL byte? + sub %ecx, %eax # ... from the beginning of the string? + cmp %rax, %rdx # is the string shorter than the buffer? + cmova %rax, %rdx # copy only min(buflen, srclen) bytes + movb $0, (%rdi, %rdx, 1) # write NUL terminator + + /* process strings of 0--15 bytes (rdx: min(buflen, srclen), rax: srclen) */ +.L0015: cmp $8, %rdx # at least 8 bytes to copy? + jae .L0815 + + cmp $4, %rdx # at least 4 bytes to copy? + jae .L0407 + + cmp $2, %rdx # at least 2 bytes to copy? + jae .L0203 + + movzbl (%r9), %ecx # load first byte from src + mov %cl, (%rdi) # deposit into destination + movb $0, (%rdi, %rdx, 1) # add NUL terminator (again) + ret + +.L0203: movzwl (%r9), %ecx + movzwl -2(%r9, %rdx, 1), %esi + mov %cx, (%rdi) + mov %si, -2(%rdi, %rdx, 1) + ret + +.L0407: mov (%r9), %ecx + mov -4(%r9, %rdx, 1), %esi + mov %ecx, (%rdi) + mov %esi, -4(%rdi, %rdx, 1) + ret + +.L0815: mov (%r9), %rcx + mov -8(%r9, %rdx, 1), %rsi + mov %rcx, (%rdi) + mov %rsi, -8(%rdi, %rdx, 1) + ret + + /* length zero destination: just return the string length */ +.L0: mov %rsi, %rdi + jmp CNAME(strlen) +ARCHEND(__strlcpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYZ41gzz58bdl; Wed, 24 Jan 2024 19:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYZ0f0cz464d; Wed, 24 Jan 2024 19:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jGFXvv9pE8zCZLoiFvAa3sJ2Y27DKSB/zryselIQn4=; b=qSk9iw1D1nystFw/We2iccgofBx4NEen42RKHNMOW79Q7RSPj0zrwSqqfsoK0QYgVKa67Z xq6gSWdyFovAAzDujR93SKIKYopSnlB5E6dnFchM1DC8mLxtJ9djqRZBIoR7PZ8B0qTWJ3 TL2dZFdvRbi9HM++DPNuaZ4GBw5K2vdlBO5LMRzIs2LY+rCG7OA5j+0RPrtIXsioMhmPtP kZ19A5vdLojvz+2nCBVbLYjZViRhNx8K7bollCpmvXMANeH9JcXmxNMSWZcspbubdmq8oH RuctGtlXNNjBv3Os0EJhYiZMxIFFPr2bAmDN4AgKzUSKuKBgyUwGvwxfzBoyRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jGFXvv9pE8zCZLoiFvAa3sJ2Y27DKSB/zryselIQn4=; b=OxL80C7efobQcJuvn2Aig9K28Cbk7uSFeMG0JONB6YPxdso2dgNDFTscUyl4Fh3iKmq5mV wtImOmoJktSSlHrLOf4na3IU7oq3PMW2ODaV3rQU1FObAIkyQnXrwS0RtVYIpH9LrBFMpE /Be59178mM3bnCkcJ7XIXtlbbFLG9VLeB9Qezdh/42myO5RjFjQV5dLjix7JQjYD1MRJl4 /sivioNo0cInGbM+RNd3XdV1txZfABgE26pLNz3+6gH5m9HnXplKXSDWveTR72FoF71FyV Vc1WE3O0nT+CNrfyYu+ZmsYtc/nKaZ8/qGRXBdNNnrJ3981CLBplwfznnvngQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125490; a=rsa-sha256; cv=none; b=r4TCjRWCmn7pgnWS9o9lYB746tbvH0Fr398u6vUd61a2rPxMOfwRLBUmWXg3ezfdp909Km rA+Zeqie73ht8GOnVxr6/qZF8PRIIeLy8JYA3TFP95qUdey4ueh2VGFRxZi5f6UOkD41sk kYgnfBDcX3hKS5NYZvVB6WHiQVW9n6Xmyu+lj01wDQV2TPmgXKGfQP4yl/M/fQFpTpqhZO iQlD3hxovY1UUotjJ7wP6uZVzfFoQqE76K8lZdlJXD1wxYRp4+pZRDhcDwm3q3MhthUXsv rv7HPPHe+ZrMEN4YAYeePvDN7iXy+D89Z1QxinN0ZCn86OdeVhA/WTd0f1vtEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYY6rV9zRmw; Wed, 24 Jan 2024 19:44: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 40OJinsX005692; Wed, 24 Jan 2024 19:44:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJinZn005689; Wed, 24 Jan 2024 19:44:49 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:49 GMT Message-Id: <202401241944.40OJinZn005689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 3045c0f198a1 - stable/14 - lib/libc/amd64/string: implement strlcat() through strlcpy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3045c0f198a1113a02f44f77b161fcf79380ae63 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3045c0f198a1113a02f44f77b161fcf79380ae63 commit 3045c0f198a1113a02f44f77b161fcf79380ae63 Author: Robert Clausecker AuthorDate: 2023-11-29 02:32:28 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:29 +0000 lib/libc/amd64/string: implement strlcat() through strlcpy() This should pick up our optimised memchr(), strlen(), and strlcpy() when strlcat() is called. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit 2b7b03b7ae179db465c1ef19a5007f729874916a) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strlcat.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 03bca498e116..2b1e276cb3da 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcmp.S \ strcpy.c \ strcspn.S \ + strlcat.c \ strlcpy.S \ strlen.S \ strncmp.S \ diff --git a/lib/libc/amd64/string/strlcat.c b/lib/libc/amd64/string/strlcat.c new file mode 100644 index 000000000000..0c1e1c5d05f7 --- /dev/null +++ b/lib/libc/amd64/string/strlcat.c @@ -0,0 +1,25 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include + +void *__memchr(const void *, int, size_t); +size_t __strlcpy(char *restrict, const char *restrict, size_t); + +size_t +strlcat(char *restrict dst, const char *restrict src, size_t dstsize) +{ + char *loc = __memchr(dst, '\0', dstsize); + + if (loc != NULL) { + size_t dstlen = (size_t)(loc - dst); + + return (dstlen + __strlcpy(loc, src, dstsize - dstlen)); + } else + return (dstsize + strlen(src)); +} From nobody Wed Jan 24 19:44:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYb5FwMz58br9; Wed, 24 Jan 2024 19:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYb1rt5z45v9; Wed, 24 Jan 2024 19:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZOR17PnrqA7N3evKr7Xj73QN2VJQlvBf261wpYIP3A=; b=QYD2fYg1RWZYTfEKKCJqZHk1SSE/FczLR0JsEfixSaeNDovMBHu9vrEqn81ClhRYSOUMlj II/3iW9txRtJLWp6CPq4Ls3yAHnYLB0mK6H3tK58ia3xhYUilY4teOYbVfcBDSUVzg09NO C/bvJcCxpC3uGnySXikBTsSaU6gD5kkrjwv8sANUKN/AlAxPrpwHT84ol6k4K5VlUSBgxQ geYzEf7zOdJLYVm9h3zUaQ9IpCSrW9FfxFG03ixLGPGHnqT1ogp2d3xJ12VPM1o1HjsCxz u2lnileiuFFkZpeE1gsPJgJz0zrr5L9UPSLSZ3OtEUjThqabwfLhPEWbyzNwpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZOR17PnrqA7N3evKr7Xj73QN2VJQlvBf261wpYIP3A=; b=PfKwcG2YpwMaHOIl2hu+K2rMv31w+OdK6sUdFqAkohVemstYiupWjQUtaadSQgVV1oVAx2 r/q3XU4WDQW+S19vD9tZA1mjFB0PberHy7CyvIvlEwe99iSgdpSc4d86MrLAK+gelAxVgu tuwVYnt/6m1lM+SuEW3IOJTsHkACiGSQnOSM/uV47lXti24xxkkxNbk+IuhnXTroE6UUn+ 9EgizbIbArFJMWHAcTVZr3uONISW1SZX7sy5B5KQ33eA/CNBLEJTprQ369wC8rOhMXFeLD qSfduTgiZzUxLNkSnrYvm+vTCHcKH7sloJ9P3d3/07xDE1NFs2PKUaG1sZT6BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125491; a=rsa-sha256; cv=none; b=yCFte0F1puGpbWxlN7u1oDMz94WhXeKKkLnzMTNUQxK0mC3N5HERjUKGtG3Lp1fXeFM3bA i7H3dPxAFLOR94BEM/3TqZjAuLV4OtXsgEuCgnBtCIpX3jWbhEQE9eS4xXEPoC7E0KNvC6 HPq+Nm6fYpKu0xsQWsgdLHIkpoRvpgtL8i13rqW26V4+RTzaVlja92n+9qLf7+olo+YJb0 SBGw0IidUCbmeqKq1O5AdWTe4vd7JpwkRu4e8+nXLG6k5x+YuUcCk2gbj/go8rBjxeBm/3 N2CganAvsHYVIX3e3HIQU0Cdw7XvcXotglw3xT83YbKdn0Xkl8z0IkitwsxcwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYb0yZhzRmx; Wed, 24 Jan 2024 19:44: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 40OJip72005734; Wed, 24 Jan 2024 19:44:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJipqJ005731; Wed, 24 Jan 2024 19:44:51 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:51 GMT Message-Id: <202401241944.40OJipqJ005731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5a37572b5ba6 - stable/14 - share/man/man7/simd.7: document scalar/baseline strlcpy, strlcat List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a37572b5ba6001534514992b2d9ac22ab347678 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a37572b5ba6001534514992b2d9ac22ab347678 commit 5a37572b5ba6001534514992b2d9ac22ab347678 Author: Robert Clausecker AuthorDate: 2023-11-29 02:35:45 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:29 +0000 share/man/man7/simd.7: document scalar/baseline strlcpy, strlcat Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit d4a5605d9fedcff34227707133a8d6694ccbfc36) --- share/man/man7/simd.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 6ddf769b6d38..e025d3ac9f12 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 November 14, 2023 +.Dd November 28, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -72,6 +72,8 @@ Enhanced functions are present for the following architectures: .It strcmp Ta Ta S Ta S1 Ta S .It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 +.It strlcat Ta Ta Ta S1 +.It strlcpy Ta Ta Ta S1 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 From nobody Wed Jan 24 19:44:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYc4wr8z58btv; Wed, 24 Jan 2024 19: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 4TKvYc385Wz467P; Wed, 24 Jan 2024 19: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=1706125492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp22FTXqe0ECiC8xbipz/FI1Ay+MJBLh2zxY/y7ATas=; b=ZDTVvYKEuvRy3elkCHbNQmpfrOn8NnGqywMh8MNT7o+tBz6qpo/kgQ4IYy4k9lHvaOGezw ym8i3rJjleFcy0CefxWGSyNb3kBtYBGVLW38Bj/4kSUTl/5YvAsKmy/2Bmx5PaYlH/NaYl 9JRAFTBbchHb84TTrjWNTS3FMvu0E8OnjHUrTQvCujSYA1vTsLyLlkr0R6Wp168Lwr4HzB satW3gFd0z0YT4hXIXI2GyyafSysuvSOpM3CYGfd88nQnWJsUm71URlpgnxMGzXInwYwjB BFSUjpCNX5owaS6I8WdXAD6gXp7/yOIYfXNdb+vtHDuf9dKwLK6GWkE1cwJq+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp22FTXqe0ECiC8xbipz/FI1Ay+MJBLh2zxY/y7ATas=; b=RRvt+GJ2CNV7HmtYDYJoSDQf/EmldkF8//Q9SvtSa81fauyFl7xGnBTpkb2n00X6YeqKAz qK3pwnH+W4NF08wQn+ijQY7K86csyz0kSsJT0knMiYuqLsso4ovepd6drNIep7Hycu0U9y ujrNh7fyeLV4gaX7tQDc8lspb/yqoPTUGgBA7oo5qRScpFvfD6Ww+MRa9C6Tobgq7IFHLv Q8pXKlNrwqKABaLUgTqBZ1YrcmuPhYt1Bm5qBB3WnoDtojzdnDuMoEyXI/Nn8X3aNC+/r5 EaezE1xoIl1LLS9d68xmyvA9nlAKa4zQ1tarp2IRm+dueyQPcsBXMIyeLG4FUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125492; a=rsa-sha256; cv=none; b=b5NjEPVPz/34b1cvBf9XXarK2tzWj0IDrC0ssnkEvU4u+4CzsNBPyQcijMqY0kcUE/Nvqg CRvAbmO2q9tNNUYJpIfkwZL+aCgwIo/Nx7LTdPRl9Sjvb1fvxHbMMqgXZ8lOKMoA8gReC1 zvm7WCTcV+GY8sj9aTybErf4ZBZvvyk6bs9qlvQRNlFNW2rGkPteRxRXZ2XiVVcrz/UOEq Zhm/G8/U0or2Z+UtoyrEC7u7T/qe8iRKtd6XE8oJuaSW0DFr7FO9D/ox5fy5BL9ZeGNQ/P lUHPBsbxpT2ozstecD/SXsg14khZrb2eCpsdHt1YsTj9VbTDCkK26jRwduLt7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYc21yvzRmy; Wed, 24 Jan 2024 19: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 40OJiqsx005782; Wed, 24 Jan 2024 19: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 40OJiqfq005779; Wed, 24 Jan 2024 19:44:52 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:52 GMT Message-Id: <202401241944.40OJiqfq005779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 0307a0095ed8 - stable/14 - share/man/man7/simd.7: add forgotten aarch64 string functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0307a0095ed82a0127c4cc3191a980643ad5b0bc Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=0307a0095ed82a0127c4cc3191a980643ad5b0bc commit 0307a0095ed82a0127c4cc3191a980643ad5b0bc Author: Robert Clausecker AuthorDate: 2023-11-29 03:33:18 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:29 +0000 share/man/man7/simd.7: add forgotten aarch64 string functions I previously forgot to mention these as they are set up through contrib/arm-optimized/routines/string. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 (cherry picked from commit 6fdcb85b1c10fb7a7f61323e52ee251cc48fd60e) --- share/man/man7/simd.7 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index e025d3ac9f12..39eafc0e8c5a 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -58,26 +58,26 @@ Enhanced functions are present for the following architectures: .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 memchr Ta S Ta Ta S1 +.It memcmp Ta S 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 memset Ta S Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S -.It stpcpy Ta Ta Ta S1 +.It stpcpy Ta S Ta Ta S1 .It stpncpy Ta Ta Ta S1 .It strcat Ta Ta Ta S1 Ta S .It strchr Ta S Ta Ta S1 Ta S -.It strchrnul Ta Ta Ta S1 -.It strcmp Ta Ta S Ta S1 Ta S -.It strcpy Ta Ta Ta S1 Ta S Ta S2 +.It strchrnul Ta S Ta Ta S1 +.It strcmp Ta S Ta S Ta S1 Ta S +.It strcpy Ta S Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 .It strlcat Ta Ta Ta S1 .It strlcpy Ta Ta Ta S1 -.It strlen Ta Ta S Ta S1 -.It strncmp Ta Ta S Ta S1 Ta S +.It strlen Ta S Ta S Ta S1 +.It strncmp Ta S Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 -.It strnlen Ta Ta Ta S1 +.It strnlen Ta S Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 .It strsep Ta Ta Ta S2 From nobody Wed Jan 24 19:44:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYg095yz58bwQ; Wed, 24 Jan 2024 19:44: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 4TKvYf4wJsz46GX; Wed, 24 Jan 2024 19:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3ANVEJ6XxkGzsj6/B71oVubzUUmtIWKoj9MHOwRZoo=; b=eSbhhyO5PFO4YXseC0GQlLdZEspe9Sdkv5Yk43R/GvlhikCkbUXYo6/sAGY3CyrNeYJsDT CSpqKaIn/4TnHTMlPWMFrUaXWl0wWOui8zaMlSrL2rncZ8FXHpvyb+toNsXdW2riy4XrW6 Cem7yiu2uYZtB8I9NlQ0r5kHWymMjWdKy7PXpTu/b0T3DJKEde6jIs6pn2q4W1Z/wgSfTZ QuIi6X/jW+C3wdRF8i1p8H3GmHDiZMidyFfBwP68mDBgIFS2XHX7C3SAX2LqGZYpXcw8Mn L1yfJQLEmsnX84YrGWAJgK/0xOu8tPhs6S93XoTgCEYaNMAtp7nG2o+5PR0mRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3ANVEJ6XxkGzsj6/B71oVubzUUmtIWKoj9MHOwRZoo=; b=TPlnKI+VD6xBc631rjsQ9DOeQGf1kIvfKCkoYclv+lMDL2jJVXKHjQ21js5B+dFi78zxrv 0yhM0mnHeTDvB7VmfgcyqzginmwDG8FPqLJI/xOvbW/UmzoKZgh9xBMz008leukFjKzqoM sjnjr1yjEDPUsVoSP6WsHCpqxblQP6FFsRbGInYFBge+B/lLdIOgA8S2e6ccTH6a09ChFD C4aozat++o9NwkY3lCtJTlxRSf2Zj9utL/L5c9t00Zd6/PKBKtf+v1KdYf60UyKZh31ZkQ MqdzQFlcG3kzcszIzbHG8zSXtlud7zfTgakRngkX/O/woSViyVGPjXrRxQo2fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125494; a=rsa-sha256; cv=none; b=asGFqfTU/hpYmBj3KipOUhIv6HjeAfnfwv2ZOyOkOkfaBPfUyj2RtRcf6u/yYJshWfWCE0 7JrO01rep3nUHDaXj1r2njW8RSl/w8BLn785aahsGXmX08sAJedbNKl6qZ093bgRmR/Sz/ alYm+Dd8wzd85dFw02OK5HWDgRoB7jU74iRPH/MBLS+aQFXLnZpNk/GQ4hMbbMKSANZJY8 ZMw5sQP6bcbAGs6zHIdnfMNy1VYtcdsBwKSX3EDPuJGmksG+Sri1hw75CCEpczRIOTECEc Vuqi2jyLT6sKitsf6+MCHf1E6Zl2we81obAfJgh58E5TPoO0DcEvdPSJwHC8tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYf41YMzSC1; Wed, 24 Jan 2024 19:44: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 40OJisjo005876; Wed, 24 Jan 2024 19:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJisSE005873; Wed, 24 Jan 2024 19:44:54 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:54 GMT Message-Id: <202401241944.40OJisSE005873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: a3ce82e5b887 - stable/14 - lib/libc/amd64/string: add memccpy scalar, baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a3ce82e5b8878dd8422b6121a529d489f42d37a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ce82e5b8878dd8422b6121a529d489f42d37a2 commit a3ce82e5b8878dd8422b6121a529d489f42d37a2 Author: Robert Clausecker AuthorDate: 2023-12-02 12:28:05 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/amd64/string: add memccpy scalar, baseline implementation Based on the strlcpy code from D42863, this patch adds a SIMD-enhanced implementation of memccpy for amd64. A scalar implementation calling into memchr and memcpy to do the job is provided, too. Please note that this code does not behave exactly the same as the C implementation of memccpy for overlapping inputs. However, overlapping inputs are not allowed for this function by ISO/IEC 9899:1999 and neither has the C implementation any code to deal with the possibility. It just proceeds byte-by-byte, which may or may not do the expected thing for some overlaps. We do not document whether overlapping inputs are supported in memccpy(3). Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42902 (cherry picked from commit fc0e38a7a67a6d43095efb00cf19ee5f95dcf710) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/memccpy.S | 259 +++++++++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 2b1e276cb3da..b569d2cb8be8 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -3,6 +3,7 @@ MDSRCS+= \ bcmp.S \ memchr.S \ memcmp.S \ + memccpy.S \ memcpy.S \ memmove.S \ memset.S \ diff --git a/lib/libc/amd64/string/memccpy.S b/lib/libc/amd64/string/memccpy.S new file mode 100644 index 000000000000..a2d9e33b3d36 --- /dev/null +++ b/lib/libc/amd64/string/memccpy.S @@ -0,0 +1,259 @@ +/* + * 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 + + .weak memccpy + .set memccpy, __memccpy +ARCHFUNCS(__memccpy) + ARCHFUNC(__memccpy, scalar) + ARCHFUNC(__memccpy, baseline) +ENDARCHFUNCS(__memccpy) + +ARCHENTRY(__memccpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + push %rax # dummy push for alignment + push %rbx + push %rdi + push %rsi + + mov %rsi, %rdi + mov %edx, %esi + mov %rcx, %rdx + mov %rcx, %rbx + call CNAME(__memchr) # ptr = memchr(src, c, len) + + pop %rsi + pop %rdi + lea 1(%rax), %rdx + sub %rsi, %rdx # size = ptr - src + 1 + mov %rbx, %rcx + lea (%rdi, %rdx, 1), %rbx # res = dest + size + test %rax, %rax # if (ptr == NULL) + cmovz %rcx, %rdx # size = len + cmovz %rax, %rbx # res = NULL + call CNAME(memcpy) + + mov %rbx, %rax # return (res) + pop %rbx + leave + ret +ARCHEND(__memccpy, scalar) + +ARCHENTRY(__memccpy, baseline) + sub $1, %rcx # RCX refers to last character in buffer + jb .L0 # go to special code path if len was 0 + + movd %edx, %xmm4 + mov %rcx, %rdx + punpcklbw %xmm4, %xmm4 # c -> cc + mov %esi, %ecx + punpcklwd %xmm4, %xmm4 # cc -> cccc + mov %rsi, %r9 # stash a copy of the source pointer for later + pshufd $0, %xmm4, %xmm4 # cccc -> cccccccccccccccc + and $~0xf, %rsi + movdqa %xmm4, %xmm1 + pcmpeqb (%rsi), %xmm1 # NUL found in head? + mov $-1, %r8d + and $0xf, %ecx + shl %cl, %r8d # mask of bytes in the string + pmovmskb %xmm1, %eax + and %r8d, %eax + jnz .Lhead_nul + + movdqa 16(%rsi), %xmm3 # load second string chunk + movdqu (%r9), %xmm2 # load unaligned string head + mov $32, %r8d + sub %ecx, %r8d # head length + length of second chunk + movdqa %xmm4, %xmm1 + pcmpeqb %xmm3, %xmm1 # NUL found in second chunk? + + sub %r8, %rdx # enough space left for the second chunk? + jb .Lhead_buf_end + + /* process second chunk */ + pmovmskb %xmm1, %eax + test %eax, %eax + jnz .Lsecond_nul + + /* string didn't end in second chunk and neither did buffer -- not a runt! */ + movdqa 32(%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + movdqu %xmm2, (%rdi) # deposit head into buffer + sub %rcx, %rdi # adjust RDI to correspond to RSI + movdqu %xmm3, 16(%rdi) # deposit second chunk + sub %rsi, %rdi # express RDI as distance from RSI + add $32, %rsi # advance RSI past first two chunks + sub $16, %rdx # enough left for another round? + jb 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 3f + + movdqu %xmm0, (%rsi, %rdi) + movdqa 16(%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + cmp $16, %rdx # more than a full chunk left? + jb 2f + + add $32, %rsi # advance pointers to next chunk + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 4f + + movdqu %xmm0, -16(%rsi, %rdi) + movdqa (%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + sub $32, %rdx + jae 0b + +1: sub $16, %rsi # undo second advancement + add $16, %edx + + /* 1--16 bytes left in the buffer but string has not ended yet */ +2: pcmpeqb %xmm1, %xmm0 # NUL byte encountered? + pmovmskb %xmm0, %r8d + mov %r8d, %ecx + bts %edx, %r8d # treat end of buffer as end of string + or $0x10000, %eax # ensure TZCNT finds a set bit + tzcnt %r8d, %r8d # find tail length + add %rsi, %rdi # restore RDI + movdqu 1(%rsi, %r8, 1), %xmm0 # load string tail + movdqu %xmm0, 1(%rdi, %r8, 1) # store string tail + lea 17(%rdi, %r8, 1), %rsi # return value if terminator encountered + xor %eax, %eax # return value if no terminator encountered + bt %r8d, %ecx # terminator encountered inside buffer? + cmovc %rsi, %rax # if yes, return pointer, else NULL + ret + +4: sub $16, %rsi # undo second advancement + add $16, %rdx # restore number of remaining bytes + + /* string has ended but buffer has not */ +3: tzcnt %eax, %eax # find length of string tail + movdqu -15(%rsi, %rax, 1), %xmm0 # load string tail (incl. NUL) + add %rsi, %rdi # restore destination pointer + movdqu %xmm0, -15(%rdi, %rax, 1) # store string tail (incl. NUL) + lea 1(%rdi, %rax, 1), %rax # compute return value + ret + +.Lhead_buf_end: + pmovmskb %xmm1, %r8d + add $32, %edx # restore edx to (len-1) + ecx + shl $16, %r8d # place 2nd chunk NUL mask into bits 16--31 + mov %r8d, %r10d + bts %rdx, %r8 # treat end of buffer as if terminator present + xor %eax, %eax # return value if terminator not found + tzcnt %r8, %rdx # find string/buffer len from alignment boundary + lea 1(%rdi, %rdx, 1), %r8 # return value if terminator found + rcx + sub %rcx, %r8 # subtract rcx + bt %rdx, %r10 # was the terminator present? + cmovc %r8, %rax # if yes, return pointer, else NULL + sub %ecx, %edx # find actual string/buffer len + jmp .L0132 + +.Lsecond_nul: + add %r8, %rdx # restore buffer length + tzcnt %eax, %r8d # where is the NUL byte? + lea -16(%rcx), %eax + sub %eax, %r8d # string length + lea 1(%rdi, %r8, 1), %rax # return value if NUL before end of buffer + xor %ecx, %ecx # return value if not + cmp %r8, %rdx # is the string shorter than the buffer? + cmova %r8, %rdx # copy only min(buflen, srclen) bytes + cmovb %rcx, %rax # return NUL if buffer ended before string +.L0132: cmp $16, %rdx # at least 17 bytes to copy (not incl NUL)? + jb .L0116 + + /* copy 17--32 bytes */ + movdqu (%r9), %xmm0 # load first 16 bytes + movdqu -15(%r9, %rdx, 1), %xmm1 # load last 16 bytes + movdqu %xmm0, (%rdi) + movdqu %xmm1, -15(%rdi, %rdx, 1) + ret + +.Lhead_nul: + tzcnt %eax, %r8d # where is the NUL byte? + sub %ecx, %r8d # ... from the beginning of the string? + lea 1(%rdi, %r8, 1), %rax # return value if NUL before end of buffer + xor %ecx, %ecx # return value if not + cmp %r8, %rdx # is the string shorter than the buffer? + cmova %r8, %rdx # copy only min(buflen, srclen) bytes + cmovb %rcx, %rax # return NUL if buffer ended before string + + /* process strings of 1--16 bytes (rdx: min(buflen, srclen), rax: srclen) */ +.L0116: cmp $8, %rdx # at least 9 bytes to copy? + jae .L0916 + + cmp $4, %rdx # at least 5 bytes to copy? + jae .L0508 + + cmp $2, %rdx # at least 3 bytes to copy? + jae .L0304 + + /* copy one or two bytes */ + movzbl (%r9), %ecx # load first byte from src + movzbl (%r9, %rdx, 1), %esi # load last byte from src + mov %cl, (%rdi) # deposit into destination + mov %sil, (%rdi, %rdx, 1) + ret + +.L0304: movzwl (%r9), %ecx + movzwl -1(%r9, %rdx, 1), %esi + mov %cx, (%rdi) + mov %si, -1(%rdi, %rdx, 1) + ret + +.L0508: mov (%r9), %ecx + mov -3(%r9, %rdx, 1), %esi + mov %ecx, (%rdi) + mov %esi, -3(%rdi, %rdx, 1) + ret + +.L0916: mov (%r9), %rcx + mov -7(%r9, %rdx, 1), %rsi + mov %rcx, (%rdi) + mov %rsi, -7(%rdi, %rdx, 1) + ret + + /* length zero destination: return null pointer */ +.L0: xor %eax, %eax + ret +ARCHEND(__memccpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYj1Bgdz58c63; Wed, 24 Jan 2024 19:44: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 4TKvYh71jVz46KD; Wed, 24 Jan 2024 19:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCGRLS183zoGj5zrjB4XTI0A6ZypdTlZQJG3Q/YkZgE=; b=TgI3l8QX006uEeCcNj9to5y4Y93j2VpmEcpw8FsFs+9IriLwRWKE5aCsCzBI62ATvlXAmN aMsaCktqqgAReZF9bA6HURrfRkr0EU0dRxRK+XM+2NG/A9TaKZqoLMqr1vYrJu33o7Ge/5 jaaPg6tkJoELzz8U9Tt0TlEWDwETIzDeYG37C2UZu2a7GlhrUHY5LNGg0Nm3ADjpP43G30 3S/+3bZIh0EYqo2lgtlxlhUPPjNBgXGQ0mA0OWuOEMWTiIZRlELct9N7LU1D3cTIlS6nCp QCWcLjAMne0rUYPn3z7+0ojU/T+FV5tmqcaX+1dcVfrX6wcYaWyPnlFGix8E1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCGRLS183zoGj5zrjB4XTI0A6ZypdTlZQJG3Q/YkZgE=; b=dQaqBCY2xkO5OAXQWuIvDsD4mqFupKr8VgVQotK/Jw3UbXCCukrESLQv4mv4CYbtSxtyG8 3I7yyR0CoVd2cYT2869FHtyagjFUFQb0EwjaFC+BUUVX+dUBtwZCJ5PYOOTgJwOe8XYPiS ux5BNIUwRA10lhLo7bso7Z/1UlWjnm9Y9XzmjobdNqOgideGt0sIIJkSPSJS/GOom4V4ft Id/Qzw+NAeIxPEX/rWoPgxgMbgmRTCIFYiRPTfw/FSVQubdXU+RsexnjWD6nKw6+pub1Mq FdsIuVYDbqpOF7jOkuQrPSFCW8c4M8XQeXIsd4t1tbXiyTBHMna/HMEkLECmQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125497; a=rsa-sha256; cv=none; b=uHW130bQYFm78wGAJS7g4P4dXI0ucF1lhhK6fIZpOvS2ZoJkQ/r0/iEqhcHS/b0D4Kcu4i /kvPuV91POg8xgBbVMuswKUm01b/sIQl9JW5oPiB3XeBFHFwYVU42E++Z2SRMNxw2aNmFD t6FyhvjP0wspoR9hy7nl1NThklzfWoI89Ly8lRvyuHVzGANGVj2j8q9k+1N4ykWGcbMzuA EVAnyHeG4Qj+1gHNKOe0U5fDW7tUyyr0dwTrVvbUi/7ATalsmt8rCHcVHXOGhofZZVU4c8 Y9S9puu5ssM8bIuxU2D/vAcA4IoF9snLEg5nZghUE0ur9AVfNq3MJqDUME3smA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYh67KnzRy7; Wed, 24 Jan 2024 19:44: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 40OJiu2S005973; Wed, 24 Jan 2024 19:44:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiuUP005970; Wed, 24 Jan 2024 19:44:56 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:56 GMT Message-Id: <202401241944.40OJiuUP005970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: ddab9e646122 - stable/14 - lib/libc/amd64/string: implement strncat() by calling strlen(), memccpy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ddab9e646122df077570fc0dfb2af1516c098668 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ddab9e646122df077570fc0dfb2af1516c098668 commit ddab9e646122df077570fc0dfb2af1516c098668 Author: Robert Clausecker AuthorDate: 2023-12-04 17:32:49 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/amd64/string: implement strncat() by calling strlen(), memccpy() This picks up the accelerated implementation of memccpy(). Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42902 (cherry picked from commit ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncat.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index b569d2cb8be8..a14e8a768f01 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -17,6 +17,7 @@ MDSRCS+= \ strlcat.c \ strlcpy.S \ strlen.S \ + strncat.c \ strncmp.S \ strncpy.c \ strnlen.c \ diff --git a/lib/libc/amd64/string/strncat.c b/lib/libc/amd64/string/strncat.c new file mode 100644 index 000000000000..33b278ac5e04 --- /dev/null +++ b/lib/libc/amd64/string/strncat.c @@ -0,0 +1,29 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include + +void *__memccpy(void *restrict, const void *restrict, int, size_t); + +char * +strncat(char *dest, const char *src, size_t n) +{ + size_t len; + char *endptr; + + len = strlen(dest); + endptr = __memccpy(dest + len, src, '\0', n); + + /* avoid an extra branch */ + if (endptr == NULL) + endptr = dest + len + n + 1; + + endptr[-1] = '\0'; + + return (dest); +} From nobody Wed Jan 24 19:44:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYh0QwPz58c4G; Wed, 24 Jan 2024 19:44: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 4TKvYg6JNyz465n; Wed, 24 Jan 2024 19:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vijXeMN4VBXYYZx0NthBprgG2tNJvSxpfLtRAexKWTs=; b=ph/otK0287ybCmbU6XdqDqQDtohRAQ1t9JXr2/PcxFOIHIJpgm8htNvzc+o1nEM0od4TT0 hPxUP7CoT8S7FNclj9kTAE87bTHbEv+hM9sCBRQa7NBHyT/Qyfs+zxw6mLIxbfpRYpCWxK P+AxP6fK1ARsSeUumVsXulpvD0YXe/sOskdhE0ldrIzkdOatOR/6EObywnpn/4KEkgUtKM MalbfpD2zWUfXFH1W0mkYnVFfSAUnZqfB9HVMrPl3NGXNcJTmucHpeLcJVad74TrYl0hTX sqfp8HsE69A4Cr9kjTbX0oNZAlysHOaG2MHUseRyGXfNW/8FIJFTSq+3I6OF4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vijXeMN4VBXYYZx0NthBprgG2tNJvSxpfLtRAexKWTs=; b=vQUvF4R+IgmzEw2X5VhO0/Cilirrkwy5Mpg8peNvfXtdGNTJAtJSfAuFy8p1jxyypWrer0 isZ5AOPMf2T2OrI38HI5XvWFGRXyKRPdujzFaSxe8P7hyqLdE4EkiDA7eDvPvkQXQqOlYo WoSONy/d3eMyrLcTujxkdvnt5jNVzX2QHM11lAg+ty3G2vQnteG7HegI92oBcxYCIj22Us qg4787KLb5GOt6xnW14IjNpWSQxz4m1ESmqsL7sdFVOFRWDE2AIZisKnRGg87A/cBpozDS Ye3ON1udu+X8J54dhRUrGWLZcp/xHjmqSklIeEMJT68uZmzrsWOejpAYyZkM5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125495; a=rsa-sha256; cv=none; b=clYALeBPCNa/TWgVDYUA1Lqn0GIroBAsqiL2XX6b4MPpAIU4wdRxTyIDNNRJKD0vR8D6P5 jeDbFVXkaICLotPkPu3fDjtgFaT3ydHgGi9kttgMK4FxV7EpZ1LrngPRW6nVqT7XfduO+j DaklZQFqgRgdZiM+5N2Y9hfEicEHKTnjUGm4dm8u46Bvmno7khJHEQsD7HCQ1zTVwujt11 EZw3V5X16ixkkXzUBd838oJHwocAUCWi5gVX3oQ2PS1WErt1i+Hece6YzF9FiMhBsGy6Lg MDkCemDOQ2JkgtiqkIIBs9FVCSs5vsMLlDLzFSwJ/OFgufvO1asYptVh/zddjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYg57cfzSFN; Wed, 24 Jan 2024 19:44: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 40OJit1O005923; Wed, 24 Jan 2024 19:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJitbd005920; Wed, 24 Jan 2024 19:44:55 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:55 GMT Message-Id: <202401241944.40OJitbd005920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: bd051ed3fed7 - stable/14 - share/man/man7/simd.7: document simd-enhanced memccpy, strncat List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: bd051ed3fed700693cf64961324b3e50102c897e Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd051ed3fed700693cf64961324b3e50102c897e commit bd051ed3fed700693cf64961324b3e50102c897e Author: Robert Clausecker AuthorDate: 2023-12-04 17:16:50 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 share/man/man7/simd.7: document simd-enhanced memccpy, strncat Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: HTTPS://reviews.freebsd.org/D42902 (cherry picked from commit 5fa0fbf40b110e4699032b97a9f540db80997812) --- share/man/man7/simd.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 39eafc0e8c5a..281898839c24 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 November 28, 2023 +.Dd December 4, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -60,6 +60,7 @@ Enhanced functions are present for the following architectures: .It lldiv Ta Ta Ta S .It memchr Ta S Ta Ta S1 .It memcmp Ta S Ta S Ta S1 Ta S +.It memccpy Ta Ta Ta S1 .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 S Ta S Ta S Ta S @@ -75,6 +76,7 @@ Enhanced functions are present for the following architectures: .It strlcat Ta Ta Ta S1 .It strlcpy Ta Ta Ta S1 .It strlen Ta S Ta S Ta S1 +.It strncat Ta Ta Ta S1 .It strncmp Ta S Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 .It strnlen Ta S Ta Ta S1 From nobody Wed Jan 24 19:44:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYk4Q0bz58bwZ; Wed, 24 Jan 2024 19:44: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 4TKvYk14ylz466C; Wed, 24 Jan 2024 19:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/KNHCKWigf3ZQqUg7dOq2O730bQzuyuMN82qINC674M=; b=IuzoU2qOLq/4vFTfSkAIO5NoOrz5PpqXr36I783YqftiwOXY5rZDfU5qGltg8sdRZpzkhs dXEI25En9v7ocZBXzP7BMmiQjaT39tPxqnQFLF/F/LSg1Iv0xCvBsLI0msy0kXJTXT0mUw PWJnHsLNPdR2MnUw+5ms1pzew2Srl9OmsZJDmeaJKE55bw0t5Rnj8/X4XJcI7xJcoPrwEH HWawbfWCk5P+Gr3zx7zGGlNHVwBPGBSucfA2P+OywU+UEP5dd8johCHVTJuKsWO+AOVZlB +xgNeiUIf3mzBR5nZvcJPLEA4I4MCrac+zT+GGHbBuVDknesAR6GW+6Z4+qEhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/KNHCKWigf3ZQqUg7dOq2O730bQzuyuMN82qINC674M=; b=pETBZ7QH1AeDdjBohhKtPiUCl+reLPsh5DqiW9nilnnGZBUkcjBKYbiZ+6wNDUawDOBDbo H9lPfnGZx7Z5WDHWQfcBM6bnsx5eJ94rNI2aTYubuWSWVNke1x7+2td3WWw58luQlsREOR B0tNUKkIyuyvmppKy6xfIAzKWFQSMu1vQBpS7CP/9DJpfrKVLWO9/XQYP4nKyOSM4RsZ6q mO6XiMs1Ft/bPAqQiSSqiIVz2pq6iXMsDhcjCsILqvYDBZrsSa+5tLhEKbR2JjqgcYyGkT nd8L/qhvLVX7FJvhoLaj2zxiosshpbj85YlbJ7yDz/Tg2KGZhhXGwkdGjArs2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125498; a=rsa-sha256; cv=none; b=DktKAtOdiFyYa0a0oBdop934IPBfzYDqMxxXZUlU5pU3jk+7iMAPxHwBPuqB88dgLcKRpP RX1lJMausEKeYc4jllKIR6ci/EKijtGZSzLqGnFTQ5d8jagTk7gNKRKAJCp9vJl6iDvIOh 9BPfvaWWDrrh6rzalySS1MuErM+grwi/in5bdnFZMLVyBCjHFVb9P4f9yNJqZZhPRzsHOS Ae/kPzl+3EVHuxvYcRHHGC9brW2bipQf1KTdb/lewU5/H6sXNErL/h2Pt7FJH4bp5pN157 S7Yga5ZORwQRm927TIP3r84HHNQdlPyTuLDpO6/9HzCjL5L6Aed1+1DaaaY7Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYk0BQFzS8x; Wed, 24 Jan 2024 19:44: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 40OJivk8006025; Wed, 24 Jan 2024 19:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJivu6006022; Wed, 24 Jan 2024 19:44:57 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:57 GMT Message-Id: <202401241944.40OJivu6006022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 667fa9c40483 - stable/14 - lib/libc/string: document restrict qualification of memccpy() arguments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 667fa9c40483f2c844a7960780e9567be4e581d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=667fa9c40483f2c844a7960780e9567be4e581d5 commit 667fa9c40483f2c844a7960780e9567be4e581d5 Author: Robert Clausecker AuthorDate: 2023-12-05 14:03:28 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/string: document restrict qualification of memccpy() arguments POSIX.1-2004 and the upcoming C23 agree that memccpy()'s arguments are restrict qualified and must not overlap. In 2002, restrict qualifiers were added to 's declaration of the function. Make things official and document that the arguments must not overlap. See also: 61b60edfd3fff20f884419f8097870c7045315c9 Approved by: kib MFC after: 1 month MFC to: stable/14 (cherry picked from commit e0d4f419ac41aa91b862f3ceadc32a86abf08572) --- lib/libc/string/bstring.3 | 10 ++++++++-- lib/libc/string/memccpy.3 | 33 ++++++++++++++++++++++++++++++--- lib/libc/string/memccpy.c | 2 +- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3 index cb29a6db6b14..bb1a0505fafd 100644 --- a/lib/libc/string/bstring.3 +++ b/lib/libc/string/bstring.3 @@ -29,7 +29,7 @@ .\" .\" @(#)bstring.3 8.1 (Berkeley) 6/4/93 .\" -.Dd June 4, 1993 +.Dd December 5, 2023 .Dt BSTRING 3 .Os .Sh NAME @@ -58,7 +58,12 @@ .Ft int .Fn memcmp "const void *b1" "const void *b2" "size_t len" .Ft void * -.Fn memccpy "void *dst" "const void *src" "int c" "size_t len" +.Fo memccpy +.Fa "void * restrict dst" +.Fa "const void * restrict src" +.Fa "int c" +.Fa "size_t len" +.Fc .Ft void * .Fn memcpy "void *dst" "const void *src" "size_t len" .Ft void * @@ -80,6 +85,7 @@ See the specific manual pages for more information. .Xr memccpy 3 , .Xr memchr 3 , .Xr memcmp 3 , +.Xr memccpy 3 , .Xr memcpy 3 , .Xr memmove 3 , .Xr memset 3 diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3 index fb2409ada846..fe543d9172d3 100644 --- a/lib/libc/string/memccpy.3 +++ b/lib/libc/string/memccpy.3 @@ -27,7 +27,7 @@ .\" .\" @(#)memccpy.3 8.1 (Berkeley) 6/9/93 .\" -.Dd June 9, 1993 +.Dd December 5, 2023 .Dt MEMCCPY 3 .Os .Sh NAME @@ -38,7 +38,12 @@ .Sh SYNOPSIS .In string.h .Ft void * -.Fn memccpy "void *dst" "const void *src" "int c" "size_t len" +.Fo memccpy +.Fa "void * restrict dst" +.Fa "const void * restrict src" +.Fa "int c" +.Fa "size_t len" +.Fc .Sh DESCRIPTION The .Fn memccpy @@ -61,13 +66,35 @@ is returned. Otherwise, .Fa len bytes are copied, and a NULL pointer is returned. +If +.Fa src +and +.Fa dst +overlap, behavior is undefined. .Sh SEE ALSO .Xr bcopy 3 , .Xr memcpy 3 , .Xr memmove 3 , .Xr strcpy 3 +.Sh STANDARDS +The +.Fn memccpy +function conforms to +.St -p1003.1-2004 +and +.\" St -isoC-2024 . +ISO/IEC 9899:2024 (\(lqISO\~C23\(rq). .Sh HISTORY The .Fn memccpy function first appeared in -.Bx 4.4 . +.Bx 4.4 +and was first specified in the +.\" St -svid1 . +System\~V Interface Definition, First Edition (\(lqSVID1\(rq). +The +.Ft restrict +keyword was added to the prototype in +.Fx 5.0.0 +in accordance with the updated specification of +.St -p1003.1-2004 . diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c index fd080d4293f4..5ef2dd6567ca 100644 --- a/lib/libc/string/memccpy.c +++ b/lib/libc/string/memccpy.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)memccpy.c 8.1 (Berkeley) 6/4/93"; #include void * -memccpy(void *t, const void *f, int c, size_t n) +memccpy(void * restrict t, const void * restrict f, int c, size_t n) { if (n) { From nobody Wed Jan 24 19:44:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYl5Ftvz58c69; Wed, 24 Jan 2024 19:44: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 4TKvYl28lSz46CH; Wed, 24 Jan 2024 19:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLWd8Lr5ByUSBn0qc1l0Z+D30gW5K1Se/mOvBoR6lBc=; b=D4WnR4+K0UxKdjM6UAIuI5fRh9Nr/XK2jfBhHbL6iA8XOmKRkSME5QqvnwbgDEAziHkl5G 7Ik4fgbNVQWb4PKncPKlPeHuWyt5AVq7ifSidL5OyJq1YiE/D02AiKcDnfjQVqtdzTREdb gTKiluIGRvclQfC4g/E8jmzKJF4EVsn7Nb061Z5ujRV9b3nG4yBfJvyICzfGIntM+0HFnp 3hkTZWXGdiOl8kNI4mLZoSH1T5vdjxgjz2lBzKP0nk+26XzStuwmYYOG/UkrF7oWK175J8 dE02/bPGgVogKbskTKbfOrykcPfqvoGAGYHqYwFmQutFQP6FlOt6q//1aVt2cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLWd8Lr5ByUSBn0qc1l0Z+D30gW5K1Se/mOvBoR6lBc=; b=dmrEoyOLDIeuWqUO/Srv1OXb0EErY19mzpvA6uwPZB3dVvx1POdRuttN60NQnbkVVuxnba 3lVc+ttdvEeqHWdmFTMggbNywftzPl2uoRmGrncJlCpYhUAi3q3+o0GMHTpYXHue3lYX+q aFN2zyRRyVC5pq+PVx13z5iWUhHOhh4UwKDoOWNSh0stE8S9k0Mp9Roa0BArykbzhIuR4c MzEwmbpCMgNlP8zI9VRmGKfxAoASkaqsdgId9/yH0UU+xraUKZnX/Tbe+vgUPUwOQwjdJ0 SmXkqkp5o0ffPWG/XwiicWKOV6KD3xsI6qRf1HV46JjWLXXTDbqAwGNAu+/l8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125499; a=rsa-sha256; cv=none; b=c/m5FSYpvyhBzTZU+1yOwW095EZSvMTtso3hMscVcPNDa5bIP3QQd23VO0bjqSlN/7Qlka MMP7ZG8Y7JEScCGPKphOfS3/stqnILe2ROi9TxIQSG9AmNd5RCD9iwZ4jwxqFO0YtvBfMY A0BitW8WvH866yElWqewIrX7wIErE9JiXnSxTgJOnGU6xaSIAJ6ta4VglLoW6KZ5SU4L5S G+o5plyFKVNxDE/8nRGlMFfaT4Puexbmsz8KVMzQ9N7SSv8J/m9r9Cjfmt9uodzzXWXOtG 2lSIq/fGzap6KTaNJpUtsuaL7TWRaPerOiy69Qkir4jXnApwbuIq3otDO+1PCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYl1Cj2zS8y; Wed, 24 Jan 2024 19:44: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 40OJixel006069; Wed, 24 Jan 2024 19:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJixcS006066; Wed, 24 Jan 2024 19:44:59 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:59 GMT Message-Id: <202401241944.40OJixcS006066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: acb47064d658 - stable/14 - lib/libc/tests/string: add memrchr unit tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: acb47064d65813386dc15f6278037f1a76ec7eab Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=acb47064d65813386dc15f6278037f1a76ec7eab commit acb47064d65813386dc15f6278037f1a76ec7eab Author: Robert Clausecker AuthorDate: 2023-12-06 09:11:40 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/tests/string: add memrchr unit tests The "values" test case is specifically crafted to detect the off-by-one error previous discovered in the scalar strchrnul implementation. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42925 (cherry picked from commit 691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6) --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/memrchr_test.c | 116 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a6e8eb18075a..4fce79685c0e 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memccpy_test ATF_TESTS_C+= memcmp_test +ATF_TESTS_C+= memrchr_test ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= strncmp_test ATF_TESTS_C+= stpncpy_test diff --git a/lib/libc/tests/string/memrchr_test.c b/lib/libc/tests/string/memrchr_test.c new file mode 100644 index 000000000000..12f696c9dc1e --- /dev/null +++ b/lib/libc/tests/string/memrchr_test.c @@ -0,0 +1,116 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include +#include +#include + +#include + +static void *(*memrchr_fn)(const void *, int, size_t); + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(memrchr_fn(NULL, 42, 0), NULL); +} + +ATF_TC_WITHOUT_HEAD(not_found); +ATF_TC_BODY(not_found, tc) +{ + size_t i, j; + char buf[1+15+64+1]; /* offset [0..15] + 64 buffer bytes + sentinels */ + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) { + buf[i + j + 1] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf + i + 1, 'X', j), NULL); + buf[i + j + 1] = '-'; + } +} + +static void +do_found_test(char buf[], size_t len, size_t first, size_t second) +{ + /* invariant: first <= second */ + + buf[first] = 'X'; + buf[second] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf, 'X', len), buf + second); + buf[first] = '-'; + buf[second] = '-'; +} + +ATF_TC_WITHOUT_HEAD(found); +ATF_TC_BODY(found, tc) +{ + size_t i, j, k, l; + char buf[1+15+64+1]; + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k < j; k++) + for (l = 0; l <= k; l++) { + buf[i + j + 1] = 'X'; + do_found_test(buf + i + 1, j, l, k); + buf[i + j + 1] = '-'; + } +} + +/* check that the right character is found */ +static void +do_values_test(unsigned char buf[], size_t len, size_t i, int c) +{ + /* sentinels */ + buf[-1] = c; + buf[len] = c; + memset(buf, c + 1, len); + + if (i < len) { + buf[i] = c; + ATF_CHECK_EQ(memrchr_fn(buf, c, len), buf + i); + } else + ATF_CHECK_EQ(memrchr_fn(buf, c, len), NULL); +} + +ATF_TC_WITHOUT_HEAD(values); +ATF_TC_BODY(values, tc) +{ + size_t i, j, k; + int c; + unsigned char buf[1+15+64+1]; + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k <= j; k++) + for (c = 0; c <= UCHAR_MAX; c++) + do_values_test(buf + i + 1, j, k, c); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + memrchr_fn = dlsym(dl_handle, "test_memrchr"); + if (memrchr_fn == NULL) + memrchr_fn = memrchr; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, not_found); + ATF_TP_ADD_TC(tp, found); + ATF_TP_ADD_TC(tp, values); + + return (atf_no_error()); +} From nobody Wed Jan 24 19:45:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYm5X9Jz58bf6; Wed, 24 Jan 2024 19:45: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 4TKvYm37G0z46HY; Wed, 24 Jan 2024 19:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiJB/Q0x9aSaKSJuS7hfOH3dB4o9lLJjZoMqCclzisE=; b=tw/YJ9/Qq83gBoJ0l00o/ItQbB/fb7t9afb1BvXiQ9NEvJkT+QmQWzoIk1RwqPJm/IfQwC WvN4hPoBtHVCB6FWAHshU8NTyuthnin6NDAcV9Ox7jGNS9BBvTLbQkJXo0h6ZXVlxzqLyf 8NCZt6hH6pM8PcaUlSiBItWdU/OeN8xjXNumKq/M/C2TTqAnQQ4oMxbzbUKgSspl3YLb+e elWftrGA0v9vP3oUCbVGJltUg2UUka72stiVYpGEfG2g3Y4pip9m5K1wnWOsUvAXGowP72 Rg0s0A53KgkQWA5Cfx3FMgb7WWLdt7+ou3iNHKDkP0dxeP8WOrzyUSBGpjaYhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiJB/Q0x9aSaKSJuS7hfOH3dB4o9lLJjZoMqCclzisE=; b=NoJec3fAZV9CCmjStf38aQYI6eAXZTUTmqEEVCLk+V99bBxPZv2idhPlkiIPXwy7EyzWq5 Af6y9zJ5NVkngYjJcOcY99kzTDNgCYHAcG+t11r4hmU7oSG4di7pjuraM2nF+dCI3mNC83 EL8XgXUQ2Om5fIhvmxyt1UPvGB73YgTvcNvKcMRfLuZ62H7DJbMFAyxR2XOaYB0adk9Q0N VaaAW1QOui0nfISkmgV98wZZk3geRjz0+qm2vV90omc2xaA+vYfZjuU3RnCMnHqkzPTXSr ouMNlklkd4gxoJ7ozWWR3k022IlHL0XmoDSCiHBeCN44B3Tf30ZUjswyj6DM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125500; a=rsa-sha256; cv=none; b=Yso3o0n5jxQry5Nyzf9kR491JEcRyWs0FSzHlPMDHpI5IrY1vm7o14k5grXDRq1sO628gw Rx10fSgV9AHVzQIykXv2GH6u3NZF3NOWkvyFtz2kruQkSdrxAc28o3wQHDz+MPn/x9H3Ky DWr/ITsvTf4E2n7EV/V8hr/2sBwAwt7l5H2R5+Ny0XLKXzy5S7uozvK2UvNkyEiLKePHms GIzFsTyaDdYUeiB1pa9FFwsDlFFJIJ84zFsTHXYceBHO0EfvBfz6I1dG1Cnf7WZoWjKjNQ CsH2BMWu3Fk5AsQHA4jMjYhendFIRQDJ9UG4kMPZrmAGUo2fdZqR9MOOEG+c0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYm2CByzRgq; Wed, 24 Jan 2024 19:45: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 40OJj0GZ006129; Wed, 24 Jan 2024 19:45:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJj03c006126; Wed, 24 Jan 2024 19:45:00 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:45:00 GMT Message-Id: <202401241945.40OJj03c006126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: ff7799e00311 - stable/14 - lib/libc/amd64/string: add memrchr() scalar, baseline implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ff7799e003110a8188bc129e663d23b54755531f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7799e003110a8188bc129e663d23b54755531f commit ff7799e003110a8188bc129e663d23b54755531f Author: Robert Clausecker AuthorDate: 2023-12-06 10:05:47 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:31 +0000 lib/libc/amd64/string: add memrchr() scalar, baseline implementation The scalar implementation is fairly simplistic and only performs slightly better than the generic C implementation. It could be improved by using the same algorithm as for memchr, but it would have been a lot more complicated. The baseline implementation is similar to timingsafe_memcmp. It's slightly slower than memchr() due to the more complicated main loop, but I don't think that can be significantly improved. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42925 (cherry picked from commit fb197a4f7751bb4e116989e57ba7fb12a981895f) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/memrchr.S | 166 +++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index a14e8a768f01..b1369841bc74 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -6,6 +6,7 @@ MDSRCS+= \ memccpy.S \ memcpy.S \ memmove.S \ + memrchr.S \ memset.S \ stpcpy.S \ stpncpy.S \ diff --git a/lib/libc/amd64/string/memrchr.S b/lib/libc/amd64/string/memrchr.S new file mode 100644 index 000000000000..4f6c5a238daa --- /dev/null +++ b/lib/libc/amd64/string/memrchr.S @@ -0,0 +1,166 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(memrchr) + ARCHFUNC(memrchr, scalar) + ARCHFUNC(memrchr, baseline) +ENDARCHFUNCS(memrchr) + +ARCHENTRY(memrchr, scalar) + xor %eax, %eax # prospective return value + sub $4, %rdx # 4 bytes left to process? + jb 1f + + ALIGN_TEXT +0: xor %r8, %r8 + lea 2(%rdi), %r10 + cmp %sil, 2(%rdi) + cmovne %r8, %r10 # point to null if no match + + cmp %sil, (%rdi) + cmove %rdi, %r8 # point to first char if match + + lea 1(%rdi), %r9 + cmp %sil, 1(%rdi) + cmovne %r8, %r9 # point to first result if no match in second + + lea 3(%rdi), %r11 + cmp %sil, 3(%rdi) + cmovne %r10, %r11 + + test %r11, %r11 + cmovz %r9, %r11 # take first pair match if none in second + + test %r11, %r11 + cmovnz %r11, %rax # take match in current set if any + + add $4, %rdi + sub $4, %rdx + jae 0b + +1: cmp $-3, %edx # a least one character left to process? + jb 2f + + cmp %sil, (%rdi) + cmove %rdi, %rax + + lea 1(%rdi), %rcx + cmp $-2, %edx # at least two characters left to process? + jb 2f + + cmp %sil, 1(%rdi) + cmove %rcx, %rax + + lea 2(%rdi), %rcx + cmp $-1, %edx # at least three character left to process? + jb 2f + + cmp %sil, 2(%rdi) + cmove %rcx, %rax + +2: ret +ARCHEND(memrchr, scalar) + +ARCHENTRY(memrchr, baseline) + movd %esi, %xmm4 + test %rdx, %rdx # empty buffer? + jz .L0 # if yes, return immediately + + punpcklbw %xmm4, %xmm4 # c -> cc + mov %edi, %ecx + punpcklwd %xmm4, %xmm4 # cc -> cccc + and $~0xf, %rdi # align source pointer + pshufd $0, %xmm4, %xmm4 # cccc -> cccccccccccccccc + and $0xf, %ecx + movdqa %xmm4, %xmm0 + mov $-1, %r8d + pcmpeqb (%rdi), %xmm0 # compare aligned head + shl %cl, %r8d # mask of bytes in the head of the buffer + pmovmskb %xmm0, %eax + + sub $16, %rcx + and %r8d, %eax # match mask + add %rcx, %rdx # advance past head + cmc + jbe .Lrunt # did the string end in the buffer? + + mov %rdi, %rsi # pointer to matching chunk + add $16, %rdi + sub $16, %rdx # enough left for another round? + jbe 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa %xmm4, %xmm0 + pcmpeqb (%rdi), %xmm0 + pmovmskb %xmm0, %r8d + + cmp $16, %rdx # enough left for second chunk? + jbe 2f + + movdqa %xmm4, %xmm0 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm0, %ecx + + lea 16(%rdi), %r9 + test %ecx, %ecx # match found in second chunk? + cmovz %r8d, %ecx # if not, use match data from first chunk + cmovz %rdi, %r9 + + test %ecx, %ecx # any match found? + cmovnz %ecx, %eax # if yes, overwrite previously found match + cmovnz %r9, %rsi + + add $32, %rdi # advance to next iteration + sub $32, %rdx # advance to next chunks + ja 0b + + /* process remaining 1--16 bytes */ +1: pcmpeqb (%rdi), %xmm4 + mov $0xffff, %r8d + xor %ecx, %ecx + sub %edx, %ecx # number of bytes to be masked out + pmovmskb %xmm4, %r9d + shr %cl, %r8d # mask of bytes to be kept in the buffer + and %r9d, %r8d + cmovnz %r8d, %eax + cmovnz %rdi, %rsi + bsr %eax, %eax + lea (%rsi, %rax, 1), %rsi # pointer to match (or junk) + cmovnz %rsi, %rax # if any match was found, return it + ret + + /* end of chunk reached within first half iteration */ +2: test %r8d, %r8d # match in previous chunk? + cmovnz %r8d, %eax # if yes, overwrite previous chunks + cmovnz %rdi, %rsi + add $16, %rdi # point to tail + sub $16, %edx + jmp 1b # handle tail the same otherwise + + /* runt: string ends within head, edx has negated amount of invalid head bytes */ +.Lrunt: mov $0xffff, %r8d + xor %ecx, %ecx + sub %edx, %ecx + shr %cl, %r8d + and %r8d, %eax + bsr %eax, %eax + lea (%rdi, %rax, 1), %rdi + cmovnz %rdi, %rax + ret + + /* empty buffer: return a null pointer */ +.L0: xor %eax, %eax + ret +ARCHEND(memrchr, baseline) + + .section .note.GNU-stack, "", %progbits From nobody Wed Jan 24 19:45:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYp0Dt0z58c2d; Wed, 24 Jan 2024 19:45: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 4TKvYn48n6z46Cq; Wed, 24 Jan 2024 19:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwaeRrenVEyGjBrq+9lnHN0FwhRBrKeWFijZoUjZKMM=; b=ZOZUtGjLeNjO08QE2z4wI49DWCuUDRvyyvr1XfNXrAKup3jeXTTaB2t/vQv0jnRbopuAJG OzEqUyQyLofUSu67H08hiu0aXnTB7H8BdIFS8SSqiAO4DzKQ4n9m2/0gCs3rwhZ7AY9qrm EaIpJnLlcx3nA5H8EKTimCIUDj1AKqhb5dF5slz+SgAlUO51Et50TR5ICOytFT88vEsvDW OGS/JAlA7xFoejSGVoYqjtKkfFDinBR2p1SflijeV6nK0UBjS0ksqvAbEP5By0f3nIcRDv sn5RB7XVc3+3eJHs6Q3qB7k2K/uUcOOictP+9/SVpsVoIvo0oVtTg5pvOcIgqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwaeRrenVEyGjBrq+9lnHN0FwhRBrKeWFijZoUjZKMM=; b=cWejtNHSMRpH0/7Zy8mcAeSE15di3xBPUtqWumTL/aG4Gcwj98c8gB9FVsnfJG15CiJHbT /uRaTcs8AD9U/80G6GMWfFOVSsUOm27oIMxN9qMBrIwE41cALUDikbTWOPUXcCFNADWO9l CIFEmNExf6Wy5kZIPVl2wJnFQAg38yB18zIU+/TyBwCPUTbv0vfPYVAfOo69bYfj5JiNsJ Mt4HYihqxnjF9tIGVSv9EdTtE8e6DKw+RmNnK/4IiovL5XzSCbRhmt6PJlVAo/weZf4rom vM/E0S5NrFqMkwDMMHulEMvzUFH+0xyajSHmBcUJUswmXyyP4IFdhsL399/sFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125501; a=rsa-sha256; cv=none; b=FruRp8LvNQra/0xGdePZ49zNnDf5dTMGayoErSvfmw51oyLpgNOOgZp8FndYVl5I2H5RSu LwrcUJTiMHpXNP9QTOzlKVjVxpX/PP+VWE71OZm/SvIZkGfQDeJMdPcOWoLUe+0l4EMFBI 28y6GTThVPbfEqUnDUG1qV5Aa+vWTFcPFDqO7sZcKejXh49BTIdshnT9hSQ5V3zl7OVF/q xzrBkGYf9gOg1JUiDAuycWTCLeXZsdZAB8M5F6ClR8sRmy/SdpkxDfVusj/kFgn1v4K36j G207VTuhtVy486BgH5RcSREf6kDdfLM2Vq/aDUVaw5TH9KEaLZd8erfYCdsXhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYn3DBhzS6N; Wed, 24 Jan 2024 19:45: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 40OJj12v006176; Wed, 24 Jan 2024 19:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJj1iJ006172; Wed, 24 Jan 2024 19:45:01 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:45:01 GMT Message-Id: <202401241945.40OJj1iJ006172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 3f2c2dda2631 - stable/14 - share/man/man7/simd.7: document SIMD-enhanced memrchr implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f2c2dda263114c46d14c23b14f989118ab1a730 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f2c2dda263114c46d14c23b14f989118ab1a730 commit 3f2c2dda263114c46d14c23b14f989118ab1a730 Author: Robert Clausecker AuthorDate: 2023-12-06 13:47:03 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:31 +0000 share/man/man7/simd.7: document SIMD-enhanced memrchr implementation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 (cherry picked from commit fb9c25a91fcf4005141eeb81ce49f4399c425d32) --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 281898839c24..fd9485524aef 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 December 4, 2023 +.Dd December 6, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -63,6 +63,7 @@ Enhanced functions are present for the following architectures: .It memccpy Ta Ta Ta S1 .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 memrchr Ta Ta Ta S1 .It memset Ta S Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta S Ta Ta S1 From nobody Thu Jan 25 03:45:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DJ2pWsz57bxf; Thu, 25 Jan 2024 03:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL6DJ1805z4JdN; Thu, 25 Jan 2024 03:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yKvNN74TpzYwIR/8QUz+NDQDbaGgWl99v5gk+17K3fY=; b=NPmJsNS6PXYOW1aDhzU4b+w67hkypPEZWD4uI1dyp9PHXPnqWLUybpp0mwv27lyaDlhHm3 z/U2vFwBfGg4qt2JQDxIEg4U0obtbVw96I503fiLiQBgislQfPioAP7tefZUTaRPOHBtmm vHfGnZmgxPc8YXAFSqOb4FQnV0ZTy75ue67iSn7MlLHPfg7OljKsqeSSAC0026IDC9eaK8 b6lu99HcgkoOsvxBc1nPrPlXmZAWdAQMFbsXSmJ6wFnFJdaqgkSBr/EbhfPMnFM/T12IlN iQf1lBNaj92S80y6Tnxfzx1DfhgrSvfWXKSpZHU275R0uh3UUUuuj22P1FB06w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yKvNN74TpzYwIR/8QUz+NDQDbaGgWl99v5gk+17K3fY=; b=Dye35oT5JWJaSn20AROjfGyENcd+E6IRmF+bsjpjdMStJVrI/A/pqp+H139VIUrjLd4f1o rRfvuVT58tJjizDKcGBHe1RRDxqesFKmIfMZe6Zz6R6prQACWo8FUDPAnXZMAI0m46kcKl 516CzHcqeR74N38CWcd2wVN4kCzvGeaUjWsIJbkuVeAYm4A4aKFR7Ror0CAccO4N1RHypq 06n+LqyW528/4xhcrWl1ChpO9+k3OqLzz0rdFiuFrP6QW2uKJC9Aid3l02mXhIyVv2QBNq NwfMI6MKuCUGnylSryp9KP5jqjM7U3StJzZ2TufhHtkwgJUzRMSeSs7UOebuwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154336; a=rsa-sha256; cv=none; b=WlZ8NxtXEcfpxIw7iUbRNsQe3NYNkWAX7ih1og07GoQvk7TtaFmMqzpMThwDZW+5pCYOO1 /zd3UTVqgzDhL/wiKSTrJfawLFpsD6pwjkwv59my5SmHL9ZXv/+zu15iprKKcfzai/ApsQ /60hR7YOBVsSxIVkr0KJEo+/SzWVe0YqoE3L1GdaQSNB6JTqYgz4QG7Fbb9U69HIgBZFu2 ZFLSjRre3OQNkKlLNipE3PaVa3AySzUx9Ji5Y3xGU8kKzSab8juiT9QgUCwwnquVVC1fAR /+pi+P4CFfXmrEW3xLFetceRXEbZiUBrnSUEBV79bjpuf4Q40rKlq5fNWp/J0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DJ06KZzjKC; Thu, 25 Jan 2024 03:45: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 40P3jZc9013118; Thu, 25 Jan 2024 03:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jZo0013115; Thu, 25 Jan 2024 03:45:35 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:35 GMT Message-Id: <202401250345.40P3jZo0013115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e465acd0f6b9 - stable/14 - msdosfs_rename(): handle errors from msdosfs_lookup_ino() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e465acd0f6b9bfdedd0f3dc21cde81ccade3249c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e465acd0f6b9bfdedd0f3dc21cde81ccade3249c commit e465acd0f6b9bfdedd0f3dc21cde81ccade3249c Author: Konstantin Belousov AuthorDate: 2024-01-17 22:55:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_rename(): handle errors from msdosfs_lookup_ino() PR: 276408 (cherry picked from commit be0df84849ff3e8fb5ec65176ffde88dbefdc434) --- sys/fs/msdosfs/msdosfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index c17d9f785dc2..726b1d8e5cb7 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1180,8 +1180,8 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - MPASS(error == EJUSTRETURN); - error = createde(fip, tdip, NULL, tcnp); + if (error == EJUSTRETURN) + error = createde(fip, tdip, NULL, tcnp); if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock; From nobody Thu Jan 25 03:45:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DK2tVgz57bxg; Thu, 25 Jan 2024 03:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL6DK1ZRMz4JdP; Thu, 25 Jan 2024 03:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRtHOXgHH9pYcgT5Moo/svfMVj1OpmWdZ/vbab1PLM8=; b=Ay7ZvyT3qfQCiWCmfy7CxtJJomNZmLbph680MvRLwDvxQU1mPgoiL8ChG82mvgcUusMCHT 1lB1BwimQXq4Rf3WRvXbA0LH+oBJJnAq2op5xyQKmAKKYnW0YdCuuQgT7jzn3MPS+yBE6F DI9nVtH9jgWvVkk4rUcR3DXwos6DvdbDvNk3+xj8gLEzbvh99VkpMYH3uusifQjl2Uez6/ wDQpETElavabGVYAj+Sno/kjU1jtecvy1IE8mWEEyj8pipM6lBPQro7+8kx1vItHawaXJm DlvDpzdlnBqspKuxAM9wm+M6Mw7SjIDV5loFn+w13ckBXP9EeMhW1Skl9MHSMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRtHOXgHH9pYcgT5Moo/svfMVj1OpmWdZ/vbab1PLM8=; b=C1x0Gd+dvxc6V9bnh7P50AjFiIzS2vFI1Y+T/gObiCGE6OfE0tP6kar5KBSLKYX/cqMmMr hxIdH155QkCEqQL9pFGwf/6qlowvcU6eiKY6VyJjM9J4BplPpo+X9Uw5RTMKtAi03sJBt6 w8eIH7CECPJs+zq/VQ2UsAJ7Aos1e/LQK+M3KxhZKUIqG/JfUFGmGy6WvBvggQWhUGpFxJ 22pgkD0uxfhpR02MGod7eD6TcplIqyFZt9bDQcA5V5q/ORmqLIZ/NcT2Wk3Xe2PMENYii1 aHONcts0jMW5tHjiR3lX9LbY3sbp6JxafXW5XF1dkVJOxxdP4x8z9/D60O9/7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154337; a=rsa-sha256; cv=none; b=DJ4O1Y8gwtYCDARGwRjHx0RAumHi2uuYcRELwYcOT7qoSEeDe5sNo7PLxoDBzNh1ujAEEu nVWu2WXINFft5YNIyTaO73Ej4VlxmQ84n8+YN2oEFYwdkSAmXyiMnOAikwDMRr1jDagmKq R3oj50VmSB1H/uIrT1FKynnb6yEyqWvC3WqejR+NMsTV/c1HhkMBGJcZzzx8ocfIOiVicA 996uHcqeDquXNBB4RcF8f1IbveV8unj6m5MajEt1hLh/W7tZY8snSHxeYYvyb62d2I0pUD crMUYxxw2ZA9DLwRXAYjNIktXmD+s887K8UbUNTpy1fFvcfyrTSLbUt3xGa1tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DK0cyGzjKD; Thu, 25 Jan 2024 03:45: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 40P3jbWB013177; Thu, 25 Jan 2024 03:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jbZu013175; Thu, 25 Jan 2024 03:45:37 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:37 GMT Message-Id: <202401250345.40P3jbZu013175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 884f990d95c9 - stable/14 - msdosfs_rename(): implement several XXXs about downgrading to ro List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 884f990d95c9663933824f3b418000cbfe20c4d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=884f990d95c9663933824f3b418000cbfe20c4d9 commit 884f990d95c9663933824f3b418000cbfe20c4d9 Author: Konstantin Belousov AuthorDate: 2024-01-17 23:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_rename(): implement several XXXs about downgrading to ro (cherry picked from commit 661db9b390b4a40418d838876b58d2186d72aabf) --- sys/fs/msdosfs/msdosfs_vnops.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 726b1d8e5cb7..31d9b003a6fa 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1203,7 +1203,10 @@ relock: MPASS(error == 0); error = removede(fdip, fip); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: removede %s %s err %d\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + fdip->de_Name, fip->de_Name, error); + msdosfs_integrity_error(pmp); goto unlock; } if (!doingdirectory) { @@ -1237,7 +1240,10 @@ relock: error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block read error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } dotdotp = (struct direntry *)bp->b_data + 1; @@ -1250,7 +1256,10 @@ relock: if (DOINGASYNC(fvp)) bdwrite(bp); else if ((error = bwrite(bp)) != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block write error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } } From nobody Thu Jan 25 03:45:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DL3Cpbz57c05; Thu, 25 Jan 2024 03:45: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 4TL6DL2YBPz4JvN; Thu, 25 Jan 2024 03:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82AUnjJQWrZyRLgEGSWeNAt6vmZxdpuqDuqBqMg6whU=; b=G5JfY3gB3uBjMNmfRk9jwiLEMCT2dyxXOwx7o2MJRN0COjrNaQoMFYhjiwKZDxHzfnmuyg oWjOVSxz4HPylwCZ7XpwPILNlZWBT870SohnHxKHEPVL6//tL8Es7nn/a0Pp44+p37gF6T L9sNcrlxQ1DfDua+UM2LJ3gUuWMsDOBdT8GxveSdJvjQUM8nm2j3kaEqwOlaeAWJ9NL8Rj TP3Cfxap4O3bzprt/qz1SQsxFe4eAVqA986SoxB3FX/ObAFAPh25jKV1nn5LD1cVpxQQ5z LW5bYBnwy7XUNZCj+xRimRI16XPQVG05GpBr8BIxs5UpLNfbAmXc80VDV+Ij7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82AUnjJQWrZyRLgEGSWeNAt6vmZxdpuqDuqBqMg6whU=; b=K+lrew69FuJ2wvW3PSz0Tub7/ybQM6WmpWji/B9XQKqRTCbptz5Rl6y4aeR1l3ptTbHVxB 8/i4rJo5eBLLUoEEVfZEd7U7vlloirsXpA5OUd0wXfJaD23OUlFndTUBL2Kh5VlKxTA9m1 NmBYsjZlpCUpjapGgZ/YKTNK4OV2WW+VmROcZRSV1xUx6+oWl/q/jZV7DQG3Nbk71r+o9D y/JmoUSc0oCPPP2W3dpPgIA31vNwrZ/wAfv7qpx63X6MPWn/QmTqnKa5lzSua2ZHzdSP4V gQJOLInIAmYsWIvbVzdR+m/R2Jmng4Sg8n2E3UuVsmBThhjqeRHTbCE9uci15A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154338; a=rsa-sha256; cv=none; b=RkUnHj4FZPrYzz/Po9gRu8o+FNly00b6oFKcOol8zedjW4MuPXScfjFyyH/GwHoit+SEV3 g3hg0u+77ZVfqqGMyok7ZfcSve23XcERl+QvqTKw8WkLzgGGG6hKg+voiHOV/y9THflSyO Efk0bRmQm+2B5micBnuctJyDe1q6+xIT8M8V4Cos8xN5IsNBbZbnSk/GsfmePVrohry1W7 6ZM9PDdYH4vth9exgJwIdabpyrXSJlt7InFogWv+sRCVrMrnqZGOtOp1ex8uAy+F42XROm ztb7Re11OZZ9TuVr/7lP6hiiPaV4zdeH8+XO1vjF8Vfk4Dm2CuLBQdM2KlvQZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DL1dcTzjKF; Thu, 25 Jan 2024 03:45: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 40P3jc2x013219; Thu, 25 Jan 2024 03:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jcH6013216; Thu, 25 Jan 2024 03:45:38 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:38 GMT Message-Id: <202401250345.40P3jcH6013216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c315699722e8 - stable/14 - msdosfs_integrity_error(): plug possible busy leak List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c315699722e8dda053f8ed6def6d014bbfa5e6d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c315699722e8dda053f8ed6def6d014bbfa5e6d0 commit c315699722e8dda053f8ed6def6d014bbfa5e6d0 Author: Konstantin Belousov AuthorDate: 2024-01-18 15:35:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_integrity_error(): plug possible busy leak (cherry picked from commit 13ccb04589e2c5c840e19b407a59e44cb70ac28e) --- sys/fs/msdosfs/msdosfs_vfsops.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index df96bcbfe9c6..03c794bad900 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1006,7 +1006,9 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - vfs_unbusy(pmp->pm_mountp); + do { + vfs_unbusy(pmp->pm_mountp); + } while (--pending >= 0); } void @@ -1015,11 +1017,19 @@ msdosfs_integrity_error(struct msdosfsmount *pmp) int error; error = vfs_busy(pmp->pm_mountp, MBF_NOWAIT); - if (error == 0) - taskqueue_enqueue(taskqueue_thread, &pmp->pm_rw2ro_task); - else + if (error == 0) { + error = taskqueue_enqueue(taskqueue_thread, + &pmp->pm_rw2ro_task); + if (error != 0) { + printf("%s: integrity error scheduling failed, " + "error %d\n", + pmp->pm_mountp->mnt_stat.f_mntfromname, error); + vfs_unbusy(pmp->pm_mountp); + } + } else { printf("%s: integrity error busying failed, error %d\n", pmp->pm_mountp->mnt_stat.f_mntfromname, error); + } } static int From nobody Thu Jan 25 03:45:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DM5VHBz57c06; Thu, 25 Jan 2024 03:45: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 4TL6DM3Hkpz4K40; Thu, 25 Jan 2024 03:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCrz3cUFsO3Ub+B6aw8S8faV6lbdAvK4/d/By/c/3Uc=; b=e7G/AZlV7NBgCrr753KdgqDCJvA8sHTUTxQzym2NZTvqUh7TFCM1VSW5MhloXTHlwjzjRl towNzu1+iMw8MlEsZkjmETUE9OIcj1zuSNO/zi/itwsAI3Y9EtKdKegoGL14+sbyIIggSi gBXci5Dne1+1xsHhvaVymD8/WNtDZ4URzH/tc4UM249wFA9Gb3Ya5rwGGmx4a3p6T/VeNQ uXAJDUlz8Ju70s6f29Q1zh7l6EfYpBafZLukKdYgqp25y5YsWqkvnaYU/4gzWdxnAKxb8z upLkdRBv/vzIaRAHR9BsyKXJ5K8sQSm9cPp9xnEdOTtTTlH0EsCWGbt1Xey9Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCrz3cUFsO3Ub+B6aw8S8faV6lbdAvK4/d/By/c/3Uc=; b=rnJer5TY2tkquaj06mS+eL4+5RrYV4bpk6BypM23Tg5ST4ACNS31QwrW8lVn1H7ja4a6aA MKFWc7nYuacGW3M49XpXh8MrU/lye1VlsOMZWZBMukW8mQor3Hpm4BrijnacyanDjOiJjb fAZodJ7Bj/fGeBo6fFImusLaiiip4/Ajdwo4xpiq0NA5LFteyn6iVtGWtiJKiGNx6vVIRZ 7Jh94GK4qqv2vYsecq62IwHZ4HPSU3XFaug3D23gto3LpGmFxuoL+MBlnIr17Hs8EteKlM QBOcgsNI1rhPY3JnRc2So4y+jB1GM4XPr8npV3L0mYG9uAG8YPC8o1oLsey6og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154339; a=rsa-sha256; cv=none; b=h7qG8+P7DsCnGKbkYIsFbnnXqdPr6YJOI+TwER1Fg4Y7uaN4XvAzFV2YuikWZQSVf3B4oz KGWdxUYtLKaXWTCDWmSYcMS4kJU7bt64Kn3BB2gZhX8Snmf1bPIydxoC79/ZRv9UEXMDtL PnqqKwjhKiVdQmOuqYGWSPrA5uJOrF58L7HHuOu4w0aG5Z11Ll4RV2/9O6huPTKLjVAbOs 6bY2sk2BNCfRNAJWga+6ATqI1zW4MwujWG28G/BZmcHDoPG8J3QWDRCxqjdQA4n5pcv0gf ld+WDyA3jTQ6p5JwdC1yLi21vrb/KrHxJVmL9eGE69WVMq+k+SGPk/AzYSK+EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DM2NBWzjKG; Thu, 25 Jan 2024 03:45: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 40P3jd67013258; Thu, 25 Jan 2024 03:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jd0s013255; Thu, 25 Jan 2024 03:45:39 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:39 GMT Message-Id: <202401250345.40P3jd0s013255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 68d021de3455 - stable/14 - msdosfs_remount_ro(): correct vfs_unbusy() loop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 68d021de34550cf1d133a375ab13544d453323e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=68d021de34550cf1d133a375ab13544d453323e1 commit 68d021de34550cf1d133a375ab13544d453323e1 Author: Konstantin Belousov AuthorDate: 2024-01-19 23:50:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_remount_ro(): correct vfs_unbusy() loop PR: 276408 (cherry picked from commit 4b3ffc5918b9968ea6ddee6f6cdf3538072e5ef4) --- sys/fs/msdosfs/msdosfs_vfsops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 03c794bad900..258c701bd300 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1006,9 +1006,8 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - do { + while (--pending >= 0) vfs_unbusy(pmp->pm_mountp); - } while (--pending >= 0); } void From nobody Thu Jan 25 04:32:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G21Z5Zz57gY2; Thu, 25 Jan 2024 04:32: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 4TL7G210CHz4Rj9; Thu, 25 Jan 2024 04:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKvuOpscyRqUcWzxnpzHbkSSDrivYZtQH19KVePaDJ4=; b=IB5f/xpeSr9klMs0znb3ulOQpDr6TtWQPJ5WiGH+PYgG5WQpA0hxrE534t+cKI5jCtQPv6 b/jx5vFLl5KuY+U11NNprLdB+ncwrKXZw9G2Q2kx2ctEDFsArmgQeBhBcOR71VcbPVhhjH N8El1Ggxfrq2Egf0OoGORn12TSrUKB49mbGgdaWouIQk9rCw7jiUGyUKCl3vPtxNr8DzEO kaWijzluRw7l0PBw/XSm9EGHW9V903r5/OiVfKw16GDJ0wl35OsV/W0EVNab3og+AwS+J+ 5hDGtdeU94bD7J/xOTZAqtZHdfKp1TTPteDzfyeVUH7tYCzdXjkBh68nwNv/uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKvuOpscyRqUcWzxnpzHbkSSDrivYZtQH19KVePaDJ4=; b=YgAiwGcn8RWu75+CtB1TtBtCwH2gZGH7l07bFyAae2L/Dv0L/cFB8awk2ivnTgBK8tgtvp AA0cvPnwElHsrwq6HskDRx0NTcmnGCIAn1bCHE3Sf2WK9nyYC+wVqxag3XrEnwcsqUt3GF XyeVYRYGztzcBIkTTrp8v3kXfJD5XwCkHGyCd2/qjs++bVDUTvV9/AS7XnCrTH+kNvQyUC reEdRKHRUEfHK2oLCT/A6goBfkXQJD0r7+xbEkr6ElslCt6HRG959p0e6AUq7KzQQFcf6M RTrlBSiwyobCklGPlXukm9G4tU0VaWaxvafchh4GhcOoB6PT4R23uqCh6ozUrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157130; a=rsa-sha256; cv=none; b=I2vQPEidyxRaB6vY30g07U5GME7YsFh/gt7obbPY4+imt9GLKj76JfufrFKefRfjxmTiKP dLaUAx5/tuhoZy0OHN2SsKK+CHa1z+a+DHN5qKgHG6Tdchs08QcixG3vUzuwaWTR37Xaok DbZW3bQ4TppPd1xT9/pmO6kz5pNzeGeIoeRRP48DPGS0m9BnHRg4sO5OnWtHr/1I8744mK izsApk+yXSLVR8hSdIfgQTNuEFSEgGdroLSE1Mc4LB0LRlHJmtAwjaQQzY2p08bYZ0ELVj M6eE3cI9u92+/pZUkB6fbyq10ssk2VrwQT8fagEh2IfJ3IxP+iLOfl25EHloDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G20306zkHP; Thu, 25 Jan 2024 04:32: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 40P4W9GJ092428; Thu, 25 Jan 2024 04:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4W9Q1092425; Thu, 25 Jan 2024 04:32:09 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:09 GMT Message-Id: <202401250432.40P4W9Q1092425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 14ef49bbadec - stable/13 - msdosfs_rename(): handle errors from msdosfs_lookup_ino() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 14ef49bbadeccf6f765025af33a07886fe3dae6f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=14ef49bbadeccf6f765025af33a07886fe3dae6f commit 14ef49bbadeccf6f765025af33a07886fe3dae6f Author: Konstantin Belousov AuthorDate: 2024-01-17 22:55:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_rename(): handle errors from msdosfs_lookup_ino() PR: 276408 (cherry picked from commit be0df84849ff3e8fb5ec65176ffde88dbefdc434) --- sys/fs/msdosfs/msdosfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 3ab9e3b3665f..a2fc115e2ca5 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1192,8 +1192,8 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - MPASS(error == EJUSTRETURN); - error = createde(fip, tdip, NULL, tcnp); + if (error == EJUSTRETURN) + error = createde(fip, tdip, NULL, tcnp); if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock; From nobody Thu Jan 25 04:32:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G32YMTz57gVD; Thu, 25 Jan 2024 04:32: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 4TL7G3204dz4RS4; Thu, 25 Jan 2024 04:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=im06dLLY2a/WJEzCpCPaj2gHTq+3b/kHX5lEMWTrWQk=; b=bw5dSZNdlsnQFXOXcPfCpBKw4OU1/m7NAVv5+mjXb+Lyq0TCxahnfu2HrbBAwmUYlBZq6I 0qoRATU1SaUYqXHtzvRW8NQMzkJyx7iPfO8Zlp1Z8oDR/aEayODro7LIpGD3ciqhWy7Ekx Y5SfMY00LZLOuI4NdoGmd2ycGYtGPMqj+euRhwiuKQ73eJJI+y0P4/nWuetudJxZ7IgO+z FpA5/vI5SfxzD+JwZmfBXGMJ6dzQGoVobPIapwZExR0rQnAySwQPOcxck5gK0ZHID1wdoE cMV3bf+CaC4BFyvSKN0gkirQ+qVg9fouIEQnFiAXjbGZBj1XfEeibWgn4jkAVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=im06dLLY2a/WJEzCpCPaj2gHTq+3b/kHX5lEMWTrWQk=; b=stK2sRGJYCnsbQ/fmtDdSJHJBoK9+aZnFbt7h1zDZPlPq9UdIuh8Nebc0Rh1NQB7xnP79y e7LmRemHrLp72KPRdXSiPutUVI1K2FlfVpVvBJoLviss8ML4wNCm4L0lijoZW1i9dKX0WY 3y/tyBzjNfL6/hMF1a6FcNqYFus55o1NBLmriyRtRP0BkxsYSeIh5Mg5cKRB3mpDjiTtUm XiLi2nuDTb0JumS7xxaiLtmUhyrqQHsZC1UNhkKLuqUgMkwUi/6QDXOpwihcKspqRNY/DP xlRKIHWyfIM2Y3l61mneTv/7e8VI/bTwN50fVMnoQ9j+nwYY+KMtFi4DvuAN4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157131; a=rsa-sha256; cv=none; b=biiEzb+Qi7djD8FiLI+TWVvRQqUfWcVlNzjslZzd1LMljizrxNi8rQOFUwwh/JeR/MUUop jzFR8CCObV5RV2g0fTWD/dSYw7BmYDQcJ2xi2doVdiA5UQZepiNUpMU8e5hAncKoijytAh MsrebQC8HFN2Agfb7QlenN0GS98/BlHqiy50z9qhvOAHHZs4mc7gtRVyHUoNKVUgeiGOlk bmAPBIRPePWMIaMVBoAUgulLsdWSqN0AxPFRERUY1TMohP2qalwqTr7JAaMFsRcXCCj8nb DyAQOz4nAdKX/uT1LawhU8+qcLYV4UxOwsjFcUtGS5TbbQZmNLLwZQKt9coBDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G313Hyzk8L; Thu, 25 Jan 2024 04:32: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 40P4WBxv092479; Thu, 25 Jan 2024 04:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4WBK5092476; Thu, 25 Jan 2024 04:32:11 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:11 GMT Message-Id: <202401250432.40P4WBK5092476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2ce0f6fb8d83 - stable/13 - msdosfs_rename(): implement several XXXs about downgrading to ro List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 commit 2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 Author: Konstantin Belousov AuthorDate: 2024-01-17 23:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_rename(): implement several XXXs about downgrading to ro (cherry picked from commit 661db9b390b4a40418d838876b58d2186d72aabf) --- sys/fs/msdosfs/msdosfs_vnops.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index a2fc115e2ca5..1d296c019331 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1215,7 +1215,10 @@ relock: MPASS(error == 0); error = removede(fdip, fip); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: removede %s %s err %d\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + fdip->de_Name, fip->de_Name, error); + msdosfs_integrity_error(pmp); goto unlock; } if (!doingdirectory) { @@ -1249,7 +1252,10 @@ relock: error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block read error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } dotdotp = (struct direntry *)bp->b_data + 1; @@ -1262,7 +1268,10 @@ relock: if (DOINGASYNC(fvp)) bdwrite(bp); else if ((error = bwrite(bp)) != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block write error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } } From nobody Thu Jan 25 04:32:12 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G51Dm5z57gY4; Thu, 25 Jan 2024 04:32: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 4TL7G43PQLz4RSQ; Thu, 25 Jan 2024 04:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNL1w91eyhISOg2b74gP/WFTSxdWS71UTE8X4czWMhg=; b=sMgZaVJZsWVBUMyDep1ocaMrutyTTyvZPSTT/kr68MuakBhLaum7JBSIAYohCNihdtJVbX WMMwxCDJsBA3gXo36aCbvYfT17dvrz/dnLA98T7uxGmiR3Te6Mqdg66AKwzXXvFKFsHf9B z5WVa3P6OJjHGi0ZnQwGjWHZsdOO1Q5rqSh5zNRh3LiiJjv7Jt+UWh1ucQ9U128SWEbyDL KnHlfiUtdbMDOu2kgbuthARRssDoVNUjZHBglhquRnEkRH4m35vVA7W1qWkbHzHIriawWL Re3AHXLYxfJxQzocQCsBFWehqPtKMG2VaWrEmz70us0zSSjpqeTsvM+IbWfriw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNL1w91eyhISOg2b74gP/WFTSxdWS71UTE8X4czWMhg=; b=JXA5gXISzZOs+Pv5y+jpo+dsDomDnLu2eCsNZ5bjSmYNwd0W47LMBeN+v6BeZXPNCzZcp2 S4GEZ4X66TSK5fcDlDTAwHTnGhBtJDe+nKnLWX7TTKp2Ki3KGwj7pPX+kIuJQSQZkHg5NT wNuJ9WMLBKYC40GDyE18TlA+ZyZ4QaJY/hI/PDuDEfg9LRVW8KsjaSNtfGLkWZkTpJR8FF rHP9Nq44DvE3watjKWsxZVkHpHLUPx3KF1DmMw6sVOjbi1EeXt4aEXlwjygVauhxoL+a36 r0Qpiw4UGSroiV6QAOivnbJHaUpISTlBmKKGTL3y2dEc41m2unTpzgaRcXBfag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157132; a=rsa-sha256; cv=none; b=ZRA9/ax11pVtxbX5rnN4WJkPhvew9s7krsHI37U9/IsLurmk9Z09YtVq72SHkz+L2d/3/m eQwGsP94PuL2g/fUD0TdIa/P9T3eCHpUbpytMM90Aw/02CzFwApXkiaQJqa+GpR2OKaMpX ihMIpl9C56kvnf10HjD3n9pMOyA/f1QFO9FvDfyHfokSpdVvt2CV3aOy0og8LE/ms8AxsJ oVNn54DcLBpQH8BjpM+iq/kF5E8wu4iEKMGvmmJFKAvsz4WvuGTmzG0r4Yxwt8WHIVt7yv MN5mhrpYFykTcNoq12v8Yk5oW7Q1NXKOMhiaI5LpyAIja+ACIp+tKOZzLkzDYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G423z0zkHQ; Thu, 25 Jan 2024 04:32: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 40P4WCxC092521; Thu, 25 Jan 2024 04:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4WC67092518; Thu, 25 Jan 2024 04:32:12 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:12 GMT Message-Id: <202401250432.40P4WC67092518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e45f10165847 - stable/13 - msdosfs_integrity_error(): plug possible busy leak List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e45f10165847baf419dbec40d0f10c0b2864442f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e45f10165847baf419dbec40d0f10c0b2864442f commit e45f10165847baf419dbec40d0f10c0b2864442f Author: Konstantin Belousov AuthorDate: 2024-01-18 15:35:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_integrity_error(): plug possible busy leak (cherry picked from commit 13ccb04589e2c5c840e19b407a59e44cb70ac28e) --- sys/fs/msdosfs/msdosfs_vfsops.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 73082976ec46..fe367122b3e3 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1008,7 +1008,9 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - vfs_unbusy(pmp->pm_mountp); + do { + vfs_unbusy(pmp->pm_mountp); + } while (--pending >= 0); } void @@ -1017,11 +1019,19 @@ msdosfs_integrity_error(struct msdosfsmount *pmp) int error; error = vfs_busy(pmp->pm_mountp, MBF_NOWAIT); - if (error == 0) - taskqueue_enqueue(taskqueue_thread, &pmp->pm_rw2ro_task); - else + if (error == 0) { + error = taskqueue_enqueue(taskqueue_thread, + &pmp->pm_rw2ro_task); + if (error != 0) { + printf("%s: integrity error scheduling failed, " + "error %d\n", + pmp->pm_mountp->mnt_stat.f_mntfromname, error); + vfs_unbusy(pmp->pm_mountp); + } + } else { printf("%s: integrity error busying failed, error %d\n", pmp->pm_mountp->mnt_stat.f_mntfromname, error); + } } static int From nobody Thu Jan 25 04:32:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G556syz57gM1; Thu, 25 Jan 2024 04:32: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 4TL7G53zsJz4RKW; Thu, 25 Jan 2024 04:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUVc0BXmfmdpqiu3d8i76IOKQEIjbrpjTF18XtuyP58=; b=LhNz3VNijAhtG2Amp2Lyv6NTBsHhErjhmi0Bg1g9tMYA4d0dZwMa1xr+ruwhceg/0l8nuh A2resHmsExxPb6SBQ2zk3tQboTatl4CM7fJSLOO71XjoiM467ByugYEK9+WwnRzV/xAAV7 hbG1lOfRdG5N7jOAbH7aNdFjWgtUm8I4JHAMswTfd4+uJmzHO4mcRchW/iCRZRGMMChxXY JECdIjN1/PXThgXLKE/+KtN18bkvYp0J3tVOrQOi5q67/6L9pAwr54KZiB0HH0N/1P/19u iZcc+cXJ8kb1pWn5mMmuYNfcEW98pX3jkatU8daIoVu8darQSlm2DaemZE03jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUVc0BXmfmdpqiu3d8i76IOKQEIjbrpjTF18XtuyP58=; b=IhIrSkZANJCgBB7fJLs2HQLtwt0UDY1GKNH57qzqBqT53EdmC9AQQpQTG/QJBDghrC2mu3 V13cePlt5fu806DeOAP220jzdTcRPo+BEWcFyW0pJVvsUSQzfKjhchq8lFg3heo7Sb8OF9 oIMwtisudaxZFWfaSKN2ajEkqX49cHPKLrqWVDMTVCVR7fOm9y9jvpCsCXsCArHPDI125l Mo6i8iekOZ7Zk0RLm90uT9DH6E/FLBQFDrA0CqlnsEeL7HE9fxcnK1947h/pDgep8TCmkk DzkzfZE8T9Z+1Tg43Pv06EZWUxdPNmwgMkm/nSuoqs6eVDsZgi9u00liImItJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157133; a=rsa-sha256; cv=none; b=RbGBx8qUrKOc2WvRQVnroabD/OvjkPDfn+E784O0BKInlIvpmC0XDHynkYZjzVuXOQrgRA dFe/s0h8/7Q4Raw9f/r/D1MXM9iErSIqxnpuAhSA77f9frjcvfem+HyKRzEGw8qjLZQsD5 AJQv/0jyOh8SWJX3hUZrl0aHvYK6vVOszLCqT/ge2RPyyx8HsNX4lTZkWqwTdjk+gPKDHO gPeD9Z1cJYcYbVQXvU5BQ4+7gtKiatsnCkg1IN84p+P0va7KZKWCi3L9n91NW7MmEWtxmR XHVrda0gUnY3P2Wfawt0qtyCSsNtXCvrSaiJ/n+++eidQ+iXvpzFgeaA6PwcHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G5353dzkTh; Thu, 25 Jan 2024 04:32: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 40P4WDsw092563; Thu, 25 Jan 2024 04:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4WDLX092560; Thu, 25 Jan 2024 04:32:13 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:13 GMT Message-Id: <202401250432.40P4WDLX092560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bbcc33086adc - stable/13 - msdosfs_remount_ro(): correct vfs_unbusy() loop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: bbcc33086adc5e2baba3c97f1e53fedcaa504edb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bbcc33086adc5e2baba3c97f1e53fedcaa504edb commit bbcc33086adc5e2baba3c97f1e53fedcaa504edb Author: Konstantin Belousov AuthorDate: 2024-01-19 23:50:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_remount_ro(): correct vfs_unbusy() loop PR: 276408 (cherry picked from commit 4b3ffc5918b9968ea6ddee6f6cdf3538072e5ef4) --- sys/fs/msdosfs/msdosfs_vfsops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index fe367122b3e3..b5392e62b578 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1008,9 +1008,8 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - do { + while (--pending >= 0) vfs_unbusy(pmp->pm_mountp); - } while (--pending >= 0); } void From nobody Thu Jan 25 06:48:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH44f1Vz57tkF; Thu, 25 Jan 2024 06:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBH42m4pz4kZm; Thu, 25 Jan 2024 06:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdgaWTIMKqjRU0Nhef9xMz1VC6y07eYAMZkPvqlOzew=; b=xwV4kzDM25tN6HLuH11OZS5MgrSZh5kMpINxF1/jgXH0uPeNIQG0YaeKtfb7nA8HTP48zN oaI9aWyn4z7Ip0L/5UTspyqCtmeu9zdOr8z2pgFwl4nhyGDDrPyTZm8uvv3BVf1F+omo3k qWNJC1m5zeRSmM6V3f5frfcPO1OP0ZkFMcWBYACTDhcFHqHacrZHquyG2Z5kc8HzOANuwl Y81Tp3Nw4/4pnmiC9R2P3q48QmMAJKlo02GmqzN4Q0/f3Ke1XKcD5ov+IAOfs9gyr4kTxE 8kk4lorN0FpI09YUzmdRls7cImJE0dW3fA0iNaMARneza2XidC/+GPuCUKkTlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdgaWTIMKqjRU0Nhef9xMz1VC6y07eYAMZkPvqlOzew=; b=iVQGWuvYUhP+6nOhCw1Y6cogSCLFhcBc5sGq1zR0fk1I1YI9JyEkvQNv3fmgenzYbK7uJ7 olrQpSOP/89kEX7kjRjQ9+OqeGnvSGhsyTs647uyPAsqbKAcAr/MIKabJ7jm8VIMnW6n7i aleHgo8kVIhJrA6npVOLSK3dWfyzULx9EuyG+TkPQSEMBbbqkXNzi/vkQd0KOSOUwDXTUe MsQvrnS6Oy1USI6HQRzCFTqMSLbLhOuTIhsg97I4USll4G7t5iuvXpZ3ZxClSsMhEPu6wh xjcuAajqXHXQQPfdSUjgknZN3LYi5P9ARpVVMmsrl0CfGs1+w0rKZVAFrHS3yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165296; a=rsa-sha256; cv=none; b=HmWRdbpscVSl5JfduTYonIjyLciLyuuwVubbk5/fuXrjL4/hXoComitzLeFuxDN8Lw/AAg 3li0Ny1AKjQdruOBuD0xUWZZvaF538afBsvYXPPhYwRTv+ZjyKl/rE7RJxsZAbJx0vLl1D HzpcBQZgkYK3FkOg2MgE0OfoKZAAAX67SspEGxFq9BA/cHPRYrLnAgiOSHMDPjO+QT/EgH FV7TBi26M+pOeY15aDaA1vX6Uk2BTX4jZcuT7PPseu3pPfh5liJmTxB16H42rU02zxlUJe e/DJ7QR1VZ4t10Npv2tvIrTrSsSMxnT5lvAy030s9I93v0U1gn5WttxliiqOsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH41qBZzn8V; Thu, 25 Jan 2024 06:48: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 40P6mGFO016455; Thu, 25 Jan 2024 06:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mGQU016452; Thu, 25 Jan 2024 06:48:16 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:16 GMT Message-Id: <202401250648.40P6mGQU016452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 80568cbfced8 - stable/14 - gjournal(8): Fix a typo in a sysctl description List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 80568cbfced81534e8f90d2a5ff0dacac76fb89b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=80568cbfced81534e8f90d2a5ff0dacac76fb89b commit 80568cbfced81534e8f90d2a5ff0dacac76fb89b Author: Gordon Bergling AuthorDate: 2024-01-20 19:58:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:43:16 +0000 gjournal(8): Fix a typo in a sysctl description - s/entires/entries/ (cherry picked from commit 3fb6adb07915b6759892c937fe4ae8a07ed1a029) --- sys/geom/journal/g_journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 11a75e541fda..4d4fa26dd608 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -131,7 +131,7 @@ g_journal_record_entries_sysctl(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_kern_geom_journal, OID_AUTO, record_entries, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, g_journal_record_entries_sysctl, "I", - "Maximum number of entires in one journal record"); + "Maximum number of entries in one journal record"); SYSCTL_UINT(_kern_geom_journal, OID_AUTO, optimize, CTLFLAG_RW, &g_journal_do_optimize, 0, "Try to combine bios on flush and copy"); From nobody Thu Jan 25 06:48:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH54P90z57twN; Thu, 25 Jan 2024 06:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBH53nX5z4kl9; Thu, 25 Jan 2024 06:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ti1JkYxlFTtmRSlbz26VnFbkLgBb4jWhNZ76vTwtMy4=; b=XqSrjatRTxy7Mp57vL+PagZX72F+0TK6SG+thTo3PRNN/mfGU73Bb8ExXjupnXm7S2+zTE V+CbV5UrRGgLtAYBwKAHJYbPnm/1TgmY+TFQCweNCdzE8426J1nD7b9MuPf4fRqhvhlYAz 8AktdFSuAReGeHwV5D+fPK1R15QKyp8xg1m0aODBzQE5tro2OLb/LnTktuYKEbjLINcHpa EipCbuSYc5o4ohZqd4aEPvIlKAfxGzYyZXulyb0KUI89WXMRrSj9LctH6nLrdAemJuvu30 k36VuJGvH+wUhWYhYIbOx/F38i0DqKjKZtBciMh8Ssp17UZ0ilCmzJsRnAG9ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ti1JkYxlFTtmRSlbz26VnFbkLgBb4jWhNZ76vTwtMy4=; b=plbSqErT4aI6LVLPiARoerDJQCDQqj8kw32PH8v5B1xc4GF3KJ5URY6pw9BRU4ccZvfuiJ Akjf4uakBAtxPnEV5lMxtu9rZaOxGICzXGOCdlVv4o8Br3KPPnrDO8ACrmwvhmWaDCPfkQ QBdjVzDKyK+o1+eE0f7bNxMSuov0evI/ddYFPL/9WN2bRXwHpwLkyqAWm11yUakAb7xqBA LLkTAJ/uqH9NCgWgJL/fq1k/lB/ySc/rXwh1SltjQtR/RRWtLAa4MydnMjTYn4D20ibYLt 4hGlDYzIniLFy5ObEkAaiSAkHkudd4jtX44ES2hnCSYHZDOvn6omyQYHBN3j0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165297; a=rsa-sha256; cv=none; b=tg5mn19RgspH2MeAE20rG/yO604sMzgZytRGaH+rHeSP2jgUrpbPLBCO/2J+R/e3g61j+j jnm0gOq/blm7P0kRP4HN4dA/R7Z4vY32EFKVCc48fLdyqw23WF9qqcAnHlZrLBuvgTaLBr ou43pUhVEML1ZMp/GGTeb0tDTaKWHmmpCagYgcSL+2ZKm7iVCfk5MKs2LskdyRfGdiLiKA D9zwGeYQ0rS06PoTUdhWxHkEhHNnTaD4TMzyix0hVFvWj0SGSirlOHyNgansPwuHcHoVRX ScC9g36sdg8uTjF9V8JKTMy/P0g1L6KQx/cBr7sg3lxWQzJlgzhFQ3YfBbNqAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH52rfszn8X; Thu, 25 Jan 2024 06:48: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 40P6mHeF016611; Thu, 25 Jan 2024 06:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mH9o016608; Thu, 25 Jan 2024 06:48:17 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:17 GMT Message-Id: <202401250648.40P6mH9o016608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 79934439c1d8 - stable/14 - virtio(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 79934439c1d8cd67e17fa6f1ed50acc974ba293b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=79934439c1d8cd67e17fa6f1ed50acc974ba293b commit 79934439c1d8cd67e17fa6f1ed50acc974ba293b Author: Gordon Bergling AuthorDate: 2024-01-22 20:59:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:43:30 +0000 virtio(4): Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit 97a4045aaf36079f54ee05a8cb314b8a90f20af8) --- sys/dev/virtio/network/virtio_net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 4dfa4d3341f0..4b728f7af21a 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -210,7 +210,7 @@ struct virtio_net_ctrl_mac { * Control link announce acknowledgement * * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that - * driver has recevied the notification; device would clear the + * driver has received the notification; device would clear the * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives * this command. */ From nobody Thu Jan 25 06:48:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH6616yz57tql; Thu, 25 Jan 2024 06:48: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 4TLBH652xcz4klN; Thu, 25 Jan 2024 06:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlR5ehVh1xyOtKWsg6h+E5KUAURwjI2qzHViAIyBRa0=; b=eTPuYCXh3E7Z1SKSxfX9vz3/09QGO1fdTZn6yrJPd/LChkRgBp+Z7Hk+vluGDN33g7Mxs2 cCj8AScKKBxesHUHeyjj7DxHZD2BpqHnBDy+HLaQLC5fnzUBeMGIz9XVVQ8Op4BMhZO/Zz GRsqgayGpkjNivdScG+0hLH/MEwK+TCSX26qcB3JGzWhoMNgRHnN4xAys6WBtarxhCJKxU TiJBBrTL8YjWI3Ygd8FRyll/2AVXXeASlgY+7hXXKdiv1WOGskr8KP+D4tj+QkOehF+5g2 tZ7aBoTYq95ICWXv7I0D1AhaBoC5UmiWd8OFAykPp4FDuOMDTt/fKIxm6OqR0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlR5ehVh1xyOtKWsg6h+E5KUAURwjI2qzHViAIyBRa0=; b=SFpPI0+u9Eg8ktnAcVn2E7UEKrVHQSmmV3YqqTeaSkqsR3ogacaTs95pBBec+bgEU0S2sf bALb2BeEbotlvlEj5baDF/yckHspsfN2Jet4T4LKTKtrqzWkMUc4Wi3zOfnhQXSISnKtCG sZAYAYJEgfmP4sfCqj+PIQvELTwK/Y52hxNiEhI//hsbu2MdFbUz6fGmAS6zDD0RO6YsPC 7J/6BcUvyAweFTPxu4jeWbpl0vp1gjlmvRJEs3AR30V9bqkKzxBrCS4ITt7Sr9BoADa+90 1ADZ52c8NA1boKBEvABBYBVODeCqMiWwKkA2IJ1uiTLqdtqIsmoqzAmKsvRi3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165298; a=rsa-sha256; cv=none; b=yysvu0RA/SZiVoeEts6IZR7a1rfGDuZ0XEob5VCz/Lboz18nEy0Mt1M1gqjGhG8gbswb/w chOVEnmIsqm/Q2x7bqo9pBM6ye/MyqTcWmDehhqRrJYQcc14/nJMMDjsjeilhTBS3KfHey hJ5+PuKV6nRwNF18KE9vOGxCCAu5jYWMJdZXGm6+4Do9N92kasQPpi5URrShx+eSQ5vHXS q0j46JWfmnePCw5uDAJX6ebgh8nD8HjEx4D6Y45NxlQ5c5HuQUWmJ1sgN21mi1sJMkhEgh vkgVDUvOqMezliZqZIWZ9CJHvUN1xhfg6Vv3LEKUMbB7+a9c6uS8XUQxmb0YpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH64797zn70; Thu, 25 Jan 2024 06:48: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 40P6mIgC016694; Thu, 25 Jan 2024 06:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mINZ016691; Thu, 25 Jan 2024 06:48:18 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:18 GMT Message-Id: <202401250648.40P6mINZ016691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a7fb3cfeb3e1 - stable/14 - rtsock: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a7fb3cfeb3e1f9eb2642e6e2172bb384de174fd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a7fb3cfeb3e1f9eb2642e6e2172bb384de174fd1 commit a7fb3cfeb3e1f9eb2642e6e2172bb384de174fd1 Author: Gordon Bergling AuthorDate: 2024-01-22 20:53:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:43:49 +0000 rtsock: Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit ab6d773dbf926e4f92e37b67a85c3290cfb90723) --- sys/net/rtsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 019b9e80291c..caee9bd6e83f 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -683,7 +683,7 @@ fill_addrinfo(struct rt_msghdr *rtm, int len, struct linear_buffer *lb, u_int fi /* * A host route through the loopback interface is - * installed for each interface adddress. In pre 8.0 + * installed for each interface address. In pre 8.0 * releases the interface address of a PPP link type * is not reachable locally. This behavior is fixed as * part of the new L2/L3 redesign and rewrite work. The From nobody Thu Jan 25 06:48:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH80ycXz57tlX; Thu, 25 Jan 2024 06:48: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 4TLBH764dzz4krC; Thu, 25 Jan 2024 06:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5KEHRbXQ6YbExAOfLFeu48ZJmocIyJw48jOwJTaY2Bg=; b=VFpA8TuNbw7Z2g8lloaUR+ajNXCoG4CeSg/5tL35TjNbQmVhTD7lqI/Bpe/jzqu65Oiuev xUxUn+SiF+qGolwiczi188KwjkrRyeL2JjSQJUhzlhASereMrAYoSvpGMgAgxKIrfjLutt 8XO6PNANRSnEwOeWKjDDVuWcvwfthDWcnX1VAhJMjRKxz2Rv72wR8CzQV929nFjv6mKRys aHyDWKxzxDD/tHuqgPgY4n5ToMSMXPdMeREB2HPPuwPpSX1/cxJo46x4KBM2XU4CD9qWhj 6YkNKwAkZoiKIVQzKMTHd3747ZvAuBqmAm4xywfx6QUeUEFAmS2hREre/vBK3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5KEHRbXQ6YbExAOfLFeu48ZJmocIyJw48jOwJTaY2Bg=; b=xkHoMPNK6A9NhhyDFv2FO8p1FG1s8cll+IjfcyXRbTodljl//f3Dp+A89MTQ57Wb/S4VMO dlU7rUOfcjOmmJQMRRf0J1FY3gq4h9ew7IeEuuwc8aSd0M+4NKRnncmPiuS56U0+rPDIqn YTmxiKWm5bZr6Djgw3YkJAtlb+yA9VB3ya0H11OAVbrlDClOs8HhTbtvmpju22TYlcQDxB nugY1B78LwPUbclQDHndQsv2crjxJSayYoMozOctZkzP5YIV9gHlEXVWcZwOZ7P4Tl2AjU /oT3iSANuxffxfupjlHIRn0GnaOws/WxBt8ADgm+JWyZIlEPvfyRbZ6RYaGKpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165299; a=rsa-sha256; cv=none; b=s193lRsALGvgJ+g+jZzIZqwVBkRPAdQhAO4cjxrQzK4WKBTIhe6m9A+D975aQeXT1UgNYB oREHXN3I5rlUGnNoDy3PXUAZyKC9ryIMaJUk74AykmzJZGNTMDOanAOKGYvppaZbOfasqS X/z5TPdlmpx5BIkMwkWWH1RxpM4iuVz9gNYR3Y6U3Aye0e0NxR2E3ucjcJDy2UWzYUtbPD 4urKNz810OcEJtLwQCzOPl0yyOpq9AhBzFZ8aEhbrVyLGTPGXwubk9SbqOe25evgw/JL0p qqZ+7NRPv6cUheKxdMg5Sb6sLKYeMvThvGI0UpFly6MX5uFOf7F/2DdP8Y1t8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH757yDzmsF; Thu, 25 Jan 2024 06:48: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 40P6mJcn016749; Thu, 25 Jan 2024 06:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mJxc016746; Thu, 25 Jan 2024 06:48:19 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:19 GMT Message-Id: <202401250648.40P6mJxc016746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d7b74e01f4dc - stable/14 - aic7xxx: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d7b74e01f4dcffd765e77ed7c71f22a6ea301558 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d7b74e01f4dcffd765e77ed7c71f22a6ea301558 commit d7b74e01f4dcffd765e77ed7c71f22a6ea301558 Author: Gordon Bergling AuthorDate: 2024-01-22 20:47:23 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:44:15 +0000 aic7xxx: Fix two typos in source code comments - s/recevied/received/ (cherry picked from commit b971c51a4d9498c26079fd8229f7af6ef1585020) --- sys/dev/aic7xxx/aic79xx.seq | 2 +- sys/dev/aic7xxx/aic7xxx.seq | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq index 118c4f187486..85957102eb5e 100644 --- a/sys/dev/aic7xxx/aic79xx.seq +++ b/sys/dev/aic7xxx/aic79xx.seq @@ -1198,7 +1198,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 1ae250d880bf..a94e2dae4149 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -1639,7 +1639,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; From nobody Thu Jan 25 06:48:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH92kbwz57v02; Thu, 25 Jan 2024 06:48: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 4TLBH86kx9z4ktk; Thu, 25 Jan 2024 06:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urEB9jRJLq6jORsNaZk0zteZNxx4SxjDYhvY4qb/FbU=; b=W+Zh2Z9XGUsqLg3FXBq7evMLDx9QVyhU6lyE79y079MN13I1up7iXy9VRxkRpdwnmxIg6v bGBrSw7awvFk85RLo6Po4/e+X1FdoJngpNscf9NAWQV/u2ijC/JErCT+ONyuCSrMpN5iEa H4fmmaQoo3IXjs/n9OcQG7vlEhhIwkK6xRzZcEd6phEzNiX3doRFE4lupqUd1Dvvf6ZEnS /ZgfIZLyERRQ9lUiXeO1bwwGwu0NfKvZfmPG+Y9X8XXOq8z34ECIu/5LwC5IQMTulD3f3c ahJ8ZHmqTmTMWKR/sOCBjcPRNJWK0QNklttkW77mTEfsjqByAKFf6fDHLye7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urEB9jRJLq6jORsNaZk0zteZNxx4SxjDYhvY4qb/FbU=; b=OMmTpHHGYJi3V7l9VL2o875gxQPnlWq9vD7MYbrNXEDiUkb9idrk2sEGY+E7fg8694v/Xz GRBgTP+ZixpzUazwl0Elsdzc6O3Lw2SjOqhVJwU+5hj9EctiB2yqizQ9VkREob5Qdt3ZY7 bJDyoDe2xXwoLAv47voK4Raxlepn/R4WWmm6SqoiHsAOAuQBUVe6/pFYTLLhAPYHHFfM+i OAbmG2jYsrPw9xiYAOOG/hIiG7TyieL78TjtV2qpzFzwgXPTyxmm9ZZy8V91PgJdwEyWck k3IcWwV8xBmFQ+OC4Ze3PYaNci7xurvA2T6/IyrG7YYJZynx2cM3hi88xxjxOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165300; a=rsa-sha256; cv=none; b=tTWIqOR+xeJGf8pJyOTtFBWTeKEsP53btmHlji/GnDAxdruzjPypK3L9+qSW/apVJaBjkk EYeVyOdcnErSUKuFEuKnztXfmQ9GlWKclQvK6MXP982u47HHyi1geABTgJ4ok+TDUZNTug DG1S6691ylrckKgRHaAldJtWVU7EbTRaG5cPgTwY7EHl7Z369/yuTmaxlabb7qc6QHduGc naaGZORuTUvC8H7TKszUqfpoUoT1P4xfVDReFvW3Bf1N4jUbyzctNj+S42RcCC/a7uM7EI pqJak1C3In97ICf/NsAnkqt3S5+6C6j6sElhtf9YYdIJdyVXSkC3yusqO7S1Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH85qPRzmsG; Thu, 25 Jan 2024 06:48: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 40P6mKXn016804; Thu, 25 Jan 2024 06:48:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mK5r016801; Thu, 25 Jan 2024 06:48:20 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:20 GMT Message-Id: <202401250648.40P6mK5r016801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 0334b131c53d - stable/14 - tcp_fastopen: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0334b131c53dd9398d8df722ab61041f2457846d Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0334b131c53dd9398d8df722ab61041f2457846d commit 0334b131c53dd9398d8df722ab61041f2457846d Author: Gordon Bergling AuthorDate: 2024-01-22 20:49:47 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:44:39 +0000 tcp_fastopen: Fix a typo in a source code comment - s/posession/possession/ (cherry picked from commit 9b035689f15fc4aec96f9c18c6c86bd615faed2f) --- sys/netinet/tcp_fastopen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index c31225214d1d..609637b83df3 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -43,7 +43,7 @@ * * In addition to the facilities defined in RFC7413, this implementation * supports a pre-shared key (PSK) mode of operation in which the TFO server - * requires the client to be in posession of a shared secret in order for + * requires the client to be in possession of a shared secret in order for * the client to be able to successfully open TFO connections with the * server. This is useful, for example, in environments where TFO servers * are exposed to both internal and external clients and only wish to allow From nobody Thu Jan 25 06:48:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHB2Dpnz57tsv; Thu, 25 Jan 2024 06:48: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 4TLBHB0cdvz4km6; Thu, 25 Jan 2024 06:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqA+++WWkcML+qXSdpuFErDnRb2c/iijOjqTob0qI+k=; b=ZbNPTvvYU8pQe2EUbYarWG+tE1zX+npl8D8/37Iq7PDg2Ks5RBFl84fN6yg1pyr8Gl5tmn o8Bq6sBi5An8LzeLwsYjNY8pa7YFCeeoFSEQnT9UDPlgIwW+orVnQMjS8PhC8vf79I0eAR tyQEIzd+t2izeGS4u5605n3TZDJ+3yRA05X0C06LKHyTeZq5Vj+SWHjiUbriIHVAyOLHAX xtOHGrwbcylOeG1MM4whm21k6XMFFHAKAKsBHt/T9PLGAvYjwQqbTZSZde/Urs/ACDMBYn 8JDXNgZh8A7wTUAkCBGQe/XEN4r+c5YCVyQJjTy9vrL3Q0vKHk1DH69LrQNxlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqA+++WWkcML+qXSdpuFErDnRb2c/iijOjqTob0qI+k=; b=HEQW/EdAbTYNPpJPRZ1XPnPUZhensN4XNkg+5Vu1+cOqRQfSMGYdLf9NsSbEiJSbH6I+Kd E+rnbGEHqaXNNGmSMY48qpemH1kFFq9ZszvZkrbuwmimVY3znsosoYs7Dz1d5vcn3/vu69 dsIfkXn4McsZkCq6mPDy+WZnlglxOYRtIsYCbil6SUDbJ6pGon4YIyMJfcrGMFjwyU/fAQ Q3Jn1ftLHG4k7eUaBhjBgMz9mqsyCa0JImLohoyJr1jdWx8ESYB9i+AIGb1p8gl4m/O5om C+t6wN7rP/H5e2ZHBHqTZCIx6/sK/evsa3LULFWbZYiREz1pxylIEKgIzVk1uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165302; a=rsa-sha256; cv=none; b=OQUbOiBbyc4d2H24UfB1cCqqFORJVRsQWTkFuYDqV+KLa2vzMz2fJDq3NkBvOMZNIXGwTn c7H4Whe+xUOxJlDtULXVvIDFnTZSl4GFDECZfdA+Va5Dpc+e3lMbHyKT757W+hQvowgw5n MTZvZirnDWaQ9fm8MU9Fjzm9mteeElztMtR2m0Md8bds/cnTBISA10L0wGpvYjtlKmgIiA DOqv121egTN1Nuq5oOFRf/SAjpDYZa7LdgR+2JirmOgGDqpIbpTuAhYKw+iOd1hl4EYpCS 6cBTFAh1RjEIcfPJ8qxbsmlyyhcYGY+WceSpDfaznOYDiKkNXvD23ohBjV9uVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH96rlJzn71; Thu, 25 Jan 2024 06:48: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 40P6mLhj016852; Thu, 25 Jan 2024 06:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mL4x016849; Thu, 25 Jan 2024 06:48:21 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:21 GMT Message-Id: <202401250648.40P6mL4x016849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a499baff3955 - stable/14 - vmd(4): Fix typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a499baff3955b9edacd56c44cf30386e26822e17 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a499baff3955b9edacd56c44cf30386e26822e17 commit a499baff3955b9edacd56c44cf30386e26822e17 Author: Gordon Bergling AuthorDate: 2024-01-22 20:55:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:44:55 +0000 vmd(4): Fix typos in source code comments - s/harwdare/hardware/ (cherry picked from commit b2c48aa4d19268610191a0b7d7b76d01d28b0a13) --- sys/dev/vmd/vmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 5ed5551d52d7..395b789fdff4 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -437,7 +437,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ if (*rid == 0) return (NULL); return (bus_generic_alloc_resource(dev, child, type, rid, @@ -465,7 +465,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, pcib_child_name(child)); break; default: - /* VMD harwdare does not support I/O ports. */ + /* VMD hardware does not support I/O ports. */ return (NULL); } rman_set_rid(res, *rid); @@ -500,7 +500,7 @@ static int vmd_route_interrupt(device_t dev, device_t child, int pin) { - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ return (PCI_INVALID_IRQ); } From nobody Thu Jan 25 06:48:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHC3HsDz57tqs; Thu, 25 Jan 2024 06:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHC1gNhz4kvS; Thu, 25 Jan 2024 06:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BEtfmJB3RGLeCN7dzOS3FYBzF6P7FF2HIcn7w9EHH4E=; b=uTtwJhxYVqUfqYQJRnI0pZ+KQ8Rc2PA+Q1DhiGL6cr8TFi7MWzau7CYA64RPhx6Rt7WTAH mb+/TY2TKxgQpRwTVuwwyFCFA5W+w6iJg2DohJo1At0LTNIepqxEcs6bMqqOa6Lv4zUipm jumQ3zexWMdyQB6lQNEJt0UQWOnEC4SnrEKdOUG270gqirX0cqpbC86b4u7JjkMvJZ3kOL KzLaQIjyWKOoyp+ed6yy+hYcS0WAuvp8I5n1g3pmFZiqGM97pTYzc8P97jGEs0nTQDZPsP Evzw8CtdpkJ3CNJCqf9UK3CNYF/GlldYOKiMByD44fu6OsE7GxJjkNkJ9DEyJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BEtfmJB3RGLeCN7dzOS3FYBzF6P7FF2HIcn7w9EHH4E=; b=HE9iuaZQxZAtvz8h8u94+rVOIVkMvBLOkZvzw2lZ7IVTJDBwgprYAgr4xC/PlN8BetH/Hs 2CNwc1bSweTijRTGJic7nP/9Ylt6jQRU9E1+WSfrOH4NtDT2ZOFfK8wRcjjIDy9eOOLLFU 0yQ8rH3MuOux6n1v2kRkElWLEPlI3FU1v5j+0bsry9v8Rzd5PYTjr5F7/yKSOxKxtvjdVA olF7OP+HDEOWljL26o4obne1lnvYV2di2WiHF4q+LmHib+qjW3uNyLUSOlTectpKN/wW90 pQ3CsL/GOvgWb6qjVwqYUALEMR5a1Hypd9bmji/4OONTLUY5QYivwvmsl4mbLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165303; a=rsa-sha256; cv=none; b=EcpCxye2vVUuCm4aaRqEDiSfOwTRPo/9y17bLzDg2t7BfF9tOuTPQNHgke4AvX6Y5wLUg7 SJpy+TbnW0CdXJj08IeE+XYQvcC64MFZxiT3yzovJD52DtA70mX8kvXJ82V8gG7Nqfg9ey 2haNbhfZRYdR2ljqtx6s+Kqik1vWsO7GOa4v8QldM17Y8xB7x3qY0gtqhPKyGoqpoAGy6Z bhLh3r7rNm9q+S7L4np/JBirp9xf/nr2E3P8j37U5e1yzJTiGsBrZW06f2+8n6yWjogQlV hA7+u6baQ5X/XlZPkMCTO5nIOpP5Clcx3QJN0uVFh83yvwz4Qvn2WR0JjxdTCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHC0nS5zn72; Thu, 25 Jan 2024 06:48: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 40P6mNwZ016906; Thu, 25 Jan 2024 06:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mNAO016903; Thu, 25 Jan 2024 06:48:23 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:23 GMT Message-Id: <202401250648.40P6mNAO016903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7924b5f36bef - stable/14 - usb: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7924b5f36bef227a253ad2b312148ae6f9b21a79 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7924b5f36bef227a253ad2b312148ae6f9b21a79 commit 7924b5f36bef227a253ad2b312148ae6f9b21a79 Author: Gordon Bergling AuthorDate: 2024-01-22 20:57:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:09 +0000 usb: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit d743711016298046ca77c5661bab41739396a180) --- sys/dev/usb/serial/umcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h index c8c6135710cf..0d34c54a3707 100644 --- a/sys/dev/usb/serial/umcs.h +++ b/sys/dev/usb/serial/umcs.h @@ -169,7 +169,7 @@ #define MCS7840_DEV_SPx_LOOP_PIPES 0x01 /* Loop Bulk-Out FIFO to the * Bulk-In FIFO, default = 0 */ #define MCS7840_DEV_SPx_SKIP_ERR_DATA 0x02 /* Drop data bytes from UART, - * which were recevied with + * which were received with * errors, default = 0 */ #define MCS7840_DEV_SPx_RESET_OUT_FIFO 0x04 /* Reset Bulk-Out FIFO */ #define MCS7840_DEV_SPx_RESET_IN_FIFO 0x08 /* Reset Bulk-In FIFO */ From nobody Thu Jan 25 06:48:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHD4z6Rz57tt1; Thu, 25 Jan 2024 06:48: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 4TLBHD2k6Rz4l1K; Thu, 25 Jan 2024 06:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZ8iunFsTWW4FYIgXpSs6qkPXT4i5sL2imoNUGbbeLo=; b=WMiMa41zZXaYnEI80isU+7hQ3gNHx9KuEkuYU/hW+hpDHprWiYcQG/4DSE4ex+Cz4KfpPI M5rgygx6bsTXEbgd2K1BoZDm6OypvC2W/s3EAmS7CwjrDWovkM3V2A/2c1Nalj/E5qJHVq uT9EFvrkMJECzyuhaeEDbceuxqr1vJXIRj9xxJn0uKF+vG51jNo1hAOXzth83AoW3ZAKB7 Jz66j4VUrwKocY/ZCG8imo/mCPyyRBq7BGTRGRn/NwK/ROqMa/Kx3l56mmMHmckrmm72BB Yn3/ZWITUkgJdhXEeFdbZD7xzWKnBP9QlpQylN+OlEtfgrGsMsqrWqpDDx7+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZ8iunFsTWW4FYIgXpSs6qkPXT4i5sL2imoNUGbbeLo=; b=o/8XQlDbFOuIlhejMWesJfaGl9vUdCta1QmIxs9F0ELjBooGRomsapL28M1R1fiKCF4c3X YyKLo3DWryfnYk8VBq+lqaQKx9/RDUFqy0kF7ArfnQizOqmRwuT88xi0L3gw30bRwgrYIG MX2MReTQxhSebEB4QIRhYrscksAMPGIZjl6J/pu6YTEf4c7PIJ3VCyP6kSAliD92gT81MF gifFpmztWmHjSxUVnG6WjRsZyaWRE2qUVMZHmCfuLcDMFfmoHGza6bysCb6Hl+uao5mzpD pMl3+x7g3Yg2JRT267EmB8GkJdQiwKSCBrvwFdiTM7ZrBn5NgSDrxGHVbeQCNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165304; a=rsa-sha256; cv=none; b=QiZn0XLrxAPWfNJBiMAT45Sj6DyWmuEjrJCVXS7h6VXQvFtiY2dp1HWR3RVUbvgSqFs47f K9mmHd/SyTO+m6tuNSGrYLzQFyvrHV+AxBHNGBWQFYrNcE/KXhgzpCs3I/JdcOpbIBrdeW CI4ZDVFZGgP9o4LAo4mGtkCu8e5b79s2H1pzJROIyrNcax6mfI4pJejgUWSSstYwikjR4x 9Eps0MVfYZaw+ohnvuH3wCk/2o0fty54vDPCpvJQUT6Vcj1upBKgQJq8+EQ2WQGr/1Bxgp J6sz7gmpGzUKPNCs2hTmCnKV75SNZhHY5g6bupu45RpukdnA0aE2+0i3QHF8Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHD1qVPznkK; Thu, 25 Jan 2024 06:48: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 40P6mOp4016960; Thu, 25 Jan 2024 06:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mOEo016957; Thu, 25 Jan 2024 06:48:24 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:24 GMT Message-Id: <202401250648.40P6mOEo016957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8ec7f15c1d7a - stable/14 - bootpd(8): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ec7f15c1d7a129ecbc16d2a46d4f76a03087aa1 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec7f15c1d7a129ecbc16d2a46d4f76a03087aa1 commit 8ec7f15c1d7a129ecbc16d2a46d4f76a03087aa1 Author: Gordon Bergling AuthorDate: 2024-01-22 20:46:31 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:24 +0000 bootpd(8): Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit d04df664776b436f712051520d48f84be93ab269) --- libexec/bootpd/dumptab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c index 3961cb4210cb..9b839c26c5b9 100644 --- a/libexec/bootpd/dumptab.c +++ b/libexec/bootpd/dumptab.c @@ -323,7 +323,7 @@ dump_generic(FILE *fp, struct shared_bindata *generic) * * The addresses are printed in standard ASCII "dot" notation and separated * from one another by a single space. A single leading space is also - * printed before the first adddress. + * printed before the first address. * * Null lists produce no output (and no error). */ From nobody Thu Jan 25 06:48:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHF4LWFz57tt2; Thu, 25 Jan 2024 06:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHF3VPmz4kw6; Thu, 25 Jan 2024 06:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l1VGc+BqZk1sOblDxAIHAzSHok2302Z9HlLy2QfwCDw=; b=CQavpxyzVnmHaw/RwjF3bjoASoKTb3DrMTo15NjibkMlXxN7LbA9bG3dXqA9G+9eVnTISw Skzu3u/MhN8s6zxsOAnbnBowj65mPCyQtDoOb7h1UpICgq+mhKrduMIjgwwn1SXdOzNl2O auY1lknaC2NjGU8JeGghmIOVB8iSDFnix0y2jAGtJp0w8XZmxVSQI7N6Be1G37gKDiEM4L YY8xtZ9fWB9MEfFqYxwJ32Eq8NJ4rtRS8zVqanW5GK32H5ukarerqvOe+zoT6vIXRtxbXi 7kQke6rhlcJDOcIGiFfEuitG1OrjEko9nxJGPofh7CRrTnEWhSMpwVGYLYxnNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l1VGc+BqZk1sOblDxAIHAzSHok2302Z9HlLy2QfwCDw=; b=CyD6Vh6chLVVc9g7/tAtXrkglGjAACYGBgQhdQEn+gY/2GuwiWL8JquUpoK0Mv7sZGni/7 D/GWlpO+KD2yaa9Am62WT/79f1GhcUwSERJt7KF892Lq5j+345BCnoXWfYPTXkz54d8dP6 0ClMHUqMqYWzkGc13S1K0l6cU7j9JsZMJEGuqMX6igYWcBE4pVs6uS3PUOM712Kg/ffA6p gyVk34it8UMdrmDjduT8AgIJzFC7UR0Ls1SOEsM/el8un8UWB9AnkRNGsY3igvmpN39l6r HyKrPJR7jDjIraWZs94D9RwKRdM3vA0txjJQ7EBsXeuyEwqPG2LbjbmWadO8yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165305; a=rsa-sha256; cv=none; b=I62CWPPWEju6VUKEGe3TowGhkJcOiSnh+MeG85kunA9eV9q17QKJ3siML0BXPoVN+NDfFB 5YTpJRYDDk+h6Hq/9HAcZMIUVpHAs31W5qElhkfgMka+xW7MMFX6t2AFDpEgZvw7srbN+8 5t6hVoLWuaODv3UhtqafdS2t/d6WvfJyBDNEgNh89O4v8V4QggopFcnCrtaPJUy+hFI+Kq vUpwkDY9oSta1YXVRX5Q7coGeCQuUYAInvw2iFZsMOU5e50xB9OSwNrFKRA34CZpv72tfV nFa7JBLczpRfFeK6UkNg8O9exlAw77kcQVqfXBTn0UYN0OJfcDlMFAX/uTTx0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHF2chZznlv; Thu, 25 Jan 2024 06:48:25 +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 40P6mPrf017011; Thu, 25 Jan 2024 06:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mPDX017008; Thu, 25 Jan 2024 06:48:25 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:25 GMT Message-Id: <202401250648.40P6mPDX017008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bddcc06e70a3 - stable/14 - bce(4): Fix a typo in a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: bddcc06e70a341b1ac33f4d92f8d6950ca247fc2 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bddcc06e70a341b1ac33f4d92f8d6950ca247fc2 commit bddcc06e70a341b1ac33f4d92f8d6950ca247fc2 Author: Gordon Bergling AuthorDate: 2024-01-20 19:10:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:37 +0000 bce(4): Fix a typo in a kernel message - s/adddress/address/ (cherry picked from commit e1c0d368d630cce01691e1967ada9f36d6b8c751) --- sys/dev/bce/if_bce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 53b503ab2fc8..33158b75486c 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -10661,7 +10661,7 @@ bce_dump_driver_state(struct bce_softc *sc) val_hi = BCE_ADDR_HI(sc->tx_bd_chain); val_lo = BCE_ADDR_LO(sc->tx_bd_chain); BCE_PRINTF("0x%08X:%08X - (sc->tx_bd_chain) tx_bd chain " - "virtual adddress\n", val_hi, val_lo); + "virtual address\n", val_hi, val_lo); val_hi = BCE_ADDR_HI(sc->rx_bd_chain); val_lo = BCE_ADDR_LO(sc->rx_bd_chain); From nobody Thu Jan 25 06:48:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHH09RLz57tWY; Thu, 25 Jan 2024 06:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHG585cz4kqZ; Thu, 25 Jan 2024 06:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ji0+EnAX1DSx02voIcsqG8bubfqEj4xq7TvWriY7Ak=; b=M0qz5KLd0EedS1YcFYzm+THi8a/O7okGUP/rL1cbX1XwJocQvWpqiWQGquUCjlM1LOTjFl 4HkvFVqdXPfrPy2x9dPXejTFPvz6nSnWanlsIxQDh+5r2/msGLfrBo6LBSIcDEPaCb4UnA Of9gx3M9Z1D/GQAnVH8h3y/LKuiPGOgXrILSbw24A9q+zx1O82Kq2dRyHQU7DOSdBfQFLO CHm+TJ/QPgJutc6nmQLpcxg63cpy6ped8Wtw+cVb3Z0j9XcdPc/j6ZPHzOWA1dFL+rd5ZG wyfafBqjYMRXaiXVh9vdW7Z+3K1iJBhwABY6bZENHqgrJEDostFZ8Ndhg5a8HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ji0+EnAX1DSx02voIcsqG8bubfqEj4xq7TvWriY7Ak=; b=BNZbKFUgXS7HupaUwXlX6RfB60e/fsw1eVZFovXsYStlFhpxAjYPRqqfM+MpEPTB30JCZ3 t0BSsDec0vC6M/VwK1m4kKfVLp/8ehV6FLNTCvSsnUvQzwIAu1kBe8HpOPvRR8j9cg35lq FKVV6sBjHy5mX/aEzgLg/CV7MwU7Ej3J1+l6kKNgKTa19NqiFGOkkMw1gzMVjz5La00SFL BxawdCSLopnlCv8gmVE/5Eq1T8fy9+nx2m30fVoZJHlER2O/+GRLbYuMFUgKav0ViFcNV7 h7hMvmQbWFxp2I8kXU68MH/9qXUf+N/VsYqsDSuOi0yvT0h+zHNiO39ijFspdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165306; a=rsa-sha256; cv=none; b=X9IQvjLhlJ38+I8kqVxZGtKwIIMWW/dGUti2A1E/c0S9aJSGnQqLmVc8U1pTfoQVMQYO1X gWCaeldvnAul0j1HtFPnFYbaTrNpo1TcpAXn4iTYvonZpxmEM3XdTn9OsSwpc7wurjvZuC ooSkdzC4+6hd8nQaDv3IJzkhYDP1MqxwxH5iJJ9ep7HTHmFqmVusOe/4Q35j+pJPr6TayN c/NnVXML6itjwbM06NFjKOz453pFyH9joWsvP9SYxIAJUI95JWSL3vF2AyItms/aAlpN3w MLy5p4JayccDPNKWrwktBwyY6zohmQ8nwVtEdL972OiNQMVY/qB1Ebp7vcYifA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHG3vqZzn8Y; Thu, 25 Jan 2024 06:48: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 40P6mQJ2017062; Thu, 25 Jan 2024 06:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mQZ5017059; Thu, 25 Jan 2024 06:48:26 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:26 GMT Message-Id: <202401250648.40P6mQZ5017059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 91e79edae637 - stable/14 - aic7xxx: Fix a typo in a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 91e79edae637ccd3c907adeb663c56f76ab82a56 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=91e79edae637ccd3c907adeb663c56f76ab82a56 commit 91e79edae637ccd3c907adeb663c56f76ab82a56 Author: Gordon Bergling AuthorDate: 2024-01-20 21:01:10 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:52 +0000 aic7xxx: Fix a typo in a kernel message - s/recevied/received/ (cherry picked from commit 54e047b13baaa5eb613e98991f807e7b6f893f78) --- sys/dev/aic7xxx/aic7xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index ea80c9d0602f..4b62f76b9cf8 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -1109,7 +1109,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) printf("\tCRC Value Mismatch\n"); if ((sstat2 & CRCENDERR) != 0) printf("\tNo terminal CRC packet " - "recevied\n"); + "received\n"); if ((sstat2 & CRCREQERR) != 0) printf("\tIllegal CRC packet " "request\n"); From nobody Thu Jan 25 06:48:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHH6qYtz57twT; Thu, 25 Jan 2024 06:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHH5wdFz4l26; Thu, 25 Jan 2024 06:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHJspHtVAze9PY/CJ48K0cY4HY4aa2X8afdUzi9r2p8=; b=DeqcOJ6f0RDISSM66V/X0B7IOitgEPfOAz3kco+xhFVb6iui1ReHOmRNN698/kuNBgjkTc KHRBYVHFNbzg1WS3k1NK8AWRuD/54UWE94XVoZG/KEyN2SH2YwolL96q3GG1LwFSDXmLss Fu0uWi0dJTeY8sWjU9sYS1jpUsAMzks2t0bHvW1KmkSriDR+156lzwkQYvYQ9DdrblyBbg TJUjF85uyYKxLBl7u5r5wy1ux2LJ4GYpRI9gD0hgGlyEbaPGkVftX8sq8VJYjfyAU9NrJ+ I9D4E9GI3rbrKX4ylybDpZ6sh/Xe18seai61cO33lhKt6ucU1M9ej3YhQJD9Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHJspHtVAze9PY/CJ48K0cY4HY4aa2X8afdUzi9r2p8=; b=J3c46uFLGDv9VDPHOzWP4X8Woo+a0iVehD0fey0tmShmJnBmXIBLk1G34GV5bNHioQtxyk WZDnCVjEZjfhq6k8cmUwFqlMdSIQujuXob6Q9LbibH2dd0T94Fu4odsjIdMtLSJhJPMt8H DAbZDnp+tI8bwv5POzgreG5XWJnUuBWmqi1os9geCrCflDv9Rxg0urOFNHRXPyI7uIrAiy S3E7jYW1Ml9CKYTdGOwHN0KpRbmzCwJTDO9E327j4RbAMHbv44XXzTFEuIS/tERwgRXUP5 I2Cj843f2IQ002M0r8DIzuowkOYhCgFAPYAo2minvSnke8SQdBwojzNlwjge0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165307; a=rsa-sha256; cv=none; b=qCjwUTahxRw9yE/RODFgo7OZoipBLnVCvzzUy3ReRkmbzNuul8KMOSY+hVv9JkTkFJ41Iu ooswmB9hbMjogm/PxVXW4SDRSgwjpga2qfvl+Q5yy1oQ10krWYCXmLDU62yyWP6Mt8m0hE NIu1cBl3W/EiZnApaYaVyFIlfaSjjSF8hOj79gVrux8IuHD5ZrHzkmL5vrhj/ES+Phe71W 3mLxwpAAaEB5ZAfWYldGQi6jbdi6Y2CX8U+eWsflE/K2/8OQCp3TxD/0v1ukPXClwGUHDo VZ+nGRWv9+Tyu8htUEynd3/uk4swupaLt3RjvFayNuX8aI0VviZCmhWsJJ/PoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHH52JrznkL; Thu, 25 Jan 2024 06:48: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 40P6mRbP017119; Thu, 25 Jan 2024 06:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mRir017116; Thu, 25 Jan 2024 06:48:27 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:27 GMT Message-Id: <202401250648.40P6mRir017116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 550922c2720a - stable/14 - netpfil: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 550922c2720a4a9cb5a2ea38b9bd8b0a75f9f315 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=550922c2720a4a9cb5a2ea38b9bd8b0a75f9f315 commit 550922c2720a4a9cb5a2ea38b9bd8b0a75f9f315 Author: Gordon Bergling AuthorDate: 2024-01-22 20:50:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:46:06 +0000 netpfil: Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit cde9ec6a451d22ad65fbe602dc57135177c0a865) --- sys/netpfil/ipfilter/netinet/ip_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_pool.c b/sys/netpfil/ipfilter/netinet/ip_pool.c index 99394232fc2f..22f687d3a4fe 100644 --- a/sys/netpfil/ipfilter/netinet/ip_pool.c +++ b/sys/netpfil/ipfilter/netinet/ip_pool.c @@ -1098,7 +1098,7 @@ ipf_pool_flush(ipf_main_softc_t *softc, void *arg, iplookupflush_t *fp) /* ipo(I) - pointer to pool structure */ /* Locks: WRITE(ipf_poolrw) or WRITE(ipf_global) */ /* */ -/* Deletes the pool strucutre passed in from the list of pools and deletes */ +/* Deletes the pool structure passed in from the list of pools and deletes */ /* all of the address information stored in it, including any tree data */ /* structures also allocated. */ /* */ From nobody Thu Jan 25 06:48:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHK2XpZz57tlq; Thu, 25 Jan 2024 06:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHJ6t1Nz4kws; Thu, 25 Jan 2024 06:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEsl0I4TiLTWIg+59m2fAeh7r0KDpsaGv4juMvHmzkM=; b=Ibd3If9EHU7v3X+cNo+wWxnL0Kn27xkm1ubmM9U57cIHNRiKdts+Sb2tt7Rz0QjaQeI/DH X8sj7LkmpvD6lXsUjensAwk78liH3nbQvVZYU/uTliVwzbXBPOLnjhAVNS0XAwp3C78lx/ qG8au/suxPmWuEsfQDh9DslmKaprXXBva9vZv93qEaz22SgW6gsEWo43ffyzccc+3efMbz 1A/g5CQciemQDCC6pIg9UEZ0uEGrY3Va0FAZfkiZzhXNG9HlqJTkb9du/mYhUormNuiSAc v9eFwaAKIacQ6pMDrQ91tS8AaZKy8/k8yT0ERr2Fxidvxxx0l07THt85tEuzBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEsl0I4TiLTWIg+59m2fAeh7r0KDpsaGv4juMvHmzkM=; b=XzXa7gyeA3LeDeeCjrJ4nj32+Zj0ss3m3j570sJY5xvHn9ewXLgJzfdmFd3DKZLzU+r8dQ 7kven/S9hn7lsNmUqeJmpf41Ml5rU9OLlGd+/Zphbz2ul+XbjBfqoiFyGtbbL7MghT1oZ4 b8/vV5lo/+O+7grfD++B6fPkbMlbWpdT11PEL0Id7sCClFZLihNPQB2T2bSQcCg/DnLkEm UY4tTjVrgb/Ax8nsv7f+Xjyxr/4TWEfDtk0mFNnhxNLmQbN+kBXNZ3vXe87coCOcmLXhgE G40o6MNbyvtI7ykq6ptKppcxGj4HDynNItUrnUU7BbbIr3aPX6rugDlnsbQW9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165309; a=rsa-sha256; cv=none; b=KMj1WxymCqs+7poXmkNijZB/6orcqRREhM39pDkY634FCelwwnSTh1R/+5yF2Lew+EXlzK 0CE4U/stELhC5sWCYsSWdbQx8e3DFrftFsbuRX1UvQNfnL/Qs1cVNYvHn/Q9rkk99hnW2R ZS0HBD7EJb2ul/OaHNfuhlhemBfBVBdLD+GFCjKIdCDqgh/myd7k4IxD0VvEHlGO+iCttt qTBtQ0hu4nUT7jTSvWLtHqmDWXJr0ASrzMwNMRdsq529+OqR8irmiSvbjPKYlkoHIK60W0 hgwW/GEyfrO3QQcN6ctLVxcPeYHNTqlqWknkE9buZFMnqsXrMyyWD1vdSELECA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHJ60CHzn73; Thu, 25 Jan 2024 06:48: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 40P6mSxo017176; Thu, 25 Jan 2024 06:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mSZp017173; Thu, 25 Jan 2024 06:48:28 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:28 GMT Message-Id: <202401250648.40P6mSZp017173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2d631cf51387 - stable/14 - fusefs(5): Fix a typo in a SDT probe List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d631cf513878b15aab430b5813102d063584f2f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2d631cf513878b15aab430b5813102d063584f2f commit 2d631cf513878b15aab430b5813102d063584f2f Author: Gordon Bergling AuthorDate: 2024-01-20 16:24:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:46:20 +0000 fusefs(5): Fix a typo in a SDT probe - s/userpace/userspace/ (cherry picked from commit 6f0da017c973f40c1bc70552c922c500a0a8c858) --- sys/fs/fuse/fuse_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index 49b0659a4826..e2351e4ac24a 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -997,7 +997,7 @@ fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio) * But there would be little payoff. */ SDT_PROBE2(fusefs, , internal, trace, 1, - "userpace version too low"); + "userspace version too low"); err = EPROTONOSUPPORT; goto out; } From nobody Thu Jan 25 06:48:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHL1xPQz57v0F; Thu, 25 Jan 2024 06:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHL0rqFz4lFG; Thu, 25 Jan 2024 06:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMl2mO1kC+8Aflv/tdjIVZz/n5vVP32FUzbotjPzIp4=; b=t8shVt7vPY5xqZoQz1vOs0GzptQrPK5U6obKM9hMG51C+Nd0z4ajtlcjONjmd1muDgPJqy ChgIdR6E2XBp5Kn0yRXj62nJJdWe3PH7fAt3lmELVbjphIiv4aFXmbGcBEtK4lh8gsw2LA Lod+vccbXbo21GRCjxSj24wEe7etsiGUJR5krMBPHb0tKWzGNir0vY+6inkpchDSIgg6ni aFqbOGZ4iBbUTy9UMj8TvrsN+jbH88M5ofvUwWRj9LCCRUgtAu7vivx44tOEYMOXznp6E5 LlXDfbVmHMmFW5j1NbWU9RPHq8/CmYJGoMhlTRWSqYyLONnu5n+w3mV4lMufkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMl2mO1kC+8Aflv/tdjIVZz/n5vVP32FUzbotjPzIp4=; b=JixUQWWzJoNF/5YgtkEHmDbubYtUIwWHU4RRV3mDd6XAX1hUdDymENtF0Fv92aT+1/8tNQ uHJ8KdLr1oUOittddmTQ9JnZUYGHmMZieCZLvUvEA/dNm67jo2c/tJyPO6RYhlhIw4/0UI E5ACuhaUWlBxQODlp3ELiT9kXxYLJuwxSZkUHwKtJCsEzA4Rt2KBS8eS5t6p0HGw5t2zyU oaP/8xiO/+/Te0AsFZ+Bo+gxTD85JwjcMzn8yG/XB8q4uHzJgI+znIG5iyTnWNQGSdij1F qWZqIU62zFuRAVeF5FF6yxvZGRkAC8StiKn+eZmogb3D/8Vx5j8eu4PNiJ1KsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165310; a=rsa-sha256; cv=none; b=JiBnR8i2SxpUKL0XNjkhUaPwAS45yqimOsemRIhy4hJQI9LG/8RcH8HO8ujcKiO/XWprLn fclMXPWn/MwuNv7AHpZJ/HvELj6ysxFES0o7HM+5R13wFY1fj29qbDzqg7t0zAJ9Cv4u49 KYgyrooMBAtemyHZxTcRlCSIkRr1lA1cSj7uj9Kq1ys+efqcoHldOFJFWb5+VCKrRqyugM PLcjF1Aqu4V25dHt+SXME2VksFU1b2dADA2gs4ZhV1pNkrakZKXmaSnEeYxo+gXc+5Y2LV iC7kCAtmM/c7cBru0UEVDUI8POtht8dlAL+f/JqNJ1sVeceElF1jzq9jwki7eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHK74kwzn74; Thu, 25 Jan 2024 06:48: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 40P6mT9Y017227; Thu, 25 Jan 2024 06:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mTvt017224; Thu, 25 Jan 2024 06:48:29 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:29 GMT Message-Id: <202401250648.40P6mTvt017224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a8dc27290f87 - stable/14 - netinet6: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a8dc27290f8704057673c14d160c53ba14144380 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a8dc27290f8704057673c14d160c53ba14144380 commit a8dc27290f8704057673c14d160c53ba14144380 Author: Gordon Bergling AuthorDate: 2024-01-22 20:48:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:46:35 +0000 netinet6: Fix two typos in source code comments - s/adddress/address/ (cherry picked from commit 496432f192165b8700da4b0ab8ebdd253002e265) --- sys/netinet6/nd6_nbr.c | 2 +- sys/netinet6/scope6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7d89fcc4ee69..7b4fa7a8d8c9 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -262,7 +262,7 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len) } if (ifa == NULL) { /* - * We've got an NS packet, and we don't have that adddress + * We've got an NS packet, and we don't have that address * assigned for us. We MUST silently ignore it. * See RFC2461 7.2.3. */ diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index 73702d8b8039..968d42aeb498 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -526,7 +526,7 @@ in6_getscopezone(const struct ifnet *ifp, int scope) } /* - * Extracts scope from adddress @dst, stores cleared address + * Extracts scope from address @dst, stores cleared address * inside @dst and zone inside @scopeid */ void From nobody Thu Jan 25 06:48:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHN6Fbyz57v0K; Thu, 25 Jan 2024 06:48: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 4TLBHN2xHqz4lHl; Thu, 25 Jan 2024 06:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJEicodcN1ClIFYn604sNcfXutKRwpw/0FOgTHbeKDs=; b=Yf1biCx6NUGAZmqIHHCISQFIwMyX2R89E8u8DFUBrUDKC5sl247JEI+DuR9EDbKn4MIMkA 3rw8I0yPyEcMXGVr7FbxRXV80xjAHsC5ikWen1TD/kNDxsPqfLARj7g5JIlvOL8eB5xWng WkeCZHLcv8E6V11Qn3txZVsmjB1uM1r4VoI9qz0ZhPoZUpUbmSptYcgq/NJ++tOUlPdZ/H LK7F4l2ycN5KANRRBI9s1sgPE0TYBsbB8jK5o8Xwz448ORJ8nfH9qayLLm3N9hoJSazQcZ zrbncTlCvsSC20XAzavMZTl1Pa4X/fhKuzqJymUQPtY6aEI+l9pOHuvD73cBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJEicodcN1ClIFYn604sNcfXutKRwpw/0FOgTHbeKDs=; b=foB0K3QiLD4EoyCZ8Lh7nyjq/OpSLHdXoSTXZJpghrtakVgKIG4VjI5NiGUC9CqOv0oQnj p4AhBT+kBEvj4QbL7B0YycwgXjLHiTOTcTk3zSTBJ8X/JVhknwl3Tx9viXMy8NGnAIaAxT M55wl06VOk37zmLelCHM3I5GDOLKnUo9/D4TaCU2Qr1imsZ4JheueC+9oKLdCifjSM5QtQ +F50dy6tcbbtqcXvHtqMUIwlQndhTvmFQ5g6Jm4E0FHLDGIpfYjWUIitoJPsJfEFJoNvuS MrOub3Ftr8xU0bJUjb7K5J7QBEDKuB3OY1rkuGGj/zmlumDJiLYn4HqRX9eQYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165312; a=rsa-sha256; cv=none; b=Q91ZBHdypWOd4BWsAk/0LqLzaQ4k4VVzdDr+bPKmeSOs526eh0PJC5PPRpea7wPTSQmJG5 inOTNVM4ehuPCj5IbP5BWgTrahVWBM3ktJCt8j73JrcrN7JKKvqd2OKCefgQEwJDONcion m0NEfBoKTuHKZ3NX1U7sqtPwZj1Z4a2s0xXE9s5JdDK71c+OnMSXB88QWnBLQFSC5n9Wyo EO8/0ROeaq+M1YxRe+pFSsjkRO1dpO87n848HMRL3GrAEQo3peaMBJ7B8m36nO8yfHLQnN /SdANAPwhAXMAIrxHqZB8LVSASYpXHDe/GGRCx9uaz3BE/pCp17+VhfXtTMh8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHN232RznkN; Thu, 25 Jan 2024 06:48: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 40P6mWKi017335; Thu, 25 Jan 2024 06:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mWbG017329; Thu, 25 Jan 2024 06:48:32 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:32 GMT Message-Id: <202401250648.40P6mWbG017329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 44784993a6fb - stable/14 - if_llatbl: Fix a typo in a KASSERT message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 44784993a6fb3bdc7654036080e3bdfe2c0668f0 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=44784993a6fb3bdc7654036080e3bdfe2c0668f0 commit 44784993a6fb3bdc7654036080e3bdfe2c0668f0 Author: Gordon Bergling AuthorDate: 2024-01-20 20:00:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:47:31 +0000 if_llatbl: Fix a typo in a KASSERT message - s/entires/entries/ (cherry picked from commit b4c94968d1bd1ffdd43976b0315e2b6c2b620ee2) --- sys/net/if_llatbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index ef4f27dbb00c..e79f781e7801 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -706,7 +706,7 @@ lltable_free(struct lltable *llt) llentry_free(lle); } - KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entires not 0: %d", + KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entries not 0: %d", __func__, llt, llt->llt_ifp->if_xname, llt->llt_entries)); llt->llt_free_tbl(llt); From nobody Thu Jan 25 06:48:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHP6ZJpz57tr9; Thu, 25 Jan 2024 06:48: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 4TLBHP4S3xz4lLj; Thu, 25 Jan 2024 06:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05mddJLOfh/ybm3zhnuJstf09DHstsOoBJSbE9C7918=; b=EogWipV1gHHHhNiZ+5Erpg+DhtAhvbXj5yfm0AFJcuTFiTlsc9I0qL6VZFLzLYaXKq3OI1 I0xIQhZcjdhUp8ep5APwVKmhOAevr6EV7kAlhpnAzqt5smTfuhLRLcyPejZDzExyoiaqLQ YWWVbsuRESUHJy2wcWWHdb1adwf2OgZ1jyIxKjuEvnPZKL2TMHIJOx/gS+f75h52M3VHQr c5P6gjiQOVxRUfOhsWLL86KYw+sp9TEm+Fw3TwoA+Rl77A9fCVPkm5htD1vXC9dhi+Rid9 JdequkbiR9TpYvcYBjbqYyeKRTjl7sTcHJYKS2rxYJjbb+ZKpXm2Fkq7r/eoTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05mddJLOfh/ybm3zhnuJstf09DHstsOoBJSbE9C7918=; b=P3IKB/C6oFqGvaeqwpc8eWjbToETbgiygPDIsoRyuJa7HmxlUNeRh7bHZJHq0AeJjBE8Va MF0x7ad4BPrnCeaFynjjQyCeZK7Kse9aS35nIZwtWwXlGqfFMpy6hvRIGtRdgVuo78kgFq O8E7FSTC8SC7Z5E5KwdNISrrbzpJ/tZNxgq2zyxAMMeCWXw/Wq4ElaSnN7vGxWIesunniV a2NFHCGKbFfBrvB/1Z/+P09QGv+pVsyBQ7v+t3OjWiyoSryEUpbTpyrH7lQIBx4u7Qrtwu fvst2iQ4fiAf1rNHe9NVfe4UHu+9Dx9ezxmCyKcnNyvOAsppfUg9IDLBVdu9kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165313; a=rsa-sha256; cv=none; b=DQueVP2ylgZS+hAzZnG+TxlH58rcWWeB/cqhxSILV24ckSpXYCYNFngabjpzOeYH9qQ/cB AMi49Rs918jGyxOpUOr935AFOXYhWFRFMXe7L5WnCeLcqULHQ5rKpVilbu3PE/Y+ShgcLL beoDzC+DpJqkPByHQ3/aDkjH3Y5qaJhG7Tmxun1IPvFS4xGnVWYqz6G2ucyJTep1iZFSl9 kZ7N83O+Il7tYe0/HsygmA+c/fxfm80MPF7sBUSqWGbKOJf8jjIR00N5MWeFQGsLvkZkXD SjOlhc/N/jVKfqZFWTGxR1SGp53BZ2c63kYr/grcTKj+yy8CXz9kfNTS7Ejb4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHP3WmbznRv; Thu, 25 Jan 2024 06:48: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 40P6mXYP017390; Thu, 25 Jan 2024 06:48:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mX8s017387; Thu, 25 Jan 2024 06:48:33 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:33 GMT Message-Id: <202401250648.40P6mX8s017387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 777bac8888f3 - stable/14 - net80211: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 777bac8888f3b5d8392d94d8cc660f35c25a971e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=777bac8888f3b5d8392d94d8cc660f35c25a971e commit 777bac8888f3b5d8392d94d8cc660f35c25a971e Author: Gordon Bergling AuthorDate: 2024-01-22 20:54:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:47:45 +0000 net80211: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit c1ada39783109c496fde853cc2fe32f31a8f7516) --- sys/net80211/ieee80211_hwmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c index e743b7dfb6f4..1dea4ec30106 100644 --- a/sys/net80211/ieee80211_hwmp.c +++ b/sys/net80211/ieee80211_hwmp.c @@ -1398,7 +1398,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni, /* * Check if we received a PREP w/ AE and store target external address. - * We may store target external address if recevied PREP w/ AE + * We may store target external address if received PREP w/ AE * and we are not final destination */ if (prep->prep_flags & IEEE80211_MESHPREP_FLAGS_AE) { From nobody Thu Jan 25 06:52:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNR1LnKz57vTp; Thu, 25 Jan 2024 06:52: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 4TLBNR0r2Dz4qch; Thu, 25 Jan 2024 06:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZIzIP/NarvUQq8S6+k6j4U0zAsrCWX91vRw/+Irrsw=; b=rJNzpZv543GRgaTE6F/Nt9TJMoPgWfc98+H8GJChkBhdQsOE7PuohbN37Evgh8rUpXA8s+ oy9weSN6bsyPhVN2f0ArLjuwx4lluLtizIEsyPHKTjOo3FcYxbNPhrnMU44Nhg/ieCPq7P k3kl407pCnJyVtmkWfSbMND6MhmsJbMfWaBUIr2gKjArZUCUW8kpY2FAZ43pfYW3lt6f+G UbLGzDG6OZBwEjHcedfFYwhYpexY33MNfII2ELOEb9RMC6H24lBnfCXcdc1Dt3EP5KCNxs O1OcrGbbHVNZUg0A6fRONwHi/l+E9+PSddvDsf2GFEcbPK1W8ZapwKRBXmaEpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZIzIP/NarvUQq8S6+k6j4U0zAsrCWX91vRw/+Irrsw=; b=FA6qJd6D0xI9qVfXnGYvEuWA29tOvWTwwbwq6QqUwz2kLaIkJsZoBZLokfifzsTNYnATgx tiRg35QuHULrvmqRMcjKT/e4Zm7wtVmmQrUcjOE9sB/TeMYM3UzsvD18wBUdsWaQ3KJaKk PpfbTT47casoxDwltma7WOQbdYDRhiuacwx8w37xGMccBr77h/0aM91HXjSflbiOuvE0Dy U64so7jmI5lK6wOz12kzAziOeT192Ourg4OcQBMzzEJVV9HheQdZpH3CqJ7rhR8hg5AxBR En/TE0M7KHiXyAvRc/2jQMnodOlQgX5H1i+Jgpt7Zxhr2t8y8ZtiYQJn/a5u1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165575; a=rsa-sha256; cv=none; b=lgv6ADmfX+QA0YWbPZbvXyLy+EUs/gTYbmg5fnqKrg+ffFsEuuQpxebbK78v3kDN81CS+4 ESOIAtSWgcQ127QwvglNukXvdG9aD2iL3wrNikqeUnYwVHE7z7/fuwjRS0S1xOdA1Ih+F+ okQa5HJT93UlmK5fgpty+dZFZcCPHkdshlIHBvhIrHZ5NErKVwbJVXdtPw0G81mlOlcxQZ XyfsGRJD1jXwVrbRidS1Tdz1DmCF7dLoBDtSRl7oyglASJ6oqlTTUhDenONolIE07Pq7HC FhOirQWVp5Vkwpsnno5rgHWOyQVBGAEZoQE4Lgm/QkPTFHH+lLqstrQlzkQwyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNQ6zGBznl7; Thu, 25 Jan 2024 06:52: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 40P6qsNG033939; Thu, 25 Jan 2024 06:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qsVI033936; Thu, 25 Jan 2024 06:52:54 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:54 GMT Message-Id: <202401250652.40P6qsVI033936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 651804251df0 - stable/13 - netlink(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 651804251df08aa8b307f8539eeb700788c08187 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=651804251df08aa8b307f8539eeb700788c08187 commit 651804251df08aa8b307f8539eeb700788c08187 Author: Gordon Bergling AuthorDate: 2024-01-22 20:52:16 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:04 +0000 netlink(4): Fix a typo in a source code comment - s/permament/permanent/ (cherry picked from commit c90f1ed104606f5a691ea2defc5711ca9d28fcc7) --- sys/netlink/route/neigh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/route/neigh.h b/sys/netlink/route/neigh.h index eacacc09711a..10bc3b93d16a 100644 --- a/sys/netlink/route/neigh.h +++ b/sys/netlink/route/neigh.h @@ -82,7 +82,7 @@ enum { #define NTF_PROXY 0x0008 /* proxy entry */ #define NTF_EXT_LEARNED 0x0010 /* not used */ #define NTF_OFFLOADED 0x0020 /* not used */ -#define NTF_STICKY 0x0040 /* permament entry */ +#define NTF_STICKY 0x0040 /* permanent entry */ #define NTF_ROUTER 0x0080 /* dst indicated itself as a router */ /* start of NDA_FLAGS_EXT */ #define NTF_EXT_MANAGED 0x0100 /* not used */ From nobody Thu Jan 25 06:52:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNS2lFCz57vTq; Thu, 25 Jan 2024 06:52: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 4TLBNS1mwBz4qJC; Thu, 25 Jan 2024 06:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GsmAborporKhnngAxq4LttM/RhfN+Fq3Xqpe/f8UtU=; b=kX83Alr4RrS4Na38VWb8mksjzYUpa+T9DqcYOH+aracDhLtefkDScM2yu0ptbXQ9Ts97Ah SIVR8IVnY82nvRGWi0YISJw7xmjSDFWe5/N0pJ8mB5OusYKnUm88WnZYYv0hGKCfdHg4Q1 +hVZDclruj3AD/v9PJvYk/hLICrvS/KJk9Akfzz485SxrvdGo6hMHfkqQJ/ockP8DaLUeG 5iGquDEfyYhhUSEQOJ4/AdzFXtHA/TZvRAdstX8QKawuwnfSPL0UvZ0KilpurFqmVZb0ZH p95Xadin1DOJSftERQHgT3d5392K16XFGXRvey51Az/Za6T09wnRBWH0It3Ahg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GsmAborporKhnngAxq4LttM/RhfN+Fq3Xqpe/f8UtU=; b=QXRUuwZWfz4ZEJZLJkCzDSFgiwUiFa0R8KCDX5oW4RsA0sjGuPSWJ4HhyusqP1jTTC8qjG y6wzLMu2NNBX/MukI+ylokPlkizyNdVUE3+7NH6Mm06vSj+D9BCZOvLZhtrS2+9wwNmHvY 0o1CJcH7VILWfLTvoUDqX1tJ4SUSSkUs0oEjNH/6d5e2VYDIGqrI+U+Dty5GFDumxo1mq9 ckakhH4BTRyPX7LoqSCSz7y3xcFIV20+EzW/sKoXcxpT+fJT9Avt+7Xc0fhTbpcWN/Hvvj ql7koCA92LJUq5ka/DNBQobTbehMNrm0wclo2zggFGUCQcqipDY8hgSwahMvJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165576; a=rsa-sha256; cv=none; b=NKfM/1mx0sSl0DK1GLVQ8AcMJrWJPBc10iz5myRtvYjm43/Yiihv4qWcYazJ82swTK54iz nYZOsVFr4ysIgX9jFP+VlzJCDPpLJPKgH2e/cbNTQ1ogWWgt1FZdjPLMBr/qRcW6RAggGK dSQn1o3hqgkih8Ntngr87lSG6eq3ZZQHcSNd+SnX6H1XhgJqEAG9IT2VS+j9ypyp9LKjMh k+S4afQSCcVGHDOj0Wx8qOOLV4gO9blP/7kBeXzdfAK2D9P4Kt1woJnNKhepu6hC2rDwPQ Vcw4uZ6wlA0/iZEnVIXzxrcLwmuvoT9VO/+vkOJAhIjr9jNvptbBCCJQ6RInxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNS0ssVzn94; Thu, 25 Jan 2024 06:52: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 40P6quaV033995; Thu, 25 Jan 2024 06:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6quDa033992; Thu, 25 Jan 2024 06:52:56 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:56 GMT Message-Id: <202401250652.40P6quDa033992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8f94574e52b9 - stable/13 - gjournal(8): Fix a typo in a sysctl description List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8f94574e52b98f97d25a3f4992f7a89b61e33631 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f94574e52b98f97d25a3f4992f7a89b61e33631 commit 8f94574e52b98f97d25a3f4992f7a89b61e33631 Author: Gordon Bergling AuthorDate: 2024-01-20 19:58:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:14 +0000 gjournal(8): Fix a typo in a sysctl description - s/entires/entries/ (cherry picked from commit 3fb6adb07915b6759892c937fe4ae8a07ed1a029) --- sys/geom/journal/g_journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 24a196215bb1..b0e8ead5c0cd 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -129,7 +129,7 @@ g_journal_record_entries_sysctl(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_kern_geom_journal, OID_AUTO, record_entries, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, g_journal_record_entries_sysctl, "I", - "Maximum number of entires in one journal record"); + "Maximum number of entries in one journal record"); SYSCTL_UINT(_kern_geom_journal, OID_AUTO, optimize, CTLFLAG_RW, &g_journal_do_optimize, 0, "Try to combine bios on flush and copy"); From nobody Thu Jan 25 06:52:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNT45MQz57twB; Thu, 25 Jan 2024 06:52: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 4TLBNT2rCsz4qZc; Thu, 25 Jan 2024 06:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTg+Y7qGKeE48QQYUoQmdUf36Zg3uByHFXXQuJacQF0=; b=mU9n89LrWq6N6TKdD03PZNGiWyw+B6po8Rl4WQ/ylh9pzLSJw2G1o4s/XaFWhmOWPH6Tmo g1ybqsIS7DdYUvhxHU0ETdFSyjP7rggAw5QJAGgDB49DNL+brSA0T6PBLGvDZG4mVuHbii Upa2OcOru+0qLudzEfGV9Ns4QJlrr5PjB7BE/M51pSwaE3uvq0gF+vOiQLjvIaeb2juTXx IubaG42yyHuMPzua+Rx5jq9BubNQQRlIAuBn1OFuGcrcJc4d6dijevKD/ETkZcIRFgg78K ouxRGgtwGoVZwTovUavoTxu5IY1MjAv5oCT+ENL1EcXsbHx2eOczqfWjfuDaCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTg+Y7qGKeE48QQYUoQmdUf36Zg3uByHFXXQuJacQF0=; b=ltsI44gKv4Ab4uRyxKCMx+MeLt72GSI13O3Yo6q8ft8TSUmJWphuh55P1AwhavqPT35b0V abjS4LIi9+qf6sJpUfXc/CUq8Fng/yO6YmHwz/rWQvkf9Ekf0bIsw7r7u/MBwa0xJ+GGN4 +Bq2eN4GmJWj3vnFjo1R+SAiWluS92njVuagQug5Fm3Z8uf44R0YrTx2AVboTzmNlHrxgN 0SeUVPIANc0SCTI5xQRtaGX/+vvlzhflgCmEyxRf52wpptZtqyxKVFcXNirdG9yonATVzM MhuLOcHuPliflMCxnUCvRk4nSgqZXwjgdJHtJK+byoBxjWJlIII5cTa5NdlIxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165577; a=rsa-sha256; cv=none; b=dI6AGGnsPSPJbHuBu3YS1Jov3C6jD+BLURfDqa37sOTRfFlRciVK+pDleH/5qKoevZrSC7 REcKlJrONQOERUN7iWAlKRoVJMfk6kBpylbA2ApyJz+Ca90mc++WdGmsnByPkooVL7sW2z dUCU9Fc1Y3AMPCdf3I+Xl8GIVGe3ndKCpaD+lB6k59K0z9z/Tu0vIMiB0MRs0iaw1dp+f+ t5isDqcF0tA0Rl+Mzfhc/hUC9nXmf4RKHLx/jMy7rI8lUOYRIW740U8RZ0qOMXhnKGTkrG /fnTDylJKK3qWnSsLZwTbfe7lvsLnecPRyj7a3vmvi+lZrSJ4Q+xXf7eEMTgUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNT1vPBznmd; Thu, 25 Jan 2024 06:52: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 40P6qvTu034049; Thu, 25 Jan 2024 06:52:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qvdi034046; Thu, 25 Jan 2024 06:52:57 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:57 GMT Message-Id: <202401250652.40P6qvdi034046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9b52af884c32 - stable/13 - virtio(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b52af884c322f8c3e904d19017d5fe83c761269 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9b52af884c322f8c3e904d19017d5fe83c761269 commit 9b52af884c322f8c3e904d19017d5fe83c761269 Author: Gordon Bergling AuthorDate: 2024-01-22 20:59:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:26 +0000 virtio(4): Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit 97a4045aaf36079f54ee05a8cb314b8a90f20af8) --- sys/dev/virtio/network/virtio_net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 0838950eec07..b22875713636 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -210,7 +210,7 @@ struct virtio_net_ctrl_mac { * Control link announce acknowledgement * * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that - * driver has recevied the notification; device would clear the + * driver has received the notification; device would clear the * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives * this command. */ From nobody Thu Jan 25 06:52:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNW1gVrz57vFc; Thu, 25 Jan 2024 06:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBNV60Hnz4qJp; Thu, 25 Jan 2024 06:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vSQeoInQPJNdE6DKapaKH4iYfm5pmlVtpXph0lPuOM=; b=Pf2JjKa0k2rZD4JYy3sUJlWCl43tp/4GsSow70TOUSIt5uG0gpByGcJWVrEbrMiuS075KS /sDkP0XXesogl9DiTgYcL7sIag4SQlmeeMg5ycajVDU00ifxXT90MAel0MFcgTvnWbRqhH XgaeBP28Z/EJhh1huuEguwjIfPHCq/mKr9ZnSMt4XW15Nj5wBhCjxCQN4yU5iwSQqBc3v/ 6cClfj4szL+WtWqzQyqr9y50f7ky90akHaXmXLD3Eq9c8c8rLYWH9UBw2z67QiRxicg+pa FMz+qeluGU57z2DfzgtwT1vCtho12iiZqdSkyTQS31MjQXHt1lgA5dTMwNN2eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vSQeoInQPJNdE6DKapaKH4iYfm5pmlVtpXph0lPuOM=; b=G26AxylyJ4Lg8Ua04Ag5YFaGihjXdvBTeiM6IkBaQPa+ceoP2ikrumrnQrgeh0/hzgr4Fk P3J2ee/cZiA+zmBzpmzQbSbAA4sspx0xNOUHWgXBgPyZXx1ct//0hHPe7+o5fEW/3xJRps OT6oJk27nIdZ2bMXD8OKXCIDNjOaHYo01idlzTHPwYnBBAzbWH2btirkjZzTZ2/53LfkPU JzRQQT6QD4VsbjFeDxuFTC65Ab04+hNYZN2lsZ8Iu5V2s6v+7dUwCgnt8rOpYSRxVwUQFu 7TkpQMoB4cIMSjTBtkTE+BTf5HUIaJ5DXwG72D7jv5N5ysbGF4oEcyr30LWFQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165578; a=rsa-sha256; cv=none; b=ApjzhAdEEwOTG6IAaInRpMaZGMaMJEFJtKn93WJD9IM/ulphJb2TDE6oJv0e5E2VgIykzy 1M2pmVdRn3DmT75DHiXex5k1hkeYxzQn3Zs6ZCnElDBBEP3c5zgTUGR9DiuGu964i9i9Cv 1k9hmfF7waMTWoKnMkzbeSvM7d5I8e7XfuP0rCiXdJjoVpX888dOXFGb7psyNVzfCqtAF1 noI+C+01eqK1he9ySknUorGMMofUzuyYTpejFQwZCxNtGI8Qm4KHQZp8aI07Ak9CgpFbf6 qjRSr1LPW69Oi4bz8FDy5szFecUmMHpc4YqFDpfH+im/XUw/30vULBTUE1JznQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNV2y68znPy; Thu, 25 Jan 2024 06:52: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 40P6qwWN034104; Thu, 25 Jan 2024 06:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qwup034101; Thu, 25 Jan 2024 06:52:58 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:58 GMT Message-Id: <202401250652.40P6qwup034101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f2770534e26a - stable/13 - rtsock: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: f2770534e26a1d70525b75deb00aa86b0d060b22 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f2770534e26a1d70525b75deb00aa86b0d060b22 commit f2770534e26a1d70525b75deb00aa86b0d060b22 Author: Gordon Bergling AuthorDate: 2024-01-22 20:53:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:39 +0000 rtsock: Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit ab6d773dbf926e4f92e37b67a85c3290cfb90723) --- sys/net/rtsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 4da7e9e74025..3d977cba4862 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -750,7 +750,7 @@ fill_addrinfo(struct rt_msghdr *rtm, int len, struct linear_buffer *lb, u_int fi /* * A host route through the loopback interface is - * installed for each interface adddress. In pre 8.0 + * installed for each interface address. In pre 8.0 * releases the interface address of a PPP link type * is not reachable locally. This behavior is fixed as * part of the new L2/L3 redesign and rewrite work. The From nobody Thu Jan 25 06:52:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNX0gw3z57vKw; Thu, 25 Jan 2024 06:53: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 4TLBNW4w0Bz4qpQ; Thu, 25 Jan 2024 06:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ha+J61sX+1Oh2ry5kL+FqyZqT+cGihJMGXDHt3OxKxA=; b=AIyo4F65JyST8VwJUCmXoDdbM+jCWvP1bXzERM4/N3CscvaydSvY/XidVoQa9nZx+qYtK5 OSgFAnGJ1wgTuKUyUX/RAbObQK+YOyslBP5dLZugzGrPMgm3Znld2pmmnMdWyQia4Hmby1 ptruUsdr2qKcw5n9IDYmuLWovi2mwg/QqjvOhs+QMtor54OU4Op5NjpDcsV6vkzt6CzUqx 2NR8C43HzODwCXx4Imh03XVIUq1Vr22J7q/IGjlO5RE8xPkjzIhGCT3vhb44kJTHMH+uKL v9VSTX8+If4jwsYxutvmxwN1oTa5atKEscS8S7od9XtKm4Gsivoof1lSFJFRHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ha+J61sX+1Oh2ry5kL+FqyZqT+cGihJMGXDHt3OxKxA=; b=rQOozvPomGiDGpHSiVydChBFvoRKOg/+B2QMQ4vkJ9aRJbJDE/51R1YzKxggRxuxp5t3wL Tf0l6ghN+kMc2PJrT38zl+/4k3iI4ySQFARPggiGVlrUC1RFmTjIwuXW9rHlCtdusPdPYQ Qv8ZGW4ePQ+PbFxfZ4dWrXis77QHCXsWX+aTIZapICU4qe3UZdUVrbrch0928Rtj/FDOkI rjYDuuhyDUzR1g+CGKcen+lL6gQX2hHAYMPM76+Hu8HhqM+E6UG1Nq/PKV+qyaCebIA3xn IgCeqWgizacjps0CfFomXb0QGpBJH1qdUbh6fA1sd84KB5/otyeXIxOetVLcnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165579; a=rsa-sha256; cv=none; b=bmD97RkcxFwKFtMJcYAwkRCHxvwY/U45yS7CF1zKssO3o/Iuvn+IHZ4E+qbNB4/NpKZK4B 1J2FLMlHNKTn23NIY1kMqZqX7CKVG8YwUnyff9Ari8QeVIdhAZRBmSF1gLzPzWs3R3GbrA uuXLmnyiItiC6NPiX3Leb7H41N4K41dcuRAgEKziOQjz0axH1I9Hevj3DKsSnd9oB7yh+9 Vxai5DS2ypU3AcKXt61sydV83AYPowGEfIggcPQQmmSeyx9vUGfjqYzlY7lhvhgRcRJfK1 Gyh1d6pkx/V/vAuM47v11P0Wn/dp7vqtBgXWxX0UTQqY1wJ/wX97tkyO3+ypXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNW41XvznQ0; Thu, 25 Jan 2024 06:52: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 40P6qxiv034155; Thu, 25 Jan 2024 06:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qxXT034152; Thu, 25 Jan 2024 06:52:59 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:59 GMT Message-Id: <202401250652.40P6qxXT034152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2ecf0a83b2dd - stable/13 - aic7xxx: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ecf0a83b2ddfc680e5761b23f41cd32fe447533 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2ecf0a83b2ddfc680e5761b23f41cd32fe447533 commit 2ecf0a83b2ddfc680e5761b23f41cd32fe447533 Author: Gordon Bergling AuthorDate: 2024-01-22 20:47:23 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:51 +0000 aic7xxx: Fix two typos in source code comments - s/recevied/received/ (cherry picked from commit b971c51a4d9498c26079fd8229f7af6ef1585020) --- sys/dev/aic7xxx/aic79xx.seq | 2 +- sys/dev/aic7xxx/aic7xxx.seq | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq index 118c4f187486..85957102eb5e 100644 --- a/sys/dev/aic7xxx/aic79xx.seq +++ b/sys/dev/aic7xxx/aic79xx.seq @@ -1198,7 +1198,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 1ae250d880bf..a94e2dae4149 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -1639,7 +1639,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; From nobody Thu Jan 25 06:53:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNZ1p9Rz57vcR; Thu, 25 Jan 2024 06:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBNY6zZTz4qkR; Thu, 25 Jan 2024 06:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jyi36jwC5mgFXfPszFVoh78gM3ME5pPscp00xkmcrkQ=; b=QA4pHWIEWD/35HfQbfimcQey+tScrcKB8ayCAaqmrrGmt1Ya6oQ39wTd3XNz4fqS1+hKG9 c+rVdaOkIKRD5tpfhFKc2TznQ3YjffZv3/DYnrtH3DoEB8wxSmFDqaKb5CqIPLkyOaI/Zd MRx8rMFz57/i7D+axg4vZ/8xFyKBBPFe/PVAR+tx9eu19czICe9zoySIx2Zru+QOjxPIgl TU42NmPer4IW8OXyQlTvmB3t7xVkGCR0qnuKzlC51hbu0toR+wsJiDm/wvv1nFj+/mD7ku klbuncMwyrbXKf2Z91Nby3HipT2pmlF57SUy2G1CLYf1L/ohHPCARvSWSq19zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jyi36jwC5mgFXfPszFVoh78gM3ME5pPscp00xkmcrkQ=; b=roXARzg8iEHZklR4zBA1OPygzGSo430vxLs9jWXIvslRb0KedN+UIKkqkiPJ3BzEElL06W kvlYZKgjfR6yeugSAOPtQOfjMO2nWujVo4/PTgCHTx4K5CSmfQmh+yXXIxkqu0JcStUdaJ vb90w9JV4TV19sddjz9uKfmgEkdqO5uoO+/WbGpVKnJS9c5bOMWnEh1NpHz6zAVeHlbIel AEkDjy31lBZEyCXfuJx1wMwB/a0CaaPgMqJcHLosCWqb0RvYL7+8VXgDhRJSfzORI7S1R+ 8g9n7ZkFoOzvJF030ympjYztz0I2mePLOBWEYiEKIBTrpiPD3FJK+WDM3BpWRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165582; a=rsa-sha256; cv=none; b=jq16ZjbuMH/pqZn6+0foe6VkMXmxoo9dVTyHEfR5GvcB72bt0Kw/blAR9tpHQm2AXlNGFq NAI61OHyQqTTd12JUaprYHgUw1OG7xVaVCSjnlqGSpxEDu2JzI6HRiQkIJHrWr7MzbXzLF fb426ej5TX1AKkjWZgWjVBid2p0htcCKabXZQJJp3j/C9D3TuP2tSSPiRnkhFvLspmOhmM yiPYugPCF0s+QJmmS1+a/xzV3qi7tht+zp4gSJaLSPHujQ7bp4VmoLZHwfMMFnA+2bSyNl sEs9AgvVYTZs/xNcVIPVvzqjikhWZFSwrQInV50My8q2Xfqdy3OB9D1SuE+lJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNY65SLznl8; Thu, 25 Jan 2024 06:53: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 40P6r1CI034270; Thu, 25 Jan 2024 06:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r1fS034267; Thu, 25 Jan 2024 06:53:01 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:01 GMT Message-Id: <202401250653.40P6r1fS034267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 48a02b429d58 - stable/13 - vmd(4): Fix typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 48a02b429d58868782005fc72c722d37deee300c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=48a02b429d58868782005fc72c722d37deee300c commit 48a02b429d58868782005fc72c722d37deee300c Author: Gordon Bergling AuthorDate: 2024-01-22 20:55:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:18 +0000 vmd(4): Fix typos in source code comments - s/harwdare/hardware/ (cherry picked from commit b2c48aa4d19268610191a0b7d7b76d01d28b0a13) --- sys/dev/vmd/vmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 16edf45c2dea..e07f1de4983b 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -437,7 +437,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ if (*rid == 0) return (NULL); return (bus_generic_alloc_resource(dev, child, type, rid, @@ -465,7 +465,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, pcib_child_name(child)); break; default: - /* VMD harwdare does not support I/O ports. */ + /* VMD hardware does not support I/O ports. */ return (NULL); } rman_set_rid(res, *rid); @@ -500,7 +500,7 @@ static int vmd_route_interrupt(device_t dev, device_t child, int pin) { - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ return (PCI_INVALID_IRQ); } From nobody Thu Jan 25 06:53:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNY3Xd6z57twF; Thu, 25 Jan 2024 06:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBNX5z98z4qf0; Thu, 25 Jan 2024 06:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/7/FwxRozvGlbCmIuPI9hHOCqrFwCmMOVslo8PJlBk=; b=bUc8spVyosc1871usBLs90/dYzzo3w/LYpyzhrOf9sjiBAY0+bBWByvLbfroXkb9X63b/i Egsqz4TQ/SfbdR9Knh1SZEPMf51h+JyFiSvegr59QCGtlkii6SL68EeFp6YsLxS5WornMK znhLLMPmwEB4r0PSzyOOiPhQD+3qU2wVb/pb7CcR3pPbwMPzcY7wRdfld4I3Vcz/jPiQgr /mwizjwGeiZ8G3LuDvLH0mJAKS5LeZD0eg4wrZI6vGBWIRf/zzzyq5Wh0xrRGfF2wPj5eO DKL1BRfxLVGBknNjVkioH8urQ/ijB+vE2iO94U96zAd3AwT6hf96lAPJRgxXxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/7/FwxRozvGlbCmIuPI9hHOCqrFwCmMOVslo8PJlBk=; b=XqIZPG4VABE5/EtFgYN1F20Z3ovT0L6UQfvtvkMNgLTXfIquoF8JlEqRwhm8TgMCp9IdFp WkS/rzv6KTgQ8oOvXKi5GTwqTNR2x10YmF1yNrKmR3Ao8iLGNUU38RHgfqe1qdnrIaWZZV /Y6upDUztSJ9+MJ0ayk1cgNeP7gEY31SviqH1Ww3nFZMxXzC5c2FSzbVbV/6skxfQHPOXK bsELYQSHbESzBn6SOHvLies/gdZ2nBDe0AUtOFF70PU8c6t2A9LH6dfy36gtPS57ZWQN8E GATojaKlZz4kx0HQiFaVOWKATvVXoDKCMmiX9uM2oMD9SQV6uCjkJx8BJtnBXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165580; a=rsa-sha256; cv=none; b=BQ0eCO2X7fta+X7BC+cOQR1C4MhrqORaNQTDyqutqq70MGBnGfTLmINsmbAG9gkeJnFK+A iEz04BUrkzy7TqW9hZV7IxqFlugXdeZENn9MWcbakDnttcBXa6Q/QTfhnwg/WXhj438l4m lwYYxJf2XBN96u47zQzBt5MT7alEXMRIHONbgvumKUj7WCi2bDE62NH5Z6xZODvgbDXwzw 3+I2xu0OJHVXGSXixi3dYYdNVYtG+xA6d0rUp5J4j0R2fMPTwVSudfI3rFpEpJgqmg1EQd U7feafeEc9vOl0x22qgAdqEM3yvV6+cn0U7sl37CeM9GW+usxnuNVRdKglBicQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNX54hKzp14; Thu, 25 Jan 2024 06:53: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 40P6r0dr034216; Thu, 25 Jan 2024 06:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r0tE034213; Thu, 25 Jan 2024 06:53:00 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:00 GMT Message-Id: <202401250653.40P6r0tE034213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c940246eb0d1 - stable/13 - tcp_fastopen: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c940246eb0d193529bdbefc03c0cc0549e57d73a Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c940246eb0d193529bdbefc03c0cc0549e57d73a commit c940246eb0d193529bdbefc03c0cc0549e57d73a Author: Gordon Bergling AuthorDate: 2024-01-22 20:49:47 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:04 +0000 tcp_fastopen: Fix a typo in a source code comment - s/posession/possession/ (cherry picked from commit 9b035689f15fc4aec96f9c18c6c86bd615faed2f) --- sys/netinet/tcp_fastopen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index b72a8c852436..0ccc67de9979 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -43,7 +43,7 @@ * * In addition to the facilities defined in RFC7413, this implementation * supports a pre-shared key (PSK) mode of operation in which the TFO server - * requires the client to be in posession of a shared secret in order for + * requires the client to be in possession of a shared secret in order for * the client to be able to successfully open TFO connections with the * server. This is useful, for example, in environments where TFO servers * are exposed to both internal and external clients and only wish to allow From nobody Thu Jan 25 06:53:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNb2hYBz57vFg; Thu, 25 Jan 2024 06:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBNb0fS8z4qcF; Thu, 25 Jan 2024 06:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgo51k7tOopv2fJTdsxwazgYClxyU96Vi+jc+6ve6rI=; b=KzEg6PPWG86BcoP4HEJywoKFhS5rquifbenwnk25U8NjQ+qiyV8xNF1yje5B2aHZw1Nhp6 nqFB3uZ1UFxFi/3Q/FJfg0URTDxTg/yFQ8Ginrx42W76cxGCxf2+K8w4IdgOJqauRvFqxd QtN80dkA0RZYnLCj5kFJIeWD7A46vjQ1eoo8+ua/O4ETYKTVAJBjv+RSAQm4Z76fsNKKx4 VX6uMIUhfnHPQMYDQxK82LBtb+ymypN67fBb6t+Pj9wRRtdyMgeVl8Ro6S/IsN2zFa+xiy +FoaBJFwWJSkTCSlNckf13BnRgrg+dDBqIPHFx3U6KnhnJNjOrehidsmP6v/2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgo51k7tOopv2fJTdsxwazgYClxyU96Vi+jc+6ve6rI=; b=xB/eVL0w1i4XVie6xHPPmKQxnSp/TEEncbLJ6U7sXNh1vKEaYqvRe/PFVwuFSvrj2GOf1C iVOH2sKeGf0f+qxMrHOcR0n2bd3AzIXLfY7oIKgYp0qB1sou2KUsbIsqNBxc2kv8PoNMao 8VJMRadoZ0eUYCzMeOZcdQ8Ki7B/Dd/WdgpetZuLvQ+XYxmrtYQ3/xlxlb5cBWtLF+Eta5 EjX6uR1tKQ9xoQawd7nJI6CeiknbSeENuY+NA5ipMl9Z1SQOjQJF/Lfn49Odz21QW5kltV HFUc+qp8AXdRIgQTphauTCR2bW2HMzw4H39JhiL/kbIoxL9O+UQJ0dSMkApsGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165583; a=rsa-sha256; cv=none; b=jppQmYLVcRHzF4K3KqQlbG/p0TAEg/fGZYvhC9o8T/fz2oplxdvU538KhuWb5Vijkx95/O tGq07CRi6c+QW9bayPXuvmMTFqDNwl7jlEWJ/rYEzM/Mi1zOLlrdnS/30ynIIJ0sBOdk0X 0CRtM79BpO6InVBmso44zlA7yKjBJqiBTTLM90KtxCNrK4iY33MzjM5hh20BjN7It05XS4 Qr+eIiMhVSv4u5IpnaoMpfgx/VinUxqN4ME2kRvUh1oz8uFt7KQW2CGxpdeE3pdBLnuRtE yOMywI7LgNSILlz5eGnRE7K728B0HYimXNqB6DhXD0Epej/BWfP2s/acIY3skQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNZ6tWdzp1c; Thu, 25 Jan 2024 06:53: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 40P6r2Ja034324; Thu, 25 Jan 2024 06:53:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r2Qc034321; Thu, 25 Jan 2024 06:53:02 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:02 GMT Message-Id: <202401250653.40P6r2Qc034321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e36e3f53d3d7 - stable/13 - usb: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e36e3f53d3d7b5570f51ceca0c6ccc64070e400b Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e36e3f53d3d7b5570f51ceca0c6ccc64070e400b commit e36e3f53d3d7b5570f51ceca0c6ccc64070e400b Author: Gordon Bergling AuthorDate: 2024-01-22 20:57:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:32 +0000 usb: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit d743711016298046ca77c5661bab41739396a180) --- sys/dev/usb/serial/umcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h index c8c6135710cf..0d34c54a3707 100644 --- a/sys/dev/usb/serial/umcs.h +++ b/sys/dev/usb/serial/umcs.h @@ -169,7 +169,7 @@ #define MCS7840_DEV_SPx_LOOP_PIPES 0x01 /* Loop Bulk-Out FIFO to the * Bulk-In FIFO, default = 0 */ #define MCS7840_DEV_SPx_SKIP_ERR_DATA 0x02 /* Drop data bytes from UART, - * which were recevied with + * which were received with * errors, default = 0 */ #define MCS7840_DEV_SPx_RESET_OUT_FIFO 0x04 /* Reset Bulk-Out FIFO */ #define MCS7840_DEV_SPx_RESET_IN_FIFO 0x08 /* Reset Bulk-In FIFO */ From nobody Thu Jan 25 06:53:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNc4y5Gz57vCG; Thu, 25 Jan 2024 06:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBNc1y4Hz4qkn; Thu, 25 Jan 2024 06:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3j6v9DOTje9Zdlv1BHbOXzHoHaBhiaN3rpOPQuMGGw=; b=ccB59bsxDEd05PhRLgkl6vqfMsxFgepm4rxDv0ca+wBPBQyzwEt458svELFJQWS/RZfSBQ hyEz3nJ1wrmBeuix0XBSx07mqiiIB1INBI4ZhuBQvd+k4G/6m90/UgMEzuSCql9KGqiFKg 10dbm+tf/VQYhyDwC13i6JMcPn2VqFeidsU5CQGRjeFFxIriCfmYRiFf5430ndWzXCaJz+ yxkW9j/sOSnocgUoUesGS0+JIlYaNi/W8osKb4jt5WM+jY8QWE7Juc06v6WkcRDpGR2wJn ipB1cg9p8aSbrFMP9Lafs9EwTy3QCRvaIDlf5ozHWcXNszfBWd8v04xOHRbU3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3j6v9DOTje9Zdlv1BHbOXzHoHaBhiaN3rpOPQuMGGw=; b=X5y2I0zR7lojjB6r/H1SjhzUrewTMq2HVXSr8MvN3PGDj1ydBvQKIcqeQ16XckXUKF0UdU PnlC8bltaTYIacDFsvUPYE8NdUv+jgjPTXqnM2IzJ07Rfr3J+3Puotc03yyRF9gxR6NSL8 XBhpGHH4nKeb/4wWquOSLnBUO9PJ1aR7uFPa9jUosb+aCOiTkoTtgsS/tLirJN1+xYnhxp UrNr8pIZCq94DlAATwu35gHexoFrrUe0K46m73MPwkiuSRC2mSpP/8v11TwnUEFcHaph2W /GoBr6pdXNPHMdAtoIbA+gyOiKauEnSjjUjlRStKSagZbaQVgQmVu7Y2i8EIsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165584; a=rsa-sha256; cv=none; b=xWFMAyb0Nz3++WjtB9HIZ3Lb12NdHXtosPYkmL3bQHAd6cfZiBBjK7xDkELUfGwKQb4yl0 xXJEmByRzGh3czy4fwwztSRze2Ary0LCCFYuexfBZR6p3q5Q5MugG1fLr+16UPYSBc/W5i ZlBEV8dNtWtqXaSEoqGI0gkisbZ7AsMTvSVUd29g0q5L3uZuYwfzuGba+1brHJrgD+EPbx 9IY5tICRv3i4LvY2ZjXRBCnpnW0WZJeL6Y/urREmQBbtzxGEW3O+3KLua5fYRZh60Mng/j ApixWt+aQ1b2mPkKE8C0GQ+5pVWdN9s37pfnhNxnWrLqYWiX7oY9B4Q8IzkOzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNc142rzp15; Thu, 25 Jan 2024 06:53: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 40P6r48p034378; Thu, 25 Jan 2024 06:53:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r49K034375; Thu, 25 Jan 2024 06:53:04 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:04 GMT Message-Id: <202401250653.40P6r49K034375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 04866ffa491c - stable/13 - bootpd(8): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 04866ffa491cca6ed1cc0916965aaa5932d72b3b Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=04866ffa491cca6ed1cc0916965aaa5932d72b3b commit 04866ffa491cca6ed1cc0916965aaa5932d72b3b Author: Gordon Bergling AuthorDate: 2024-01-22 20:46:31 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:46 +0000 bootpd(8): Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit d04df664776b436f712051520d48f84be93ab269) --- libexec/bootpd/dumptab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c index d6839362f718..b8f564a99917 100644 --- a/libexec/bootpd/dumptab.c +++ b/libexec/bootpd/dumptab.c @@ -329,7 +329,7 @@ dump_generic(fp, generic) * * The addresses are printed in standard ASCII "dot" notation and separated * from one another by a single space. A single leading space is also - * printed before the first adddress. + * printed before the first address. * * Null lists produce no output (and no error). */ From nobody Thu Jan 25 06:53:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNd3TYGz57vFl; Thu, 25 Jan 2024 06:53: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 4TLBNd2YGhz4ql2; Thu, 25 Jan 2024 06:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eivGcwGQLpH0WBUB2KjxOZX6EJgRBbitZJf5jTniGwg=; b=UAgV/iD7J/Q4peALvR6DVCbvaTj+8pWtWKs3tIDl2+ISz5gwvf8xeU54ou5HpllHmJIz3Y HvOjZF2deuNMn+jCgR5NpMyRfi59Bndcgpe6mBgiH5PV/6SYw0TU5eSWWl09T5J+rTdSeD 1GTHyWdm6na/tsK6DUHE+oMv48V/8dvu34h8ZOclV0Hru+R3JsRv00f1oL2sx6dRV39Yti 9BHS3wq0sIEt4ks8rKdlUooGWj9lD8Rtb8FrzzsNn9SqnqfmzvYykXsvGYuYNL0J7ZplgA hlnhdzvvrAHBvqH/Q3wXokzWGPdBZnXDW775vrl0Y/6ldvlJWUfdmPlps37i6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eivGcwGQLpH0WBUB2KjxOZX6EJgRBbitZJf5jTniGwg=; b=o+HlrqTERCoYEfNXOaPjv3zxMxwW5i9Ueraf5xgt/rzBzlHUKVxkL2Zhw8OQSnUbS4rS7N j7UyCrptZCvJdOIItoYVwoJpo080qIUKCGWz3+N9KNfbVL5sZiFtYo4kMuS9frCLA7JxBL Q65ekVv8tkdJtFGPFaDmyodr4w9hQxJXUh54d6mqGcgtYj9Nj9ekSN9sDhAOHmcBVpPMqF 8uisRQfL2XkMtklt59uCc0y7KYJ+qs2G4afnBLkS2qBbNPUPwgqZDDJUz6OYwRNoJohRpp Hft9o3QKyjO892ZT7S34DLVLzUgNehrQppn4cz1+mU/86g3MBBJuCq3DC9sGQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165585; a=rsa-sha256; cv=none; b=HdlyDvj83h2Gm6Qydpf4uTqZAX6G23rfQ9u9wYtjjB1s3SPcNzVoThwtahJ1ULJ7FGYKQN 7FApB//Zr42E4adcsQdDvoNQ35LhzHKtO71w4gSERef9qdjIvanbHlB30snreCwPQhaLHV yqDUiVdBeox7kEfDGrXQAkoGlDbWtW0N+5vBKTHrQffEBGx9a1t+zoEJcFQCkWkqFT1qZD 7wmQSH9mw0lzC9JEehjW3bg/wdKfgJIn2i7OaL4uKNcts4nTwL/fhDgtvjBaWsy5cUFYQb MPMd7N9UEx4Njwgg0uUIv5Bg9UMVeMPeR7fWUEiOanAa9cCZdcCAAPDPbR/xQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNd1fxHznpr; Thu, 25 Jan 2024 06:53: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 40P6r5Rj034429; Thu, 25 Jan 2024 06:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r5vG034426; Thu, 25 Jan 2024 06:53:05 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:05 GMT Message-Id: <202401250653.40P6r5vG034426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b146a9c34084 - stable/13 - bce(4): Fix a typo in a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b146a9c34084787ab16a12ab6d2b4c10df25a6d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b146a9c34084787ab16a12ab6d2b4c10df25a6d9 commit b146a9c34084787ab16a12ab6d2b4c10df25a6d9 Author: Gordon Bergling AuthorDate: 2024-01-20 19:10:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:19 +0000 bce(4): Fix a typo in a kernel message - s/adddress/address/ (cherry picked from commit e1c0d368d630cce01691e1967ada9f36d6b8c751) --- sys/dev/bce/if_bce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index cafb4940b440..322ab8328080 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -10663,7 +10663,7 @@ bce_dump_driver_state(struct bce_softc *sc) val_hi = BCE_ADDR_HI(sc->tx_bd_chain); val_lo = BCE_ADDR_LO(sc->tx_bd_chain); BCE_PRINTF("0x%08X:%08X - (sc->tx_bd_chain) tx_bd chain " - "virtual adddress\n", val_hi, val_lo); + "virtual address\n", val_hi, val_lo); val_hi = BCE_ADDR_HI(sc->rx_bd_chain); val_lo = BCE_ADDR_LO(sc->rx_bd_chain); From nobody Thu Jan 25 06:53:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNf5ScYz57vXF; Thu, 25 Jan 2024 06:53: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 4TLBNf3rJWz4qwB; Thu, 25 Jan 2024 06:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8W1YUXXLoRYC/+fQT22A9vB+5HGVjeTo8EjzUA+1AZ8=; b=GKtTdiAMD56Gm256j/Mof05q1pF5JsMvctuopKVxExt0Rwi8l5F9YCezVp8badCtWg64SW kWprMmDTTbIKTUfBRXTPPhiCQ4VN2hk8nap4dr8KdFS+VkWb9uotXjpmi6MP01N+NK4wOB Qo6yQNzmm5jIx/7FLMv7wC+5c2J6HwmSPKSxlX+2SkQiHABMuXv/ySku/0V6dAbeW1znN8 PFlDIoUIdORCzGsPhKGsPs57FGZdIfxbCybsCVS3AY2zsZ8la3W7Ak0QyQDH++fRyxBv+d XWV2Tzd8eoE3NHf0rPhtsr0fgoGOAz22s/0knrdcemRtZweIaTe2aw8olsFDcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8W1YUXXLoRYC/+fQT22A9vB+5HGVjeTo8EjzUA+1AZ8=; b=F1mbbjlj1bjFZY6dNF9egrjA8k6D/G+u/S2AFJsC0WOCIze/v2eS3ufctG+RI1b0TYM40E NZ0uiuCwc1RByfIm9/iZZNNsZ9tP/uVpqXHNNYbajAJbJl8Lz83K/vkn7IvfGyt/Nkodoc TTCxEhKW0m4ujK+deThRx2+kLE+QFY9vE7D5GGF+szUU7eGywEgHOa0lwX+zNl92PAoqaW vZIvkD/MRfkGjP8BloY2X5kJs/dBCfScjR/KhmYNAvUL9uFGrxer133ZCTk6MDwrnA3Fr1 +9BvpElvzkIejxnoUoxv1iucqJpT/FnP1A9Gw93YQ0ZH7TxQsO6EXqfDaVQwTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165586; a=rsa-sha256; cv=none; b=DrPyydwbahQbICgTG523q0gX9ETULKQzG1xbMhpabrkIy2CSxXcMFk6Dhv7r35CqHofXCg uhKPJKxAC850e1D0uolgQ481nhnEUc/bVKTkJvgtGSmdIilAOi+CkCNMxyR9rt9YICc3XO qGfhjGT82b09Vf2uPsJd5rxedWsYM64jKudwe80ZMZLEBiz3YdjLJb2ZPXF9O2PG4XhjHJ QRTcFCKlDfn3UWb2XcbiF9lWssGr7/U96u8cRT/0HdZUpFMKA2yepT/hLhfLMLPbR6o0TI +dbOWzpBlHlSbVd4C45zDwkPfGnu1m2GyzFr72jiJbr9/xzd/cgDV+FYLjpMgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNf2yCSzmw1; Thu, 25 Jan 2024 06:53: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 40P6r6J7034485; Thu, 25 Jan 2024 06:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r66n034482; Thu, 25 Jan 2024 06:53:06 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:06 GMT Message-Id: <202401250653.40P6r66n034482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 48aff6a116ee - stable/13 - aic7xxx: Fix a typo in a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 48aff6a116ee202e2474bb9ec9ac0d7f8f7834b1 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=48aff6a116ee202e2474bb9ec9ac0d7f8f7834b1 commit 48aff6a116ee202e2474bb9ec9ac0d7f8f7834b1 Author: Gordon Bergling AuthorDate: 2024-01-20 21:01:10 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:36 +0000 aic7xxx: Fix a typo in a kernel message - s/recevied/received/ (cherry picked from commit 54e047b13baaa5eb613e98991f807e7b6f893f78) --- sys/dev/aic7xxx/aic7xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index ba3fa46d01bf..68f189f5dd48 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -1109,7 +1109,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) printf("\tCRC Value Mismatch\n"); if ((sstat2 & CRCENDERR) != 0) printf("\tNo terminal CRC packet " - "recevied\n"); + "received\n"); if ((sstat2 & CRCREQERR) != 0) printf("\tIllegal CRC packet " "request\n"); From nobody Thu Jan 25 06:53:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNg5xgFz57vck; Thu, 25 Jan 2024 06:53: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 4TLBNg4dFBz4r28; Thu, 25 Jan 2024 06:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxIJcEyoE89n+FbSiehL2ZaG3lWQZotD88R3FRGI/5U=; b=uswJDACjCO9DnoKjGpNhStiSF5vMry7pNui4K3MBF8C84ERwO3QruSiw9jJ/VdrBDHedix ZP9o7mwtjmwJ4e5B27bUQywuSQSEmZdAvnpadD6Tp81IJQgN5c+8oet6+NiZ/YZjO025Pl yGmdHHiQHWPJjBTBBPW441w/FbKIwzMg6Tq07MF66Xmq2NM8mOSEFqmPdWZ0z/4+xZU5Lw Hsha7ZZhibEZzT+POuskuBOTbtlRNAPuNPKEB6MSjhJLg5MJuiaBzypXdKJXMZspUUW7bj crL/4OBl+6z/GZI2/1wbX95SSujL+XFgj5j2Zsl/i7Jpd/63BgMeMdU62Yn6mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxIJcEyoE89n+FbSiehL2ZaG3lWQZotD88R3FRGI/5U=; b=YymkoOZObGhFBj8oabWHdd3+0wq8vgykOAVzd0gG/y3jRM9yXrWV1CbhoAKMRktpNO6mCX hWNFX16KUkDBePivbI470mEGIL8zEZVMgY1XE0vvz1xuwsmMFeqO9+JaedTA9z/E+LDLqm jU9WocCnKJzghIlL9i+yfUP2GhCEDD5ji7IWMJV2qB2T8HL2yZjMZUv52uSqacelZIuJBh S+dJph2y3hr2q3nR1lGgGYquYWRqgXiWsdnVnqRCtzZ9/LB9bwzsJjxATUxbmMSGASsL6w A7ZOUzFuWJWSFbue6LLxuu5W5VLUAfTSDlSeBJtdr+IIPL3lkfmoxi5OQ5Fx1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165587; a=rsa-sha256; cv=none; b=XuC1MzSK5FMrnjp0niAmg+FbNoPtwcnl2Xkgef4k/NBZFAQ3/AB99p5WpFRqemyiSGRXI+ srriDhHhXFiqg/uXQXjH3I+xGLTrOynesMCMgYSufGC7swX14k+MFrZwsSCiwakk7F1Pd9 ZIJ9kPYmgiGyDzfZIeKUnGnW+prtIfL3qn+vxW5lU7YO+n4X6++vTL3cI5mvUdW/eYJlqs wJUX/7LSPab9fkFY5n2pwBLZtduJNC9ev3pvxrSYx/cUERZ7xx+50Jsple8uhfiFsXeMb2 62rAp6xH9g5SWSG5fb4FW0loXlC8Zlgk1kr4FdBhQnf6RubODKMfU9mdroXmyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNg3lJYzmw2; Thu, 25 Jan 2024 06:53: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 40P6r7s8034547; Thu, 25 Jan 2024 06:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r7aS034544; Thu, 25 Jan 2024 06:53:07 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:07 GMT Message-Id: <202401250653.40P6r7aS034544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 416cd6de3b83 - stable/13 - netpfil: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 416cd6de3b83710421997fb29f22d77797448a8a Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=416cd6de3b83710421997fb29f22d77797448a8a commit 416cd6de3b83710421997fb29f22d77797448a8a Author: Gordon Bergling AuthorDate: 2024-01-22 20:50:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:47 +0000 netpfil: Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit cde9ec6a451d22ad65fbe602dc57135177c0a865) --- sys/netpfil/ipfilter/netinet/ip_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_pool.c b/sys/netpfil/ipfilter/netinet/ip_pool.c index 99394232fc2f..22f687d3a4fe 100644 --- a/sys/netpfil/ipfilter/netinet/ip_pool.c +++ b/sys/netpfil/ipfilter/netinet/ip_pool.c @@ -1098,7 +1098,7 @@ ipf_pool_flush(ipf_main_softc_t *softc, void *arg, iplookupflush_t *fp) /* ipo(I) - pointer to pool structure */ /* Locks: WRITE(ipf_poolrw) or WRITE(ipf_global) */ /* */ -/* Deletes the pool strucutre passed in from the list of pools and deletes */ +/* Deletes the pool structure passed in from the list of pools and deletes */ /* all of the address information stored in it, including any tree data */ /* structures also allocated. */ /* */ From nobody Thu Jan 25 06:53:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNj2HZpz57vcp; Thu, 25 Jan 2024 06:53: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 4TLBNh5xQjz4r91; Thu, 25 Jan 2024 06:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkzxjVF+3rKmA86Hm0Rpc1kyYsSuoHyO1SA6bTatDiE=; b=qRqVc7hdbEZUyAR+MMyjy3UNA+OetQwLLPHytSzOrIez9KfFQf8kuEgJoiMN91Z7S1aB2e UvENFe/0wuhfJatH6Ni2jXuIFE+mUUTw6ezZq3oO0njf4GJIRaBmZd2aUOImwaDgk6qSi+ EQcbt/oCUViJFJOXyECdo7CSN7n0APK3B6/G0MnXw6HBiHQFTEj72Dak1D1iRGMAeLUkHK ja03gsz+YMjl9w83YAHqGAX9BMNQnuHaR+Qxq6ueZO6pWwXNJDutsqZbe43sNEtBElOKOZ kM+Yb9gRhgd9DCRt+bN1xTstXE1XXHspneuR0x8a2YnG9k2NgqAJfFAV4FkTkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkzxjVF+3rKmA86Hm0Rpc1kyYsSuoHyO1SA6bTatDiE=; b=kdCxJwbIRWrSpTGLQurTSA4nFp3nah3bUM9lIxyXYoR3pQcW2kbXDIZ/riJ1bottn2Ajwb S61+dvImEkj9uRpjf1DNdcPbW+A72ZJALQSkW1zz773o+FCS/4+MuSV6uzR2H/6FMlyX2y gQdF2XaaZGmvCraGr1wn3ts45d9tNL9REOeUt2GeeomD3C493NqnTa/XPMKcSPks7M+qW+ /Hf6eiGaH3JMGdw5HamXsF9dll6ZLhHeCD9U6VdbQNly46rb2ZPjxcFhVnlG6pYTCd58Py iyEdY6AejZOwrbRr1VXOqQ5gouE6ftgVpo7Va84eIXIA+1EWt6NZY5yBAL0hiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165588; a=rsa-sha256; cv=none; b=NliUN8hCU4w10Q54LidkL6yBsBgtIK7Wu2iTKvCmtDkG8oWmKVjZDK0Ax+xfs+/R6xIkOc F51quFAlP8WJvzLLN30nm97Hl9nAUzctlckJBZR3RchqHqzLnOAhNaggeMpMXPifqIxbb8 nyCJK2h863qXCLg1vBqEukpKJBz/+iEcmrsZ5jWI0DbbVC2ISSB6+86q20Dq5vhOgTk2Fj pvVXcXrfhT52keUKoGYedmVzqVuVUhmit8oNcQnTuDFrjDZTRr9h/2Jb9jFCj2lsk6d5t6 IUgEdL6INqasnR2VbCf0QE3jY4nw/BxjPBjUlawhWROqZXQ82gnHonxm17mZWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNh52f6zmw3; Thu, 25 Jan 2024 06:53: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 40P6r8hA034598; Thu, 25 Jan 2024 06:53:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r8jx034595; Thu, 25 Jan 2024 06:53:08 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:08 GMT Message-Id: <202401250653.40P6r8jx034595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 664eac6c9151 - stable/13 - fusefs(5): Fix a typo in a SDT probe List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 664eac6c91515e2472c3d7a7cba6588b17fb8ba0 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=664eac6c91515e2472c3d7a7cba6588b17fb8ba0 commit 664eac6c91515e2472c3d7a7cba6588b17fb8ba0 Author: Gordon Bergling AuthorDate: 2024-01-20 16:24:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:59 +0000 fusefs(5): Fix a typo in a SDT probe - s/userpace/userspace/ (cherry picked from commit 6f0da017c973f40c1bc70552c922c500a0a8c858) --- sys/fs/fuse/fuse_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index ea5330feaa37..13d18127d2e6 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -998,7 +998,7 @@ fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio) * But there would be little payoff. */ SDT_PROBE2(fusefs, , internal, trace, 1, - "userpace version too low"); + "userspace version too low"); err = EPROTONOSUPPORT; goto out; } From nobody Thu Jan 25 06:53:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNk1vR6z57vZW; Thu, 25 Jan 2024 06:53: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 4TLBNj6FD6z4r4l; Thu, 25 Jan 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peMhiTpzID8C3sbqUEfmsCikK9kkq2c+gMpRleBeF60=; b=Glf3YKEc6r6/GEjZTaRcUFoFh+Qb83BLd3S/rpXkvrzMYfBZ4yCqeIX5n6O3uN5Q0oeOnH cVu8bbyA/VFgWALf5IW3000gCBDcF0RUgMsLgHjcSPHimk4xoW08BMPsdcOYnmi7HWJrEV OgFb+O1UmjjXeEIVryN6soBU1ciY956C3zv0V8jLdey6JXpmqVb3TlNHjbuf7kQGdMG6lG I66wL9Gqmum8U58K4iYol396ozJoK5cl6OTUfGn7DmOSL/+cQfcvgLkv3wN1DvjDr1yHIj PEvqZmJdLTiL2WKXNGA2CpJJDqTGOFWsHjBJ4DNlQVHVIVywmJgipIyOAppyQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peMhiTpzID8C3sbqUEfmsCikK9kkq2c+gMpRleBeF60=; b=seSusGg0cCtNH/wrTWjiPHKz3EzlPqvIlwQk4fyGF2BnxHGk7wAT6IiEDk5+xPu9d/Sx2g mVxvAbqGeevfZKcCU04V5allhLwIdPeyrvrHdWno+WqgzrVyCw/76vJfID2F7mNuzgAxe1 9HxgwUfUPJAzvlnWcuQfre0JmcBYdo7zcNV/GNce9V2Y7KLK6PahESWD8rGk37Naio1kce /RoX58cHc6NIx3TGwUSBhTriUA8rihKSY3a43/i0bZZ3j2rbMr+YRT9yz447Rh0D8PsyJv A5YtClaitAxhBoRmKHW70M/oxNqkr6BEFKhb46IVYAiiDaXuwPEhaqueThF+tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165589; a=rsa-sha256; cv=none; b=sQ2oEvYzimZRl66FLYwqcBh35A81d/v+InXcToW6vZ090E16UUriUK4pjcJ3tLmYau226A 3nmAIyVifATTXTVP8v0a3N1v6I8n+1oO7vit+mJQmIZbpwIiH/rgQnNLXz0Lbhaw6ivQ4k kZ/s4/SLVyp4WHZe2diOzkD5rW8y3ilKPAeeS5KdqE826u758BiYdX4XBsltByL+MgPW2h uHAPtuowv/7UEqjfRmGOH2fQr2EhsjaD5rkWrmEOu3rRmtksZedKbbxkQWp6p4quk9XX4x i8Hvdzp84NAAmBnyoVynySaOVG2Vujhh+MZtCz0l8mz9dLQx/QK375sG+0yYUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNj5MMKznps; Thu, 25 Jan 2024 06:53: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 40P6r9Hp034657; Thu, 25 Jan 2024 06:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r9rL034654; Thu, 25 Jan 2024 06:53:09 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:09 GMT Message-Id: <202401250653.40P6r9rL034654@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e347b72a3914 - stable/13 - netinet6: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e347b72a3914be25ff77f987511165fc1af4562c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e347b72a3914be25ff77f987511165fc1af4562c commit e347b72a3914be25ff77f987511165fc1af4562c Author: Gordon Bergling AuthorDate: 2024-01-22 20:48:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:11 +0000 netinet6: Fix two typos in source code comments - s/adddress/address/ (cherry picked from commit 496432f192165b8700da4b0ab8ebdd253002e265) --- sys/netinet6/nd6_nbr.c | 2 +- sys/netinet6/scope6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7f6ce3f80e22..70f02561cefa 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -284,7 +284,7 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len) } if (ifa == NULL) { /* - * We've got an NS packet, and we don't have that adddress + * We've got an NS packet, and we don't have that address * assigned for us. We MUST silently ignore it. * See RFC2461 7.2.3. */ diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index b3bb5c248834..f2a68019fa13 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -512,7 +512,7 @@ in6_getscopezone(const struct ifnet *ifp, int scope) } /* - * Extracts scope from adddress @dst, stores cleared address + * Extracts scope from address @dst, stores cleared address * inside @dst and zone inside @scopeid */ void From nobody Thu Jan 25 06:53:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNl1NP0z57vZZ; Thu, 25 Jan 2024 06:53: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 4TLBNl0021z4r54; Thu, 25 Jan 2024 06:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWTunj4RZa/boFVEU6ztG6JNAl/pnWrBdEcaxErOPi4=; b=eRC0+GrzDdQ02f1ehMRaMwtg5d/9pB9KdENkPdqov7iJ4KRvp1pov0rYjgtVj7PDYUxw0b 0JdSCEHwDgFd6vJnm6joZ3VEBhC+vzhwcnbaNoW+ADwE0gXxuSHL1XfEmdlHGXXV8HYNiq cw7trOUSeXIyZ52Or5IbhfEqWqLQuOj04MMtl27RnUqCGjW6sJwObN2smEnnN/ykKAewrC KMyo6dtE5s5r8Y8GVZ/rZZFLzux74kftaJoX0q1oimDubIHDcrB5ZR2v2bHxYDK1ArsjH6 NoLbfJlVQaS7AAAvNGUcPfEDazz+gVS2QLV54o9jgJVp31IFegK6v/ygYTubdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWTunj4RZa/boFVEU6ztG6JNAl/pnWrBdEcaxErOPi4=; b=mek+XtEfgcRMbLj2+XB2NG6OiAY1ly0peUIUPesds/oYq0EvY2zQF4LW+oBR4Kgx/RpNjk FlgMn4T59UKUigYQgKLV1CrKGg8XZ2FJmeuGr9FFm+0Tqno3Ayz6Ol3mLORmiZdVXS8aFY oFoxI/FyvYH+C3z8AOgpfC3BFQIQlpDLauTc63Nrp4kD6OPdIxC9VemPMliFJPUaLhDd+n 2ZWBP946DlGPTqPCktN+ft/WxFDu9fwrc6hziWIAB4oo9636O2orSd2B8H3m1i+uOQ95a/ x7P8Y59866qvdJDCGdTKIss/+irrMPQdNUyysZ9+QX5/GSl8so2TGCFtA78Iag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165591; a=rsa-sha256; cv=none; b=fnrsyWNPssbSlv46H3ATlNNpB5D3o/5iDd65Gk6FSDboCS/pRKQAM3QuyYF68gdt2WuFWh vlDeTMUXDeSS+OECDqWQQSUEJZgqhd9zrUhgFaGtcdRoVMn/YiaImQeAtJMb7isEqWwYsb NG6nsbLCpn0+q+zTVKQiNcnr3fuXj63LbaKPvXvF2i2CIblWopU1DJdSkNmrhHn9UtZarr vmWYJaBGnroz34M4h8K0ZoXIYDOZKjiA3Qz4lI4Z9IcB/Jjr4QH6M344bERtW86Q369kNz qkh4Vmbmc9IdHcJtfjTYDI/mvJ43WHEjT3kUvUEvF2q0L0EwroqS2ziVFcqejQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNk6CZczmw4; Thu, 25 Jan 2024 06:53: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 40P6rAKF034720; Thu, 25 Jan 2024 06:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6rA9f034717; Thu, 25 Jan 2024 06:53:10 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:10 GMT Message-Id: <202401250653.40P6rA9f034717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 774644887a8d - stable/13 - meta2deps.py: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 774644887a8d97c83bd9195f9d900dc90b0a7fcd Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=774644887a8d97c83bd9195f9d900dc90b0a7fcd commit 774644887a8d97c83bd9195f9d900dc90b0a7fcd Author: Gordon Bergling AuthorDate: 2024-01-22 21:00:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:26 +0000 meta2deps.py: Fix a typo in a source code comment - s/follwing/following/ (cherry picked from commit ad92f3d9d0b56ee723271152cec9174f74e17cb9) --- share/mk/meta2deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/meta2deps.py b/share/mk/meta2deps.py index 4627e08d7c11..bd71a1888e9b 100755 --- a/share/mk/meta2deps.py +++ b/share/mk/meta2deps.py @@ -184,7 +184,7 @@ class MetaFile: def __init__(self, name, conf={}): """if name is set we will parse it now. - conf can have the follwing keys: + conf can have the following keys: SRCTOPS list of tops of the src tree(s). From nobody Thu Jan 25 06:53:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNm4HHzz57vL9; Thu, 25 Jan 2024 06:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBNm1CJjz4r9s; Thu, 25 Jan 2024 06:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWq4TnZ2tH/xV2bsCFSOP9pAf+Hnh3/7ORFsDIq9Jq4=; b=iTF1asPe6ehKa7e2SnJwdeQS2UTrWdEm6dSuUyjBAdhInWDWwSjnzxJaUKvR/996obkR24 RhSWqNXDNWFVoUccdU0XeWQiHC30MEZpxqIk3IfGOsT8hoE2F1nalutvU+bc+K7C61yw9G ynZjBUm5RoVMfY7fhu1MkQVzNrelu3pXy1aLVe8GbZgC5FwMcye7KJvE7444vpjefVTQ4N a5RkPBkGva6Wxo5FuypTjTALic7TFbnZa+4cSuMAwY3plt02LAnKaaB/u4pwK3rMjIWgSr Pho5iipeBmD+jumHDTMUH9CyIUE5C+PDrEBM+tFBkmfHWHcvUUFlvFQtR+FWeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWq4TnZ2tH/xV2bsCFSOP9pAf+Hnh3/7ORFsDIq9Jq4=; b=xdWg5mwd69VbqAEw/fCVS572RVQLUeZ4jfdx1HvNqbOsbIRQ+Eu9TKAtretyzXTg20e06d ZkJ2STvmKXPBiWGnFtPKEa4nR7OZJDMbPjpwlAbhaNhk6+1ds+wuhFTKvt5uLdIaqPArvU eGREdhCpMVpzUnGjSmFqNH3WRoBzFiI7lkjQLAb9lvMMfvsD2NOJUb1h/NH6ihJhLb+vGU pGdMYM+ed+p/gDsv5ca7w1Qc3D81x0+VR2MdDCNWkLjd7+VxYMJXznoT6FRXmdkZO6Ss8M /n16Y4IyRKBjYdebwfvey5hft8jH0f00NJmIZknc5aCKR1UAb002ydlDgFY7Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165592; a=rsa-sha256; cv=none; b=icQV3YrdMeot8IQiAcLeVLMSlwZHnaWxboPHIVG8E/xHIe8bkH/wveWKcLvmzRXG0ADQYF WIWoyT+hNP43QAL7G/dFIwYUjfYl0SjhEybeIyn183yzprT31iu0wjQbKWleWklMbGkvxi gbSlCQjipknjg8EUbOQa/a5TZ45kRyl6t+DlmrQY11EWl8Rh+h+u29i0Xc8Q8q4AwlTyRz GXLEOUgo2DaLiIe+9x0S8aHfoXuzk4Af4SbT+z7GkopUM5pQVVA/JF+hA4XkiRoHUPyWdC 96+YOka9r/fq7DryskrSfoDjG598lSNRTUpz+0SytDGYhpP6AMGo/eP2spICdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNm0KLlzp16; Thu, 25 Jan 2024 06:53: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 40P6rBBE034774; Thu, 25 Jan 2024 06:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6rBew034771; Thu, 25 Jan 2024 06:53:11 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:11 GMT Message-Id: <202401250653.40P6rBew034771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 94e75f5e29b6 - stable/13 - if_llatbl: Fix a typo in a KASSERT message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 94e75f5e29b645e351cec7ec287aef5b48762fd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=94e75f5e29b645e351cec7ec287aef5b48762fd9 commit 94e75f5e29b645e351cec7ec287aef5b48762fd9 Author: Gordon Bergling AuthorDate: 2024-01-20 20:00:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:38 +0000 if_llatbl: Fix a typo in a KASSERT message - s/entires/entries/ (cherry picked from commit b4c94968d1bd1ffdd43976b0315e2b6c2b620ee2) --- sys/net/if_llatbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index ffd5cb7a9899..0c5690db74ef 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -705,7 +705,7 @@ lltable_free(struct lltable *llt) llentry_free(lle); } - KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entires not 0: %d", + KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entries not 0: %d", __func__, llt, llt->llt_ifp->if_xname, llt->llt_entries)); llt->llt_free_tbl(llt); From nobody Thu Jan 25 06:53:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNn5j3cz57vcr; Thu, 25 Jan 2024 06:53: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 4TLBNn27Whz4rB8; Thu, 25 Jan 2024 06:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3puXJmflO3wCkPquA4dYfI+lXORhi5wuot6NEV00IgI=; b=MWlOKpjO1YVafJFPm/70F4ubW3y7t2y9/wFpBmiyb1DAPhGYHfcoL9aoCfrifqDGVhfd3j toHqYoWdbFv3+CiVO9l1vPb53XdxwVrUdXMTFkD9Ul8VHP/BZssxHGJzwkBRLDe1tZji7G Aq4nP5igu52W7x9vovY6d5FrXEkoa7tHStAxCUBrBj49DLsFNb+okPBQUeo8AmPApXkTAW MTev2jp6Wa2kjEU9c9HA81/SgeeqtPrBuEyzoAGr0CwsvxI0HGZysliZxvK2t9W5RFlVc9 6wSTz60Zo9ZT4CpCjmleCFilZECZySfUoq2i9taNv33Zd/kE7yu7kYu2qyEipw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3puXJmflO3wCkPquA4dYfI+lXORhi5wuot6NEV00IgI=; b=l/AGcJ8AO5oALhfm9SY7wmxB0ztXRAgRlWRM0T5agQeu55HdfsX/URInCvpIc1XhdOkXdO pfbwTnvbPw4dhLmD8LRB3jVguuhLBKdTgjhMloZqKv0Po0TCDRCXh0n7fHJbgkxKxEmRne j0mdpkjzgo23a3jQGcP9mycK6zVgb5uUhghMm1c0J3iLyg9ETmXV4dQugH8chrXQN071aK VnvlvX/E3esa4RcrevTedxTQcN6zi2ODtp4UpwgQCRHp8gp/rYyoZ7sBiL6VkM/w8B3QO7 Ohv5jl+bp/rPxB8bOlMgHVoRa0yWixlv3sosjGbLu2Sjp9eN4jdIOdvyS6NdFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165593; a=rsa-sha256; cv=none; b=jYyTedfdQqne4fCRxjjJfwVi1Tu/i7aMAY7aLmiU5RHxNUhY5d4r9dCmoEwIwfZo7a5eqA l3c18m6MKCJV0wqLZlhBLz20aKjIwla3czirdJS853rkYm13C2p51QRwCMYxk6WzuVQvG6 PcHc7TyGiQtHJEkPtbfjxYAQEJcmynMDeQKkqFRDdbqTXmCTRPyWubKqIRMG3S1JaxTo4P wX5N7fS3rCqInpa1r48yShLIl1TMegfCnD9JZYeeRLu4K5AUbwM/rGpCzNJm8SJ4yg+sAM Z6yMjxdjF6MhZPIXJm3yG090ezOwbp65VmeNOZpNcJWHPB3dr+BGTZuxnke5aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNn1FLtznQ1; Thu, 25 Jan 2024 06:53: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 40P6rDs5034945; Thu, 25 Jan 2024 06:53:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6rDBM034942; Thu, 25 Jan 2024 06:53:13 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:13 GMT Message-Id: <202401250653.40P6rDBM034942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6a7eaf04f166 - stable/13 - net80211: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a7eaf04f166b141b27da70d18a737bac48fbcd4 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6a7eaf04f166b141b27da70d18a737bac48fbcd4 commit 6a7eaf04f166b141b27da70d18a737bac48fbcd4 Author: Gordon Bergling AuthorDate: 2024-01-22 20:54:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:46 +0000 net80211: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit c1ada39783109c496fde853cc2fe32f31a8f7516) --- sys/net80211/ieee80211_hwmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c index e743b7dfb6f4..1dea4ec30106 100644 --- a/sys/net80211/ieee80211_hwmp.c +++ b/sys/net80211/ieee80211_hwmp.c @@ -1398,7 +1398,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni, /* * Check if we received a PREP w/ AE and store target external address. - * We may store target external address if recevied PREP w/ AE + * We may store target external address if received PREP w/ AE * and we are not final destination */ if (prep->prep_flags & IEEE80211_MESHPREP_FLAGS_AE) { From nobody Thu Jan 25 15:02:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLPFN73fpz57QV9; Thu, 25 Jan 2024 15:02: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 4TLPFN5VkMz4pWG; Thu, 25 Jan 2024 15:02:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vcueVoo2+b6uQWchw6zWRhca2o9hE19y0Amdy7st0k=; b=rhcLlgcOBIZmZe+v72vSJiJYjXusj3SnUvNk5RISwDXtOCyMGN38VMP/kfYeHUzmgFP3zg lzoyxby/P3+qox70w3HlneckkxLZ+abAGivj1k6mCPjUVCwXu6p0ZYKApgs7pXtv21ZBrC 06bGBY6H+ltb53xCVIqShKHqAG/FyC/57mZOgaXEh6Q8wJd7g+vF44hntMEIRnmwNMhpzB Rd/s/QvRq8jju173vrdY7wfR/EkzQ0A+TfsdVwdCJ6ib8SOaNfuaaZeblIsCwneB2KZWnL lfg19XRZ6BcRlhZNGoRbIWQxAJzyrjy3/Ze9dyVjg1F9IeSh3ScGNEoesABNUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vcueVoo2+b6uQWchw6zWRhca2o9hE19y0Amdy7st0k=; b=S87tUevQHt4/8XuadRiH9Q9wabeCNn32jZMwARNTCHJioOOGV4MT2NMuHJT7ZVQ/WN/4fP BD/hY2wZYD8G/Rdj0h9gOkM0zWCCaCd+METelZCZ2hEpK/qS1uqZSwkOd1iJo9sQtESUTF pQO06Y1IXhv7ttkzj+PBczZK3fp4zb9AB7qtSW80fPX+h3pSZo7g/t/pZz1kGtwOpVWdSO G6fEpxus/X7WzKPB8xBU/b0ikH1+a39phoEzr4KlaKoYMxXeo2U+U2XNMertz0ilVDhw5T z8bXjR/Epl0mKoCmzE2l9TEaHDSMSXhWliQ/JQwtvxAaOGegdvyP6LVbqlxeIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706194952; a=rsa-sha256; cv=none; b=d13AuNw6UjXe/9i2dZCHLaqvIBJvj2rZnInA6HWiAyZuyT/nfInEqhOgd+Qupk0Hi6WbgR 4nU+bry6y9sDCz/0TConam7e7HIblA8sAyRvZXuCEEZK6X3CuZgpZYRWM/WBjmxipPKAYY fqG0C6VW7RS/YhkOzN4aMMEstJQ86yLrZj2UsONq/IKHgscxKoi2Y/KgxAueyEXK8n1rOt dYCEAEBoGOq75XTEYYwMuEpPcGMxAGE1t/NQSJruTnyNAciZ0hPAy/4ii6aZjDICdaT3tC kWGUJabgaKldjv7zuvlJy+9FG3LoiHkFubkf/A0bQjNYczkm3icbYku3rYEqBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLPFN4bTFz12MR; Thu, 25 Jan 2024 15:02: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 40PF2Wg7057066; Thu, 25 Jan 2024 15:02:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PF2WiU057063; Thu, 25 Jan 2024 15:02:32 GMT (envelope-from git) Date: Thu, 25 Jan 2024 15:02:32 GMT Message-Id: <202401251502.40PF2WiU057063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f1186fab56e8 - stable/14 - bhyve: return ENOMEM instead of EFAULT and call free() after being used List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f1186fab56e86b963a127bcdacbd1e8e1f03acf2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f1186fab56e86b963a127bcdacbd1e8e1f03acf2 commit f1186fab56e86b963a127bcdacbd1e8e1f03acf2 Author: rilysh AuthorDate: 2024-01-08 06:06:55 +0000 Commit: Mark Johnston CommitDate: 2024-01-25 14:57:05 +0000 bhyve: return ENOMEM instead of EFAULT and call free() after being used 1. In basl_load() function, when allocation fails, it returns an EFAULT instead of ENOMEM. An EFAULT can mislead in some scenarios, whereas an ENOMEM for an allocation function makes much more sense. 2. Call free() on addr, as it's not being used anymore after the basl_table_append_bytes() function. Signed-off-by: rilysh MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1016 (cherry picked from commit e2e956828caf2f1db308d54b264c277c0abc25df) --- usr.sbin/bhyve/acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 050e1a0ab75f..db253aeb523d 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -327,7 +327,7 @@ basl_load(struct vmctx *ctx, int fd) addr = calloc(1, sb.st_size); if (addr == NULL) - return (EFAULT); + return (ENOMEM); if (read(fd, addr, sb.st_size) < 0) return (errno); @@ -339,6 +339,7 @@ basl_load(struct vmctx *ctx, int fd) BASL_EXEC(basl_table_create(&table, ctx, name, BASL_TABLE_ALIGNMENT)); BASL_EXEC(basl_table_append_bytes(table, addr, sb.st_size)); + free(addr); return (0); } From nobody Thu Jan 25 15:02:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLPFP6xWmz57QXD; Thu, 25 Jan 2024 15:02: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 4TLPFP6R4pz4phB; Thu, 25 Jan 2024 15:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pin40ANgThdeyF5+ZkgJwIHRnC/TE9MN79049Ue+S+8=; b=S/oBOGypQpOhvU+BioU8ZPgI/CN1lvhMzZJFJLCJBCwHqJqndKpxLOzxiE1K5eb4/Jt/I+ hYc7q8H4p/6Nde1iRHWJZ/oJ2bk1re49JaPVeral1LMRy/P/qFed1KG+mFgX8U15fxryOe VoL/sEyMtaF+NFwj+T3htpN4iBd0wUHbzT4ewt9o1QTASMhtmGGty8sTv5G8GzH1IgJhRI r1x18Cxu6bN3oT9WV5tnHfToHvwZJJMngVYpAWHfgHprIpB9vvYa8/Ug0zhwxhJzbgyuG7 uH+ViOUa51NCdMAUkJRDcUirWBi3q9NkhEvd6dY/gxjavkuTyV1f6lnTnZANiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pin40ANgThdeyF5+ZkgJwIHRnC/TE9MN79049Ue+S+8=; b=YsEbnRJvnniwEtbXPOMFFjKgX86GF6ztwl70kFZ/YQsweMrrEDMBNlaLDZ+Bf4bSMVetdU Ll7VxpJFDr448vYnRaU1ldjRtauJ56vNz6SVo+yZVHw5JIKKDheaAQT5c0b6WdHK1saJqb bYx2MOr+umTypda9hcbgm+/pKDG7Up/hgLMaiXXlu7am3r74MVOqoG4+0h0hI+hh+vt8LE 1aC90GuwECjWwcOa/+RUZIrPKmqh2jdNMldPBVT6sAOPf6tD/afHa9rUrSpp+K5K5Djckj KIMsraY4AXfInHkPbR91B0gytJIW0hzbJaaj9oqkeU41g/8o1FYhfTiO2cHdIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706194953; a=rsa-sha256; cv=none; b=VTXY4Mx5fleTkataMHLakmkbJg25EQ4gZCZEzBKF/mnaDl/lTFVnS9lmSWrCRpi0YGJnDj WDSYkcqvYskK317mAz8khzz5viLK2oGFD6BEwaGhMdUK2D8WtvYBsnQ4IN45qWEnWEVgtH 3O0YGKNR7Obh9JvND07LmS8WOR1si4WOmaJxefENfcUB1d8bfArKivdqNRbmUck6xzaJl3 Eu03QDNlMjD+GXHplzlL31aq95yfxRzSxIyqX8oKQlofJNGMETqVqtH5hvzy/OB6jTDlTk tV4pSAPbv6nTDrt2+InmJbWhDpEHoMruJUJN1vzdflA8ZdJr+M3a4O4IE8O46Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLPFP5RZzz12n9; Thu, 25 Jan 2024 15:02: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 40PF2XNi057129; Thu, 25 Jan 2024 15:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PF2X9u057126; Thu, 25 Jan 2024 15:02:33 GMT (envelope-from git) Date: Thu, 25 Jan 2024 15:02:33 GMT Message-Id: <202401251502.40PF2X9u057126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1c090bf880bf - stable/14 - top: Avoid printing a blank line when the ZFS ARC is empty List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1c090bf880bf8879f75e4cd4b93c9a277faef2fa Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1c090bf880bf8879f75e4cd4b93c9a277faef2fa commit 1c090bf880bf8879f75e4cd4b93c9a277faef2fa Author: Mark Johnston AuthorDate: 2024-01-11 14:58:31 +0000 Commit: Mark Johnston CommitDate: 2024-01-25 14:57:12 +0000 top: Avoid printing a blank line when the ZFS ARC is empty PR: 275994 MFC after: 2 weeks (cherry picked from commit 1f62718d8ba26d813d8c2e826ac5f4caee4c6730) --- usr.bin/top/machine.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index b4cd29dab878..a76d77a80ce4 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -293,17 +293,27 @@ machine_init(struct statics *statics) size = sizeof(carc_en); if (arc_enabled && sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size, - NULL, 0) == 0 && carc_en == 1) - carc_enabled = 1; + NULL, 0) == 0 && carc_en == 1) { + uint64_t uncomp_sz; + + /* + * Don't report compression stats if no data is in the ARC. + * Otherwise, we end up printing a blank line. + */ + size = sizeof(uncomp_sz); + if (sysctlbyname("kstat.zfs.misc.arcstats.uncompressed_size", + &uncomp_sz, &size, NULL, 0) == 0 && uncomp_sz != 0) + carc_enabled = 1; + } kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open"); if (kd == NULL) return (-1); size = sizeof(nswapdev); - if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, - 0) == 0 && nswapdev != 0) - has_swap = 1; + if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, 0) == 0 && + nswapdev != 0) + has_swap = 1; GETSYSCTL("kern.ccpu", ccpu); From nobody Thu Jan 25 15:03:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLPG03SDwz57QXG; Thu, 25 Jan 2024 15:03: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 4TLPG0326Vz4q88; Thu, 25 Jan 2024 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=1706194984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rgn4prWIxne8r9YDS8XnF/chn+3R8Qzt5r2O18GWIlY=; b=xU0CouqKtAdqL/xGW8KLNk6R0ncPcO1z99fRM4MLEse/250J2cD2I0xpC8YC7/6AMZpm3g 6L0FdU2TzFf4dSQx7r+j3bnUAtxVmkKeFI/KksIv7/1XAdiLnSSKym+SrqRWg3xJXDg1F/ b/0nbOh1VSvAmwLHKEiLllOTpR9J+kTQ5P0B/n4O7wSX30661DnnYngzUZAIn/WH/zV/Qy Td/BUeJHC0JyaS+gu47vRBEUJFmtIW+raBiVtU6w1D6zxdLHHW1CSZvnqhpEX58EPV9DV8 7PMUR1bt6caw3MRioOqnLu9BJJx6n9mdxSaA37yL5R5Wwy/jAqb5TeuO44nm3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rgn4prWIxne8r9YDS8XnF/chn+3R8Qzt5r2O18GWIlY=; b=CA/oOCsAoKfAJV/XUXnnUf/B8Tt+hZC8OZKO+8ZURStyLwmZfiIAZ9k2WjYfaj7+XSEiaq 410d3dLowXxvywy9uDT675CyKrDSmnwbYHyouYw9AGXTT9M5ck4lP7cDndZPD2nkPPcVgQ OSv0EB2fUEAT6DqyyGtIlPQ5l7dox/N1C4OJ/gFdfZbG4tzOkjJEPoNJCnocR+WMSI6gLi Mb/tM3ueaMDry3jTjIFsNdUX86GoNzIuScgJGIgIK/dyLQ1EsY0J1IAXMU3/LIyQuWTW40 Aq0d2p6qOoJsmEqEeT5z5FVJeQCLNQ0QBfdBtvT7Ii0574Zawoyh323wYgD/oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706194984; a=rsa-sha256; cv=none; b=k2annLd217tsvmQ8tDQ1Gt3isT8m/mm1DNPKe/LkUFZb9gLfuopnmlbf0EP5n0wZFv7FPT G7Y3NmBozMR2FD3Jzci4+b9hjHqony7D/0q1HGxIWXRypbQJ1Jr3p+zl4U/gCJX84HIH45 Drx4bFHgjH+I+L8Qe0k8kNvPwoEtvIHdRtc0FeUokChSykxGQ6v0I8uMZDmxZmDAX2IV9Y 3ZXnQCmsUPmO8lR+WmED4Yg9SGyB+KxeuvbQVuNOZxQKn75nEdJsc2QXaOMQ5z3lZwJYhd 8/witgUzpKiPq0jtr9sQi+feVqEJNMnIG8LCpzLMbhGCNpLI62f9u970xylCsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLPG0264Hz12yZ; Thu, 25 Jan 2024 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 40PF34iu057365; Thu, 25 Jan 2024 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 40PF34ck057362; Thu, 25 Jan 2024 15:03:04 GMT (envelope-from git) Date: Thu, 25 Jan 2024 15:03:04 GMT Message-Id: <202401251503.40PF34ck057362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f4524aff6d66 - stable/13 - top: Avoid printing a blank line when the ZFS ARC is empty List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f4524aff6d66edbfb7b3f184118b0a4299c4b1af Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f4524aff6d66edbfb7b3f184118b0a4299c4b1af commit f4524aff6d66edbfb7b3f184118b0a4299c4b1af Author: Mark Johnston AuthorDate: 2024-01-11 14:58:31 +0000 Commit: Mark Johnston CommitDate: 2024-01-25 14:58:44 +0000 top: Avoid printing a blank line when the ZFS ARC is empty PR: 275994 MFC after: 2 weeks (cherry picked from commit 1f62718d8ba26d813d8c2e826ac5f4caee4c6730) --- usr.bin/top/machine.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index b4cd29dab878..a76d77a80ce4 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -293,17 +293,27 @@ machine_init(struct statics *statics) size = sizeof(carc_en); if (arc_enabled && sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size, - NULL, 0) == 0 && carc_en == 1) - carc_enabled = 1; + NULL, 0) == 0 && carc_en == 1) { + uint64_t uncomp_sz; + + /* + * Don't report compression stats if no data is in the ARC. + * Otherwise, we end up printing a blank line. + */ + size = sizeof(uncomp_sz); + if (sysctlbyname("kstat.zfs.misc.arcstats.uncompressed_size", + &uncomp_sz, &size, NULL, 0) == 0 && uncomp_sz != 0) + carc_enabled = 1; + } kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open"); if (kd == NULL) return (-1); size = sizeof(nswapdev); - if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, - 0) == 0 && nswapdev != 0) - has_swap = 1; + if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, 0) == 0 && + nswapdev != 0) + has_swap = 1; GETSYSCTL("kern.ccpu", ccpu); From nobody Fri Jan 26 21:02:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bj0l2fz58qgx; Fri, 26 Jan 2024 21:02: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 4TM9Bj0H6Mz4Lv1; Fri, 26 Jan 2024 21:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2WUUB72SXqsYYJlyF/eo6zYFkD3XgrJHAP2SnWXEmI=; b=HDLXugR8koe/eaY53qbt1POVf0dwF4E7ijcrGmek6wJP7XM0yOqfXkEEhSa4aTXzQYQNvv 4dP8sSE97hC5w+HCBE6izYVVtEje1belI6Lja4Ex/MXsbxks04FQSxJYH+wYm1WBweMjeE TWh/2O/svyb+3sGSCTLIovZ1GZEY3p9pj14ZX2Wi5L3gX+DIh1V5hNdbE77hLIzYvL5McC MHCrr/4TNtzWU7YwqKQDNUspm1O9ayPKMtVGt6mLruOqsrKUj3DGjsY/ZiOfuNdzyrgbYw 9dW0rIcabSys+mzvRXVZ4Bt+T52QcNMM4zVdSI06BQa22xnpNDS0lrfd6NXNAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2WUUB72SXqsYYJlyF/eo6zYFkD3XgrJHAP2SnWXEmI=; b=ouXazKHTmPTxZDfIjL3p2bmOHOzglwIEx1AM/IditTnXuaRPMXaubrhwjVcv2OjhFg0Ffr a7wbfgCJ1tzXvEW2/q1QP3ZPLXEIpDClvKOzjZMHZS3xDyKE+ovOeR+O4a+SEE4skfIKIu WvvqDUpMetk5fJAj5lCWpj/hJenHSAkG1qeibGAhdtWvKJjefYImEEf0yfeCOVHuyS/pCW ZB72ec2FjLaZI6A0+0h2LCw6AtC2VbLDQ6lo4sawyoYUAJJKjfJXLyL3f3ZEBeO4X4fsCC 7XvyCkcMXfCsBSO4QocvzB4EuuU8PzHjkrJn4ydrey0PUezQW/I+zXHREHuBLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302973; a=rsa-sha256; cv=none; b=wv207Tm0dFNucQ/EaSv0S2lIzdr0RKorgL9+xqQX2M2rjf+boP6nZ8KIW0kfY19vcQtXx0 F9ETyaJWCqJCB7CLXaYs+sSMbv5vQJ+ZvooMmwtOTl55n68QyJRtmMUKx6D3lRny7ZaT8e IYgAcah+LVa908QPcNb0ArDBYhAwXlhes/YmfbJd01kWxrzfLY0OhLhJuC6i94/OXr8Bh9 5H9WdtB+hFA3rsXvdf68l656tsFfjM1dX9aGxsRz1KcBQlZdYCqzTFGLO/gTUamcQeJ16A qo9U1gUKUKMeUUuk6KgVBRUx7Q5gDUQcSyE6uYPG4Gs8++W3nENED5EFC6tm+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 4TM9Bh6SDDzwVZ; Fri, 26 Jan 2024 21:02: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 40QL2q9R083750; Fri, 26 Jan 2024 21:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2qmb083747; Fri, 26 Jan 2024 21:02:52 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:52 GMT Message-Id: <202401262102.40QL2qmb083747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: a431d0f4a2ac - stable/14 - libthr: thr_attr.c: More style and clarity fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a431d0f4a2acb70a79a84d5dd73d9593fd7481db Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a431d0f4a2acb70a79a84d5dd73d9593fd7481db commit a431d0f4a2acb70a79a84d5dd73d9593fd7481db Author: Olivier Certner AuthorDate: 2024-01-04 15:10:40 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 20:58:22 +0000 libthr: thr_attr.c: More style and clarity fixes The change of argument for sizeof() (from a type to an object) is to be consistent with the change done for the malloc() code just above in the preceding commit touching this file. Consider bit flags as integers and test whether they are set with an explicit comparison with 0. Use an explicit flag value (PTHREAD_SCOPE_SYSTEM) in place of a variable that has this value at point of substitution. All other changes are straightforward. Suggested by: kib Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43327 (cherry picked from commit 4d312aa051414ad77d3515f258230d01ad11d6dc) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 0ccc31b22c13..bbb143da1a7d 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -117,8 +117,7 @@ _thr_attr_destroy(pthread_attr_t *attr) if (attr == NULL || *attr == NULL) return (EINVAL); - if ((*attr)->cpuset != NULL) - free((*attr)->cpuset); + free((*attr)->cpuset); free(*attr); *attr = NULL; return (0); @@ -151,7 +150,7 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (error); attr = pthread->attr; - if (pthread->flags & THR_FLAGS_DETACHED) + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) attr.flags |= PTHREAD_DETACHED; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), @@ -180,7 +179,7 @@ _thr_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate) if (attr == NULL || *attr == NULL || detachstate == NULL) return (EINVAL); - if ((*attr)->flags & PTHREAD_DETACHED) + if (((*attr)->flags & PTHREAD_DETACHED) != 0) *detachstate = PTHREAD_CREATE_DETACHED; else *detachstate = PTHREAD_CREATE_JOINABLE; @@ -258,7 +257,7 @@ _thr_attr_getscope(const pthread_attr_t * __restrict attr, if (attr == NULL || *attr == NULL || contentionscope == NULL) return (EINVAL); - *contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ? + *contentionscope = ((*attr)->flags & PTHREAD_SCOPE_SYSTEM) != 0 ? PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS; return (0); } @@ -321,7 +320,7 @@ _thr_attr_init(pthread_attr_t *attr) if ((pattr = malloc(sizeof(*pattr))) == NULL) return (ENOMEM); - memcpy(pattr, &_pthread_attr_default, sizeof(struct pthread_attr)); + memcpy(pattr, &_pthread_attr_default, sizeof(*pattr)); *attr = pattr; return (0); } @@ -449,7 +448,7 @@ _thr_attr_setscope(pthread_attr_t *attr, int contentionscope) return (EINVAL); if (contentionscope == PTHREAD_SCOPE_SYSTEM) - (*attr)->flags |= contentionscope; + (*attr)->flags |= PTHREAD_SCOPE_SYSTEM; else (*attr)->flags &= ~PTHREAD_SCOPE_SYSTEM; return (0); @@ -546,6 +545,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, if (cpusetsize > kern_size) { /* Kernel checks invalid bits, we check it here too. */ size_t i; + for (i = kern_size; i < cpusetsize; ++i) if (((const char *)cpusetp)[i] != 0) return (EINVAL); From nobody Fri Jan 26 21:02:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bk1pGHz58qjv; Fri, 26 Jan 2024 21:02: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 4TM9Bk1Gs9z4M1m; Fri, 26 Jan 2024 21:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNwM74lN+cYhBizjQdHYMWAZIZuX12p17DeFQD/BaK4=; b=Nfp7FZqWQ09eOgMZ17jsf9YIRFOHRKxBCW+0yBsjBQ4H6jHwnJpfiCDTRQ1QUiDSr5J21H j5x+0e4k1vT80TFoqTBw1gtYQX8PFYQi7Y7QFy/InClrKJc/gKV6fxjEF7evCMI8XCfWqH BrUYWueGxiFKYpXyi+iUXbFo2U3l5mcQEEz9Y9WkMzYsBNEv6k2GB+tscrNHrPVJ3rDM5G TOys9QM3ux3rE9SWfT6VkI0kwHjqo/hted4/CAwrGbHDZFOWofu3Enf51UhRWfxP3oxr2P znWJWatqWHUNyRunmFf5q0z6tedNfXjeZvM6MyLiZTXQdnK+BNp9ynl4vFfYzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNwM74lN+cYhBizjQdHYMWAZIZuX12p17DeFQD/BaK4=; b=FcBJ1arXarSMfGYmJmMmbBhGT2+M6QlNVpV3jY68BSQpLN0uQtt+FYEH5iuBHkUef3uO+M JqCPqSwwwijH/NMk4M8tjgskG+q//vJLXG4L5nx6r8rFLD/o/6s+CKL8sxlfs+6BlzhNm9 8M8bWu+5RtJONP6om3qmFlxK3S0A+2hA/sdawkBlVBmbylnzIdfHHpQI5txblx08aLvCYH JxSbsjO28t9HzuJrt2XzGDSC3iNvsFvc4FJo5ZwaXQuSV9wUebvgsLj86vINOhY5mxmW8k Ku1QwK4kM2ieULW5F6jobjzp526hVUmRvk+xHS33PHSvGDyK+ttJ4mXBIbDOwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302974; a=rsa-sha256; cv=none; b=uhIKQpzxEOYSqJszIqTv5CT8x7uSvmRd8Ci3LDBb+LbxNjiqyEBxk8a/nSjM8/LxFsNUXj DCUZR6r3sUA7AqkjqzQdnjiXULJENHa4+hLjRxCxVf5LTXQPldsn2IxNxtACKLyQDO7LOL A5uXD5PysWeMz0DMkgT5H9dUuiPbeKFqofto5qn3mDE7mODSiDTgoakQrTE88a87wTJ//w SQhYNU6ALhUYp4lspwF22NpjRaymZJ4EqReSArmkUHxM5nU4d7/IFqe5m/PAAPUydDdNyJ V19AZCJG2QPn7rbdMVmhR3rZHNDitLKKimluYntEGziPbJCNtMgU6fy4gVZb3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Bk0LTjzxJQ; Fri, 26 Jan 2024 21:02: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 40QL2rsf083802; Fri, 26 Jan 2024 21:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2rhc083799; Fri, 26 Jan 2024 21:02:53 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:53 GMT Message-Id: <202401262102.40QL2rhc083799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 194df67ef569 - stable/14 - libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 194df67ef5691d25ed3cd4be5750eb181867cc7d Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=194df67ef5691d25ed3cd4be5750eb181867cc7d commit 194df67ef5691d25ed3cd4be5750eb181867cc7d Author: Olivier Certner AuthorDate: 2024-01-04 15:20:50 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 20:59:11 +0000 libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() Using calloc() instead of malloc() is useless here since the allocated memory is to be wholly crushed by the memcpy() call that follows. Suggested by: kib Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43328 (cherry picked from commit 15bb0300eeca233827a6a13cd2ed883e0034979d) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index bbb143da1a7d..561037fa5eb4 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -551,7 +551,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, return (EINVAL); } if (attr->cpuset == NULL) { - attr->cpuset = calloc(1, kern_size); + attr->cpuset = malloc(kern_size); if (attr->cpuset == NULL) return (errno); attr->cpusetsize = kern_size; From nobody Fri Jan 26 21:02:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bl46Xwz58qmT; Fri, 26 Jan 2024 21:02: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 4TM9Bl1tYmz4Lv5; Fri, 26 Jan 2024 21:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q0IEgbc48o7rDaI9lXOX7tvEZ5J97obWIkmP9kxaM0E=; b=MrfaiHiqh0sJLvd5p54k4dv7Uoze0Xcr8ErkEJaBCBpbQeHQnAjJrOt7OCmyONNdbxqx6w Vg9c5J1aboX+xe8M7VOEXe1wLJPzSNPGCoSvWMHSZ1lh6RZkirHaZQy1pVYLW8YbCfXrCH 527eU4qLqoqVJgEqFPDd+hOkiyvdgcb0LmV7QnzR4lpiCMhgt1G0o9/4rNpB6AQe/ASkSv o+89L9faSefDF/RylBh3S5Z/kys8eSdHaeOdvlqQ3+AxBS7jsLVTzp0xcJSE0dopyFe+Hm 6oUKKni9Z5XcAk2FcZ8Q8ArQ/GQBWlpWdZTos82iSat70kOmJJrKab41c39E8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q0IEgbc48o7rDaI9lXOX7tvEZ5J97obWIkmP9kxaM0E=; b=KZdFvz+136t3rGpJ2jYCe9QOKanrbcJzWMJVnduLOmE7Q2wRUsOi/xWUVP4Ja8/0PyY6zq BC8b+S7MN6L7UT2MbioHSgvU7jPBk9EQCS//Nj8V8Pk+FxAPIrWgbsc4g97xNyBnElvdle 4A3xWjOpxRwji71hY5+7Iv7cJr1PwL8VwgCmjS4pHA28fbSjPYVi3TdrhCnD1YYY+upYEa Ie09jVsS5g/nGmHUruaVTmssy1icNEHYmT+AQIFNtLQY/VOv4du5xTQ8LPz1nEPKF0hDmY LPKG+fBd/Pft460nmZxgrAxI3bvXUsa4deI1cofhZOKAHXdpUGCpIZC5ehdS+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302975; a=rsa-sha256; cv=none; b=SOUP8b4yqnzUBx7owFgkPZ0OOY5q7r/LTVj5vEilFqsgu7NgGwe9AN+BbkUDREG/TGPvE7 MPBuRIPH8bDfJjMyaSlCOtPIellbDnedgT9MjXxDmkdCzomRBSBrDg/p3talPKdvgweRPT Ag1cQo51vUMk92hmXuQhBH9CQz1mgtVKuetBp/BLs369GjHTh1BE/0DRtiUkoT9lc5m1YO zL4XoJjOAkQgAxZXCX3uMOSk2FuZ8c0mE9oeERzq2jLz1wQq7fnvAwcHQ+ip+LO9vaggzI n7kOffx1MFlLDr/yxhmx0FeBhV/48J91GHNxtvihgAJbbhuj6ROssBakF9jawQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Bl0zGNzx2T; Fri, 26 Jan 2024 21:02: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 40QL2tNe083858; Fri, 26 Jan 2024 21:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2tJ3083855; Fri, 26 Jan 2024 21:02:55 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:55 GMT Message-Id: <202401262102.40QL2tJ3083855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f68a255ff325 - stable/14 - pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f68a255ff325258a97edfe317ed8272d59e58104 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f68a255ff325258a97edfe317ed8272d59e58104 commit f68a255ff325258a97edfe317ed8272d59e58104 Author: Olivier Certner AuthorDate: 2024-01-04 17:45:52 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:01:30 +0000 pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error Similarly as in the previous commit, using calloc() instead of malloc() is useless here in the regular case since the subsequent call to cpuset_getaffinify() is going to completely fill the allocated memory. However, there is an additional complication. This function tries to allocate memory to hold the cpuset if it previously wasn't, and does so before the thread lock is acquired, which can fail on a bad thread ID. In this case, it is necessary to deallocate the memory allocated in this function so that the attributes object appears unmodified to the caller when an error is returned. Without this, a subsequent call to pthread_attr_getaffinity_np() would expose uninitialized memory (not a security problem per se, since it comes from the same process) instead of returning a full mask as it would before the failing call to pthread_attr_get_np(). So the caller would be able to notice a change in the state of the attributes object even if pthread_attr_get_np() reported failure, which would be quite surprising. A similar problem that could occur on failure of cpuset_setaffinity() has been fixed. Finally, we shall always report memory allocation failure. This already goes for pthread_attr_init(), so, if for nothing else, just be consistent. Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43329 (cherry picked from commit aadb4a1b3fd185d547087f6eafca6ce0b4df3291) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 45 ++++++++++++++++++++++++----------------- lib/libthr/thread/thr_private.h | 2 -- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 561037fa5eb4..3c03225c33cb 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -129,8 +129,9 @@ __weak_reference(_thr_attr_get_np, _pthread_attr_get_np); int _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) { - struct pthread_attr attr, *dst; + struct pthread_attr *dst; struct pthread *curthread; + cpuset_t *cpuset; size_t kern_size; int error; @@ -138,35 +139,43 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (EINVAL); kern_size = _get_kern_cpuset_size(); - if (dst->cpuset == NULL) { - dst->cpuset = calloc(1, kern_size); - dst->cpusetsize = kern_size; - } + if ((cpuset = malloc(kern_size)) == NULL) + return (ENOMEM); + } else + cpuset = dst->cpuset; curthread = _get_curthread(); /* Arg 0 is to include dead threads. */ if ((error = _thr_find_thread(curthread, pthread, 0)) != 0) - return (error); - - attr = pthread->attr; - if ((pthread->flags & THR_FLAGS_DETACHED) != 0) - attr.flags |= PTHREAD_DETACHED; + goto free_and_exit; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), - dst->cpusetsize, dst->cpuset); - if (error == -1) + kern_size, cpuset); + if (error == -1) { + THR_THREAD_UNLOCK(curthread, pthread); error = errno; + goto free_and_exit; + } - THR_THREAD_UNLOCK(curthread, pthread); + /* + * From this point on, we can't fail, so we can start modifying 'dst'. + */ - if (error == 0) - memcpy(&dst->pthread_attr_start_copy, - &attr.pthread_attr_start_copy, - offsetof(struct pthread_attr, pthread_attr_end_copy) - - offsetof(struct pthread_attr, pthread_attr_start_copy)); + *dst = pthread->attr; + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) + dst->flags |= PTHREAD_DETACHED; + THR_THREAD_UNLOCK(curthread, pthread); + + dst->cpuset = cpuset; + dst->cpusetsize = kern_size; return (0); + +free_and_exit: + if (dst->cpuset == NULL) + free(cpuset); + return (error); } __weak_reference(_thr_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 3475029f8996..3fc4d02c611e 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -261,7 +261,6 @@ struct pthread_atfork { }; struct pthread_attr { -#define pthread_attr_start_copy sched_policy int sched_policy; int sched_inherit; int prio; @@ -271,7 +270,6 @@ struct pthread_attr { void *stackaddr_attr; size_t stacksize_attr; size_t guardsize_attr; -#define pthread_attr_end_copy cpuset cpuset_t *cpuset; size_t cpusetsize; }; From nobody Fri Jan 26 21:02:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bm3tMmz58qmV; Fri, 26 Jan 2024 21:02: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 4TM9Bm2s6tz4LvL; Fri, 26 Jan 2024 21:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJMwk3sODRYH1L+PKg6sFxUAo8UDIfaezV216edF67s=; b=Pt/P6Z81VBhY/QXcawq3ngV7zWinUso6Jd46CLRwmyCDrJthZ/nrc8AUrb15BbXZjs0AJU N+hnwbCVfrAgLtoZH3zfy3TFZe0xOIkzBynLKRYyhuwNoZv3N1QSvIE1Fu/cd4upLzBlpP L3GhZCgqKVY0QJRZEjbJXl9xpUUUrHY7Qc8qvBkIrnYpawK1L5fyrJtCmL1q9nCpIlVBcU jeBsSmSkL9Se1O5exon+TJ34YakHZwAE3KqDmlzW1lRfwoOmJF4I3/57Q6jztpXdNUWSub vRR8BfwFHO9pbpn6Ghxq/nJfIPyknMelSe4A4aufnitr+BcyOCqlVcjmJTfI0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJMwk3sODRYH1L+PKg6sFxUAo8UDIfaezV216edF67s=; b=y2IFvxoEjUUaHa4aUaOTGr2s7fLTG4/yAOh9UVCpAucCG6eHoRlH35Dkjz9nBnDRWWi/PA 23TDtuCh9p8+HYvAb+zK5p7BkNPPke1C9L1NByDq8yTbEmCVGxfti6x8ivBKNbyTt8UMIP cQnVedWDwtBhhOY0VmbS/i5ifTxtv2+NqWgUPqPIC7eRjhvV0M0S64xmCEOxBu7MAIK720 84GxAEhBi6Fai18jvKBT/MelG17YjMK5XStrIVzbNLW09p1jNyAUh2H/SaGAL1FD6o3BSV 3Inmsi4ofJRk6E1QxMMJ3ckQxxbfIeXkh17g1NwJt26ffi8gA9FsXYOmr1RBAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302976; a=rsa-sha256; cv=none; b=ExiKYgxSIKnN5xvJSaSO099q2t97IxDaQmsd7Tk/PdZp7KK55e/2uy0UDLsh5CB+uezp0I YSHiJBXQupobJCVBAL1d4EKbVU2a+qsAciJnIo3EW4aZMMvT+nWhaHwaY1FZBicuL9+arq Em8XArVrpdt8lM16obrDDr8NUM8R61e5opOPaaC0KGQeS6uclb/h/Lo/mnpkaX0TKyxjOm MbK7kjBwklmMBb3uGeDjEJYHRXYBkmx8IXYSkfRbzaorqbf9sFJRYpbKKQ5ttlFaBOq+F3 c4EuNi3nbX8UPcD4cp7IucD16E3LURWkch5XfgUvRua9OgRnOGJHrRpHJgkGhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Bm1yg0zxRb; Fri, 26 Jan 2024 21:02: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 40QL2upk083891; Fri, 26 Jan 2024 21:02:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2ufg083888; Fri, 26 Jan 2024 21:02:56 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:56 GMT Message-Id: <202401262102.40QL2ufg083888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: efdf24fd9bb9 - stable/14 - pthread_attr_get_np(3): Revamp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efdf24fd9bb92a3742fb16bb39a4c9940647b1b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=efdf24fd9bb92a3742fb16bb39a4c9940647b1b4 commit efdf24fd9bb92a3742fb16bb39a4c9940647b1b4 Author: Olivier Certner AuthorDate: 2024-01-05 13:14:48 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:01:39 +0000 pthread_attr_get_np(3): Revamp Fix and more thoroughly describe the attributes object lifecycle. Also, correct the text about which attributes' values are reported. Add the ENOMEM error. While here, rephrase unclear passages, add references and fix the example's style. Reviewed by: kib, emaste Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43330 (cherry picked from commit 6211cd4be32dfdc51b5ac452d4ead98a36ec42a6) Approved by: markj (mentor) --- share/man/man3/pthread_attr_get_np.3 | 84 +++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3 index a13835287d7f..07153586c1b2 100644 --- a/share/man/man3/pthread_attr_get_np.3 +++ b/share/man/man3/pthread_attr_get_np.3 @@ -1,5 +1,10 @@ .\" Copyright (c) 2002,2003 Alexey Zelkin .\" All rights reserved. +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Olivier Certner +.\" at Kumacom SARL 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 @@ -22,12 +27,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 12, 2021 +.Dd January 5, 2024 .Dt PTHREAD_ATTR_GET_NP 3 .Os .Sh NAME .Nm pthread_attr_get_np -.Nd get attributes of existent thread +.Nd get attributes of an existing thread .Sh LIBRARY .Lb libpthread .Sh SYNOPSIS @@ -37,51 +42,54 @@ .Sh DESCRIPTION The .Fn pthread_attr_get_np -function is used to get existent thread's attributes. -Most fields of -.Vt pthread_attr_t -structure are exact values of attributes provided at thread creation -time (as parameter to -.Xr pthread_create 3 -function), except for the stack address. -.Pp -Value returned as -.Fa dst -is supposed to be used in conjunction with -.Fn pthread_attr_get* -functions to retrieve individual values from +function is used to retrieve the attributes of the specified thread into an +existing .Vt pthread_attr_t structure. -Parameter -.Fa dst -should point to allocated memory area big enough to fit this structure. +The attributes' values are the current ones for the target thread, except for +the stack top address if not properly aligned for the architecture, since in +this case its value has been adjusted internally before use. .Pp -It is HIGHLY RECOMMENDED to use +Argument +.Fa dst +must be a pointer to a valid attributes object +.Po +it was initialized at some point by .Xr pthread_attr_init 3 -function to allocate attribute storage. -.Sh IMPLEMENTATION NOTES -The -.Fn pthread_attr_get_np -function will always return a pointer to the thread's real stack address, -regardless of its value in the original attributes structure. +and was not destroyed since then +.Pc . +After a successful call to +.Fn pthread_attr_get_np , +the individual attributes' values can be retrieved as usual via the +corresponding accessor functions as documented in +.Xr pthread_attr 3 . +After a failed call to +.Fn pthread_attr_get_np , +the object pointed to by +.Fa dst +is left unmodified, and can continue to be used as if the failed call never +happened. .Sh RETURN VALUES If successful, .Fn pthread_attr_get_np function returns 0. Otherwise, an error number is returned to indicate the error. .Sh EXAMPLES +This function retrieves the stack size of the thread specified by the +.Fa pid +argument: .Bd -literal size_t -my_thread_stack_size(pthread_t pid) +my_thread_stack_size(pthread_t tid) { - pthread_attr_t attr; - size_t size; + pthread_attr_t attr; + size_t size; - pthread_attr_init(&attr); - pthread_attr_get_np(pid, &attr); - pthread_attr_getstacksize(&attr, &size); - pthread_attr_destroy(&attr); - return(size); + pthread_attr_init(&attr); + pthread_attr_get_np(tid, &attr); + pthread_attr_getstacksize(&attr, &size); + pthread_attr_destroy(&attr); + return (size); } .Ed .Sh ERRORS @@ -90,12 +98,16 @@ The function will fail if: .Bl -tag -width Er .It Bq Er EINVAL -Invalid value for one of given parameters. +One of the arguments has an invalid value. .It Bq Er ESRCH No thread could be found corresponding to that specified by the given thread ID. +.It Bq Er ENOMEM +There was not enough memory to allocate additional storage needed by the attributes +object's implementation. .El .Sh SEE ALSO +.Xr pthread_attr 3 , .Xr pthread_attr_destroy 3 , .Xr pthread_attr_getdetachstate 3 , .Xr pthread_attr_getinheritsched 3 , @@ -111,4 +123,6 @@ thread ID. The .Fn pthread_attr_get_np function and this manual page were written by -.An Alexey Zelkin Aq Mt phantom@FreeBSD.org . +.An Alexey Zelkin Aq Mt phantom@FreeBSD.org , +and the latter was revised by +.An Olivier Certner Aq Mt olce@FreeBSD.org . From nobody Fri Jan 26 21:05:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FL0Js9z58qdy; Fri, 26 Jan 2024 21:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TM9FK69nMz4NcL; Fri, 26 Jan 2024 21:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EvCdY6LX/LDH8gH/pqtGEGWJGh0k/E6E8+2Vwm05iY=; b=EVz0Ib6mAUo2dlP2xzaAb7joYbq+hm+pb3KUOeTzYzLNXitF4Y2r+TeW63XoX+AdOGiVQy Zk6+ExMx7HfHa4qSiVWoGfIqGf7Zlz0T9Py6UzS/VAUSQYGZgGQPIxijZHeOo3d5Qh+/5t e/BaNXQhExFx9UvVdyDpzEXQeK/Cy2s9TmUcreWESgjfbhppt9+tPZSGauyjImkZXaed4l /gk0SCwRlWxbbYYgPtwleXNEFhbA167IPxAsWEqTkN1KiGxgYECWpJw0oQgDpHsemoSYH4 TxgyldfIzTzmaDTHwiRR80UGSh+J3zHSQqY9IZR35fIul6alaAb8I8nBgOjFsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EvCdY6LX/LDH8gH/pqtGEGWJGh0k/E6E8+2Vwm05iY=; b=DMZMfmUre1x4LsBWIG5ruTNFg//qRRDUQyzECZVWrY+UNktfAuAlvkziz1AQSnOTZdNnXw pB6HOp2P7xR66a4HrFtwG3y+XMnsbtct0brHQo2Te9uufERJphmqXiJ7kw0DklahTtrTzz h0s4ek7UWxie2dWDrRqliVks+w6O8XnIbht5M/3e9cjbK1oVtWZKvnCaiyl08zldHEX4WE 1+qr/pyU/wLBqwbdMrLf31Q/e66MxKRmZLdKq2V74k2IdtQB4GDtbobMk71Y2vMCWvaO14 ClV++6sDz3tDWin5Tucgd2NKVQETf1iJrarp9XUXKgCaa/tOjvQprb5oOlI1Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303109; a=rsa-sha256; cv=none; b=hv7Cj4OJ+l+bMxUaYfh6nJ2Ug1uiYLdPHqu41fVo1xwaGsUs2BVAkB8xEzyJPf6GCJCFfT PcrxVJfobKnUNT0BG79OQ0n9c+FwnMInyUhKecgeFSO2qM1Q95N0IzE7jQyPKYvcFVatT9 ZSe2I94V1XLHCvYUbiq/9/YFfwT5PB+mczw9kWvjVteEjLsfNMCmsJoxZXRMuZEZssywmI ei80oACcmBZdleH3u+L8TdRuX2deROGnQI8nooHCyiCGe4yMp4Bo1SkMNmlJE3TpFqK/j5 6Rlszaw8y8+1JKZvGKpvwd9Yw05msZCK+R1EFAobkpOhWiYRf+7m3122B0TmFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FK5GZLzxZs; Fri, 26 Jan 2024 21:05: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 40QL59cI084359; Fri, 26 Jan 2024 21:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL59Np084356; Fri, 26 Jan 2024 21:05:09 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:09 GMT Message-Id: <202401262105.40QL59Np084356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 8bd4bf5db4c3 - stable/13 - libthr: thr_attr.c: More style and clarity fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8bd4bf5db4c3de931bd18c5b57ca98cd9c980ede Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd4bf5db4c3de931bd18c5b57ca98cd9c980ede commit 8bd4bf5db4c3de931bd18c5b57ca98cd9c980ede Author: Olivier Certner AuthorDate: 2024-01-04 15:10:40 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:20 +0000 libthr: thr_attr.c: More style and clarity fixes The change of argument for sizeof() (from a type to an object) is to be consistent with the change done for the malloc() code just above in the preceding commit touching this file. Consider bit flags as integers and test whether they are set with an explicit comparison with 0. Use an explicit flag value (PTHREAD_SCOPE_SYSTEM) in place of a variable that has this value at point of substitution. All other changes are straightforward. Suggested by: kib Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43327 (cherry picked from commit 4d312aa051414ad77d3515f258230d01ad11d6dc) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 0ccc31b22c13..bbb143da1a7d 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -117,8 +117,7 @@ _thr_attr_destroy(pthread_attr_t *attr) if (attr == NULL || *attr == NULL) return (EINVAL); - if ((*attr)->cpuset != NULL) - free((*attr)->cpuset); + free((*attr)->cpuset); free(*attr); *attr = NULL; return (0); @@ -151,7 +150,7 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (error); attr = pthread->attr; - if (pthread->flags & THR_FLAGS_DETACHED) + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) attr.flags |= PTHREAD_DETACHED; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), @@ -180,7 +179,7 @@ _thr_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate) if (attr == NULL || *attr == NULL || detachstate == NULL) return (EINVAL); - if ((*attr)->flags & PTHREAD_DETACHED) + if (((*attr)->flags & PTHREAD_DETACHED) != 0) *detachstate = PTHREAD_CREATE_DETACHED; else *detachstate = PTHREAD_CREATE_JOINABLE; @@ -258,7 +257,7 @@ _thr_attr_getscope(const pthread_attr_t * __restrict attr, if (attr == NULL || *attr == NULL || contentionscope == NULL) return (EINVAL); - *contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ? + *contentionscope = ((*attr)->flags & PTHREAD_SCOPE_SYSTEM) != 0 ? PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS; return (0); } @@ -321,7 +320,7 @@ _thr_attr_init(pthread_attr_t *attr) if ((pattr = malloc(sizeof(*pattr))) == NULL) return (ENOMEM); - memcpy(pattr, &_pthread_attr_default, sizeof(struct pthread_attr)); + memcpy(pattr, &_pthread_attr_default, sizeof(*pattr)); *attr = pattr; return (0); } @@ -449,7 +448,7 @@ _thr_attr_setscope(pthread_attr_t *attr, int contentionscope) return (EINVAL); if (contentionscope == PTHREAD_SCOPE_SYSTEM) - (*attr)->flags |= contentionscope; + (*attr)->flags |= PTHREAD_SCOPE_SYSTEM; else (*attr)->flags &= ~PTHREAD_SCOPE_SYSTEM; return (0); @@ -546,6 +545,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, if (cpusetsize > kern_size) { /* Kernel checks invalid bits, we check it here too. */ size_t i; + for (i = kern_size; i < cpusetsize; ++i) if (((const char *)cpusetp)[i] != 0) return (EINVAL); From nobody Fri Jan 26 21:05:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FM2lcrz58qhd; Fri, 26 Jan 2024 21:05: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 4TM9FM07Kdz4NlR; Fri, 26 Jan 2024 21:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56E5W0vYAWuvmcOjQCmVpWECLyf3WOkdmUWA97vp6qY=; b=WYeWlNsnDD8+mXb1clUHokxxq8Mux63hZAfUscRZwgruGAaqXlAkUN6hn8/JyDwjvoFhY7 S9Ss2mEKCxp30I1Myt5L7zqN20HHoj7tS6BVzJriZLljAcwXdBtMh4kSFbPSGwAVMcRk7q HKeyJnYJ+pXQjzim5mjRULzCvk069gUONPt8ZBFCL7c45UuIweTWjjO2D0XZDOgc5mipB1 8J3tAjWzfLSMZ5lFzfVkY7G/WiFiluZrhBL8fCfqK2xOWAFfNGKRzo+s7+EehElpIe33uo aJ31Tk+H9VO5f5SMw5uwADtwk5yZJQc6uxR9ZASagjPgxM5YFx4ugRRCcwEinQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56E5W0vYAWuvmcOjQCmVpWECLyf3WOkdmUWA97vp6qY=; b=JQffvVSa/avhPYoYDIAYFOzE3fy/m9Xxtyti9JDU1iDjSQjG2MOe4F9s7ZbY0Lr1Gw3f0y /f0OlLDc5EVXxqUM5ZP0tM17ayXyZXKfckWsRn7bj5x0SvMpHsyQo0yADSWunA1HOHnltt wOkzlNjlWjZ4gV85sD22GgdHKIGu8NESB7H1rrKjbJ3nnN85mHXstJZaz0wr4OJ3bFssiI 3Ss3xdZwImvkFKtAI0iz91imbf4oeGUycC51uGJ1NqqNVOERo0/dE2o8m9yexB/Jb5RNhW PW31y/+5mdhete55Jun9fc1erNYW+ENg3JouNOS++UGj5F+wb4baPIzZ7QAXDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303111; a=rsa-sha256; cv=none; b=nsNjIwJpZzptONJKxe6xQo4vURYITl8OEld/FfQtxkte+/LYr8N4UeLvbR8ccr65VpwOEp 1vF4KUzdsukrc0SqvRQkpF7rchSa9UvfoOAU8y8aMB6mXydoWh55dPm7EWABZTMJj3Ngth OXoLGtFyzYJ3LH/DDU+VIldMerPkdZLVE1lVavb+w0CJX/kf3h/V/zLP4K4Bqkkt/aZRS2 mPq54lXvgx6WvtY72UValm+H3vZfvPvfLfc6iUGQEMdYYRzGSPjVNmbQw1oYEe/rMnikU6 2/DO590vQ26Ig68IxU0zBzY8ZNZ/3yDIGEe0oVNW/4A2QQC+NDu3CSA1l35RSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FL6KX8zxFk; Fri, 26 Jan 2024 21:05: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 40QL5AwE084416; Fri, 26 Jan 2024 21:05:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL5AiX084413; Fri, 26 Jan 2024 21:05:10 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:10 GMT Message-Id: <202401262105.40QL5AiX084413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 2c9ab16625d7 - stable/13 - libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c9ab16625d7129aae29270764e6e447a5c614fd Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2c9ab16625d7129aae29270764e6e447a5c614fd commit 2c9ab16625d7129aae29270764e6e447a5c614fd Author: Olivier Certner AuthorDate: 2024-01-04 15:20:50 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:32 +0000 libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() Using calloc() instead of malloc() is useless here since the allocated memory is to be wholly crushed by the memcpy() call that follows. Suggested by: kib Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43328 (cherry picked from commit 15bb0300eeca233827a6a13cd2ed883e0034979d) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index bbb143da1a7d..561037fa5eb4 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -551,7 +551,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, return (EINVAL); } if (attr->cpuset == NULL) { - attr->cpuset = calloc(1, kern_size); + attr->cpuset = malloc(kern_size); if (attr->cpuset == NULL) return (errno); attr->cpusetsize = kern_size; From nobody Fri Jan 26 21:05:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FN2zfsz58qf1; Fri, 26 Jan 2024 21:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TM9FN0fvZz4NcZ; Fri, 26 Jan 2024 21:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eGYilJTz5X8xJz0FYLP/CN81mVioF+p6xpXVmuTR9M=; b=K34ub2G69SIFLAi6fNIS2DVJ1v+t8I7psl9NKK8QCGV+v1uyB8lajZFYrnRMjELTaIoTic s9P1ZDk6uqHA559l/tGvFlP1Zn1126/FWjX6diSNhIH1qyHNQW4IqT15HWW6VIqLmfHvDR GTYqh5WoL0H7gYQBS9VVkO6AaOV1AV8k5H6IPTF/PatTWVzr4uu2PygaCIxXZ7ZEmJJeBo 8yyO4PcRiS5gCmQ7OClXVelFb9wb/+vjqKs4wPGC5M33H+UqPmEnKaB3Eu2ZNfp1mZ6DIJ W0WT8Mv1VcZ65Xnjwr3jqnP+SLjz5Kx6Q7hnD/5iaTD0TLK4f7e56jGxeLKb9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eGYilJTz5X8xJz0FYLP/CN81mVioF+p6xpXVmuTR9M=; b=XdM55kNwevIUfz9ew+YyIJApkHX6CZEsZoERq3Ds/LvMmvgJ8bncF9dRE1ilParcZaNUpm FfTmzIsVAz3Zn6ucBxUmZeQzkoLSF3nEhfpkh/qxdl6awpO4UIs3GvstuMneFe6v9qY6ws i0haKbBYzriDAhreo1MEDakYO6o1KNvEgn71O7ULmC9e3LUpk+rv6/XWibF3dwuG8MEBwZ qaMCoXWRGxwiONeEARr+z38TV90pmmAHJy96t/s+11IfGJFa0n0EwVrpeNJ+7KyR9+Y5hq DY7g7XNOb72JoOO2n7cm7zPgk5j6O2bv9oYcpvAniTN+K31sckgAjb2w6tx0JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303112; a=rsa-sha256; cv=none; b=rySgz5UTguLJsAgq4pZYyuqxrTtWvPC0s3VNmwLe07pkKtikOqq+Z7p2+/+W1G2e1+VE1Q R/dvaDvFP9w3fP0K0Uf6l2DlsebPpLJurgBtsKLx2Oimz+nhxkj7WC1A/9wUI+mVJ81GeA 1V61Q5LE6AJ8/eJcBZj8xczD2XKS27T9y9JS8Q8uIyfANvK0Ltp8AqJLcx2b4SiAmdQb3Y AggpMsn4HUnjM6rg/SJHc1+ifnvCAtQhGJAp4sw03eTs35E6GOa+fmqpSQJkKNrlXr+yPv i5Kx05eeYhysvCepTpkVUC1eg4zdH6awj4SCtZBaOHbhuIx6KADjK7QQUzy2Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FM6sLbzx2X; Fri, 26 Jan 2024 21:05: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 40QL5BRM084473; Fri, 26 Jan 2024 21:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL5B1H084470; Fri, 26 Jan 2024 21:05:11 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:11 GMT Message-Id: <202401262105.40QL5B1H084470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b95b9505acf1 - stable/13 - pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b95b9505acf176ca8b058286c74847f4a49856e9 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b95b9505acf176ca8b058286c74847f4a49856e9 commit b95b9505acf176ca8b058286c74847f4a49856e9 Author: Olivier Certner AuthorDate: 2024-01-04 17:45:52 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:39 +0000 pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error Similarly as in the previous commit, using calloc() instead of malloc() is useless here in the regular case since the subsequent call to cpuset_getaffinify() is going to completely fill the allocated memory. However, there is an additional complication. This function tries to allocate memory to hold the cpuset if it previously wasn't, and does so before the thread lock is acquired, which can fail on a bad thread ID. In this case, it is necessary to deallocate the memory allocated in this function so that the attributes object appears unmodified to the caller when an error is returned. Without this, a subsequent call to pthread_attr_getaffinity_np() would expose uninitialized memory (not a security problem per se, since it comes from the same process) instead of returning a full mask as it would before the failing call to pthread_attr_get_np(). So the caller would be able to notice a change in the state of the attributes object even if pthread_attr_get_np() reported failure, which would be quite surprising. A similar problem that could occur on failure of cpuset_setaffinity() has been fixed. Finally, we shall always report memory allocation failure. This already goes for pthread_attr_init(), so, if for nothing else, just be consistent. Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43329 (cherry picked from commit aadb4a1b3fd185d547087f6eafca6ce0b4df3291) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 45 ++++++++++++++++++++++++----------------- lib/libthr/thread/thr_private.h | 2 -- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 561037fa5eb4..3c03225c33cb 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -129,8 +129,9 @@ __weak_reference(_thr_attr_get_np, _pthread_attr_get_np); int _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) { - struct pthread_attr attr, *dst; + struct pthread_attr *dst; struct pthread *curthread; + cpuset_t *cpuset; size_t kern_size; int error; @@ -138,35 +139,43 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (EINVAL); kern_size = _get_kern_cpuset_size(); - if (dst->cpuset == NULL) { - dst->cpuset = calloc(1, kern_size); - dst->cpusetsize = kern_size; - } + if ((cpuset = malloc(kern_size)) == NULL) + return (ENOMEM); + } else + cpuset = dst->cpuset; curthread = _get_curthread(); /* Arg 0 is to include dead threads. */ if ((error = _thr_find_thread(curthread, pthread, 0)) != 0) - return (error); - - attr = pthread->attr; - if ((pthread->flags & THR_FLAGS_DETACHED) != 0) - attr.flags |= PTHREAD_DETACHED; + goto free_and_exit; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), - dst->cpusetsize, dst->cpuset); - if (error == -1) + kern_size, cpuset); + if (error == -1) { + THR_THREAD_UNLOCK(curthread, pthread); error = errno; + goto free_and_exit; + } - THR_THREAD_UNLOCK(curthread, pthread); + /* + * From this point on, we can't fail, so we can start modifying 'dst'. + */ - if (error == 0) - memcpy(&dst->pthread_attr_start_copy, - &attr.pthread_attr_start_copy, - offsetof(struct pthread_attr, pthread_attr_end_copy) - - offsetof(struct pthread_attr, pthread_attr_start_copy)); + *dst = pthread->attr; + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) + dst->flags |= PTHREAD_DETACHED; + THR_THREAD_UNLOCK(curthread, pthread); + + dst->cpuset = cpuset; + dst->cpusetsize = kern_size; return (0); + +free_and_exit: + if (dst->cpuset == NULL) + free(cpuset); + return (error); } __weak_reference(_thr_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 3475029f8996..3fc4d02c611e 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -261,7 +261,6 @@ struct pthread_atfork { }; struct pthread_attr { -#define pthread_attr_start_copy sched_policy int sched_policy; int sched_inherit; int prio; @@ -271,7 +270,6 @@ struct pthread_attr { void *stackaddr_attr; size_t stacksize_attr; size_t guardsize_attr; -#define pthread_attr_end_copy cpuset cpuset_t *cpuset; size_t cpusetsize; }; From nobody Fri Jan 26 21:05:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FP2pBTz58qf2; Fri, 26 Jan 2024 21:05: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 4TM9FP1fcLz4Nm6; Fri, 26 Jan 2024 21:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8gL9D9/x/DQomsu8fEvcznmdCirXsVIdB8Or1jbYfY=; b=X+hk9N4NDJtt0BleKxpkV6KV4sFOj+RwiYhj77ncIcUIU6ZzFYQmGywA0huRenEivdDKox HzccfELBkkAVkBW3EEAe0MMccHi2jVWlNXhkKiEH9xPdt3r6GGF2XGDEjA2ujD4Z4NHeId huu/LM/amdQwK7R1UsZwPusJ24fuN/STNf8OyFIWywkVinapB2mXl0utI4+5Qr5uRorsf7 SnloRuRcZnShFvtpujVlpbWtzmGztrliTXISKF96KYbprhG/SYQNvTqFXGWa5M2s3bs3Yz dKzXJlwxTiZuul9qlRRt3/pxNk61Bx+GkGuEFUdrjSUMafWUlBsd4N5Hi9JV2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8gL9D9/x/DQomsu8fEvcznmdCirXsVIdB8Or1jbYfY=; b=sNIu9aVqRIRFpFaJyU6GMxQlQQlOyX/2NkftX/dMi1IX2TBA5Z1bRcYml9y35/vBLA0c5H Ilv4yst3XZ3qNJZGru2FyHGqzxA9AZG6nMB4sgVNqbMTYebIN/VVERHOhBNE1dCiAyF/ct pobrGCHc2vnY9qnc43COvPmPuvT8EVBx49cJhC6O+7ex/eDotzWnR22LpJ3JiId+7W42CP OmWUJngCZDs1FIiHotoVhdWiVAPiUp+N2+l2sSShW0dvhPbRmwydI6BCw5L9gOmm84S26F 68pXngGu6OYC+g9aBOFzzY6Q/7Ax0atvOUGyon3yaPVEaNEOrH1Jaj91QIkIAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303113; a=rsa-sha256; cv=none; b=Lf6pRO2UWL6OyuFKtY8A46oqjE5RH8aH7fz9PqEl1Q/+ZurjmWHtPnVBxSRjgZlHJKfTph f745ZLcROQgUE+Ao4FZfeGSJJxD5xwo+JC9pNhvCpHgI30uXOUDDYgoBMQ9jbVJDLyOwml ZqZLKmDXwnRWmgNtSpuBXeYsO/FJrStC2pN7RbFMe/QdvqPerJvorxmqZcjN3jhbDuV18y NjRcI1hfkxS4qMNnABjguVZuXVAoBuq3LcthyMlc7cPE42z+jdGQCSiTpdm4ux0vlbyrgX 7VB14eh1+OLsllxdfqpTw72croAlVH4TgPOFamPwMyQvpthWYTpMfrGzgGz+OA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FP0k5tzxXT; Fri, 26 Jan 2024 21:05: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 40QL5Ddi084507; Fri, 26 Jan 2024 21:05:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL5DOX084504; Fri, 26 Jan 2024 21:05:13 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:13 GMT Message-Id: <202401262105.40QL5DOX084504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 72ef14799d4c - stable/13 - pthread_attr_get_np(3): Revamp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 72ef14799d4c084494078b56acefb0272419c519 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=72ef14799d4c084494078b56acefb0272419c519 commit 72ef14799d4c084494078b56acefb0272419c519 Author: Olivier Certner AuthorDate: 2024-01-05 13:14:48 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:46 +0000 pthread_attr_get_np(3): Revamp Fix and more thoroughly describe the attributes object lifecycle. Also, correct the text about which attributes' values are reported. Add the ENOMEM error. While here, rephrase unclear passages, add references and fix the example's style. Reviewed by: kib, emaste Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43330 (cherry picked from commit 6211cd4be32dfdc51b5ac452d4ead98a36ec42a6) Approved by: markj (mentor) --- share/man/man3/pthread_attr_get_np.3 | 84 +++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3 index a13835287d7f..07153586c1b2 100644 --- a/share/man/man3/pthread_attr_get_np.3 +++ b/share/man/man3/pthread_attr_get_np.3 @@ -1,5 +1,10 @@ .\" Copyright (c) 2002,2003 Alexey Zelkin .\" All rights reserved. +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Olivier Certner +.\" at Kumacom SARL 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 @@ -22,12 +27,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 12, 2021 +.Dd January 5, 2024 .Dt PTHREAD_ATTR_GET_NP 3 .Os .Sh NAME .Nm pthread_attr_get_np -.Nd get attributes of existent thread +.Nd get attributes of an existing thread .Sh LIBRARY .Lb libpthread .Sh SYNOPSIS @@ -37,51 +42,54 @@ .Sh DESCRIPTION The .Fn pthread_attr_get_np -function is used to get existent thread's attributes. -Most fields of -.Vt pthread_attr_t -structure are exact values of attributes provided at thread creation -time (as parameter to -.Xr pthread_create 3 -function), except for the stack address. -.Pp -Value returned as -.Fa dst -is supposed to be used in conjunction with -.Fn pthread_attr_get* -functions to retrieve individual values from +function is used to retrieve the attributes of the specified thread into an +existing .Vt pthread_attr_t structure. -Parameter -.Fa dst -should point to allocated memory area big enough to fit this structure. +The attributes' values are the current ones for the target thread, except for +the stack top address if not properly aligned for the architecture, since in +this case its value has been adjusted internally before use. .Pp -It is HIGHLY RECOMMENDED to use +Argument +.Fa dst +must be a pointer to a valid attributes object +.Po +it was initialized at some point by .Xr pthread_attr_init 3 -function to allocate attribute storage. -.Sh IMPLEMENTATION NOTES -The -.Fn pthread_attr_get_np -function will always return a pointer to the thread's real stack address, -regardless of its value in the original attributes structure. +and was not destroyed since then +.Pc . +After a successful call to +.Fn pthread_attr_get_np , +the individual attributes' values can be retrieved as usual via the +corresponding accessor functions as documented in +.Xr pthread_attr 3 . +After a failed call to +.Fn pthread_attr_get_np , +the object pointed to by +.Fa dst +is left unmodified, and can continue to be used as if the failed call never +happened. .Sh RETURN VALUES If successful, .Fn pthread_attr_get_np function returns 0. Otherwise, an error number is returned to indicate the error. .Sh EXAMPLES +This function retrieves the stack size of the thread specified by the +.Fa pid +argument: .Bd -literal size_t -my_thread_stack_size(pthread_t pid) +my_thread_stack_size(pthread_t tid) { - pthread_attr_t attr; - size_t size; + pthread_attr_t attr; + size_t size; - pthread_attr_init(&attr); - pthread_attr_get_np(pid, &attr); - pthread_attr_getstacksize(&attr, &size); - pthread_attr_destroy(&attr); - return(size); + pthread_attr_init(&attr); + pthread_attr_get_np(tid, &attr); + pthread_attr_getstacksize(&attr, &size); + pthread_attr_destroy(&attr); + return (size); } .Ed .Sh ERRORS @@ -90,12 +98,16 @@ The function will fail if: .Bl -tag -width Er .It Bq Er EINVAL -Invalid value for one of given parameters. +One of the arguments has an invalid value. .It Bq Er ESRCH No thread could be found corresponding to that specified by the given thread ID. +.It Bq Er ENOMEM +There was not enough memory to allocate additional storage needed by the attributes +object's implementation. .El .Sh SEE ALSO +.Xr pthread_attr 3 , .Xr pthread_attr_destroy 3 , .Xr pthread_attr_getdetachstate 3 , .Xr pthread_attr_getinheritsched 3 , @@ -111,4 +123,6 @@ thread ID. The .Fn pthread_attr_get_np function and this manual page were written by -.An Alexey Zelkin Aq Mt phantom@FreeBSD.org . +.An Alexey Zelkin Aq Mt phantom@FreeBSD.org , +and the latter was revised by +.An Olivier Certner Aq Mt olce@FreeBSD.org . From nobody Sat Jan 27 09:12:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMTNJ1JNcz5838y; Sat, 27 Jan 2024 09:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMTNH6SXwz4TX4; Sat, 27 Jan 2024 09:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LA7vX8431wamRBdO54lUROOKWcJHz4aI3FX/gpGhC9E=; b=KWPYogXTWC/TzaSTH9zu9BVE8tZQOSgeSYVlabB7SerWJtxVX2RTnsLyNLWCMypdTgjIiT dIUMwFTGcX+jWb9ihegZp4imUjTDdZ6y7UkzeJHCcajt82Jj3ogB98BuRx2/rxUE1xmFC2 PYxACJ8mGNqSqk47Rn4dpkV32iumB74tqW+fcwkC4J7O/bPIEIT6KiexrrADIK2S7W/PCA T+K11UjO2nHbdgg9Evyc0sCLrycRl9ednxlfBbzik+0+G03crcKJkVdF28D0yO1bZL/Cm7 sDJdjwWWarNVejoPW5RjMrwLKJ1bQYKTVUyoGtmL1hgOcNCRDVbhOLp8Gg0WDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LA7vX8431wamRBdO54lUROOKWcJHz4aI3FX/gpGhC9E=; b=XXlsE3x46xL5N4IKCKWu4dNlB6ab1TS9bmwDBchfJwwcy8Nu2gju055uXWD84Kd3Uvj15C iOo07X4d1kL60yYVgfetqSCeMy8ME0CASNl18AZuzwY8cAf15uGM9dZY+ME5HdycQKBJPX SSQ+plKiUq3ETFxiq/vQrYP71wo9ImIxTMzN77fB9H4SgAbxSXxCIDFOPHFmietGVT0g1Q os5s/ebcAS2wA0gENkRqyOZyGrgE6yC241wr+gndbGI4sLVf9fA4sKhUXJPGcHjGqgb/Rh I22vtrT2rtKGqICesOMUqISi+1qiCQuknZLOfdQBT39ViqrEnToTVahs0kizdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706346735; a=rsa-sha256; cv=none; b=oCvTDMH7VqqDOR159epyEVZiK3muk9UfBxGrNmQTS5En02LtNuJ8FcUiWLoF4FIF6zF2/s Kej7rkZrPDuBfcC4gukOhICdHoiWnMD5pRVE6Mle11MXvTAnv1LFoFAF6+lOblrZh8/bsU GMhHmJvZJDY/DQDzlZHvaPBfzzTjyI/VMxCJemiZq8txVwYcmQ1Tibx2PkhGqO87NG1Xwb e5IF9tZwzxNyY8/7DpqVKFXUd93LmqogfnH6ooxZzK1/wUsdWKgWn5ttFziuY9O9pJLy3y 2tzhQBlD0dsc4NkVpJFTA3JTcx0P0a6nKq7YoLwu3HQXDygJr/AWZHqcPi+/Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMTNH5ZF6zJqB; Sat, 27 Jan 2024 09:12:15 +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 40R9CFQc012397; Sat, 27 Jan 2024 09:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R9CFYf012394; Sat, 27 Jan 2024 09:12:15 GMT (envelope-from git) Date: Sat, 27 Jan 2024 09:12:15 GMT Message-Id: <202401270912.40R9CFYf012394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 63a7e799b32c - stable/14 - fsck_msdosfs: do not call checksize() if the cluster is bad List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 63a7e799b32cd9a5dcc3158677330edf8ea313bb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=63a7e799b32cd9a5dcc3158677330edf8ea313bb commit 63a7e799b32cd9a5dcc3158677330edf8ea313bb Author: John F. Carr AuthorDate: 2024-01-20 23:18:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-27 09:11:31 +0000 fsck_msdosfs: do not call checksize() if the cluster is bad PR: 276464 (cherry picked from commit deeb1d34024b3f843d965cdf204c745165c9bac0) --- sbin/fsck_msdosfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index c60eaab59b12..19516d882e2a 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -995,7 +995,7 @@ readDosDirSection(struct fat_descriptor *fat, struct dosDirEntry *dir) n->next = pendingDirectories; n->dir = d; pendingDirectories = n; - } else { + } else if (!(mod & FSERROR)) { mod |= k = checksize(fat, p, &dirent); if (k & FSDIRMOD) mod |= THISMOD; From nobody Sat Jan 27 09:13:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMTPB3SMpz58304; Sat, 27 Jan 2024 09:13: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 4TMTPB2Zyxz4V67; Sat, 27 Jan 2024 09:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ntrk9UF1CJ4swPIesuCZFudTqmWnBERSsYp+lMX8XI=; b=AQMERDFLAwcawaCsgeOf9vCe6bANHtFuXZmLuio+K33c6aRe5Zouk1FV53cWTtRvcKULps Suj1ZKpGmf4Kj5eFrGVKk7biSmEotX2O10i0iMXmqSnQGjByD9ygY8P5iZDZlxJ9Nx3zEf nd8Kf2nMSKTJt3/wNxEXeXxkHDNOQXiuYB7ee7T+iSs7Fe6ExPc9FiUawF/KflCFd4p5ba S06p7ryjB8JlYY92Nx9nLHx8CqblwjkSMxonC0Fq8ZmbHfeSCYzKkbhwDUEsb+5HTw958P 4T0fGuR1ivpImlYfM/W0QBaBP0nOsurRdabeJ91eLu/jyqHRlKzZNycSFWprLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ntrk9UF1CJ4swPIesuCZFudTqmWnBERSsYp+lMX8XI=; b=J1ZW6oKCWDR2Hw3/19fSfgO1EJIcWkEAAGpu1CTS9U4WGpyiUqWhrEl0clwalA2YumZqnX Gg0aXFtAcjLTLGI7fho/0cmpC6z2DCLpHu20GeboCYX5BfwggSbtE+EmRRx2O9FdzemcO2 x8siKJeKiazCCNzmTkbNdYjpneXrJ3j4/5tz8MtOLnUs6nv1MvYy6JJQedZ/NBfEph1SgA br1NztZp7yrB+vrc2ZOHxiQf7HsYVpqBM1BGQH94ky3fltuzVHng8TgRJuDXF5E/3GfOl2 6r9RiQ7vDTIpnZXyj+DIl/hkfpFq3yScX140JjmuFumgUUq52hoN4fLIsZhBLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706346782; a=rsa-sha256; cv=none; b=Wsj4VabqSJGnThx4zpAnDGf4ATA1eqX8z9VtUif1QBZb6l0tWxwCUPr+JBv9cagu9+N1i9 6R/VAHwZ1Zqmb5mt/N9KxSH2KAl6D4Djkl3isg8N8qL3tJjSF2LI7eFLktEkGJdRJjO7+Z Opl17VCoP2WtMpXtWYrbV3st7OuGLwCY6UVJVVm6DeBVvhJp+wIdM5dCFAyjL6yMwvYYLC UGHGwPZtHoT9WaTWiVq25Pm4weiDO6PuF5ZH9EYEneilRftzDV10cXJri44dImKsgBdeKE zBwxDpR/cqnHTuv9gYRS07cBf9Dvrqljf3E7vUjA2B6zDQOXFaYwtakzxIwMhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMTPB1f0BzJnk; Sat, 27 Jan 2024 09:13: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 40R9D25Z012633; Sat, 27 Jan 2024 09:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R9D29e012630; Sat, 27 Jan 2024 09:13:02 GMT (envelope-from git) Date: Sat, 27 Jan 2024 09:13:02 GMT Message-Id: <202401270913.40R9D29e012630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3ed143596029 - stable/13 - fsck_msdosfs: do not call checksize() if the cluster is bad List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ed143596029f4605354715c150381f2bbbc795f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed143596029f4605354715c150381f2bbbc795f commit 3ed143596029f4605354715c150381f2bbbc795f Author: John F. Carr AuthorDate: 2024-01-20 23:18:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-27 09:12:26 +0000 fsck_msdosfs: do not call checksize() if the cluster is bad PR: 276464 (cherry picked from commit deeb1d34024b3f843d965cdf204c745165c9bac0) --- sbin/fsck_msdosfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index be3d5ddc5425..fbd1929f17f4 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -982,7 +982,7 @@ readDosDirSection(struct fat_descriptor *fat, struct dosDirEntry *dir) n->next = pendingDirectories; n->dir = d; pendingDirectories = n; - } else { + } else if (!(mod & FSERROR)) { mod |= k = checksize(fat, p, &dirent); if (k & FSDIRMOD) mod |= THISMOD; From nobody Sat Jan 27 18:49:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMk9w04c2z58jq6; Sat, 27 Jan 2024 18:49: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 4TMk9v6cdKz4lMW; Sat, 27 Jan 2024 18:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzMMHJyceWFi2UN1QJObZNXbnlb5H2kiXYr9lEO3Qrg=; b=sfbr1I40WgThvlOsTBVL0wCoXjcK2onbEiZlkGEXXQQRin3PYZDQbGzGZ1Y5lzctc9QJkC fXiBzk8Aoy566ct0Pmyhxey030FG3hs8DMePi0jzJdWeqJHaL1aWfsoPpT+PlsIXIQDWEB UBWnbTxFF29/4lS6AcwRs2h8uysGQex+exvMCd3USgUVg9DVa1B7xnrvA7fSFbgclXWyyV iadTZDx6rcY+5JXt8SQA0cLX3APfwoNy3V4/6nLkpo8B1M4BIL/xIjcmNP9TMla815NyEO CLknkBitoD2s8RduzeJ/fxxo+1gPydXzuDI5d3t/c6TGOwjdUJX33gDnQ1PS2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzMMHJyceWFi2UN1QJObZNXbnlb5H2kiXYr9lEO3Qrg=; b=IEo/BeBJwDy7vVSAA+Y9Bu6VXqE2ypKyMSrny+nbF/MyKCxFse5IvunQeLfcg63srqq8OQ M+qsu9wndvF6zvX+RZIo+Yyq1EsdxS6K/M4y3D1UTI5cmoF90mqLi/RKGZi3+O5yDrynOM GWC0kOm2QuMBGbgg+8qFpV5pRZBNmZkyKVCQ5ZBrfUUNrMDCMCkRXGu9ynKTnw8wfP7894 GasXkLOYnTwS70EcLVemjqP76X0Wlz0gh5hdJmoFOfqiKEHxh6kWjDM1yAdROd1ueJsT4j zY6l4og/DB3Sa883kx9mIWUl7v4/8hypQsJgGNV8TP6TdsTC5bOfkWnD4H9vsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381347; a=rsa-sha256; cv=none; b=d4CYk3AH92vXFc9MOl244It1aD/uLjsKQeh9b/Q+oqW0/sa6hgcOoznsv1/xR55ZnYs41y P09+dFYt4fUMUtn2p5ltPmvmOGqbARY1BTLjsQ+HnHt5uZ3tbQlegSPY+JFhv93w2iOIXt JoctPellJvVQ6IgI6dXjA043gEXXoPgqr+IcZBL/wAoZGUrF5B/qEnyB6UvRSCB0jgGU6g kogB/EayY10JepCUsthjZv7V9iFNXyebn08sgu1zagUJDONnbAtYPTMn6yT09+bpvR4PpY SwOuXzPtHwcbiSHgFPUOTEfxiQXwkN5Q5tIXlSMUC+o2DouJ83Ji0NE3sqJCgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMk9v5gKjzcMc; Sat, 27 Jan 2024 18:49: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 40RIn7Er073987; Sat, 27 Jan 2024 18:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIn7Na073984; Sat, 27 Jan 2024 18:49:07 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:49:07 GMT Message-Id: <202401271849.40RIn7Na073984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 00a82bd964b6 - stable/13 - hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00a82bd964b68ad20f47b25f9419af14ff159f64 Auto-Submitted: auto-generated The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=00a82bd964b68ad20f47b25f9419af14ff159f64 commit 00a82bd964b68ad20f47b25f9419af14ff159f64 Author: Vladimir Kondratyev AuthorDate: 2021-04-22 22:13:25 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-01-27 18:46:46 +0000 hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. Reported by: olivier PR: 268653 (cherry picked from commit 55eb41bb1fb69429330ea415fb463735ae08da64) --- sys/dev/hyperv/input/hv_kbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/hyperv/input/hv_kbd.c b/sys/dev/hyperv/input/hv_kbd.c index 82d661faedb9..3f8fe3c30154 100644 --- a/sys/dev/hyperv/input/hv_kbd.c +++ b/sys/dev/hyperv/input/hv_kbd.c @@ -267,9 +267,8 @@ hvkbd_read_char_locked(keyboard_t *kbd, int wait) uint32_t action; keystroke ks; hv_kbd_sc *sc = kbd->kb_data; -#ifdef EVDEV_SUPPORT int keycode; -#endif + HVKBD_LOCK_ASSERT(); if (!KBD_IS_ACTIVE(kbd) || !hv_kbd_prod_is_ready(sc)) From nobody Sun Jan 28 01:25:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMtzh391Vz57Mdr; Sun, 28 Jan 2024 01:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMtzh2dkDz4cnN; Sun, 28 Jan 2024 01:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xu5GE1qeSg3Zxovw/SDoQe0H9mdnkqaQ1PhpwhbpsqI=; b=qhbUD1zJajjXNwVwboshcqp2dis61BmH64EkYX7wQLSC6NKou4guISKegbLSn7YWNUwxQQ 3LVw8t3wP460SjwX1mKBmUyYosHs/9RbjuVuyfbbUvr+wYDq9YZv2NVPHzHgME626/xDHR sAdy48pckmyHuCZwhqp1OP1w90+mTSHZf4SMYteO5NuZmaVegrQwRiPavQ7Br5bB9lnnna Yw7D3ViLu4R9lUA1F2vWgPLVDNVfAarp7jIHgrX7QnZVYZy6HlYqO9e+xDARziNeq3ah1B H3F1bJofzREPD+QOsOuNJLzMFhWF0fasfNGH9zey9hmebDyUW8Z42mtcVg6wtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xu5GE1qeSg3Zxovw/SDoQe0H9mdnkqaQ1PhpwhbpsqI=; b=vLTNqBzRPSxBI7I9RBkj3sZrahtr2+L98YTZYzo/34pC71bU32lhMJKvn5nM2q6SAFFUUO mNAhgWBJUk7hQz3P6xVM5Mt8ZToOMsfuVaG/A4Zw60MTTwPs1XtqjaVvX+RhdwRe6fw/pn jGvXeFS/X0hhUoQPz0vYJsPXP4ztXSpOSusk4V+CEIrRJnyDsq7/85iQi7Qd2ydrE4qlsZ 4Ddbt9FV9dVyllrhsA9rFxl3/h4UxsE/cubNJRLHW3eDYusXSX+1h1jMxGPjXUK9jJVJJd BhG0G518eQpyKJWDUoojBQBYFxuG2Ejewn4U61n/Tq/pdbgywWbsepqDw24WqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706405152; a=rsa-sha256; cv=none; b=dpcoIgbGgyUOkcrtjSao6jwU0ig9uYpsrqTE+nVfkMQ6PmAqGcXN1/VE2BmUBa7472xW3/ tB00kUMTRVtiiFKIf1Ud9c2XTGbbyg1MWhMwl8NLsMJMwr9AQgdxbKjGw8bUWFDIKPQagO hZTRoGQ+yVOLA9Ch5LmL3BNmJJyrz/b5xi98/W0MO1n1Tghh1cijYLA/+cI46/8DXoVTjo V/n8LuIFH7NqKhXdIlFiuNw2DFxnLJd+cjSVxc7W0BJYOx/OfTeqX0GXErpaObLc3LSWeK ZqTu6yZAFldXlfI081pFKx2M7NuAdUngxGkDY/EGMDYoamSoVhqddWfeXCqiwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMtzh1gfrznhW; Sun, 28 Jan 2024 01:25: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 40S1PqMZ046148; Sun, 28 Jan 2024 01:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S1PqGF046145; Sun, 28 Jan 2024 01:25:52 GMT (envelope-from git) Date: Sun, 28 Jan 2024 01:25:52 GMT Message-Id: <202401280125.40S1PqGF046145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 4bd4942ea70b - stable/14 - bhyve nvme: Add NQN value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bd4942ea70becc583246597b658f3dcdbffafde Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd4942ea70becc583246597b658f3dcdbffafde commit 4bd4942ea70becc583246597b658f3dcdbffafde Author: Chuck Tuffli AuthorDate: 2023-10-12 22:04:17 +0000 Commit: Chuck Tuffli CommitDate: 2024-01-28 01:24:31 +0000 bhyve nvme: Add NQN value Add a NVMe Qualified Name (NQN) to the Controller Data structure using the "first format" (i.e., "... used by any organization that owns a domain name" Section 7.9 NVM-Express 1.4c 2021.06.28 Ratified). This avoids a Linux kernel warning about a missing or invalid NQN. (cherry picked from commit 32557d16e2c3c24c04eccfafd895e1514dc65b35) --- usr.sbin/bhyve/pci_nvme.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index d1b15d6f3a3c..2fd49a84c768 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -514,6 +514,7 @@ static void pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) { struct nvme_controller_data *cd = &sc->ctrldata; + int ret; cd->vid = 0xFB5D; cd->ssvid = 0x0000; @@ -583,6 +584,13 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; + + ret = snprintf(cd->subnqn, sizeof(cd->subnqn), + "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", + get_config_value("name"), sc->nsc_pi->pi_bus, + sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func); + if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn))) + EPRINTLN("%s: error setting subnqn (%d)", __func__, ret); } static void @@ -3309,7 +3317,6 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_aen_init(sc); pci_nvme_reset(sc); - done: return (error); } From nobody Sun Jan 28 01:33:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMv8x3mGLz57NF5; Sun, 28 Jan 2024 01:33: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 4TMv8x2qzSz4dXT; Sun, 28 Jan 2024 01:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsQfX798HgxL8EH60zrh7dzYE1fLydT4a2GoVXnZ7iU=; b=ae3ku+nb52tPKTkr8wRxpQfSBCtw/lgpZG7jOB4+5hMPMCoQaJXfUKhH32OpuLPZ9ASISl 04jEYjSYKvTyPemOEo0U56NScrD8h2XvebUyQ3X6CphjOilOBsq9yMnGEZZ2Djqt/2yjH0 0rueS+DWxmq8l3a7ZAPKvOBgVV8WXEg6jToO1ubxbd6Z0l5aXUeXClTHqHAqLO4soCAnGZ 70yDQwRrgQkbk0N8skm2Mwetysq9ZnT/CY+Y+YC3E+85vUOSntwuTpJ6RL0I9Bc+0uwX/Q f6j4U/GlDtK4x490VHoPVHo0EgBieAv7EbqZ6zw0ymBDiDhYeC+LlPtUVZ8nzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsQfX798HgxL8EH60zrh7dzYE1fLydT4a2GoVXnZ7iU=; b=lBJVhU3kguhsA1EomZmJjpoI5xOwLNEJX17KHayCayPC7fAvHlJ5slTKYvBhnpSi0rY9yw KSwFwj2vGIjuLjI4tSQ4gfp+S+CZSKrnoXgnTZCtK5QxsjI+nFHDuk4kARAff0n5HQvzuA vBlp25/Nl2QyKXD5DD3x+E5zcdJOKl1gl6K+n1YVK8TRem3058hJXpiKkNdo3MAuPetVcH Bilm2htFOe7hWokGSmfx//ivE19lrjpyrzOy+KRTf3nRrMHgnP47ERfWnGJObHyvXdbIFD KDMq/NAfRvKuOtsIUdj8bsbYoJ8T5z3jbmr1+NHav9cR5/YjCTBv/q82d/RciA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706405633; a=rsa-sha256; cv=none; b=pGFAsrhkjt//TfLiagC4RB6HyAkm4P/R8Z4ike5YmQpkaNEdAMS34uqd3tbBHFurJpd5OK wrY1Nb6SMr9A+GW9TUh6AcutjqklyzYM6SYKFwYxM5eQ8IM8KG36nJe8JYK2N5iUWYq6Fq DPvqieJzYKatMzsScEvfyLkxTTMZ5ugPVlDFnxA2/tzUWhc6cLnLSG/8oP7LuBTctZHJYD MFOyuI9KA/qNFcsXnk2MOTcf5JIjwGWGeF9w0NgWrNXuNcHqqnlSdl0voGHYf8a+IV9jpz ynA5CK5h1LyCeOgbAsrQ+ADcHhTGG+sUa1OAMT4UhoMpinObQ5s3xm95avCFXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMv8x1t76zp2L; Sun, 28 Jan 2024 01:33:53 +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 40S1XrBq062680; Sun, 28 Jan 2024 01:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S1XrwO062677; Sun, 28 Jan 2024 01:33:53 GMT (envelope-from git) Date: Sun, 28 Jan 2024 01:33:53 GMT Message-Id: <202401280133.40S1XrwO062677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 55210b704a05 - stable/14 - Revert "bhyve nvme: Add NQN value" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55210b704a056dfb2ea115edb3894efe16b7411b Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=55210b704a056dfb2ea115edb3894efe16b7411b commit 55210b704a056dfb2ea115edb3894efe16b7411b Author: Chuck Tuffli AuthorDate: 2024-01-28 01:33:37 +0000 Commit: Chuck Tuffli CommitDate: 2024-01-28 01:33:37 +0000 Revert "bhyve nvme: Add NQN value" This reverts commit 4bd4942ea70becc583246597b658f3dcdbffafde. --- usr.sbin/bhyve/pci_nvme.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 2fd49a84c768..d1b15d6f3a3c 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -514,7 +514,6 @@ static void pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) { struct nvme_controller_data *cd = &sc->ctrldata; - int ret; cd->vid = 0xFB5D; cd->ssvid = 0x0000; @@ -584,13 +583,6 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; - - ret = snprintf(cd->subnqn, sizeof(cd->subnqn), - "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", - get_config_value("name"), sc->nsc_pi->pi_bus, - sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func); - if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn))) - EPRINTLN("%s: error setting subnqn (%d)", __func__, ret); } static void @@ -3317,6 +3309,7 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_aen_init(sc); pci_nvme_reset(sc); + done: return (error); } From nobody Sun Jan 28 09:02:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN56j6j5pz589hM; Sun, 28 Jan 2024 09:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TN56j5zRzz4Tr0; Sun, 28 Jan 2024 09:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2fbfEocRNzrxAHcT3ZyGugohyMoVUkd145Sh78d8lmg=; b=YZ+tjnAyZ+r5VojVs902NeWZAHX7lGzhn15Oxf/gdWf7B0EQkRDGWljWfGSuKiF0Y9liOx 2bnmg0jZRAFSUz5A89VLok6RilLYb9SVTGePnXk0vGvMPlBsRFk7KFzYrMoNrSmDdbx5ES wegqD4egv86lLce62fkoMGr6UZ56r05D7ACe0d75L9B2WYZg0oJZhspluKu+ca8gFRGoAG DqeZ/UPqe5bDO1nOnSR02DoWEtRMA8ZMp5ax/vs4sFCzBE+LrWMLKnvXsxS2WJxgHPH3I0 H5Bj4OWJW//BNaLI6OIj0Mu8I1Lde4hWr45AvcI028ZUiTc5/2SauhbyUPuMGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2fbfEocRNzrxAHcT3ZyGugohyMoVUkd145Sh78d8lmg=; b=mFO6bW2AShghAukuzpHqSmAa+cx7+caYCtNOBpsLpZh4lHupTSeNC8uvK5BjM7ujP37NNM V7I1m81+B6rF1xxhDI1WezA+EVTyK7x5xdqxWwTOTg4QY0Ez5J0GEQkxqBMBsHSPZnaFwP pV9r2dxYnfg71dFTOxJoqB9i77wBWjr5buzIzkpqUrU/CTyrUrnW0eXgjI2joLAd0lCFF3 FxcPDU2hMmv9odtVoMRKPWlEbMhZ93jnpqEghNEvupGUTY6QUaMbhegKtoTyOms77YyuXs +aRXmeNelTuLLvoad1Hvcz6+3ZYM1/ogBowcky5V2vhrJuy/Zr7xedU1LW5AlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706432557; a=rsa-sha256; cv=none; b=IVf0Oe5lQygSf2y89ePTeTM1JHvnisgqtBIHBSgN/fhBIc3opWm6XxOZtS7Vkp3mNqeAS/ CHMVlcigJjpoGwSzv32+W3Zg5BnY6ncMY6KSJBUK5QzMbCOqWuo372qVev0p0t6GM6Tbyh p4Rj+EqSy/LxiB45YZkdysvzs3qMXSyJ+I57sU/1tfmmS2KwH490usAF/RQ8upGQ0EOsD3 RnGBgONFpzYtcsPvF9Spperj6frEHLfq99wsycqCI4P9KpAIOssRXmeo86oG9Msjplmvhv J+P1t7+/1dDUYblaoeXFvIN0wFiAcQEktfKvH7zjCbdmluGBbEjMLc9gFsk/lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN56j53S9z11HR; Sun, 28 Jan 2024 09:02: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 40S92bkJ018155; Sun, 28 Jan 2024 09:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S92bXq018152; Sun, 28 Jan 2024 09:02:37 GMT (envelope-from git) Date: Sun, 28 Jan 2024 09:02:37 GMT Message-Id: <202401280902.40S92bXq018152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Peter Grehan Subject: git: 2ee407b6068a - stable/14 - Fix issue with Linux guest XHCI tablet probing. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grehan X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ee407b6068a994bba45597c995c5ea76eec9cf3 Auto-Submitted: auto-generated The branch stable/14 has been updated by grehan: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee407b6068a994bba45597c995c5ea76eec9cf3 commit 2ee407b6068a994bba45597c995c5ea76eec9cf3 Author: Peter Grehan AuthorDate: 2024-01-14 11:27:12 +0000 Commit: Peter Grehan CommitDate: 2024-01-28 09:01:49 +0000 Fix issue with Linux guest XHCI tablet probing. The USB3 spec mandates that the device-descriptor max packet size be 512 bytes, which requires a field size of 9 since it is a power-of-2. Linux kernels recently started validating this field, resulting in the table not being probed and the cursor not working in bhyve VNC. PR: 275760 (cherry picked from commit 0c243cd4a3671bf728f33378ac593c08d8367bc2) --- usr.sbin/bhyve/usb_mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c index 80f79980a98e..a37941c0cd9d 100644 --- a/usr.sbin/bhyve/usb_mouse.c +++ b/usr.sbin/bhyve/usb_mouse.c @@ -154,7 +154,7 @@ static struct usb_device_descriptor umouse_dev_desc = { .bLength = sizeof(umouse_dev_desc), .bDescriptorType = UDESC_DEVICE, MSETW(.bcdUSB, UD_USB_3_0), - .bMaxPacketSize = 8, /* max packet size */ + .bMaxPacketSize = 9, /* max pkt size, 2^9 = 512 */ MSETW(.idVendor, 0xFB5D), /* vendor */ MSETW(.idProduct, 0x0001), /* product */ MSETW(.bcdDevice, 0), /* device version */ From nobody Sun Jan 28 09:04:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN59D2yBRz58BDF; Sun, 28 Jan 2024 09:04: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 4TN59D2NKpz4Vx7; Sun, 28 Jan 2024 09:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZceQzl/+TLIVuctEhMM8wZ7VCuulPKgMQScBB8JiHDI=; b=ugkAz/eanuA4QDhaFQuEO17AzH1kvlR+l5MTlXD2GBlH7VKEmoK8rv58CNOd80dahRheVo 6p+iuxPMj+Ow5nKVbTqFkAq7Y+Ws3sdKZDSOZqwZ2ZXMXhXqlVHMbp48gTkAGHu9skAd8b RTTWbhgRfjV64szCF14zVdDEwXbMu4DrxUZxFV/2gFUFBGAVTzoRDtSA7oedxJfo4YQ2cF l2KNlf3oAeQyc0tT2uxa2nVUbis+QPuCM5C0AuwjWPKdADrvvgkg0e2Iz3MdlfWoTKIqNx UZssITRh8NS0qqb2o5RFr95RSrOaEaNJHvteAOLaUo/l14w1Yw28SRUjlOxnhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZceQzl/+TLIVuctEhMM8wZ7VCuulPKgMQScBB8JiHDI=; b=j8YtaoudhgqHiU9lSZvfGojbrFLo/W79VdjHedDCeACZwRovUMQFdZLSMyuJIEwsm8cy0q 7W4nnFloQHzx0ejwVmJkXN4+jQp4fpOFn65WYkdhpBpGP0J6fAqb81WpxYl4n5fSlIiUhH SKpjtMlhYP1yz6GHtslyBpwVOi5KsLHxPa7qnwzfCvVe+wcoBtklNvuZZuHKObi2XoJWRH vd62BmR0plMzYe9q8uiKt+3ILy6Cd41lx2P23slkDhHVE4bZThwfCpJwQCzgCTzadOW9Fu +fkM8YMYZ9sRad14S++85TKY2xSK4gt+8DX03f91JkOpQBoV4J4eb05pUhwHhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706432688; a=rsa-sha256; cv=none; b=Hzgh0/JvwQkBMv1UdlYK6gQcH9fmxiRNy5fXly00q2dDdV8B3UO09pVPgwmTe0S1Joj72i SHuPVN+aGV0sBaGmCFIcHhYnIbracJbxl/uJrVFdoffZxfIeLleTUSDpBv+ieUepTXw9+c GusrniRR/4qjHGkUSh3qE3jkC3J5HB7w4SJO/z2T4nYaGPTGsvAPgOb+PZhQEzka9AYwc5 CNezvEJ1mZ84FfuAD+2or/XYHLnQCahR+eDtzkR7nfeV6eomc3chjIRCOpCY6RYlG3++G6 CAeKGEAPpsjqy1UHo2QIRlM0RIEWY+R1R+ujSrUURwKLZTTR0zUJSrFIUaiirg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN59D1QzNz124s; Sun, 28 Jan 2024 09:04: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 40S94me9018550; Sun, 28 Jan 2024 09:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S94mUg018547; Sun, 28 Jan 2024 09:04:48 GMT (envelope-from git) Date: Sun, 28 Jan 2024 09:04:48 GMT Message-Id: <202401280904.40S94mUg018547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Peter Grehan Subject: git: 48214dfab801 - stable/13 - Fix issue with Linux guest XHCI tablet probing. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grehan X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 48214dfab80155c03b9b22aca9f9810774c151e9 Auto-Submitted: auto-generated The branch stable/13 has been updated by grehan: URL: https://cgit.FreeBSD.org/src/commit/?id=48214dfab80155c03b9b22aca9f9810774c151e9 commit 48214dfab80155c03b9b22aca9f9810774c151e9 Author: Peter Grehan AuthorDate: 2024-01-14 11:27:12 +0000 Commit: Peter Grehan CommitDate: 2024-01-28 09:03:25 +0000 Fix issue with Linux guest XHCI tablet probing. The USB3 spec mandates that the device-descriptor max packet size be 512 bytes, which requires a field size of 9 since it is a power-of-2. Linux kernels recently started validating this field, resulting in the table not being probed and the cursor not working in bhyve VNC. PR: 275760 (cherry picked from commit 0c243cd4a3671bf728f33378ac593c08d8367bc2) --- usr.sbin/bhyve/usb_mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c index 80f79980a98e..a37941c0cd9d 100644 --- a/usr.sbin/bhyve/usb_mouse.c +++ b/usr.sbin/bhyve/usb_mouse.c @@ -154,7 +154,7 @@ static struct usb_device_descriptor umouse_dev_desc = { .bLength = sizeof(umouse_dev_desc), .bDescriptorType = UDESC_DEVICE, MSETW(.bcdUSB, UD_USB_3_0), - .bMaxPacketSize = 8, /* max packet size */ + .bMaxPacketSize = 9, /* max pkt size, 2^9 = 512 */ MSETW(.idVendor, 0xFB5D), /* vendor */ MSETW(.idProduct, 0x0001), /* product */ MSETW(.bcdDevice, 0), /* device version */ From nobody Sun Jan 28 17:57:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNJzf69H7z5919J; Sun, 28 Jan 2024 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNJzf5jJVz4X9C; Sun, 28 Jan 2024 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706464638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiW5jn5H21h6sevTxKUV3ynieGQLAVoJX0IMQ1CYbLA=; b=Kv98XmnI7SiELAjMk/5UaNHRYBwSq4Dw66PAXRUqgh2T3m5QtwQhNULaTeTA8p4M/8MbAi u0036a8++FhiGAfK+m2IqhnOqh8HdF5zehPDQ56mmD0VM0qX4P+YadDGne8gzmTOwXi69m 54ulLVFqsHcJhRtPpcf+v/uV9t2hSqyf7IFneJedMWM//E3TfOK+JD1TLc303lbeOKQSsW MtJrE7AodLyDkhSaTROX8TwYiWr2XwRC08vj80pDnyclIUXgbz6dpfRsIEFAEi06Q9CssM ajcAqhKtLYS08cOBMqPJvb2GeEiDKsUd92+bOZ4Djwct8mksk4RJG6+jAXJVdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706464638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiW5jn5H21h6sevTxKUV3ynieGQLAVoJX0IMQ1CYbLA=; b=SXsH9/cOJX4pEmiMQUdlavJ0/Pes7a0du+Zu0FKeP23Nmzm8Z8J6egCbi5DTgceoPaojMO a46jtQLwl2fQF2iMDymQItd4TlslQqC/nR7vf6MP7zFhBJUo26HHgPpj6PF/dQBz1SylUM MSMX6GNDM6uO8b93Fm3g+Fv5r/+5p2kWlUo52mvfWooQ9jw10uXXeqcsfLSZAFbxgAwR01 actODakhoeMbq7LBHMiBB1ByBORRoNap7jmTbCMnuSgh2KHoXrWJVouIyQtMFNTJgLbu6p tvbac8OUTAetnDxjJRsrCd7yD+gFocWi5Dkd2+oze+05D2UCFF8PaG3prElDEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706464638; a=rsa-sha256; cv=none; b=S8iNIZCOeEs6XfWZxYUpCqdaW5rbr0fowJCXZoOfBQA4uNmYfPlzUmMiiH1EUYJzKiDSnp 0RGny0e0+iYV0HFnRt1XHQ5mGjbcH8N+3B/cmDalrgfNKjd25qJKsWuclrbWdibkzZ+b59 lohBPfEKOaz1LsOGAdBp06Mi0GrGsfXoaOsVChbk1+eLRA6C+P6sJfwEqv5aAPVy9OimN/ XoFb5WtJOz1aAN+MYo1rzUAbF52uTAwSmbrxREP4MX3AyR8aQU4mt6/qTTqskIN2yJ/PyO ifAykm7cIbKXbtoxDtVBmxk/ooeQ6+vlGSJw1Ij06tGWxMrvqQ56ST5G0OlaGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNJzf4mwYzHBM; Sun, 28 Jan 2024 17:57: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 40SHvIf8011886; Sun, 28 Jan 2024 17:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SHvINt011883; Sun, 28 Jan 2024 17:57:18 GMT (envelope-from git) Date: Sun, 28 Jan 2024 17:57:18 GMT Message-Id: <202401281757.40SHvINt011883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Gmelin Subject: git: e65182c7bc28 - stable/14 - libifconfig: Fix bridge status member list List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e65182c7bc2835d847f363bf5d7ffc6e14426570 Auto-Submitted: auto-generated The branch stable/14 has been updated by grembo: URL: https://cgit.FreeBSD.org/src/commit/?id=e65182c7bc2835d847f363bf5d7ffc6e14426570 commit e65182c7bc2835d847f363bf5d7ffc6e14426570 Author: Michael Gmelin AuthorDate: 2023-12-20 20:21:55 +0000 Commit: Michael Gmelin CommitDate: 2024-01-28 17:55:56 +0000 libifconfig: Fix bridge status member list When this functionality was moved to libifconfig in 3dfbda3401abea84da9, the end of list calculation was modified for unknown reasons, practically limiting the number of bridge member returned to (about) 102. This patch changes the calculation back to what it was originally and adds a unit test to verify it works as expected. Reported by: Patrick M. Hausen (via ML) Reviewed by: kp Approved by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43135 (cherry picked from commit 3d36053ca6d6a17d408c8f92c504e6135dc9d8df) --- lib/libifconfig/libifconfig_bridge.c | 2 +- tests/sys/net/if_bridge_test.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/libifconfig/libifconfig_bridge.c b/lib/libifconfig/libifconfig_bridge.c index e4db90f373d6..2a9bbc35858b 100644 --- a/lib/libifconfig/libifconfig_bridge.c +++ b/lib/libifconfig/libifconfig_bridge.c @@ -111,7 +111,7 @@ ifconfig_bridge_get_bridge_status(ifconfig_handle_t *h, free(bridge); return (-1); } - if (members.ifbic_len <= len) + if ((members.ifbic_len + sizeof(*members.ifbic_req)) < len) break; } if (buf == NULL) { diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index cf0c81d6f682..44370a905223 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -663,6 +663,33 @@ vlan_cleanup() vnet_cleanup } +atf_test_case "many_bridge_members" "cleanup" +many_bridge_members_head() +{ + atf_set descr 'many_bridge_members ifconfig test' + atf_set require.user root +} + +many_bridge_members_body() +{ + vnet_init + + bridge=$(vnet_mkbridge) + ifcount=256 + for _ in $(seq 1 $ifcount); do + epair=$(vnet_mkepair) + ifconfig "${bridge}" addm "${epair}"a + done + + atf_check -s exit:0 -o inline:"$ifcount\n" \ + sh -c "ifconfig ${bridge} | grep member: | wc -l | xargs" +} + +many_bridge_members_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "bridge_transmit_ipv4_unicast" @@ -677,4 +704,5 @@ atf_init_test_cases() atf_add_test_case "gif" atf_add_test_case "mtu" atf_add_test_case "vlan" + atf_add_test_case "many_bridge_members" } From nobody Sun Jan 28 23:54:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNSvj48gWz57Zdn; Sun, 28 Jan 2024 23:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNSvj3h7mz4jjK; Sun, 28 Jan 2024 23:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706486065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0VMwb8pLXF/rQ28bYOW5j+ORPl65lyAcoCAjfDs6SPA=; b=epLjZKXVbs8nhcE0jm7tTcHWwSj3D3jDFy4RSOgd2Bx+V0/HUKWwIL2dGCMuLC9WdDQ4sw J33oIsj6L5//0Y5OazUZ6HxdTmQKs7LUYLj0zv1djg6gW7EN1EhUX3LiLkLTC1Tj4vkvbG ML9p7WBp/WpZnFlnAO63y5lv8PfBFTViMuRjOxZ/TVMEawpA4+ye9TD9Aa5OomK+DJvQCp HwG056dVgq2LpKV7uAng/4vwvhqyr2WlQt2/ot9MiydYigo+mnR4/+XgKDVUbaAD7ClT2Z FrQvsEMkwiMswxtPDz4BA90NK2i3FMYtZ1x4H/4vjfRJcwMIXt2Ecl7QXwaaOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706486065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0VMwb8pLXF/rQ28bYOW5j+ORPl65lyAcoCAjfDs6SPA=; b=BYOmJONqrqS1Plegbn4ep2McBRkwwiU+sShDIqN8rrbUdNLPLzovxI2OzwlppcYL3lY+IG CcOVkMC3E6jHMQCx5bWXlz0qFzyfspMrKHVVX/M3FmINKppDg/i4k9jLYqJnluZbCIY6NF Amio50oz57W3xs9xi11G9soOnDRItBgozxjNWOX9XjKSppPE67m3rD6h5sX8VfB+mrz8FV 6ncT0FP/S+sCONLmT7g8Mk7GOE/VWmc88kOcyk86oC+rq5gXSlIBXUxXNg2+5r39VtICay 5K2X1cCdwknxtyTZyyduh+jewwN9wj6b2EMRPk9iFuHUMch+LwN9T2kuknqJdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706486065; a=rsa-sha256; cv=none; b=Uo6fQmhvBLuobGEp0/Fo6esCmusvnKuL2AUTAVbmLkKcKgPlmDIaR47V4pe/D/1WXU9YGp WwfaDCblQQCtRZg2SIId7v5hqJoQYHZwUvTyA8uiYk0FcKdv1XnCDgjFgpb5oiX5QaB+B7 UmLds2oZ2A/HS015Uzr7vc9vOCxpxePPE8VEJzN16EpwmmIAeobIzMHep5sr6epJyObHs+ oFac/RqzFWf57/SHii+uD6uSPW5G+S94V2xs4psZBwA7rl9qd8u5/BypjVGdnniSk30vHZ rFZbvM51pz9LPGUVMtWRlQb4bAGDAWQrFEanme/otHZhvFlNMzTmUknqhTFvMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNSvj2kQSzSBM; Sun, 28 Jan 2024 23:54:25 +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 40SNsPBv020250; Sun, 28 Jan 2024 23:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SNsPjF020247; Sun, 28 Jan 2024 23:54:25 GMT (envelope-from git) Date: Sun, 28 Jan 2024 23:54:25 GMT Message-Id: <202401282354.40SNsPjF020247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: dca696965fda - stable/14 - bhyve nvme: Add NQN value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dca696965fdaee80f91d44cc210bae380ce6b56b Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=dca696965fdaee80f91d44cc210bae380ce6b56b commit dca696965fdaee80f91d44cc210bae380ce6b56b Author: Chuck Tuffli AuthorDate: 2023-10-12 22:04:17 +0000 Commit: Chuck Tuffli CommitDate: 2024-01-29 05:19:00 +0000 bhyve nvme: Add NQN value Add a NVMe Qualified Name (NQN) to the Controller Data structure using the "first format" (i.e., "... used by any organization that owns a domain name" Section 7.9 NVM-Express 1.4c 2021.06.28 Ratified). This avoids a Linux kernel warning about a missing or invalid NQN. (cherry picked from commit 32557d16e2c3c24c04eccfafd895e1514dc65b35) --- usr.sbin/bhyve/pci_nvme.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index d1b15d6f3a3c..2fd49a84c768 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -514,6 +514,7 @@ static void pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) { struct nvme_controller_data *cd = &sc->ctrldata; + int ret; cd->vid = 0xFB5D; cd->ssvid = 0x0000; @@ -583,6 +584,13 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; + + ret = snprintf(cd->subnqn, sizeof(cd->subnqn), + "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", + get_config_value("name"), sc->nsc_pi->pi_bus, + sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func); + if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn))) + EPRINTLN("%s: error setting subnqn (%d)", __func__, ret); } static void @@ -3309,7 +3317,6 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_aen_init(sc); pci_nvme_reset(sc); - done: return (error); }