From nobody Mon Apr 22 00:31: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 4VN5lR4FtFz5Htrc; Mon, 22 Apr 2024 00:31: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 4VN5lR0sZcz4R7n; Mon, 22 Apr 2024 00:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713745875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvuluoNuA177qhSlLycFT0qwiG7WvxgeGcGk9byRtmU=; b=MVLiL6EbnQ4V4AJq+ZtQy1+C4RZEhX+NVUcQAkRWBWePmnmuw0B6tJA8VaHs7BzdpgS3L/ 6EaZ1tHgiM8Skn/MQc93LUtVI4X1jr+4AgwG62DrhUr8jLzAZ/O1yQ3Vc3xkGJ2ZF4lLUD muQSR10uDZHMr8nsqBBY8TEN9Yg9a8Pve8fwSXd/2GBEDAxKjhvX4dfk4igGNiWHDmgNzs cUr6tR3EXqcuZb92Nqs5y10bU6oqiJdyJnasNoSekszn0As+HSO5W9nYYeuC9nC1BK4DGF BxWDuCn3YI9PrpAqkvdxr0tHSVHQkqzhIGS+ILMx0VX7q4a/sxf6Dqx8acMJsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713745875; a=rsa-sha256; cv=none; b=ezaP5l+FRQTUzFjG1EN7wKOjWy+CwL0GvkTrpELbTrWE+8Ggy7kMAoxP0nw8bb3y6Nylxu 7hzEwlTM4BWQiyvBI/39GZ5O9kva8+K76WrjoEW/RmXNx4pRW/DJ9gC+B/WpBqS28oEI8g PI0hXJi7px1b4Wwpf/xh/lMexYwep3tmL1y6pn3bIEDcit0u41oPk//dolYwVgZnndcn4E fvtTnYrHZH8eJZefXwyOReWSYBlWT2fK6xTDH5ZX/B34Yo13FH+oTluAgUCKYQodbiyWaL xtAuUDLYMm3nvSO+x2dCJNDJ2maXiPqccO2VJFKb5K9Vsms1NLenErn3f1E0gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713745875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvuluoNuA177qhSlLycFT0qwiG7WvxgeGcGk9byRtmU=; b=d/ZdYDtxEv9lUIyxWR5qKOPJj0m/uUpKk+LbteayiVkJQvbEmTPQ2C/1B4suDqbcSh2+li dktTyhmxY8//wU66PDjd+oH7upo/UiR011D+lMdkGCHS4A7fapS0RITYA3hfygwg7D3Uul byslpnKAMZ7QohpeMs0a+K3G+oUF8vLeUzO+Nw8fAiAL67av0l2591rMg+UFsqmtuIjGL8 /qw4Kcxwg5YG4G8O/NzhJiSbo717bJwnL4VhOtj6pgftVZ9eZ1W77y2ODkc2g4j4vvZALp yBx6E1F3UWJrZJemVR38FkhYVJnn0g0OUK5Q+GTzuCGF6JGBHzlLrM8CnXK/AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VN5lR058dzRfn; Mon, 22 Apr 2024 00:31: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 43M0VEjc079244; Mon, 22 Apr 2024 00:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43M0VEDX079241; Mon, 22 Apr 2024 00:31:14 GMT (envelope-from git) Date: Mon, 22 Apr 2024 00:31:14 GMT Message-Id: <202404220031.43M0VEDX079241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 933490d3b6d4 - stable/14 - kasan: fix false-positive kasan_report upon thread reuse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 933490d3b6d43f7ad1dd5d8720fb2f7774d7f26e Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=933490d3b6d43f7ad1dd5d8720fb2f7774d7f26e commit 933490d3b6d43f7ad1dd5d8720fb2f7774d7f26e Author: Ka Ho Ng AuthorDate: 2024-04-19 19:18:27 +0000 Commit: Ka Ho Ng CommitDate: 2024-04-22 00:30:58 +0000 kasan: fix false-positive kasan_report upon thread reuse In fork1(), if a thread is reused and thread_alloc_stack() is not called, mark the reused thread's kstack pages clean in the KASAN shadow buffer. Sponsored by: Juniper Networks, Inc. MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44875 (cherry picked from commit 68a3a7fc94833020403190c20bd9be186c6156ce) --- sys/kern/kern_fork.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index edcd8a1f2139..9bbe7c8a8153 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -1028,6 +1029,10 @@ fork1(struct thread *td, struct fork_req *fr) error = ENOMEM; goto fail2; } + } else { + kasan_mark((void *)td2->td_kstack, + ptoa(td2->td_kstack_pages), + ptoa(td2->td_kstack_pages), 0); } } From nobody Mon Apr 22 13:47: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 4VNRQb4VL9z5H7tg; Mon, 22 Apr 2024 13:47: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 4VNRQb40hkz4fLH; Mon, 22 Apr 2024 13:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKCugiBJF57dzHsEcl5IeR/10PDA/ZAc1b53y3jV/0Q=; b=KjTSwg9pNhzLpt+lueyF60eFj0gXlA8LLvxN+0vFqC0WoktN1k0/r7HO5hN9uCN+Tonyg0 ytOVTrA5Vl6wEBpjOj6A7VsKWEh7b+vmyq+EzQkw2X6fq/A3MWj6IwNfZOj3nUxSyAxtWM ktBqmA5B0JgpFwW9LnErVjNoVQWUxfmgri1m3SASZTsq4aDiYmYIZjFH6b6MWet+6tz0Z8 lc6MsI37sPk4OWVC960hv1m8pq5TTzdNS5Jt5rXYrSyLsN1p2Ez9vpb6WEkbBjeHx1n+73 x3hnlajr90Ms3TqKKebUaCQs5qMlKcbczGqXzzyrwYNZkLP7Bj6hfLYVmG+tJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793671; a=rsa-sha256; cv=none; b=TH9G2zMp13nYJvM2ZjxPGT5b3QGdP8qVVm4SKXGmZE3omIWP/BdcnIlx43zYZNIoGy4I2q gGhqrguVgp02RMrhum0U689xNIu6OtV4x6HZBP+u6532pwJ0NZUdKi1AGQqjWN+Oy137ej iLjvnN1B6MaRx99bBUKHXCJiB2vHAPNMeWOsPCnDruIStqMmxmjcYQdr/Gk0ZVdxbc7iCw dSEkxQq3nG/FtRdD/04rB1sgaXe8hwmCBsDVni4eIzlhGc1Swu/HXXFE4RecpPrZv3OrG6 Vu9lG65K54EIJMQHlwk0fRRysgqBLouiqCRZiDV3IH9SODspZ599rtDHcnjCzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKCugiBJF57dzHsEcl5IeR/10PDA/ZAc1b53y3jV/0Q=; b=WAFiJ7ZcgQKNHzAsT5rG/DS7lAjDuLpc6kooCsrCHOnmdR7i4wb8p7kaBf3aGIYeTmzRhP OxQtjdlD0xZNeNSsmlhHcpUptqxxn0Q4tiz4AJbejJreFZa0AyLxpO+RkkjBfYr5Azq5ye MTpp5UB7MmFeidB1aQWSWjSIJTDDht4w7JjOMX3607UVp9eu0mq2e1LhAEX5SVWNSvqJyr ojOrzQorVGYKxMeIvJmdkXoPayytQvKCEYg9Z9HSIJ1LFeb7STTHGcQVcxW0r6IYsEU+Ma yyfydYGyHgnfbwoZ0D8pSPuEC8Sv6T3WlYA3buqcCaoUkVhvg4j9NXmBEvS1tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRQb3Tg8zqp0; Mon, 22 Apr 2024 13:47: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 43MDlp96021605; Mon, 22 Apr 2024 13:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDlpNU021602; Mon, 22 Apr 2024 13:47:51 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:47:51 GMT Message-Id: <202404221347.43MDlpNU021602@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: 753de7251761 - stable/14 - tarfs.5: Provide some guidance on zstd frame sizes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 753de7251761e9ce7dfe7a6196b6d2ef7806d996 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=753de7251761e9ce7dfe7a6196b6d2ef7806d996 commit 753de7251761e9ce7dfe7a6196b6d2ef7806d996 Author: Mark Johnston AuthorDate: 2024-04-05 15:28:55 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 13:47:37 +0000 tarfs.5: Provide some guidance on zstd frame sizes Reviewed by: des, emaste MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44636 (cherry picked from commit fd56d24725860a3c1f12180cf8503d38d8d0c70d) --- share/man/man5/tarfs.5 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/share/man/man5/tarfs.5 b/share/man/man5/tarfs.5 index 5378491b9c9f..56c56ac43287 100644 --- a/share/man/man5/tarfs.5 +++ b/share/man/man5/tarfs.5 @@ -74,6 +74,15 @@ to create the tar file, this can be achieved using the and .Cm ztsd:frame-per-file options. +Sensible frame sizes are powers of 2 between the system's base page size +(see +.Xr arch 7 ) +and the value of the +.Sy kern.maxphys +sysctl. +Smaller frames will generally yield a worse compression ratio and require extra +kernel memory to maintain an index, and larger frames will on average require +more CPU time to access data when performing random I/O. .Sh DIAGNOSTICS If enabled by the .Dv TARFS_DEBUG From nobody Mon Apr 22 13:47: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 4VNRQc5B7Wz5H7cj; Mon, 22 Apr 2024 13:47: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 4VNRQc4d8yz4fg4; Mon, 22 Apr 2024 13:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaIvjqGkc3hCAfHdeJfoe3gnlG2bnoynmMt/blC1zOc=; b=t8HREv1RO1liYSOdKRoMJ3rSXFEcVMQ8RpD7XpNnj7sIpLvW1N+QKYYiRUgDI5bQB2vcf1 p6XqUPHhKhllnDZtTF+4Sjk5EugxAULcAsT3NXkWGajUIV9jPuE+rviUGB3PqYT9zLA7+S DIx0fISgjSElSQ6YwyYSixAmilxYcvJNJzwHzKaAAm7Bd37KNZ0hCbMnoWEK+jyQp7hhQu fGCGw8s9iyRwoQdbxFIWSFlDdwq+HEtTlNL6JmlSRoFlUsrRm8sURgN2HTo0aEgFxpcaal 7EiVUTXP125wfKsZVvcUM+EdAtkTQblulZ5REVdASLWUBuk26a2PS42FbjblNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793672; a=rsa-sha256; cv=none; b=RHTJU21EnNvN6ZkeWtFD8VXTGht44WSS4jPz/KiWPidkdFbMdDYT5cF5okoCzmpBHKKD7N 58pDhkDLFBExIQ8BgJTmD1SA8u6AMbiuNHmcqtKfpe0OV7wsbhqQOc5V0+VyV0lQwaYJbX daNwVeStZrn7RQ+/NxIA2ORrHbCW/WVwiMMQyvl8/qZgsWTTn+inDF0DSdC3Dp4ho9GL2s mt9UhJpXo2oil8RSN+KMfCgOabu++Vsuf3dIStMsm6Qo5gClJ6aKoAFV4oTiLeYyoJy2gV tCFqhRBJdXQOF7sD/IQMrJvEVma/GaNDC+VhmEzd8xLuL0SGYoNmh6jXclj+CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaIvjqGkc3hCAfHdeJfoe3gnlG2bnoynmMt/blC1zOc=; b=HxsvIzACvtVZsp4GU8AopasXef+daNQAXw22ztETB7l4AQZjfqXt+Lx2nI4Zk0nNpk0Fd2 p9dhVkn5dYHi7Hkc7ueNj4k1hGbPEk3OPtKM3rAaBJo6pM67G45bMm7zKJDl0B8Ki99WIC VcDn9oEM9TLu0e+usPpAu4pTHS4HEzUoQY9z8tqKulQjDP+e8GrFsV6INOzfaT/gsSzecf ZZPHOFfPvOl49gx0EvigY/bqlUSFPFoPBPHaSAe56x+cMZ32AyimpwhYzok5a51U7t+Phl +LLNxsRs6l3pNHcQ8Si3uvjxIFEvrd2RemKfaZqOXojRoH56hBtf6HMk0V+9gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRQc4DL5zr3y; Mon, 22 Apr 2024 13:47: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 43MDlqf1021667; Mon, 22 Apr 2024 13:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDlqkL021665; Mon, 22 Apr 2024 13:47:52 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:47:52 GMT Message-Id: <202404221347.43MDlqkL021665@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: fc045609789f - stable/14 - arm64: add CPU part identifiers for Apple M1 and M2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc045609789feec9d6dce75c3558fd080d53a004 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc045609789feec9d6dce75c3558fd080d53a004 commit fc045609789feec9d6dce75c3558fd080d53a004 Author: Lexi Winter AuthorDate: 2024-03-23 16:18:24 +0000 Commit: Mark Johnston CommitDate: 2024-04-22 13:47:38 +0000 arm64: add CPU part identifiers for Apple M1 and M2 Part numbers are sourced from Linux (arch/arm64/include/asm/cputype.h). MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1144 (cherry picked from commit da2b732288c72b347b128e1fa9a169c7bba3beb8) --- sys/arm64/arm64/identcpu.c | 19 ++++++++++++++++++- sys/arm64/include/cpu.h | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index d02be636ad50..8ecb4926c198 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -251,6 +251,23 @@ static const struct cpu_parts cpu_parts_qcom[] = { CPU_PART_NONE, }; +/* Apple */ +static const struct cpu_parts cpu_parts_apple[] = { + { CPU_PART_M1_ICESTORM, "M1 Icestorm" }, + { CPU_PART_M1_FIRESTORM, "M1 Firestorm" }, + { CPU_PART_M1_ICESTORM_PRO, "M1 Pro Icestorm" }, + { CPU_PART_M1_FIRESTORM_PRO, "M1 Pro Firestorm" }, + { CPU_PART_M1_ICESTORM_MAX, "M1 Max Icestorm" }, + { CPU_PART_M1_FIRESTORM_MAX, "M1 Max Firestorm" }, + { CPU_PART_M2_BLIZZARD, "M2 Blizzard" }, + { CPU_PART_M2_AVALANCHE, "M2 Avalanche" }, + { CPU_PART_M2_BLIZZARD_PRO, "M2 Pro Blizzard" }, + { CPU_PART_M2_AVALANCHE_PRO, "M2 Pro Avalanche" }, + { CPU_PART_M2_BLIZZARD_MAX, "M2 Max Blizzard" }, + { CPU_PART_M2_AVALANCHE_MAX, "M2 Max Avalanche" }, + CPU_PART_NONE, +}; + /* Unknown */ static const struct cpu_parts cpu_parts_none[] = { CPU_PART_NONE, @@ -261,7 +278,7 @@ static const struct cpu_parts cpu_parts_none[] = { */ const struct cpu_implementers cpu_implementers[] = { { CPU_IMPL_AMPERE, "Ampere", cpu_parts_none }, - { CPU_IMPL_APPLE, "Apple", cpu_parts_none }, + { CPU_IMPL_APPLE, "Apple", cpu_parts_apple }, { CPU_IMPL_APM, "APM", cpu_parts_apm }, { CPU_IMPL_ARM, "ARM", cpu_parts_arm }, { CPU_IMPL_BROADCOM, "Broadcom", cpu_parts_none }, diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 9ef5b7897a7c..c84d48438964 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -134,6 +134,20 @@ #define CPU_PART_KRYO400_GOLD 0x804 #define CPU_PART_KRYO400_SILVER 0x805 +/* Apple part numbers */ +#define CPU_PART_M1_ICESTORM 0x022 +#define CPU_PART_M1_FIRESTORM 0x023 +#define CPU_PART_M1_ICESTORM_PRO 0x024 +#define CPU_PART_M1_FIRESTORM_PRO 0x025 +#define CPU_PART_M1_ICESTORM_MAX 0x028 +#define CPU_PART_M1_FIRESTORM_MAX 0x029 +#define CPU_PART_M2_BLIZZARD 0x032 +#define CPU_PART_M2_AVALANCHE 0x033 +#define CPU_PART_M2_BLIZZARD_PRO 0x034 +#define CPU_PART_M2_AVALANCHE_PRO 0x035 +#define CPU_PART_M2_BLIZZARD_MAX 0x038 +#define CPU_PART_M2_AVALANCHE_MAX 0x039 + #define CPU_IMPL(midr) (((midr) >> 24) & 0xff) #define CPU_PART(midr) (((midr) >> 4) & 0xfff) #define CPU_VAR(midr) (((midr) >> 20) & 0xf) From nobody Mon Apr 22 13:48: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 4VNRRW151Pz5H82W; Mon, 22 Apr 2024 13:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNRRW0XrQz4g9H; Mon, 22 Apr 2024 13:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyV0KWFrRCNS8lP20wZ8ob4+ueGAH8L0mkbjs/4JMBA=; b=w5Dwo/Kyv+X70ZiXlHp2CRb8HAc/Izoox+zvDcUJkFK4Yb32Z/tp2xbsXXPTYpGLWNRdBf MFMy8Et1MFwAK2A2buMolbsR2j29RcmZQM7mnoeVnvOG8GFm4nzwd+jMIdnfUPMUPD4XlI huG4JNHTgbtKBySA+hLVdj7jhA31C1hbgqbjI7jnoFbjUJD2LARprbBJJF4z37m3dM/K1W zcLXrT9lKTAZFqTsZzFw7AtNA13KcQiEtx9Ml+tD2MwmWM5G0zP5CEEoPItnxDyMTO7SSj x7F0JF7eONLqSshg6EjHLlUueOvuplI2JO/K60A94lfmTyfWuQL1eTT78PZQ3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793719; a=rsa-sha256; cv=none; b=yHchQXS+i2aZpRqjKz2aDhVt1u/P+4DrH/GEeuX1Ynhi3rmIs9NcRMHtT8aaZDjkINMdl1 kw5N/xrl3qiR2aL9tYvgyLhd7u8C9Xyp5m1srM9j+GNpo0Jhuv7RhqcbMyLkkeImyR0qTF uagnnOjPrrE4JUNPLFV/1PT0G73C7desK9hhyPep/M0CpkLen6nPM4FLRMMSGJyKE4tpMk ZKI0dmonD7CZ5jh67WhfNkM5iS+aaWg0/P1Z9A1K3gOSgKsVCmcvk4e1ps3NuvblZ3DNTg TCWb2xSMhNRCPy33SbeIq4MlNHiaNg8Cfj8/EsPm4wW1/OW14c706oU6Clp9hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyV0KWFrRCNS8lP20wZ8ob4+ueGAH8L0mkbjs/4JMBA=; b=twRhwobZc/AlMyWku1aw/6b9Z8EFq9Tw78RHcsOZNHZv7MDMMXgdyolh0cpVrPO+qB6tFD CTR7cmIcWaHUbkfB99q8rO+HQRKucPcbBg6FQupsBiUo7D3TPdVZcD75IqyMtipYgjeC9W VlY9KTTKAVTb+V6WUwyc9Fjw06RuQ1d1j2bbX+dGcRAHGk8ioOsIanopTcSJCyJgeGM8sp x3yr+qFaAf11VWHJVgKJjmq00qNFzN0aodWcU7EFqKNANnafA+NzGSNWDnxo5jy4mqYV8u 8B/dbXjODAo+Z4h4ZQcQvCTAy+rqKT7THcn+/9mVruKBP8E023tZQqIGbA6fIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRRV6y6dzqZZ; Mon, 22 Apr 2024 13:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43MDmcrT021952; Mon, 22 Apr 2024 13:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDmcnk021949; Mon, 22 Apr 2024 13:48:38 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:48:38 GMT Message-Id: <202404221348.43MDmcnk021949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a1e55af8d123 - stable/14 - Fix MNT_IGNORE for devfs, fdescfs and nullfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1e55af8d12398ae43725ff6987b2fdbb2044fd2 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a1e55af8d12398ae43725ff6987b2fdbb2044fd2 commit a1e55af8d12398ae43725ff6987b2fdbb2044fd2 Author: Doug Rabson AuthorDate: 2023-08-26 09:32:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-22 13:48:15 +0000 Fix MNT_IGNORE for devfs, fdescfs and nullfs The MNT_IGNORE flag can be used to mark certain filesystem mounts so that utilities such as df(1) and mount(8) can filter out those mounts by default. This can be used, for instance, to reduce the noise from running container workloads inside jails which often have at least three and sometimes as many as ten mounts per container. The flag is supplied by the nmount(2) system call and is recorded so that it can be reported by statfs(2). Unfortunately several filesystems override the default behaviour and mask out the flag, defeating its purpose. This change preserves the MNT_IGNORE flag for those filesystems so that it can be reported correctly. MFC after: 1 week (cherry picked from commit b5c4616582cebdcf4dee909a3c2f5b113c4ae59e) --- sys/fs/devfs/devfs_vfsops.c | 2 +- sys/fs/fdescfs/fdesc_vfsops.c | 2 +- sys/fs/nullfs/null_vfsops.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index a81a63ebf27a..dbc29fbe4d78 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -224,7 +224,7 @@ static int devfs_statfs(struct mount *mp, struct statfs *sbp) { - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 309134798374..30924580dece 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -219,7 +219,7 @@ fdesc_statfs(struct mount *mp, struct statfs *sbp) freefd += (lim - fdp->fd_nfiles); FILEDESC_SUNLOCK(fdp); - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 262a6793b285..5114fa0b50ae 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -372,7 +372,7 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED)) | + MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; From nobody Mon Apr 22 13:48: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 4VNRRX3HkNz5H89b; Mon, 22 Apr 2024 13:48: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 4VNRRX1Drgz4fxM; Mon, 22 Apr 2024 13:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCqvuWLFW1wYCC4mj+NvaWg9ljN3ElyhALZU+i/zOT4=; b=nqQeZUWnoiqWz24mVtUiyk5ZyULNSMVoTFyHLBt2Sa3Pn4XP5AbCpt5HLds1QkWW0vf6JZ s9Phceohe1VmK42lEUR8eSpfwTG48kqEkmwv/ImbHHk8KtYPJ1Bc3K9yP/ie+C3HOY2fB8 gzjmGNf4HZ0tRS97pFksYU61/G1b02lZsx9d3eAOdqqsFXubjAeFkutktlhYBHBNgDCAwk fvPCDAj12AjSV48RoS4cXs95uA2euFJo+Pv12bzSgyYnUcs0j1Avol4vv9oUwk3CLGG6pS bkKzi1q9VEBCBF2V9Xc6JX5ML2LjJaKv3rFxLQyfO8j5QeV/4u+2i0a/b78xtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793720; a=rsa-sha256; cv=none; b=ThIhSFEgGOUpzZetnHokogibo3auKz4XuVP8zA4KhwpqQ5NClSoLX8F8xJGWY9SlZAwjgb XtjBQ5SsteJdsyYe1JnbkQnynzNWFbXonYwBaebQYN2oQWYiW0i7PRysmxS40fBrwVRi7t M9GKBelpEHHQGHMF97y+V9PLGGrjqqbg0ahxXQkIetwRZ7VyrpEUAMNe1VYQFwIhXrB0zy 83pERvReG3CJ+43iFVZBlvqeFnqj4XUtTohOaBzg/Ygfqstqz8pbi5TvJHLCBp204HLZ51 VPlouo5DAWCqP0g7jyAqMU+JttoDIVNdAFuhqEVvjld+KACtOZWm2tZ/7tO7RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCqvuWLFW1wYCC4mj+NvaWg9ljN3ElyhALZU+i/zOT4=; b=M5lODXOnS2zQTtaHLcG5k0vUDSCYU6One5TiFdrF6AtnC9rgpMkTLX9sTKkxAfxkIqZQ+N x9xDko1l5vl9yDK+JqCjUIfcK3STUEcb5SwI1BXAhFfQ2icrSdkuaL5mEQuxa5LYf5zJEG EU0eUoITE3y4hhm1Bq+fq1+XwSA4PAJptFzibdlWV+3BuCisk1TaSE1xUdFylFznwssatM 4MySpLzy+FNlowqQ0OKuKv82KqWJn6tOy3QGvqu9ogvYlh7EbVl01K/uQc3byYb/ljYWnG kHcA07ikL+iC1q1eEXIlgw8Ju8XJ6+99yR3dh1JeLSGFibmpn6q9L4WjhCK02w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNRRX0r9BzqZb; Mon, 22 Apr 2024 13:48: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 43MDmeoK021997; Mon, 22 Apr 2024 13:48:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDmefA021994; Mon, 22 Apr 2024 13:48:40 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:48:40 GMT Message-Id: <202404221348.43MDmefA021994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0ee0770fafc3 - stable/14 - nullfs: Show correct exported flag. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 commit 0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-13 15:20:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-22 13:48:15 +0000 nullfs: Show correct exported flag. MFC after: 3 days Reviewed by: allanjude, kib Differential Revision: https://reviews.freebsd.org/D44773 (cherry picked from commit 2b258dd17caf329bc549f93d9858b74109a479d7) --- sys/fs/nullfs/null_vfsops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 5114fa0b50ae..35d0f46d0ef7 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -371,9 +371,10 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; - sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | - (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); + sbp->f_flags &= MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | MNT_UNION | + MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_EXPORTED | MNT_IGNORE; + mstat->f_flags &= ~(MNT_ROOTFS | MNT_AUTOMOUNTED | MNT_EXPORTED); + sbp->f_flags |= mstat->f_flags; sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; sbp->f_blocks = mstat->f_blocks; From nobody Mon Apr 22 19:43: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 4VNbKQ1pXpz5Hlvn; Mon, 22 Apr 2024 19:43: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 4VNbKP6zVHz4lyC; Mon, 22 Apr 2024 19:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5I3q19OH6pnnEJPF3nUwjUPmn6JemRfVFhi0v0W3tg=; b=uuqh619tkNWtw2SmRoeuwfXhv9C17h7JhNW8U/eAqazrdFf9qwtSr/bq0MrieVyZyR8U6k Xy40ARgCkO+BoE26dar4f6seGO/wdBfU9YTb8M9v2oRw5RHLOYkbl5RIU20WUFKW/Q28cI kuF+itjKVajlg5M8JMQt/mPEsGCHlJZXkn4MFU9W0/Aa1efcO4Pey+mw3EWtNhfyTIGyfR 6NeOlwnVTYAjyaUhEHfYqHOQDK35HNXaWrkfXBSkjEK/urPOEoq6EaYUWC60VF9g6uME8h +pHtQknSpW7dPiArQ75fKHlnVBjzIQGHveFJ2kNqxxxHzbgjKt7JgWFrNZjE6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815034; a=rsa-sha256; cv=none; b=PQiRRiV9IXOoJXJVkJXbXS+ZyVzi+IA5rhdH4f8rblgc2rd81jz+FWMkv3uZOdeKEDnt7d 3j/qdqg2QAfGcpilnAHU7fdZH0j1yODgrNR1YV85iWiqvqMIfOg0rs5teu83esdlhK6hst uvQCj9SBmZKHwp3fjOIej8zytHUsZHvwd5cMWqE8YFRKlizvmeNXosptAfVE5lgA+yHlk3 /KhlAF0i0yFr7b1DRSKUJhjdl0tyPogiLa26BlJObm25waLtjWU7IgZ2q0fGKwNeoO8x5C it5c2NOu552GIJ91MGstmM29g+Np2rZiidNgqDN+K9MhaMf+nA9XVe0QOhvsgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5I3q19OH6pnnEJPF3nUwjUPmn6JemRfVFhi0v0W3tg=; b=q8ZfD+JKtqnthfKGyW23/8HIYS/QKa2gVh/tjy17Yy5rlHL//cKBZlULJvX4FvJ4Pz7CRz y6nHisU3RvOGGrDh9S4VAL5Gjb/Rd/F5H2NndLhd0yPuIEtIHjAkAsHlEcdDAV4ELb0tZx 7IYpYZ/gjPmOIOt8TYfKeu6GoML8Dgx5S79QgYK2WKBKtISwIbQ2S9WU6L60c5h8PL6Ple PciOJgthFBbR0F1tG17SiXKTzNkjJ+Wz3bNLvwGYc5L1kl7YYHdaQWCP3JocIRaGK+J7jX 0VoTyllIhhpj75kyPG4RBf2Mx53ouWr61GVfJlBfw5bXt8AAlbsqzZs6ifvmsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKP6bYvz126l; Mon, 22 Apr 2024 19:43: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 43MJhrpN031872; Mon, 22 Apr 2024 19:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhr8s031869; Mon, 22 Apr 2024 19:43:53 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:53 GMT Message-Id: <202404221943.43MJhr8s031869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f44b05ee942f - stable/14 - LinuxKPI: add PCI_VENDOR_ID_ITTIM List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f44b05ee942f0ca94d6a73988e3abe0737a95900 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f44b05ee942f0ca94d6a73988e3abe0737a95900 commit f44b05ee942f0ca94d6a73988e3abe0737a95900 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:40:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:23 +0000 LinuxKPI: add PCI_VENDOR_ID_ITTIM Add PCI_VENDOR_ID_ITTIM as needed by mt76. Sponsored by: The FreeBSD Foundation (cherry picked from commit ce707e674f7941c0743e72193c433fcf554a82b5) --- sys/compat/linuxkpi/common/include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci_ids.h b/sys/compat/linuxkpi/common/include/linux/pci_ids.h index f23cd7d6a124..b52ecc525db6 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci_ids.h +++ b/sys/compat/linuxkpi/common/include/linux/pci_ids.h @@ -51,6 +51,7 @@ #define PCI_VENDOR_ID_HP 0x103c #define PCI_VENDOR_ID_IBM 0x1014 #define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_VENDOR_ID_ITTIM 0x0b48 #define PCI_VENDOR_ID_MEDIATEK 0x14c3 #define PCI_VENDOR_ID_MELLANOX 0x15b3 #define PCI_VENDOR_ID_QCOM 0x17cb From nobody Mon Apr 22 19:43: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 4VNbKR1wBDz5Hly4; Mon, 22 Apr 2024 19:43: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 4VNbKR0lBtz4lsK; Mon, 22 Apr 2024 19:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJnILKmuJL7YFXb57bhbJZ9kkYfZ0Q4GxoCleU9R/ZE=; b=Goscu3S7n/UU4rkfj77ZcBlqTJ9RtowX6DJjb7a8dOqoTAq781fK0jFuahRk2LRFvyYZWg U7L6V3nrunbVB8pflZcH7sDfZqKB5fr/3XULcyD4jfzqHjSukdn+D6G3QCkm+I6q3k6NhV PrFm9lq3PA/eqca60Ta2F2zK3lbas5NWoYukqXjZAHJYo3RTdli3cktgwP9+gLbGOYWLAp fszRUjW/607BEXho6VfnbG1o9gQBiduqxfYjUSHl7b+kGeMX31wYcWPikVi5SEwkbnr30a mo3lHRyKVjYpH3U6UNrn1kk6W/gKEtrF+FkrcP9Lnzj38899pTaR8lXNinujrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815035; a=rsa-sha256; cv=none; b=SR1CTw/ucfHUo5U8/nwv/Z2n5pSmwHQetepAry29ojsLlI3IqI0PPo/UFJNJZjDRVFgahc aoIoa6AVn5sq90wlojHhPOf7Uf/F4KFsJwJ/m8R54juR+LRJQijQf26GOiaK2FqwZ/cr8z ucidHjgGaXX63w2spRenRwxpiAC/7yCuEfPLxH+xEMaIIclMrpDlpMFxLSZOBY6S6IK7VX NUEtIJDzw55zM6nUwAXioHb4OYQgz33LpjJIk2TO5NZdrD4WFbgGfYB4J28DGSaXnb1j1m EiH+6h1n2DQSw1RDFcNE7HRDq6v68UC00bYT30O8TU4oZp1TqIJ9a1PzcUiycg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJnILKmuJL7YFXb57bhbJZ9kkYfZ0Q4GxoCleU9R/ZE=; b=NAVuEK0Vl/xpc3T7MzcGVNkAWBLDyTo9+/793Ejg7R4ggxYEPgOFVfn4cU/HlBL2nnzsou 424AInjGMnXNzHRpLEicEm1QSyYEBjEh3YGLODO02Un4u7XtRXElk9BDuh3IJDOO9OWf2g 6mk1v+1stGh4qNf23A17gOywj+dX3yMxVL7TXJnsYL0v1i197DjbYrVPndOldi0FnNLMYN Km7DK6csGKlo+Mi//Aw6Z3sZkxIgipLdau1kT1PSpmpq0UNM0DZpeIuv0ZERHb0cxd0CZ1 pOnMvy09dPfKKQxLaXAOb/Mx9Q61U601qtu0k73gUlRCxmHA4MV7wEzalDyg/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKR0LV0z11pT; Mon, 22 Apr 2024 19:43: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 43MJhsur031924; Mon, 22 Apr 2024 19:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhsBl031921; Mon, 22 Apr 2024 19:43:54 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:54 GMT Message-Id: <202404221943.43MJhsBl031921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0af78fa479ca - stable/14 - LinuxKPI: add further constants to pci.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0af78fa479ca3dee46f4deeba0e543ec7b77afc0 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0af78fa479ca3dee46f4deeba0e543ec7b77afc0 commit 0af78fa479ca3dee46f4deeba0e543ec7b77afc0 Author: Bjoern A. Zeeb AuthorDate: 2024-03-31 17:26:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:30 +0000 LinuxKPI: add further constants to pci.h Updated wireless drivers require more knowledge about PCI (BAR) bits. Sponsored by: The FreeBSD Foundation Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D44573 (cherry picked from commit a1cdddcf1596d258ce0b01b156dfd9921bd60e08) --- sys/compat/linuxkpi/common/include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 174599d06141..98ba160150f7 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -105,6 +105,8 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define to_pci_dev(n) container_of(n, struct pci_dev, dev) #define PCI_STD_NUM_BARS 6 +#define PCI_BASE_ADDRESS_0 PCIR_BARS +#define PCI_BASE_ADDRESS_MEM_TYPE_64 PCIM_BAR_MEM_64 #define PCI_VENDOR_ID PCIR_VENDOR #define PCI_DEVICE_ID PCIR_DEVICE #define PCI_COMMAND PCIR_COMMAND From nobody Mon Apr 22 19: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 4VNbKS3f4Kz5Hlny; Mon, 22 Apr 2024 19: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 4VNbKS1X9Kz4mGV; Mon, 22 Apr 2024 19: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=1713815036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXlTSrlkq6V3CZ+prXH5FcXLt0Y1ALO4LIYpErzsIZI=; b=mlki8TuOb5zJSjSgE0dFThoAKSggqLij1XWiHHlHh6T92YUMIUXbqNK8Gsr1AnZT7PclI7 PW6Iuq5GFKJ/VllKxhW0t8a6fPdCiwZ5hu8AC4yu4DbA6hy0qWc/4w+NIFKpIQ7CLA5abD F9X5fwiyxvVGDuAZXybi5V0hdrbbjUTUtyjsJrDY7kxupdOZ3+PqxMn8cISthGCKvZr4G0 f1Ft62WZ4W10Z/GLhhHBMga8qJTYVYO3lrVkMYL3b3rGWU8J8aYaV2E7PPR8HOaBHVWtHQ uDDy8+C/I3+udqzziA1rf/09JK0V+d/II5qwEhP/UZhnqhAzeFaavABEGNLEmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815036; a=rsa-sha256; cv=none; b=rRcRFaedVQA7oiDqz4O/Uw/onF+jaJ5ONRWwlqrplheFn8Yg/6e4aWYnGDzGG5CqCygJaH vXKauMajaRQK5gffTQbx+w0L9ZSAQwE24BWmk5NyKhZmQxvWOZCrd16dQ0DpqvPYGjueot IGISa6hnWw5jPH+T7TOva5r45e73d3QqWIk3solcXYLDxJ0HFRviaemrHDMXMUH6vzSeZ+ PgLHIHD/rsL30WzI0TqHCSkZlup15O9fkCRQFYbqAqx4XURShgTlF0pZkW9bmlCNaMX06x zOXo33tKpRn0RADDQQkaR16ti55A6h1t1vCdrpZOTThh1PThebRWNH0PrGbzlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXlTSrlkq6V3CZ+prXH5FcXLt0Y1ALO4LIYpErzsIZI=; b=gb/i8RRfQoCQ0H5kct4ICjugOMoJDzUr6vTKY57HXlni7I5Sf0c4bmcYTgoAvrCJsLlZD1 YShhX63BjHImwoZxZdpECX9gyUBvSKtJIM+9o60MDpnb4IzU24PSaVp7ZG2h1yfG7MQyMN xYnL5SWy6gh2UlUcDi5fXwn5/NL1ubLt0GODlxKhyfV/kEpuDbobMZCZbymapwDR9zYuSw LuNK6U+Tpd34N85CRR2B7PBuGUdy8ku/30FVziIXn7vnjxvgbXj/YS59u3NOp9D0d53PWv vHvMOKWJHompiAbYsEm+fnImRjhOR7rtt/1EtVSzMznj86OLnYEriaas5XN+lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKS15DSz11x0; Mon, 22 Apr 2024 19: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 43MJhux5031966; Mon, 22 Apr 2024 19: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 43MJhuIs031963; Mon, 22 Apr 2024 19:43:56 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:56 GMT Message-Id: <202404221943.43MJhuIs031963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7a52baf2805f - stable/14 - LinuxKPI: implement memzero_explicit() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a52baf2805fbb954a8db98921253a1c288efeb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7a52baf2805fbb954a8db98921253a1c288efeb2 commit 7a52baf2805fbb954a8db98921253a1c288efeb2 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:30:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:36 +0000 LinuxKPI: implement memzero_explicit() Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44586 (cherry picked from commit 218b2ccf8cc90698487515c681f3e3453b0dcead) --- sys/compat/linuxkpi/common/include/linux/string.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index f745c2f6d343..06dcdbd97663 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -273,4 +273,11 @@ memcpy_and_pad(void *dst, size_t dstlen, const void *src, size_t len, int ch) memset(_ptr + _o, _c, sizeof(*(ptr)) - _o); \ }) +static inline void +memzero_explicit(void *p, size_t s) +{ + memset(p, 0, s); + __asm__ __volatile__("": :"r"(p) :"memory"); +} + #endif /* _LINUXKPI_LINUX_STRING_H_ */ From nobody Mon Apr 22 19: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 4VNbKT3yNMz5Hlbx; Mon, 22 Apr 2024 19:43: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 4VNbKT2Sprz4mYt; Mon, 22 Apr 2024 19:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlrAeD0Y8qxHb6jtYfIGtCrfNcPhqCXvEo4OrLhztvM=; b=YFF/hNZrCKvQTP7yeT712bCrYwzqWx0gx8sO/s6zT2i8h0+JRd6GVgCNtf3bIwUdeSpU21 G3gbLN9VIAnhmQlMgKSmN6zsH3Fa+RVl98fx6eaXZSdM3IKWTuWPD315zCWViRfEgnB1VS SNBtAA/Vm1jhlhg9z8ON7ClfWdZCjT+lmcNRZfusW+SE+e6eX9TKs/6QooKIXkdNeOD8rO z6fSGbanUix6VkCKZd6Yh+eHaAWfgsGMRpUnIkKxYR9bNi3RlnERvvJ+cBx+nsAoPwO/Xz 5A1h6sOqUe8xY8E6twYFvp1k+gfeABuo3xfRHF+NJ+IFeWCUnsCAKgr0Q1mMsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815037; a=rsa-sha256; cv=none; b=l91lxK546uBVM7VzOZwW3W9Ye0ZRE6dBtAav5EqluI7SNtcNoO3Wgrclnc9pHxiw1XOVgf V1sUqXdNx8eeTZXlHtOnkr5DNU4GKBYcHi9q6kCnKSu157OFrGC1AVR/7Oz6r+2hrsTG+2 nKRJ7AJcruekGwoiyQAnd4vihCJR3jrUrKQPv4uGftmIJ/PKTCPAB97yx8+jpIyF39EQDi IX8NaUtcYAY/ac4FqdeuSrbHp2CMBCa15bJ6TnRUk4/TyFZ/9YeSkdqtRJh5kOLuJLdevB jNzlCMbTpKoXHDYTnouF8E0GmgedH8b6DSkDFNLAwSNKIimFAal8T9ebQ62ObQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlrAeD0Y8qxHb6jtYfIGtCrfNcPhqCXvEo4OrLhztvM=; b=N2kvgB+vGX3ECpB1uC++ikdJPzNWNEatckuh3qS8ZUJIRa+GDdwaUW95nl0/M+9nNY56uu PkXLPYn/I0RLCQ0ATa+aPR3FBnGUnHRPaultXxNgcV6F/A77y5Xjffe69nzuIlkMHzmlsg tfY+o+wdrjkjybHsRU48hDxAQX098VM6wMuLtrEKFOLvki2RkW43nf8BdJRjq4ULOA2WT/ eXWZB91kNSH9HCN/ex8P21b25Pn2Obm5OQmptPmZqiXJmDa4NTXzg80a66LhsY2gnwfEAk zz0fG4xC8r9G2aPP7T4/soPIMMCQqxyyy2mGOsoAoi8GtRcSmusMGELUi70Tbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKT222Hz11fd; Mon, 22 Apr 2024 19: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 43MJhvTu032007; Mon, 22 Apr 2024 19: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 43MJhvcO032004; Mon, 22 Apr 2024 19:43:57 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:57 GMT Message-Id: <202404221943.43MJhvcO032004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a939c9544033 - stable/14 - LinuxKPI: add BITS_TO_BYTES() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a939c954403314318d64d848534a4f9e3578217a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a939c954403314318d64d848534a4f9e3578217a commit a939c954403314318d64d848534a4f9e3578217a Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 23:48:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:40 +0000 LinuxKPI: add BITS_TO_BYTES() Just like BITS_TO_LONG() ... used in rtw89. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44603 (cherry picked from commit f674f016c03d49e14f1c651ed088a6f2d01a62ee) --- sys/compat/linuxkpi/common/include/linux/bitops.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h index 58677631b604..1415d5224084 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitops.h +++ b/sys/compat/linuxkpi/common/include/linux/bitops.h @@ -54,6 +54,7 @@ #define GENMASK_ULL(h, l) (((~0ULL) >> (BITS_PER_LONG_LONG - (h) - 1)) & ((~0ULL) << (l))) #define BITS_PER_BYTE 8 #define BITS_PER_TYPE(t) (sizeof(t) * BITS_PER_BYTE) +#define BITS_TO_BYTES(n) howmany((n), BITS_PER_BYTE) #define hweight8(x) bitcount((uint8_t)(x)) #define hweight16(x) bitcount16(x) From nobody Mon Apr 22 19: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 4VNbKV5SBgz5HlqC; Mon, 22 Apr 2024 19: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 4VNbKV3QsSz4mT3; Mon, 22 Apr 2024 19: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=1713815038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eqlFJwK6O3bYLadXq2xed6KxfGEpitVKUi5MGvdxsY=; b=dcmC6M1O2UpEQDa/aJPgqXwYQwvXMXAQZsE4ENXnNcrjdIk7noCWRO+I841OR4wn4KcqGN 5Q99ka7AbdbpgDptLMlsatpQj9yz20GHqAI1lgIDBwqxrUoN/Au7m34WEngLC46kDE3ov4 hFlzahAcifuddrywzlvRs2FP5PuuTQSoV5b2NUyQvL/e/JGhHInpAcg6jAaSohkcF17/Ce CsxsbqiZ93YptdEtv3UV6itsDJHoPZuFAAvL26DqU2uUMLWZ65shXgZKFd/deM78SkQ7bN B/PC0jDteYp7eI/opRosQiJ+LiI7wZ11Csa0WqzUAK6kzkn4Rw1q3t8C9J1aHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815038; a=rsa-sha256; cv=none; b=SvAW9GKvma/YnV0nqce/0XeRGCaeLwEbiJ4P1oqUarx3F8mfw+2zRthIpp4iv1UrqtdRP6 4IxJ/z49AyoMcUI8hyiTvSQriLuHszLdwYUCBsUhzAyw8nNtWHNVWVFWKkTRzoJhN5paRB ZrFaFzLyKjD1jSfp4/ijEdSAK2bYm/piU4mUyEwP6ta6FTp77XZ50fLzVaR9lKZRRWYj3L Qo29RQIEchm5cfJ7H4QUcczPN7onsfHkuePA7uOBQsfyCQ3WVmGDD5NI+R9WLArVaK0dRR qwwteA/AF59Eo36hwPO3UnmSx6gU8UeX01EO8yC6CIOcVNQyBwoJMV5HhhOOfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eqlFJwK6O3bYLadXq2xed6KxfGEpitVKUi5MGvdxsY=; b=vq+obQvc3JaVYzIgkCU9rNkTWJyxVUZzUyuDwz0k/XGuWG0Z1YAX3vXYJwMM76WoLtOFG7 W142Q0aUQR/UMNa38p0DEa222P8BgQRL2dSzzkIyUsMaUw3C0o+m4/S1SGBQX2K24fKDk6 8Zl7uu4C02Foke2+2IzWKA5HgebNFIHXu9djSXfHNd9O1tF4nYTWbKXwJK/AESB5ErMoHf N6a26KgNqFDlwCxnTIMBUxbMtdxVjsXhvnFxUKY/ViySQg1NMBp0CN5Uec+GPtdBNMkyJJ KSayr1jkXJu4Tm2W9W4sJ5LMESX9ax7NolIvXMwSsdJYblOCfMQJXru1jcKKbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKV33Xmz126m; Mon, 22 Apr 2024 19: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 43MJhwmG032046; Mon, 22 Apr 2024 19: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 43MJhw0v032043; Mon, 22 Apr 2024 19:43:58 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:58 GMT Message-Id: <202404221943.43MJhw0v032043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8cf307284f6c - stable/14 - LinuxKPI: add dev_alloc_pages() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8cf307284f6c1508b5c075155c711a7d3a8dab39 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8cf307284f6c1508b5c075155c711a7d3a8dab39 commit 8cf307284f6c1508b5c075155c711a7d3a8dab39 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:44:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:45 +0000 LinuxKPI: add dev_alloc_pages() Add dev_alloc_pages() though it seems a weird KPI, not passing a dev despite its name. Used by updated wireless driver. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44588 (cherry picked from commit 738c02ba24c66391870067602f1c9c030d5c5e5d) --- sys/compat/linuxkpi/common/include/linux/gfp.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index c5de09e896de..2fcc0dc05f29 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -138,6 +138,12 @@ __free_page(struct page *page) linux_free_pages(page, 0); } +static inline struct page * +dev_alloc_pages(unsigned int order) +{ + return (linux_alloc_pages(GFP_ATOMIC, order)); +} + /* * Page management for mapped pages: */ From nobody Mon Apr 22 19:43: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 4VNbKX0N06z5Hlvx; Mon, 22 Apr 2024 19: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 4VNbKW4gxJz4mM6; Mon, 22 Apr 2024 19: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=1713815039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxrpBQ77HRuS/YQSukDAUJKNKG9iS5/9i/H9PKugmvY=; b=ho0aEqc7dgK2x9aTKV/u+5PqNDGRLHtpcPoQ/wkbUu5RPPy4EAf7k8WeoZ41aKPnt3ic1D cvjB3+RK8ESYADi5KSDGFdHmUEC/M79wpYTQp3/8EOzyh35qWtvESaUaAhOlupMHR4FSIW R/vWdRGIKiPaFTQ1IBdK1afQchFluKR0t5bBHrNXfSvKNzBA9AYV2qARomS8nEVjhkfzNk l+O62/f9QynYseLfrLmKiZo6oE8Qqnl+oeatFUifqxELS7UpwMN2wV+peBVuBSDrY1w8vY O3q4EvJPJL/Z0iR019jzkmoS37sl+unS92T5IJ1W4/aKfVQYt2Z/Y+ntOuNU5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815039; a=rsa-sha256; cv=none; b=JSuJchPvKhKnO/tq0NzZRFqPxJzdJOnHrE6lgkb1KZfMMm75fqlko8Jm8KqK6WApErIeUV 3bvVK9o3ZCR+f+YkOevh9BA6cp9EeyACL62sV8OAw2xW5KcKFw6OSGuYS8c24S+RTr0Ouk BinsxkKORh+PaJ6R1YG1UuMAxRcENmGSNmILqDmJpLBy4fc5F8Shr/opcQT7vqPxRDmC0E fzS890Sqr3Cv0+p18vvI6WSkPiu/yuVFOCAD/MbK50WMBRWoldZfPYbeTkS2lUjTH07iWO tT+JNF9XpqYVU3vrFHs4zKb9dKAfB3i4OWMD+gAvMJH0UbEEpJvdZ+gWTdgdpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxrpBQ77HRuS/YQSukDAUJKNKG9iS5/9i/H9PKugmvY=; b=GIFdR13jL7WMKNFMsw853ZjXQKUbs8kBfDSXxMG2tmmxWnj95L2NcpV0UNhee4JC6+TbVD 8Y9KdAbCAxmvn/QYxlsjPePzaP6+47dx9125H+oGpkaUkgA5/HIgfjH2T7q+5BZW5uuew1 /dxeUooVZS7c2GiNyJGbVGAARyumy/wlDKD/cSXiWQGvP5fux4h2W7boY+jCtQk+LXrD4U zxIepblnd7nxxZ1sC2xjCWAiBqEEdPym+LoF34mpCGMB2YDetcuN5Lzj8FFe3ig/IjmxIK FW6N6mva19PXYc+cr3AwU+8JTXYi10IsG2SzeL2ORs/+zRsxIVacwjjCIY9UmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKW44CCz11RH; Mon, 22 Apr 2024 19:43: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 43MJhxvQ032096; Mon, 22 Apr 2024 19:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJhxIK032093; Mon, 22 Apr 2024 19:43:59 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:43:59 GMT Message-Id: <202404221943.43MJhxIK032093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 10c94114ac5c - stable/14 - net8011: radiotap: add more EHT constants List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10c94114ac5c5440e85b653a4fe54bceff75a181 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=10c94114ac5c5440e85b653a4fe54bceff75a181 commit 10c94114ac5c5440e85b653a4fe54bceff75a181 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 23:34:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:49 +0000 net8011: radiotap: add more EHT constants (cherry picked from commit ab95bca9988ab15a2502efd03db43068a0a2b18b) --- sys/net80211/ieee80211_radiotap.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index dba454a8fa42..d44f81b68b8c 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -540,6 +540,11 @@ struct ieee80211_radiotap_eht_usig { #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_OK 0x00000080 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER 0x00007000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW 0x00038000 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_20MHZ 0x0 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_40MHZ 0x1 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_80MHZ 0x2 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_160MHZ 0x3 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_320MHZ_1 0x4 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL 0x00040000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR 0x01f80000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP 0xfe000000 From nobody Mon Apr 22 19: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 4VNbKY0dcSz5Hm1D; Mon, 22 Apr 2024 19: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 4VNbKX5VCvz4mPR; Mon, 22 Apr 2024 19: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=1713815040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4uxfh9wFhuLhZJYYPbp2XK35Lar8Hp9GRvA38ElBXY=; b=G2JttdPBUMqNPUUv0XM+19SivishLwNUY2Aw3cPvY2Muqu/5J6MUspLhTAvIWjg/rZbogz lJlVpNumXZ8dAGazHAjM6ZE5ovSFgfvAfNbhX3zB0JWFvTgk84Kd79hqVG2mG1FPvanJDJ RvwY+VFOxcJUyg6NIDLcvDlGdGDuBInJFgl8cMYuTP1vFiZ+Ltm5TE9MY2HhBFl7HXocGj skt5xRsTB0/Er7XTjqCYpk+bh4ywom/Q5kEc6J6gh69rsJaxIOt+vGzCECH6LUkLDiZCL9 KEcJ/nYSz4SrGDpoQO45EdHEWEd6nrAcZT88+csATn+eUHOc+ws6rjlXBSAESA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815040; a=rsa-sha256; cv=none; b=SO455EXuPLQ+4I+c0emsJJMc/bJS0ZDzzjPZE4AC3AWzMbYbKyTOx6sG3YpVea2HDKsN43 HIboCpc+AeZ8rGzdZjRgrPZ6iadGiCJPPS+wRhXyLK57O/A18qrNZsZx1WhqtlW/PQVVCc nUwd3Gcvd34kLMbwxO9aw1SO3knftDSIDadWNze0WQn50j5LL1z4Adrso5G0gGYTE4y+Df zI4TmrnXU9zkGIr5RBhwo5s9V8cLpeAypGoiWDtW5GNPDL73n43A+oTXBkpTMwwQsv2b7x Sr9XC2b83GLZmEhzLDjJROKM6fbghgNhYw4/rxyb1C4BT1/AlT3PhNjHMukCjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4uxfh9wFhuLhZJYYPbp2XK35Lar8Hp9GRvA38ElBXY=; b=HhuliBHRCvMl5+u9kM9i/0XaIBgbMxuAbAJT2F7ml0plGQCSijWENUdK+MXQLvCPWZGPPx 6mKsufXqe269mtMNndTLUoUP2IL2JBuQFlOS4KnUf3WeRykfGVQhkXTevNe+8K98+IunSq T7ZndjpxQ+N/3PaCIvS1IJMuC4kAfWM1g1fgzNdWBx+3vAOJ6Wg8PtvmdmiZDbKm+/0Vo0 6sH3zDyrnnea4DHkQpKRMEhHaNZeaGCqhZtUeOC7UJhUkw60R73U7uryxojhX5njVsmvxy Z7KdK3yVdU5gi0aOLzjWC33M6EODCzHjU+BFbLJljBYxQ5n/ldvuMs0FCfqa1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKX52sMz11tZ; Mon, 22 Apr 2024 19: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 43MJi0qx032165; Mon, 22 Apr 2024 19: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 43MJi0JV032162; Mon, 22 Apr 2024 19:44:00 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:00 GMT Message-Id: <202404221944.43MJi0JV032162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6b2686ca9bc6 - stable/14 - LinuxKPI: sk_buff: implement skb_queue_splice_tail_init() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b2686ca9bc600f6658e9bd02093484a9b5a4fe5 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2686ca9bc600f6658e9bd02093484a9b5a4fe5 commit 6b2686ca9bc600f6658e9bd02093484a9b5a4fe5 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:17:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 16:59:54 +0000 LinuxKPI: sk_buff: implement skb_queue_splice_tail_init() Implement skb_queue_splice_tail_init() and SKB_DATA_ALIGN() as needed by the mt76 wireless driver. Sponsord by: The FreeBD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44590 (cherry picked from commit 3d3ec17825a124f0119d76c4d2523d73012fa226) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 02190a29e241..ee3f427aa6e9 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -89,6 +89,7 @@ struct skb_shared_hwtstamps { }; #define NET_SKB_PAD max(CACHE_LINE_SIZE, 32) +#define SKB_DATA_ALIGN(_x) roundup2(_x, CACHE_LINE_SIZE) struct sk_buff_head { /* XXX TODO */ @@ -824,7 +825,7 @@ skb_mark_not_on_list(struct sk_buff *skb) } static inline void -___skb_queue_splice_init(const struct sk_buff_head *from, +___skb_queue_splice(const struct sk_buff_head *from, struct sk_buff *p, struct sk_buff *n) { struct sk_buff *b, *e; @@ -847,7 +848,21 @@ skb_queue_splice_init(struct sk_buff_head *from, struct sk_buff_head *to) if (skb_queue_empty(from)) return; - ___skb_queue_splice_init(from, (struct sk_buff *)to, to->next); + ___skb_queue_splice(from, (struct sk_buff *)to, to->next); + to->qlen += from->qlen; + __skb_queue_head_init(from); +} + +static inline void +skb_queue_splice_tail_init(struct sk_buff_head *from, struct sk_buff_head *to) +{ + + SKB_TRACE2(from, to); + + if (skb_queue_empty(from)) + return; + + ___skb_queue_splice(from, to->prev, (struct sk_buff *)to); to->qlen += from->qlen; __skb_queue_head_init(from); } From nobody Mon Apr 22 19: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 4VNbKZ0RBWz5Hm1H; Mon, 22 Apr 2024 19: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 4VNbKY6Rmxz4mTn; Mon, 22 Apr 2024 19: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=1713815041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4+Hwog2VqsilgO1MxNNxkIPfH3HkL4DPHwggbPmV6o=; b=Np19xcDbMS3QkvAOZnG5so1o0tcv1F74jYHwUshfH9CfObNW2/yM+ybZ14FWIcTD4HAQzQ t/7EyrZ0Kjh9nzD/CZsMtMNYJqzBjIZVFAVsDkJFluWZ7lF+Op+uS8RLwlRN4FpWPexwij R5kraGTfWoNkaAayE/Urqk1mvKU8HbIA6vC3qKsZBMOqpIBQi2D4/rjEdKKK4ILK/TtFWv Pv4mXm0Qb2oIgjC7wFsL7AggZkYZfMU+qTK1EhoEhm3Fk1re49ntLaV+7DJqvFKYB+36LM xEXTNQpIGJqZNVRIq3QFZZGPsqBweKjBcef2BxBAghrFYXqaOH62uD8ja/CQWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815041; a=rsa-sha256; cv=none; b=i47FnrCGmnWh9X2bFX+sX86ynGWL76XJH7b9AqmDMe+D9dFsJLbvbV38UU9KxNb5vxJSAX mBl6zis+bN/nLQTE2AeEdxcIB9bmXtHjb9mx1OgNfoo2eYUORStdfH2J81ifx1NY2bsNY5 qXIAmckVJRDXMWc31ntC9wlQB8sW77jraj4pJ+vpvLLcZFEzVY5LWzYsOKuuHh3iJiuk/j 9FIJdZdHPkhHjDvjDT9GxdFJ6ARYaX61wnHggTExSIs7nLdwGY6W7wyi02Y5ZGP+FDnfuE 5Ue8XSrKuZpfbhAqVpuN53wxwBUc6whszkdCjz+bxk8FAC9fvpOFD/Z40AUzQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4+Hwog2VqsilgO1MxNNxkIPfH3HkL4DPHwggbPmV6o=; b=sKTvwaQOC5VM/Gjk+NaVqDQSAzJZdvXPkzZXn0mbiolZZf0gWPm2WH8JCUOXRVEbFrJqaJ NG6UJxKicJBc7U8a0v3bMKocHU+zN8Gkx5ysjApjl3bMVtL8/ho/C+Gp/9jFrpcvuvjwOA LFhX9X4Aj6QlmssoBQBBBMPMTF3G+9PvYCUfmWeYGs5itwPTZLA/7h7o32VSalmo6+Gs97 GB49dGZAgMhoSmnqaDWyFau7BfSCzPMR/kJSZAJ/BhNt5U9GV9Jhtn31yuYqPOSeO56mGQ u8byIhHFL+AY15N015hyDYN3fHPNZt9bv2nW74md0YR7TpBjX1u7EwqelimjdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKY63Btz11RJ; Mon, 22 Apr 2024 19: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 43MJi1PX032223; Mon, 22 Apr 2024 19: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 43MJi1wl032220; Mon, 22 Apr 2024 19:44:01 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:01 GMT Message-Id: <202404221944.43MJi1wl032220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 25e0847ef7d2 - stable/14 - LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 25e0847ef7d213107e4238677489dadcff90a6fd Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=25e0847ef7d213107e4238677489dadcff90a6fd commit 25e0847ef7d213107e4238677489dadcff90a6fd Author: Bjoern A. Zeeb AuthorDate: 2024-03-31 17:27:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:00 +0000 LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() A newer version of iwlwifi requires a return value from napi_schedule(); unclear if the function always should have been bool. Add the bool to test based on the napi_schedule_prep() result. Also add napi_is_scheduled() for rtw89. Sponsored by: The FreeBSD Foundation Reviewed by: emaste (previous version) Differential Revision: https://reviews.freebsd.org/D44591 (cherry picked from commit 21761f2ede4ebad13e78112b9409c1f20f946781) --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 9 ++++++++- sys/compat/linuxkpi/common/src/linux_netdev.c | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 95fbf2a0f48c..3d2b309909b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -230,7 +230,7 @@ void linuxkpi_netif_napi_add(struct net_device *, struct napi_struct *, void linuxkpi_netif_napi_del(struct napi_struct *); bool linuxkpi_napi_schedule_prep(struct napi_struct *); void linuxkpi___napi_schedule(struct napi_struct *); -void linuxkpi_napi_schedule(struct napi_struct *); +bool linuxkpi_napi_schedule(struct napi_struct *); void linuxkpi_napi_reschedule(struct napi_struct *); bool linuxkpi_napi_complete_done(struct napi_struct *, int); bool linuxkpi_napi_complete(struct napi_struct *); @@ -272,6 +272,13 @@ netif_napi_add_tx(struct net_device *dev, struct napi_struct *napi, netif_napi_add(dev, napi, napi_poll); } +static inline bool +napi_is_scheduled(struct napi_struct *napi) +{ + + return (test_bit(LKPI_NAPI_FLAG_IS_SCHEDULED, &napi->state)); +} + /* -------------------------------------------------------------------------- */ static inline void diff --git a/sys/compat/linuxkpi/common/src/linux_netdev.c b/sys/compat/linuxkpi/common/src/linux_netdev.c index 61ebcdbf7a39..61342395f03c 100644 --- a/sys/compat/linuxkpi/common/src/linux_netdev.c +++ b/sys/compat/linuxkpi/common/src/linux_netdev.c @@ -185,7 +185,7 @@ linuxkpi___napi_schedule(struct napi_struct *napi) } } -void +bool linuxkpi_napi_schedule(struct napi_struct *napi) { @@ -195,8 +195,12 @@ linuxkpi_napi_schedule(struct napi_struct *napi) * iwlwifi calls this sequence instead of napi_schedule() * to be able to test the prep result. */ - if (napi_schedule_prep(napi)) + if (napi_schedule_prep(napi)) { __napi_schedule(napi); + return (true); + } + + return (false); } void From nobody Mon Apr 22 19: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 4VNbKb2NL9z5HlyL; Mon, 22 Apr 2024 19: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 4VNbKb0SrNz4mdj; Mon, 22 Apr 2024 19: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=1713815043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPC55nbiBlqGZSfvM5VaQHHU0rPzmIznjxTYTmwOIc8=; b=BAKaF6DJicrmASqxQitJmmM+uu7iBeT+xdn0J4ZiSd1ngln50HijKDub8vex1boknDxmIi 2UB+h86hwiFSerlzIOruN2I8nlHBp0vob1cwF0ivkfNXLNvqGt9TIoldUdXYHqzHDu6N/E cVpxBo6AJTVy0Q2e0gqB0wwoUmhE2D9z5vzFPzsW+cWw7gb0pc4WltFxXXtojBQfw4dP7k 1D4J00PGB18Ex5JxIgjg/pnnIR7xVbYdOgeGq5NA1QJJdVlN++VfgBo5kuXAg0nM1ENDNO piuiSGbh79oKFzBZB0EktpxomhBW3aPPzs59j4D/F7xRk7sRhMSvh9nS3jp9Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815043; a=rsa-sha256; cv=none; b=it3nnBrnIacpxYujBZu7kQJRuj/LX0+X9QcxIfxPgX8PZ3q05+hM9XEHSoBVnwalOVc/lJ /QN6sR3kDuvv5meJauxzEUdACK/FoEoKqhZXkcepby1ZjTGKYp2seNezpw1W4kj/KhytTj Y8maU49ezCMRjHg0V2V8ZfjRt8wFqEeqPJX3ErGFu8hC/qqDDrzfQPCZPb6xdlIdi3EvPP NhviR/GRrKbLcD6j1DZE38EnGdqNSByGcfJUlxUu+F8Wj9904wM8Hxiy6jC90k+diOnhDm zDtlBqZqS1J2u+qdvwOxFOsklaLxcOjBEzSLEvGY5nTImd4U46Wo1nayi5VY3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPC55nbiBlqGZSfvM5VaQHHU0rPzmIznjxTYTmwOIc8=; b=V9AZTzBDlrwLKV42InlWVCmXgu8T9CeVSvr7GN0OeG1YJVkIx6Zayltr/UCq44EhRYAWXc BTohy7zSZKTBohvFPBRP68CSVVUshT6UWYwqoSlUf2S+n8tuDu34gxExS49/FhJZWgBSLR PJ8WnNO7dWRU7EgXZKzZxTYZlhUxU9KhKGeulQIg4fmbDVoDseS+ifzPxOsPcdEJDCy0nv QW2Y8qCo8D3qpsErjSutQt93WtsOoyU14tB+Y1SF0L26u1wr/ZTGOTiYwEFs9IDYHZYsNa 3g3MR99TZdEGKmlsW6woVyXuTDk6gtZkuOhesQz5zPERlHOfs0XklE5hK0Nxnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKb04fNz11qn; Mon, 22 Apr 2024 19: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 43MJi2Sq032262; Mon, 22 Apr 2024 19: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 43MJi2Ag032259; Mon, 22 Apr 2024 19:44:02 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:02 GMT Message-Id: <202404221944.43MJi2Ag032259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 24293e9f97a4 - stable/14 - LinuxKPI: add devm_kfree() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24293e9f97a4ade4b0ea785ff4d892d4ed50f6a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=24293e9f97a4ade4b0ea785ff4d892d4ed50f6a6 commit 24293e9f97a4ade4b0ea785ff4d892d4ed50f6a6 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:45:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:08 +0000 LinuxKPI: add devm_kfree() mt76 calls devm_kfree() directly, so alias it to our lkpi_devm_kmalloc_release() function. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44589 (cherry picked from commit 170c2e0e2bb1b2d9a7661ba729f8264381c9d9d7) --- sys/compat/linuxkpi/common/include/linux/device.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 7e5b1423311b..4ac041298ab7 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -281,6 +281,7 @@ int lkpi_devres_destroy(struct device *, void(*release)(struct device *, void *) void lkpi_devres_release_free_list(struct device *); void lkpi_devres_unlink(struct device *, void *); void lkpi_devm_kmalloc_release(struct device *, void *); +#define devm_kfree(_d, _p) lkpi_devm_kmalloc_release(_d, _p) static inline const char * dev_driver_string(const struct device *dev) From nobody Mon Apr 22 19: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 4VNbKc301Tz5HltD; Mon, 22 Apr 2024 19:44: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 4VNbKc1HXpz4mVN; Mon, 22 Apr 2024 19: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=1713815044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6M8HIJfKoTvwTZeu+J3kZQtTF2RTq7zW1Nrmk1ICyZs=; b=FHMVS5WfYcn6R316ugm5gHzHztLsulRh3BQsdaoHk5BXPaNI+2t08cfx5blQRzVVcQZpy3 abWZGvHr8vfQFZPVWbM+pGzpOldjMUo3PwTZ0LXl26V4YbE54Prx00yUg2hlK0iO/wb378 acsEhxMNOYCOBkXtYDPpGxysEsDGN/+scodyqXxcGICf5iw9Wo9wue5hw9+WVzhyeSdVpm KiwcgvGmLF4l6kgI7psxqPGbe5DOWFIKT0Uf++XofqTw9vRjfwij/lObbAJqxNZvA80AVI hhL4emnM+P0AdVZPBVUFudTeosFDa4+Rd+02nHqV+gQVoKaL8eRgnBcO/WNpKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815044; a=rsa-sha256; cv=none; b=HA7NMHAOc8nOOhVL4TTYgyiRlWuEEymhI771E4G8ON3y2gTLPqY+O92oxv7t8xtj1CqunN 1+kgEl+3tLWv1/TYccQ6S7y+eSMESVazbjxf7IZhP1h0fhfemkFMHACaX8Ev/cERkHyKOo UqXv+y1gjt36Iu1lbqENLzTokKF7jthRKhsvMwG5kvLJTIix9OZ5jNW1HELVipcel9RKM4 W1NgBDd+otLA8SbyObvCit2dGx6rrRP09fKuTt/WCOwEFDnq9ykqr4Y9U4UsCB5fTvZhLW 48vjo0oepIJKC8fZtEtOUa9NUeFyuF21V6AhIQZWpd3ptGJZlQBVT0bcHAyv+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6M8HIJfKoTvwTZeu+J3kZQtTF2RTq7zW1Nrmk1ICyZs=; b=daFEc16pt7Q/AaOSgLSkyBmxGgn9Kdss/vHx4bS424qT6CTJXwX57dw2ZPh/ptX2W1aVDt JHD/yca0sejyuqxeyvf2Ds7ADn+KqDYqzP+zxSXEk2rBp5Fo8RdgX+GgpzdgYq9podUGKu 0kyrr2KwuFi45oIx/S/t5f2AlksWt7FpPyQFeoKJN77cp8x/dRr/JXCsk0/STSJLx4+not wisNGOzDU+a/KMJBoPN+7qGZFORFq812kSjq4cVbE+LhiDg5YuTkhTjBZ4wDxdXnYwDGrK EPRanTQEZ0seNs9FRlIFbMerivww+W5grXUmVtBiCSiOsrWi4KNEWMbmPX1TMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKc0thRz11x1; Mon, 22 Apr 2024 19: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 43MJi4R6032323; Mon, 22 Apr 2024 19: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 43MJi4pK032320; Mon, 22 Apr 2024 19:44:04 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:04 GMT Message-Id: <202404221944.43MJi4pK032320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fb94767f7863 - stable/14 - LinuxKPI: 802.11: remove unneeded re-lookup in lkpi_80211_txq_tx_one() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb94767f7863ff6d05cb8fddd39a1f464d9fb7b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb94767f7863ff6d05cb8fddd39a1f464d9fb7b9 commit fb94767f7863ff6d05cb8fddd39a1f464d9fb7b9 Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 18:07:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:16 +0000 LinuxKPI: 802.11: remove unneeded re-lookup in lkpi_80211_txq_tx_one() Given we are passed the lsta in as a function argument there is no need to re-lookup the sta by ni and possibly not find it. We know the sta and ni from the lsta and whether it is uploaded to firmware or not we can check directly from the local lsta flag. Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43965 (cherry picked from commit ac867c20e67423e5019ab90148c387ea127eeffb) --- sys/compat/linuxkpi/common/src/linux_80211.c | 76 +++++++++++++--------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d5a97009200f..daf7eb7a5661 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -142,8 +142,10 @@ const struct cfg80211_ops linuxkpi_mac80211cfgops = { */ }; +#if 0 static struct lkpi_sta *lkpi_find_lsta_by_ni(struct lkpi_vif *, struct ieee80211_node *); +#endif static void lkpi_80211_txq_task(void *, int); static void lkpi_80211_lhw_rxq_task(void *, int); static void lkpi_ieee80211_free_skb_mbuf(void *); @@ -3584,6 +3586,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) struct ieee80211_tx_info *info; struct ieee80211_sta *sta; struct ieee80211_hdr *hdr; + struct lkpi_txq *ltxq; void *buf; uint8_t ac, tid; @@ -3694,54 +3697,45 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) #endif #endif - lsta = lkpi_find_lsta_by_ni(lvif, ni); - if (lsta != NULL) { - sta = LSTA_TO_STA(lsta); + sta = LSTA_TO_STA(lsta); #ifdef LKPI_80211_HW_CRYPTO - info->control.hw_key = lsta->kc; + info->control.hw_key = lsta->kc; #endif - } else { - sta = NULL; - } IMPROVE(); - if (sta != NULL) { - struct lkpi_txq *ltxq; - - ltxq = NULL; - if (!ieee80211_is_data_present(hdr->frame_control)) { - if (vif->type == NL80211_IFTYPE_STATION && - lsta->added_to_drv && - sta->txq[IEEE80211_NUM_TIDS] != NULL) - ltxq = TXQ_TO_LTXQ(sta->txq[IEEE80211_NUM_TIDS]); - } else if (lsta->added_to_drv && - sta->txq[skb->priority] != NULL) { - ltxq = TXQ_TO_LTXQ(sta->txq[skb->priority]); - } - if (ltxq == NULL) - goto ops_tx; + ltxq = NULL; + if (!ieee80211_is_data_present(hdr->frame_control)) { + if (vif->type == NL80211_IFTYPE_STATION && + lsta->added_to_drv && + sta->txq[IEEE80211_NUM_TIDS] != NULL) + ltxq = TXQ_TO_LTXQ(sta->txq[IEEE80211_NUM_TIDS]); + } else if (lsta->added_to_drv && + sta->txq[skb->priority] != NULL) { + ltxq = TXQ_TO_LTXQ(sta->txq[skb->priority]); + } + if (ltxq == NULL) + goto ops_tx; - KASSERT(ltxq != NULL, ("%s: lsta %p sta %p m %p skb %p " - "ltxq %p != NULL\n", __func__, lsta, sta, m, skb, ltxq)); + KASSERT(ltxq != NULL, ("%s: lsta %p sta %p m %p skb %p " + "ltxq %p != NULL\n", __func__, lsta, sta, m, skb, ltxq)); - LKPI_80211_LTXQ_LOCK(ltxq); - skb_queue_tail(<xq->skbq, skb); + LKPI_80211_LTXQ_LOCK(ltxq); + skb_queue_tail(<xq->skbq, skb); #ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE_TX) - printf("%s:%d mo_wake_tx_queue :: %d %u lsta %p sta %p " - "ni %p %6D skb %p lxtq %p { qlen %u, ac %d tid %u } " - "WAKE_TX_Q ac %d prio %u qmap %u\n", - __func__, __LINE__, - curthread->td_tid, (unsigned int)ticks, - lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, - skb_queue_len(<xq->skbq), ltxq->txq.ac, - ltxq->txq.tid, ac, skb->priority, skb->qmap); + if (linuxkpi_debug_80211 & D80211_TRACE_TX) + printf("%s:%d mo_wake_tx_queue :: %d %u lsta %p sta %p " + "ni %p %6D skb %p lxtq %p { qlen %u, ac %d tid %u } " + "WAKE_TX_Q ac %d prio %u qmap %u\n", + __func__, __LINE__, + curthread->td_tid, (unsigned int)ticks, + lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, + skb_queue_len(<xq->skbq), ltxq->txq.ac, + ltxq->txq.tid, ac, skb->priority, skb->qmap); #endif - LKPI_80211_LTXQ_UNLOCK(ltxq); - lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); - return; - } + LKPI_80211_LTXQ_UNLOCK(ltxq); + lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); + return; ops_tx: #ifdef LINUXKPI_DEBUG_80211 @@ -3753,9 +3747,7 @@ ops_tx: #endif memset(&control, 0, sizeof(control)); control.sta = sta; - lkpi_80211_mo_tx(hw, &control, skb); - return; } static void @@ -5225,6 +5217,7 @@ linuxkpi_ieee80211_frequency_to_channel(uint32_t freq, uint32_t flags __unused) return (ieee80211_mhz2ieee(freq, 0)); } +#if 0 static struct lkpi_sta * lkpi_find_lsta_by_ni(struct lkpi_vif *lvif, struct ieee80211_node *ni) { @@ -5241,6 +5234,7 @@ lkpi_find_lsta_by_ni(struct lkpi_vif *lvif, struct ieee80211_node *ni) return (NULL); } +#endif struct ieee80211_sta * linuxkpi_ieee80211_find_sta(struct ieee80211_vif *vif, const u8 *peer) From nobody Mon Apr 22 19: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 4VNbKd4tFqz5Hm3m; Mon, 22 Apr 2024 19: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 4VNbKd3Kmfz4mh0; Mon, 22 Apr 2024 19: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=1713815045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wwWFLsJAAsLkW6yyrKAk7/IYx1Wo9so//WHtzSMoZY=; b=KPZLNssj8mZTf0qa03NJDwrsVpnSBCIwSP6ztY34UheEY4lkpqFnWgoOlzs3dD/Lj837mo XOBX0YcMv2qg5ihoGzkibOU+KcYb06gv0I9adA81jPw5UYTaqVUO32gQeR5I8q76pdc80V za6h6pRjSisp/JnWg768cca0MVDDl5arHvu8Cupm+eFep9Uh/0MPp4KSVgX4TQVdohZz3/ qoyFoaIfzwTANLSfhYGNyEdM6UC6H4/05x8jN23g78qpXu7p9b5bSgeOtUO3x+sV0Uw7u1 qSpJkUCZ/MAahGFTlGU/l5KkgyM5Iv4euoX9cGhmiejfT1m4idSnF0v1ebmgqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815045; a=rsa-sha256; cv=none; b=yPpoegbh7tyC+YAbCdFkmZBXZ1eZrih1TkMipoYYyGWgCugSQovfndngctuqM0qVx6Lk72 4KQFgCVugag03q5TDYYsCTA7cQc0QQojcLa7uGEInibwt8SNc8NdhMwzWnmVgzryuLP4qs x5XFq7QoPLNGGdSGAN8LtrabkUFigfmnnCiFZzq8psagJ3Hy6aDjL69eIL+W4YvjaP71RY /7l7NRn5/oaOeARDvo2T12FOWgAtZJ1YI+cTbsdTQbDLt/PiLu33JtBcihdmMAt+YRbuYT 2SgwKVe4Rv5YGXgPvGYOcExvDtaVq3MZuN7HRrlgvGCSldauQH4wXEKAJ8taMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wwWFLsJAAsLkW6yyrKAk7/IYx1Wo9so//WHtzSMoZY=; b=wmNZBaZqx2ujWhioFXDZCczklfEvx0Qz7ehByLL2NWI73SdjHohllmqUbzWRxS+DMoLvBf 4MqBD0fa3321BlkBgmWeXixNx21VKVWSFTmubjx0lcWRRNdShLE9h6gTS4lFW7gVP37ej9 ssyjgZmjmbPgnHDVKHTpVqSCZoWT3Oi8noyLvhOdKRiQ8njX24+vGh1aB7xuQ5T3QDvWvd L4klCELjGZfSZFMovXlKtAY8W5ZqGaQhicfjdVW9zW1wWRd5ca9ctfPjtEssXTMQWlotRu z/uOC42Kc7BYIHZcYG1pFeo8jG3Whyiwtn7sVbIlVVaVHOmU7g0ss7GRTP8XsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKd1t2qz11RK; Mon, 22 Apr 2024 19: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 43MJi55J032371; Mon, 22 Apr 2024 19: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 43MJi58d032368; Mon, 22 Apr 2024 19:44:05 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:05 GMT Message-Id: <202404221944.43MJi58d032368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 634fd711b003 - stable/14 - net80211: amrr_init: change order of commands List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 634fd711b003fa59fda39533a2b578228299031a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=634fd711b003fa59fda39533a2b578228299031a commit 634fd711b003fa59fda39533a2b578228299031a Author: Bjoern A. Zeeb AuthorDate: 2024-02-05 14:48:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:22 +0000 net80211: amrr_init: change order of commands First run the KASSERT before trying to do the free operation. Better for reporting and debugging. Add a guard setting the value to NULL afterwards. NULL pointers are a lot easier to test for. Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43751 (cherry picked from commit cd9fee3d2c370e81109505c2abfd381af952e9b3) --- sys/net80211/ieee80211_amrr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c index 7248af0edccf..461554d75ea1 100644 --- a/sys/net80211/ieee80211_amrr.c +++ b/sys/net80211/ieee80211_amrr.c @@ -132,8 +132,9 @@ amrr_init(struct ieee80211vap *vap) static void amrr_deinit(struct ieee80211vap *vap) { - IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); KASSERT(nrefs > 0, ("imbalanced attach/detach")); + IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); + vap->iv_rs = NULL; /* guard */ nrefs--; /* XXX locking */ } From nobody Mon Apr 22 19: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 4VNbKf41tqz5Hm3n; Mon, 22 Apr 2024 19: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 4VNbKf3Gv7z4mk3; Mon, 22 Apr 2024 19:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ4oATT6GNgY8Szfd+ehRevre7twMLOaR9a+reUGbLs=; b=WYnYRYLLQYMBBJFa7nJtwNzbAGJrfSzyVe/3mtez1clzjcRpoxYT02pKTfzb3lM6dQhD74 E6dUPYx8PCjsfrAzfUfAECc0GRY73Vp/JFCz9p+81KqufEWmEMhOAJ9lFN/gTkOJxvD4pT V70RVmm510r2eVGcD6O5kD/zNfmg/VtdpiSbls48QF+QdGRaXjcpKN90rfMxocW97VhXnh vl2xoGhI1S+CmJS2mrP6eCSFwreCpXK9Ir17YrfDTWwPwvd2jL0m1eJ4dvzOt60nxQJTOY LQ/rzqk8Nj/9A46AFoeQBdB6Y/F24BTW4B+h3TKXXqgREoUq54ij0oS5htVoeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815046; a=rsa-sha256; cv=none; b=wnuJoxnewSxzCQZxHlS+GNmx1ohk2csKIk6hlVQZe+mthWrydgwgoX3owQVGpW7zGBnMIS 8Hh0bkm/WmgfL3v2z+hPQcf8e0dep5Ff8FQCBFNAzagAqeZJS9U6S0CLCVFXf4Ri0d7uv+ atg/qkUK3x+hKo+u+DD/Q+g5lqdrcE7k1cROqoTAgkeKJFkFnj8OwIFRyxbUhn3cc/sTDh PoDzaheeyFRGR/r0b9grR/2AhpqOh2s/nNE9RieAmUr2DNZq6sPh1gX37CytHVyxMA8r9z qZZFR8QdPWBV5TN7JxeNTTVAi2nhCLvkP+9RHyJAlKmYVDtqkFAZxIVdHVD40A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ4oATT6GNgY8Szfd+ehRevre7twMLOaR9a+reUGbLs=; b=MJrDUH2GSupjFlFb61hVrRftT/9F4oJ4RkQ9a045FS3r0ctuXseE9RTeeHHay5A/yDVPpQ GoR6PHU8HfDnINieiFHu2SWq6nuh2eWLnU1pJTfvG8PTUulTcAhcmq33CApH7TaWjbdWdq YYTLg/gl0XF0Twg6D333eBYozxT0rx5x3Ds2btK8W+knn3MXNqQRYKby3VKEX+dhtexwBI MJy3w0poRdSOpBzUIw3spiBlHoNf1tokcFFxMH5mKB8JkT4/l8icXM32V5kgQNroIGynFc h1I3fn5LOvBsqQgrt6O7OioM5BbpkJSrcbdAVv1jhOy538oM58J12dSmkpzHBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKf2cNgz11ff; Mon, 22 Apr 2024 19:44: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 43MJi6OI032431; Mon, 22 Apr 2024 19: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 43MJi6SJ032428; Mon, 22 Apr 2024 19:44:06 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:06 GMT Message-Id: <202404221944.43MJi6SJ032428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b5cf81e20984 - stable/14 - LinuxKPI: 802.11: disable early queue wakeup workaround; better classify List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5cf81e209848b3abee365de2eca56f74305b025 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b5cf81e209848b3abee365de2eca56f74305b025 commit b5cf81e209848b3abee365de2eca56f74305b025 Author: Bjoern A. Zeeb AuthorDate: 2024-02-16 21:14:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:27 +0000 LinuxKPI: 802.11: disable early queue wakeup workaround; better classify We used to call lkpi_wake_tx_queues() for all queues early on in order to make sure they are ready. Turns out whatever logic in iwlwifi startup is working correctly these days under LinuxKPI so this is no longer needed. As the comment indicated the "workaround" did not always work. Disable it for now. The second part of the improvement is to properly classify Non-QOS non-data frames (mgmt and ctl frames for now, unless we have to be even more careful in the future about certain sub-types) as TID 7/VO. Contrary to net80211 we must not promote PAE frames. Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43944 (cherry picked from commit 1665ef979d3adab05d178480077674ab5978e4f0) --- sys/compat/linuxkpi/common/src/linux_80211.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index daf7eb7a5661..758db287d613 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1312,6 +1312,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); +#if 0 /* * Wakeup all queues now that sta is there so we have as much time to * possibly prepare the queue in the driver to be ready for the 1st @@ -1321,6 +1322,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int * for all queues. */ lkpi_wake_tx_queues(hw, LSTA_TO_STA(lsta), false, false); +#endif /* Start mgd_prepare_tx. */ memset(&prep_tx_info, 0, sizeof(prep_tx_info)); @@ -3670,8 +3672,16 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) hdr = (void *)skb->data; tid = linuxkpi_ieee80211_get_tid(hdr, true); if (tid == IEEE80211_NONQOS_TID) { /* == IEEE80211_NUM_TIDS */ - skb->priority = 0; - ac = IEEE80211_AC_BE; + if (!ieee80211_is_data(hdr->frame_control)) { + /* MGMT and CTRL frames go on TID 7/VO. */ + skb->priority = 7; + ac = IEEE80211_AC_VO; + } else { + /* Other non-QOS traffic goes to BE. */ + /* Contrary to net80211 we MUST NOT promote M_EAPOL. */ + skb->priority = 0; + ac = IEEE80211_AC_BE; + } } else { skb->priority = tid & IEEE80211_QOS_CTL_TID_MASK; ac = ieee80211e_up_to_ac[tid & 7]; From nobody Mon Apr 22 19:44: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 4VNbKh0003z5Hm6M; Mon, 22 Apr 2024 19: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 4VNbKg4DRMz4mrr; Mon, 22 Apr 2024 19: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=1713815047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ppR2YbIZP5GpxcmhQjfFh8/MCGnoGBRRYid2SEmN7Vk=; b=Fwbd5nwI3MID6SDX9ccdgTY7EhRjp2n6V+uw7dZlLmKVGLw8nqU0upLJmk41etP9PdxXMX Sukl/vSOJLMoeXiqAIQsuScWQFh8B0zZtV662sk8c5/PQjMRILyOPgagHwIqNFqVQq5YoA Lv7xF7KQgm9FfKfrl6rtcB3/5EFEc4E3WKFeXgo19gkE8Jwq75Ema86iexti125rfdF7b1 gRZt61+Bq5FFtOzaXKkJ+CysbpPmtwnmRxcnjWNgWTfYy2eOlXJTewg3r82QyntLZ0eWBM HUjPTBoqkkGghf46+jweuK1wRWvyQgnuFHWM/Kyvik49KuENQF8YPmAuKSggsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815047; a=rsa-sha256; cv=none; b=dZPgaXkCHFRoYseXTdRtnfgS0srcSNVsCjAJS1Ly1PuGMuDBL6zykaekwIF82iKgmsMhSz rIaSiJ2zfTarFmIJkz7yNdnsUfelGYzutbWJj4I8cmV6uq9HP7+860JkjgLpoRCZ4EioNO KzyVqh10O6dsiscRfnCmrpgN+6AJTHsAl7Z5H4Zh7jwjIfLwTOAwGcS0EMmH0D+5+tcVbj IWBfP9m74UXQjw3CIHKxrg3U57WZPGvBwQcL+y5BCF3pQkXCyYL2QA4dKfVDy5xbBjHmbk CRPj5TjiCnjSQILTSID7EL2CGY8QQjQh7wFYT+ZvKlkBkbP16gk8G/FyYsUhTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ppR2YbIZP5GpxcmhQjfFh8/MCGnoGBRRYid2SEmN7Vk=; b=X+bsgTtvDdwp04lLi1Ss1q/nyRKEMT5g10AMWgmfIKy9IUHcxUAwvo7mboNBV9A0Awxy+B Gd3tJrS9a8wxyelp9WtWsjpOO9imxhsmc90Xg+9zEk94d2/v+mg+7IfEyICGHujXuxF3UH WdJTQ7nmqnZwLPB/iDKu3mHh4zdvlH2Wd2Mo8XIc4OoOidhtif34SpJThlLhzKiBVqRshP CgVydYDvhQJppLhI125BhBdYY1hfXb3RyOK1CLFpMyBMgQdnhaqDuaInlJEMBUIecsRTOH C6hcHd1AjnwNNIfoESoDaesWeFFU5277B4eVN73TiH0F5gtefQUZHFjrWAvDOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKg3q16z11tb; Mon, 22 Apr 2024 19: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 43MJi757032480; Mon, 22 Apr 2024 19:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJi73e032477; Mon, 22 Apr 2024 19:44:07 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:07 GMT Message-Id: <202404221944.43MJi73e032477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6290fe776c74 - stable/14 - LinuxKPI: add __counted_by() and __nonstring List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6290fe776c74297eb6fd14bee08a31b17a6a54b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6290fe776c74297eb6fd14bee08a31b17a6a54b2 commit 6290fe776c74297eb6fd14bee08a31b17a6a54b2 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:41:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:48 +0000 LinuxKPI: add __counted_by() and __nonstring Add checks for __counted_by(_x) and __nonstring as and depending on compiler support enable the attribute/feature. This is needed to make mtk76 and ath1xk drivers compile. Sposnored by: The FreeBSD Foundation Reviewed by: emaste, dim Differential Revision: https://reviews.freebsd.org/D44587 (cherry picked from commit 2a8c50592f7fce8bceedf004f674a5a9eae0fd46) --- sys/compat/linuxkpi/common/include/linux/compiler.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index 97687ccdc7e1..59c7d3cc04e7 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -67,6 +67,17 @@ #define ____cacheline_aligned_in_smp __aligned(CACHE_LINE_SIZE) #define fallthrough /* FALLTHROUGH */ do { } while(0) +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif +#if __has_attribute(__counted_by__) +#define __counted_by(_x) __attribute__((__counted_by__(_x))) +#else +#define __counted_by(_x) +#endif + #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) #define typeof(x) __typeof(x) From nobody Mon Apr 22 19: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 4VNbKh6WQwz5Hm3r; Mon, 22 Apr 2024 19: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 4VNbKh4bwxz4mhZ; Mon, 22 Apr 2024 19: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=1713815048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+xqtcBwRaiX91neoDMFTRD/yYamQU8O60juzB1mzPs=; b=ZipuASsCgMHiUz5TTeLara5y0ywVMzDOefB8Jd2kfEzMi4nyQ+m3ETGl4+dfyomsgzxqYw l5sD5pRPtz1bdhxb3AyXXayv1WQhpld7cGacbAnfPDWhciyNd4hxxeDa5wb3IuZRuyIKW/ CQDzvwOJBtX/1TXkEB3FtnEjndQcfQWyBmEFWDbNyT1tTL6EJAcLHI3dq+bfWRsR7LfOsI 8+k8un0Ps7I+4/NxjNVn3bvd6GKFqpuM+8Z5cDz/uqTgi8EGtBegLvRLW16ia1n3/NW0k6 ddhNdoWmHlH4uiTHpBjizlj166T/uS+GpvyhzXphrXw3iWAVzw/+cpKhjDiCmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713815048; a=rsa-sha256; cv=none; b=iaXO87aYWYLhwU6kre6an4tgFvSkRrFGLkAkRjB4dI1DB58+6xwmLyQDz6FzF2SFQv+Jiy OG4wfrRXWbOh/0DtgO2sSzRAFq6qUjkunEfR68IgqIilXzDmNW3OrDLh7uiQNM6W3gNGxr fX2CB0vwMe5g3gXq8RuO6y89dbO786TBzxNp2htjUQAdLc9+VS3kqPaqMWAAcw4iqqdUzC biG2W+280HEhjseX/wrpQzc7o9/xnrN2BTlGeavt05yVflN+satuUqvLROJOxHPAl0NxF5 1WgxGU9OSJqTjiBHzKsxRmuKKoRvJvP0s0WYKGZlFPZ+CeLxUWkCRhy7c1nqfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713815048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+xqtcBwRaiX91neoDMFTRD/yYamQU8O60juzB1mzPs=; b=H1R4P6tVANueQ64Jr4LzdHYryxg9vcdt3eQc18klRX7maE8/n9AWEVB0nYB4X77nGo7xQK QAp5NzUJxO+xIqiXdidlNaDq5vddVQeKkyLPgllXkW2wmKYdtac29te/8jLEpfQuNc8OlL utO+0xmEHtajRIs/+6oOpvn/u2OKfl73/0rnMkTp22idcvj10hWFNGCUDBG/Cvagz7/rwu 6XWOoKo1G2g/mEfsX6HXjsR5IZX4gAGgHNimWHLsyJBO4RXqDQlCXktt3pfG4yby4fKtzS p0qNzAcKoghvB79rcFHG38+jiukQZ2RYxbqfhRfYveYuzZM3q8hgGZszjk97YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNbKh4Czdz11tc; Mon, 22 Apr 2024 19: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 43MJi8SO032529; Mon, 22 Apr 2024 19: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 43MJi8ps032526; Mon, 22 Apr 2024 19:44:08 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:44:08 GMT Message-Id: <202404221944.43MJi8ps032526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f4ccd1122a79 - stable/14 - LinuxKPI: utsname.h add missing SPDX-License-Identifier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4ccd1122a79ac55ed1b9aca58a23337008f6933 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f4ccd1122a79ac55ed1b9aca58a23337008f6933 commit f4ccd1122a79ac55ed1b9aca58a23337008f6933 Author: Bjoern A. Zeeb AuthorDate: 2024-04-19 18:23:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-22 17:00:53 +0000 LinuxKPI: utsname.h add missing SPDX-License-Identifier Reported by: markj (2023-05-24; sorry took me a while) (cherry picked from commit 563c72e2137cb8cb9eb0eabf78319e8fe9c8aedd) --- sys/compat/linuxkpi/common/include/linux/utsname.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/utsname.h b/sys/compat/linuxkpi/common/include/linux/utsname.h index e6c52f8a5020..3239801ca17b 100644 --- a/sys/compat/linuxkpi/common/include/linux/utsname.h +++ b/sys/compat/linuxkpi/common/include/linux/utsname.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2023 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without From nobody Tue Apr 23 00:32: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 4VNjkc28Q1z5J1w4; Tue, 23 Apr 2024 00:32: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 4VNjkc1S17z4CQV; Tue, 23 Apr 2024 00:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsGx/h6JFYef4kAiaHHDq4e9959aAs3bOjV87g2CxKU=; b=ZoRNXFtxEObxKe2DxgLtNgFph1bzDwAnWNzpiO6U6BjmTNFA3jJjaBNH6OdeDbD92JcKoj j95w5Nxiv0BQfFP2Awk7ptnbVgt0kLThZIFM5XEcB3fyXvIjAOZJR8Q9icLUcR5uxWFzkN 4aBa5KYpgNckL6x8AHh1/f9DpGZhAzLJikdYlo+FG39Jr6VFBROFM8xA211BfCxnzim4FI GOXXwF2L3pqS2usYE5NayBXRdpg0Hvfa3OmN+lsqc3HD4YzktKAFnSX3mYI/rzl89A25ha W0HsOBMuOtY0ggRMulhVxQg8UOQyZ6fort1UdKhOR+Ap+YkR24RwG84mNwlBCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713832360; a=rsa-sha256; cv=none; b=Rap9iqMk2PculakYiGOk02DGLl140FCmG34iPNGocnFSyGKy9mHvt8OPaEtaGwkGwv9jk5 uaNdZX3svQAwcpyBnLwDuOdseM0YNyohRhP9aVBceGpHDnIIMjn5ptFnr287oMPeOk7ncT 1gkQv4YlWxq4B8HoGv8CZxm/1tdJspv6la9cLNBoaumjrdH3tnAk9XhiwgsNMk6W5sZrIW UaRg/2yBjWb28isrbmfiLYaveGMLQWYeeUQTwtCMBVP+bMYmG2LlH82U8uP/K0csKIe0wr YHJaOR17hBM2/3xl59Ft+J403K/r13uxrp83+xc6KuPJshUsNWSwErf0eIPOqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsGx/h6JFYef4kAiaHHDq4e9959aAs3bOjV87g2CxKU=; b=XV9rnebg+9Xu9si6/hmKuITUlDIardhrD/8mhP9F6Tu/LJHlXlf/RULh+1gu7j+Oc/z3w8 9d+duBsuVZAXRSBtio1wSqVMk6RQ4qltJG2MdvR8BbRVIF/nk6zz7l7ay/caBca3aQhjnL wUQqiv2L1EMozhS/1wd4OaV/EiZlBoz+1vf4avFOrxhETMzfkmxq/6INqA96ZMxrPx5Dgl 8ZP87PYFR0U2mgjuoQZQ5C9pXVkhRsakGT6336x03SkHfGu0dgGtZvw8nkAb40xbwmE2Ms uv7SvTxIEkTLX3trUfNR2AILiKBEkUJ9/ctXI9X/PhRg6o7AmvJG7CTcfVby5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNjkc13Ldz18tg; Tue, 23 Apr 2024 00:32: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 43N0WeGG022278; Tue, 23 Apr 2024 00:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N0Wedo022275; Tue, 23 Apr 2024 00:32:40 GMT (envelope-from git) Date: Tue, 23 Apr 2024 00:32:40 GMT Message-Id: <202404230032.43N0Wedo022275@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: 2cd1939e2e58 - stable/14 - rtld(1): minor clarification for LD_STATIC_TLS_EXTRA List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2cd1939e2e587626c6811ee09e7688129cf749d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2cd1939e2e587626c6811ee09e7688129cf749d4 commit 2cd1939e2e587626c6811ee09e7688129cf749d4 Author: Konstantin Belousov AuthorDate: 2024-04-20 13:47:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 00:32:21 +0000 rtld(1): minor clarification for LD_STATIC_TLS_EXTRA (cherry picked from commit 8d7473703520f315c1bcd3b3d12498eee10d563e) --- libexec/rtld-elf/rtld.1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 4d97159b0aaf..a152dd444bd7 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -324,8 +324,11 @@ control to any user code. If the variable is specified and has a numeric value, .Nm will set the size of the static TLS extra space to the specified number -of bytes. The static TLS extra space is used when loading objects with -dlopen. The minimum value that can be specified is \'128\'. +of bytes. +The static TLS extra space is used when loading objects compiled for +initial-exec TLS code model with +.Xr dlopen 3 . +The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm From nobody Tue Apr 23 00:33: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 4VNjlF533qz5J1yM; Tue, 23 Apr 2024 00:33: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 4VNjlF4LxKz4Cn1; Tue, 23 Apr 2024 00:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCBfM6ThKjA+geIMCGUh/QU8fvDvMAWC7uhWdRvNRog=; b=HYQ/KCvtG3U+vK3X4fTRItPkfi5cPr/pnMz48idfKhGD+tHOHzF6NiTtmjVcu3AqMhZ8Q5 jIMK+nJDGIyBT75/pBO9BRLdG4ojVVaRY7cq/dzzN8Nj/K2PSkeJBs1mHHCmzEOkxqlKv3 i7ZZGsh5onRshwJSix4rZUuXRCGY6WpNulNtYF2joR8UoQDyo2VlAe6Lv95dMk5iP7kv23 LxJwpMnfmRZ4KGnQIdPyApHYNk+HNKzL33TxfxDp4+IFMrRWsyT0dvWlRdUo5lZHvNKe8L dhr2hHlyCgVGL4MHSfzsPYLSWOXLy00c7cPBrN3qDd3Cb/tZdMgvfrEst5IioQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713832393; a=rsa-sha256; cv=none; b=SaVa6a+ujQZSkfmNV+f3+xylDO+gxsvL0QB+UVlKAwJzqVPRURyBr/kkrJI6qouX4SE5fd XGgVsthOXnH83ehytmjtd2G6WHnRYYjifF8cRSmSPhSwNKgeRkdlFmGuBG2ML3gH78q/7+ ww5IxpaTtM6amcAyequiMiRt2KkgAVTV1Mo7U1M6iPEEvd9qSBjbjYF2ZEMxDAq05vh1lK BziIMdiatTMYi/cQueUMkTLrEcOdckya30q9waFkyWtERCphUaVxje/FLYTWVCIyelquGn //+7LQ/Knai4zEiq/dw4bmzLqdb7preTXupp8b/q10D2w/8K1GfcWapwZmPU/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCBfM6ThKjA+geIMCGUh/QU8fvDvMAWC7uhWdRvNRog=; b=Sb7BI4szqkFfLPjSphIrLIA1O5yohaZM7LE5gHxJLsTPd7p5kTBfqE+ldY6G7gvUqRY9Sh 8mYkLUBYe1bt7xGY559DsFuVfX4pCOAZvy/WsZqMF7KVuWv3Rt2G7CwYKG53taiywh5EVc 08ox/E62Hg8DNrHAeKRuFldHE6hRkzZ1cs0FGU1wL8K6RZfqK+TQ+yJA0Tb1htFKqSA8O8 jC6NF04lYPNJptKIM6tvUsAd+YdpOyfCoKlXfPan7Tn+ll3oUB1fdsz5mHP0c7/SHW4WCW Ke0s1zqx+ShhQO/OrPx0yg3hdLoJE462e5c6ZhKFvkrbwWsOBYojNVAOOx5cMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNjlF3fWwz18Yp; Tue, 23 Apr 2024 00:33: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 43N0XDaK022549; Tue, 23 Apr 2024 00:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N0XDSQ022546; Tue, 23 Apr 2024 00:33:13 GMT (envelope-from git) Date: Tue, 23 Apr 2024 00:33:13 GMT Message-Id: <202404230033.43N0XDSQ022546@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: 57d49c4bcb49 - stable/13 - rtld: introduce STATIC_TLS_EXTRA List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 57d49c4bcb494bb6c630713369fe6f0a0b277944 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=57d49c4bcb494bb6c630713369fe6f0a0b277944 commit 57d49c4bcb494bb6c630713369fe6f0a0b277944 Author: Stephen J. Kiernan AuthorDate: 2023-10-29 21:13:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 00:32:54 +0000 rtld: introduce STATIC_TLS_EXTRA (cherry picked from commit 95335dd3c19e0ade161bb4dc8462fc3d045ce4f8) --- libexec/rtld-elf/aarch64/reloc.c | 2 +- libexec/rtld-elf/amd64/reloc.c | 2 +- libexec/rtld-elf/arm/reloc.c | 3 ++- libexec/rtld-elf/i386/reloc.c | 2 +- libexec/rtld-elf/powerpc/reloc.c | 3 ++- libexec/rtld-elf/powerpc64/reloc.c | 3 ++- libexec/rtld-elf/riscv/reloc.c | 2 +- libexec/rtld-elf/rtld.1 | 8 +++++++- libexec/rtld-elf/rtld.c | 21 +++++++++++++++++---- libexec/rtld-elf/rtld.h | 1 + 10 files changed, 35 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index c8f09d797215..907377f2619a 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -521,7 +521,7 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ tls_static_space = tls_last_offset + tls_last_size + - RTLD_STATIC_TLS_EXTRA; + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index ce74c54cc5c3..9c5887def356 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -527,7 +527,7 @@ allocate_initial_tls(Obj_Entry *objs) * offset allocated so far and adding a bit for dynamic * modules to use. */ - tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + ld_static_tls_extra; addr = allocate_tls(objs, 0, TLS_TCB_SIZE, TLS_TCB_ALIGN); diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index 83bea4092065..e2dc7f8c9eb9 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -497,7 +497,8 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index 8e8966926839..04a8354343bc 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -510,7 +510,7 @@ allocate_initial_tls(Obj_Entry *objs) * offset allocated so far and adding a bit for dynamic modules to * use. */ - tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + ld_static_tls_extra; tls = allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); _tcb_set(tls); } diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index 8254f21a3ce6..73a1c89991e2 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -817,7 +817,8 @@ allocate_initial_tls(Obj_Entry *list) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(list, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index 5bfb05116315..70928829aeda 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -714,7 +714,8 @@ allocate_initial_tls(Obj_Entry *list) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(list, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index 5ed516bc4337..d806e1ec3d63 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -392,7 +392,7 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ tls_static_space = tls_last_offset + tls_last_size + - RTLD_STATIC_TLS_EXTRA; + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 807ecb31ad7c..4d97159b0aaf 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 10, 2022 +.Dd October 29, 2023 .Dt RTLD 1 .Os .Sh NAME @@ -320,6 +320,12 @@ If set, causes .Nm to dump content of the aux vector to standard output, before passing control to any user code. +.It Ev LD_STATIC_TLS_EXTRA +If the variable is specified and has a numeric value, +.Nm +will set the size of the static TLS extra space to the specified number +of bytes. The static TLS extra space is used when loading objects with +dlopen. The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index fadde9561662..1078ddd0551a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -225,6 +225,8 @@ static Obj_Entry *obj_main; /* The main program shared object */ static Obj_Entry obj_rtld; /* The dynamic linker shared object */ static unsigned int obj_count; /* Number of objects in obj_list */ static unsigned int obj_loads; /* Number of loads of objects (gen count) */ +size_t ld_static_tls_extra = /* Static TLS extra space (bytes) */ + RTLD_STATIC_TLS_EXTRA; static Objlist list_global = /* Objects dlopened with RTLD_GLOBAL */ STAILQ_HEAD_INITIALIZER(list_global); @@ -365,6 +367,7 @@ enum { LD_TRACE_LOADED_OBJECTS_FMT2, LD_TRACE_LOADED_OBJECTS_ALL, LD_SHOW_AUXV, + LD_STATIC_TLS_EXTRA, }; struct ld_env_var_desc { @@ -398,6 +401,7 @@ static struct ld_env_var_desc ld_env_vars[] = { LD_ENV_DESC(TRACE_LOADED_OBJECTS_FMT2, false), LD_ENV_DESC(TRACE_LOADED_OBJECTS_ALL, false), LD_ENV_DESC(SHOW_AUXV, false), + LD_ENV_DESC(STATIC_TLS_EXTRA, false), }; static const char * @@ -515,7 +519,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) struct stat st; Elf_Addr *argcp; char **argv, **env, **envp, *kexecpath; - const char *argv0, *binpath, *library_path_rpath; + const char *argv0, *binpath, *library_path_rpath, *static_tls_extra; struct ld_env_var_desc *lvd; caddr_t imgentry; char buf[MAXPATHLEN]; @@ -738,9 +742,16 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) else ld_library_path_rpath = false; } + static_tls_extra = ld_get_env_var(LD_STATIC_TLS_EXTRA); + if (static_tls_extra != NULL && static_tls_extra[0] != '\0') { + sz = parse_integer(static_tls_extra); + if (sz >= RTLD_STATIC_TLS_EXTRA && sz <= SIZE_T_MAX) + ld_static_tls_extra = sz; + } dangerous_ld_env = libmap_disable || libmap_override != NULL || ld_library_path != NULL || ld_preload != NULL || - ld_elf_hints_path != NULL || ld_loadfltr || !ld_dynamic_weak; + ld_elf_hints_path != NULL || ld_loadfltr || !ld_dynamic_weak || + static_tls_extra != NULL; ld_tracing = ld_get_env_var(LD_TRACE_LOADED_OBJECTS); ld_utrace = ld_get_env_var(LD_UTRACE); @@ -6211,13 +6222,15 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, "Env prefix %s\n" "Default hint file %s\n" "Hint file %s\n" - "libmap file %s\n", + "libmap file %s\n" + "Optional static TLS size %zd bytes\n", machine, __FreeBSD_version, ld_standard_library_path, gethints(false), ld_env_prefix, ld_elf_hints_default, ld_elf_hints_path, - ld_path_libmap_conf); + ld_path_libmap_conf, + ld_static_tls_extra); _exit(0); } else { _rtld_error("Invalid argument: '%s'", arg); diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 8cf8b2771a24..1f9b82caef33 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -50,6 +50,7 @@ extern size_t tls_last_size; extern size_t tls_static_space; extern Elf_Addr tls_dtv_generation; extern int tls_max_index; +extern size_t ld_static_tls_extra; extern int npagesizes; extern size_t *pagesizes; From nobody Tue Apr 23 00:33: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 4VNjlG6Qvkz5J2Cm; Tue, 23 Apr 2024 00:33: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 4VNjlG5L1Pz4Cdl; Tue, 23 Apr 2024 00:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsAwn9Wftsemo8a9cl3roxmMTDGLDn46i9YPFP6SClg=; b=HYSRlHa+Po/FRsv+uiTQfxShwG8UTpvEdlSk/8pDQ7U8g9ZyMTBD6cWKUMmLqoM2xwQz9y j5lDh3eIhGFs7OnfSVHngUja0P/LKhBJQT19ncMg4TL6AvS/xS1KCthGQZUPKlwytLfYsB iPmCngbDgUlVN4vsaFoCFmyxIHLPSyySA1NikVOpNyPLEc9W3NISFsT1F2osqJfOw3Yc18 dT4UyIksw+vBk3CahV35C0JYr4QLtjolhFXr3ot7TnNTp+ekPng62jdz3zuz5+OdW8Lv3U JTMy6hdR9vFs8LL4boWFUkgePZC0NwS0DWF5XVN784YR/KQgvMfLKI9hJDA3Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713832394; a=rsa-sha256; cv=none; b=YHrMORfLcqSVAdiJLj1DiYhCsCOXOYDoSAUcnx6nXM7MmX4vzm7zhGlu3CjnAQogW0WkO1 +B2JXIcKOPjRSK7DrYKr3xdAYV+BI+WW59HdJJ2SG9eQMBvSn0OxFU/GK9E1i6TTD5Iyic oncSPPgfonjunxR8/YhmVditRvHrBWlzMWEOzSMoQtyCJO6U9q77DV7SFHw7+17vQrrfSE EjeuhTJh9afBiRU8QGva0XNjz68i6YeJ8VIz0j5zTLLF8ptfORA6di2tho3OABxBw/4zDT RhDon8e3cc8CGjsHuqLM3EjNrEzjSv0erDEH9bSrxx+AvJR/L0uheKpRentjKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713832394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsAwn9Wftsemo8a9cl3roxmMTDGLDn46i9YPFP6SClg=; b=f1+F89Nt2vhHdezIRzW5Igmiq4YAuYcBnnHpIvX36AGtpU8mGY7Gd67lMf7bhGmZjzZwKc 7iuYKszzLaUAJgdx56EHGi0vJXKR7oZoXfKoSqWEEQbgpzDUbu8Xj8oAttLxCOe7PRR0Ga WAkNkNY6923KwwFajWa3PHhHuLcwNC+BgV9cLeeHG4GJ27DHFYaZpmYRn7XBhapbS+N9ie j2u+8B/8pO8HjrJFab/tDQMZh3lr+JvPSHSXHDN+o3WOE5Pqi3o5LFeuqvJhnWYD3tnyDK 2y+kL8xS5vjnxvlkcbGAHpTr5mF+Re0Lr975k5PcYz0EVsYbtTA1D4vzFhR3UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNjlG4xWwz18tj; Tue, 23 Apr 2024 00:33: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 43N0XEBP022593; Tue, 23 Apr 2024 00:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N0XEh3022590; Tue, 23 Apr 2024 00:33:14 GMT (envelope-from git) Date: Tue, 23 Apr 2024 00:33:14 GMT Message-Id: <202404230033.43N0XEh3022590@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: ed9f44083dba - stable/13 - rtld(1): minor clarification for LD_STATIC_TLS_EXTRA List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ed9f44083dbaf9b1bde1d81f7b48308e1dc33138 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed9f44083dbaf9b1bde1d81f7b48308e1dc33138 commit ed9f44083dbaf9b1bde1d81f7b48308e1dc33138 Author: Konstantin Belousov AuthorDate: 2024-04-20 13:47:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-23 00:32:54 +0000 rtld(1): minor clarification for LD_STATIC_TLS_EXTRA (cherry picked from commit 8d7473703520f315c1bcd3b3d12498eee10d563e) --- libexec/rtld-elf/rtld.1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 4d97159b0aaf..a152dd444bd7 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -324,8 +324,11 @@ control to any user code. If the variable is specified and has a numeric value, .Nm will set the size of the static TLS extra space to the specified number -of bytes. The static TLS extra space is used when loading objects with -dlopen. The minimum value that can be specified is \'128\'. +of bytes. +The static TLS extra space is used when loading objects compiled for +initial-exec TLS code model with +.Xr dlopen 3 . +The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm From nobody Tue Apr 23 05:24: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 4VNrC92jHjz5JSkD; Tue, 23 Apr 2024 05:24: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 4VNrC929Bkz4hD7; Tue, 23 Apr 2024 05:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgRczKwoprCIOMPcvkGwSieeIrFkDVP//cIpmSxsjO0=; b=VH36LB+kt/PUxYJHou/7LS5+pdBq9p0/Bk519qSCZDaFqX+vR+QubONSWldzNZnsI1vfex nOINpSw9mWhdS78R3bHAn7aTgSwy5wV49Ny/G52AtHx4Zhuf83rGbbtWlNQvgRHc8meWP7 ivFe2Dg/PLdABnv+h24+8zRmDIQEvY8n6dt/aPPlUs4augWjFHq8ewPW8UT5YHla1vXJiA vZDoRRvHMzMQq3hYgsbJDBhLoS6EyuSNI9vJevpNn7+YjEzP33luwqP2MujS1B4JeXzhQY B/DpPZd4aOGde608h4KZ7h9IfydGvhbB1yIYrV/mNf/sPLgmBWYy2a5/nZJ7VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849861; a=rsa-sha256; cv=none; b=H0DEFDSdVBNJ60M+3R7Mqo7K1+Jn/IaDBBJRA9QfXs0Dfqf78If7mF9JY46NOULLNOUq/g szkbqw3wUtoQlaqDRAZ/pyU1YAICK06y6tNyCoXD62GuY7Q6VO/UrOm370BJwFfcZ6ixpA GYA9UnKYosHUXtxgP+bFwjq4Q4f/fzTo6mQX+mXKXqPnaxzqC5lQKNEAeaCAUyY00mAK0p XA66i9mnyTZZ/FBkw0CSF5CXfaZpD3V/SxQI1pokca+wxQzeF3wN9yyS/uefxQI+mIY0lF i5jKJmGgcVCFacSBnyJOmtJBdxCbb/rlzNe6X9Nsbz7FGPOCEmBKdkiKpTz5Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgRczKwoprCIOMPcvkGwSieeIrFkDVP//cIpmSxsjO0=; b=Uzwjeb8bvTt3SIuDAaoLQUvBOQAobnXOQKBocesXxRhkJenv7MbdqjT/ILdU1hx9izP0cs 7Jhi5ErgwQTntG8sE1GolyworsOpZIUBa0jfqG4I947MQcyPty3iG7Q079xx5wdNvWkKBz Qw+nd/Poed+PvcKN/yVTt6JMa4IIHWjNLJdFYRZ6bGYEJbR5d+GsPPBjF2+5X3VHeubiCx ERh1GdSEAhIU6+p8slhT1tdt05D3AjKdSTLojBrvNPYB0RvprKp/amird/Ngy4fz3WZ4l+ IKxBwVtUxznUYGtcZUGrKHtOcu7JC04XWiUz2hB406KFc6evYZkVy3mvRxVfRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrC91mfxzJGJ; Tue, 23 Apr 2024 05:24: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 43N5OLIE015637; Tue, 23 Apr 2024 05:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OLE9015634; Tue, 23 Apr 2024 05:24:21 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:21 GMT Message-Id: <202404230524.43N5OLE9015634@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: 4a393999f312 - stable/14 - usb(4): Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a393999f3124626161fbc72658e4f19e2a96a38 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4a393999f3124626161fbc72658e4f19e2a96a38 commit 4a393999f3124626161fbc72658e4f19e2a96a38 Author: Gordon Bergling AuthorDate: 2024-04-20 12:10:59 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:21:45 +0000 usb(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 604511f84ae6378db25ae3080e9db2e3bc9e0811) --- sys/dev/usb/usb_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index a4355de237c5..c4fe3b4a6ab6 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2484,7 +2484,7 @@ usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len) #ifdef USB_VERBOSE /* - * Descriptions of of known vendors and devices ("products"). + * Descriptions of known vendors and devices ("products"). */ struct usb_knowndev { uint16_t vendor; From nobody Tue Apr 23 05:24:22 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 4VNrCB3spnz5JStx; Tue, 23 Apr 2024 05:24: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 4VNrCB37Hxz4hP3; Tue, 23 Apr 2024 05:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQRCw8Wwh9n4DQ6I1xqp2inx/T9SRI3QAOebvirVnG8=; b=jdTNOVFAA+PoJPcqqp/1YsG13AN+dFt66Iw8X2qeM46Hh2XeWAY15oaQttQ8JSGvx22a8X iMhX54FGHB8lfqGkFYyBQINYhOoJa0GD4DEk6dv3aReAoAs2CQ199cuZlKRa821PhrZlkZ GPO36JE8hzTtS87mvcZhsYM0xeRkUJTMom7v6PrFM8zSGhQBEmUqYXc1bYK3i5VIWn5O/r HVqOc3aBSCvdxwazAMQpIWy+3mnDpSqfea5GnWltCXccCMrGY0JXopv95Nnpkc8UotiiaI 8w31M588NSeZVq59La5/PFr7MEmQdTN1AxrQJhXRR+MSX5CdPnmmjpVC+v235A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849862; a=rsa-sha256; cv=none; b=VTUE8D25VZGCGQUfUEHdvvTNPXXwntUIhuJtTipibzK8dmJcuzks4QfwCig9SYg6rVV4Gd gWGIGu+bIfSOp1PEKb5CQl8zulA3PoU8aGFwHUz42cohCtm2V9vunXPZLlzHij6O46XKOx qzjd2DN8jUAXiyGDBbfSvADMCikK1UHEYbttdAojYYAGyCjYIIKz1b9l/3oJjXxvTPbvsr 1EAKlKEWzI0dx44vBhbZT8fM031EP6lCkVjh2LvTQNr/DNgHWYSQo8YtkckDiYfLjNOOSf KMBrsThYzJw2RUAOjPtKJuP2yFqkaUxsdsJ11L2RiVtGAKjne2UB3OmYHDj3sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EQRCw8Wwh9n4DQ6I1xqp2inx/T9SRI3QAOebvirVnG8=; b=X5SCjK2nPXzAob3rwteG9QYiY30bSjvPpSotOtzTW2mRMDNOjeNaAHzb+r2QB7Rm/ugwRX 0+HLZvAWCG0hdEv33uIHt+kc+KUGJZ5xHmA0W6US72caAWBIz4RXPEyrWMUc3DitENH96B 0qLq4fJwfhjSHqkMcV7SD3nAYjuBhWLNPzb4s8TNJRouG46bmfxXk86bLS9O0YLxJ2SYpx dru8EB1iFdpJA+Imx2m8pWHag5l587u0V6B+Jfl3F9AmW2Zx8DSMdnQk4gO5P6jorKMdkL zAgHSsY9v/Xn5o3cxo8HZmoGvw6DlUlxgMLGrnZrg2N+xHrGfajOJtaeGmaK8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCB2kvNzK9v; Tue, 23 Apr 2024 05:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N5OMs0015689; Tue, 23 Apr 2024 05:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OM5m015686; Tue, 23 Apr 2024 05:24:22 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:22 GMT Message-Id: <202404230524.43N5OM5m015686@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: 7b6a12da16a6 - stable/14 - binmiscctl.8: Remove a double word List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b6a12da16a629ba7cf1a93631ed5f588cec2e17 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7b6a12da16a629ba7cf1a93631ed5f588cec2e17 commit 7b6a12da16a629ba7cf1a93631ed5f588cec2e17 Author: Gordon Bergling AuthorDate: 2024-04-20 09:15:20 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:22:06 +0000 binmiscctl.8: Remove a double word - s/the the/the/ (cherry picked from commit 5235e9d646e7771cc532b8fc02f742a8157a41e5) --- usr.sbin/binmiscctl/binmiscctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 36b69f5d3375..178389920448 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -128,7 +128,7 @@ To make the interpreter automatically available in jails and chroots, use the .Fl -pre-open option to allow the kernel to open the binary at configuration time -rather then lazily when the the interpreted program is started. +rather then lazily when the interpreted program is started. .Pp The interpreter .Ar path From nobody Tue Apr 23 05:24: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 4VNrCC5jwYz5JT85; Tue, 23 Apr 2024 05:24: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 4VNrCC3vDxz4hS0; Tue, 23 Apr 2024 05:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErHPLpSNmAT4b4d1rdDy3vw+mu2AM5ZanQLR45j7qRc=; b=G9HE87v9uM4C729vVPfAIhMFkuUFnSoAqCZi6dEEMa9WDR4UROY9Va1eYL34sLRyRH+ofH ODBXmQVibWwXAv4aiyt1Q71HsF3DCc/zSnaljeSNUCwPkdkSL5L5bJo3akx0h0hxak3YmU EUe8chvz9dN8UatuQ47hl7WPq6lg+p7/7A7s80o6qyYpnEC7WQElP5jE8fmOM7dQfv85o3 Ld2Rn2WvD7u/RiwSO0oQWdFn6GSzYI55LuSb1bSvP3t8Kj7E4XlD78iDgDdp7iMeL8mOJ4 3Sk1//QNyd/ARnht5x0a/2bIm7guMNTa5RMmKyhcmuPgOmR1pquxf24oKZ5eyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849863; a=rsa-sha256; cv=none; b=qD8o74E+GHtrZKQLL1wKHgNOeDyPuzU296FYZloyOUf5ZKD4MrWfqYBIqsua6m1C+Vmstb EEq4B6Sbw5HIo1DwipCGbQLPrzxb+YmyebWEhb+SvGH0u50DLROmEKys5OfpXqh/PVdvnO SkomNJ6OhPcVdhGDJDWZA9Oh5De9doir5i5QyxnytbCAEcqQRlgTo7vAerWADAfO6vWP1G RyAgT2aJu37nv4qlIhMn0gCQ8MD7KY9+IzaanZayxwSTqpea5oos/ZMWXRLBKMacdth5C4 VkHnutvnDX2DEj5m6GLWqsSOncUDTBv+UYLfALnFKctmMDb+0PsI+VZ/SlYkdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErHPLpSNmAT4b4d1rdDy3vw+mu2AM5ZanQLR45j7qRc=; b=Kx8Kw8ZG+4hPzlE4yAOzmhj9+akc36jkjp5ZB3hbICx7m4vN3a+3OSdyZ5a8gu/rBWrQfx OfAgr4iXq1yqG6J7vkpId7fzZT7Awwid3amaxrp7+Z0eLcq7sdmmPap055aSCzVaQn6hKg tcfFRM9QaHK86XcXFaOW4A+6l1UK3ID1zDcmWzC3F6UG2u4JZJIaReGJg94U10AuYYmZvI uPKszu0zwCCHGHgkLdtcZi8KMYb75UEh9x9tg1vGlryRSOTm16NHPvCHzid5K9fra17m5X queZUJuVWMMsa5kPYdfk/6dHYc7yi4pzaNUza+JuHXhMKN4iLs7iBw53+tP4JQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCC3ScZzJyn; Tue, 23 Apr 2024 05:24: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 43N5ONOA015731; Tue, 23 Apr 2024 05:24:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5ONFG015728; Tue, 23 Apr 2024 05:24:23 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:23 GMT Message-Id: <202404230524.43N5ONFG015728@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: 499d4a609480 - stable/14 - timerfd.2: Remove a double word List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 499d4a6094806b5867903a600f1de07daf8ade07 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=499d4a6094806b5867903a600f1de07daf8ade07 commit 499d4a6094806b5867903a600f1de07daf8ade07 Author: Gordon Bergling AuthorDate: 2024-04-20 09:31:25 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:22:46 +0000 timerfd.2: Remove a double word - s/is is/is/ (cherry picked from commit bbef63ec27fdb86814e34c4b4013cd92ba86bc42) --- lib/libc/sys/timerfd.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/timerfd.2 b/lib/libc/sys/timerfd.2 index e5dab05821bd..7a112ad0dfcb 100644 --- a/lib/libc/sys/timerfd.2 +++ b/lib/libc/sys/timerfd.2 @@ -300,7 +300,7 @@ object fails if: .It Bq Er EAGAIN The timer's expiration counter is zero and the .Nm -object is is set for non-blocking I/O. +object is set for non-blocking I/O. .It Bq Er ECANCELED The timer was created with the clock ID .Dv CLOCK_REALTIME , From nobody Tue Apr 23 05:24: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 4VNrCF0Vg5z5JSpW; Tue, 23 Apr 2024 05:24: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 4VNrCD5KSGz4hTh; Tue, 23 Apr 2024 05:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VqOVdzPmyDM1p0GApU7zYV+gcs3Iws0rNZd/uutsoIE=; b=CA7DOFEMQdZqpKcg/AvMHNGnGiyXtq2gBdrejeVbuPE6IV6iycR3WfL2dA2GHBxkFUpBmJ 25XzEWxB0SMKHI3lLB6qrqvdm0bB3rhQ+jNyIUz15vjPP702tdTtkoFP11OkBwVBEBoECL 0zbg+l3w+rL94urtwE9Mc37j0Vxi1tHTqFJqwBLOK/IzsNwFNPpPF9meEfoLZIbau7Hi3T fovPgV/ouWfaOrq+cnK/mZAoqkD13hU3WXBGDnVUTZnLpKQUMQJqH0opv0/RVpgBa25l+0 3HwRsJjSdzuE0DgtMTM68VX9T06Pp10EksXl19vqnMy+bOXlfs/8gaM6/xfF4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849864; a=rsa-sha256; cv=none; b=CJj319xkTkAvYHFEpz2SKB3w9jXZbi1689/G3btEUvXC0W/z1en+fdjKvKBLHaxK136Cgu H1ui2keKrXS6r7KamLZVFvY7CRLshQnmx/+F+cSv1qYwzKyW3nU4br8lN9UGJIwcDIOKhx v/ejZ4kLQAMZc0R0DV5SHIXgPOxUhM4Fz3rMYSIXS5OQP2IUzwE21WizqxWMF94PEq75HX tKed5k7SqGJ/IFdbgKBn2PMpNdkCoJbqu6Chd04TTXoQSlHW5cKtKNX+kvsyTL7iMDIJ4v cx3NtSpgk01UfuLOHEFF9FZOStib25uf/khJ0yDfGUaRa0Vp3mA5AylofxVnbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VqOVdzPmyDM1p0GApU7zYV+gcs3Iws0rNZd/uutsoIE=; b=WIZWEvvf86tX3IQ+FA6EXzqutiTlVJ7ir+Eyrj2zdP5Dc43UkNbDpf3FU1u8QGc+kPux03 soGUmD6bXnymukwA42VS6Z0jx/pmn70KDCVdc8MXajLxSc5QkdyFL9oxlmiYGn8prAXKZE DZm49KKgH+/KGZRw8DhctNCpmrWhQRITqPJODb/h1UsabuLTdpaq49qxzLIAt57p9MkG2I KBfaZbslHC1Zu9CfD946N14T0EMprw30wM7AZughRZt1Zh0QBUSUt7sFpUtCVaplunO2xT VxzauwsIgek5wPslWttY4samE7ZPJ1ii1VQUbuYsBVWlwFMXvxD5BgeBxRAYaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCD4ptHzJbs; Tue, 23 Apr 2024 05:24: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 43N5OOxL015788; Tue, 23 Apr 2024 05:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OOSG015785; Tue, 23 Apr 2024 05:24:24 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:24 GMT Message-Id: <202404230524.43N5OOSG015785@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: 1e17c1177995 - stable/14 - safe(4): Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e17c11779954a283deceeb715c7208ead1749ba Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1e17c11779954a283deceeb715c7208ead1749ba commit 1e17c11779954a283deceeb715c7208ead1749ba Author: Gordon Bergling AuthorDate: 2024-04-20 12:12:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:04 +0000 safe(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7) --- sys/dev/safe/safe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index bafee29b9a9a..da2afbd38fad 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -1777,7 +1777,7 @@ safe_dmamap_aligned(const struct safe_operand *op) * of an operation. The hardware requires that each ``particle'' * but the last in an operation result have the same size. We * fix that size at SAFE_MAX_DSIZE bytes. This routine returns - * 0 if some segment is not a multiple of of this size, 1 if all + * 0 if some segment is not a multiple of this size, 1 if all * segments are exactly this size, or 2 if segments are at worst * a multiple of this size. */ From nobody Tue Apr 23 05:24: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 4VNrCG017kz5JSpX; Tue, 23 Apr 2024 05:24: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 4VNrCF5rYyz4hV3; Tue, 23 Apr 2024 05:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXxNITpjujzhkaF2Z0mZ/UrAY2KTmkEs08bP3w9LNYA=; b=HwvBDsgXGju0kvLQhCVWLQrW5aq0SvMq0yv6RxG9obBzFYlMI2wlg2OfryM9AolZks7tHz 2+Y95vbUrfx9o80RzgWKsS/Tvk7Wr/v16UPNw0wHwL90ojeqKkT95JrZKbLlnqNOmRiJIr zMEJkJtCEMpZg9ZwgK3dfjT2m2I1xujTSlAhFUC2WlQ9lixEkTAOVNPwXe0y3sJtEBow0K o0HclViLgc2qs1um8l2kC0Qs+yolEk2LyQOf8fgP74f5VzMYSaQXom+wlgFfJ0m31tMuji KR6mbOxsVAiUVuVrzMMucBXiK5tC0n/rptyMUAjQOWbL6VSa78OqrTqn45O3bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849865; a=rsa-sha256; cv=none; b=EZfquSlAw34DJYYGPl0enqvFBVVQP6ETfjcaPKDz1/sU7lshEuht75hW3/0Yyjivj8lJHv TrCjE4FGNZLjs0c5ahIzEEYRVNqRdySK0yUyf6IvAoRlfT0b4+5eQajLumNMmt1jti5vBe HaMuZn7KRR9Ihhllfn0CwonTiZsvjGwtWKTK7lHRJ+jxPmdGfm+Iv085ThpWq0fMF+T5Zu 52VveDjg5TcYVODmPA1Lqt6t3h3jSlY3ui58UEeWGuLfPHrbyhaRKYrFbVxCz0SgIjvcX5 NYjFbgauqSn5YXo9zxpH8gMtJy4MWt43P3CKTZ/aDXxwbFOSLdg6q/erDPDYAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXxNITpjujzhkaF2Z0mZ/UrAY2KTmkEs08bP3w9LNYA=; b=tdyZZoJQKnVapTnib54tTtkfkl70kTBhw2yCYVeEEYy8sC9eismNpSZuvQNQ/qwJdr+wFq nEpU/RgOezep3Rn8MDbsW214E3u035qJqXes8ECN6bsivWpgnZpE1WDYGxem1iboY2VDcZ pP7QM4kn3ykco9SfJaTavdm79PzQuymZioxgiKv6k+TUlXCDWjTfyqTa8TrOC+CSs9XPfb eRoSjz9OPxScAQY/Ybypu4H8AGbBk2pYfVr6bMImCvFsjXWYALpkRpcqSyOOipnZSUB0zq VW5MoBmFKvrBjRGteq+PrRBTJtc0vdqn1zJvuUPnUS0BBMLAxjOG1y4FXst1bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCF5T6bzK9w; Tue, 23 Apr 2024 05:24: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 43N5OPds015845; Tue, 23 Apr 2024 05:24:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OPXG015842; Tue, 23 Apr 2024 05:24:25 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:25 GMT Message-Id: <202404230524.43N5OPXG015842@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: 0b396f0185c7 - stable/14 - bhnd(4): Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b396f0185c7fc9b9a7bae30aba77e43b6725ce8 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0b396f0185c7fc9b9a7bae30aba77e43b6725ce8 commit 0b396f0185c7fc9b9a7bae30aba77e43b6725ce8 Author: Gordon Bergling AuthorDate: 2024-04-20 12:09:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:21 +0000 bhnd(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit d2747968c068b8cfc890901f4955037bad7adb9a) --- sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c index cdb92551e887..5467bcbaac20 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c +++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c @@ -56,7 +56,7 @@ * The Broadcom NVRAM NUL-delimited ASCII format is used by most * Broadcom SoCs. * - * The NVRAM data is encoded as a stream of of NUL-terminated 'key=value' + * The NVRAM data is encoded as a stream of NUL-terminated 'key=value' * strings; the end of the stream is denoted by a single extra NUL character. */ From nobody Tue Apr 23 05:24: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 4VNrCH1PmYz5JTDR; Tue, 23 Apr 2024 05:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrCG6bBGz4hVR; Tue, 23 Apr 2024 05:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOkiJ6sgPYYI5kVFjolFP2R35BAMw0v5a21oKoQvaSE=; b=bt4g7JOgfgU+A+R0hYDQsKtLBcin70JOdR+SlQc6/Wi/V5tmHZmC9iOV58UnGFF74NljGN 26GypJ16sPYhlkn46SyjI3vZXy3mIC0+TQzVeg/eSAixab32NF7MB0V2RfelCo5y/oYlxJ IF+CbhPvi7zAgfTNhX1X9xBcKvJ/vp75f4WO2GAtAppvp9rbTlIZ5emaaDZl/LFfYyIPJ/ U7Ny63hC3u5s1SH77gj8SpsnttJ5i20ktWBXFFrJJpDuZrr0zXF03b0MdYuHW7lKK1WRHs 1hDPXqR1jVUc62ORchdab8nTJFp5VOkxEBJ5/4jJxh+VIfwq5akAXedKe9pYtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849866; a=rsa-sha256; cv=none; b=PYlF5ROwc9gQsshwo99Q/7qCPdIJkK8RgqhAHaCnhMC2ZYuZUnvzFWptO2raNswnop10Ol LouOr3OkqO7TYvIAWVY5frLk8rbq+J5FSzZyTv4umiXqypRm7CYtiNTMhO1AQqeKZDMzeg zSd2ianWgOoefjtSqNvBsRynxGAl6is3tl23FDD4ZzOuSOqzr1nQ2djkmjoAX1I2Dw/yXX bSpxSV5hOrwCIxz1M0+n3/7M5CwjRAkxXbzkxCZlc90hRHzGh9C1nVNpeF7Rw550wnMnrP Pvy0w97S4UiGmOi0+Rjha8THAmD2shQoG/HcXclJ0f+K6ed8QqqL43w0tux5NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOkiJ6sgPYYI5kVFjolFP2R35BAMw0v5a21oKoQvaSE=; b=s4fTnTzNiqJ86jO6KoMfXp76Q/nz92pXiHFDtTUwMNjI85aWHlpyqoHkoIYHllv5dZiDuU 6DJAygVlxuC1WwiFr9uGv9DQ18lttvcGSyOouieuf4/xXG31ZiLyIT7xN7O+tfDq10jed4 qimiHdx45p297V+ViU4ZjavdbQuwGnBaBbm4xOIOXQgIFkzzp4hrH83Ews/4zLtlV7+6ZL 0evp4YB91WutPEUHP47LuKQy2gK+N2HY66tLd6H8IFXDCc0/XmRTSxJoazBURTyPveOJYk QzseN0Dci4qGkCxiEsc49wnH5yBWmk46SgqnJl1Q5vGqRD1uoIpi2oOwv4C1MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCG6BPSzK6x; Tue, 23 Apr 2024 05:24: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 43N5OQLt015901; Tue, 23 Apr 2024 05:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OQRl015899; Tue, 23 Apr 2024 05:24:26 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:26 GMT Message-Id: <202404230524.43N5OQRl015899@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: 6e97dd94f34e - stable/14 - ifconfig(8): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6e97dd94f34e6f74090e92100d9127a89b100b80 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6e97dd94f34e6f74090e92100d9127a89b100b80 commit 6e97dd94f34e6f74090e92100d9127a89b100b80 Author: Gordon Bergling AuthorDate: 2024-04-20 12:01:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:37 +0000 ifconfig(8): Fix two typos in source code comments - s/the the/the/ (cherry picked from commit 68b9eb9185f5569d05b5fecb178048f00c3b5c1a) --- sbin/ifconfig/ifieee80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index bde079deb4c6..c6875785f8f5 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2784,7 +2784,7 @@ printvhtcap(if_ctx *ctx, const char *tag, const u_int8_t *ie) const struct ieee80211_vht_cap *vhtcap; uint32_t vhtcap_info; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtcap)) { printf(""); return; @@ -2814,7 +2814,7 @@ printvhtinfo(if_ctx *ctx, const char *tag, const u_int8_t *ie) if (ctx->args->verbose) { const struct ieee80211_vht_operation *vhtinfo; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtinfo)) { printf(""); return; From nobody Tue Apr 23 05:24: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 4VNrCJ1V11z5JSrp; Tue, 23 Apr 2024 05:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrCJ0V36z4hZp; Tue, 23 Apr 2024 05:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7JUgfLvH2K5LtxvmGrODDIk7Sxx+OoHSx77ugpBi80=; b=QOfXtW+AJ0qc6RzxMwJAg43RYGj87JP4ZOKzGFPW1ZJQOHkHvaxjrzgP5Eho80byEFEmAN 7+GdigpxRPpPC7TiR1WEjg9bkmTEm88xbGSRE7yE9KLY419zCDBZLSCorqK9Kv6LsXewCQ SoM7fIGvdSc6SdQfJbUNbld4220dfeSPgCILs0IjH1xdj3KO1E0b6UULj+HFPL7Esd87MJ +1OQBJKUqu6ZIH7LUb/MT6GkCKXZCk3y+xkBp75vlSrc2q6RAKEkKVISuz8eps20LnbzCH l0bu5YK9K0pfCyqRX/5lxHR3vXZB5+bq+d91bzFkZ9X/wPaOjAawTp6LFdK6NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849868; a=rsa-sha256; cv=none; b=x4sX5J3pyetBSAXF4u3anfONqj5R2ji0kOVu+2wQkr1fM6FL4IItTAB6SFZjwbZGNYVoNq LM9DatRSA9A6U5junEn3DZgqpeWEaiVDGcpcoz1vTV/i6KUoTKB7qYUoLkxMJsDhFQxebu hFOAPfBS2zhDx5jSl6uHRwtHvw5h639fhmy2jhKpQwqnRfBHmFMItsG23hrYXzv0fEIBdv uv6xjn2OVVemnaOWVtlNGFtCt3L/Sy6tGyr7pO3lUzslx0aVO3B427t3kJ/A4M+bWUaA5N /nhcrsjvPemBOknaxlXhujtDa7srWGh6vgeonxST/1fnvIJQKFIsuyBm30gKrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7JUgfLvH2K5LtxvmGrODDIk7Sxx+OoHSx77ugpBi80=; b=xsVdqE1PHbJJ5pbK0eujFHlHUSbM2cEOcCJRciePk+Xddr6M+ptg01waS8z8PGHpX5RNcR gFPTsaR5bZ28EOVllPYAgj3GSUC6nocvDU759B/24AQ38GBevGR4LzK/YUfbbWmX03keOy 6uX4xpi1cl0KkUg+C+NPqfKspWwwCtKyoQnsc808wn5BKsAYZfaHb8L2JzWwEKRtiKfUOE spSGkmWtPX51l/hWYpQm9N7oPXzqAHLTz9Mid0ahm8hdbv3gNEjZvDITnXFumXcmaW8PNr 8KI+hD4jUeF/TY7rbFf+Rxha0it053bvrc2grAGfnGEVz5elumXVr04m9fjcsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCJ06Y5zK6y; Tue, 23 Apr 2024 05:24: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 43N5ORkX015964; Tue, 23 Apr 2024 05:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OR9X015961; Tue, 23 Apr 2024 05:24:27 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:27 GMT Message-Id: <202404230524.43N5OR9X015961@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: fa4b1ab76983 - stable/14 - arm64: Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa4b1ab76983e54b34f303eb7c911f84dafc0751 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa4b1ab76983e54b34f303eb7c911f84dafc0751 commit fa4b1ab76983e54b34f303eb7c911f84dafc0751 Author: Gordon Bergling AuthorDate: 2024-04-20 12:06:53 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:23:53 +0000 arm64: Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 516e591db11a29c7bb3d8135a94530b27b94f91d) --- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index 825043a09faf..2323b4bc5e1f 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -61,7 +61,7 @@ struct qoriq_dw_pci_cfg { uint32_t pex_pf0_dgb; /* offset of PEX_PF0_DBG register */ - uint32_t ltssm_bit; /* LSB bit of of LTSSM state field */ + uint32_t ltssm_bit; /* LSB bit of LTSSM state field */ }; struct qorif_dw_pci_softc { From nobody Tue Apr 23 05:24: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 4VNrCK3QpRz5JSpj; Tue, 23 Apr 2024 05:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrCK1d0Bz4hYQ; Tue, 23 Apr 2024 05:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wi2S5FkYWxm8VLizMtNj1J65xCy/zurKmJ8Pq7rjrXM=; b=PK7Rf/n6+n1wcW4huFy5jP2m0Lqk8Kac5fDL+XZBv/r15Gf6dOk05Vl7OQYYcKoFJdrWup 9x4WZBxC7wwySTg9MmONfVFlkx4+h+mHV3TOibT5parv1ZPOTzPdNsPX6Reivop9Qmg8jT 4MHfcINk1Z0uhrNVOUa9qsXAZTyzCYIHqWfCIF7UpidgVd9B91jmRFucd+JJ56mHQTvNop EtLA+r8s+8/MulJ1SHmVXHEMHRJJ4JGZ6NFAh3MWeLqgx9psz6YNl51yGwPhmNIHjFdRox c75ITIeI9u6eQJb2RVRSUIblP7AHLOXQ6XT8KAJOZsEmeqmkHZw1t+8qtYHLVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713849869; a=rsa-sha256; cv=none; b=D4EnrEslkXw/HBFtBmKRUR1RzMeyAdwLMsMOcptYGOqXMvRoJ6WxUHnV38oXJCk8NVoDyt oOtmM6R3m86NrSekutcg3Q2ITyoG0hHy0BvAh0BRGTrt55gZdVKZ5wrxTTpHzZ4xdYqpvb ywX5s+vLvoDglO1NLAJW2lImYdmQvcbyB3GV+xjlrjPkJFjwT+93yuGftMJJe7P0VVwtIQ C2L9/B7zpwWwG1rMz3g+WAraZd+0TXV1bdm1htXAs+q/8VwXyOIEwSwCYn1sXLrJNkriVE I56BE+7dpEHdol9fplSv4WiAWkOxyhiXLgQjh4u7SzoxbQ4lAexGT4fjhFMPQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713849869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wi2S5FkYWxm8VLizMtNj1J65xCy/zurKmJ8Pq7rjrXM=; b=NdpyoNnnaL/Ac3eb3ck39Z8jqpI9/mK9I8PmwDBcTDT6mwUK+6BtZX8/RPnLpUQUamyaHX cksLit2C8HVyz603s39fZlLodKiTL91cEnDYdsscn7ptsGAfbFxuoNH22BaUgN6gwc0QpM gBD7ARdNcFl5IFgqcjo2QhwJBOgbyZfeC2jqRA4ok2DCGq6NLl+nUQuzKsrErAOI2i990G cwzjOJ8/PJUr7wkDL5otC7uvZx3Oc2Hi/HRfeEDKX+vfalKUt4syG4hEDhWGw+2Q9yRge3 B/mOUhcqd8RQPTHkWyvVJ2qEE5GF03MuQrQEgRprdFiJ9Rv/b4VhVRHOuZx9Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrCK1C5QzK70; Tue, 23 Apr 2024 05:24: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 43N5OTh4016012; Tue, 23 Apr 2024 05:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5OTA9016009; Tue, 23 Apr 2024 05:24:29 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:24:29 GMT Message-Id: <202404230524.43N5OTA9016009@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: 0744d3268e07 - stable/14 - NOTES: Remove a double word in comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0744d3268e074605c279e553f605cd62dc134883 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0744d3268e074605c279e553f605cd62dc134883 commit 0744d3268e074605c279e553f605cd62dc134883 Author: Gordon Bergling AuthorDate: 2024-04-20 12:08:04 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:24:09 +0000 NOTES: Remove a double word in comment - s/of of/of/ (cherry picked from commit 1ff65c57e337ddb1681af5f98da0fa757cefc5ad) --- sys/conf/NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 45dd6c30c7ba..c6434d1ea85d 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2744,7 +2744,7 @@ options MAXFILES=999 options RANDOM_ENABLE_UMA # slab allocator # Select this to allow high-rate but potentially expensive -# harvesting of of the m_next pointer in the mbuf. Note that +# harvesting of the m_next pointer in the mbuf. Note that # the m_next pointer is NULL except when receiving > 4K # jumbo frames or sustained bursts by way of LRO. Thus in # the common case it is stirring zero in to the entropy From nobody Tue Apr 23 05:27: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 4VNrGK4jcDz5JTDH; Tue, 23 Apr 2024 05:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrGK3Bg8z4l5R; Tue, 23 Apr 2024 05:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxBjA8i098AxquTmR845pq3xeId1n5nufI5pYmuzmYY=; b=xQtnV2hqJUmxjsbI+mLtdk8n5a8hhtfZojeqa7eUjJOoTWh/5LFgD7I48pGzZIQEWT4vTU Rwa1EQcg8FxIMJN9kQSQMVu9VWyaAbm/1ignp8YhB0KFifZpoFMsEKMCcaAZHfS2i8VR2f ayHnEedXif1R6EvvC4JIB7zcYnn7nHnZSoz+7GzPglTeYwhFGBll1sj24lRppvb5cdkoAw StZU/3qSs2KMR2V26VjJzzQNgayDw+Dx5spMrgJ8Ve0f4DvyBIUew00XhyxXE8FbkI0z5u INko/M5SSmQUEhWTTbew60EYtbhuovEKo/bPPi+yj4j0vQzZdH84cXpGKZpUOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850025; a=rsa-sha256; cv=none; b=uc5RH5apuuav8rcjKTcIQDqORXRF7vwx6ES70jkM7CuXAhJQ7QL626RiAAyFDfJfmOHOCV jXFxiaYgHbqwWWc/2xgDqI7WEYUi04ekxvGncVXwLl7rztCmgK43pLwn2zDwexLhYG2E7e j+NN2C4e5Uv3/wGfyBfaytGcOCg29J0aAUafENhBJWJifrveqSPoCNxvaedx54jz8hT5f4 sfyE4lCQfkt6cHVUZz6fMDHY5b8Cig2NK2dQ9ZzQgyPcNLB4XX14wdkVkLNdY6gHmmSy7j fJRX3pC84hnxdGA8NRxVQ5K5pHgu5jkMflHAoEq1pHh+/lSikPNxxnEY2VBEKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxBjA8i098AxquTmR845pq3xeId1n5nufI5pYmuzmYY=; b=AHlTLbIcG92LeRDFrLWS/kdKdP5CO9M6Ty/xpJ/Koi7OkJJMvdyVpVjdDasvD4dbycJbTJ ise+R8sHk9JhsQKpvEvm0Rgvikud26fYzIquypnNDVqLiLKxPG5nU9iuZoJtXwHLMvRo/E 1G4dZdPCcq+C8BNwyzF0s4rK8vXFljTN1xawS0XOkt6UjwdtDWeNdG7HrlXGldm9BDgDv0 33i4D8KJ8LY+AS3JguG8ikFWTF5vJdE8/bOBToTGSKMjXlBE+WpMFBUTHdFgu3v/uTDEw3 UOBMU8riPVSm+r8AzcIKlKfqGnCoID7iu/dQ31AmFbt2RIr42C35m/HZ0D+iMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGK2GjmzKB0; Tue, 23 Apr 2024 05:27: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 43N5R5Zr016712; Tue, 23 Apr 2024 05:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R5kf016709; Tue, 23 Apr 2024 05:27:05 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:05 GMT Message-Id: <202404230527.43N5R5kf016709@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: db6bf2d09bec - stable/13 - usb(4): Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db6bf2d09bec47a3729485eb999ffc393126ec30 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=db6bf2d09bec47a3729485eb999ffc393126ec30 commit db6bf2d09bec47a3729485eb999ffc393126ec30 Author: Gordon Bergling AuthorDate: 2024-04-20 12:10:59 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:24:57 +0000 usb(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 604511f84ae6378db25ae3080e9db2e3bc9e0811) --- sys/dev/usb/usb_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index a4355de237c5..c4fe3b4a6ab6 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2484,7 +2484,7 @@ usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len) #ifdef USB_VERBOSE /* - * Descriptions of of known vendors and devices ("products"). + * Descriptions of known vendors and devices ("products"). */ struct usb_knowndev { uint16_t vendor; From nobody Tue Apr 23 05:27: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 4VNrGL5r20z5JTLj; Tue, 23 Apr 2024 05:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrGL41FRz4kyJ; Tue, 23 Apr 2024 05:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zyd1x0Qun2MRwwXqnnHMjqLc96aMbNyKDX0RGXpocA=; b=rrHD7zAgdPj7hJXybNXc37MJ4w9C4QfaB9T/J03qKA8cgTTin3ZiWfqLraUxDx0O4oBz8L fx7dBXRSPU184VBtep7FRETskDPdRwNK7uWqJdYQUsXOSo2l9SPkNISn2bbeUOVjqO9UMJ g9qP/HVKY5r4aItB/gPDXN43zcmwLBQ0FrA/XNWVsKQH4CfLAHEUwNxzPl0DERyYntfMRA YTMIf8QZok4T6QAB9UpNFZfcZU/r+LlMC5pa44OXeg96qqZ48rAz03QlBkoFc8bfkre2CW SFCgMqwJgYMHZDO57vC+X4MinAlwKbgvvUMKpHO8fgkZF9jyxawCBmgD0wMCQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850026; a=rsa-sha256; cv=none; b=fv5jcTq3RvdLOzJtQkuqWaLP7+Zk5R351Gli/nitJWOS4PoUpm4HNYfobq9DduPGeVh9jv D4lEHqfanLHonoVysEQs/O/I3SLZWnrR9/9F+/Sq1WkJEkxhO38AkjJksrn2pUhMjeJvXm RWSP1y6PgXV51tSF+eBKfTmc5lDnmzqSREUZtfXjyr277bItmFzxDxBFWvr3RR123qao0n /PmfX1adYHiitRHIZqkTm9bAta6LDl6bKRFvJ9KsVr4229P82ET+/kwdbLEGmyObB7Z1hv ZmZ7MTib+BhZq6N6L3EOUWIY/r0/FdV40j8f/aymoaqAs33aG0IwxArNRFOayw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zyd1x0Qun2MRwwXqnnHMjqLc96aMbNyKDX0RGXpocA=; b=vWrcRbMjNkWXcyEDtR61h1egB5pSuFrsaIEUkLN0r8ldtj5WleJroI2FgWQex88fVp6IMh 3buPDMckSCHI7+CtvgzuiQ03qv9FOYyFXOG9FtyLP7ENQcJfYPYgGOYCiIGLJeCYPaZhiA Vt5AjOXan+2o4eQbE4oEZ0t/jTJS2KzqkW67Ov34TcpS+VjZnqfUYe2F2dph7djL9WYWXO ntP3UDzTJQ+wy+o7IMNI9nnXFRVTqTzsJVaTxHd7zJj+w++IdAPAxcskYwyrQ5St+AKeUf QwqtlWaeiXZq+UGeLQLymVy1S+1JBPhnWoroUw0nmGI6xtVgCAQ6RC6bFKmG0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGL3XFRzJyp; Tue, 23 Apr 2024 05:27: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 43N5R68Q016758; Tue, 23 Apr 2024 05:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R6Dj016755; Tue, 23 Apr 2024 05:27:06 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:06 GMT Message-Id: <202404230527.43N5R6Dj016755@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: b6ddbb47e120 - stable/13 - binmiscctl.8: Remove a double word List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6ddbb47e12077c5a24bcbb0500b4eaac114e9aa Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b6ddbb47e12077c5a24bcbb0500b4eaac114e9aa commit b6ddbb47e12077c5a24bcbb0500b4eaac114e9aa Author: Gordon Bergling AuthorDate: 2024-04-20 09:15:20 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:25:10 +0000 binmiscctl.8: Remove a double word - s/the the/the/ (cherry picked from commit 5235e9d646e7771cc532b8fc02f742a8157a41e5) --- usr.sbin/binmiscctl/binmiscctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 36b69f5d3375..178389920448 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -128,7 +128,7 @@ To make the interpreter automatically available in jails and chroots, use the .Fl -pre-open option to allow the kernel to open the binary at configuration time -rather then lazily when the the interpreted program is started. +rather then lazily when the interpreted program is started. .Pp The interpreter .Ar path From nobody Tue Apr 23 05:27: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 4VNrGN0Bcrz5JTJj; Tue, 23 Apr 2024 05:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrGM569Kz4kyL; Tue, 23 Apr 2024 05:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rgIleGDYiz/O5mxhHFEGBgHU7agKYZC5y8QgK9iZfE=; b=yYsA3rEf0Bb669b//w/mq+z5BgVpIXs0sveJZ9Dno0eSEYNxZ0q4F9D0HkE6qcurS0vEYI jdo3Uk2A19kqogVVuvqLEl/apRLgkZJMbM+qZAGgBl6fPOI+IqQnNhHTO8tQi6mEDqn/BZ 0mCe9XEtB0awKLwc25+ehYuOhekXYdR4UinXCpy4YwDmJ8Dp6/6IWhqZ4HuFn1tjzK3jQn QjRjrFoa7NozfcYXWkF+oL0dTHQldxA+M47MAqMW7EiSqrnbBBgCZfIzEeu/28A/1ANVjG sljjUxb+OyEH/e6gZ2sJ94QttlHcoD+xOPX9YawJzft2Sbxq0RhT93gSEphYtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850027; a=rsa-sha256; cv=none; b=isfDScrMu/Nm2KEPqIHxHFpAphZ7Z/JYB6w+vC21Vkbwj48wOfr+pFMNdY8WEwuu4QIt1t WHOJJzfuG4vgU+aj0Un9ZqoEJx0bvOi3dd7j8CDCXUaz4N9marSbfivGwWC1bhgHQIPLR5 4fK3IEAXGRLQVGzTBtPVAN+aVhgHjmdZz0CveBfkbvAYEfQnxJukrcD5PQdbEiTFUivWZf +cs7I6/lb8BuPaapy+Zu4L17r70cDiJCpuupi1zbbDgNBU7uIBzsg1UG4ulpdkigpBCjp8 72rDPQ9U5+E1uqxVlT/284K0gGg3gD4jUy0IVWbQ+QTIGwgQ7j74Xjrn099z9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rgIleGDYiz/O5mxhHFEGBgHU7agKYZC5y8QgK9iZfE=; b=GtecJbcKwgwTwurs5Ed7sPMg5UopGjaX2UX7/nw8Q0xE3ArARqhDaTC4Ru9lI6cpEROAvH Gbwdgv+rOPfOsk+Z6Puxr8UHmnJbjxmO6MKOF4uCSSDaSkJY/1HFdlF0QtE239SpQgqA+X vAq8kmqpM1yyxEuBZgXPQ0DppxXK0yTRCyrMHJXib4snUVYhy/5jdWY/z9KGAsqBwXDOA6 Rq7UWRjcJ0Y6bpjbcrXZzjA6bWqxL9rl3XR8ov4iP2L1smuFVr5NTkDA8euUpPuWyQxu2y 0e5GRjv62NpMWclnp2thdmJwua3Huibt2P2Dgfuxyw0TgcldgjTSspCbgkB2PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGM4bJKzKB1; Tue, 23 Apr 2024 05:27: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 43N5R75Y016818; Tue, 23 Apr 2024 05:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R79F016815; Tue, 23 Apr 2024 05:27:07 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:07 GMT Message-Id: <202404230527.43N5R79F016815@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: 8e73397eb632 - stable/13 - safe(4): Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8e73397eb632ca273e8d4b01695393f12dcce62c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8e73397eb632ca273e8d4b01695393f12dcce62c commit 8e73397eb632ca273e8d4b01695393f12dcce62c Author: Gordon Bergling AuthorDate: 2024-04-20 12:12:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:00 +0000 safe(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7) --- sys/dev/safe/safe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index 8ce093b637db..f33905b1ce57 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -1779,7 +1779,7 @@ safe_dmamap_aligned(const struct safe_operand *op) * of an operation. The hardware requires that each ``particle'' * but the last in an operation result have the same size. We * fix that size at SAFE_MAX_DSIZE bytes. This routine returns - * 0 if some segment is not a multiple of of this size, 1 if all + * 0 if some segment is not a multiple of this size, 1 if all * segments are exactly this size, or 2 if segments are at worst * a multiple of this size. */ From nobody Tue Apr 23 05:27: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 4VNrGP0Nftz5JTLr; Tue, 23 Apr 2024 05:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrGN6BhCz4lBT; Tue, 23 Apr 2024 05:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sLY/XhCdXBqEaiYZnDYQQra2KP2thclOI/NV8z9k5mw=; b=nUbwOWMXnXYDlYrfAHuxYnIcf2Pb8D+aAenWcqG148cJ+lfMn7Bh7/fJ+D/9HGQhyUoXsu 7sI0lP3ls5RXRqnukuqJ61Iz1DbBwj+AtXEG/4vViy7K5ucNw9CH6ySmBjIPwLGOpNeImP KCrsRjEh2fKMaoGlmDHj20bGDmKht/VrnlcxHuQ8ZL1jX9OAz0d1DEEf9so3/Enj54AUCT iGLjBa8tdgnK4o22eS3zEfjpHqkw13X8+Ub7fO9lkpipBx8yRcQlR34qOOk3MSfQ1kqzRj Jt2+Hfex1k3xPNB2l9B4hBMnpa4u2qSe+M1jEw2vv3HG5U5ThtgJ52s3hct1Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850028; a=rsa-sha256; cv=none; b=CzydYNGmXPzP3cvseG0fYFgb8RTSQPX12wcUMFtzk+gKMVdF7SLNOqGxKLuqHunigIzuQd 31MIfOY9CCQCQPBu/Pyph67TaLnNWSdL9EcNQBSaULY/X4eO4cMjG0Bfx+l76X67tpko9z FytELGobC2YH6RBJ/ywPP9uiovVsZclm3BUtEgCpCJ8cS+dj6ROcD8k9KjSw6o35dl3yfk hX0gf33CSUVtt9iuK1Fo1+8Y78Bkn0WVrwEhDgQo6OAfBVIfuygRRgloUkPMr53/sJGtM8 X1q6UGe7a+95zaMnqYSrlyAUsTXxxtmJ5FUfE6jfK0PjEEMDYC5mVCUIKngvLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sLY/XhCdXBqEaiYZnDYQQra2KP2thclOI/NV8z9k5mw=; b=Lryj9zTxLNPFZHZwXjlIbHlbPk05aUaxXM1wr+t7dlvwQA9k5OoFAB23sYjzlhWq8WvGxx iTw7JFg8MofIYf4mnwYPd3DfXtob/+leKDAI94ykqWphzCoQX9DoUXXj5dyt5SbrgllpBp 1u7dKMB/qavzGQSGMwjBZyse2MAt0w0gkLZSnAqTfqpMKpKzqhAAUWRbJ3TUauznL0xbrN TCpo4etcg1yM6Ik6Zq0RCLXuODakBGAqRjwJ4K05A1j+Z77kvCctXJNYDX69nhQeQ4Dr/B 8Df8sucTladvo0LcMFPXqbhXRANfAs95uP3kVvclUvwRQAVJW2DCvH8UgUKNlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGN5j1rzJfG; Tue, 23 Apr 2024 05:27: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 43N5R8ac016875; Tue, 23 Apr 2024 05:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R8Bk016872; Tue, 23 Apr 2024 05:27:08 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:08 GMT Message-Id: <202404230527.43N5R8Bk016872@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: 4fef442e75cd - stable/13 - bhnd(4): Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4fef442e75cd11f475fccec5c0bdfac88628d984 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4fef442e75cd11f475fccec5c0bdfac88628d984 commit 4fef442e75cd11f475fccec5c0bdfac88628d984 Author: Gordon Bergling AuthorDate: 2024-04-20 12:09:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:15 +0000 bhnd(4): Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit d2747968c068b8cfc890901f4955037bad7adb9a) --- sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c index cdb92551e887..5467bcbaac20 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c +++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c @@ -56,7 +56,7 @@ * The Broadcom NVRAM NUL-delimited ASCII format is used by most * Broadcom SoCs. * - * The NVRAM data is encoded as a stream of of NUL-terminated 'key=value' + * The NVRAM data is encoded as a stream of NUL-terminated 'key=value' * strings; the end of the stream is denoted by a single extra NUL character. */ From nobody Tue Apr 23 05:27: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 4VNrGQ2ytQz5JTLs; Tue, 23 Apr 2024 05:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrGQ1Gtgz4kyl; Tue, 23 Apr 2024 05:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qyKBAc/iL1ISWVaAUE4PVePwcGZmA/tca4KDgIlmFPM=; b=yaxoe+qgoHOxKQze77WFT4C4/SyikMof2kiHBH5auWrb7TAhqqIBmVeNbueXmwGYl9UFxR zlib4F6YYpO6Tjf3qMffjiAWynAFGIWkTiCeVA6EqL/cjAaGKOBWWUangRo9prpq1D1VQp u7XyoZG4hpE4yDZ0XzEVQHHBmGN2tm4uK9zADcYn7i2oHW3hEibzmJOxNdvNZ0Zk0yPvg4 OpBwd646EykmgiyJyHWqhiBu3JOVjH0U8wbH+mijOvaypOf3z2rkNkT7C6/iAURDsEQCo+ LbxyOpqVGFGsgiuNTT99fTKYTwkm7JBwbrv7tivDLSXGuDVBpodG6NFvGz0hog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850030; a=rsa-sha256; cv=none; b=xEmVbpqs5Bh5dkPLqV3KYXwoj+itYSVCwXE5VMAkNhFp4QXeaNPWhewYOYVgVzn1tBJzdW LJlA5FjNyQzCy0/6SzAFDNk4cIJfISx33+zB2Wd4NYIg4x4wK+2reva3ZD0wQu9TpnykfM FWcvkLfTp2W87oqIDAy3GjBT8YhcEPzbLjN8wLzkY51n2oc7sglIEGpS63HIGMKTxwypDm ev5FaImBy37EUIWxMgngoXg/WepWnzryHwBJbGU+QUJnEPs/uGKD0pUtUebvNg7yIpb+eo 8J0visv31/ft9NHAgqMTkeGjnkQOYUdm45s95xzcsi9u9veCj49ML1m6qkZt1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qyKBAc/iL1ISWVaAUE4PVePwcGZmA/tca4KDgIlmFPM=; b=qyaVTnpvFQOWf70aOhfC14kB6UfcAnCYzF0DD2PCyypYSCrHd5vEvzUnolCKGaZqSI3G1t oJEadl5TAynZYwQ09oZ+6UzmvFd38LvhZxW/fC+H41Ng0wZQ89B0QYBgx50NzsvN1IR88R BXuUbG77jDe7Byr8QugtjZlsP9EV2oBMW7DwRHYXfchDYmcS6XXtDz3u3gYsgMAxVYt63i 3SyDnV6HxBq19lxOnrb+yqYbhls000KBNiUAeFsQtGpge7HwUReTWKgG65CvwLjNzE/fjt GL6C2zApUGqHg9IEbId/BYR+U1gawkDmDD42wiV3oDl27+RKqFo8pXo6gFfYow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGP6t5dzJw9; Tue, 23 Apr 2024 05:27: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 43N5R9Uq016931; Tue, 23 Apr 2024 05:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5R96A016928; Tue, 23 Apr 2024 05:27:09 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:09 GMT Message-Id: <202404230527.43N5R96A016928@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: cdadad917ea2 - stable/13 - ifconfig(8): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cdadad917ea282443d215db6ed6a3e9e6f9551c3 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cdadad917ea282443d215db6ed6a3e9e6f9551c3 commit cdadad917ea282443d215db6ed6a3e9e6f9551c3 Author: Gordon Bergling AuthorDate: 2024-04-20 12:01:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:30 +0000 ifconfig(8): Fix two typos in source code comments - s/the the/the/ (cherry picked from commit 68b9eb9185f5569d05b5fecb178048f00c3b5c1a) --- sbin/ifconfig/ifieee80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 0271fded95ba..b537b70edf0b 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2784,7 +2784,7 @@ printvhtcap(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) const struct ieee80211_vht_cap *vhtcap; uint32_t vhtcap_info; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtcap)) { printf(""); return; @@ -2814,7 +2814,7 @@ printvhtinfo(const char *tag, const u_int8_t *ie, size_t ielen, int maxlen) if (verbose) { const struct ieee80211_vht_operation *vhtinfo; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtinfo)) { printf(""); return; From nobody Tue Apr 23 05:27: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 4VNrGR3wBVz5JTDP; Tue, 23 Apr 2024 05:27: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 4VNrGR1hMjz4l6L; Tue, 23 Apr 2024 05:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJtZW7CLZNVnbbDEwQI3/A+mMoqCKvPJtfEaLcEuUZI=; b=bmjpRj3j6l2BiV0H7wLXZME9fBJrf8lZWG6KgP4uvvlEjlvHPf0dhvB34SfEnKpQqoRMM/ Zb590EjgIog/2WhEMZnWwa+Xel4/evWQpJpzCvxVqeT9EURDCoUl46MPjh0w6kbAVsdt+S MFujUDLjfyhe/6UM1fypLgEpDi4Z13iHr29y17iu3tP4bctwmi70kVF2QooI6IC5GO21o7 vxYiIvohNrircVTe1KM64iX+S0xw5fbifsV+CMoIr3xpBTIP33jwEyyE93mYV5fUMYyud1 vWioot/Z5lkU51XXpdDuMq00hkoLatTFu5NkT7IoaxVx36p80BDfymnrHmqW5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850031; a=rsa-sha256; cv=none; b=rHipMSJe/ieoB8YVljc6Qymy2F1184nJUmDxpmTPpoZWrHUyhC4H937cRPxBC63tRB+iAy Gsvc76rPWrlZsn5ouHHXKg72Cy4T7+veH8e/VopRN6mtsDJHp33XONv+WUCyiHBDaW8rUT meB+uVioTNAemdR9lpWBhR90i0OeRPjdgXVK7HmUsMhMlL0fG6sQMKVskbHHqABnMHpOai MAimZcgn6SRPj5TXqtKmVZehEsVWci6vnpHgcxfEEhztNdKDrCtfM5p2/36+WtsOrnFyZD EO+N/EojOj+rLMdWeaqLM+TOe7CeLN4I9I1ODR6XptyKrjzA5uRlXUlK0uurkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJtZW7CLZNVnbbDEwQI3/A+mMoqCKvPJtfEaLcEuUZI=; b=ohY/BQ4NuxIIDxF6hAnoxuMhNziTKfCyTw/W6B8DTs/XgWXZJtgtJeYP7P2Ux4qb9ehu5k qhIt8POE15NQM7ThJkG5BGa+vj1vVpzCscfHjuQkqyjXO+IPAbx5mn7bkuMEVAojg447F3 aECjLnkmwfaewbkAV+RC1TI+XqHPtR1Me5KWmWp9D/XnV5WioZxxgQ3n8K8P+BFWEfMpBC 5zK0l0G2ySP+141Suwa8nph6NOED7XFNTxvygbDA4/Wbsj7AXwyJhGujj+q0xzh97zG4c8 j7YJnF2K4pqbDP+KgpyssU+g1QiW8vo8zZIhsogz3gLYti1m2asbzBOhcMLWng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGR0hvFzJwB; Tue, 23 Apr 2024 05:27: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 43N5RAvZ016988; Tue, 23 Apr 2024 05:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5RABJ016985; Tue, 23 Apr 2024 05:27:10 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:10 GMT Message-Id: <202404230527.43N5RABJ016985@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: 4cea50b47df8 - stable/13 - arm64: Remove a double word 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4cea50b47df8dc1cddeed5237492fc3f4e256c1f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4cea50b47df8dc1cddeed5237492fc3f4e256c1f commit 4cea50b47df8dc1cddeed5237492fc3f4e256c1f Author: Gordon Bergling AuthorDate: 2024-04-20 12:06:53 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:42 +0000 arm64: Remove a double word in a source code comment - s/of of/of/ (cherry picked from commit 516e591db11a29c7bb3d8135a94530b27b94f91d) --- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index 38005ec44c95..4e80ef66c7b7 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -61,7 +61,7 @@ struct qoriq_dw_pci_cfg { uint32_t pex_pf0_dgb; /* offset of PEX_PF0_DBG register */ - uint32_t ltssm_bit; /* LSB bit of of LTSSM state field */ + uint32_t ltssm_bit; /* LSB bit of LTSSM state field */ }; struct qorif_dw_pci_softc { From nobody Tue Apr 23 05:27: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 4VNrGS60Ndz5JTLt; Tue, 23 Apr 2024 05:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNrGS1yKhz4kkF; Tue, 23 Apr 2024 05:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9Pt99olKFz9o9BFvtdYukKrRvps7fmLp6+XCf1F8K0=; b=jkJ1R3PGsvAd0FtVBvHjI3Bnubxki2LzU/x4VXGwzR+b59v7wxZ1QDUchDZRiWstOA1tW4 OiQNOYDxVVx8+mp1VAlf2pLxL4ffsWhZzMozmpB8ylBR0IWxjJR3WLLw1JIZLvfgVk/6Yf Dzu483D5NXAGkQLP+TjtEJIWe8gHvydJEYohf8Cj+1FO7BHz84NyalIsOo5b3o+coYr3u0 wnzNkhZhOxNBC2wY6Nuv1rul2cSgYDZshyBAjXOzl/m9plK7Ao0aj8luNag1YLdlj5gohJ /uzuS1FTY+8SPAztzFE4vK+aSSZkppFw2x3DuCutyxMw3MqJ2hZX86fVsxdzNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713850032; a=rsa-sha256; cv=none; b=j8+uM7pmtDZ2KDAIjTTzV0PxylUn8Ie6MrO3KoUn0SDbHS9hbMniPd/SVZpChB8Ilo60Hd 17s7619S6xkTWs6uulcWJT6f5TUTAjhepyQ95XLkEvZQW/pR/QivgMMqSm9Yr5l2cjoB89 rRxDKdnX2JvOm+bqNpZLiKU/gsW//q6nyO4/yTWrUm7+P/f7favTTM+2ZDj2ieaTaUHC41 mpUty1ag/fDtQcg+2UMvabfTD197thP+NPENaO425yphpqHHoAXIz88MaPmF4rRta09Mrq r39bbpor7C80khtaClFLvqy7TSrjQ563s3ic1uiypEWYHs9NZsJwsgdvUQSBVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713850032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K9Pt99olKFz9o9BFvtdYukKrRvps7fmLp6+XCf1F8K0=; b=o/tud+JlpRxT3+9kU3Pl4h/bSiUrYRiuGsc2G5GnlS7iBb2zqWuZr0s9AW2Rxh1I3jl1u+ qcAPRBwnJmeZE1TjgdU9WsmxkPK1ic98nthLIZ2lV+oaNMSOQH5SvTbAyFIZ0JnTotyWHY FH+zybkZFluVw4vQp/PgvrY8RZW0FiKn5f3e/R4Ooslug+ePpgXSgU2fExPt0Sw0WwGMov PdIhz3cAOc1jhmhlHBhMpCSZO1kQZCSPvfn+0rK41K8qFoWK6ay2kKxq+BS0b+U/3D0HX+ EdrbXproZqwrjuLbzRaKolxB+tLrMQ2sVvKdRAkJsHMcPDO5bS0QXc5R0yx4pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNrGS1V7CzKB2; Tue, 23 Apr 2024 05:27: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 43N5RCD5017038; Tue, 23 Apr 2024 05:27:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N5RC5E017035; Tue, 23 Apr 2024 05:27:12 GMT (envelope-from git) Date: Tue, 23 Apr 2024 05:27:12 GMT Message-Id: <202404230527.43N5RC5E017035@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: 78de6a587cd7 - stable/13 - NOTES: Remove a double word in comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78de6a587cd7ebe8041e39f290f2023517cb4b22 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=78de6a587cd7ebe8041e39f290f2023517cb4b22 commit 78de6a587cd7ebe8041e39f290f2023517cb4b22 Author: Gordon Bergling AuthorDate: 2024-04-20 12:08:04 +0000 Commit: Gordon Bergling CommitDate: 2024-04-23 05:26:55 +0000 NOTES: Remove a double word in comment - s/of of/of/ (cherry picked from commit 1ff65c57e337ddb1681af5f98da0fa757cefc5ad) --- sys/conf/NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 3b92c610283a..c688f7947123 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2787,7 +2787,7 @@ options MAXFILES=999 options RANDOM_ENABLE_UMA # slab allocator # Select this to allow high-rate but potentially expensive -# harvesting of of the m_next pointer in the mbuf. Note that +# harvesting of the m_next pointer in the mbuf. Note that # the m_next pointer is NULL except when receiving > 4K # jumbo frames or sustained bursts by way of LRO. Thus in # the common case it is stirring zero in to the entropy From nobody Tue Apr 23 13:52: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 4VP3TF0J7pz5HHxJ; Tue, 23 Apr 2024 13:52: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 4VP3TD6vWcz4mx7; Tue, 23 Apr 2024 13:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Pzz9ps1/BzjifA5bayg7gyxfFfLxWJUfCn/f+mv4kE=; b=t6PZtbNYGhCkuPbFJejzBMWDoq2d7Xo1ppcDBUYIswDGAl//mrZ+uVFDEpkYjjBO46giAF h2Ohto7yDrBsp00PLWYvTzB8tSljdbmKc7PnDC2oKYGM121x2ka/4NZfz+eZJ6SSNn9q3B c/k3/aX+ODGgbC1wXbSp1wXgaOPQGaJeR9wRekkBpM6uBAAZst7ToD2dExVfEmsokpp0Cz ThPWlGkS+t41fmCLqmb7vF+zb35phzSaC+0M5GlbikZZn5GWWaM86FUhScNU2U85P2+iZo wvT6eESGz0RSkAkjMMblX+WHBK7GNYyQWX73yhmudjFIfYzcpzbUqTFvu63i4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713880337; a=rsa-sha256; cv=none; b=k7e8E/wGSU1q2wE2caXZr35ptCuA0J4xMk7lCKEdrkrG/xsOds785ER1TrvvJXvLjMnUDg hzGZhZ6UjuUodyL58BJaQnCGDSb4U5IRMs+738e+8ZM7BRpe2DlIN05P667Mauy2WV7aTV 2nfKzDPW/ncd8QI8RwCY/9BHOgdgNd3mMEd9nvaA4lMiAhnUKxk+Zc3WQ17xExM3BNUsEZ qbZDUfRmpq+2NoxOBM6IkET5tjHSdoRxHTn0UEZkfp1Pz4+EMttfIfaeuCCxOCgMnDs2Ug zqxM5lw8t10jDlNv7jVgpI0zO43kKuBU6XmKa0Whpg/+j2He6503cjON0xTdxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Pzz9ps1/BzjifA5bayg7gyxfFfLxWJUfCn/f+mv4kE=; b=T8SXUbd3yXX3NlogSn9vfxsqPN80nhOvHSBPr0q8szEeTetCyT8aNI2PHQod+QlTDPnSjk MiPsTFPcuMylkYF4zG1RIiVpQYzojuwKscm2cQCYOI5mOWVLaIUo/tXya4Wja2QsbsWrnK b9f2M9rWYYNT7BhzueUhLXPcN3iMGgeJU2MKHrmOw0g23/gBhgqpFkxau7Fj3VffmriPYl nwvXMv6uH5v5KiuIqkdluDBpVWbk3qnExWNiA0QZ0nBIIDZ6w/EVOTOeJ7duCK1v0ht4KQ 7EUNHznMA4XoYt1ZWgBDqQ3OtS41K+h6pjj/shCBRvBh7iODxDoWxrKIgnC5Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP3TD6WCrzZXD; Tue, 23 Apr 2024 13:52: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 43NDqGuR081993; Tue, 23 Apr 2024 13:52:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NDqGK7081990; Tue, 23 Apr 2024 13:52:16 GMT (envelope-from git) Date: Tue, 23 Apr 2024 13:52:16 GMT Message-Id: <202404231352.43NDqGK7081990@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: 21d1f73f886d - stable/14 - exports.5: Clarify that exported dirs should be local mount points List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 21d1f73f886dff0dde314ead91f09526f6e23c08 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=21d1f73f886dff0dde314ead91f09526f6e23c08 commit 21d1f73f886dff0dde314ead91f09526f6e23c08 Author: Mark Johnston AuthorDate: 2024-04-16 22:25:57 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 13:51:24 +0000 exports.5: Clarify that exported dirs should be local mount points If not, then in general the entire filesystem containing the exported directory is accessiable. This may be surprising, so try to make it more clear. Reviewed by: rmacklem, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44614 (cherry picked from commit 9d975e47d5a3638d4f575b2cf97e07bf22b53c7e) --- usr.sbin/mountd/exports.5 | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index aa249c1a882b..6e5429886bd0 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -27,7 +27,7 @@ .\" .\" @(#)exports.5 8.3 (Berkeley) 3/29/95 .\" -.Dd April 7, 2024 +.Dd April 16, 2024 .Dt EXPORTS 5 .Os .Sh NAME @@ -57,8 +57,8 @@ file system or the NFSv4 tree root for one or more hosts. A long line may be split over several lines by ending all but the last line with a backslash .Pq Ql \e . -A host may be specified only once for each local file or the NFSv4 tree root on the -server and there may be only one default entry for each server +A host may be specified only once for each local file system or the NFSv4 tree +root on the server and there may be only one default entry for each server file system that applies to all other hosts. The latter exports the file system to the .Dq world @@ -68,7 +68,26 @@ be used only when the file system contains public information. In a mount entry, the first field(s) specify the directory path(s) within a server file system that can be mounted on by the corresponding client(s). -There are three forms of this specification. +Note well that exporting a directory on the server does not guarantee that only +files below the exported directory will be accessible. +This is true even in the absence of the +.Fl alldirs +flag. +To provide this guarantee, the exported directories must be local file system +mount points on the server. +For example, if one exports +.Pa /home , +and +.Pa /home +is not a file system mount point, then clients will be able to access arbitrary +files on the root file system. +As such, to avoid confusion with respect to what is exported, it may be prudent +to limit exported directories to server local file system mount points. +When exporting ZFS datasets with the +.Sy sharenfs +property, this is auomatically the case. +.Pp +There are three forms of the directory path specification. The first is to list all mount points as absolute directory paths separated by whitespace. This list of directory paths should be considered an @@ -599,6 +618,7 @@ afterwards, whereas NFSv3 rejects the mount request. .Xr strunvis 3 , .Xr nfsv4 4 , .Xr netgroup 5 , +.Xr zfsprops 7 , .Xr mountd 8 , .Xr nfsd 8 , .Xr rpc.tlsservd 8 , From nobody Tue Apr 23 13:52: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 4VP3TG3pVpz5HJ0l; Tue, 23 Apr 2024 13:52: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 4VP3TG1mk9z4nCb; Tue, 23 Apr 2024 13:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+Ke1GAFpKVI9uJfqeYkWd8Axv2H2I/2LZ5JT2Zhv2M=; b=Ja/YyBh008AV4lSFWaDb+1EnpY2BQwAXWRPGRwIP8VnlkVB0G4VjQc0cCvJ+OFHWCYeIqz VUdBF4zI68Wgz/Q6sYVG5dDDWuiO42aYof9HxwSlvhw75tXuX3zo4Lk4jftOF4RDoQvypJ QWmuWYfMtPRFf5ekjuLNvotsMrwX1t6VX5kuOZVkBcVAaCBb9ofhLeXuKa6E/kMDxwQVIP l94gsiiKp9k5GGcGA0+b3DUeztTixTsUbMqQA2oMa/JjKM6ijIIGmxqav2j2EBmjw6ne3c oDucOZiJbX1SXb2SdKCPp4TaBJ7vbztqBWqeQ53CIuHOaq5/LNGI0Ajol1uNuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713880338; a=rsa-sha256; cv=none; b=UxpS4hrqYHTw/4QNRuzMkeBgNIWpNXE1bXKgCtSLzlusHlMkTNiqYnftH/V8g6VGr/DtHD 5jQFdR9Jx1Cgsq8W5l9fx8lP5u7HXtlEQ443ergi7XghjwhgheIcZN51+GU/lTlBJglgTd hju4o8wuoJ9jkBpUq6QwBWql84HF9p+ZKxc3AHW9Gq/Bl24VrfwKXTEoSgSjfj6BYsAXhw sMpzp7abAGI1aFIG0H8D4s3ufGOhPXDD0cPCa8BKqkqcVIOcYMt+jdTW/fW329sOv3UxVn 1KUQTlhyvIJhf+zUkDG3zJHqm8rUmKULg/7B4blreMWJQPFBAHphd6OHhJbH4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+Ke1GAFpKVI9uJfqeYkWd8Axv2H2I/2LZ5JT2Zhv2M=; b=amxyXMSwrIftFmtIzt3BmPJ2CJ/qGrwaW0q268R4A4kv3rPoCK6uo1CkpHJT1IdO4KjzzS GU9IcL2Rz40QAMOIHqRj02QeKhOt8f9bINPr9kSs7SUH08eQLbJFZgUpx/lAy+PG3Wx9vx 5zx83n6RsLEg+CZld/7pblvR6MSJmspHTi/fQu2K3Td/YE+Zreq+ZvUlsTetVyn3ZInJEK pwE+05OczV/moWizVALVZGGCPV6xQHkKzRU7cKlvGkVXoyLHvsZFxu+BHrmAF8LNKK5eA7 SLnQaa8DaH3/iuX+1F2SGVIVeKUJBfOajdEL2yvbFDr7NuK7tZPBdWNIpXxojw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP3TG0hNZzZXF; Tue, 23 Apr 2024 13:52: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 43NDqHi3082042; Tue, 23 Apr 2024 13:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NDqHAe082039; Tue, 23 Apr 2024 13:52:17 GMT (envelope-from git) Date: Tue, 23 Apr 2024 13:52:17 GMT Message-Id: <202404231352.43NDqHAe082039@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: 692106afb8a8 - stable/14 - graid3: Fix teardown in g_raid3_try_destroy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 commit 692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 Author: Mark Johnston AuthorDate: 2024-04-20 16:02:06 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 13:51:33 +0000 graid3: Fix teardown in g_raid3_try_destroy() Commit 33cb9b3c3a22 replaced a g_raid3_destroy_device() call with a g_raid3_free_device() call, which was incorrect and could lead to a panic if a RAID3 GEOM failed to start (e.g., due to missing disks). Reported by: graid3 tests Fixes: 33cb9b3c3a22 ("graid3: Fix teardown races") MFC after: 3 days Sponsored by: Klara, Inc. (cherry picked from commit 955f213fa2f14d5b5e9b655d8922e28315eb9fa3) --- sys/geom/raid3/g_raid3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 721610cefbec..c2d05b48d80d 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -2033,7 +2033,7 @@ g_raid3_try_destroy(struct g_raid3_softc *sc) sc->sc_worker = NULL; } else { g_topology_unlock(); - g_raid3_free_device(sc); + g_raid3_destroy_device(sc); } return (1); } From nobody Tue Apr 23 13:52: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 4VP3TH4968z5HHLR; Tue, 23 Apr 2024 13:52: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 4VP3TH271yz4mxH; Tue, 23 Apr 2024 13:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FM8ffUsOJB1SiNZpzSjAUNczsb0/v1tkYy5DFsoPFao=; b=nk/6ANpbi2yUCchoSbRhMISAva092I8o2NckTlPJmY0Kmj09Zb8SHmFNMy0+DNz05wud4O 7JZVMEJejXjKEryHcNx4m4V6yYIulFdQANq7dFfCCk+ky01X5WianErp0wRvgBexoIb4an pWlD7kLiLio5GlMzJIsGxDMD1v11IMRLQ7oOjEkS9jgzt8M611Nfnx5uGBLs9yVEBONKiA 8Okb1BIEL16NI6yF1iof2ZBCJjNkN6xBmY9zEVQzqK2JCZX5cGX9/+Q1ptHXo0bH7ODrCw 63uxu6mWQA4QC9L87JEriO2mB5xMW+wQT2rIJoKUDOBRrS3dj6REgwzeN4GhKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713880339; a=rsa-sha256; cv=none; b=EChiFf6lec7hMH5uDQ6z3SDuqobPAk3H45nPloEUupxqCUX7DsG78LrPcZqM8qi0m23JNy glJbPTVhr8wcZM7bCayuQfuLDSRNfcHRsMx0mYvxbkrD/osxzEZRgJ1hO0e4/jJtjnqTN7 jC3svxJXiyPkQc3HK8OqEFJCvY2jfrkGsxcTVL8FVn4Yni8tWTy8rH7I0iz+5yMDaMsmGt 9TyELWp/OHHUG9viGMHmVIwLe4tu6DPwYNggtETBDO8cLJ5FEXB1m4Cq6jitcVe+dqbMTm jgrZKA25e2IwvP02Fn1xasK0/rwNiwv5sEqN9Cy3DTPIzlPuS+43TLs7NDcAvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FM8ffUsOJB1SiNZpzSjAUNczsb0/v1tkYy5DFsoPFao=; b=gzID0AWyVf3cm2ITruX8kSvHjQNRrNyhSQfRJe3NDMHu5CTgGDpIg5psq1jc3c1sZ2sKQy io4t5ZZDHCh70vToNO5/ByLDYuev9uaNuI0pIaj9QFYe2mx1IPpc8mQnSLde2if9c/7nA4 6qXtu+fWBHn/uIvi3KHYtiuHZGZA8fEECdSce59t9974FE/0w8qI9r9zwVPPPjmPhvW1qU uP0F0FTFSkV1RrNqQjPl2DhRR0xFNjHu3h79Ziq3nufIBWkOYf7BKHqod2cficw5uSFE/x 9brN66qBYx8Ei0mruVlOBUWgDQz0tP15bpKBmFGPaXKCExtyrVTozpiP15lupg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP3TH1k7VzZTw; Tue, 23 Apr 2024 13:52: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 43NDqJ9t082092; Tue, 23 Apr 2024 13:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NDqJkR082088; Tue, 23 Apr 2024 13:52:19 GMT (envelope-from git) Date: Tue, 23 Apr 2024 13:52:19 GMT Message-Id: <202404231352.43NDqJkR082088@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: 60546b68864f - stable/14 - exports.5: Update an example to use service(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60546b68864f37618e3cf81ec15464a83d28dfa3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=60546b68864f37618e3cf81ec15464a83d28dfa3 commit 60546b68864f37618e3cf81ec15464a83d28dfa3 Author: Mark Johnston AuthorDate: 2024-04-16 22:25:19 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 13:51:41 +0000 exports.5: Update an example to use service(8) MFC after: 1 week (cherry picked from commit 88d09ddea0111abd74579e5c3c4ed029351feccb) --- usr.sbin/mountd/exports.5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index 6e5429886bd0..c3a6af5a9f0e 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -423,7 +423,7 @@ utility can be made to re-read the .Nm file by sending it a hangup signal as follows: .Bd -literal -offset indent -/etc/rc.d/mountd reload +service mountd reload .Ed .Pp After sending the @@ -622,6 +622,7 @@ afterwards, whereas NFSv3 rejects the mount request. .Xr mountd 8 , .Xr nfsd 8 , .Xr rpc.tlsservd 8 , +.Xr service 8 , .Xr showmount 8 .Sh STANDARDS The implementation is based on the following documents: From nobody Tue Apr 23 17:37: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 4VP8TG3P6Xz5Hhxv; Tue, 23 Apr 2024 17:37: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 4VP8TG1Jm1z4JSM; Tue, 23 Apr 2024 17:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sr26TameZBK4phpEJijHqY46E3ONEDc6Yjm5WoQOOiI=; b=nuzK6gbZuxfe3JTgtCwN7EUDMIqtDbYKF9NJcusGODaEyyjnommnWOsC927Tc4dt2S+sSr 9DoD77pZQdrHRNZzgzHKIeg54fO1ytmwBACQuqaC3u9urqtEUJJnAigrvkme3iH/Jt5T9z 0Mo+eX70tziZNufWbX5FfLjYmbMVMXOVXkU+FBAc7HumKTd+qPduupyteO45PC91lCvntA j/XMUx/pRgwvTrPdDF20m+R107dQD9YI5ZxuiZ4iSakNMV2tmLsipmOtACP5WbWsRvNM/7 plHgNM7kpr3MslZD32iCkdL8xVVZFPuo+czxJ1L6occON6hfxMLT7MSgien9XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713893858; a=rsa-sha256; cv=none; b=lu+loBFjvu5KhbnEys6RTTh3FAsEG3somb52E4jJ5vFS9cIoV7911xRVL7gOBIyVSzqaIy b/dyRQ2PVkJh3TnllvAOqf1/l3iXQTOVwU6f5QNHv0l7yKpSgTWSyBlhQjNUQoh2iQng6z smvuUa3HZLZ9DqMASh+NEyt1StBBZQhF/Db7kgdMVqDQu6UGkboeOHFtLS6kz+ZzIJF+EE wegVxuIId0Nq8ggrYD+whRIR/uDB/iVmHupBkMf5ROS6+GjK+sND8MoArY3wpAx9RUB6yK UXV0zjgYe8GdzZ58P2Z82IcpSpKejL/vmuSyjGkrcGyUTKBI3hbEeGxpRVMVJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sr26TameZBK4phpEJijHqY46E3ONEDc6Yjm5WoQOOiI=; b=wnoSyZAADgs+PuM5xJH9xoW94LWEFLZcekhr540+RyAWce+Qb4Cl3xgJ8DpPWrUGgoLFkS i2fchIraBnwlTx/ASx+u93sJ79k8QdXO2nGMXy68+xPcHi7AG4e/naBbCBOu3PsDt/8F3O NH2LLG6NFdDx6+1FeQLXJAm7p7fG6F3xvs7gJbPBDVnpD8HfgbuhTl8bQys/vEU4DXTN6r jJwDOuYXJAC3h3TA2UWnW4SFZHzqMksRXgoBcIKlRCHSlCsVcFjD3P1fJnMoRiA3RY0Q5x R/7iSGa9R4IWFDFaInq/Fd8lDZJf6YiggZQdKYUMp8GbAqFEmMjb3UOMTcDd8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8TG0wmXzh75; Tue, 23 Apr 2024 17:37: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 43NHbcwo057135; Tue, 23 Apr 2024 17:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHbbJg057132; Tue, 23 Apr 2024 17:37:37 GMT (envelope-from git) Date: Tue, 23 Apr 2024 17:37:37 GMT Message-Id: <202404231737.43NHbbJg057132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 854034a32cf6 - stable/14 - Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 854034a32cf6a2472392f4b7e1c11fbef93d9041 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=854034a32cf6a2472392f4b7e1c11fbef93d9041 commit 854034a32cf6a2472392f4b7e1c11fbef93d9041 Author: Dimitry Andric AuthorDate: 2024-04-20 12:01:32 +0000 Commit: Dimitry Andric CommitDate: 2024-04-23 17:33:06 +0000 Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6. PR: 276104 MFC after: 3 days (cherry picked from commit dfa39133b333f57ca3133bf6c71cd75be4c3e801) --- .../llvm-project/clang/include/clang/Basic/Attr.td | 2 + .../clang/lib/Format/TokenAnnotator.cpp | 20 ++++---- .../clang/lib/Headers/__stddef_unreachable.h | 4 ++ .../compiler-rt/lib/builtins/riscv/restore.S | 42 +++++++++++++++ .../compiler-rt/lib/builtins/riscv/save.S | 42 +++++++++++++++ .../include/__format/formatter_floating_point.h | 2 +- contrib/llvm-project/libcxx/include/stddef.h | 29 ++++------- contrib/llvm-project/lld/COFF/Chunks.cpp | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 3 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 7 ++- contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp | 4 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 42 +++------------ .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 3 ++ .../llvm/lib/Target/Mips/Mips32r6InstrInfo.td | 8 +-- .../llvm/lib/Target/Mips/MipsExpandPseudo.cpp | 60 ++++------------------ .../llvm/lib/Target/Sparc/SparcAsmPrinter.cpp | 44 ++++++++++++++++ .../llvm/lib/Target/X86/X86MCInstLower.cpp | 4 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +++++++- lib/clang/include/VCSVersion.inc | 6 +-- lib/clang/include/clang/Basic/Version.inc | 6 +-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +-- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 25 files changed, 234 insertions(+), 140 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/Attr.td b/contrib/llvm-project/clang/include/clang/Basic/Attr.td index 58838b01b4fd..dbf2dd2120fb 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/Attr.td +++ b/contrib/llvm-project/clang/include/clang/Basic/Attr.td @@ -1590,6 +1590,7 @@ def RegCall : DeclOrTypeAttr { } def Final : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"final">, CustomKeyword<"sealed">]; let Accessors = [Accessor<"isSpelledAsSealed", [CustomKeyword<"sealed">]>]; let SemaHandler = 0; @@ -2472,6 +2473,7 @@ def Overloadable : Attr { } def Override : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"override">]; let SemaHandler = 0; // Omitted from docs, since this is language syntax, not an attribute, as far diff --git a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp index d0c4273cfc7e..4d482e6543d6 100644 --- a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp +++ b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp @@ -3450,10 +3450,11 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { for (AnnotatedLine *ChildLine : Line.Children) calculateFormattingInformation(*ChildLine); - Line.First->TotalLength = - Line.First->IsMultiline ? Style.ColumnLimit - : Line.FirstStartColumn + Line.First->ColumnWidth; - FormatToken *Current = Line.First->Next; + auto *First = Line.First; + First->TotalLength = First->IsMultiline + ? Style.ColumnLimit + : Line.FirstStartColumn + First->ColumnWidth; + FormatToken *Current = First->Next; bool InFunctionDecl = Line.MightBeFunctionDecl; bool AlignArrayOfStructures = (Style.AlignArrayOfStructures != FormatStyle::AIAS_None && @@ -3475,16 +3476,15 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (const bool IsCtorOrDtor = Tok->is(TT_CtorDtorDeclName); IsCtorOrDtor || isFunctionDeclarationName(Style.isCpp(), *Tok, Line, ClosingParen)) { - if (!IsCtorOrDtor) { - LineIsFunctionDeclaration = true; + if (!IsCtorOrDtor) Tok->setFinalizedType(TT_FunctionDeclarationName); - } + LineIsFunctionDeclaration = true; SeenName = true; break; } } - if (IsCpp && LineIsFunctionDeclaration && + if (IsCpp && (LineIsFunctionDeclaration || First->is(TT_CtorDtorDeclName)) && Line.endsWith(tok::semi, tok::r_brace)) { auto *Tok = Line.Last->Previous; while (Tok->isNot(tok::r_brace)) @@ -3507,7 +3507,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (IsCpp) { if (!LineIsFunctionDeclaration) { // Annotate */&/&& in `operator` function calls as binary operators. - for (const auto *Tok = Line.First; Tok; Tok = Tok->Next) { + for (const auto *Tok = First; Tok; Tok = Tok->Next) { if (Tok->isNot(tok::kw_operator)) continue; do { @@ -3644,7 +3644,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { calculateUnbreakableTailLengths(Line); unsigned IndentLevel = Line.Level; - for (Current = Line.First; Current; Current = Current->Next) { + for (Current = First; Current; Current = Current->Next) { if (Current->Role) Current->Role->precomputeFormattingInfos(Current); if (Current->MatchingParen && diff --git a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h index 518580c92d3f..61df43e9732f 100644 --- a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h +++ b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h @@ -7,6 +7,8 @@ *===-----------------------------------------------------------------------=== */ +#ifndef __cplusplus + /* * When -fbuiltin-headers-in-system-modules is set this is a non-modular header * and needs to behave as if it was textual. @@ -15,3 +17,5 @@ (__has_feature(modules) && !__building_module(_Builtin_stddef)) #define unreachable() __builtin_unreachable() #endif + +#endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S index 73f64a920d66..6f43842c8ca6 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S @@ -22,6 +22,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -86,8 +88,29 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + lw s1, 0(sp) + lw s0, 4(sp) + lw ra, 8(sp) + addi sp, sp, 12 + ret + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -161,6 +184,25 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + ld s1, 0(sp) + ld s0, 8(sp) + ld ra, 16(sp) + addi sp, sp, 24 + ret + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S index 85501aeb4c2e..3e044179ff7f 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S @@ -18,6 +18,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -92,8 +94,29 @@ __riscv_save_0: sw ra, 12(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -12 + sw s1, 0(sp) + sw s0, 4(sp) + sw ra, 8(sp) + jr t0 + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -181,6 +204,25 @@ __riscv_save_0: sd ra, 8(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -24 + sd s1, 0(sp) + sd s0, 8(sp) + sd ra, 16(sp) + jr t0 + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h index 6802a8b7bd4c..46a090a787ae 100644 --- a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h +++ b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h @@ -689,7 +689,7 @@ __format_floating_point(_Tp __value, _FormatContext& __ctx, __format_spec::__par // Let P equal the precision if nonzero, 6 if the precision is not // specified, or 1 if the precision is 0. Then, if a conversion with // style E would have an exponent of X: - int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); + int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); if (__result.__exponent == __result.__last) // if P > X >= -4, the conversion is with style f or F and precision P - 1 - X. // By including the radix point it calculates P - (1 + X) diff --git a/contrib/llvm-project/libcxx/include/stddef.h b/contrib/llvm-project/libcxx/include/stddef.h index 887776b150e4..1583e78e3739 100644 --- a/contrib/llvm-project/libcxx/include/stddef.h +++ b/contrib/llvm-project/libcxx/include/stddef.h @@ -7,18 +7,6 @@ // //===----------------------------------------------------------------------===// -#if defined(__need_ptrdiff_t) || defined(__need_size_t) || defined(__need_wchar_t) || defined(__need_NULL) || \ - defined(__need_wint_t) - -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif - -# include_next - -#elif !defined(_LIBCPP_STDDEF_H) -# define _LIBCPP_STDDEF_H - /* stddef.h synopsis @@ -36,15 +24,18 @@ Types: */ -# include <__config> +#include <__config> -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif -# if __has_include_next() -# include_next -# endif +// Note: This include is outside of header guards because we sometimes get included multiple times +// with different defines and the underlying will know how to deal with that. +#include_next + +#ifndef _LIBCPP_STDDEF_H +# define _LIBCPP_STDDEF_H # ifdef __cplusplus typedef decltype(nullptr) nullptr_t; diff --git a/contrib/llvm-project/lld/COFF/Chunks.cpp b/contrib/llvm-project/lld/COFF/Chunks.cpp index 39f4575031be..e2074932bc46 100644 --- a/contrib/llvm-project/lld/COFF/Chunks.cpp +++ b/contrib/llvm-project/lld/COFF/Chunks.cpp @@ -652,6 +652,13 @@ void SectionChunk::getRuntimePseudoRelocs( dyn_cast_or_null(file->getSymbol(rel.SymbolTableIndex)); if (!target || !target->isRuntimePseudoReloc) continue; + // If the target doesn't have a chunk allocated, it may be a + // DefinedImportData symbol which ended up unnecessary after GC. + // Normally we wouldn't eliminate section chunks that are referenced, but + // references within DWARF sections don't count for keeping section chunks + // alive. Thus such dangling references in DWARF sections are expected. + if (!target->getChunk()) + continue; int sizeInBits = getRuntimePseudoRelocSize(rel.Type, file->ctx.config.machine); if (sizeInBits == 0) { diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index d0c27cae0dff..72b6dfa181e8 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -439,7 +439,8 @@ static Value *threadBinOpOverSelect(Instruction::BinaryOps Opcode, Value *LHS, // Check that the simplified value has the form "X op Y" where "op" is the // same as the original operation. Instruction *Simplified = dyn_cast(FV ? FV : TV); - if (Simplified && Simplified->getOpcode() == unsigned(Opcode)) { + if (Simplified && Simplified->getOpcode() == unsigned(Opcode) && + !Simplified->hasPoisonGeneratingFlags()) { // The value that didn't simplify is "UnsimplifiedLHS op UnsimplifiedRHS". // We already know that "op" is the same as for the simplified value. See // if the operands match too. If so, return the simplified value. diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 3135ec73a99e..e806e0f0731f 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -3575,6 +3575,11 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, return SDValue(); if (Opcode != ISD::UADDO && Opcode != ISD::USUBO) return SDValue(); + // Guarantee identical type of CarryOut + EVT CarryOutType = N->getValueType(0); + if (CarryOutType != Carry0.getValue(1).getValueType() || + CarryOutType != Carry1.getValue(1).getValueType()) + return SDValue(); // Canonicalize the add/sub of A and B (the top node in the above ASCII art) // as Carry0 and the add/sub of the carry in as Carry1 (the middle node). @@ -3622,7 +3627,7 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, // TODO: match other operations that can merge flags (ADD, etc) DAG.ReplaceAllUsesOfValueWith(Carry1.getValue(0), Merged.getValue(0)); if (N->getOpcode() == ISD::AND) - return DAG.getConstant(0, DL, MVT::i1); + return DAG.getConstant(0, DL, CarryOutType); return Merged.getValue(1); } diff --git a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp index cbb64b299e64..f105bdb4816a 100644 --- a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp +++ b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp @@ -746,7 +746,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, Min = Min.zext(ResultBitWidth); Max = Max.zext(ResultBitWidth); } - return ConstantRange(std::move(Min), std::move(Max)); + return getNonEmpty(std::move(Min), std::move(Max) + 1); } case Instruction::SIToFP: { // TODO: use input range if available @@ -757,7 +757,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, SMin = SMin.sext(ResultBitWidth); SMax = SMax.sext(ResultBitWidth); } - return ConstantRange(std::move(SMin), std::move(SMax)); + return getNonEmpty(std::move(SMin), std::move(SMax) + 1); } case Instruction::FPTrunc: case Instruction::FPExt: diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 196aa50cf406..95d8ab95b2c0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -1658,40 +1658,14 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM, setMaxAtomicSizeInBitsSupported(128); if (Subtarget->isWindowsArm64EC()) { - // FIXME: are there other intrinsics we need to add here? - setLibcallName(RTLIB::MEMCPY, "#memcpy"); - setLibcallName(RTLIB::MEMSET, "#memset"); - setLibcallName(RTLIB::MEMMOVE, "#memmove"); - setLibcallName(RTLIB::REM_F32, "#fmodf"); - setLibcallName(RTLIB::REM_F64, "#fmod"); - setLibcallName(RTLIB::FMA_F32, "#fmaf"); - setLibcallName(RTLIB::FMA_F64, "#fma"); - setLibcallName(RTLIB::SQRT_F32, "#sqrtf"); - setLibcallName(RTLIB::SQRT_F64, "#sqrt"); - setLibcallName(RTLIB::CBRT_F32, "#cbrtf"); - setLibcallName(RTLIB::CBRT_F64, "#cbrt"); - setLibcallName(RTLIB::LOG_F32, "#logf"); - setLibcallName(RTLIB::LOG_F64, "#log"); - setLibcallName(RTLIB::LOG2_F32, "#log2f"); - setLibcallName(RTLIB::LOG2_F64, "#log2"); - setLibcallName(RTLIB::LOG10_F32, "#log10f"); - setLibcallName(RTLIB::LOG10_F64, "#log10"); - setLibcallName(RTLIB::EXP_F32, "#expf"); - setLibcallName(RTLIB::EXP_F64, "#exp"); - setLibcallName(RTLIB::EXP2_F32, "#exp2f"); - setLibcallName(RTLIB::EXP2_F64, "#exp2"); - setLibcallName(RTLIB::EXP10_F32, "#exp10f"); - setLibcallName(RTLIB::EXP10_F64, "#exp10"); - setLibcallName(RTLIB::SIN_F32, "#sinf"); - setLibcallName(RTLIB::SIN_F64, "#sin"); - setLibcallName(RTLIB::COS_F32, "#cosf"); - setLibcallName(RTLIB::COS_F64, "#cos"); - setLibcallName(RTLIB::POW_F32, "#powf"); - setLibcallName(RTLIB::POW_F64, "#pow"); - setLibcallName(RTLIB::LDEXP_F32, "#ldexpf"); - setLibcallName(RTLIB::LDEXP_F64, "#ldexp"); - setLibcallName(RTLIB::FREXP_F32, "#frexpf"); - setLibcallName(RTLIB::FREXP_F64, "#frexp"); + // FIXME: are there intrinsics we need to exclude from this? + for (int i = 0; i < RTLIB::UNKNOWN_LIBCALL; ++i) { + auto code = static_cast(i); + auto libcallName = getLibcallName(code); + if ((libcallName != nullptr) && (libcallName[0] != '#')) { + setLibcallName(code, Saver.save(Twine("#") + libcallName).data()); + } + } } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h index 541a810fb5cb..74d0c4bde8dd 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h @@ -1001,6 +1001,9 @@ private: /// make the right decision when generating code for different targets. const AArch64Subtarget *Subtarget; + llvm::BumpPtrAllocator BumpAlloc; + llvm::StringSaver Saver{BumpAlloc}; + bool isExtFreeImpl(const Instruction *Ext) const override; void addTypeForNEON(MVT VT); diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td index 854563ab32bd..3ef04e488f01 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td @@ -152,15 +152,15 @@ class SELNEZ_ENC : SPECIAL_3R_FM<0b00000, 0b110111>; class LWPC_ENC : PCREL19_FM; -class MAX_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; -class MAX_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; +class MAX_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; +class MAX_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; class MIN_S_ENC : COP1_3R_FM<0b011100, FIELD_FMT_S>; class MIN_D_ENC : COP1_3R_FM<0b011100, FIELD_FMT_D>; class MAXA_S_ENC : COP1_3R_FM<0b011111, FIELD_FMT_S>; class MAXA_D_ENC : COP1_3R_FM<0b011111, FIELD_FMT_D>; -class MINA_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; -class MINA_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; +class MINA_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; +class MINA_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; class SELEQZ_S_ENC : COP1_3R_FM<0b010100, FIELD_FMT_S>; class SELEQZ_D_ENC : COP1_3R_FM<0b010100, FIELD_FMT_D>; diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp index c30129743a96..2c2554b5b4bc 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp @@ -388,32 +388,18 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( Opcode = Mips::XOR; break; case Mips::ATOMIC_LOAD_UMIN_I8_POSTRA: - IsUnsigned = true; - IsMin = true; - break; case Mips::ATOMIC_LOAD_UMIN_I16_POSTRA: IsUnsigned = true; - IsMin = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MIN_I8_POSTRA: - SEOp = Mips::SEB; - IsMin = true; - break; case Mips::ATOMIC_LOAD_MIN_I16_POSTRA: IsMin = true; break; case Mips::ATOMIC_LOAD_UMAX_I8_POSTRA: - IsUnsigned = true; - IsMax = true; - break; case Mips::ATOMIC_LOAD_UMAX_I16_POSTRA: IsUnsigned = true; - IsMax = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MAX_I8_POSTRA: - SEOp = Mips::SEB; - IsMax = true; - break; case Mips::ATOMIC_LOAD_MAX_I16_POSTRA: IsMax = true; break; @@ -475,42 +461,14 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( // For little endian we need to clear uninterested bits. if (STI->isLittle()) { - if (!IsUnsigned) { - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), OldVal) - .addReg(OldVal) - .addReg(ShiftAmnt); - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), Incr) - .addReg(Incr) - .addReg(ShiftAmnt); - if (STI->hasMips32r2()) { - BuildMI(loopMBB, DL, TII->get(SEOp), OldVal).addReg(OldVal); - BuildMI(loopMBB, DL, TII->get(SEOp), Incr).addReg(Incr); - } else { - const unsigned ShiftImm = SEOp == Mips::SEH ? 16 : 24; - BuildMI(loopMBB, DL, TII->get(Mips::SLL), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SLL), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - } - } else { - // and OldVal, OldVal, Mask - // and Incr, Incr, Mask - BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) - .addReg(OldVal) - .addReg(Mask); - BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr) - .addReg(Incr) - .addReg(Mask); - } + // and OldVal, OldVal, Mask + // and Incr, Incr, Mask + BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) + .addReg(OldVal) + .addReg(Mask); + BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr).addReg(Incr).addReg(Mask); } + // unsigned: sltu Scratch4, oldVal, Incr // signed: slt Scratch4, oldVal, Incr BuildMI(loopMBB, DL, TII->get(SLTScratch4), Scratch4) diff --git a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp index 215a8ea83190..6855471840e9 100644 --- a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -434,6 +434,50 @@ bool SparcAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, default: // See if this is a generic print operand return AsmPrinter::PrintAsmOperand(MI, OpNo, ExtraCode, O); + case 'L': // Low order register of a twin word register operand + case 'H': // High order register of a twin word register operand + { + const SparcSubtarget &Subtarget = MF->getSubtarget(); + const MachineOperand &MO = MI->getOperand(OpNo); + const SparcRegisterInfo *RegisterInfo = Subtarget.getRegisterInfo(); + Register MOReg = MO.getReg(); + + Register HiReg, LoReg; + if (!SP::IntPairRegClass.contains(MOReg)) { + // If we aren't given a register pair already, find out which pair it + // belongs to. Note that here, the specified register operand, which + // refers to the high part of the twinword, needs to be an even-numbered + // register. + MOReg = RegisterInfo->getMatchingSuperReg(MOReg, SP::sub_even, + &SP::IntPairRegClass); + if (!MOReg) { + SMLoc Loc; + OutContext.reportError( + Loc, "Hi part of pair should point to an even-numbered register"); + OutContext.reportError( + Loc, "(note that in some cases it might be necessary to manually " + "bind the input/output registers instead of relying on " + "automatic allocation)"); + return true; + } + } + + HiReg = RegisterInfo->getSubReg(MOReg, SP::sub_even); + LoReg = RegisterInfo->getSubReg(MOReg, SP::sub_odd); + + Register Reg; + switch (ExtraCode[0]) { + case 'L': + Reg = LoReg; + break; + case 'H': + Reg = HiReg; + break; + } + + O << '%' << SparcInstPrinter::getRegisterName(Reg); + return false; + } case 'f': case 'r': break; diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp index 58ebe023cd61..7ce0aa22b997 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp @@ -959,8 +959,10 @@ void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI, SmallString<256> Code; unsigned MinSize = MI.getOperand(0).getImm(); - if (NextMI != MI.getParent()->end()) { + if (NextMI != MI.getParent()->end() && !NextMI->isInlineAsm()) { // Lower the next MachineInstr to find its byte size. + // If the next instruction is inline assembly, we skip lowering it for now, + // and assume we should always generate NOPs. MCInst MCI; MCIL.Lower(&*NextMI, MCI); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 0a9e2c7f49f5..1fbd69e38eae 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -11653,12 +11653,12 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, -1)) TysForDecl.push_back( FixedVectorType::get(CI->getType(), E->Scalars.size())); + auto *CEI = cast(VL0); for (unsigned I : seq(0, CI->arg_size())) { ValueList OpVL; // Some intrinsics have scalar arguments. This argument should not be // vectorized. if (UseIntrinsic && isVectorIntrinsicWithScalarOpAtArg(ID, I)) { - CallInst *CEI = cast(VL0); ScalarArg = CEI->getArgOperand(I); OpVecs.push_back(CEI->getArgOperand(I)); if (isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) @@ -11671,6 +11671,25 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { LLVM_DEBUG(dbgs() << "SLP: Diamond merged for " << *VL0 << ".\n"); return E->VectorizedValue; } + auto GetOperandSignedness = [&](unsigned Idx) { + const TreeEntry *OpE = getOperandEntry(E, Idx); + bool IsSigned = false; + auto It = MinBWs.find(OpE); + if (It != MinBWs.end()) + IsSigned = It->second.second; + else + IsSigned = any_of(OpE->Scalars, [&](Value *R) { + return !isKnownNonNegative(R, SimplifyQuery(*DL)); + }); + return IsSigned; + }; + ScalarArg = CEI->getArgOperand(I); + if (cast(OpVec->getType())->getElementType() != + ScalarArg->getType()) { + auto *CastTy = FixedVectorType::get(ScalarArg->getType(), + VecTy->getNumElements()); + OpVec = Builder.CreateIntCast(OpVec, CastTy, GetOperandSignedness(I)); + } LLVM_DEBUG(dbgs() << "SLP: OpVec[" << I << "]: " << *OpVec << "\n"); OpVecs.push_back(OpVec); if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 82f25ad621b6..687fb1656937 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,8 +1,8 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define CLANG_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLDB_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 782f047618b5..536f72efec52 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,8 +1,8 @@ -#define CLANG_VERSION 18.1.3 -#define CLANG_VERSION_STRING "18.1.3" +#define CLANG_VERSION 18.1.4 +#define CLANG_VERSION_STRING "18.1.4" #define CLANG_VERSION_MAJOR 18 #define CLANG_VERSION_MAJOR_STRING "18" #define CLANG_VERSION_MINOR 1 -#define CLANG_VERSION_PATCHLEVEL 3 +#define CLANG_VERSION_PATCHLEVEL 4 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index c9d51f35c752..65838f76ba5d 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "18.1.3 (FreeBSD llvmorg-18.1.3-0-gc13b7485b879-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "18.1.4 (FreeBSD llvmorg-18.1.4-0-ge6c3289804a6-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 7cef82df9e4f..1fc1a4d88b7b 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 18.1.3 -#define LLDB_VERSION_STRING "18.1.3" +#define LLDB_VERSION 18.1.4 +#define LLDB_VERSION_STRING "18.1.4" #define LLDB_VERSION_MAJOR 18 #define LLDB_VERSION_MINOR 1 -#define LLDB_VERSION_PATCH 3 +#define LLDB_VERSION_PATCH 4 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 5cf49eceeced..a017437dc568 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -344,10 +344,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 18.1.3" +#define PACKAGE_STRING "LLVM 18.1.4" /* Define to the version of this package. */ -#define PACKAGE_VERSION "18.1.3" +#define PACKAGE_VERSION "18.1.4" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 2b7d5b3e9504..fb878ccdde4d 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -180,10 +180,10 @@ #define LLVM_VERSION_MINOR 1 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 3 +#define LLVM_VERSION_PATCH 4 /* LLVM version string */ -#define LLVM_VERSION_STRING "18.1.3" +#define LLVM_VERSION_STRING "18.1.4" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index b1a8aef7de29..e324de0f9fc6 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,2 +1,2 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Tue Apr 23 17:38: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 4VP8Vg48zxz5Hj18; Tue, 23 Apr 2024 17:38: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 4VP8Vg3vSJz4KCJ; Tue, 23 Apr 2024 17:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53kkQNoEVTDtf87oWcpn1ynKitRABfYoR7hRVmdA1o4=; b=pkz5iI1rcMC2d7ChBvNclonvSw3rXA3O3TA9/9yK7mG0JxqOekv7xq9hYJ6emMMLpE5e0Y oZqRw0YKrewi4CTf2KrUi1Dg9nNrZaWO+JlwFHBIA8HiGBjkz5iZtqbf00SKK+vYYk2Ktu 8lLNGvP17vB2QTv2BFDWvajEo1F/dM3/MhbnzwrfouRdv1RYdtUIUj/FbGuYEbryL+FdVx FRKohGBvsO6ETlLqf375+54QIj9minKPNJtxji5XKmo46xdXZ9re5SvXYNweVxxUHch0/I q0ASlCiI5wnUUUSnV805KKPUwOnQbIDSXlAxwlgWZittRawAud1zIxKOf9QB1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713893931; a=rsa-sha256; cv=none; b=DQ59w1kZhCBdiFplk7uLH3PidKZTBGpNc1bJFKZdEvXfbJCG3e8y6SPI+2qgCu0LtKWo8x N+W/LMVr6RTYZz8wMB/I2fUGHIMEjmpU1C3PjvMk1lqvSejXtqzDFh7oErJa4lveKSElTY mxbd9pZKHhsYnT1yqpXBSjb5NPj9dYbBKxTCghEXhiMz8IJHoY++5X1fO6N7f40A3loN5M QFtkpDGDAOfFGXyaEpiksVVMCil8jSOqWS9xp7ntGy+GHa4Vc1Kn0NF2r9mvIlyoe/V7Vo TcoizNdDqfk1/5Z/C0GWOL0KFKRC51diMDcl456WQxADMJMlgmcL62YQOC8hEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713893931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53kkQNoEVTDtf87oWcpn1ynKitRABfYoR7hRVmdA1o4=; b=bt0d1MewFCUPC7Zz2i4C50DNX3INmodz9dJWsdVJRc4bng/CKSTf9/eRoZ//M8B2XXEJe+ CwG2fLxck6kF5tHIYsVowPSaV7X1ys0UmEaY+EliBc4YZV/jgGR5EyLCMXqVbtzLfWEi6d ItGFHS/0LTqbBZFkR+GFQopLJRd+JyJtNUGHCXB5gE2rujD6MSCBcaEMyEmVZaXhtGkVqz zmMoEXD7U46rTDcjECbTEk1+OfdF177+bswZExEbVmR9z8QBFoKHiWCjLBk6+YJ0cUPqfM oxvkP0tZ9HOoa/9K1jisWUNpSjvnaH6Bw7iaZ1yE31AkhwhUAT+MCnvWVlrabA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8Vg3VlCzhPH; Tue, 23 Apr 2024 17:38: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 43NHcpdx057547; Tue, 23 Apr 2024 17:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHcpwF057544; Tue, 23 Apr 2024 17:38:51 GMT (envelope-from git) Date: Tue, 23 Apr 2024 17:38:51 GMT Message-Id: <202404231738.43NHcpwF057544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7929070fb753 - stable/13 - Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7929070fb7533cf16f60ffdefacc8cc6687b5f3d Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7929070fb7533cf16f60ffdefacc8cc6687b5f3d commit 7929070fb7533cf16f60ffdefacc8cc6687b5f3d Author: Dimitry Andric AuthorDate: 2024-04-20 12:01:32 +0000 Commit: Dimitry Andric CommitDate: 2024-04-23 17:33:14 +0000 Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6. PR: 276104 MFC after: 3 days (cherry picked from commit dfa39133b333f57ca3133bf6c71cd75be4c3e801) --- .../llvm-project/clang/include/clang/Basic/Attr.td | 2 + .../clang/lib/Format/TokenAnnotator.cpp | 20 ++++---- .../clang/lib/Headers/__stddef_unreachable.h | 4 ++ .../compiler-rt/lib/builtins/riscv/restore.S | 42 +++++++++++++++ .../compiler-rt/lib/builtins/riscv/save.S | 42 +++++++++++++++ .../include/__format/formatter_floating_point.h | 2 +- contrib/llvm-project/libcxx/include/stddef.h | 29 ++++------- contrib/llvm-project/lld/COFF/Chunks.cpp | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 3 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 7 ++- contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp | 4 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 42 +++------------ .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 3 ++ .../llvm/lib/Target/Mips/Mips32r6InstrInfo.td | 8 +-- .../llvm/lib/Target/Mips/MipsExpandPseudo.cpp | 60 ++++------------------ .../llvm/lib/Target/Sparc/SparcAsmPrinter.cpp | 44 ++++++++++++++++ .../llvm/lib/Target/X86/X86MCInstLower.cpp | 4 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +++++++- lib/clang/include/VCSVersion.inc | 6 +-- lib/clang/include/clang/Basic/Version.inc | 6 +-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +-- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 25 files changed, 234 insertions(+), 140 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/Attr.td b/contrib/llvm-project/clang/include/clang/Basic/Attr.td index 58838b01b4fd..dbf2dd2120fb 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/Attr.td +++ b/contrib/llvm-project/clang/include/clang/Basic/Attr.td @@ -1590,6 +1590,7 @@ def RegCall : DeclOrTypeAttr { } def Final : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"final">, CustomKeyword<"sealed">]; let Accessors = [Accessor<"isSpelledAsSealed", [CustomKeyword<"sealed">]>]; let SemaHandler = 0; @@ -2472,6 +2473,7 @@ def Overloadable : Attr { } def Override : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"override">]; let SemaHandler = 0; // Omitted from docs, since this is language syntax, not an attribute, as far diff --git a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp index d0c4273cfc7e..4d482e6543d6 100644 --- a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp +++ b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp @@ -3450,10 +3450,11 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { for (AnnotatedLine *ChildLine : Line.Children) calculateFormattingInformation(*ChildLine); - Line.First->TotalLength = - Line.First->IsMultiline ? Style.ColumnLimit - : Line.FirstStartColumn + Line.First->ColumnWidth; - FormatToken *Current = Line.First->Next; + auto *First = Line.First; + First->TotalLength = First->IsMultiline + ? Style.ColumnLimit + : Line.FirstStartColumn + First->ColumnWidth; + FormatToken *Current = First->Next; bool InFunctionDecl = Line.MightBeFunctionDecl; bool AlignArrayOfStructures = (Style.AlignArrayOfStructures != FormatStyle::AIAS_None && @@ -3475,16 +3476,15 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (const bool IsCtorOrDtor = Tok->is(TT_CtorDtorDeclName); IsCtorOrDtor || isFunctionDeclarationName(Style.isCpp(), *Tok, Line, ClosingParen)) { - if (!IsCtorOrDtor) { - LineIsFunctionDeclaration = true; + if (!IsCtorOrDtor) Tok->setFinalizedType(TT_FunctionDeclarationName); - } + LineIsFunctionDeclaration = true; SeenName = true; break; } } - if (IsCpp && LineIsFunctionDeclaration && + if (IsCpp && (LineIsFunctionDeclaration || First->is(TT_CtorDtorDeclName)) && Line.endsWith(tok::semi, tok::r_brace)) { auto *Tok = Line.Last->Previous; while (Tok->isNot(tok::r_brace)) @@ -3507,7 +3507,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (IsCpp) { if (!LineIsFunctionDeclaration) { // Annotate */&/&& in `operator` function calls as binary operators. - for (const auto *Tok = Line.First; Tok; Tok = Tok->Next) { + for (const auto *Tok = First; Tok; Tok = Tok->Next) { if (Tok->isNot(tok::kw_operator)) continue; do { @@ -3644,7 +3644,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { calculateUnbreakableTailLengths(Line); unsigned IndentLevel = Line.Level; - for (Current = Line.First; Current; Current = Current->Next) { + for (Current = First; Current; Current = Current->Next) { if (Current->Role) Current->Role->precomputeFormattingInfos(Current); if (Current->MatchingParen && diff --git a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h index 518580c92d3f..61df43e9732f 100644 --- a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h +++ b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h @@ -7,6 +7,8 @@ *===-----------------------------------------------------------------------=== */ +#ifndef __cplusplus + /* * When -fbuiltin-headers-in-system-modules is set this is a non-modular header * and needs to behave as if it was textual. @@ -15,3 +17,5 @@ (__has_feature(modules) && !__building_module(_Builtin_stddef)) #define unreachable() __builtin_unreachable() #endif + +#endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S index 73f64a920d66..6f43842c8ca6 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S @@ -22,6 +22,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -86,8 +88,29 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + lw s1, 0(sp) + lw s0, 4(sp) + lw ra, 8(sp) + addi sp, sp, 12 + ret + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -161,6 +184,25 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + ld s1, 0(sp) + ld s0, 8(sp) + ld ra, 16(sp) + addi sp, sp, 24 + ret + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S index 85501aeb4c2e..3e044179ff7f 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S @@ -18,6 +18,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -92,8 +94,29 @@ __riscv_save_0: sw ra, 12(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -12 + sw s1, 0(sp) + sw s0, 4(sp) + sw ra, 8(sp) + jr t0 + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -181,6 +204,25 @@ __riscv_save_0: sd ra, 8(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -24 + sd s1, 0(sp) + sd s0, 8(sp) + sd ra, 16(sp) + jr t0 + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h index 6802a8b7bd4c..46a090a787ae 100644 --- a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h +++ b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h @@ -689,7 +689,7 @@ __format_floating_point(_Tp __value, _FormatContext& __ctx, __format_spec::__par // Let P equal the precision if nonzero, 6 if the precision is not // specified, or 1 if the precision is 0. Then, if a conversion with // style E would have an exponent of X: - int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); + int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); if (__result.__exponent == __result.__last) // if P > X >= -4, the conversion is with style f or F and precision P - 1 - X. // By including the radix point it calculates P - (1 + X) diff --git a/contrib/llvm-project/libcxx/include/stddef.h b/contrib/llvm-project/libcxx/include/stddef.h index 887776b150e4..1583e78e3739 100644 --- a/contrib/llvm-project/libcxx/include/stddef.h +++ b/contrib/llvm-project/libcxx/include/stddef.h @@ -7,18 +7,6 @@ // //===----------------------------------------------------------------------===// -#if defined(__need_ptrdiff_t) || defined(__need_size_t) || defined(__need_wchar_t) || defined(__need_NULL) || \ - defined(__need_wint_t) - -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif - -# include_next - -#elif !defined(_LIBCPP_STDDEF_H) -# define _LIBCPP_STDDEF_H - /* stddef.h synopsis @@ -36,15 +24,18 @@ Types: */ -# include <__config> +#include <__config> -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif -# if __has_include_next() -# include_next -# endif +// Note: This include is outside of header guards because we sometimes get included multiple times +// with different defines and the underlying will know how to deal with that. +#include_next + +#ifndef _LIBCPP_STDDEF_H +# define _LIBCPP_STDDEF_H # ifdef __cplusplus typedef decltype(nullptr) nullptr_t; diff --git a/contrib/llvm-project/lld/COFF/Chunks.cpp b/contrib/llvm-project/lld/COFF/Chunks.cpp index 39f4575031be..e2074932bc46 100644 --- a/contrib/llvm-project/lld/COFF/Chunks.cpp +++ b/contrib/llvm-project/lld/COFF/Chunks.cpp @@ -652,6 +652,13 @@ void SectionChunk::getRuntimePseudoRelocs( dyn_cast_or_null(file->getSymbol(rel.SymbolTableIndex)); if (!target || !target->isRuntimePseudoReloc) continue; + // If the target doesn't have a chunk allocated, it may be a + // DefinedImportData symbol which ended up unnecessary after GC. + // Normally we wouldn't eliminate section chunks that are referenced, but + // references within DWARF sections don't count for keeping section chunks + // alive. Thus such dangling references in DWARF sections are expected. + if (!target->getChunk()) + continue; int sizeInBits = getRuntimePseudoRelocSize(rel.Type, file->ctx.config.machine); if (sizeInBits == 0) { diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index d0c27cae0dff..72b6dfa181e8 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -439,7 +439,8 @@ static Value *threadBinOpOverSelect(Instruction::BinaryOps Opcode, Value *LHS, // Check that the simplified value has the form "X op Y" where "op" is the // same as the original operation. Instruction *Simplified = dyn_cast(FV ? FV : TV); - if (Simplified && Simplified->getOpcode() == unsigned(Opcode)) { + if (Simplified && Simplified->getOpcode() == unsigned(Opcode) && + !Simplified->hasPoisonGeneratingFlags()) { // The value that didn't simplify is "UnsimplifiedLHS op UnsimplifiedRHS". // We already know that "op" is the same as for the simplified value. See // if the operands match too. If so, return the simplified value. diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 3135ec73a99e..e806e0f0731f 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -3575,6 +3575,11 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, return SDValue(); if (Opcode != ISD::UADDO && Opcode != ISD::USUBO) return SDValue(); + // Guarantee identical type of CarryOut + EVT CarryOutType = N->getValueType(0); + if (CarryOutType != Carry0.getValue(1).getValueType() || + CarryOutType != Carry1.getValue(1).getValueType()) + return SDValue(); // Canonicalize the add/sub of A and B (the top node in the above ASCII art) // as Carry0 and the add/sub of the carry in as Carry1 (the middle node). @@ -3622,7 +3627,7 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, // TODO: match other operations that can merge flags (ADD, etc) DAG.ReplaceAllUsesOfValueWith(Carry1.getValue(0), Merged.getValue(0)); if (N->getOpcode() == ISD::AND) - return DAG.getConstant(0, DL, MVT::i1); + return DAG.getConstant(0, DL, CarryOutType); return Merged.getValue(1); } diff --git a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp index cbb64b299e64..f105bdb4816a 100644 --- a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp +++ b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp @@ -746,7 +746,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, Min = Min.zext(ResultBitWidth); Max = Max.zext(ResultBitWidth); } - return ConstantRange(std::move(Min), std::move(Max)); + return getNonEmpty(std::move(Min), std::move(Max) + 1); } case Instruction::SIToFP: { // TODO: use input range if available @@ -757,7 +757,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, SMin = SMin.sext(ResultBitWidth); SMax = SMax.sext(ResultBitWidth); } - return ConstantRange(std::move(SMin), std::move(SMax)); + return getNonEmpty(std::move(SMin), std::move(SMax) + 1); } case Instruction::FPTrunc: case Instruction::FPExt: diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 196aa50cf406..95d8ab95b2c0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -1658,40 +1658,14 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM, setMaxAtomicSizeInBitsSupported(128); if (Subtarget->isWindowsArm64EC()) { - // FIXME: are there other intrinsics we need to add here? - setLibcallName(RTLIB::MEMCPY, "#memcpy"); - setLibcallName(RTLIB::MEMSET, "#memset"); - setLibcallName(RTLIB::MEMMOVE, "#memmove"); - setLibcallName(RTLIB::REM_F32, "#fmodf"); - setLibcallName(RTLIB::REM_F64, "#fmod"); - setLibcallName(RTLIB::FMA_F32, "#fmaf"); - setLibcallName(RTLIB::FMA_F64, "#fma"); - setLibcallName(RTLIB::SQRT_F32, "#sqrtf"); - setLibcallName(RTLIB::SQRT_F64, "#sqrt"); - setLibcallName(RTLIB::CBRT_F32, "#cbrtf"); - setLibcallName(RTLIB::CBRT_F64, "#cbrt"); - setLibcallName(RTLIB::LOG_F32, "#logf"); - setLibcallName(RTLIB::LOG_F64, "#log"); - setLibcallName(RTLIB::LOG2_F32, "#log2f"); - setLibcallName(RTLIB::LOG2_F64, "#log2"); - setLibcallName(RTLIB::LOG10_F32, "#log10f"); - setLibcallName(RTLIB::LOG10_F64, "#log10"); - setLibcallName(RTLIB::EXP_F32, "#expf"); - setLibcallName(RTLIB::EXP_F64, "#exp"); - setLibcallName(RTLIB::EXP2_F32, "#exp2f"); - setLibcallName(RTLIB::EXP2_F64, "#exp2"); - setLibcallName(RTLIB::EXP10_F32, "#exp10f"); - setLibcallName(RTLIB::EXP10_F64, "#exp10"); - setLibcallName(RTLIB::SIN_F32, "#sinf"); - setLibcallName(RTLIB::SIN_F64, "#sin"); - setLibcallName(RTLIB::COS_F32, "#cosf"); - setLibcallName(RTLIB::COS_F64, "#cos"); - setLibcallName(RTLIB::POW_F32, "#powf"); - setLibcallName(RTLIB::POW_F64, "#pow"); - setLibcallName(RTLIB::LDEXP_F32, "#ldexpf"); - setLibcallName(RTLIB::LDEXP_F64, "#ldexp"); - setLibcallName(RTLIB::FREXP_F32, "#frexpf"); - setLibcallName(RTLIB::FREXP_F64, "#frexp"); + // FIXME: are there intrinsics we need to exclude from this? + for (int i = 0; i < RTLIB::UNKNOWN_LIBCALL; ++i) { + auto code = static_cast(i); + auto libcallName = getLibcallName(code); + if ((libcallName != nullptr) && (libcallName[0] != '#')) { + setLibcallName(code, Saver.save(Twine("#") + libcallName).data()); + } + } } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h index 541a810fb5cb..74d0c4bde8dd 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h @@ -1001,6 +1001,9 @@ private: /// make the right decision when generating code for different targets. const AArch64Subtarget *Subtarget; + llvm::BumpPtrAllocator BumpAlloc; + llvm::StringSaver Saver{BumpAlloc}; + bool isExtFreeImpl(const Instruction *Ext) const override; void addTypeForNEON(MVT VT); diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td index 854563ab32bd..3ef04e488f01 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td @@ -152,15 +152,15 @@ class SELNEZ_ENC : SPECIAL_3R_FM<0b00000, 0b110111>; class LWPC_ENC : PCREL19_FM; -class MAX_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; -class MAX_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; +class MAX_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; +class MAX_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; class MIN_S_ENC : COP1_3R_FM<0b011100, FIELD_FMT_S>; class MIN_D_ENC : COP1_3R_FM<0b011100, FIELD_FMT_D>; class MAXA_S_ENC : COP1_3R_FM<0b011111, FIELD_FMT_S>; class MAXA_D_ENC : COP1_3R_FM<0b011111, FIELD_FMT_D>; -class MINA_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; -class MINA_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; +class MINA_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; +class MINA_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; class SELEQZ_S_ENC : COP1_3R_FM<0b010100, FIELD_FMT_S>; class SELEQZ_D_ENC : COP1_3R_FM<0b010100, FIELD_FMT_D>; diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp index c30129743a96..2c2554b5b4bc 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp @@ -388,32 +388,18 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( Opcode = Mips::XOR; break; case Mips::ATOMIC_LOAD_UMIN_I8_POSTRA: - IsUnsigned = true; - IsMin = true; - break; case Mips::ATOMIC_LOAD_UMIN_I16_POSTRA: IsUnsigned = true; - IsMin = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MIN_I8_POSTRA: - SEOp = Mips::SEB; - IsMin = true; - break; case Mips::ATOMIC_LOAD_MIN_I16_POSTRA: IsMin = true; break; case Mips::ATOMIC_LOAD_UMAX_I8_POSTRA: - IsUnsigned = true; - IsMax = true; - break; case Mips::ATOMIC_LOAD_UMAX_I16_POSTRA: IsUnsigned = true; - IsMax = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MAX_I8_POSTRA: - SEOp = Mips::SEB; - IsMax = true; - break; case Mips::ATOMIC_LOAD_MAX_I16_POSTRA: IsMax = true; break; @@ -475,42 +461,14 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( // For little endian we need to clear uninterested bits. if (STI->isLittle()) { - if (!IsUnsigned) { - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), OldVal) - .addReg(OldVal) - .addReg(ShiftAmnt); - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), Incr) - .addReg(Incr) - .addReg(ShiftAmnt); - if (STI->hasMips32r2()) { - BuildMI(loopMBB, DL, TII->get(SEOp), OldVal).addReg(OldVal); - BuildMI(loopMBB, DL, TII->get(SEOp), Incr).addReg(Incr); - } else { - const unsigned ShiftImm = SEOp == Mips::SEH ? 16 : 24; - BuildMI(loopMBB, DL, TII->get(Mips::SLL), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SLL), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - } - } else { - // and OldVal, OldVal, Mask - // and Incr, Incr, Mask - BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) - .addReg(OldVal) - .addReg(Mask); - BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr) - .addReg(Incr) - .addReg(Mask); - } + // and OldVal, OldVal, Mask + // and Incr, Incr, Mask + BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) + .addReg(OldVal) + .addReg(Mask); + BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr).addReg(Incr).addReg(Mask); } + // unsigned: sltu Scratch4, oldVal, Incr // signed: slt Scratch4, oldVal, Incr BuildMI(loopMBB, DL, TII->get(SLTScratch4), Scratch4) diff --git a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp index 215a8ea83190..6855471840e9 100644 --- a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -434,6 +434,50 @@ bool SparcAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, default: // See if this is a generic print operand return AsmPrinter::PrintAsmOperand(MI, OpNo, ExtraCode, O); + case 'L': // Low order register of a twin word register operand + case 'H': // High order register of a twin word register operand + { + const SparcSubtarget &Subtarget = MF->getSubtarget(); + const MachineOperand &MO = MI->getOperand(OpNo); + const SparcRegisterInfo *RegisterInfo = Subtarget.getRegisterInfo(); + Register MOReg = MO.getReg(); + + Register HiReg, LoReg; + if (!SP::IntPairRegClass.contains(MOReg)) { + // If we aren't given a register pair already, find out which pair it + // belongs to. Note that here, the specified register operand, which + // refers to the high part of the twinword, needs to be an even-numbered + // register. + MOReg = RegisterInfo->getMatchingSuperReg(MOReg, SP::sub_even, + &SP::IntPairRegClass); + if (!MOReg) { + SMLoc Loc; + OutContext.reportError( + Loc, "Hi part of pair should point to an even-numbered register"); + OutContext.reportError( + Loc, "(note that in some cases it might be necessary to manually " + "bind the input/output registers instead of relying on " + "automatic allocation)"); + return true; + } + } + + HiReg = RegisterInfo->getSubReg(MOReg, SP::sub_even); + LoReg = RegisterInfo->getSubReg(MOReg, SP::sub_odd); + + Register Reg; + switch (ExtraCode[0]) { + case 'L': + Reg = LoReg; + break; + case 'H': + Reg = HiReg; + break; + } + + O << '%' << SparcInstPrinter::getRegisterName(Reg); + return false; + } case 'f': case 'r': break; diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp index 58ebe023cd61..7ce0aa22b997 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp @@ -959,8 +959,10 @@ void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI, SmallString<256> Code; unsigned MinSize = MI.getOperand(0).getImm(); - if (NextMI != MI.getParent()->end()) { + if (NextMI != MI.getParent()->end() && !NextMI->isInlineAsm()) { // Lower the next MachineInstr to find its byte size. + // If the next instruction is inline assembly, we skip lowering it for now, + // and assume we should always generate NOPs. MCInst MCI; MCIL.Lower(&*NextMI, MCI); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 0a9e2c7f49f5..1fbd69e38eae 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -11653,12 +11653,12 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, -1)) TysForDecl.push_back( FixedVectorType::get(CI->getType(), E->Scalars.size())); + auto *CEI = cast(VL0); for (unsigned I : seq(0, CI->arg_size())) { ValueList OpVL; // Some intrinsics have scalar arguments. This argument should not be // vectorized. if (UseIntrinsic && isVectorIntrinsicWithScalarOpAtArg(ID, I)) { - CallInst *CEI = cast(VL0); ScalarArg = CEI->getArgOperand(I); OpVecs.push_back(CEI->getArgOperand(I)); if (isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) @@ -11671,6 +11671,25 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { LLVM_DEBUG(dbgs() << "SLP: Diamond merged for " << *VL0 << ".\n"); return E->VectorizedValue; } + auto GetOperandSignedness = [&](unsigned Idx) { + const TreeEntry *OpE = getOperandEntry(E, Idx); + bool IsSigned = false; + auto It = MinBWs.find(OpE); + if (It != MinBWs.end()) + IsSigned = It->second.second; + else + IsSigned = any_of(OpE->Scalars, [&](Value *R) { + return !isKnownNonNegative(R, SimplifyQuery(*DL)); + }); + return IsSigned; + }; + ScalarArg = CEI->getArgOperand(I); + if (cast(OpVec->getType())->getElementType() != + ScalarArg->getType()) { + auto *CastTy = FixedVectorType::get(ScalarArg->getType(), + VecTy->getNumElements()); + OpVec = Builder.CreateIntCast(OpVec, CastTy, GetOperandSignedness(I)); + } LLVM_DEBUG(dbgs() << "SLP: OpVec[" << I << "]: " << *OpVec << "\n"); OpVecs.push_back(OpVec); if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 82f25ad621b6..687fb1656937 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,8 +1,8 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define CLANG_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLDB_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 782f047618b5..536f72efec52 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,8 +1,8 @@ -#define CLANG_VERSION 18.1.3 -#define CLANG_VERSION_STRING "18.1.3" +#define CLANG_VERSION 18.1.4 +#define CLANG_VERSION_STRING "18.1.4" #define CLANG_VERSION_MAJOR 18 #define CLANG_VERSION_MAJOR_STRING "18" #define CLANG_VERSION_MINOR 1 -#define CLANG_VERSION_PATCHLEVEL 3 +#define CLANG_VERSION_PATCHLEVEL 4 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index c9d51f35c752..65838f76ba5d 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400006 -#define LLD_VERSION_STRING "18.1.3 (FreeBSD llvmorg-18.1.3-0-gc13b7485b879-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "18.1.4 (FreeBSD llvmorg-18.1.4-0-ge6c3289804a6-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 7cef82df9e4f..1fc1a4d88b7b 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 18.1.3 -#define LLDB_VERSION_STRING "18.1.3" +#define LLDB_VERSION 18.1.4 +#define LLDB_VERSION_STRING "18.1.4" #define LLDB_VERSION_MAJOR 18 #define LLDB_VERSION_MINOR 1 -#define LLDB_VERSION_PATCH 3 +#define LLDB_VERSION_PATCH 4 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 5cf49eceeced..a017437dc568 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -344,10 +344,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 18.1.3" +#define PACKAGE_STRING "LLVM 18.1.4" /* Define to the version of this package. */ -#define PACKAGE_VERSION "18.1.3" +#define PACKAGE_VERSION "18.1.4" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 2b7d5b3e9504..fb878ccdde4d 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -180,10 +180,10 @@ #define LLVM_VERSION_MINOR 1 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 3 +#define LLVM_VERSION_PATCH 4 /* LLVM version string */ -#define LLVM_VERSION_STRING "18.1.3" +#define LLVM_VERSION_STRING "18.1.4" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index b1a8aef7de29..e324de0f9fc6 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,2 +1,2 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Tue Apr 23 17:57: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 4VP8vj4WLKz5Hk2l; Tue, 23 Apr 2024 17:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VP8vj3ytYz4PBC; Tue, 23 Apr 2024 17:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713895025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I/431zGEdsNQZ29LchYSG3UQrCBVVuMnJJD7ApEm0XM=; b=Ntitk+1zoqncj5TFkzCTmI5VhNQV5j3l6/Sfsz+6UsPAfM4mcplVH/4+et8hTIx4pQveAW 1ZSBsaLVOf3dIp0F4g4RZ3PmCfzgT2uioQ5TJ3LNZU3zmBlSaMxoYqPnaSkc7jjaj3BaOI 1cehZzYlqb4eaB6HsYPNAPGrbE3qjTk8d3Imh6q7HPJR+OV62hUHg5jJ9Zs5xZuBUP2cX5 McYvBtXhypnCStvnktewa2iG9uF+SfWSFtKJnCYFV/0myHiJV6OcsuFXsA5o+bY5HNKtDb B3zY2kqVIBiD+8DAULOK8FNlFmx9r0NVZpRYFHiOkP4ClPKTuN3rOWoQYnZOdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713895025; a=rsa-sha256; cv=none; b=M/QeqpfWUgkazbjYKbvHQdB9KaAremPeX0tlykuIzOSg9Xo+w9NDTnFvp3qxgYh0k1GuSK zrMzwwU+J0orf9hQete50HupmTefJ9SUJ37Ra29t6yKV5cx7AkHRzG7S97aRSdKMsywgBg h2FR969Afp7TeY1zXi0cxcyg2W2QvekO/8V8eO5bx66pxtzVA/sQMc+O9SpNSI5KSw0Hc0 aDlTpsGJ7wjBoqpwx7E9RPmNiV2vn4gDRdc+GWkGs+HFYusMlhpAyThdxbpARWWxynTNKK b+/KAY4QCnz+/ExEckyHI7IREHrP8nw4RdBtWpW8H2kOOHOum+oKf4TJSzH90w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713895025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I/431zGEdsNQZ29LchYSG3UQrCBVVuMnJJD7ApEm0XM=; b=yUJ9ioUD0OJqIpeNu4FDIC7ruPchymfV68FmxAQlFGMSvtRgup0bfjvEfp33dwI3GgBiO5 hxuDccIjslMZpEEn+4bimP60CUIkxpkKXgteDEvNxK/1Tc23bnm359SpY3IFL0IfO3e7JP EZLwW6nI6551ropuncbOTk5xqIj+GEHDbTuN1ysS3fVo3WTxUWXRz7Vn/lTI0C4DUnHqQL HIHDLiYLkzwIQoxUy3S45tpPtq9CJnIYTZDlDrO1v+dial49YujDW/fOGVZlHnWpm/woOB Is0WuJ2hzwkMshFb3nnYcw1SmxP2w6qg+sMd4rGGw/vK76R+NjhPcgCSAUR86g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8vj3ZXzzhfs; Tue, 23 Apr 2024 17:57: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 43NHv5iV091147; Tue, 23 Apr 2024 17:57:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHv5Uk091144; Tue, 23 Apr 2024 17:57:05 GMT (envelope-from git) Date: Tue, 23 Apr 2024 17:57:05 GMT Message-Id: <202404231757.43NHv5Uk091144@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: 86d06911d60b - stable/14 - Cirrus-CI: switch to llvm18 by default List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 86d06911d60b5bdbd795e9c5a5d3153285aebc6e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=86d06911d60b5bdbd795e9c5a5d3153285aebc6e commit 86d06911d60b5bdbd795e9c5a5d3153285aebc6e Author: Ed Maste AuthorDate: 2024-04-06 21:53:17 +0000 Commit: Ed Maste CommitDate: 2024-04-23 17:56:58 +0000 Cirrus-CI: switch to llvm18 by default As of commit 439352ac8257 Clang/LLVM 18 is the default in-tree compiler. Follow suit in with the external toolchain package used by Cirrus-CI. Sponsored by: The FreeBSD Foundation (cherry picked from commit e8b7c78c1b38d0486ff12993c0529a201030bd07) --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 90d031a919f2..13719a3e2058 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,15 +23,15 @@ task: TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm17 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm18 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' - trigger_type: manual + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Wed Apr 24 05:06: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 4VPRlt6t2jz5JnJJ; Wed, 24 Apr 2024 05:06: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 4VPRlt424zz4TMJ; Wed, 24 Apr 2024 05:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTYz+v8EHfjIKUa516xwDRihbOR024Wjpp8l/jvEW4M=; b=BASIke1HnXgcQZaAJDrdN9IcMevDvHUUxRHcTCCnF1b3OvZi0c4J5tK3/o98livpwMrkPo mWfXr43kVqR0p1Zav/+0iKDiONOPFySQOJe701eDU6qQByuyoEAQCgtfsIbip/D5YYiper 6FdsUhVBG6kRhqFx+Kx0ySq7uAPNcXJNf8gRxRTUeUdtVsIU4TGCqSFTxvGY8BUR/hlbVI d4YfrP1LGUOmtxaGeZl+A2SIxdrM+NHK6YVmDWua5P0q09BAKD9KD+zs3ULn5voUmris8r 7/7JBNRKJ3svL+2MRJ6A3GwY5+9om46heeWQqRIIaPb6gC7ihJByAAXwSq4L0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935178; a=rsa-sha256; cv=none; b=ute4sAhgUf1w5pZ948uhWXX8gZsmR0DD5NUSE7PEPRCazgToWOXgX49u+0n7OkfetOHtIS yGWoqpQOcWMawLtxzQmiJZW8xKcQCEzjnx3Uv9LZFx+Fdj+Z7mrTJgXCCxHT+a1hEQuhzc A0XH7gtP1IzeTVreoi9ffeeZwlBtEqb1I+raIv+PXSuUG03gz8RAMcZpjMzV8ZsEZgXCvh +o1WYfmasa1RfEcVRlNfOwswSTbtKutqQyZaJblgdsIPFv1xq9e/sCJis4CEHTLG7hErCg syzRvcKhXTkGOJK6kDcdGz3tNLJ6Trc6S+yrMQdkW5bNnMQ1XN0yyq/6pV0kiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTYz+v8EHfjIKUa516xwDRihbOR024Wjpp8l/jvEW4M=; b=ai4iRZjQiEWPDFJ85EAcdXHsO8k6Nt6PGFwX/ZuzyYpywO2T7FvDLDGDBQW+Gq2nXhYmW7 Wb2BYmgbz7+XAdYW70sQ4yuK1xY313ktlKTqrdssxo9fs1DHzVgtCjz0kTJB9W4P1VEnt2 PMyfp0jvNf5/m0UblUuCSH2CI+kE8wR51jgbZXCovsDSr2nhvJHhvyBDEalhADvsNMLz5d BEk4yotJGU1JTm1hgfuLh4qtMKXxGK5meFJ/uLj4lzMxQ+mjU3862jl0ZJ/Damz4aD1DdD CcLL8iQsQnAWrjY8Gm5NbB8y1f5T+upV5N/izm6DsxKTaCmBZH4V5LNbvpFCvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPRlt3f62z121f; Wed, 24 Apr 2024 05:06: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 43O56Itb023967; Wed, 24 Apr 2024 05:06:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56IWx023964; Wed, 24 Apr 2024 05:06:18 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:18 GMT Message-Id: <202404240506.43O56IWx023964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1b0e8598970d - stable/13 - release/Makefile.vm: Support read-only ports tree List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b0e8598970dd98eb9248d4f29bb8738abb11eb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0e8598970dd98eb9248d4f29bb8738abb11eb4 commit 1b0e8598970dd98eb9248d4f29bb8738abb11eb4 Author: Colin Percival AuthorDate: 2024-04-11 16:24:59 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:02:02 +0000 release/Makefile.vm: Support read-only ports tree Build qemu (if needed) with WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles so that we can have a read-only /usr/ports and don't contaminate it. This became an issue when I enabled parallel release building, since one image might be creating its ports.txz file at the same time as we're building qemu as a prerequisite for building another image. MFC after: 5 days (cherry picked from commit 6f454c211b295ad13e80fc5b858efc9bad33e33b) --- release/Makefile.vm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 27053208c689..2e5bdb9a7004 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -55,7 +55,10 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo emulator-portinstall: .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) - env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean + env - UNAME_r=${UNAME_r} PATH=$$PATH \ + make -C ${PORTSDIR}/emulators/qemu-user-static \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y From nobody Wed Apr 24 05:06: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 4VPRlw3L5rz5Jnjm; Wed, 24 Apr 2024 05:06: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 4VPRlv6fmtz4TK4; Wed, 24 Apr 2024 05:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Erfajz4/e0GxRsp3ujoGLBxDaTQP167r35U5Qbo32MM=; b=Xl//2q81NXg7mdDQ9Ng2s3RD7vp5KSP1duSP5jFJ68FxetFSTYadepTK7RTB/SwOYho1HH jThrkaahVbw4HnI/E1t+7glM/DyLoMY9VtLLkOwNdhq2b+o2wbBx6q5H478pU1ZpO8IWYe 0fBF8BfabztJRSgivAaEF9TQjEV/8eKtkYDwWvfuDTfgM9S8JlmV0TwlFIpe27C/FHjcFj 0W1rSdMoYA/YbcS90mbZX5pheW5jLeP1XXdTOYQgCIMMKBFeoMDC0FidfCLu3KS9J9d84E TwXhsjyjhfD3wyOOOpHfbIYArn8GenWFS6Easc64y2UwCXvHhoQ3o75E2QG7ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935179; a=rsa-sha256; cv=none; b=Tt825Tx2nlAU5eF41mLYPFzW4oSRdvosBZmd1Uut2pQBqF/sTUTiyO5TSugeyWoxEKS167 xvnJrlhVpp4fLY9Njz1Dsqkp3TxM0eSkmBjqW444Ryet2bIZjcYpJ5M07afwVX9qyNP3qJ ksRnhQKhFyEcaeC65DvC9DJsPqzhG4KHAJ3Ew1PPAJt+iib1MSgj5H8lBgS6iAZMXGhAYt mKRgLPX/ppU85WmtoozKRAiA1OXJal8lm75TTZC1638TeGzkNdBDNH6XLbRdo2y1mL/WJP kUY25gzx/Fde+Na0tT2HubUtTo5YRAntFwS1hZtgxsfeQCaK0VJiVBN3TlvP1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Erfajz4/e0GxRsp3ujoGLBxDaTQP167r35U5Qbo32MM=; b=LEdUk3edqQOzl/WG+TmnaTDTUZIdau8/RnVhiOy9DKOxgv1O6IRrfZU0OL62pPMoe73Gan /yUNo7vA20WWKbMPzgeO3b6bcYohf3oAbDF2mmMoA9DdCY27Y7NZyBJJLf/Uwyb1zX/J+m biZ5F9FbOt8RJxnN709Pb4JevF+QvogSWfcks3Ifpbc1+KGzOCIJn1q0Po/I9T6cgiGzuG elY/FRZBp1p+QOQtU3gwR80pVfUX33triMlQmSC24+YdxBVzva74Ou2Gvq45TnH5NGZ9CM 1Zrr+zW4hxNOz8KmNmiP85mSUU2giuvcRwBtBpT5xMON2sxci3/7f6HNTyTfxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPRlv4dLXz11ry; Wed, 24 Apr 2024 05:06: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 43O56JLv024012; Wed, 24 Apr 2024 05:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56J2G024010; Wed, 24 Apr 2024 05:06:19 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:19 GMT Message-Id: <202404240506.43O56J2G024010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6b8ca8c4e406 - stable/13 - release: Support r/o /usr/ports for cloudware List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e commit 6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e Author: Colin Percival AuthorDate: 2024-04-12 17:20:25 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:04:06 +0000 release: Support r/o /usr/ports for cloudware Set WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles when building tools needed for uploading cloudware images. While I'm here, adjust the bsdec2-image-upload build target to match the style used by the Azure/GCE/Vagrant Makefiles. MFC after: 3 days (cherry picked from commit 6c87aed39c3053cd338c1ec18fba5b1d773beca9) --- release/Makefile.azure | 4 +++- release/Makefile.ec2 | 16 ++++++++++------ release/Makefile.gce | 8 ++++++-- release/Makefile.vagrant | 4 +++- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 19d571de9f44..0f63acb0046b 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -38,7 +38,9 @@ azure-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y www/npm . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif . endif npm install -g azure-cli diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 51d32ecd97a6..20a5ae23ac3b 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -43,13 +43,17 @@ CW_EC2_PORTINSTALL= .endif cw-ec2-portinstall: -.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) - env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean -.else -. if !exists(/usr/local/sbin/pkg-static) - env ASSUME_ALWAYS_YES=yes pkg bootstrap -y -. endif +.if !exists(/usr/local/bin/bsdec2-image-upload) +. if !exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf +. endif env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload +. else + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/bsdec2-image-upload \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean +. endif .endif @touch ${.TARGET} diff --git a/release/Makefile.gce b/release/Makefile.gce index ea5daf290e3c..c6c19961b673 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -48,8 +48,12 @@ gce-check-depends: env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk \ lang/python . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif .endif diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 5fd2c31e9f49..cc72f7456740 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -57,7 +57,9 @@ vagrant-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y curl . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif .endif From nobody Wed Apr 24 05:06: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 4VPRlx3S6hz5JnJb; Wed, 24 Apr 2024 05:06: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 4VPRlw6bWyz4Swx; Wed, 24 Apr 2024 05:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ze7sps5BePPJi28EgjfNmKVIAMhKDRwKrEsauM4VF80=; b=s16bDNqoYXILC6yJ9SowF3N5/lHiZIoZ0Ui/YWXQnZJ56D9F1nyinDhvhfJXfFfyBFMtvh cKam22TV7eBy0afvqAXzhbUEYuXC7S69uBocsJS7DTc+ZsDBukviloKG0H0ZoKsCF0Rexu M77HkYSh5o53OgTX6seyc1IlV5UQoZTqaX4T7fIFWt9bOX8S0fnip6z/JJMQx6nqvucARa MZGyviMGi+pQUoKfVRRzYj2Gc1OoS2lynHXMRU0HRx3c147U0SAXU43QnRE/E8tZ9baunU Zqho1bubYks6XU1e/99eGOo4OnPLUMKkcWEGbhsNVcwv2aBZ6Ovkg5KmE6nG3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935180; a=rsa-sha256; cv=none; b=cyLSubq8rURtyzKL6iqham0oOjBcOZ+bZCysVaktX4GgH+heNJtIedWKoplqMAhlM1EGcY fE/5B3q5gTC5nm1mwTtIbkrDm40QLG/5+VrpJo4ON7Hhfgf6Ion5YwZ3HVTnNc4XMHiQYU ora7ErV/Jy6ArAXI3HmqXYQsg8CVwCADXuISDdjzJ5o9rwtgAPdxtMqF3fPhy0uqfBPBJC f6iXG2iMiOwedY1hDU6h5Mru7K56hoiMmmuKaqPvJ78aCqgrgy8vhYK/yBHDs0VI+Ueq2l Kic6L/Toyy9VvQSuYiKnsI7gCnUu9pVaPc//HH7YIDNhnX3EHmU2/LMMhSEMFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ze7sps5BePPJi28EgjfNmKVIAMhKDRwKrEsauM4VF80=; b=nKccSrgt88Zz3aImcHgk2mimFBM8WF5PCmfdulbDR14uzo+fA/i8oeqpXp6cXvX0+ys2gP 5dwW7/CON5rsDLYczB21Ab3CMlXHhXL0qCJlDv8UA1SXsNQlPQopDa/eujHAZM6a0l+MgG HhBTjX0aEDrj1qSNxGoks/n8sQjrGO/jLLNsFkZkiVhEyEpGWtl0cCyp/Eh2gNHcPvSmpu U1Clj0ZT7fqCr5yUVK7D00fRrG7UCeYlutqF4nCNiDwtvNHPhW9/Wdw/sFSTWpC1QUppqV DsVvifKMnP5W/F0OY5y5HGxA0RYph8BFV59hqi5DwqS7f57XP2W60uwz7NZFiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPRlw5hC3z11s0; Wed, 24 Apr 2024 05:06: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 43O56K1t024073; Wed, 24 Apr 2024 05:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56K19024070; Wed, 24 Apr 2024 05:06:20 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:20 GMT Message-Id: <202404240506.43O56K19024070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 835b1bd4045a - stable/13 - release: Use the ABI of the target release to fetch packages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 835b1bd4045a7ef56f58868fc150d099b2ce135b Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=835b1bd4045a7ef56f58868fc150d099b2ce135b commit 835b1bd4045a7ef56f58868fc150d099b2ce135b Author: John Baldwin AuthorDate: 2024-04-13 21:16:01 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:04:44 +0000 release: Use the ABI of the target release to fetch packages - Point --rootdir at the installed destdir in the dvd tree. This causes pkg to determine the ABI from the installed destdir instead of the host's binaries. Previously the result was that packages for the host's ABI were always downloaded breaking cross-releases (e.g. arm64 releases built on an amd64 host included amd64 packages on the DVD ISO image rather than arm64 packages). This also handles version mismatches, and I tested this by cross-building a 15.x arm64 release on a 14.x amd64 host. - As a result, pkg now does a chdir(3) to the rootdir before running, so the -o argument to fetch needs to be updated to be relative to rootdir instead of the CWD as make runs. - Add a new ROOTDIR variable to limit references to "dvd" to one place. Ideally ROOTDIR would be an argument to this script so that it didn't really know about the dvd layout at all. - While here, simplify creation of symlinks by just using a longer path to the link name instead of using 'cd' in the shell before invoking ln(1). Also use ln -sf to create the pkg.pkg symlink rather than rm + ln. PR: 278273 Reported by: gatekeeper Reviewed by: imp, delphij MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44749 (cherry picked from commit ea2663040d524efd84b12edcbe83884437fdceea) --- release/scripts/pkg-stage.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index b96ce2947bb1..b51bdd4a2117 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -8,7 +8,8 @@ export ASSUME_ALWAYS_YES="YES" export PKG_DBDIR="/tmp/pkg" export PERMISSIVE="YES" export REPO_AUTOUPDATE="NO" -export PKGCMD="/usr/sbin/pkg -d" +export ROOTDIR="$PWD/dvd" +export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip @@ -46,14 +47,13 @@ if [ ! -x /usr/local/sbin/pkg ]; then /usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean fi -export DVD_DIR="dvd/packages" -export PKG_ABI=$(pkg config ABI) -export PKG_ALTABI=$(pkg config ALTABI 2>/dev/null) -export PKG_REPODIR="${DVD_DIR}/${PKG_ABI}" +export PKG_ABI=$(pkg --rootdir ${ROOTDIR} config ABI) +export PKG_ALTABI=$(pkg --rootdir ${ROOTDIR} config ALTABI 2>/dev/null) +export PKG_REPODIR="packages/${PKG_ABI}" -/bin/mkdir -p ${PKG_REPODIR} +/bin/mkdir -p ${ROOTDIR}/${PKG_REPODIR} if [ ! -z "${PKG_ALTABI}" ]; then - (cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI}) + ln -s ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI} fi # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the @@ -82,11 +82,10 @@ ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES} # Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works # using the on-disc packages. -mkdir -p ${PKG_REPODIR}/Latest -(cd ${PKG_REPODIR}/Latest && \ - ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg pkg.pkg) -(cd ${PKG_REPODIR}/Latest && \ - rm -f pkg.txz && ln -s pkg.pkg pkg.txz) +export LATEST_DIR="${ROOTDIR}/${PKG_REPODIR}/Latest" +mkdir -p ${LATEST_DIR} +ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg ${LATEST_DIR}/pkg.pkg +ln -sf pkg.pkg ${LATEST_DIR}/pkg.txz ${PKGCMD} repo ${PKG_REPODIR} From nobody Wed Apr 24 10:20: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 4VPZk660bmz5H2bk; Wed, 24 Apr 2024 10:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPZk6573gz42Nn; Wed, 24 Apr 2024 10:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwLTi5QWY6/enTJ7vQhskb1qU7gFRu9TLj3ZUo0Bd7U=; b=PtauhUKTpuMl17KR6Tz2zFMPoZzE0665jjIH4NQDujOMU7+VB6dgpY9UwgsqRGzXnRbQdY AfArV3E2L54Zct+/ile+e+WSK12ZV5q+niNRx2JcxU9PwBJuASBtMuUdklB7ZML9CRiMgd IeMDbCpYSN0VqAocOZoF6gBTySpCCqpQ6EHA1aBkvL2iXmh2fw03w/r1wD9SuY6/ARz/Az Dxr53yctqOL6WB76r21EpZ5si/+JCe7EB8ZD1iaQtgbIuaIEW94XIRcVAFJEfO10yoj1zR gLcn3UPuFxaVrMY40SkPvgvaD4l4d48yzoaBMJ/Ts7v4jbO6AbqQDgUKRw4QpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954014; a=rsa-sha256; cv=none; b=BVV4TAgrqXHy5nmH3URY61R/LqzLdRivu1oG2koDrgGuHRtus9B6bRRHs5GbyqXirVA1Cy L0is7So4DdvD2ebndMoroTuNl2HwVvF1zZ8xu1GhEIcIYL1l53cLrElPFcv2zXTYLw/wLi y6L7G2GhEDclwEWCleJMrTg2LvYOomU2ijF56zaNfCm2/ArOweDZ66LpXHguNge2q1/kSI hzijqGozSgIlONGQpluQjMrXzNYVsTY+ygAqu1S9p/xM/a/Cgkm8Ll4fZutWikHbCq6lP2 GK5oKbXrUwltPGdmxxqOOgsazm0ARch9TUFkA9JJoHA+sg5fIPkJZeChMyNuGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwLTi5QWY6/enTJ7vQhskb1qU7gFRu9TLj3ZUo0Bd7U=; b=Toy9JueDZPpx4NJGQ+ERac9+4NofayWIqfCgvs32Z7IDfS34nnbg4lSCX9p1uLLUN38lJi dEHtlQpKPU0w1YiKl6SjzCPjENUrHNcpPS4ekxw7ysT6MoNB2+kogScrtOhEqTV4doDvPe VaI3tIjcgRAN81VV5q9VMt/ythpCZjHK12IsVit+V/g+Pbw92f/r3eaXPZ37sKBjTbt4KW abYCsMgAzQLIalMxvs47fP1Q1H94MmRtPPxXjJK6EhVFMgFkQQ1FRFMySRtzBwh2PuO+ge txNFFXtLkPES728at8KFDoumohdXco7+tVa8PafmPSl5oFdRXxgGhme3TEiZng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk64kYDz1B83; Wed, 24 Apr 2024 10:20: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 43OAKEGD056305; Wed, 24 Apr 2024 10:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKEPS056300; Wed, 24 Apr 2024 10:20:14 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:14 GMT Message-Id: <202404241020.43OAKEPS056300@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: 3b83e014c094 - stable/14 - uipc_domain: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b83e014c09492b3b089571758f4831466f86279 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3b83e014c09492b3b089571758f4831466f86279 commit 3b83e014c09492b3b089571758f4831466f86279 Author: Gordon Bergling AuthorDate: 2024-04-21 07:51:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:19:09 +0000 uipc_domain: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181) --- sys/kern/uipc_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 649bd798ebab..22b8a17295ed 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -226,7 +226,7 @@ pr_init(struct domain *dom, struct protosw *pr) /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you can't unload it again because a socket may be using it. * XXX can't fail at this time. */ void From nobody Wed Apr 24 10:20: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 4VPZk818k9z5H2tr; Wed, 24 Apr 2024 10:20: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 4VPZk766Ynz42LF; Wed, 24 Apr 2024 10:20:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UwxEHBCi7d5BItLEO/fEnS7H6njQok7pfHlqaPsOqlg=; b=uv16qO1WdreRSTQ2AFSMEw+GiD6vpspgwC1xJ7gAsAI+dTQs2mRjDMIOTdCs6XE/VMS9Qo vqi2t5KgeLn0jJgDhudGTJnOOR9Xy/R54ny76JWYifgy0QuQSC1GKejirWGEM2Ex3DNk1U vYeSaFUpzBdSj5lLwXJG8wHY+mtMGRn0mNwmh2KWtsQIvUsvtOqcqGffmNvdHeA7jLumQp A+WdDrxLBrO/ts0aRtPY0HTKNRSB4g3aM1wzvRtn6ZjibAqyLSPB1eXg7KFXROD1C2jDFc smQxYdbG38ptDUzkNybesb/+U07MY7GWsThwXFhdkarE/23w0nzvfxIioXiQlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954015; a=rsa-sha256; cv=none; b=GdrGRHPnbJ5rCfYxRyoD5a68h8+pCrRLE0Go0zQtv8w62T5ESLt1lt3yapVgF6CASM9W6F DT5exa6VUNI01cHbeXik8jkfG/zhuZ6wFk9c/gYupHsb5NpNXtt/V+5yObjMn1dhwHysVi Y/4CngCKytUPxUS/B1Yx6FFsAP7Evk8DfvNJRHdI6F5yJLPvndm7dkd2Cb0DT7pGHyuR6M a3yrqTmofbvr1kupp4aYlSMciJi968PZrvNFqQTE99lkyEkYz1n35FcbnPVgsBgbTs/gKO vMhMqLl0US4BcydgLCyhyTo1DpCZ3CIN1QoT6WvBBI70THL8JqJedY3+wXHe4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UwxEHBCi7d5BItLEO/fEnS7H6njQok7pfHlqaPsOqlg=; b=tSSDNY5vav1PikYYQmXXgxupntAPwyLOpLL+MHUxTGWc8rTYQ8I+wbHVfSiAydkwtipWU7 Sd4f+yt0CvkjEDp9zRzQK1PGxS4JTVDhrdxH3qTbGcbd5xaT9p96OpfrtOfF9qLoEfXJeD soFdkt+RTyy+VmgC7mX8+QzcdwkOCbJ+VBcFxGsJLJ3rEuTlJZCAZ22qxl6i+OBJoND9eF gHzzImBLXonZ0TwfU4p+eKAqWAZU56BUofC/lLJ6UpQZ5A99qzBElrbvrmgWe7EQAKjsnN uR5z7AewFchQ9pzBiVCc0Czl6r76VSSXhUHq1BKnjV5LzcHK68u3VIatjNotXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk75k0Tz1B84; Wed, 24 Apr 2024 10:20: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 43OAKF6w057017; Wed, 24 Apr 2024 10:20:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKFOs057012; Wed, 24 Apr 2024 10:20:15 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:15 GMT Message-Id: <202404241020.43OAKFOs057012@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: 956a99badeaf - stable/14 - geom(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 956a99badeaf1eadbb9eb83d11fd07b7cb7ee771 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=956a99badeaf1eadbb9eb83d11fd07b7cb7ee771 commit 956a99badeaf1eadbb9eb83d11fd07b7cb7ee771 Author: Gordon Bergling AuthorDate: 2024-04-21 07:49:44 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:19:28 +0000 geom(4): Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f) --- sys/geom/geom_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 6aa7ded19537..3fef8a918530 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -475,7 +475,7 @@ g_wither_geom_close(struct g_geom *gp, int error) } /* - * This function is called (repeatedly) until we cant wash away more + * This function is called (repeatedly) until we can't wash away more * withered bits at present. */ void From nobody Wed Apr 24 10:20: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 4VPZk90sChz5H2ps; Wed, 24 Apr 2024 10:20: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 4VPZk86hshz42LG; Wed, 24 Apr 2024 10:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Afkxc7MqFyydk6boyM0fh7gkZhJqDZ/MtRly8W57Tc=; b=TKMdSx+l8p9/TsePcggCWebNzfmyCz5LWjb/H9NNSytqaljTXqGZaHzhkqGLXg6wkRiRS6 g0xvMM5FinW7ajs4BmF0gV8EooumGRI1RrvSWwHMxeNvUCoVTV+CdsmLJdjlNI45kXrZns ZPxICGRoc1vvphx9rdxcSRcpsnzidQAc3g8UDKRVx9pTTn60QLGB4Jq0k21ITy6QQAVobf BrnU/1Y6amFklRrK/5TDtSZ3UJZsxS9K/CJG8PsAS0OW58cGZSeVy8JvRhBneLliup/LOw +fMiUNPLPdxMCHGQILxuFMgHJ45JPKpAYGuYc3wg8ZhZOHCrBjk3pGCyzVieSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954016; a=rsa-sha256; cv=none; b=vH7S97DXvYZQvm3Nz+j0Ksvah2+bRiYpvS6f36UIGvXWp9Do+ekWmqsgvoZ5mnEkJ+y5m4 WPTsgcMf20/0q1OKK4czyDxnRLfOcUbV9B09TSP04yRix/sBdSw1EKmNVEHeEQxAfWFLxh czgO/V4TargTbVKCjocrAflpVftvtgOgNGPGK4XyBk+NPW65/CsMzRpWak13ELd4dEEaak 8lZ8DLx9gGxoGksiq16HRqx/jO21stc6jnURuDG0daL6c9gpERSMbNn/70E7jal3hN2YJ8 KV+Az72drFQnXhogCdDbVDz5Vh3pXZ25spPtBtZdtyzrN2ksZC1KxS52osE9Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Afkxc7MqFyydk6boyM0fh7gkZhJqDZ/MtRly8W57Tc=; b=gOBEvfeqduftrEeSkOh8h6HAcUtHjs4rLpkfAQYH0a+kGIz4+FvuxD1WUWxnjcG7M3T1R2 4RM1dI2/SiFXNqN9krzkF3EWjH7K1bmf90st2ht58S/xj0mUvfVbrvv8J9fe9ohzw1KvR+ np/zNaC1awrpa3NyhOZJukgWzsTGrsmv7DS/QSHNaTlJ95O6B9xXJUe8MEF6lcl3+bh25s k/CS39J4ryhBpvii7STCfYJhQPvUotNK1BO6Hm0EhkoLw5AXVz6b29aM+Spu11hh8dhSBa Csizt0HN+kGUGwigrr1o8tYsfjlB8cx+Q9HF58d5ReUNzrWu8IZKT0vCHj0gDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk86Jgtz1B9D; Wed, 24 Apr 2024 10:20: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 43OAKGx7057679; Wed, 24 Apr 2024 10:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKGI9057674; Wed, 24 Apr 2024 10:20:16 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:16 GMT Message-Id: <202404241020.43OAKGI9057674@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: 87cf19849942 - stable/14 - freescale: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 87cf198499422281ab57b070b1d8caf0d688209f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=87cf198499422281ab57b070b1d8caf0d688209f commit 87cf198499422281ab57b070b1d8caf0d688209f Author: Gordon Bergling AuthorDate: 2024-04-21 07:52:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:19:44 +0000 freescale: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd) --- sys/arm/freescale/vybrid/vf_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 5f4733533414..5336dfc6dd57 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -462,7 +462,7 @@ find_edma_controller(struct sc_info *sc) sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group, edma_src_transmit); if (sc->edma_chnum < 0) { - /* cant setup eDMA */ + /* can't setup eDMA */ return (ENXIO); } From nobody Wed Apr 24 10:20: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 4VPZkB1GN1z5H2ll; Wed, 24 Apr 2024 10:20: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 4VPZkB0CQhz42FX; Wed, 24 Apr 2024 10:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttlgpHb9XbY8+inPebH+QEXyr6Gc5RLCk7PUiZbi9vE=; b=iDASTAgmmf1mFaxRQu5m1khoaMIkGokuBn8K0b9XAz+wn39AsJVM7nFOLL3PL0TJ80VciN wng5RVnIiHnDW5eadXN6fowceU/zFGJ5uq/KzuHLTKtpcnC+5JUSdTpqHlNGgRppiMXOuS swyB9lRHJyPkFdrR2n4/dREaRSmlHiIM5+SYia1uZZYObxeIO+Ovf0GN/16Paq0ikk1El2 2TY2usdxoYRm8SqHrBEGa62DQro3TCjtalvDB3FiVUtZPWha488P6KtPW/0OGuz3Sn9KX9 HcVWOGuA5q8UPieO+AkorFsoVBLBij9wMhRiYLiMBLxxMMqcrBD+u/DbxnTvMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954018; a=rsa-sha256; cv=none; b=cXF8tOK7AdmBMlPKTvRZRwVAjBWNL7xTIYrlIU01kSc/vaQbVcCfROKeUTHLeFqKnoA9PO CURSdfY1EWY90Owh7XM9NFFPkzkulByjX0/UULXH81dFEx9rfPa7RF/Ug5L6RYxX4PRyZb DPG5sNjVWVpwBP50PVMZjq4vE1p2E3+MQxGPx6+Y8FecqMILn+4XOqi3BMOW8VM9kBHWEn Jm0CzdjNMOKt+p8NBd+7t2BT7BE0zSS0BV3cqrbqFTIlQZPRtgkfUlGquCDbX/rzTpjJ6V MYc/Ja62GefPGTP4ZkuQiLqtQTk9oLjphJg7FcD88V7SGVD/q1/9bTYQfDShlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttlgpHb9XbY8+inPebH+QEXyr6Gc5RLCk7PUiZbi9vE=; b=B9o9H61lERq/6gYH9LcsGO61tadzZKn71uWFjtD24ewJU7uKoPI349TaA6xQ2jg6X9Y23e W7swrjI2tgP299z5VkWFVMv+njeQFPSnivRCJ8Ww3zw8W0ZY3TOlgHcafnQ9rJqQ9nRckk Axyj3KxUt5KuUHM82/2mL1ODWVOX+hSpxEGjl881XkfrarGntYFWpo6M6hlvBOMTFjl6K8 pg6aBcjwu/xoa97jI2xM8YqAhpxD8mi7sE4SK3wpeOH7jQSBxLmPw5dUI6m1H1ozfkI28E b7GSxQp02KDGVDxTYmq0iOtGqxMKGLl9T+925cVOrIrz738Nmf/Qhq4RH7K2pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZk96v55z1B85; Wed, 24 Apr 2024 10:20: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 43OAKHv8058276; Wed, 24 Apr 2024 10:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAKHtX058268; Wed, 24 Apr 2024 10:20:17 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:20:17 GMT Message-Id: <202404241020.43OAKHtX058268@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: a6ee6b6fc021 - stable/14 - arm: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a6ee6b6fc02115fbbfc679326060cd1531e624f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ee6b6fc02115fbbfc679326060cd1531e624f1 commit a6ee6b6fc02115fbbfc679326060cd1531e624f1 Author: Gordon Bergling AuthorDate: 2024-04-19 06:54:39 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:20:03 +0000 arm: Fix a typo in a KASSERT message - s/resoure/resource/ (cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0) --- sys/arm/arm/gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index cb1419c42569..7fbf7e7fd827 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -444,7 +444,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource_list *rl; int j; - KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type)); + KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type)); sc = device_get_softc(bus); From nobody Wed Apr 24 10:21: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 4VPZlZ6nsMz5H2qv; Wed, 24 Apr 2024 10:21: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 4VPZlZ6J4dz43fM; Wed, 24 Apr 2024 10:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztZjElHR1VdhCtXB+jkpXx8Pb/929tcM0HrBRaL3Aqc=; b=v01MHomzzDLpqd5SQQhIUQybWJbnnK+U5n66+9ohjW17tkl2NlBeLP61Popzba+3J0PApQ qBrrlD2DSHCtzuWq2qbhVWA78CunkyKqOJojgtDL4oKe1f1q/YO1N+/kKR8JjkZn1fqM2M SSGmCPwOZRy4DU6MqsGH8PU8ggdWK8ZJktMMsmWQr23KgGWf4igZJTi6atwWFKJqnOc+bE DIa3x1xXDVGOLbd6vIAiEnQIF1u1r6SvSrd3Rl43V/J6TChzCFi8pEeKLBk0dC33uNUGMD gvftyke5qXoeJU53bGgyUKejuMcrfhp6jDc9RSHsLEMV4z1nQNwDUUrHoTJr4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954090; a=rsa-sha256; cv=none; b=S3+5HloYXQB6AoviCZ4ve7YXyndkvXQQMZxaCRMezRTAPLcf+ytV7AcK6D0N6kRpsZL1Yr x+Js0CsfS5VntBSwfaxqkx7yta+3T+eFSH8eKt/iR3zB9qj6FoItc05otg/5d5e5K4QskR cL6hClBQegirCXQsyJLRMg87km/GFkEF1ExFbG9ZyE5v9bVFOYZannVkw8KYGJgsbPrBej P+UjTQvsjwIA/NqePo4R/SocTQL7u6pzag8nnWbueDoKRuYAZl8eG5AMi5FQQ0UmDYTWyh 6YlgexipbTMxmIwU+OXIqlM0uZmhwQ8bKfDPzAFA+NJ3AMEKNE9xXBaCPr0QZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztZjElHR1VdhCtXB+jkpXx8Pb/929tcM0HrBRaL3Aqc=; b=kxNZXFzaRZBD9Weqh+h6JIy2uTBiZhV+yhCvEI0lqznFmT7LLaj6YPw58kPtT3RtGEhFxq uQtzW3q4cKR7U9BHb5u9/mU9cIlVxPJKOiKWnaJW36RvzsA4kyYZjYyOc84lBjtidZgzJD u7/8yf2nNa0pYmATnQ3lv4DVs+rxVLpAv0oXYAmRJvFgVbFUxcowg417a8Qi4r2SAF6Krm g/r2B/WDI4atdgSLYvdeNly26OhpxlfmX1anKU//iAONYLWRsj9ic3gCqMZQi4nvH+aXsu fluOT4bvcMsY/JKNdXdqJgKwdlrmibDJqIHEJOG4YOFC390VVj0PNB467lbk2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZlZ5vbSz1BKx; Wed, 24 Apr 2024 10:21: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 43OALUZE063311; Wed, 24 Apr 2024 10:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALUmm063309; Wed, 24 Apr 2024 10:21:30 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:30 GMT Message-Id: <202404241021.43OALUmm063309@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: 64dfe0a94bfd - stable/13 - uipc_domain: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 64dfe0a94bfda5fb858d0e5642e3f82e8dc22dd7 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=64dfe0a94bfda5fb858d0e5642e3f82e8dc22dd7 commit 64dfe0a94bfda5fb858d0e5642e3f82e8dc22dd7 Author: Gordon Bergling AuthorDate: 2024-04-21 07:51:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:20:45 +0000 uipc_domain: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181) --- sys/kern/uipc_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 89cdead26bc5..57bf3ac9771c 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -171,7 +171,7 @@ protosw_init(struct protosw *pr) /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you can't unload it again because a socket may be using it. * XXX can't fail at this time. */ void From nobody Wed Apr 24 10:21: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 4VPZlc1WDpz5H2ks; Wed, 24 Apr 2024 10:21: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 4VPZlc0CW6z43Np; Wed, 24 Apr 2024 10:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qM9GVsKzzpKVVOgCmrJOPTXcUAjeNQK6RW0G7WFZFGM=; b=gJMUT5Co3b4SoFB7GhtIWoRZ4QTUfjKjS+jWos3wWMlvUefWMoNXl+T2c+xvEjsjehyAhS 2y0vrmMHdfF0nPj9DEGaEkHwZqhZZ9q4Aseq82lGs3pa1YeS/BgLGB4nh0eqgKmFTTLlyT RLCZL/JMY5ds0n5UcxyChbPNa8RtROzhdEsPrff+4whgjurQjB2KdHxWk1WsNobd/G99HF 5NR9JRYvOzVOhmYP97feseMHwifxRlSFTtoMV6OmhBz8SSOQnsaW2t7SMCet/a/MuCPUzE zjuaN8c8fj5XQ+lLwj7ZclytNHvy+dyZaOV6B4wbRP/6oqa848d2Ye23ko0qFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954092; a=rsa-sha256; cv=none; b=A1y98sGeouOMpre9ygKj5Rpz0qFoidANINnj4QxP3jHen3j0bEibgRPI1ZS/NmFrQE3dqR M057iRioFp5B0M0+mK5iLckQObMfykxnHJNrZ9D3x5WurSI20yJUvMl6hW6PlJC609ecLw ZaPg7+7ORNXuE6aP1bSQZNR9ZVDXbEOq2fGYO/OxKxBXr84/mXlyYfw9rFD8LIk7TCOkqi XuqCFyI/bU2LnNyJXrAZklO7QOEOG4etWgARrTUeSYKLG/cxShipYAtfgB/nv/gl/gnvCt LB7XZyIx8vi+EnvruA5kCJxZkjb/U5/JwymalE2mYm4Ob3cn94ftC+RX8DBbOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qM9GVsKzzpKVVOgCmrJOPTXcUAjeNQK6RW0G7WFZFGM=; b=Po7D5tqfhV4E/9gbFSGS7Lpn18Ifey5edwK1q6ZUVnL2yO5Cna4VKlp224sjF9MQxuvYt6 sHW/hb5gF5d9l3ecNmQBg2xR5VG/M6TATKH+VT7TgQi6jwniWVyCvbgtrKMMIuWEwuqM4F Pont1j/1Jm5pmaTwBg4GAt5jmOjepjuwHcNIhHIJsX4TjN+/3U0O8LOR1xSf9bTQYJaXPQ kT9m3kkxRjJly1zhYDMCso8U0ju6Aoj3V9eHjNjzmO2WdoAB4tZHG+dfzKs87a+WmI4hxn QXQLlcstu012tbnbZGCmV5El9bOPRWtbtDBPqHCve7GAFofKQEv1OuKHuSjroA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZlb6xNSz1B9c; Wed, 24 Apr 2024 10:21: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 43OALV6Y063365; Wed, 24 Apr 2024 10:21:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALVaN063362; Wed, 24 Apr 2024 10:21:31 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:31 GMT Message-Id: <202404241021.43OALVaN063362@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: 67e24ed0fc4d - stable/13 - geom(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 67e24ed0fc4d0119c0ec140f18ffb35f6302efc7 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=67e24ed0fc4d0119c0ec140f18ffb35f6302efc7 commit 67e24ed0fc4d0119c0ec140f18ffb35f6302efc7 Author: Gordon Bergling AuthorDate: 2024-04-21 07:49:44 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:20:58 +0000 geom(4): Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f) --- sys/geom/geom_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 6360cb67b4f1..290c0ea66623 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -476,7 +476,7 @@ g_wither_geom_close(struct g_geom *gp, int error) } /* - * This function is called (repeatedly) until we cant wash away more + * This function is called (repeatedly) until we can't wash away more * withered bits at present. */ void From nobody Wed Apr 24 10:21: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 4VPZld2MjMz5H2xx; Wed, 24 Apr 2024 10:21: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 4VPZld0Vs1z43c8; Wed, 24 Apr 2024 10:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/wRPf+jAqseNWLw5BMGYJfpV7MfhV9YgnCLdhb2/EM=; b=uS4TSjAdhu58bxGy5LCqkHVAZQ/LSIgdCsGmgM7dCDSvWLx8HQLhSJLxHPfrw79dNpchKA DS4EvrlCAb3YL7IoqJs2CztvwULeQupgefPH19pWWJaXNFfFR3KJVmhd4ooVaFEU2EaOaO GAUAseuiOiVTX3nY/BZ0eaxmgR7rvcFSNwGLdQHq5MIrCf4/eo+xVCicwkT8G1JhXy6KiG LDUBTlymlqMJt0tyZpQHjd5FfWsh6Hho6dG8+OvoiVv1sZPB7SjRsO7Sz+TI7N5KvPjR+g ZBCstBtMAQHN4q4YIQZM768v924CCH2u4AxIJ/mlo4gCS3iejDajvox7q0CbfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954093; a=rsa-sha256; cv=none; b=P/jeHUhQx2I3fkBmwRYL0TBL+u8RUs8L9DNNELdXshSa3vmZZDG7QjwsVtgQapiw5k/08A doxNn/gPhX6BuCR92TgGVGLOr5MWiZLvlO9Fsy4Ui9tNJicvlnGTEU5SjCaA0PCtJpIxBb lnRL4SihTxiSbTgoMZYGfstJhtNwnDdHQE1gkXSmYI4ACbzBSlMtXnvzDNcBe8YxNNtQ39 R5YdQhf/xIbavKA3yEwKHVNe8QALslW884D0wpr/zUH2GjLZ6BiXQlT/kMVC7auTNuXnCC i3myqz0M1t3YH0eaAN4AQ8s1/303HlIUhLt36N0h56jXdunMKPgZSff/ChrkLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/wRPf+jAqseNWLw5BMGYJfpV7MfhV9YgnCLdhb2/EM=; b=Q4IRCV58rVZ1g/W34AbtDp67YcI9IKtyA2S11g+gN5EbSd2TQuHrV+wqHz4BV2cc37MGct U4oabOuRsYeiJdEtRRUedLTzVD9NVRfmgA1STtVetePZz5kGxREHIkjMlqGxS8Pua91c5t kZLXJoMcfGZ6E1SjRWQD49IphPVeZDqMaSJPkRLXv7LCUq2upsmXQzaQX2z2JrQjaOAIpX DGFK489EIitQTRVms1bMfZx5QQRKeo55uP8J5/jr5ohUE3nDepNfgOuRC43HHGAaeThD55 Pcf4m/vTiB2frGfcObNDWxWo+07xEeXLot4CRGf/ejowS/eCBA1D+JKRBcwCdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZld079mz1B9d; Wed, 24 Apr 2024 10:21: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 43OALW0S064366; Wed, 24 Apr 2024 10:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALWXu064339; Wed, 24 Apr 2024 10:21:32 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:32 GMT Message-Id: <202404241021.43OALWXu064339@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: c64f93bf5aef - stable/13 - freescale: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c64f93bf5aef543524234285038111455c84cf77 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c64f93bf5aef543524234285038111455c84cf77 commit c64f93bf5aef543524234285038111455c84cf77 Author: Gordon Bergling AuthorDate: 2024-04-21 07:52:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:09 +0000 freescale: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd) --- sys/arm/freescale/vybrid/vf_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 666fd1b87159..0ff76b6a8d6c 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -462,7 +462,7 @@ find_edma_controller(struct sc_info *sc) sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group, edma_src_transmit); if (sc->edma_chnum < 0) { - /* cant setup eDMA */ + /* can't setup eDMA */ return (ENXIO); } From nobody Wed Apr 24 10:21:34 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 4VPZlf4y0Tz5H2ky; Wed, 24 Apr 2024 10:21: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 4VPZlf1xMwz43hs; Wed, 24 Apr 2024 10:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dWObu+b64HZVzDeT+y07rxo5odCHoCSiqRb7QJuaUeQ=; b=I4PV0eInCDhKaT9iayf5/LDgexi3+7g5BDAOuKLZzAJPBzc91V00XTjniaXt2dbh4QQBfk gpLP2XQJlemOiw3tt84KtDiH+W8Csc5jMoeLZvD2r9dz+A5LRezN3sqKs9dbMaZcND6Thp 0dGxuvhlsgX4Q5ic7+XOueA2HqrEgIwwAIdL1LcyZCZpVAhTmevcdf9Tdty0ewRj4PI+yv A4Dh2JhFG6TLGapvjOzhooqeoPkARjLDsE6PhhJAbZNWAvK74wspJklv5m/HUCVE+xAq8X AQ/vgy3teTX0sfh8rQ45qxsWkBb98F1qdgIFDUXH3J5pa1y87igBmTv0WpzjLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954094; a=rsa-sha256; cv=none; b=iShBrzzfkHFQzkUEpOR7YyRMYKvEiBPaEw9/OjMfleIVN+tVLWonNWSYdW/GkhgdJm+Ryg mg952F2mNUuiebWzjm5kI6ROAXbiX26gFpb/xPzG2pIyMdpAF/1f3z9saBtDGjRIh5p73E mQU/1v73YnWssvIJnK+5kLXp6FpMSsWR5kGXQ252fPFWLyufvQVl0FIoNIg3LHH/SsI4Vf 5ov0vWCTBIDAKEtQCaClqKwpCSKbEPzeBBw/3PUhlS251hN7TcFtVMM0tWQwSwYd+D82+q 85R22YqTUHl8KZK0jYUy77s5aYsQzRX8UOJ5R/vC8xKA0IzN+nc3oVFfatHQGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dWObu+b64HZVzDeT+y07rxo5odCHoCSiqRb7QJuaUeQ=; b=ax2SeMOQ4ntgKmnx4i0Cpqcv3GA7qLGGVJih5NJx3qh8vYqIlQALMR6FoH8WJJAn8NCyho 1ezCQqDfL+++jyrM0P/6L7jHrDroNLMvOKUc3Yu2I3l+UK6dWaVwGMnri5A5eb/isLHcrP WCBKF+jUp6H4mXiCEAcS0hSv9wj2Z6H7jf5IdowPAXxuIr2Sx5F1pf6CC4sk7SFznSAWhL YAsQ8SQZ51Pi9si238vtdgcwoztnpmA4eumNU4vitPM+lWgTk3ZWpZdwGzLZsEpQqm/IsX +2JG+YwpdFcvhfGZKRvJcTw4y6lR+xyxg0xn4e+mhDB06Ym4EaVo/18GgS6JMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZlf1VPdz19SQ; Wed, 24 Apr 2024 10:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OALYxh064506; Wed, 24 Apr 2024 10:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OALYGD064503; Wed, 24 Apr 2024 10:21:34 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:21:34 GMT Message-Id: <202404241021.43OALYGD064503@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: e03c9c311e89 - stable/13 - arm: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e03c9c311e892d5f9992f6ba74929a4a0866a325 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e03c9c311e892d5f9992f6ba74929a4a0866a325 commit e03c9c311e892d5f9992f6ba74929a4a0866a325 Author: Gordon Bergling AuthorDate: 2024-04-19 06:54:39 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:20 +0000 arm: Fix a typo in a KASSERT message - s/resoure/resource/ (cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0) --- sys/arm/arm/gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index e9114c5b0fe6..2f13707c46b8 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -435,7 +435,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource_list *rl; int j; - KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type)); + KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type)); sc = device_get_softc(bus); From nobody Wed Apr 24 10:22: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 4VPZmq4TbDz5H3Tw; Wed, 24 Apr 2024 10:22: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 4VPZmq41jzz44RV; Wed, 24 Apr 2024 10:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIcFivMJ9x/WDoDU96t1JJMRQUdqaYpKuf1MRWERuNU=; b=fiZSiBi2QM+PHG6YjCQIc+Kh1DNiuBTkYTrrMXwvgFtja1ef3RUWz2cMt6kGuB4aEgV29X foI7QkW8QVh9vn8yU3bOZTojzqxUHQxAIhOlAH2rsnFndFzpeIepT4s+tEXwqEVuQiItb7 M/30eyKqhpHYOF6GBoyo0fQhe8hnyDvfzePH375aj8yyHC5AoTnVhrYuwM0UYv0WsLSZ1r X/5mD6vr5rKaoEfSzIi3bFLNQ8iaAm3QJwvIn3Oi1cAD+rVrz/pb1eTdOPc5KeajYXWM56 s83+zddJkTI0nHIuYXCTqcnJnVPj+ev9v2Db6QnYzviGpoDw8eUZ/DfOSuL9vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954155; a=rsa-sha256; cv=none; b=Ba1LL3rmSz/TA/2UQd8JIiIqpY7494E0kGzGtOzBah9vf3VmfjyfQMU1KQK3ygcIvepGNs 1IY7X71AFWH1chlizTk4HRPwyBKEWSg7vrLsIsF8BcvpuBRrLDxeJ4BwiWWOs9++b+ofCZ /uO7ElncdtBWPd6N8hfwoTf7LIGMNVfCG/dcgKs4PjJJinigcB5o/IwwOMzrjwQYyVeBx3 x1Q+Wy2P0B2ug6hukl3R2qtwknFF9/X9A1PlPeS39oPyse6/dczpUalbJjweKBNEtWgQav TFKILHdrvGZdW3FN6cpLilcMSKfVo+/vX/Lq40uDM5j4LheouBD6sj1/1Zg+lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIcFivMJ9x/WDoDU96t1JJMRQUdqaYpKuf1MRWERuNU=; b=UK2orYtStlzHYpUmJHqAdFY120Dqm6axzPH1vMcVTk4m8sYr5+AOppujsirgF9MAdFecJC KEI3L+EfsppbLx4pPueqnzbLy90S1LBLlHmXouf++FDpmqR8F6121Tj246kuRukCTL8Xyj pavYKe6vX2wfhendlYW5i8CjHt5t23kYhQdSY7bfn3sE5ycDZxn0++h5xPx1hfDg16uxmi w4Q+qcHqxIY8MUGyDt6li5chRWEqAvMNFYBGZluvzKeF5bvjzyH2oVCR6L4ME8KkHDct/k 9H8Cz7Cbh8L0IF2AG2OWh1t2/2vwLrh2DexQwK5sk3bDPCE/9YPa8PRNGuZeOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZmq3YVdz1BQ0; Wed, 24 Apr 2024 10:22: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 43OAMZEC065745; Wed, 24 Apr 2024 10:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMZKg065742; Wed, 24 Apr 2024 10:22:35 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:35 GMT Message-Id: <202404241022.43OAMZKg065742@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: 656ec7b96663 - stable/12 - uipc_domain: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 656ec7b966632fa7560bc27eda32e245dd4d307c Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=656ec7b966632fa7560bc27eda32e245dd4d307c commit 656ec7b966632fa7560bc27eda32e245dd4d307c Author: Gordon Bergling AuthorDate: 2024-04-21 07:51:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:47 +0000 uipc_domain: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181) --- sys/kern/uipc_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index ca7995bee39d..5297d9b303b0 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -163,7 +163,7 @@ protosw_init(struct protosw *pr) /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you can't unload it again because a socket may be using it. * XXX can't fail at this time. */ void From nobody Wed Apr 24 10:22: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 4VPZmr6L0tz5H3Ny; Wed, 24 Apr 2024 10:22: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 4VPZmr4x9hz44t6; Wed, 24 Apr 2024 10:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbEb5VBYzEDRlUHi5qmjApGcYDppcbelYLb6c6TklwE=; b=GbGeUJ2kJJSIXNkUMT3Kyd+0AWpJZEIkC1SSrngaKL5ey9sjmwmEFkd6O5kBM8ykoC/FrR Uh5tm+9b1LOz4P3hL/Izmn20C3HxRbcZUai7WOKEEg+i5Lee/IV/sWhN2KSeXSXa+42PAX xPBDyYZaNr1Lo4YNwzS4LQ5coGB2P3N8qqbFxK+phfDD96XE9n4Usb0HBjSiO387LxH792 SHz3xo68o6YQWHj3I1Y929tJZhEidD4rmpTbRxG5iVKNJUaRrtUVTxub3ImZCpqr0ruxpF 5YdH+UycvfHmN5YDisTinrMdSWZtdWQU3rv74LRbwLsone6xgUwW+B5pYnhIKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954156; a=rsa-sha256; cv=none; b=OmObSLM1eDU/a83+Ui+yt6CQNEKlcDcHT4OmrXhpEdUygMb6JJexyx0ZuKoo+s4iLIZCEF 9xp+ssI26Bnp2w5XoVlNofVaAjDIe/1n0hH93kuJ3oEm56HOHMIFInmWMXYUmO2X/troHH tBwwcY3KggJ2g9J+msMiLd7gjeB1///oW4TwcJPNY5lWSqA9fo1PV/mGD7TbZKMLgZBkfD o0nO0s2acoAV2VVYjYEG9NFWCtT910/+Ajp1K6J3TNiiXF6KEl4Zt8i/I7g/NsVNi94f3a GFarMGINWcefZEuxOPUIbIkouVFGhcpZTZYAME5D3rUPmk19+wIERlF+2VObjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbEb5VBYzEDRlUHi5qmjApGcYDppcbelYLb6c6TklwE=; b=JXx9iInop6uy32MrHc3X1lfFdrt095MEJZ2/C1D5arHHDEHJKtJjPcWmWmgj2eAbxWmcvm 2PSu+rknNwKTdHyvJUgwNzfOSmKR4C+2O3V+um6UCg44XmFngfVUiNKGZeizzJavr3i/uw GW4lKaR+emj01oE4KlET2jEViXi1UITRpLtE4zknTGF/t7ygHZdjg/stDWiUe7OG2r7xTC pUdd4m2Zso7jmnvkk38DC1tJZrqRRmT35od+gc8bP7Ev4HZoL5OMyQShMG25fASWV+w9SY FffLrK6j2fqpcouhOiUTCjjNbeZZH6Vj8ysCtFYJF/t/RkHiUWgJqEBmJ9d4Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZmr4XRbz19tn; Wed, 24 Apr 2024 10:22: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 43OAMaVt065803; Wed, 24 Apr 2024 10:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMa1P065800; Wed, 24 Apr 2024 10:22:36 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:36 GMT Message-Id: <202404241022.43OAMa1P065800@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: 87f5c26218a6 - stable/12 - geom(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 87f5c26218a6665246ea489910861c3fa34f1a5b Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=87f5c26218a6665246ea489910861c3fa34f1a5b commit 87f5c26218a6665246ea489910861c3fa34f1a5b Author: Gordon Bergling AuthorDate: 2024-04-21 07:49:44 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:21:59 +0000 geom(4): Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f) --- sys/geom/geom_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 397d24ba8e13..4867beb63e6f 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -443,7 +443,7 @@ g_wither_geom_close(struct g_geom *gp, int error) } /* - * This function is called (repeatedly) until we cant wash away more + * This function is called (repeatedly) until we can't wash away more * withered bits at present. */ void From nobody Wed Apr 24 10:22: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 4VPZmt273hz5H345; Wed, 24 Apr 2024 10:22: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 4VPZms61Ysz44dF; Wed, 24 Apr 2024 10:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv1EnRXyX/B/AvIOI0yLSvA77SBiQHtpvDeT/pbVxk0=; b=Si/usGAbhlAQoIozLd3DVlmiVewgJdh4MOuw+yiLUmacx8w84a8OQUcCcoBd3Z8SL15Ab+ IFY1xWzLwMnk79iuHHbIozYOCrlh1WreCet8DQfqN5kpm8jWrnFOr3nKqR4fgvcSX8GEKG KuEVEa1uxXjTWf2cVYjAeWIcNsxMoa8FEQ9wiYpoVJx68R19494Y45/TkMfuPwcg9yzavP ntq8wLbKXOcu41p32PvhoaMkOgzJ2nkm5kzgLChXSbOd1Q6IaHZ+M94JX4pjD7emXUmhyt Pm1jteQx6NhexUygPZW9yw6ZqQS3xTutPekoR0LkDJ1CuzzxdECGPFYqSJukxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954157; a=rsa-sha256; cv=none; b=esrPtB+NCtJApb4k4dyPI5XCrWvXAIts87+ji4SnPRM91YT7Rf3V5PJd37Kn/WNZ5Haenh nXPA4BZubpiHx20guE0FJEGT4Hwsxv+FzJIaCFKoU3ioK8jupK3lr7V7ckemGoUq+CNPDf Z60/+dXhxm+9T2utnxHdbJyqOjT05dipbUXO3yWLLEN+Tm/Fqgu+vAk3m8WX4fkJnUaN+J gyLHJ7h2VjnLmysGJD4wq0d7KSPOs1MIEdsR1cJtgRroRN5uj7L4/HsiiMd07cnUKCxIdg VfUtYbUEmYLoznHES+d/IW6gkdTozoOACF8OSBdUEO2LoZme/v8hn0gsSUAxxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pv1EnRXyX/B/AvIOI0yLSvA77SBiQHtpvDeT/pbVxk0=; b=wLJhrC+mbJztplKiM+7oAY0Ii8l+OlDQrdjdZYYwjeyARiWtin6eDefxqtsTO2qFNIvTH8 vo5wf3+8BXN+LWR0Usr/xRvSt68Wvw2uXmlFwooLugrl1tBLf0pMtlFrHW0F9SvwtH/WIm MmzNXvSioRap8nI2hMwu3l/B62gX09zarXWKW13Lz+kqye91uXIGe6zShrkMrNWxdv8IGa JOVfFt2Aanvdk+ZpfagHfkieG8EUjIJ9O3+CimG/5LTUuKJ8g1YHnanNYXNYUK2zDBBXZL Ez+qqFT8rl7qL7sS2O825tA/vHXckQbYkfA20ITU5Arf4vPcgolkZ7rBDLrugg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZms5bfmz1B9s; Wed, 24 Apr 2024 10:22: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 43OAMb1c065868; Wed, 24 Apr 2024 10:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMbDG065865; Wed, 24 Apr 2024 10:22:37 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:37 GMT Message-Id: <202404241022.43OAMbDG065865@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: d94c2398888b - stable/12 - freescale: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d94c2398888bfa9660f61ab253bf6f2a26d0ee25 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d94c2398888bfa9660f61ab253bf6f2a26d0ee25 commit d94c2398888bfa9660f61ab253bf6f2a26d0ee25 Author: Gordon Bergling AuthorDate: 2024-04-21 07:52:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:22:12 +0000 freescale: Fix a typo in a source code comment - s/cant/can't/ (cherry picked from commit 26f6c148bce2d6734a07ea621616724f1e76e4fd) --- sys/arm/freescale/vybrid/vf_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 84dcf991419b..5c8fc48c5423 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -464,7 +464,7 @@ find_edma_controller(struct sc_info *sc) sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group, edma_src_transmit); if (sc->edma_chnum < 0) { - /* cant setup eDMA */ + /* can't setup eDMA */ return (ENXIO); } From nobody Wed Apr 24 10:22: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 4VPZmw3l87z5H3Rh; Wed, 24 Apr 2024 10:22: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 4VPZmv66Gcz44gL; Wed, 24 Apr 2024 10:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaVhP/4nrrFtpmntWodgVS5EKxIFKS5jaZZ2gcIpNJQ=; b=IY+s611O2VTsBdiz6yD3Z+CLdEBSR5uGwM0LKcyCtHl6KfYY9muvyHNd2rW0D55qhqqF6d en5UU7U5fcljPd5wR7pLFXXGfewaVQhvMt4dGrQq+VyK1xLI5QjKv/mSVtZs3b/RjplAMC whpiyNYdNX5Hfr0vRsFhQdrqEVsqpxVrr/W9hkUMvF4Puf/odXZ3xgWll74HoYVtjrKY68 shcJio4ZlB+X4n3Nld3Pl4ivuhVK3Q+J+emSL3awSE33mWp+gOkTjuW8sJQ8yExJVoiK/h qQNEU1+CyIHBEAoP+6WoTNCobSzBKoRVJMIcZ2OCyN0Xq33+koYDeM4PV1TLQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713954159; a=rsa-sha256; cv=none; b=uzAzo7G6gwSwSP0HHMyVRLSwHGeX3XXnXtG0PwJZWXJ3eG8hyfFjjcwtCXw7zKWNvEncIc mpmOqL7/cPZg8SOuvi7p3AvAIzK1Ijmzqbx76YAO/Qg9lPTJb/JALwv5DdjNU3PoO/c4rp Uy8AD8h0r8xasms9+8+IuR+1LaAVOVH1YthobOYE6MyvupNhEmv2xb8HbXceLkcHfHtB8e dfBf2OWfPhHEzQujan9bSJOB1G7yEZ1J0uBeCBhv4M8GZBqX/efLoKkTNSy9id8uv6Uhhh eIXvfbOaoswCVxGMBlezAPzpH553/epJkGzuyAuozXNinmjXRjlWyb1KAjKx+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713954159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JaVhP/4nrrFtpmntWodgVS5EKxIFKS5jaZZ2gcIpNJQ=; b=w5ebTCpzPOK5CBV3dmzmu4JHekSVnLzgeOUQDBV9AWdhrx+JPwbiiXgdblTZ9NAlSHlAM3 k5D26PH4z4wsY+8cnzqhqO4xXu8En9yXlhs2Bhv9Qzv9yk6rVgsp9/0Z9RBTdUQJs0n8GM n4AcD4DH4mB1xUTC6MLqXevBeRqWoNY9Q46j+EjyPMVNKgZ8EjHdITr6shr5kkeiezLSbm ZYY4X03PlwBSxXIfaaeOmkM45aSl88KweDuhb522eR2gDD4eOKeMNba7qKkoG5SwTonFBG IDJF4L6fp5ltrGwfMvPICutSdPFI+8T8IMb+YbpeVOasqNbHhj1lVf5Cb/kldQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPZmv0Fd5z1B9t; Wed, 24 Apr 2024 10:22: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 43OAMcTg065919; Wed, 24 Apr 2024 10:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAMcHi065916; Wed, 24 Apr 2024 10:22:38 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:22:38 GMT Message-Id: <202404241022.43OAMcHi065916@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: d7deb6833d29 - stable/12 - arm: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d7deb6833d2948edc63ce7005ae0e2d828561ecc Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d7deb6833d2948edc63ce7005ae0e2d828561ecc commit d7deb6833d2948edc63ce7005ae0e2d828561ecc Author: Gordon Bergling AuthorDate: 2024-04-19 06:54:39 +0000 Commit: Gordon Bergling CommitDate: 2024-04-24 10:22:24 +0000 arm: Fix a typo in a KASSERT message - s/resoure/resource/ (cherry picked from commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0) --- sys/arm/arm/gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index 9ff0ec110b54..a660722fa6e0 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -439,7 +439,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource_list *rl; int j; - KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type)); + KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type)); sc = device_get_softc(bus); From nobody Wed Apr 24 11:40: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 4VPcVV5tpzz5H9yq; Wed, 24 Apr 2024 11:40: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 4VPcVV5H5xz4Cm1; Wed, 24 Apr 2024 11:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713958818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUHWfRUxP5GDtWmMfJ51ZCZmWZKD/kjTfFdWsNtho2c=; b=q/EftUdm/XGccckE8gOVLp2Cn1Tksutw5PwJeIwXreEjMLe9A6kp+z12Kf4zjItga/t2rl b7oOqsHsot/adwMHfKS4gjzaWYHonjJ8zNpgyxv1rEiXxiaiSU5sD0SZgGbKN95Y2ncYln FKtCSkmogT8Rgh8GN8iRuCTyXmZPWQC6KbFnxjQ20SEDvchvxx+DBL1zVHNoGEDzgLiE9Z ZRT4t9mbkySZ8v3p9XVuN49N4qQbdXMJolys1/V8iB9tjAP6DPlGM86WNLYU8YlTiM8AsA 3AXt49loICk3QcAIErCj/JfXjrY7SxONbHKIyz1Q0vTL+aj5qJLDyFX1qv1caQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713958818; a=rsa-sha256; cv=none; b=r/ubo+D1/OadbtTF5Ou45l4vokgAwrZdcV1vASm+Z6oJwc13mSUlnVihyPpY2jomoeR4gj R9z0tr3H1+f2dcg/7gKiYB5IS2oymdyAyeXRsxPvEvRhbJy4Jx/cN1hUoX+QadrWPj7c9/ +BUxsaRQorlttI8rWftvIaIdg1qFYN3CkjudrhvlydgQsYRaBew5Li+5x4N/Z6SOB5s3J8 tRtAX1Kshg5YWUWxE56Xg4PJMREeBkR8h+tGSmRYNcQAMwUK6crXthI3FebYb1r/8SwawA AnwkHlqA00lWhjgdiAyJI90dMj3FnrG3kAxQmuiAM41pKupKv3ajDFxJJ1rK/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713958818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUHWfRUxP5GDtWmMfJ51ZCZmWZKD/kjTfFdWsNtho2c=; b=P6ixs5KQNVeUnb4Lrtkda6/jZrTZP5NAMZX5Ti45dAiWaxfcteaZnchz9399kxsOkQQP1m yQ+IqQxJn9OHB4p8SYstg0tDpUA59TVpWe1rWak28VcXcCPSmhMKXFyRMrGWll1XUZShBr tJed6qLEWPUpa+M8aPvQ4YvEnC6BV6Y4LcTIDvjkxXx55D5QGPjQEP+IOpZ5z1qA45DLHF Oi7hhhG8dfC2ZpU9oO+IuoNCFxyS9LBQZdp6rbu9POXVzFsYycntX+Ik8FLz8+zBhAaJkl WiB1CoBmJssyxzewv85hMKmWwWM7HTYbyKvY8yP2DelP4aqB8BtN6sir3MIM0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPcVV4tMSzDdW; Wed, 24 Apr 2024 11:40: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 43OBeIt6093643; Wed, 24 Apr 2024 11:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OBeILj093640; Wed, 24 Apr 2024 11:40:18 GMT (envelope-from git) Date: Wed, 24 Apr 2024 11:40:18 GMT Message-Id: <202404241140.43OBeILj093640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b8e171b73a07 - stable/14 - organization.dot: Fix typos List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b8e171b73a07788451ccb64b2af53b105d0a9335 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8e171b73a07788451ccb64b2af53b105d0a9335 commit b8e171b73a07788451ccb64b2af53b105d0a9335 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-18 19:59:49 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-24 11:40:13 +0000 organization.dot: Fix typos MFC after: 3 days (cherry picked from commit 806bd5e00658e66a5625397335cafa4748112f14) --- share/misc/organization.dot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/organization.dot b/share/misc/organization.dot index 1552da1f646e..f33ea0f0dbd0 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -30,9 +30,9 @@ doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"] pkgmgr [label="Package Management Team\npkgmgr@FreeBSD.org\nantoine, bdrewery"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat\npizzamig, rene, tcberner"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat,\npizzamig, rene, tcberner"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"] -re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib\n, blackend, delphij, cperciva"] +re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib,\nblackend, delphij, cperciva"] secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, markj,\nemaste,\ngjb, gordon,\noshogbo, philip"] portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, jgh, rea, riggs, sbz, simon, zi"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] From nobody Wed Apr 24 14:06: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 4VPglS0rTHz5HQsn; Wed, 24 Apr 2024 14:06: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 4VPglS0CCXz4Xtw; Wed, 24 Apr 2024 14:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NrBehe1CZZ/+PvPSg/5ncwWtvNJ71ZMjv4yuWiQfSIs=; b=HdTiKffhhsKz+OAdrY9Rx5i3+wfwpBL0uxpcz0sHGam2iC6YzUeBDVq67rVJXzmFUPy2yQ XgQdv6ybqp3Yd8fLBzZv0jLU5a0SRIXwmhuzDKdFW2s6EO40AO04UZ+sXlV06ysGLXdCJD tKubfwQDGEmXU5AFyY55NkXMwzmVzPS9zyV9Wd+aT9DoJjG6+MLznoCQKqEbw6Uhr6EdWR YDkX3QT1iTiQWwZh1L5KhQOuGNyTmujFPe0aYBUE52YHK4KD2RR5C2I5ytP4CMWLn08Mb6 zAHrQHOuIyLtxuBpRQhJkMyV5mHxZ+M+HYPZzpQ5RWVkgV/rK9aXAz1KVx4wPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713967604; a=rsa-sha256; cv=none; b=PSe14gdjzWJ1+LuX1OK6b7+eVz1JnKqKrKq16KiewygU2LGJK3/ZKCSFiT9wT9FlPSl0fo pLsIIIoO3rvqI1+/929HhqTBrlt34VEmBSS75yfBuMICtlO8c9oSejo2tNesXZ9iwV7DoO k3HlJBH66szFj+QEXfmp6Sn5/KrkS1mgEuwdGYaoEoAmYMPnl5QqR9Iig1o460oVPQ+spA sESNFRoaqCpQ2TGuBg+P/oKIEC1Ew74gmSQUZ5IUX0S6ItVXrb7uSW22TFdEjVAZe25fL/ N373oeBGBoX1xJpAQ9EnfHWW7eAPLpPLRD9i41n8QOs1AA02u7q87V0mnS1YaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713967604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NrBehe1CZZ/+PvPSg/5ncwWtvNJ71ZMjv4yuWiQfSIs=; b=aiOG/iicLDVdpgXjL89J+nvgydZcvcqjwQiuRR53S74/okr3ezb4Aeb4RiYGVdc3pZcy9p Y8NIccrGJrj4UsxSNyLDI3v6joBh0MlZJztqjkYb8qTGu1v4v9yRJ7OWICZZq7Vgjwc2so m+gUeA4ttXHdJbC9e0NUthsABU9lGDvImctxLrTQQXX01GQMBfC+hyTWMoMwwuI6d9FNv5 pPd5oiNq5QYyRBrrxU5PDNORBv1FvDVxrNgu2eI2O5/9ub0ve8VFxhBTr1Pke0ta7OLDbj 76Dql4rU37EteZ+0rA/enzu+YmQEo8wUMHyAlhDsXmDhaaEa8QZdP6UerMfilw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPglR6w1gzJWQ; Wed, 24 Apr 2024 14:06: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 43OE6hcP039312; Wed, 24 Apr 2024 14:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OE6hE9039309; Wed, 24 Apr 2024 14:06:43 GMT (envelope-from git) Date: Wed, 24 Apr 2024 14:06:43 GMT Message-Id: <202404241406.43OE6hE9039309@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: 1a4e512adbab - stable/13 - acpi_battery: avoid divide-by-zero when no devices have capacity info List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a4e512adbab4dfc072d6331a7483f4188fb96ce Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1a4e512adbab4dfc072d6331a7483f4188fb96ce commit 1a4e512adbab4dfc072d6331a7483f4188fb96ce Author: Josef 'Jeff' Sipek AuthorDate: 2024-04-16 23:01:28 +0000 Commit: Ed Maste CommitDate: 2024-04-24 14:06:08 +0000 acpi_battery: avoid divide-by-zero when no devices have capacity info On laptops with builtin batteries, disconnecting the battery may show up as a battery without any capacity information. (The theory is that one is disconnecting the cells but the electronics identifying the battery are still connected.) As a result, the loop over all batteries in acpi_battery_get_battinfo results in total_lfcap == 0. So, just check that total_lfcap is non-zero to avoid a division by zero (triggerable by sysctl hw.acpi.battery). Reported by: Stefano Marinelli Tested by: Stefano Marinelli Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44818 (cherry picked from commit 2e850b832f5d2adb9b230d191277d67c00caaab9) (cherry picked from commit 788987e034b1c73d779a3aa179f79f672bbdb366) --- sys/dev/acpica/acpi_battery.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c index 7455c6afc6a6..cfd8261d5eab 100644 --- a/sys/dev/acpica/acpi_battery.c +++ b/sys/dev/acpica/acpi_battery.c @@ -266,7 +266,14 @@ acpi_battery_get_battinfo(device_t dev, struct acpi_battinfo *battinfo) */ if (valid_units > 0) { if (dev == NULL) { - battinfo->cap = (total_cap * 100) / total_lfcap; + /* + * Avoid division by zero if none of the batteries had valid + * capacity info. + */ + if (total_lfcap > 0) + battinfo->cap = (total_cap * 100) / total_lfcap; + else + battinfo->cap = 0; battinfo->min = total_min; battinfo->state = batt_stat; battinfo->rate = valid_rate; From nobody Wed Apr 24 16:27: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 4VPktM33dxz5HwCH; Wed, 24 Apr 2024 16:27: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 4VPktM0QQGz4mQR; Wed, 24 Apr 2024 16:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713976075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/rOm0XTDyUeLgNL+kXI2AomX6f9DR0d2aiEUz6nix0=; b=Xt2NJZvA3Egrvp6yt/6ALc426GeQZCTR4PZdUq5eVobzXJW9gZa7pmzVlSbjVgoFOIVaFZ U7qSn/pKjYqawj5+tx8hx8b5REwTxAED1S3kMgPsLICGCAcEMLF+19jQjo+oHkwr+sn2Jz vt9bdqfYmis2li5XyJIHgj5kjTgwT/rj9ECNSZ59gWq6nqatZrfelCrSN63LBfPMQ+TfAF fL0+IW25MlQFQ6cBHHbaBfSoOq+JWHDYcotEaG5bA/7ZR9GceDc3NikezffmLmcryvq+0p qFxW+WVVjDowSuYeRKpU2mE2dvvJqZWhZ4IPo4JJnWlQsdrSEDyMFfiuGJTo2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713976075; a=rsa-sha256; cv=none; b=GvvWqRGavBsQqimntg90Wgld/oMBsKZJv681gFOo4r4axdpG3mBHPdSO4TMJeCYoIAUVhT w3u+9vIC9MiLu+qrqcdLQbfKmlPF3E2N6f/Eya/SzjIEKwswuirtKO3rfn+nDIuVcbYX8t ExDIWW4GGy06uUrluVFXFmtP74/pvCKh3CExpZcsSdxPuofVK9T88+LzGpT5dWVYJ2Ieot j7EHurwfqvK9Xur29M2noYhgPoM4IkkwpKfgZUTqFV0+7icJaCWog2dS1AC+w1rmBlhY+O 2C6CvzpUVmHIP2skcacEv8CzTibyL5lQdQ8yd6U6N2PfVxPoZKA1av1aUCGPWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713976075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/rOm0XTDyUeLgNL+kXI2AomX6f9DR0d2aiEUz6nix0=; b=YZTri0wquKJeYE/OlDEVJgkg61FubMWt+bN0CTOhlca14UkmVADd7vVs5DH9Fig1L6WKYj bLm8szD6goJdiTTQQjHKnv5Q1+g2q6zGo2rKkDP7JT8pxMI7+UE+AReGDDWc/rGvFspO/Q /ptvY4MurxFtFzXwGnxkvMdCvNvPLvdV6Zh4IBoSinJs47zU76TyAVAeVWdR8EoDmTbxIo eP8J2Kh6TijgTwFfWXv+RqPbA5j9ZTr7pzoOCTjpUfO1syc5IQ33yh1K6MV2kjVUKqN1bK +tvzMRSAYJH2XjXOEdbOd/gVAdvgzBJsDS7X78Yk8H1SrVvq2WquW/lRz+PAaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPktL71bgzN23; Wed, 24 Apr 2024 16:27: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 43OGRsHr075709; Wed, 24 Apr 2024 16:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OGRsQT075706; Wed, 24 Apr 2024 16:27:54 GMT (envelope-from git) Date: Wed, 24 Apr 2024 16:27:54 GMT Message-Id: <202404241627.43OGRsQT075706@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: a913f3ab8f20 - stable/13 - Cirrus-CI: bump Clang versions to 16 and 17 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a913f3ab8f20a7fe021246d858e648445618983c Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a913f3ab8f20a7fe021246d858e648445618983c commit a913f3ab8f20a7fe021246d858e648445618983c Author: Ed Maste AuthorDate: 2024-02-29 22:00:39 +0000 Commit: Ed Maste CommitDate: 2024-04-24 14:06:09 +0000 Cirrus-CI: bump Clang versions to 16 and 17 Clang/LLVM 17 is currently the in-tree default compiler, so use it as the default Cirrus-CI toolchain. Clang/LLVM 18 is coming soon and needs to be added here, but I ran into trouble with llvm18-lite package availability so will look at that later. Reviewed by: dim (earlier), Jose Luis Duran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44162 (cherry picked from commit 51c6bf0478bd331225121eb4a0a60510cc3920b1) (cherry picked from commit adc61137fdf7b31b5f32354b970a8d824347b0de) --- .cirrus.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 51a2940e51eb..2f2b76537968 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -15,35 +15,35 @@ env: task: matrix: - - name: amd64-llvm15 World and kernel build and boot smoke test + - name: amd64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: amd64-llvm16 World and kernel build and boot smoke test + - name: amd64-llvm17 World and kernel build and boot smoke test env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: arm64-llvm15 World and kernel build and boot smoke test + - name: arm64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN} - - name: arm64-llvm16 World and kernel build and boot smoke test + - name: arm64-llvm17 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' From nobody Wed Apr 24 20:21: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 4VPr3W1N2bz5J2dt; Wed, 24 Apr 2024 20:21: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 4VPr3W0v1jz4KQN; Wed, 24 Apr 2024 20:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C77MluIy/9yUVDkecvH/kRsjbf1O/y7AbXlqaEDYp3Y=; b=qArfvr3dil6HxFWHkPuwgOMgdEUcFsxNte5mJs9JPpWodNgxFVdofFoQWt1roL8DiWJYPb fr1PE4rAso4RHVaKa93koI82ZHnc0h1wjijQG2T/GvlItX7rb+/YL4D6k/8oRa/pklvpXs Z0q6lr9EG82p5GfJEUtNlG0ulIGJ0qRS1R20rE8iQNYpwQno/JnARGVVCiDX7W6+u+pdW9 XvjH9NUEcqqoAH1Rqb0IsM9gHIfvq1nHRG4n0BDE4rm/v/zlxavjbns6Zk8WXKInA3uH0h 6Cm9sGhMifcy27op1AOFcRqqq8ZmCm91Rg8DC60rKreoXEyYd00Yk5DL9Ru+AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713990071; a=rsa-sha256; cv=none; b=RhR/5C+Hb7KPHNO80tQlMJuk68PzYQVJfKdHmR8XEK/IN+awlnsp3dSanP3Uyd34Wz8Xsq N8GhIRSNQLbvelDYhNHBXS8gLfis4DXEluX3sk6hmkx+/pmHEu1gxuOfY1l5ZjwhRbwI0B cVAW23olYHyOYFky9k6RA7FHDUDp0tqHp9ZKD5sY8I7EZyFLUJ1lt+5bQfKRgXJC8yKLlV Rj8tvAML8U7IskcvZsA1AEm6kg6LRXXClNzCRzjD80zXjonrsjrvQl0Og6idZItRcSqodT DEhGo6rdxXXrTPZHYgps4UTRq3BRjuNPlqK5OqgYeghXAAAH0MCX8EJkS6RuoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C77MluIy/9yUVDkecvH/kRsjbf1O/y7AbXlqaEDYp3Y=; b=IhZcnbXbQcBA3mKy3EefrgUXh19aCi0O7Uf4E0ERcQ1WuO1elHdFilsEsAQ4nApROx7QS5 1oLwZ4Zo5kqTkefBxzK6+f4pnxLQUxHsAp51CGTT5OVt7A96G9+hZW6xZ8PWBgxoPiIPLA m5yV/jolQX8nm81TyafJJt1W70K6QiJdUETpqryjo1UtHB0Yc5gf9BETB3RRLC6sw7BV7F Bm7b2Syc3S+AzjAtZk/Rk4SVN9XdMRI0oyhx0dewQ/Ign72hxeIfHDpmt2YIvwUY7neL0/ 1g7FChb3rryJo/lKL9vgtTEEBTxIIhp48P2GbLQhex82ZH1zRrQirApgpe2W9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPr3W0C8DzT4Z; Wed, 24 Apr 2024 20:21: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 43OKLA0Z075199; Wed, 24 Apr 2024 20:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKLAki075196; Wed, 24 Apr 2024 20:21:10 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:21:10 GMT Message-Id: <202404242021.43OKLAki075196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 266b3bd3f26d - releng/13.3 - Unify arc_prune_async() code, fix excessive ARC pruning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 266b3bd3f26d30f7be56b7ec9d31f3db2285b4ce Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=266b3bd3f26d30f7be56b7ec9d31f3db2285b4ce commit 266b3bd3f26d30f7be56b7ec9d31f3db2285b4ce Author: Alexander Motin AuthorDate: 2023-10-30 23:56:04 +0000 Commit: Gordon Tetlow CommitDate: 2024-04-24 20:06:16 +0000 Unify arc_prune_async() code, fix excessive ARC pruning There is no sense to have separate implementations for FreeBSD and Linux. Make Linux code shared as more functional and just register FreeBSD-specific prune callback with arc_add_prune_callback() API. Aside of code cleanup this fixes excessive pruning on FreeBSD. [olce: This code comes from the OpenZFS pull request: https://github.com/openzfs/zfs/pull/16083, vendor-merged into our tree. Its commit message has been slightly adapted to the present context. The upstream pull request has been reviewed and merged into 'zfs-2.1.16-staging' as 5b81b1bf5e6d6aeb8a87175dcb12b529185cac2f, which should come into our tree at the next vendor import. This is the same code that was merged into stable/14 and main as part of vendor merges, and released as an EN (FreeBSD-EN-23:18.openzfs) over releng/14.0 by markj@.] PR: 275594, 274698 Reported by: Seigo Tanimura , markj, and others Tested by: olce Approved by: emaste (mentor) Approved by: so Obtained from: OpenZFS Sponsored by: iXsystems, Inc. Sponsored by: The FreeBSD Foundation Signed-off-by: Alexander Motin (cherry picked from commit 330954bdb822af6bc07d487b1ecd7f8fda9c4def) --- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 2 +- sys/contrib/openzfs/include/sys/arc.h | 2 +- sys/contrib/openzfs/include/sys/arc_impl.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 62 ---------------------- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 32 +++++++++++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 51 ------------------ .../openzfs/module/os/linux/zfs/zpl_super.c | 2 +- sys/contrib/openzfs/module/zfs/arc.c | 52 ++++++++++++++++++ 8 files changed, 87 insertions(+), 117 deletions(-) diff --git a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h index 4e08470e794f..9d048d19aece 100644 --- a/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h +++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h @@ -52,7 +52,7 @@ extern const struct file_operations zpl_file_operations; extern const struct file_operations zpl_dir_file_operations; /* zpl_super.c */ -extern void zpl_prune_sb(int64_t nr_to_scan, void *arg); +extern void zpl_prune_sb(uint64_t nr_to_scan, void *arg); extern const struct super_operations zpl_super_operations; extern const struct export_operations zpl_export_operations; diff --git a/sys/contrib/openzfs/include/sys/arc.h b/sys/contrib/openzfs/include/sys/arc.h index 5d8176894e60..9b762c01c159 100644 --- a/sys/contrib/openzfs/include/sys/arc.h +++ b/sys/contrib/openzfs/include/sys/arc.h @@ -81,7 +81,7 @@ typedef struct arc_prune arc_prune_t; typedef void arc_read_done_func_t(zio_t *zio, const zbookmark_phys_t *zb, const blkptr_t *bp, arc_buf_t *buf, void *priv); typedef void arc_write_done_func_t(zio_t *zio, arc_buf_t *buf, void *priv); -typedef void arc_prune_func_t(int64_t bytes, void *priv); +typedef void arc_prune_func_t(uint64_t bytes, void *priv); /* Shared module parameters */ extern int zfs_arc_average_blocksize; diff --git a/sys/contrib/openzfs/include/sys/arc_impl.h b/sys/contrib/openzfs/include/sys/arc_impl.h index db6238fda61e..118bf33632fb 100644 --- a/sys/contrib/openzfs/include/sys/arc_impl.h +++ b/sys/contrib/openzfs/include/sys/arc_impl.h @@ -994,7 +994,6 @@ extern void arc_wait_for_eviction(uint64_t, boolean_t); extern void arc_lowmem_init(void); extern void arc_lowmem_fini(void); -extern void arc_prune_async(int64_t); extern int arc_memory_throttle(spa_t *spa, uint64_t reserve, uint64_t txg); extern uint64_t arc_free_memory(void); extern int64_t arc_available_memory(void); diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c index 3dd49f05521b..9641bf8bd591 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c @@ -51,11 +51,6 @@ #include #include -#if __FreeBSD_version >= 1300139 -static struct sx arc_vnlru_lock; -static struct vnode *arc_vnlru_marker; -#endif - extern struct vfsops zfs_vfsops; uint_t zfs_arc_free_target = 0; @@ -151,53 +146,6 @@ arc_default_max(uint64_t min, uint64_t allmem) return (MAX(allmem * 5 / 8, size)); } -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *arg) -{ - int64_t nr_scan = (intptr_t)arg; - -#ifndef __ILP32__ - if (nr_scan > INT_MAX) - nr_scan = INT_MAX; -#endif - -#if __FreeBSD_version >= 1300139 - sx_xlock(&arc_vnlru_lock); - vnlru_free_vfsops(nr_scan, &zfs_vfsops, arc_vnlru_marker); - sx_xunlock(&arc_vnlru_lock); -#else - vnlru_free(nr_scan, &zfs_vfsops); -#endif -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the arc_meta_limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(int64_t adjust) -{ - -#ifndef __LP64__ - if (adjust > INTPTR_MAX) - adjust = INTPTR_MAX; -#endif - taskq_dispatch(arc_prune_taskq, arc_prune_task, - (void *)(intptr_t)adjust, TQ_SLEEP); - ARCSTAT_BUMP(arcstat_prune); -} - uint64_t arc_all_memory(void) { @@ -248,10 +196,6 @@ arc_lowmem_init(void) { arc_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, arc_lowmem, NULL, EVENTHANDLER_PRI_FIRST); -#if __FreeBSD_version >= 1300139 - arc_vnlru_marker = vnlru_alloc_marker(); - sx_init(&arc_vnlru_lock, "arc vnlru lock"); -#endif } void @@ -259,12 +203,6 @@ arc_lowmem_fini(void) { if (arc_event_lowmem != NULL) EVENTHANDLER_DEREGISTER(vm_lowmem, arc_event_lowmem); -#if __FreeBSD_version >= 1300139 - if (arc_vnlru_marker != NULL) { - vnlru_free_marker(arc_vnlru_marker); - sx_destroy(&arc_vnlru_lock); - } -#endif } void diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 6ffd36885655..33581d018256 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -2097,6 +2097,26 @@ zfs_vnodes_adjust_back(void) #endif } +#if __FreeBSD_version >= 1300139 +static struct sx zfs_vnlru_lock; +static struct vnode *zfs_vnlru_marker; +#endif +static arc_prune_t *zfs_prune; + +static void +zfs_prune_task(uint64_t nr_to_scan, void *arg __unused) +{ + if (nr_to_scan > INT_MAX) + nr_to_scan = INT_MAX; +#if __FreeBSD_version >= 1300139 + sx_xlock(&zfs_vnlru_lock); + vnlru_free_vfsops(nr_to_scan, &zfs_vfsops, zfs_vnlru_marker); + sx_xunlock(&zfs_vnlru_lock); +#else + vnlru_free(nr_to_scan, &zfs_vfsops); +#endif +} + void zfs_init(void) { @@ -2123,11 +2143,23 @@ zfs_init(void) dmu_objset_register_type(DMU_OST_ZFS, zpl_get_file_info); zfsvfs_taskq = taskq_create("zfsvfs", 1, minclsyspri, 0, 0, 0); + +#if __FreeBSD_version >= 1300139 + zfs_vnlru_marker = vnlru_alloc_marker(); + sx_init(&zfs_vnlru_lock, "zfs vnlru lock"); +#endif + zfs_prune = arc_add_prune_callback(zfs_prune_task, NULL); } void zfs_fini(void) { + arc_remove_prune_callback(zfs_prune); +#if __FreeBSD_version >= 1300139 + vnlru_free_marker(zfs_vnlru_marker); + sx_destroy(&zfs_vnlru_lock); +#endif + taskq_destroy(zfsvfs_taskq); zfsctl_fini(); zfs_znode_fini(); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c index fc76fe0e0b5c..496dce5abe61 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c @@ -488,57 +488,6 @@ arc_unregister_hotplug(void) } #endif /* _KERNEL */ -/* - * Helper function for arc_prune_async() it is responsible for safely - * handling the execution of a registered arc_prune_func_t. - */ -static void -arc_prune_task(void *ptr) -{ - arc_prune_t *ap = (arc_prune_t *)ptr; - arc_prune_func_t *func = ap->p_pfunc; - - if (func != NULL) - func(ap->p_adjust, ap->p_private); - - zfs_refcount_remove(&ap->p_refcnt, func); -} - -/* - * Notify registered consumers they must drop holds on a portion of the ARC - * buffered they reference. This provides a mechanism to ensure the ARC can - * honor the arc_meta_limit and reclaim otherwise pinned ARC buffers. This - * is analogous to dnlc_reduce_cache() but more generic. - * - * This operation is performed asynchronously so it may be safely called - * in the context of the arc_reclaim_thread(). A reference is taken here - * for each registered arc_prune_t and the arc_prune_task() is responsible - * for releasing it once the registered arc_prune_func_t has completed. - */ -void -arc_prune_async(int64_t adjust) -{ - arc_prune_t *ap; - - mutex_enter(&arc_prune_mtx); - for (ap = list_head(&arc_prune_list); ap != NULL; - ap = list_next(&arc_prune_list, ap)) { - - if (zfs_refcount_count(&ap->p_refcnt) >= 2) - continue; - - zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); - ap->p_adjust = adjust; - if (taskq_dispatch(arc_prune_taskq, arc_prune_task, - ap, TQ_SLEEP) == TASKQID_INVALID) { - zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); - continue; - } - ARCSTAT_BUMP(arcstat_prune); - } - mutex_exit(&arc_prune_mtx); -} - /* BEGIN CSTYLED */ ZFS_MODULE_PARAM(zfs_arc, zfs_arc_, shrinker_limit, INT, ZMOD_RW, "Limit on number of pages that ARC shrinker can reclaim at once"); diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c index c2fd3fee1401..9300a7199296 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c @@ -334,7 +334,7 @@ zpl_kill_sb(struct super_block *sb) } void -zpl_prune_sb(int64_t nr_to_scan, void *arg) +zpl_prune_sb(uint64_t nr_to_scan, void *arg) { struct super_block *sb = (struct super_block *)arg; int objects = 0; diff --git a/sys/contrib/openzfs/module/zfs/arc.c b/sys/contrib/openzfs/module/zfs/arc.c index 1180853da038..eacc2104a6a6 100644 --- a/sys/contrib/openzfs/module/zfs/arc.c +++ b/sys/contrib/openzfs/module/zfs/arc.c @@ -868,6 +868,8 @@ static void l2arc_do_free_on_write(void); static void l2arc_hdr_arcstats_update(arc_buf_hdr_t *hdr, boolean_t incr, boolean_t state_only); +static void arc_prune_async(uint64_t adjust); + #define l2arc_hdr_arcstats_increment(hdr) \ l2arc_hdr_arcstats_update((hdr), B_TRUE, B_FALSE) #define l2arc_hdr_arcstats_decrement(hdr) \ @@ -6521,6 +6523,56 @@ arc_remove_prune_callback(arc_prune_t *p) kmem_free(p, sizeof (*p)); } +/* + * Helper function for arc_prune_async() it is responsible for safely + * handling the execution of a registered arc_prune_func_t. + */ +static void +arc_prune_task(void *ptr) +{ + arc_prune_t *ap = (arc_prune_t *)ptr; + arc_prune_func_t *func = ap->p_pfunc; + + if (func != NULL) + func(ap->p_adjust, ap->p_private); + + zfs_refcount_remove(&ap->p_refcnt, func); +} + +/* + * Notify registered consumers they must drop holds on a portion of the ARC + * buffers they reference. This provides a mechanism to ensure the ARC can + * honor the metadata limit and reclaim otherwise pinned ARC buffers. + * + * This operation is performed asynchronously so it may be safely called + * in the context of the arc_reclaim_thread(). A reference is taken here + * for each registered arc_prune_t and the arc_prune_task() is responsible + * for releasing it once the registered arc_prune_func_t has completed. + */ +static void +arc_prune_async(uint64_t adjust) +{ + arc_prune_t *ap; + + mutex_enter(&arc_prune_mtx); + for (ap = list_head(&arc_prune_list); ap != NULL; + ap = list_next(&arc_prune_list, ap)) { + + if (zfs_refcount_count(&ap->p_refcnt) >= 2) + continue; + + zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); + ap->p_adjust = adjust; + if (taskq_dispatch(arc_prune_taskq, arc_prune_task, + ap, TQ_SLEEP) == TASKQID_INVALID) { + zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); + continue; + } + ARCSTAT_BUMP(arcstat_prune); + } + mutex_exit(&arc_prune_mtx); +} + /* * Notify the arc that a block was freed, and thus will never be used again. */ From nobody Wed Apr 24 20:21: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 4VPr3X2wcPz5J2Qn; Wed, 24 Apr 2024 20:21: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 4VPr3X19DJz4KKx; Wed, 24 Apr 2024 20:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtTkSOiO/gqE67U6FGcYRrNz5/jRqso6oTOUDmjBTlM=; b=TDb79P0vzsBMbIze9SMJqsVCNQK8UpOftN29ZdWDgBZbcGsv+8MJ5zAD9f6z3kAOl8ZF7m 5P5JJ+ncphI4a2mM6qclR3N/fn5iSlhULN5w6HWGw4jJ+ixHRnCDBQsUBPgKzw3zYe7cBM xNV75PUGNt91gNXhHt5RBAdCi+XwF9p3CdWgVsIleBWNxdQQXB4Xp4p399wEIRXmmCmSUL aW8u8daKC1cU9u2fBltnjxWTcMIplZBbG09l+w6qP6wRTcOvYL9lhPDfZ/0of7l7RZaDAM S2S+mfLCB/h0u0bXHaiAUgUIb/IMUL4YuDZfZ1SX6EXtmVOkrBVpRgXO9HOwBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713990072; a=rsa-sha256; cv=none; b=YtVhQddaFXDuiNzI8WtbwLkA3uwi4mSOlT+LN6k4b/dp6GR0lNwOkKzQtWwSa+DKwMPc2i Mh746MDoBAe0ue3A3Ik9vudX/B/al0muTLtiNZZ7qHHHzhXL58N6xbs2WVHe4mqFa0GGzT TtrTeTgwfL7UzFgg/O9AlTGklWZGbvqPWOQG8jTao3x/FfOBH0+2+/H7dJpKxb9XVKbFhb RzOxjTb25v1AVRRE3op7NI3KFKiWbTOsv8+mRrax0aho6GQkeXc7D9AjHM4xqQR4hlljb5 +0y6kKEaVQDKb8ABiJz7meNwae5mjRkFvyI4ioU7i2GXpPWJfF2Eb7uzUpu3Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtTkSOiO/gqE67U6FGcYRrNz5/jRqso6oTOUDmjBTlM=; b=rmKecONL1UbnfY6hsOJ02sg/MN0ajAaV/bLJjj/JFst2wVW8pqPaEU0P+NPMiL9q2NypbC 88MxnDwtCcrG7eutcRTEfv+hQjUxa/q37/nFnjuZsMeN5CHkifc4KDarJePQW/Xk2JtvrB 7GsZ20+/UUzLYmUCMe9pDMWxv6nzcgDHWBLMTQQV4mBCvP2kdw+dWkAJv6+BZQtMndSymv fF9r8vnIqRzg54rwt2pym7NyF16oa91lN2ymUOXaf6nSAUE5Jysi44nfn3i9TD+c1YSenx z/cXfMvJl2wNQeueZmWzCQDQpGV4vd6UvyY7vVH1/deOS6E09tAtxf9D53aKmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPr3X0nGDzVKG; Wed, 24 Apr 2024 20:21: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 43OKLCXX075250; Wed, 24 Apr 2024 20:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKLCod075247; Wed, 24 Apr 2024 20:21:12 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:21:12 GMT Message-Id: <202404242021.43OKLCod075247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: be4f1894ef39 - releng/13.3 - Add UPDATING entries and bump the branch version. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: be4f1894ef399f421bab451e8cf8557e27e5a948 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=be4f1894ef399f421bab451e8cf8557e27e5a948 commit be4f1894ef399f421bab451e8cf8557e27e5a948 Author: Gordon Tetlow AuthorDate: 2024-04-24 20:08:33 +0000 Commit: Gordon Tetlow CommitDate: 2024-04-24 20:08:33 +0000 Add UPDATING entries and bump the branch version. Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 9e07b0d7e3a3..97c8abff980a 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240424: + 13.3-RELEASE-p2 EN-24:09.zfs + + Fix high CPU usage by kernel threads related to ZFS [EN-24:09.zfs] + 20240327: 13.3-RELEASE-p1 EN-24:06.wireguard EN-24:07.clang diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 4d4f28badbac..c6e44a41b9f8 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.3" -BRANCH="RELEASE-p1" +BRANCH="RELEASE-p2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Apr 24 20:30: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 4VPrG45yGTz5J3R0; Wed, 24 Apr 2024 20:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPrG45Py7z4LWt; Wed, 24 Apr 2024 20:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5y4IULsgraTXoKCMAIKHISpR+XH5YbTKrLprFe4ElTQ=; b=wE/+SetykJC3I5+Z2D5Y2c0btUnfE7Mm4oAUYbPQuGTJOYMGV+h2lEw3gFzhid6SaVIPli vJmtmYCuCCifEQIz64fjQIwoVKXvis+g6P1IOOoLxhIpay8CXzg34iLFycUEph+rusUB/4 CMzkkp+hdONOTvVExYkrcejEzy6sua605KKSD3khGCELyhDTNIxKCz73YYd5q+mcQRwbn+ e8W2TKkADn5rDbXd5cz9Rch5P5OeJZbL1wZVz9EEmPuOimFPF+xSb07TT9gvbHVKPMDgMF QjeKF4fapWMJx27W8FDdnyHIMLNoxn2M5CVmbh5ZUBO6vd18ixwJSutcrHzTdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713990620; a=rsa-sha256; cv=none; b=qgPJxuIW6nrgptbOTKqs0tHyxHFl1ABKTKWq/AwYOS9ZFq80YREcmpR2pVATGf+GOlqd67 8wBe55a3lG35ctgbcyeadIFDa7P/YcUKNxvwr/OzbtVyDbS0LX5pYC3KKRmKYpmCG/ifbD /aTGZBKOcbxEQvT+eHLzPRyvYgIcSNqvq33+SuzjxOhOSFOUiIALMZEE9dHbH4GY57Y0Wq qpnkjJALxxNiDZOwQKJua+EMQpH000FGY05Y+nrVfwjhq08qbsUon9F/YIqj+mhb2suw1h Bo/sQAXQeteqBoe+Y4TKOioJtlfurXCrxMVm7Vfc6gk++Oygg3ictOUN5dW9Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5y4IULsgraTXoKCMAIKHISpR+XH5YbTKrLprFe4ElTQ=; b=rpi1AcTTBvvJ1MZ1U2H8XZ+ZzloIm6Zhl6/zBfCCIs0h6rUoRJofB+Ooq0XP7baNLxzORz uJT1fcnJ+1RMyP0gAiW9kHzT+pmm0t56kQh0ZSMSojDoizueBmrcYSnqI7LG0Ea3q5jpi1 y1B6fgPSIXLetgJ2ylPldyrhlzcejF2BMdZqGntnaiL2mYFJXsZZpRdI7ylqJ8b1e+fYNp YrJv4AsO9M48OUbK2+x5N+H5YD0OiT0zOkfCPC9lz99AEdnf42c7oMhuEsI1iiga+Q+Wfa BL+SaM8IyCNWGmGj9fB3CHLexVDrnf9YQBlJvgUJ3wp4+tFKMaF1Ay2GMbA/9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPrG44v5jzVdm; Wed, 24 Apr 2024 20:30: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 43OKUKQH091587; Wed, 24 Apr 2024 20:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKUKet091584; Wed, 24 Apr 2024 20:30:20 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:30:20 GMT Message-Id: <202404242030.43OKUKet091584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: d48e7e89e02f - stable/14 - TCP: Fix a rack bug that skyzall found which results in a crash. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d48e7e89e02f3b7f56121bf2bedbff7c94b7e9ba Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d48e7e89e02f3b7f56121bf2bedbff7c94b7e9ba commit d48e7e89e02f3b7f56121bf2bedbff7c94b7e9ba Author: Randall Stewart AuthorDate: 2023-10-04 19:16:01 +0000 Commit: Michael Tuexen CommitDate: 2024-04-24 20:26:27 +0000 TCP: Fix a rack bug that skyzall found which results in a crash. So when we call the fast_rsm retransmit path, we should always move snd_nxt back up to snd_max. In fact during ack-processing if snd_nxt falls behind it should be moved up there as well. Otherwise what can happen is we have an incorrect mark on snd_nxt and incorrectly calculate the offset when we go through the front path (which is what skzyall was able to do) then when we go to clean up the send the offset is all wrong and we crash. Special thanks to Gleb for pointing out the problem and the email that had the reproducer so I could find the issue. Reported-by: syzbot+f5061a372f74f021ec02@syzkaller.appspotmail.com Sponsored by: Netflix Inc (cherry picked from commit 8818f0f1124ea3d0e8028f85d667237536eba10c) --- sys/netinet/tcp_stacks/rack.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 889622b7ff90..0bc3b5588b7b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -12346,8 +12346,8 @@ rack_process_ack(struct mbuf *m, struct tcphdr *th, struct socket *so, if (SEQ_GT(tp->snd_una, tp->snd_recover)) tp->snd_recover = tp->snd_una; - if (SEQ_LT(tp->snd_nxt, tp->snd_una)) { - tp->snd_nxt = tp->snd_una; + if (SEQ_LT(tp->snd_nxt, tp->snd_max)) { + tp->snd_nxt = tp->snd_max; } if (under_pacing && (rack->use_fixed_rate == 0) && @@ -16369,8 +16369,8 @@ rack_do_compressed_ack_processing(struct tcpcb *tp, struct socket *so, struct mb /* Send recover and snd_nxt must be dragged along */ if (SEQ_GT(tp->snd_una, tp->snd_recover)) tp->snd_recover = tp->snd_una; - if (SEQ_LT(tp->snd_nxt, tp->snd_una)) - tp->snd_nxt = tp->snd_una; + if (SEQ_LT(tp->snd_nxt, tp->snd_max)) + tp->snd_nxt = tp->snd_max; /* * If the RXT timer is running we want to * stop it, so we can restart a TLP (or new RXT). @@ -19118,6 +19118,8 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma lgb->tlb_errno = error; lgb = NULL; } + /* Move snd_nxt to snd_max so we don't have false retransmissions */ + tp->snd_nxt = tp->snd_max; if (error) { goto failed; } else if (rack->rc_hw_nobuf && (ip_sendflag != IP_NO_SND_TAG_RL)) { From nobody Wed Apr 24 20:37: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 4VPrPw6kgbz5J3qB; Wed, 24 Apr 2024 20:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPrPw5n34z4Lr5; Wed, 24 Apr 2024 20:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYTt4kJ7a7b8Kt6dSu8GmybXNavVGF6sBVhuBkHpFNE=; b=lG750ncaIRYjCiP2o/0oA0i0Tbq4W2Uw+h3ocQu8MHUqs7aUO4r/zx0dbTx5oCBdPBQxQE L4+VEHuw2kZcAk9JAVax+yLOVQMdVo6atd72jm4vihv6jAB50jRCNr/K1q1bbYT66agt48 eyDSErhaucYwnFelERarsL70mRBYMT45bVYR8mcHtRmQQ1quroq5gx1TRvw25E0pyS+XU/ cL/6LTcAdFAN/Al/leQLev0PrE0qe/tDVVjaNQHTdyl38wDv1GBRlCOkhGSrS5conMj+bH aW7Nr+n3UOzKmv6dtROki2+4D2+EileG2ckInxQHds74/IlZaZ1Y+2eRuAXYiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713991028; a=rsa-sha256; cv=none; b=OXjKY26Dit/usBF+YZEPx6nUYeETB9MQ57jwEN29RJ1Ui3YbOO5NGG8SKKDWmXr+wOohMP roBIvORml0L6gYT5zBLoX/+sLkip17PtDlmn/AGNJJcoxbOXVfFkxEaRKrCFp9K22ng2TN zjTfJuA2kDpX8rF5h8erRIxsfLOdzHIsVHe9QyBbrx8gksY4EkcOzMTvlq39bRCrH8RFbZ 0C4KC4H3KTEkaLu6X6HdkshgdCLSJ7jCDjXjeB5Iv7JNJkXKfDUzKKTVmKPMKKITukxmGH cjSXRIT2sFu8vG1bJanJhm91IVK/8BYcGJF4NC0Mhqr0fV9sTtBYf0UcTBNM8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYTt4kJ7a7b8Kt6dSu8GmybXNavVGF6sBVhuBkHpFNE=; b=iyOBBw2CrP1eEfdfBSLnUXqOFgTtnOqUVTP0X/yrF6Yymanf6BS+wkxDWBXTGW886oX4fc 2Wjk2kY1mz6KTHlTRhRdISuSq6uYizR4SsRSzrILSvPwqreldM9ZDpmEKDQaOiOMbn3Y1X xJO9f1CDLlvueUqq5Lg8j4m1YvEN/OiX+eRP1gpsz6IKXZCZL+hmL0rB3dKJ4UusmWKLNC BnrqMkdLuN4KzSWBuga8WHX6wL6rgg35dOATCVImik5oCJQDiQvqMAbOWEhiXVYnpYUgiv tVBvvDAsWbI/5sjqKVGqGXiLB+ACkkdnNhkTIHfpbHGpwTT7y0/Pses86YKixA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPrPw5GBSzWBy; Wed, 24 Apr 2024 20:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OKb85O099291; Wed, 24 Apr 2024 20:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKb89E099288; Wed, 24 Apr 2024 20:37:08 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:37:08 GMT Message-Id: <202404242037.43OKb89E099288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 917b5431453d - stable/14 - HTPS has actually three states not two so the macro needs to account for that. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 917b5431453d0a02ac4f976b76511357ed6c5604 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=917b5431453d0a02ac4f976b76511357ed6c5604 commit 917b5431453d0a02ac4f976b76511357ed6c5604 Author: Randall Stewart AuthorDate: 2024-03-01 20:21:15 +0000 Commit: Michael Tuexen CommitDate: 2024-04-24 20:36:32 +0000 HTPS has actually three states not two so the macro needs to account for that. Ok lets fix up the tcp_in_hpts() so that it also says yes if you are in the race state moving and you are scheduled to be put in. This also requires changing the MPASS to be the old version non inline function of tcp_in_hpts(). This change also adds a new inline macro so that a uint64_t timestamp can be obtained by a transport (aka Rack will use this). Reviewed by: glebius, tuexen Sponsored by: Netflix Inc. Differential Revision: https://reviews.freebsd.org/D44157 (cherry picked from commit 638b5ae1c7858373344bc7b9dcb5a1e7fab80bd9) --- sys/netinet/tcp_hpts.c | 2 +- sys/netinet/tcp_hpts.h | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index af7b2691ff2e..07c5f04b907e 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -821,7 +821,7 @@ tcp_hpts_insert_diag(struct tcpcb *tp, uint32_t slot, int32_t line, struct hpts_ INP_WLOCK_ASSERT(tptoinpcb(tp)); MPASS(!(tptoinpcb(tp)->inp_flags & INP_DROPPED)); - MPASS(!tcp_in_hpts(tp)); + MPASS(!(tp->t_in_hpts == IHPTS_ONQUEUE)); /* * We now return the next-slot the hpts will be on, beyond its diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 0c5cfac28a6c..b097a2b98db9 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -115,7 +115,9 @@ void tcp_hpts_remove(struct tcpcb *); static inline bool tcp_in_hpts(struct tcpcb *tp) { - return (tp->t_in_hpts == IHPTS_ONQUEUE); + return ((tp->t_in_hpts == IHPTS_ONQUEUE) || + ((tp->t_in_hpts == IHPTS_MOVING) && + (tp->t_hpts_slot != -1))); } /* @@ -208,6 +210,17 @@ tcp_gethptstick(struct timeval *sv) return (tcp_tv_to_hptstick(sv)); } +static __inline uint64_t +tcp_get_u64_usecs(struct timeval *tv) +{ + struct timeval tvd; + + if (tv == NULL) + tv = &tvd; + microuptime(tv); + return (tcp_tv_to_lusectick(tv)); +} + static __inline uint32_t tcp_get_usecs(struct timeval *tv) { From nobody Wed Apr 24 20:41: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 4VPrVl1f1lz5J3vS; Wed, 24 Apr 2024 20:41: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 4VPrVk0dK7z4MX2; Wed, 24 Apr 2024 20:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hZejh25Way3YEaaApiPmdqX/4+SgWrAI/AQgx+vcas=; b=jBfqM9iMnQyu6nMMGo9q4RBGiej1V85Jq7qhchV3/vEucRP3uxEdNUF5DxlvRlCsfAp9ve yvlkrJGPpWOBFIcM0PXwMhYoCrzCE/Uh/fOmC/NezbWZ6I8uL+GGvb+RLendP3GXKQhSOY h+hmrSYDQv7eFQvLFwwOewheck6Hr0NoBYQx9TLAC+7l+Uw5jaDEpdeE0Ds7HDdgmB6PxF kx8EhkFqL/aEL6AnLy1XBql3COMAEEDQqJGfanfc+SIUpiTfA70oCEnxK6eHDUaIhTteWs daawo3r3iWr1UkIry/rCEYJ3v5Rqq/PW483nXRB2tFqdCOK+n7HT6rtKj5Zo1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713991278; a=rsa-sha256; cv=none; b=pgTqy5e2e5XAZaeMtOdYLyCOQl7QSJ/HYj6bKEV48NXj8M+TOZJj1B0JZMHR1dnJ04kl5H qPS/3IeHy9pePt9PMSq28krSFI77j/uhdxbV1ZiuzwMgFKb90w0HiFaT5EBj/jvkpfcVbn X7Z1HeI24GkLHpWV6hrLDfRpP5AVbqCqUkc/HsEyKTh6YKavw+kIaNouS7y5+p0Vh7aC22 utTFa3N7PpSWVre0dgJHQAYwbUKRpnRL9JEmilJkS4zApcDEuZWncIl3Q6R76fnCA4YQx7 mcd/pm3fHpbvOtYxNrWbbAOtVgemuvwIxuEeBdUXXgJ+Rupv3iqJ8SD6oEMJRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713991278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hZejh25Way3YEaaApiPmdqX/4+SgWrAI/AQgx+vcas=; b=WqYLvtcAUaYvcPFhGXcYQ29UJaPJ9gMTmxIOIgUha2JenFEjRbOlVces38trX5S3Srenw7 Ggpn1m0uA3wREmPcDrCI3H3i4pVZf3sz3Gs5EHvSrpn98jpoLRSWuvlUlkIJneE1z/hLtP jeWqGElcTWr+XYt+8cIi3smSleubY2eDN+3iGKvNx6MNO4OrOrkC1RbfroEfGc9lS5pHC8 kHPSUac5E0hF+Eem0CfFgBdeyPa0seV/cptrcRW+3CBRdMKxj51a3tQ8gY2sZKseQH36RG D19DBwFFDsHERvLqBrTzhOGiziFAO4A/1hJVWUlLnoxC2S53Ux/5oc2b8CyR5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPrVk0CTHzWRS; Wed, 24 Apr 2024 20:41: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 43OKfH9J010493; Wed, 24 Apr 2024 20:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKfH8c010490; Wed, 24 Apr 2024 20:41:17 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:41:17 GMT Message-Id: <202404242041.43OKfH8c010490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 7fdef9cdb7ee - stable/14 - Optimize HPTS so that little work is done until we have a hpts thread that is over the connection threshold List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fdef9cdb7ee3ff9b7bc7629ee2db7c808e8f1a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7fdef9cdb7ee3ff9b7bc7629ee2db7c808e8f1a5 commit 7fdef9cdb7ee3ff9b7bc7629ee2db7c808e8f1a5 Author: Randall Stewart AuthorDate: 2024-03-28 12:12:37 +0000 Commit: Michael Tuexen CommitDate: 2024-04-24 20:37:40 +0000 Optimize HPTS so that little work is done until we have a hpts thread that is over the connection threshold HPTS inserts a softclock for system call return that optimizes performance. However when no HPTS threads need the help (i.e. when they have less than 100 or so connections) then there should be little work done i.e. check the counter and return instead of running through all the threads getting locks etc.ptimize HPTS so that little work is done until we have a hpts thread that is over the connection threshold. Reported by: eduardo Reviewed by: gallatin, glebius, tuexen Tested by: gallatin Differential Revision: https://reviews.freebsd.org/D44420 (cherry picked from commit b7b78c1c169dd2213b4cb3e14e19c045b2c5e5af) --- sys/kern/subr_trap.c | 2 ++ sys/netinet/tcp_hpts.c | 10 +++++++++- sys/sys/systm.h | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 42ce9e7988b5..5a89ba8b6500 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -76,6 +76,8 @@ #include #endif +volatile uint32_t __read_frequently hpts_that_need_softclock = 0; + void (*tcp_hpts_softclock)(void); /* diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 07c5f04b907e..85341cab0750 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -193,7 +193,8 @@ struct tcp_hpts_entry { uint8_t p_direct_wake :1, /* boolean */ p_on_min_sleep:1, /* boolean */ p_hpts_wake_scheduled:1, /* boolean */ - p_avail:5; + hit_callout_thresh:1, + p_avail:4; uint8_t p_fill[3]; /* Fill to 32 bits */ /* Cache line 0x40 */ struct hptsh { @@ -1684,6 +1685,13 @@ tcp_hpts_thread(void *ctx) ticks_ran = tcp_hptsi(hpts, 1); tv.tv_sec = 0; tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; + if ((hpts->p_on_queue_cnt > conn_cnt_thresh) && (hpts->hit_callout_thresh == 0)) { + hpts->hit_callout_thresh = 1; + atomic_add_int(&hpts_that_need_softclock, 1); + } else if ((hpts->p_on_queue_cnt <= conn_cnt_thresh) && (hpts->hit_callout_thresh == 1)) { + hpts->hit_callout_thresh = 0; + atomic_subtract_int(&hpts_that_need_softclock, 1); + } if (hpts->p_on_queue_cnt >= conn_cnt_thresh) { if(hpts->p_direct_wake == 0) { /* diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 3721db649a3d..eb690b1cf4b4 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -393,8 +393,10 @@ extern int cpu_disable_c2_sleep; extern int cpu_disable_c3_sleep; extern void (*tcp_hpts_softclock)(void); +extern volatile uint32_t __read_frequently hpts_that_need_softclock; + #define tcp_hpts_softclock() do { \ - if (tcp_hpts_softclock != NULL) \ + if (hpts_that_need_softclock > 0) \ tcp_hpts_softclock(); \ } while (0) From nobody Wed Apr 24 21:28: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 4VPsXk6ksCz5J87g; Wed, 24 Apr 2024 21:28: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 4VPsXk6BKyz4StV; Wed, 24 Apr 2024 21:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ai5lYLWxQGs3/1G+Z1y/+8j4tEXL0m2yxnGvgDxNmuQ=; b=q9HDdU2OC98lNwJwZtgIhB6tz6djKNRWSlFPuwrbePqAIrxIq+ou3kSNnNzc5skxDZrPx3 C0rH++e14qNoo+o5I6VFGW1f0WXuEuQ81Lv9WvfdlHFHbsebudZhOmdpTbpyBQ6hjhynRI zJC+QzhT2/B0X11nzrW8NKdpbJI2Ti6Y9qnsIykC7hG9VxRpt9Ebk955IYnQbBf13WMKYy hS22/GImUfym7THeoSyem6OrHnwBj+1il5EW6puIeTFJMNA3ihQ/JdQ1XhSxOKhZXlnbc+ 4u+T1X30J+PYT3/GfMv21EqY2NGjLF40zl4S+ARkxlyjIHh5imemiOfjQrimnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994086; a=rsa-sha256; cv=none; b=LJNne2HalSu2XAdSS7o9a+k7zGVgKkYbEM51bLaRQKBD+PoCjnFuO1J8fHu44I9y/NIn+0 +K1VdDCQixLRp0FM7l8zRsnYZYSE9HSMl1PWbXTvglGaiOtimsKZKfngnL5ZKXKvmYqWnT 5i7l9/zzwDz4tx/bALa/9iDzt03aVm+FmIr+gqzwWgZk2oQIz2HMeObAEA67BjZTebM4dr tUYoJAmFgIj2UwI19r1b/3nCqODxbiY3sv7/VwF4IEPBf2oL7AT6Usv8k7TRwudTmh4smn 4sxJOHUPQr0G/WPY50KvHxFccuWLGKwaxkGkB3viF6AcEVA66RaYCg7snEiUxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ai5lYLWxQGs3/1G+Z1y/+8j4tEXL0m2yxnGvgDxNmuQ=; b=xY6jqtj4oeLjkWPDb2/RkCUnvW7LaHZ0iA5KvgvtQVKSAmkb/f8rCUN2p3o4GOgVYcyupN 9i5Gcf7CwkZLmzzMZAzRbrhM/vsEjh6RcXlIZBEHvfVZgWYqKhJFdsKIe+8TdfBf1iUQiP nbmgL2xht8BK0+vsACr8aI2PyJZPEREXhtsIYY7Q33B8V9fjdlZauNEsKmpUwfF/vGHREG i52w4f0wIorUG5qOfdN0ItkcPyGq2hBPFogCmCd3uem2WvtvftUYI7HUrUJiSakRLIoyTr eV4pWUqAAHVuy2VQtG1L/5dcB37Cu7Iutb40uJ5CJuVqVwPtbFuJRtQ3LnD3yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsXk5p3kzXmK; Wed, 24 Apr 2024 21:28: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 43OLS60X086194; Wed, 24 Apr 2024 21:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLS6Gh086191; Wed, 24 Apr 2024 21:28:06 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:28:06 GMT Message-Id: <202404242128.43OLS6Gh086191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: feb6e2786dc5 - stable/14 - Add a few missed libclang_rt files to ObsoleteFiles.inc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: feb6e2786dc523a57a9c2384ed67cdb4970dde34 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=feb6e2786dc523a57a9c2384ed67cdb4970dde34 commit feb6e2786dc523a57a9c2384ed67cdb4970dde34 Author: Dimitry Andric AuthorDate: 2024-04-21 21:32:22 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:24 +0000 Add a few missed libclang_rt files to ObsoleteFiles.inc PR: 276104 Reported by: Mark Millard MFC after: 3 days (cherry picked from commit 0ab121e9f9a33dde06b292df02ec2eee03033e1f) --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6d3ba576de86..2b0766222429 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -325,6 +325,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -343,6 +344,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Wed Apr 24 21:28: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 4VPsXm0g5xz5J7xR; Wed, 24 Apr 2024 21:28: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 4VPsXm0CK3z4Syx; Wed, 24 Apr 2024 21:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tad2rOsLwLvB7HkeZcKcV5Ig1j3gtjZRxzcUMDmdnNA=; b=VM/wLLOQWUAlSfCtlqEeJe2blU/DrX0uC/pUmEFzQLYw1wmCHdf0TH9UaYdk1rbc7Dc/Bn sl71DHhC/jxCFsXB+hsppOSIyAcgkWk1kckVV3J9eazTAQVLKSIEpAPY5Yz6gqp7qBqF2o k/WoCCydqFigwp0o3P7fEYOgKxiZVNXP1PwFKXo2dBCARzxQw/RR+WUn1HFWnKrHZcXaNX Cs93AwU8bQCpDspJk0/8l2nWxxhhD9Jra0V9rkYG7Aa0F/bQvf0uP5Rc8eQSr6zExPEGhM DGAbBxBN4y/ElvVoxoTzftLu22v5je7V8uHmOZr1gUpMQoCZ6S6tGlK71pP4Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994088; a=rsa-sha256; cv=none; b=VPLx1Bh933iaTYyb36meAlC8FZVEX47XOqQRZisuvC3gGHeFBYz6Z7N31D12Kxs8hyxjPn 2++Fjf1/93eZhiz7F4hYbO+iJFbjddV8OSGXyRWJRUipKRGpDi60YlXwowJC2m3hK9a5GS WWDwxJz7SZnQnN9FMf60SdI+mP2k7CAUC402QXOU1vRFu11+2I90vPVoaYArMRhk9w/QVV CEBB5GqiDPBd20NCytyv3jLQqa6XDxMcYyCnDCS4A7aNa7SEX4BL5JJRhozP5IbHSwxRkP /fnNdNXMShxBBSI79cdSgnPUv71HAHSaxCz6kaTqIcDemLzwbw8hYkv3KyWnBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tad2rOsLwLvB7HkeZcKcV5Ig1j3gtjZRxzcUMDmdnNA=; b=wQEWe7JFDGqLdzvvse7ZxKSNyot+ayU8HE8zU7JfH+VQ+9Z5YrLwawUURXj+pfmf3TLQu5 ptDxe0l5aYIJ0zgt1vLHcxNa9A2qL+4aiTnEkf6M75VbzROk6oCCF2FO/PyZgN3UtpRiQT UEGOiyjoCCSyckCJAGI1OAKNskH/jIf8laCt4c8vwIehRY/5ESp5ltNRQHLN+PGqt3953M 1IN9GQGJrYb4jsXAqrna6rbjcq6+p0jVNQLHd0K+8/cT4h6kzpI+u4SCq1pKWZwlgZIBFQ SoX95yWGmEdQTNj8H1sP5m/I5qBIe01i1nnbQHlAbAmFv7wZF/NkSksMADP4cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsXl6wkBzXpk; Wed, 24 Apr 2024 21:28: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 43OLS7KK086247; Wed, 24 Apr 2024 21:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLS7qN086244; Wed, 24 Apr 2024 21:28:07 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:28:07 GMT Message-Id: <202404242128.43OLS7qN086244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 164f125311a6 - stable/14 - heimdal: Add 64-bit integer support to ASN.1 compiler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 164f125311a6cc0217ce9103aaefcfd31fb796bf Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=164f125311a6cc0217ce9103aaefcfd31fb796bf commit 164f125311a6cc0217ce9103aaefcfd31fb796bf Author: Dimitry Andric AuthorDate: 2024-04-16 18:56:37 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:52 +0000 heimdal: Add 64-bit integer support to ASN.1 compiler Import upstream 19d378f44: ASN.1 INTEGERs will now compile to C int64_t or uint64_t, depending on whether the constraint ranges include numbers that cannot be represented in 32-bit ints and whether they include negative numbers. Template backend support included. check-template is now built with --template, so we know we're testing it. Tests included. Also adjusts the generated files: * asn1parse.c, asn1parse.h (not strictly necessary, but nice to have) * der-protos.h, which needs a bunch of new prototypes. I copied these from a der-protos.h generated by the upstream build system, which uses a perl script for this. * adjust printf format strings for int64_t. Upstream uses %lld for this, but that is not portable, and leads to lots of -Werror warnings. This should fix target-dependent differences between headers generated by asn1_compile. For example, when cross compiling world from amd64 to i386, the generated cms_asn1.h header has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..-1), iv OCTET STRING, } while a native build on i386 has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..2147483647), iv OCTET STRING, } These are _both_ wrong, since the source file, cms.asn1, has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..4294967295), iv OCTET STRING -- exactly 8 octets } PR: 276960 Reviewed by: cy, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44814 Differential Revision: https://reviews.freebsd.org/D44815 (cherry picked from commit 1b7487592987c91020063a311a14dc15b6e58075) --- crypto/heimdal/lib/asn1/Makefile.am | 12 +++- crypto/heimdal/lib/asn1/asn1-template.h | 2 + crypto/heimdal/lib/asn1/asn1parse.c | 6 +- crypto/heimdal/lib/asn1/asn1parse.h | 2 +- crypto/heimdal/lib/asn1/asn1parse.y | 6 +- crypto/heimdal/lib/asn1/check-gen.c | 120 ++++++++++++++++++++++++++++++++ crypto/heimdal/lib/asn1/der-protos.h | 50 +++++++++++++ crypto/heimdal/lib/asn1/der_copy.c | 14 ++++ crypto/heimdal/lib/asn1/der_free.c | 12 ++++ crypto/heimdal/lib/asn1/der_get.c | 45 +++++++++++- crypto/heimdal/lib/asn1/der_length.c | 57 +++++++++++++++ crypto/heimdal/lib/asn1/der_put.c | 72 +++++++++++++++++++ crypto/heimdal/lib/asn1/gen.c | 20 +++--- crypto/heimdal/lib/asn1/gen_decode.c | 18 ++--- crypto/heimdal/lib/asn1/gen_encode.c | 12 ++-- crypto/heimdal/lib/asn1/gen_length.c | 12 ++-- crypto/heimdal/lib/asn1/gen_template.c | 22 +++--- crypto/heimdal/lib/asn1/lex.l | 2 +- crypto/heimdal/lib/asn1/symbol.h | 10 ++- crypto/heimdal/lib/asn1/template.c | 2 + crypto/heimdal/lib/asn1/test.asn1 | 2 + 21 files changed, 446 insertions(+), 52 deletions(-) diff --git a/crypto/heimdal/lib/asn1/Makefile.am b/crypto/heimdal/lib/asn1/Makefile.am index 47158b88aa42..608639aed276 100644 --- a/crypto/heimdal/lib/asn1/Makefile.am +++ b/crypto/heimdal/lib/asn1/Makefile.am @@ -37,6 +37,7 @@ gen_files_pkinit = asn1_pkinit_asn1.x gen_files_pkcs12 = asn1_pkcs12_asn1.x gen_files_pkcs8 = asn1_pkcs8_asn1.x gen_files_pkcs9 = asn1_pkcs9_asn1.x +gen_files_test_template = test_template_asn1-template.c gen_files_test = asn1_test_asn1.x gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x @@ -53,7 +54,7 @@ asn1_print_SOURCES = asn1_print.c check_der_SOURCES = check-der.c check-common.c check-common.h check_template_SOURCES = check-template.c check-common.c check-common.h -nodist_check_template_SOURCES = $(gen_files_test:.x=.c) +nodist_check_template_SOURCES = $(gen_files_test_template:.x=.c) dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) @@ -134,6 +135,7 @@ CLEANFILES = \ $(gen_files_pkcs12) \ $(gen_files_digest) \ $(gen_files_kx509) \ + $(gen_files_test_template) \ $(gen_files_test) $(nodist_check_gen_SOURCES) \ asn1_err.c asn1_err.h \ rfc2459_asn1_files rfc2459_asn1*.h* \ @@ -145,6 +147,7 @@ CLEANFILES = \ pkcs12_asn1_files pkcs12_asn1*.h* \ digest_asn1_files digest_asn1*.h* \ kx509_asn1_files kx509_asn1*.h* \ + test_template_asn1_files test_template_asn1*.h* \ test_asn1_files test_asn1*.h* dist_include_HEADERS = der.h heim_asn1.h der-protos.h der-private.h @@ -170,6 +173,7 @@ priv_headers += pkcs9_asn1-priv.h priv_headers += pkcs12_asn1-priv.h priv_headers += digest_asn1-priv.h priv_headers += kx509_asn1-priv.h +priv_headers += test_template_asn1.h test_template_asn1-priv.h priv_headers += test_asn1.h test_asn1-priv.h @@ -178,7 +182,7 @@ $(asn1_compile_OBJECTS): asn1parse.h asn1parse.c $(srcdir)/der-protos.h $(srcdir $(libasn1_la_OBJECTS): $(nodist_include_HEADERS) $(priv_headers) asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(libasn1base_la_OBJECTS): asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(check_gen_OBJECTS): test_asn1.h -$(check_template_OBJECTS): test_asn1_files +$(check_template_OBJECTS): test_template_asn1.h test_template_asn1_files $(asn1_print_OBJECTS): krb5_asn1.h asn1parse.h: asn1parse.c @@ -192,6 +196,7 @@ $(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files $(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files $(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files $(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files +$(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files $(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1 @@ -221,6 +226,9 @@ digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 $(ASN1_COMPILE) --one-code-file $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1) +test_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 + $(ASN1_COMPILE) --template --sequence=TESTSeqOf $(srcdir)/test.asn1 test_template_asn1 || (rm -f test_template_asn1_files ; exit 1) + test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 $(ASN1_COMPILE) --one-code-file --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1) diff --git a/crypto/heimdal/lib/asn1/asn1-template.h b/crypto/heimdal/lib/asn1/asn1-template.h index 107706ce8340..5fd6b812630f 100644 --- a/crypto/heimdal/lib/asn1/asn1-template.h +++ b/crypto/heimdal/lib/asn1/asn1-template.h @@ -118,7 +118,9 @@ enum template_types { A1T_IMEMBER = 0, A1T_HEIM_INTEGER, A1T_INTEGER, + A1T_INTEGER64, A1T_UNSIGNED, + A1T_UNSIGNED64, A1T_GENERAL_STRING, A1T_OCTET_STRING, A1T_OCTET_STRING_BER, diff --git a/crypto/heimdal/lib/asn1/asn1parse.c b/crypto/heimdal/lib/asn1/asn1parse.c index 0e04fabf6296..a305f4b0267b 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.c +++ b/crypto/heimdal/lib/asn1/asn1parse.c @@ -304,7 +304,7 @@ struct string_list { typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -1874,7 +1874,7 @@ yyreduce: lex_error_message("Non-integer in first part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); (yyval.range)->min = (yyvsp[(2) - (5)].value)->u.integervalue; - (yyval.range)->max = (yyvsp[(2) - (5)].value)->u.integervalue - 1; + (yyval.range)->max = INT_MAX; } break; @@ -1884,7 +1884,7 @@ yyreduce: if((yyvsp[(4) - (5)].value)->type != integervalue) lex_error_message("Non-integer in second part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(4) - (5)].value)->u.integervalue + 2; + (yyval.range)->min = INT_MIN; (yyval.range)->max = (yyvsp[(4) - (5)].value)->u.integervalue; } break; diff --git a/crypto/heimdal/lib/asn1/asn1parse.h b/crypto/heimdal/lib/asn1/asn1parse.h index 69b7d6dc1a4a..c1ced1df5a44 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.h +++ b/crypto/heimdal/lib/asn1/asn1parse.h @@ -224,7 +224,7 @@ typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; diff --git a/crypto/heimdal/lib/asn1/asn1parse.y b/crypto/heimdal/lib/asn1/asn1parse.y index e3bea6ce0ac9..b419676d3429 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.y +++ b/crypto/heimdal/lib/asn1/asn1parse.y @@ -69,7 +69,7 @@ struct string_list { %} %union { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -370,14 +370,14 @@ range : '(' Value RANGE Value ')' lex_error_message("Non-integer in first part of range"); $$ = ecalloc(1, sizeof(*$$)); $$->min = $2->u.integervalue; - $$->max = $2->u.integervalue - 1; + $$->max = INT_MAX; } | '(' kw_MIN RANGE Value ')' { if($4->type != integervalue) lex_error_message("Non-integer in second part of range"); $$ = ecalloc(1, sizeof(*$$)); - $$->min = $4->u.integervalue + 2; + $$->min = INT_MIN; $$->max = $4->u.integervalue; } | '(' Value ')' diff --git a/crypto/heimdal/lib/asn1/check-gen.c b/crypto/heimdal/lib/asn1/check-gen.c index e686f166cfa0..44699cab4356 100644 --- a/crypto/heimdal/lib/asn1/check-gen.c +++ b/crypto/heimdal/lib/asn1/check-gen.c @@ -764,6 +764,124 @@ check_tag_length(void) return failed; } +static int +check_tag_length64(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\x01\xff\xff\xff\xff"}, + { 1, 7, 7, "\x02\x05\x02\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x7f\xff\xff\xff\xff\xff\xff"}, + { 1, 10, 10, "\x02\x08\x00\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x7f\xff\xff\xff\xff\xff\xff\xff"}, + { 1, 11, 11, "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTuint64 values[] = {0, 8589934591LL, 8589934592LL, + 36028797018963967LL, 36028797018963968LL, + 9223372036854775807LL, 18446744073709551615ULL, + 0, 127, 128, 256, 512 }; + TESTuint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTuint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + +static int +check_tag_length64s(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x01"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x80\x00\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTint64 values[] = {0, -8589934591LL, -8589934592LL, + -36028797018963967LL, -36028797018963968LL, + -9223372036854775807LL, -36028797018963967LL, + 0, 127, 128, 256, 512 }; + TESTint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + static int cmp_TESTChoice (void *a, void *b) { @@ -1291,6 +1409,8 @@ main(int argc, char **argv) ret += test_cert(); ret += check_tag_length(); + ret += check_tag_length64(); + ret += check_tag_length64s(); ret += test_large_tag(); ret += test_choice(); diff --git a/crypto/heimdal/lib/asn1/der-protos.h b/crypto/heimdal/lib/asn1/der-protos.h index 3b3d81d175fb..9ebc78538a9e 100644 --- a/crypto/heimdal/lib/asn1/der-protos.h +++ b/crypto/heimdal/lib/asn1/der-protos.h @@ -67,6 +67,11 @@ der_copy_integer ( const int */*from*/, int */*to*/); +int +der_copy_integer64 ( + const int64_t */*from*/, + int64_t */*to*/); + int der_copy_octet_string ( const heim_octet_string */*from*/, @@ -92,6 +97,11 @@ der_copy_unsigned ( const unsigned */*from*/, unsigned */*to*/); +int +der_copy_unsigned64 ( + const uint64_t */*from*/, + uint64_t */*to*/); + int der_copy_utctime ( const time_t */*from*/, @@ -128,6 +138,9 @@ der_free_ia5_string (heim_ia5_string */*str*/); void der_free_integer (int */*i*/); +void +der_free_integer64 (int64_t */*i*/); + void der_free_octet_string (heim_octet_string */*k*/); @@ -143,6 +156,9 @@ der_free_universal_string (heim_universal_string */*k*/); void der_free_unsigned (unsigned */*u*/); +void +der_free_unsigned64 (uint64_t */*u*/); + void der_free_utctime (time_t */*t*/); @@ -214,6 +230,13 @@ der_get_integer ( int */*ret*/, size_t */*size*/); +int +der_get_integer64 ( + const unsigned char */*p*/, + size_t /*len*/, + int64_t */*ret*/, + size_t */*size*/); + int der_get_length ( const unsigned char */*p*/, @@ -284,6 +307,13 @@ der_get_unsigned ( unsigned */*ret*/, size_t */*size*/); +int +der_get_unsigned64 ( + const unsigned char */*p*/, + size_t /*len*/, + uint64_t */*ret*/, + size_t */*size*/); + int der_get_utctime ( const unsigned char */*p*/, @@ -367,6 +397,9 @@ der_length_ia5_string (const heim_ia5_string */*data*/); size_t der_length_integer (const int */*data*/); +size_t +der_length_integer64 (const int64_t */*data*/); + size_t der_length_len (size_t /*len*/); @@ -388,6 +421,9 @@ der_length_universal_string (const heim_universal_string */*data*/); size_t der_length_unsigned (const unsigned */*data*/); +size_t +der_length_unsigned64 (const uint64_t */*data*/); + size_t der_length_utctime (const time_t */*t*/); @@ -508,6 +544,13 @@ der_put_integer ( const int */*v*/, size_t */*size*/); +int +der_put_integer64 ( + unsigned char */*p*/, + size_t /*len*/, + const int64_t */*v*/, + size_t */*size*/); + int der_put_length ( unsigned char */*p*/, @@ -569,6 +612,13 @@ der_put_unsigned ( const unsigned */*v*/, size_t */*size*/); +int +der_put_unsigned64 ( + unsigned char */*p*/, + size_t /*len*/, + const uint64_t */*v*/, + size_t */*size*/); + int der_put_utctime ( unsigned char */*p*/, diff --git a/crypto/heimdal/lib/asn1/der_copy.c b/crypto/heimdal/lib/asn1/der_copy.c index abaaf8e5d740..4faf87014280 100644 --- a/crypto/heimdal/lib/asn1/der_copy.c +++ b/crypto/heimdal/lib/asn1/der_copy.c @@ -54,6 +54,13 @@ der_copy_integer (const int *from, int *to) return 0; } +int +der_copy_integer64 (const int64_t *from, int64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_unsigned (const unsigned *from, unsigned *to) { @@ -61,6 +68,13 @@ der_copy_unsigned (const unsigned *from, unsigned *to) return 0; } +int +der_copy_unsigned64 (const uint64_t *from, uint64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_generalized_time (const time_t *from, time_t *to) { diff --git a/crypto/heimdal/lib/asn1/der_free.c b/crypto/heimdal/lib/asn1/der_free.c index 4bae5fc2338f..1584cfcb299e 100644 --- a/crypto/heimdal/lib/asn1/der_free.c +++ b/crypto/heimdal/lib/asn1/der_free.c @@ -50,12 +50,24 @@ der_free_integer (int *i) *i = 0; } +void +der_free_integer64 (int64_t *i) +{ + *i = 0; +} + void der_free_unsigned (unsigned *u) { *u = 0; } +void +der_free_unsigned64 (uint64_t *u) +{ + *u = 0; +} + void der_free_generalized_time(time_t *t) { diff --git a/crypto/heimdal/lib/asn1/der_get.c b/crypto/heimdal/lib/asn1/der_get.c index 3112da86f93b..8a456d4d983d 100644 --- a/crypto/heimdal/lib/asn1/der_get.c +++ b/crypto/heimdal/lib/asn1/der_get.c @@ -48,9 +48,28 @@ der_get_unsigned (const unsigned char *p, size_t len, unsigned val = 0; size_t oldlen = len; - if (len == sizeof(unsigned) + 1 && p[0] == 0) + if (len == sizeof(val) + 1 && p[0] == 0) ; - else if (len > sizeof(unsigned)) + else if (len > sizeof(val)) + return ASN1_OVERRUN; + + while (len--) + val = val * 256 + *p++; + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_unsigned64 (const unsigned char *p, size_t len, + uint64_t *ret, size_t *size) +{ + uint64_t val = 0; + size_t oldlen = len; + + if (len == sizeof(val) + 1 && p[0] == 0) + ; + else if (len > sizeof(val)) return ASN1_OVERRUN; while (len--) @@ -67,7 +86,27 @@ der_get_integer (const unsigned char *p, size_t len, int val = 0; size_t oldlen = len; - if (len > sizeof(int)) + if (len > sizeof(val)) + return ASN1_OVERRUN; + + if (len > 0) { + val = (signed char)*p++; + while (--len) + val = val * 256 + *p++; + } + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_integer64 (const unsigned char *p, size_t len, + int64_t *ret, size_t *size) +{ + int64_t val = 0; + size_t oldlen = len; + + if (len > sizeof(val)) return ASN1_OVERRUN; if (len > 0) { diff --git a/crypto/heimdal/lib/asn1/der_length.c b/crypto/heimdal/lib/asn1/der_length.c index db82025861ea..684ba9bc6f32 100644 --- a/crypto/heimdal/lib/asn1/der_length.c +++ b/crypto/heimdal/lib/asn1/der_length.c @@ -55,6 +55,24 @@ _heim_len_unsigned (unsigned val) return ret; } +size_t +_heim_len_unsigned64 (uint64_t val) +{ + size_t ret = 0; + int last_val_gt_128; + + do { + ++ret; + last_val_gt_128 = (val >= 128); + val /= 256; + } while (val); + + if(last_val_gt_128) + ret++; + + return ret; +} + size_t _heim_len_int (int val) { @@ -82,6 +100,33 @@ _heim_len_int (int val) return ret; } +size_t +_heim_len_int64 (int64_t val) +{ + unsigned char q; + size_t ret = 0; + + if (val >= 0) { + do { + q = val % 256; + ret++; + val /= 256; + } while(val); + if(q >= 128) + ret++; + } else { + val = ~val; + do { + q = ~(val % 256); + ret++; + val /= 256; + } while(val); + if(q < 128) + ret++; + } + return ret; +} + static size_t len_oid (const heim_oid *oid) { @@ -134,12 +179,24 @@ der_length_integer (const int *data) return _heim_len_int (*data); } +size_t +der_length_integer64 (const int64_t *data) +{ + return _heim_len_int64 (*data); +} + size_t der_length_unsigned (const unsigned *data) { return _heim_len_unsigned(*data); } +size_t +der_length_unsigned64 (const uint64_t *data) +{ + return _heim_len_unsigned64(*data); +} + size_t der_length_enumerated (const unsigned *data) { diff --git a/crypto/heimdal/lib/asn1/der_put.c b/crypto/heimdal/lib/asn1/der_put.c index 0b276d1ebdce..0ccb181c0b39 100644 --- a/crypto/heimdal/lib/asn1/der_put.c +++ b/crypto/heimdal/lib/asn1/der_put.c @@ -75,6 +75,38 @@ der_put_unsigned (unsigned char *p, size_t len, const unsigned *v, size_t *size) } } +int +der_put_unsigned64 (unsigned char *p, size_t len, const uint64_t *v, size_t *size) +{ + unsigned char *base = p; + uint64_t val = *v; + + if (val) { + while (len > 0 && val) { + *p-- = val % 256; + val /= 256; + --len; + } + if (val != 0) + return ASN1_OVERFLOW; + else { + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + } + *size = base - p; + return 0; + } + } else if (len < 1) + return ASN1_OVERFLOW; + else { + *p = 0; + *size = 1; + return 0; + } +} + int der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) { @@ -115,6 +147,46 @@ der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) return 0; } +int +der_put_integer64 (unsigned char *p, size_t len, const int64_t *v, size_t *size) +{ + unsigned char *base = p; + int64_t val = *v; + + if(val >= 0) { + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = val % 256; + len--; + val /= 256; + } while(val); + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + len--; + } + } else { + val = ~val; + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = ~(val % 256); + len--; + val /= 256; + } while(val); + if(p[1] < 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0xff; + len--; + } + } + *size = base - p; + return 0; +} + int der_put_length (unsigned char *p, size_t len, size_t val, size_t *size) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 2194b329ce1d..76a893c5ade7 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -303,7 +303,7 @@ gen_assign_defval(const char *var, struct value *val) fprintf(codefile, "if((%s = strdup(\"%s\")) == NULL)\nreturn ENOMEM;\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "%s = %d;\n", var, val->u.integervalue); + fprintf(codefile, "%s = %" PRId64 ";\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -324,7 +324,7 @@ gen_compare_defval(const char *var, struct value *val) fprintf(codefile, "if(strcmp(%s, \"%s\") != 0)\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "if(%s != %d)\n", var, val->u.integervalue); + fprintf(codefile, "if(%s != %" PRId64 ")\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -397,7 +397,7 @@ generate_constant (const Symbol *s) case booleanvalue: break; case integervalue: - fprintf (headerfile, "enum { %s = %d };\n\n", + fprintf (headerfile, "enum { %s = %" PRId64 " };\n\n", s->gen_name, s->value->u.integervalue); break; case nullvalue: @@ -540,7 +540,7 @@ define_asn1 (int level, Type *t) if(t->members == NULL) { fprintf (headerfile, "INTEGER"); if (t->range) - fprintf (headerfile, " (%d..%d)", + fprintf (headerfile, " (%" PRId64 "..%" PRId64 ")", t->range->min, t->range->max); } else { Member *m; @@ -723,14 +723,16 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "} %s;\n", name); } else if (t->range == NULL) { fprintf (headerfile, "heim_integer %s;\n", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + fprintf (headerfile, "int64_t %s;\n", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + fprintf (headerfile, "uint64_t %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { fprintf (headerfile, "int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - fprintf (headerfile, "unsigned int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_decode.c b/crypto/heimdal/lib/asn1/gen_decode.c index bf2d93b806df..c821ee1481a7 100644 --- a/crypto/heimdal/lib/asn1/gen_decode.c +++ b/crypto/heimdal/lib/asn1/gen_decode.c @@ -189,19 +189,19 @@ range_check(const char *name, { if (r->min == r->max + 2 || r->min < r->max) fprintf (codefile, - "if ((%s)->%s > %d) {\n" + "if ((%s)->%s > %" PRId64 ") {\n" "e = ASN1_MAX_CONSTRAINT; %s;\n" "}\n", name, length, r->max, forwstr); if (r->min - 1 == r->max || r->min < r->max) fprintf (codefile, - "if ((%s)->%s < %d) {\n" + "if ((%s)->%s < %" PRId64 ") {\n" "e = ASN1_MIN_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); if (r->max == r->min) fprintf (codefile, - "if ((%s)->%s != %d) {\n" + "if ((%s)->%s != %" PRId64 ") {\n" "e = ASN1_EXACT_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); @@ -252,14 +252,16 @@ decode_type (const char *name, const Type *t, int optional, name); } else if (t->range == NULL) { decode_primitive ("heim_integer", name, forwstr); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + decode_primitive ("integer64", name, forwstr); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + decode_primitive ("unsigned64", name, forwstr); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { decode_primitive ("integer", name, forwstr); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - decode_primitive ("unsigned", name, forwstr); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { decode_primitive ("unsigned", name, forwstr); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_encode.c b/crypto/heimdal/lib/asn1/gen_encode.c index 1bd47484d83a..ac43b6a0d364 100644 --- a/crypto/heimdal/lib/asn1/gen_encode.c +++ b/crypto/heimdal/lib/asn1/gen_encode.c @@ -129,14 +129,16 @@ encode_type (const char *name, const Type *t, const char *tmpstr) fprintf(codefile, "}\n;"); } else if (t->range == NULL) { encode_primitive ("heim_integer", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + encode_primitive ("integer64", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + encode_primitive ("unsigned64", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { encode_primitive ("integer", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - encode_primitive ("unsigned", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { encode_primitive ("unsigned", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); constructed = 0; break; diff --git a/crypto/heimdal/lib/asn1/gen_length.c b/crypto/heimdal/lib/asn1/gen_length.c index 20b5adfe5d02..f12246e676ec 100644 --- a/crypto/heimdal/lib/asn1/gen_length.c +++ b/crypto/heimdal/lib/asn1/gen_length.c @@ -80,14 +80,16 @@ length_type (const char *name, const Type *t, fprintf(codefile, "}\n"); } else if (t->range == NULL) { length_primitive ("heim_integer", name, variable); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + length_primitive ("integer64", name, variable); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + length_primitive ("unsigned64", name, variable); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { length_primitive ("integer", name, variable); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - length_primitive ("unsigned", name, variable); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { length_primitive ("unsigned", name, variable); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; diff --git a/crypto/heimdal/lib/asn1/gen_template.c b/crypto/heimdal/lib/asn1/gen_template.c index edd68e122380..15bf7d30c498 100644 --- a/crypto/heimdal/lib/asn1/gen_template.c +++ b/crypto/heimdal/lib/asn1/gen_template.c @@ -52,11 +52,13 @@ integer_symbol(const char *basename, const Type *t) return "int"; /* XXX enum foo */ else if (t->range == NULL) return "heim_integer"; - else if (t->range->min == INT_MIN && t->range->max == INT_MAX) + else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) + return "int64_t"; + else if (t->range->min >= 0 && t->range->max > UINT_MAX) *** 100 LINES SKIPPED *** From nobody Wed Apr 24 21:28: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 4VPsXn46PFz5J87l; Wed, 24 Apr 2024 21:28: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 4VPsXn1XN2z4T2b; Wed, 24 Apr 2024 21:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8CQasD7ilfgy4IS8husfxa84nicp5qspuA1ThHW9Rk=; b=t4D1mj+UIhCJ5/BtGsJkEDJN2FLwijqg5l1xIFdIkUi72QNvuEzyViCioH5CaNhzrwAy4E UlpS8xXt0aiimKcLeaiw2AsKtC5FFeucZ3jWcXZ+VyOLU8MyfkNv9m7KsEFWevbYLlHGjQ tYn6q/CsuptElRUlGeOiklYkHX2iAPFV49eamSvJQQDNMUlpLY3tXd3jthEpR3c7f2p9n8 u2XjOpNzpfRoRXk5DQXvne6NvzuA0zTmASLSoBhrradKvwI4dQgcGLE0+Qex7kVhH3NWZ8 SE7z9i9/linsedupYtY4JQeJSjsY+7kdxgj4Ui+zeLFOQOzOhGeHkXEG4Q47xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994089; a=rsa-sha256; cv=none; b=GodAHNjdD0Pn0bFRcljQgHil9a9ZBNMdVwvqZBq/esXuNYBZYJswlgR6pGUh0xgoeqeEm4 WiXgSFdyLkmrk1bhysrxHXZOVxX0J9r5xjW22ArAICYCWmItXcVvLdtLvCzwQGRQlvLhW+ pHyEcfXswNDE1zFYan2fWhvg6vFXtVcMdWgeTSZ61Htdn7IEN1CLttW5g9uH4U6pnG06bU lZTfiwsfNdSOPTP3J9SNHxOiK/IaG+fmy5XLJCBt9ZVex9r/QmRIGMyu6ElQp6NeU/xHzC 7bTWHDprPD3QsjlVJouXmxu2F/GNaQ22TxmQGo56fZoc87KiH5HIs11zotb2Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8CQasD7ilfgy4IS8husfxa84nicp5qspuA1ThHW9Rk=; b=LX+tt9XgQf3/x1G81eSN8eLzc6ytYRhkiSmvEZw47qP7Gym5TDWqx7lCL8kURmjIWBJOVb TTXlfMjAW224B76ofQD9duDi3yg0mfNAF/yyODlW7d13FJrVuf4Bloi8jkFPnEjnqloF/B fkQ85khsckYl5STOTRpghSnpfwLdE7UyUeiKlheQOTnU/ImL3tJqahXqlrh5GAz3XB20pP 1xwCpx15+sm0QCEI4xs4iECNSRm8eYDr+oBGQgqboY+vKRi3nX2+6ZgvxrNoDnayXKKtDW cViua25CF3b9iglSYryNNDo7DuWpEAOJVLYmJUovPzHTjdFGZNIFKeqHqWalLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsXn0sP2zXMK; Wed, 24 Apr 2024 21:28: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 43OLS9nL086299; Wed, 24 Apr 2024 21:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLS9Y3086296; Wed, 24 Apr 2024 21:28:09 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:28:09 GMT Message-Id: <202404242128.43OLS9Y3086296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 689dbdedd8bd - stable/14 - heimdal: asn1: Use unsigned bitfields for named bitsets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 689dbdedd8bdaa0e6c7149a7a26dc77ba9db886e Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=689dbdedd8bdaa0e6c7149a7a26dc77ba9db886e commit 689dbdedd8bdaa0e6c7149a7a26dc77ba9db886e Author: Dimitry Andric AuthorDate: 2024-04-17 17:49:30 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:27:11 +0000 heimdal: asn1: Use unsigned bitfields for named bitsets Import upstream 6747e1628: asn1: Use unsigned bitfields for named bitsets Signed 1-bit bitfields are undefined in C. This should fix the following warnings, which for unknown reasons are errors in CI: /usr/src/crypto/heimdal/lib/hx509/ca.c:1020:22: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1020 | ku.digitalSignature = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1021:21: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1021 | ku.keyEncipherment = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1028:17: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1028 | ku.keyCertSign = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1029:13: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1029 | ku.cRLSign = 1; | ^ ~ PR: 276960 Fixes: 1b7487592987 MFC after: 1 week (cherry picked from commit 219b6e442308d5353b2af5f0771ce9b887b70754) --- crypto/heimdal/lib/asn1/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 76a893c5ade7..f35d41667a57 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -727,10 +727,10 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "int64_t %s;\n", name); } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { fprintf (headerfile, "uint64_t %s;\n", name); - } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { - fprintf (headerfile, "int %s;\n", name); } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { + fprintf (headerfile, "int %s;\n", name); } else errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); From nobody Wed Apr 24 21:29: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 4VPsZR3CN8z5J8FD; Wed, 24 Apr 2024 21:29: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 4VPsZR2dGGz4VXf; Wed, 24 Apr 2024 21:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a9m37bkuM7Hypp3bKL2jyPMhvUQNJDP2esPWiNG7pY=; b=GjkfJPjVWKSe8gbQopwfg1gRqcuKBztBLC4x1Z/8j8QI7PnzAhmkI76l6Mnyn3BgFdwKl6 Ve4qtNFC0WTPyHSP9FLRVWqKmdzRCScHAeDak6oSHDK4G+ZCa1J1ryYGO3f2xyG8VNDb0T eucjPn7neZBk5ANy+4MkqHb0BYaObaTawObl3ffM9IqK7OXE3m5NfnNNhmyMzOS1gb/kXw KE1pDXlfOV3aacB2a3n4EA+2uaIY/fxxo2xUuAo5W82bQmCBxfso4PfcO/ZkZnRGcsmAC4 dCh4IUyDajThcn7MODR+za2d6j1gTd5xET/uINsgfg5ruHYwmuwiUysaR1BwDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994175; a=rsa-sha256; cv=none; b=JXxVCN9yNbieAz34ZBM8zJhIVjREDZjD+lb2QhoHkUPHyLbNZjFx+ZIWZnkrHCuAByeOOu Xrzgg6AhSuA4Tt/+cKrHjAOtA1Bx9EV0TYrtDtMeUQ28AN9sm9thmGBA7rG9ZPN2Uetfg+ U17pMmhpWwwxQC5oGWc5Q/p7DGImPSDROoD7cQQxrj5ApzGeYrRQV11/iVshQvq4m8aHED iMFqXtXFNoUkgTzg7o2128VllkTFiyHCYjKAj2rhA73A903GFvb+3N3eD1+wEAvd8+DVdJ BoiJiVMQty2GGRgPUMbf7EsXFNjTKBU5Rhf+X5fztFCftSeXixSDEyhovoM4Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8a9m37bkuM7Hypp3bKL2jyPMhvUQNJDP2esPWiNG7pY=; b=i98l6b0g9gGrhLhiOEfPfv6iUFOPjZoIcBg+hGB9ZJ97mzCPk5UOgtkzZGqLi/fyY7wiq/ PIXlV5j5Xuiy0AbGSYRFRl//Rb7fRGW9xxfWoU5ro+oH/ahQoYtOoGWS1I8aY17gZpJQyA E9jrB2EApsZYqTppPfjxh/FxjS9RbbwCiT6mzKatdP2AfkgErGCR0GShU8/McBhfOO8TJi HRN8CoHMsLyum2q0TtuiHHEwhp51Oofo/nybIJgR5csoGob5ag0506L3IlISjCrw2yqeMn 8xGTcPjJAB1+hdmw2Kibqnvrdsb5hwNwnbwHlPtbOrJHJLoO7dAXOGVYd/VIdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsZR2F3pzXMN; Wed, 24 Apr 2024 21:29: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 43OLTZcE086805; Wed, 24 Apr 2024 21:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLTZse086802; Wed, 24 Apr 2024 21:29:35 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:29:35 GMT Message-Id: <202404242129.43OLTZse086802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8b4cf1092b65 - stable/13 - Add a few missed libclang_rt files to ObsoleteFiles.inc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b4cf1092b65d941d7b62fa843621c9c86187e32 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4cf1092b65d941d7b62fa843621c9c86187e32 commit 8b4cf1092b65d941d7b62fa843621c9c86187e32 Author: Dimitry Andric AuthorDate: 2024-04-21 21:32:22 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:28 +0000 Add a few missed libclang_rt files to ObsoleteFiles.inc PR: 276104 Reported by: Mark Millard MFC after: 3 days (cherry picked from commit 0ab121e9f9a33dde06b292df02ec2eee03033e1f) --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 55479a7f6bfc..d759e7db2bc6 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -325,6 +325,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -343,6 +344,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Wed Apr 24 21:29: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 4VPsZS50VBz5J8V8; Wed, 24 Apr 2024 21:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPsZS3Wq7z4VXg; Wed, 24 Apr 2024 21:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PD77azksROonivNYopXOLHWMI/Sq5azqBLIx+uktuCY=; b=MS5eEGz4maFKKTLL8t4a7xt2KKG8nbuNWofc9oSOHjKv+uNAdFUHU3Uxli9MIcaAJb0+1q EMWlPtChWaBHFGQXc1JV0Wl0eoRBWzv86BDnT4uKxavGH58I9hjpzXuM6lsapQ1h3ME5wQ ds5qcKyMCFWgdZ7xaougsZul6J+Dgisd3us78Ma+Y9yeKBQZWyId//EuczjlxhilVqiHSW iAnrmciS9h9qg2cos+tQxW3rnDZjh6y0A6urlOFzE1PAiex1PbIX1jkZbaDdOE7X/M1E2S wBYqs9B3WOc0O0d9sgsQzkhcxVclCKE99DOVsZW5WGar8m+of2bMYrd/+kA+ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994176; a=rsa-sha256; cv=none; b=ZPCPD+A/A3apQsNMegV8jh117EER29gmSKIH+MkuNCHApQM6UcHkDm23HPDPDnbCb06g5F vVPk0XDL/GkxIalKBkLgZOvUQAurYEBy+k/QRRUg2WDzP6l9UwdwvJinrMTkO4vV+rP1kB ytKLWvjDay6UttF5XmqsgOTMRscjCzv+DWLjyB2oJK2ja7VcySPto1shYznrTGbrkPOvrA rW7Wds097EOJOl0c0wz/j91uAlslDGevbZTyP4swac7A1H0KzOBxjTTW8u4YwG3t5flYR+ Nd1XMXF/GcztzbOZ5cAPbnF1awPX7n4o3fKqKKoecqFL5a84rHCMZlZfixe/8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PD77azksROonivNYopXOLHWMI/Sq5azqBLIx+uktuCY=; b=CNv9VZrzubafXiUrPVeeHE8yxap0PUXwigjkwunKrr2mt+t5H9wbZIGYyoG6hBLiCgLvp/ WoHUXC52bbyvOTZyp2v2A27HZmPjfGYKqIoDP1k9bJFwRuTMdoxWS78rC6OiE0uAS01kY3 Bl4m5mVq9gHT8blKt/yMxDAB32XGaM+6pDcfDjScOasDuiFpVZVqiWLxDQaUrIlGlcYOkO fe2XTnpWGpflAJdYnC4oRRJebOTxsCqn9QNV+e1UdmYIq4kmQ14ru/Z8OkP+mZ5VJZ1p5D 1Xo9dQv6x83EQW9tpJxdj1Ka8fXUT0Us+DOsOG9kN1KVf52AGB9CVXcsmQOqtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsZS36tmzXMP; Wed, 24 Apr 2024 21:29: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 43OLTaLa086860; Wed, 24 Apr 2024 21:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLTajv086857; Wed, 24 Apr 2024 21:29:36 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:29:36 GMT Message-Id: <202404242129.43OLTajv086857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 2efe30782cd9 - stable/13 - heimdal: Add 64-bit integer support to ASN.1 compiler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2efe30782cd92ef975eb4d05c53bac1d8a7e9f46 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2efe30782cd92ef975eb4d05c53bac1d8a7e9f46 commit 2efe30782cd92ef975eb4d05c53bac1d8a7e9f46 Author: Dimitry Andric AuthorDate: 2024-04-16 18:56:37 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:26:47 +0000 heimdal: Add 64-bit integer support to ASN.1 compiler Import upstream 19d378f44: ASN.1 INTEGERs will now compile to C int64_t or uint64_t, depending on whether the constraint ranges include numbers that cannot be represented in 32-bit ints and whether they include negative numbers. Template backend support included. check-template is now built with --template, so we know we're testing it. Tests included. Also adjusts the generated files: * asn1parse.c, asn1parse.h (not strictly necessary, but nice to have) * der-protos.h, which needs a bunch of new prototypes. I copied these from a der-protos.h generated by the upstream build system, which uses a perl script for this. * adjust printf format strings for int64_t. Upstream uses %lld for this, but that is not portable, and leads to lots of -Werror warnings. This should fix target-dependent differences between headers generated by asn1_compile. For example, when cross compiling world from amd64 to i386, the generated cms_asn1.h header has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..-1), iv OCTET STRING, } while a native build on i386 has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..2147483647), iv OCTET STRING, } These are _both_ wrong, since the source file, cms.asn1, has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..4294967295), iv OCTET STRING -- exactly 8 octets } PR: 276960 Reviewed by: cy, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44814 Differential Revision: https://reviews.freebsd.org/D44815 (cherry picked from commit 1b7487592987c91020063a311a14dc15b6e58075) --- crypto/heimdal/lib/asn1/Makefile.am | 12 +++- crypto/heimdal/lib/asn1/asn1-template.h | 2 + crypto/heimdal/lib/asn1/asn1parse.c | 6 +- crypto/heimdal/lib/asn1/asn1parse.h | 2 +- crypto/heimdal/lib/asn1/asn1parse.y | 6 +- crypto/heimdal/lib/asn1/check-gen.c | 120 ++++++++++++++++++++++++++++++++ crypto/heimdal/lib/asn1/der-protos.h | 50 +++++++++++++ crypto/heimdal/lib/asn1/der_copy.c | 14 ++++ crypto/heimdal/lib/asn1/der_free.c | 12 ++++ crypto/heimdal/lib/asn1/der_get.c | 45 +++++++++++- crypto/heimdal/lib/asn1/der_length.c | 57 +++++++++++++++ crypto/heimdal/lib/asn1/der_put.c | 72 +++++++++++++++++++ crypto/heimdal/lib/asn1/gen.c | 20 +++--- crypto/heimdal/lib/asn1/gen_decode.c | 18 ++--- crypto/heimdal/lib/asn1/gen_encode.c | 12 ++-- crypto/heimdal/lib/asn1/gen_length.c | 12 ++-- crypto/heimdal/lib/asn1/gen_template.c | 22 +++--- crypto/heimdal/lib/asn1/lex.l | 2 +- crypto/heimdal/lib/asn1/symbol.h | 10 ++- crypto/heimdal/lib/asn1/template.c | 2 + crypto/heimdal/lib/asn1/test.asn1 | 2 + 21 files changed, 446 insertions(+), 52 deletions(-) diff --git a/crypto/heimdal/lib/asn1/Makefile.am b/crypto/heimdal/lib/asn1/Makefile.am index 47158b88aa42..608639aed276 100644 --- a/crypto/heimdal/lib/asn1/Makefile.am +++ b/crypto/heimdal/lib/asn1/Makefile.am @@ -37,6 +37,7 @@ gen_files_pkinit = asn1_pkinit_asn1.x gen_files_pkcs12 = asn1_pkcs12_asn1.x gen_files_pkcs8 = asn1_pkcs8_asn1.x gen_files_pkcs9 = asn1_pkcs9_asn1.x +gen_files_test_template = test_template_asn1-template.c gen_files_test = asn1_test_asn1.x gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x @@ -53,7 +54,7 @@ asn1_print_SOURCES = asn1_print.c check_der_SOURCES = check-der.c check-common.c check-common.h check_template_SOURCES = check-template.c check-common.c check-common.h -nodist_check_template_SOURCES = $(gen_files_test:.x=.c) +nodist_check_template_SOURCES = $(gen_files_test_template:.x=.c) dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) @@ -134,6 +135,7 @@ CLEANFILES = \ $(gen_files_pkcs12) \ $(gen_files_digest) \ $(gen_files_kx509) \ + $(gen_files_test_template) \ $(gen_files_test) $(nodist_check_gen_SOURCES) \ asn1_err.c asn1_err.h \ rfc2459_asn1_files rfc2459_asn1*.h* \ @@ -145,6 +147,7 @@ CLEANFILES = \ pkcs12_asn1_files pkcs12_asn1*.h* \ digest_asn1_files digest_asn1*.h* \ kx509_asn1_files kx509_asn1*.h* \ + test_template_asn1_files test_template_asn1*.h* \ test_asn1_files test_asn1*.h* dist_include_HEADERS = der.h heim_asn1.h der-protos.h der-private.h @@ -170,6 +173,7 @@ priv_headers += pkcs9_asn1-priv.h priv_headers += pkcs12_asn1-priv.h priv_headers += digest_asn1-priv.h priv_headers += kx509_asn1-priv.h +priv_headers += test_template_asn1.h test_template_asn1-priv.h priv_headers += test_asn1.h test_asn1-priv.h @@ -178,7 +182,7 @@ $(asn1_compile_OBJECTS): asn1parse.h asn1parse.c $(srcdir)/der-protos.h $(srcdir $(libasn1_la_OBJECTS): $(nodist_include_HEADERS) $(priv_headers) asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(libasn1base_la_OBJECTS): asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(check_gen_OBJECTS): test_asn1.h -$(check_template_OBJECTS): test_asn1_files +$(check_template_OBJECTS): test_template_asn1.h test_template_asn1_files $(asn1_print_OBJECTS): krb5_asn1.h asn1parse.h: asn1parse.c @@ -192,6 +196,7 @@ $(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files $(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files $(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files $(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files +$(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files $(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1 @@ -221,6 +226,9 @@ digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 $(ASN1_COMPILE) --one-code-file $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1) +test_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 + $(ASN1_COMPILE) --template --sequence=TESTSeqOf $(srcdir)/test.asn1 test_template_asn1 || (rm -f test_template_asn1_files ; exit 1) + test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 $(ASN1_COMPILE) --one-code-file --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1) diff --git a/crypto/heimdal/lib/asn1/asn1-template.h b/crypto/heimdal/lib/asn1/asn1-template.h index 107706ce8340..5fd6b812630f 100644 --- a/crypto/heimdal/lib/asn1/asn1-template.h +++ b/crypto/heimdal/lib/asn1/asn1-template.h @@ -118,7 +118,9 @@ enum template_types { A1T_IMEMBER = 0, A1T_HEIM_INTEGER, A1T_INTEGER, + A1T_INTEGER64, A1T_UNSIGNED, + A1T_UNSIGNED64, A1T_GENERAL_STRING, A1T_OCTET_STRING, A1T_OCTET_STRING_BER, diff --git a/crypto/heimdal/lib/asn1/asn1parse.c b/crypto/heimdal/lib/asn1/asn1parse.c index 0e04fabf6296..a305f4b0267b 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.c +++ b/crypto/heimdal/lib/asn1/asn1parse.c @@ -304,7 +304,7 @@ struct string_list { typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -1874,7 +1874,7 @@ yyreduce: lex_error_message("Non-integer in first part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); (yyval.range)->min = (yyvsp[(2) - (5)].value)->u.integervalue; - (yyval.range)->max = (yyvsp[(2) - (5)].value)->u.integervalue - 1; + (yyval.range)->max = INT_MAX; } break; @@ -1884,7 +1884,7 @@ yyreduce: if((yyvsp[(4) - (5)].value)->type != integervalue) lex_error_message("Non-integer in second part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(4) - (5)].value)->u.integervalue + 2; + (yyval.range)->min = INT_MIN; (yyval.range)->max = (yyvsp[(4) - (5)].value)->u.integervalue; } break; diff --git a/crypto/heimdal/lib/asn1/asn1parse.h b/crypto/heimdal/lib/asn1/asn1parse.h index 69b7d6dc1a4a..c1ced1df5a44 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.h +++ b/crypto/heimdal/lib/asn1/asn1parse.h @@ -224,7 +224,7 @@ typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; diff --git a/crypto/heimdal/lib/asn1/asn1parse.y b/crypto/heimdal/lib/asn1/asn1parse.y index e3bea6ce0ac9..b419676d3429 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.y +++ b/crypto/heimdal/lib/asn1/asn1parse.y @@ -69,7 +69,7 @@ struct string_list { %} %union { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -370,14 +370,14 @@ range : '(' Value RANGE Value ')' lex_error_message("Non-integer in first part of range"); $$ = ecalloc(1, sizeof(*$$)); $$->min = $2->u.integervalue; - $$->max = $2->u.integervalue - 1; + $$->max = INT_MAX; } | '(' kw_MIN RANGE Value ')' { if($4->type != integervalue) lex_error_message("Non-integer in second part of range"); $$ = ecalloc(1, sizeof(*$$)); - $$->min = $4->u.integervalue + 2; + $$->min = INT_MIN; $$->max = $4->u.integervalue; } | '(' Value ')' diff --git a/crypto/heimdal/lib/asn1/check-gen.c b/crypto/heimdal/lib/asn1/check-gen.c index e686f166cfa0..44699cab4356 100644 --- a/crypto/heimdal/lib/asn1/check-gen.c +++ b/crypto/heimdal/lib/asn1/check-gen.c @@ -764,6 +764,124 @@ check_tag_length(void) return failed; } +static int +check_tag_length64(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\x01\xff\xff\xff\xff"}, + { 1, 7, 7, "\x02\x05\x02\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x7f\xff\xff\xff\xff\xff\xff"}, + { 1, 10, 10, "\x02\x08\x00\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x7f\xff\xff\xff\xff\xff\xff\xff"}, + { 1, 11, 11, "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTuint64 values[] = {0, 8589934591LL, 8589934592LL, + 36028797018963967LL, 36028797018963968LL, + 9223372036854775807LL, 18446744073709551615ULL, + 0, 127, 128, 256, 512 }; + TESTuint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTuint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + +static int +check_tag_length64s(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x01"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x80\x00\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTint64 values[] = {0, -8589934591LL, -8589934592LL, + -36028797018963967LL, -36028797018963968LL, + -9223372036854775807LL, -36028797018963967LL, + 0, 127, 128, 256, 512 }; + TESTint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + static int cmp_TESTChoice (void *a, void *b) { @@ -1291,6 +1409,8 @@ main(int argc, char **argv) ret += test_cert(); ret += check_tag_length(); + ret += check_tag_length64(); + ret += check_tag_length64s(); ret += test_large_tag(); ret += test_choice(); diff --git a/crypto/heimdal/lib/asn1/der-protos.h b/crypto/heimdal/lib/asn1/der-protos.h index 3b3d81d175fb..9ebc78538a9e 100644 --- a/crypto/heimdal/lib/asn1/der-protos.h +++ b/crypto/heimdal/lib/asn1/der-protos.h @@ -67,6 +67,11 @@ der_copy_integer ( const int */*from*/, int */*to*/); +int +der_copy_integer64 ( + const int64_t */*from*/, + int64_t */*to*/); + int der_copy_octet_string ( const heim_octet_string */*from*/, @@ -92,6 +97,11 @@ der_copy_unsigned ( const unsigned */*from*/, unsigned */*to*/); +int +der_copy_unsigned64 ( + const uint64_t */*from*/, + uint64_t */*to*/); + int der_copy_utctime ( const time_t */*from*/, @@ -128,6 +138,9 @@ der_free_ia5_string (heim_ia5_string */*str*/); void der_free_integer (int */*i*/); +void +der_free_integer64 (int64_t */*i*/); + void der_free_octet_string (heim_octet_string */*k*/); @@ -143,6 +156,9 @@ der_free_universal_string (heim_universal_string */*k*/); void der_free_unsigned (unsigned */*u*/); +void +der_free_unsigned64 (uint64_t */*u*/); + void der_free_utctime (time_t */*t*/); @@ -214,6 +230,13 @@ der_get_integer ( int */*ret*/, size_t */*size*/); +int +der_get_integer64 ( + const unsigned char */*p*/, + size_t /*len*/, + int64_t */*ret*/, + size_t */*size*/); + int der_get_length ( const unsigned char */*p*/, @@ -284,6 +307,13 @@ der_get_unsigned ( unsigned */*ret*/, size_t */*size*/); +int +der_get_unsigned64 ( + const unsigned char */*p*/, + size_t /*len*/, + uint64_t */*ret*/, + size_t */*size*/); + int der_get_utctime ( const unsigned char */*p*/, @@ -367,6 +397,9 @@ der_length_ia5_string (const heim_ia5_string */*data*/); size_t der_length_integer (const int */*data*/); +size_t +der_length_integer64 (const int64_t */*data*/); + size_t der_length_len (size_t /*len*/); @@ -388,6 +421,9 @@ der_length_universal_string (const heim_universal_string */*data*/); size_t der_length_unsigned (const unsigned */*data*/); +size_t +der_length_unsigned64 (const uint64_t */*data*/); + size_t der_length_utctime (const time_t */*t*/); @@ -508,6 +544,13 @@ der_put_integer ( const int */*v*/, size_t */*size*/); +int +der_put_integer64 ( + unsigned char */*p*/, + size_t /*len*/, + const int64_t */*v*/, + size_t */*size*/); + int der_put_length ( unsigned char */*p*/, @@ -569,6 +612,13 @@ der_put_unsigned ( const unsigned */*v*/, size_t */*size*/); +int +der_put_unsigned64 ( + unsigned char */*p*/, + size_t /*len*/, + const uint64_t */*v*/, + size_t */*size*/); + int der_put_utctime ( unsigned char */*p*/, diff --git a/crypto/heimdal/lib/asn1/der_copy.c b/crypto/heimdal/lib/asn1/der_copy.c index abaaf8e5d740..4faf87014280 100644 --- a/crypto/heimdal/lib/asn1/der_copy.c +++ b/crypto/heimdal/lib/asn1/der_copy.c @@ -54,6 +54,13 @@ der_copy_integer (const int *from, int *to) return 0; } +int +der_copy_integer64 (const int64_t *from, int64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_unsigned (const unsigned *from, unsigned *to) { @@ -61,6 +68,13 @@ der_copy_unsigned (const unsigned *from, unsigned *to) return 0; } +int +der_copy_unsigned64 (const uint64_t *from, uint64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_generalized_time (const time_t *from, time_t *to) { diff --git a/crypto/heimdal/lib/asn1/der_free.c b/crypto/heimdal/lib/asn1/der_free.c index 4bae5fc2338f..1584cfcb299e 100644 --- a/crypto/heimdal/lib/asn1/der_free.c +++ b/crypto/heimdal/lib/asn1/der_free.c @@ -50,12 +50,24 @@ der_free_integer (int *i) *i = 0; } +void +der_free_integer64 (int64_t *i) +{ + *i = 0; +} + void der_free_unsigned (unsigned *u) { *u = 0; } +void +der_free_unsigned64 (uint64_t *u) +{ + *u = 0; +} + void der_free_generalized_time(time_t *t) { diff --git a/crypto/heimdal/lib/asn1/der_get.c b/crypto/heimdal/lib/asn1/der_get.c index 3112da86f93b..8a456d4d983d 100644 --- a/crypto/heimdal/lib/asn1/der_get.c +++ b/crypto/heimdal/lib/asn1/der_get.c @@ -48,9 +48,28 @@ der_get_unsigned (const unsigned char *p, size_t len, unsigned val = 0; size_t oldlen = len; - if (len == sizeof(unsigned) + 1 && p[0] == 0) + if (len == sizeof(val) + 1 && p[0] == 0) ; - else if (len > sizeof(unsigned)) + else if (len > sizeof(val)) + return ASN1_OVERRUN; + + while (len--) + val = val * 256 + *p++; + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_unsigned64 (const unsigned char *p, size_t len, + uint64_t *ret, size_t *size) +{ + uint64_t val = 0; + size_t oldlen = len; + + if (len == sizeof(val) + 1 && p[0] == 0) + ; + else if (len > sizeof(val)) return ASN1_OVERRUN; while (len--) @@ -67,7 +86,27 @@ der_get_integer (const unsigned char *p, size_t len, int val = 0; size_t oldlen = len; - if (len > sizeof(int)) + if (len > sizeof(val)) + return ASN1_OVERRUN; + + if (len > 0) { + val = (signed char)*p++; + while (--len) + val = val * 256 + *p++; + } + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_integer64 (const unsigned char *p, size_t len, + int64_t *ret, size_t *size) +{ + int64_t val = 0; + size_t oldlen = len; + + if (len > sizeof(val)) return ASN1_OVERRUN; if (len > 0) { diff --git a/crypto/heimdal/lib/asn1/der_length.c b/crypto/heimdal/lib/asn1/der_length.c index db82025861ea..684ba9bc6f32 100644 --- a/crypto/heimdal/lib/asn1/der_length.c +++ b/crypto/heimdal/lib/asn1/der_length.c @@ -55,6 +55,24 @@ _heim_len_unsigned (unsigned val) return ret; } +size_t +_heim_len_unsigned64 (uint64_t val) +{ + size_t ret = 0; + int last_val_gt_128; + + do { + ++ret; + last_val_gt_128 = (val >= 128); + val /= 256; + } while (val); + + if(last_val_gt_128) + ret++; + + return ret; +} + size_t _heim_len_int (int val) { @@ -82,6 +100,33 @@ _heim_len_int (int val) return ret; } +size_t +_heim_len_int64 (int64_t val) +{ + unsigned char q; + size_t ret = 0; + + if (val >= 0) { + do { + q = val % 256; + ret++; + val /= 256; + } while(val); + if(q >= 128) + ret++; + } else { + val = ~val; + do { + q = ~(val % 256); + ret++; + val /= 256; + } while(val); + if(q < 128) + ret++; + } + return ret; +} + static size_t len_oid (const heim_oid *oid) { @@ -134,12 +179,24 @@ der_length_integer (const int *data) return _heim_len_int (*data); } +size_t +der_length_integer64 (const int64_t *data) +{ + return _heim_len_int64 (*data); +} + size_t der_length_unsigned (const unsigned *data) { return _heim_len_unsigned(*data); } +size_t +der_length_unsigned64 (const uint64_t *data) +{ + return _heim_len_unsigned64(*data); +} + size_t der_length_enumerated (const unsigned *data) { diff --git a/crypto/heimdal/lib/asn1/der_put.c b/crypto/heimdal/lib/asn1/der_put.c index 0b276d1ebdce..0ccb181c0b39 100644 --- a/crypto/heimdal/lib/asn1/der_put.c +++ b/crypto/heimdal/lib/asn1/der_put.c @@ -75,6 +75,38 @@ der_put_unsigned (unsigned char *p, size_t len, const unsigned *v, size_t *size) } } +int +der_put_unsigned64 (unsigned char *p, size_t len, const uint64_t *v, size_t *size) +{ + unsigned char *base = p; + uint64_t val = *v; + + if (val) { + while (len > 0 && val) { + *p-- = val % 256; + val /= 256; + --len; + } + if (val != 0) + return ASN1_OVERFLOW; + else { + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + } + *size = base - p; + return 0; + } + } else if (len < 1) + return ASN1_OVERFLOW; + else { + *p = 0; + *size = 1; + return 0; + } +} + int der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) { @@ -115,6 +147,46 @@ der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) return 0; } +int +der_put_integer64 (unsigned char *p, size_t len, const int64_t *v, size_t *size) +{ + unsigned char *base = p; + int64_t val = *v; + + if(val >= 0) { + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = val % 256; + len--; + val /= 256; + } while(val); + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + len--; + } + } else { + val = ~val; + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = ~(val % 256); + len--; + val /= 256; + } while(val); + if(p[1] < 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0xff; + len--; + } + } + *size = base - p; + return 0; +} + int der_put_length (unsigned char *p, size_t len, size_t val, size_t *size) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 2194b329ce1d..76a893c5ade7 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -303,7 +303,7 @@ gen_assign_defval(const char *var, struct value *val) fprintf(codefile, "if((%s = strdup(\"%s\")) == NULL)\nreturn ENOMEM;\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "%s = %d;\n", var, val->u.integervalue); + fprintf(codefile, "%s = %" PRId64 ";\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -324,7 +324,7 @@ gen_compare_defval(const char *var, struct value *val) fprintf(codefile, "if(strcmp(%s, \"%s\") != 0)\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "if(%s != %d)\n", var, val->u.integervalue); + fprintf(codefile, "if(%s != %" PRId64 ")\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -397,7 +397,7 @@ generate_constant (const Symbol *s) case booleanvalue: break; case integervalue: - fprintf (headerfile, "enum { %s = %d };\n\n", + fprintf (headerfile, "enum { %s = %" PRId64 " };\n\n", s->gen_name, s->value->u.integervalue); break; case nullvalue: @@ -540,7 +540,7 @@ define_asn1 (int level, Type *t) if(t->members == NULL) { fprintf (headerfile, "INTEGER"); if (t->range) - fprintf (headerfile, " (%d..%d)", + fprintf (headerfile, " (%" PRId64 "..%" PRId64 ")", t->range->min, t->range->max); } else { Member *m; @@ -723,14 +723,16 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "} %s;\n", name); } else if (t->range == NULL) { fprintf (headerfile, "heim_integer %s;\n", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + fprintf (headerfile, "int64_t %s;\n", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + fprintf (headerfile, "uint64_t %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { fprintf (headerfile, "int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - fprintf (headerfile, "unsigned int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_decode.c b/crypto/heimdal/lib/asn1/gen_decode.c index bf2d93b806df..c821ee1481a7 100644 --- a/crypto/heimdal/lib/asn1/gen_decode.c +++ b/crypto/heimdal/lib/asn1/gen_decode.c @@ -189,19 +189,19 @@ range_check(const char *name, { if (r->min == r->max + 2 || r->min < r->max) fprintf (codefile, - "if ((%s)->%s > %d) {\n" + "if ((%s)->%s > %" PRId64 ") {\n" "e = ASN1_MAX_CONSTRAINT; %s;\n" "}\n", name, length, r->max, forwstr); if (r->min - 1 == r->max || r->min < r->max) fprintf (codefile, - "if ((%s)->%s < %d) {\n" + "if ((%s)->%s < %" PRId64 ") {\n" "e = ASN1_MIN_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); if (r->max == r->min) fprintf (codefile, - "if ((%s)->%s != %d) {\n" + "if ((%s)->%s != %" PRId64 ") {\n" "e = ASN1_EXACT_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); @@ -252,14 +252,16 @@ decode_type (const char *name, const Type *t, int optional, name); } else if (t->range == NULL) { decode_primitive ("heim_integer", name, forwstr); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + decode_primitive ("integer64", name, forwstr); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + decode_primitive ("unsigned64", name, forwstr); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { decode_primitive ("integer", name, forwstr); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - decode_primitive ("unsigned", name, forwstr); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { decode_primitive ("unsigned", name, forwstr); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_encode.c b/crypto/heimdal/lib/asn1/gen_encode.c index 1bd47484d83a..ac43b6a0d364 100644 --- a/crypto/heimdal/lib/asn1/gen_encode.c +++ b/crypto/heimdal/lib/asn1/gen_encode.c @@ -129,14 +129,16 @@ encode_type (const char *name, const Type *t, const char *tmpstr) fprintf(codefile, "}\n;"); } else if (t->range == NULL) { encode_primitive ("heim_integer", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + encode_primitive ("integer64", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + encode_primitive ("unsigned64", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { encode_primitive ("integer", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - encode_primitive ("unsigned", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { encode_primitive ("unsigned", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); constructed = 0; break; diff --git a/crypto/heimdal/lib/asn1/gen_length.c b/crypto/heimdal/lib/asn1/gen_length.c index 20b5adfe5d02..f12246e676ec 100644 --- a/crypto/heimdal/lib/asn1/gen_length.c +++ b/crypto/heimdal/lib/asn1/gen_length.c @@ -80,14 +80,16 @@ length_type (const char *name, const Type *t, fprintf(codefile, "}\n"); } else if (t->range == NULL) { length_primitive ("heim_integer", name, variable); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + length_primitive ("integer64", name, variable); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + length_primitive ("unsigned64", name, variable); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { length_primitive ("integer", name, variable); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - length_primitive ("unsigned", name, variable); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { length_primitive ("unsigned", name, variable); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; diff --git a/crypto/heimdal/lib/asn1/gen_template.c b/crypto/heimdal/lib/asn1/gen_template.c index edd68e122380..15bf7d30c498 100644 --- a/crypto/heimdal/lib/asn1/gen_template.c +++ b/crypto/heimdal/lib/asn1/gen_template.c @@ -52,11 +52,13 @@ integer_symbol(const char *basename, const Type *t) return "int"; /* XXX enum foo */ else if (t->range == NULL) return "heim_integer"; - else if (t->range->min == INT_MIN && t->range->max == INT_MAX) + else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) + return "int64_t"; + else if (t->range->min >= 0 && t->range->max > UINT_MAX) *** 100 LINES SKIPPED *** From nobody Wed Apr 24 21:29: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 4VPsZT5wkxz5J8Kk; Wed, 24 Apr 2024 21:29: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 4VPsZT4Jgrz4VVP; Wed, 24 Apr 2024 21:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9fK7z6ZrEJocjWnjMevve14Pw6ZmdWE+9yMGdgo1f8=; b=U2aYxvqk/T5M4yodbRZNCMTF5vQnFAPTJldaMHLrT6LyWPFRJLZE1GyuEWkX8gQRATMOxk HV1kXNB9mJxw43K3ZLSliwYk7L9IV0EIBDWAHro5XDhjZhVw+ByMOEvfEAplTEEOI04Ida YGl+e8MfP5NcNLQYKcDeVDpTsAoDXkikMSDBSNfr4TNGy2rBNzTfdlrgngm17NqEBcxPbT pBOfxmOoOxa60/Z+a0kscPB/gZk6byws6cey/akfj2VdERQMi6OHNXaKbpDFnBzB17J53V njSj4QLjWj+nt0ZrsNAnGa1CWXshMdpmNi9N1iK3fE7u+FDlNZ5+GygGWJaTVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713994177; a=rsa-sha256; cv=none; b=oT5SAKmUhvp2D+aU3bhW9I+h9VE+oKCG+UBh/jUPbfWXrmuhzBFgKDBKlifhLrR+g9nDMt fjypkuVX1oycE3pqmCivG0OoyivOJByjVbqRbbWihXTfvGrXqmeZ5/BMYbUJp9g2rmFZmN X0hpNaTqzTSDvZdAiySgPDsK44/QKPVXIqTIYY5UgtH5GVvmf0Tyu85ggAyUiuaAvq9UZy 8HPgKlQWuKzwvPXsVKTWgbvNspgGxsfqsIyVoUum1mn/DRD+L5i0WCegaWMuJ6I+RVho8I x8gRtg9W7hlExGNa0gl93RvQmZZ8eq7I0RieiG1acoqNv5pEMOAY7/KtAs+aAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713994177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9fK7z6ZrEJocjWnjMevve14Pw6ZmdWE+9yMGdgo1f8=; b=GiNDhO2XWKyUiWB4ulkqMnV4+ojfnELBdiHo1C9OhE9UhJIckjmqUugKpkCLLLw0z1tf0t F8yLlvr07okSMt/fy2K9AY/QLB4CoEJG58CaaTufsOVZKFpdCPfV+Bk3MSd8wJvbXuCICz qUsUPIQI6IriG6379FCz+QfTAR3eZe6I6KdJbDNk/VYHeYajzVazUd0Gp0Ayo0yBM9FH4T W7EJYSDjfyBzWtilot3YgDd5nL6qNpJn2pFffTvbRbkt+2wOrWhHU4ib2nMzfKDd724/2B WzAQB/4Y4lE56qqZQ4ve3fd6N/7JWSMndjMhpgqYInf5SdIBPbtN9Up3tJoJcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPsZT3wD2zXmM; Wed, 24 Apr 2024 21:29: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 43OLTb9b086915; Wed, 24 Apr 2024 21:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLTbbD086912; Wed, 24 Apr 2024 21:29:37 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:29:37 GMT Message-Id: <202404242129.43OLTbbD086912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 15dfc47b6adc - stable/13 - heimdal: asn1: Use unsigned bitfields for named bitsets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 15dfc47b6adc0ba6bf91f60d05c404c7621dbc11 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=15dfc47b6adc0ba6bf91f60d05c404c7621dbc11 commit 15dfc47b6adc0ba6bf91f60d05c404c7621dbc11 Author: Dimitry Andric AuthorDate: 2024-04-17 17:49:30 +0000 Commit: Dimitry Andric CommitDate: 2024-04-24 21:27:27 +0000 heimdal: asn1: Use unsigned bitfields for named bitsets Import upstream 6747e1628: asn1: Use unsigned bitfields for named bitsets Signed 1-bit bitfields are undefined in C. This should fix the following warnings, which for unknown reasons are errors in CI: /usr/src/crypto/heimdal/lib/hx509/ca.c:1020:22: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1020 | ku.digitalSignature = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1021:21: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1021 | ku.keyEncipherment = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1028:17: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1028 | ku.keyCertSign = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1029:13: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1029 | ku.cRLSign = 1; | ^ ~ PR: 276960 Fixes: 1b7487592987 MFC after: 1 week (cherry picked from commit 219b6e442308d5353b2af5f0771ce9b887b70754) --- crypto/heimdal/lib/asn1/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 76a893c5ade7..f35d41667a57 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -727,10 +727,10 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "int64_t %s;\n", name); } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { fprintf (headerfile, "uint64_t %s;\n", name); - } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { - fprintf (headerfile, "int %s;\n", name); } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { + fprintf (headerfile, "int %s;\n", name); } else errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); From nobody Wed Apr 24 22:12: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 4VPtX61vKrz5JDNq; Wed, 24 Apr 2024 22:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPtX56h5Pz4cPN; Wed, 24 Apr 2024 22:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wf0e9nBdDzff6vV5b1x+cURzq9bQ1eIz8JrBa/dPG30=; b=p+lf7cSY3cKUF8T/aWI/pGNOvp+76DxrihG1XaUwa5MzDeUBy8+YqdsSYhVV8iICsmDddD R+VnDRrjLV8oQnCYZfIR/KW+3tpK0CgvCu1l7CliqFf10eB1jCwdL+R8sAcJt7MFZqc/5C kMaLxpcSa/rqUK50cglEw+sInxqtI9pzLeA4Vrnw6/m3vGBFj/EM31qYICP4eIIN3LPWXa LYzdT3+6DoMg05RsYMWyq7/O9L2ltoNNRxa3ixOWy41D1rE2AUdKDzCanTvl3zwR5EGURR HSMS1L4FD7oHGvLftHBngzO7QpjtFO4r/I3cpS3LOO3LVCBVyj3KmLlUl6ejKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996757; a=rsa-sha256; cv=none; b=Fg6WF5ZCw0cBbRfLFwAFrr0PckCdD0V5aoj7blWDkaU6agmHR9pNJhcilEJm659Je1Hp8D mqIeOZ4Cgv+wJcGO29NOge8PVwqo8yMZJ6IwzSIjT58pD/nchbb0HGX9oidaHF3JjeGoHj lDg2mfs6a8EK7DurVSIjouu1kJSiDMntkQwvjZoS3CoKSbiOjB0BoUimaO9L9vyK/JXg2A NNKq53f7+Xl7oDRRaForcGeqP8CSP4Fl4qQaZd0WFJOYJFc9pQBOu7rQt3g2kn8TwrCM2x J5zzoYoQ4RF/aQWyBwiFlp/o5s7FeTGeOnJIdRSoe2WbMGgxWusOTrxF8Okhfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wf0e9nBdDzff6vV5b1x+cURzq9bQ1eIz8JrBa/dPG30=; b=Y1um2QZjaDW3Am+eIbsrtTvL9dDcTdHj60d7kxsClLACkRsslwnVnPvBpmxi+GKF5QCthJ iMo6KhDL/T2rEUmDwT4VOmHUinOK6nF+sOkU9sgk9xaVN26wreq7UZwao+4scEqBlUyKuy WyEViwcH3YgV7G7c+g2HDaXIR2+wjnAW3Pckj92i69t9xYM2S6aRFLr97d+g7cQ63iFGNo uw4J+Rzvvqby8aW8UIOYiZ12eHXhnweWSW+SPcnEf3L+KjPB5OBoJJP1SGnW0if/AiYHS6 1uJyyzO5PVbFE3t1mAfCfExO/5zjzwbCz/QjAwt6xe3CHXB+eQZsgtOEhrMlfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX56J1tzYX3; Wed, 24 Apr 2024 22:12: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 43OMCbng070700; Wed, 24 Apr 2024 22:12:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCbHF070697; Wed, 24 Apr 2024 22:12:37 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:37 GMT Message-Id: <202404242212.43OMCbHF070697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f1d4502c295 - stable/14 - install: Fix a compiler warning when bootstrapping List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f1d4502c29564021dc4772939d0df99abe083e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f1d4502c29564021dc4772939d0df99abe083e0 commit 9f1d4502c29564021dc4772939d0df99abe083e0 Author: Mark Johnston AuthorDate: 2024-04-19 18:22:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:56 +0000 install: Fix a compiler warning when bootstrapping Fixes: 4336161cc9c6 ("install: Don't skip syncing in the common case.") Reviewed by: imp, des Differential Revision: https://reviews.freebsd.org/D44866 (cherry picked from commit 2f44f86575f9cba5da28b762c359f7a806400744) --- usr.bin/xinstall/xinstall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 5d4a6f48b717..1667c54e3649 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1262,7 +1262,9 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, errno = serrno; err(EX_OSERR, "%s", from_name); } +#ifndef BOOTSTRAP_XINSTALL done: +#endif if (safecopy && fsync(to_fd) == -1) { serrno = errno; (void)unlink(to_name); From nobody Wed Apr 24 22:12: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 4VPtX46GlLz5JDM0; Wed, 24 Apr 2024 22:12: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 4VPtX45gm3z4c0P; Wed, 24 Apr 2024 22:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5oNsUAi/dVWCFy54WeerXsodCCpArZXnC7PCHIzvXI=; b=sxQ2vztbv5hW7qn2uC4XtupEI7zq85bgrskYE0FvvcHmKk+ohq/jEXHgvnaddpZY0GLHfE 6eKr7eGaqdqkGHkDpgLKWq9BsbPCwO2bqlZci2xUgC8jOlIEIItCVNy3g4NZo5A9EgYypr tEX6wQ7HacppvkZCEDmma3NL8yafraNU7TvTrPOBBwnDAg4TOyhLci3cDHyBCx9/FmyOmC 8jxu0kO1dpCrIAGCyunyl1l5uL2MpsQNseFAKg1J+u0PuoeL1f7UVC76zjw1iCR1vgpfqs aBis32Iua118p1NcNPNMwocCd/47DkanAmKchKrI+5V3wVsQwRu5qMXhgwBS1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996756; a=rsa-sha256; cv=none; b=rI3Qrzh6fToxub4tipjZedf77OQ+mbTPichVnjqUzcNKiO8ivgs4B5nZHaS6XBuhEnh/cS gEWYeYKLkC/LukHjL9v9DNIekSZPqCi9WVwdL69uuZsLK+XNIVQAtRoX9Fsh8N9KH3wAjm j5zWBm5K6zH3xrQnP7Y3n9235NVPNftH9Cz8QDKo5trjKVGvQloxRAkb/K/23WoIFmXpA4 reLk29QxkTWw8/8rm3RTr/rzsMrwIAC3opc/y+V69eRH67UzVNG81/uchJrWOVmQg7d/7Q Icyoad+cCBrkweQIulB0pmGB5d3DZxEclKqytT98mbziIoGc/4a2SQBzj7nxJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5oNsUAi/dVWCFy54WeerXsodCCpArZXnC7PCHIzvXI=; b=R4Mha6SZX4jQH2PQeWPRDGpT/xC/zMzoUy4htJjXJ83iji2irbqDITm4pTPt3xt0lcZXWR HkjQKaXkAI4U6L/f1LxexWgPJPQfAW2Z+mtHUjGepc3O8CRgJOezWwSex/0nCKMqzD0gyk owzeHb2S8nuxwiJRNdFNmiwoipUJy0gh9PLyVNcG59Cf+tvjeJ1w+fmXjE6MxRLxK0rOfb c6RD5VdMHryniXzYl2x96U71Slog4l0+8N22f/fqdymTgmt7h7WC7wpQgMa0SBnhxMtE6X jkTL0gjn5UIWIHQuxbLoLFoA/8mXQJXqOGR+jA5bDmIXVNVqIDHwS27XhsmLfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX45GRFzYvR; Wed, 24 Apr 2024 22:12: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 43OMCaLP070649; Wed, 24 Apr 2024 22:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCa4k070646; Wed, 24 Apr 2024 22:12:36 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:36 GMT Message-Id: <202404242212.43OMCa4k070646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 34ee703400c0 - stable/14 - install: Always use a temporary file. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34ee703400c0c1c9705dfc3d718ab5effd993618 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=34ee703400c0c1c9705dfc3d718ab5effd993618 commit 34ee703400c0c1c9705dfc3d718ab5effd993618 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-12 17:30:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:55 +0000 install: Always use a temporary file. Previously, we would only use a temporary file if explicitly asked to with the `-S` option, and even then, only if the target file already existed. This meant that an outside observer looking for the target file might see a partial file, and might see the file disappear and then reappear. With this patch, we always use a temporary file, ensuring atomicity. The downside is slightly increased disk usage. The upside is never having to worry about, for instance, cron jobs randomly failing if they happen to run simultaneously with `make installworld`. The `-S` option is retained, partly for compatibility, and partly to control the use of `fsync(2)`, which has a non-negligible cost (approximately 10% increase in wall time for `make installworld`). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: 0mp, brooks, imp, markj Differential Revision: https://reviews.freebsd.org/D44742 (cherry picked from commit e5035d08578e372d40b4e2d4c3574b7583549bd6) install: Simplify path construction. There's no need to copy the path twice to split it into base and dir. We simply call `basename()` first, then handle the two trivial cases in which it isn't safe to call `dirname()`. While here, add an early check that the destination is not an empty string. This would always fail eventually, so it may as well fail right away. Also add a test case for this shortcut. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44743 (cherry picked from commit 17dc7017d7375b3463d65adffe1eb980b0f86795) install: Don't skip syncing in the common case. In `copy()`, if no digest was requested (which is the common case), we use `copy_file_range()` to avoid needlessly copying the contents of the file into user space and back. When `copy_file_range()` returns successfully (which, again, is the common case), we simply return, and therefore never get to the point where we call `fsync()` if the `-S` option was specified. Fix this. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44756 (cherry picked from commit 4336161cc9c631d40d00adee97dfc8161b6bec9f) install: Remove the mmap(2) option. We already removed it from cp(1) over a year ago but never followed up here. Do so now, for the same reasons: significant complexity for little to no benefit. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44809 (cherry picked from commit a0439a1b820fa0e742c00d095f5f5c06f5f19432) install: Assorted nitpickery. * Use `errc()` instead of manually setting `errno` before calling `err()`. * Change one warning into a fatal error. * Drop some unnecessary casts. * `strlcat()` bounds checks were off-by-one. This does not matter in practice because the subsequent code renders an overrun harmless. * We were passing `SSIZE_MAX` to `copy_file_range()` instead of the requested size. This only matters if we're asked to install a file which is still being written to while we are copying it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44810 (cherry picked from commit 000a533e6d1db9878296b32d1cc212e11a2cc718) --- usr.bin/xinstall/install.1 | 31 +-- usr.bin/xinstall/tests/install_test.sh | 8 + usr.bin/xinstall/xinstall.c | 422 ++++++++++----------------------- 3 files changed, 148 insertions(+), 313 deletions(-) diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1 index 346b0f428121..193892c4a2b9 100644 --- a/usr.bin/xinstall/install.1 +++ b/usr.bin/xinstall/install.1 @@ -27,7 +27,7 @@ .\" .\" From: @(#)install.1 8.1 (Berkeley) 6/6/93 .\" -.Dd August 4, 2022 +.Dd April 16, 2024 .Dt INSTALL 1 .Os .Sh NAME @@ -227,16 +227,18 @@ Copy the file, as if the except if the target file does not already exist or is different, then preserve the access and modification times of the source file. .It Fl S -Safe copy. -Normally, +Flush each file to disk after copying. +This has a non-negligible impact on performance, but reduces the risk +of being left with a partial file if the system crashes or loses power +shortly after .Nm -unlinks an existing target before installing the new file. -With the +runs. +.Pp +Historically, .Fl S -flag a temporary file is used and then renamed to be -the target. -The reason this is safer is that if the copy or -rename fails, the existing target is left untouched. +also enabled the use of temporary files to ensure atomicity when +replacing an existing target. +Temporary files are no longer optional. .It Fl s .Nm exec's the command @@ -302,15 +304,7 @@ Ports Collection. .Sh FILES .Bl -tag -width "INS@XXXXXX" -compact .It Pa INS@XXXXXX -If either -.Fl S -option is specified, or the -.Fl C -or -.Fl p -option is used in conjunction with the -.Fl s -option, temporary files named +Temporary files named .Pa INS@XXXXXX , where .Pa XXXXXX @@ -333,7 +327,6 @@ The default was changed to copy in .Xr cp 1 , .Xr mv 1 , .Xr strip 1 , -.Xr mmap 2 , .Xr getgrnam 3 , .Xr getpwnam 3 , .Xr chown 8 diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index cbe95f0dfbf3..b35706521ec3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -25,6 +25,13 @@ # # +atf_test_case copy_to_empty +copy_to_empty_body() { + printf 'test\n123\r456\r\n789\0z' >testf + atf_check -s not-exit:0 -e match:"empty string" \ + install testf "" +} + copy_to_nonexistent_with_opts() { printf 'test\n123\r456\r\n789\0z' >testf atf_check install "$@" testf copyf @@ -497,6 +504,7 @@ set_optional_exec_body() } atf_init_test_cases() { + atf_add_test_case copy_to_empty atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe atf_add_test_case copy_to_nonexistent_comparing diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 3764c5ef92fa..5d4a6f48b717 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -42,10 +42,6 @@ static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif /* not lint */ #endif -#include -#include -#include -#include #include #include #include @@ -157,7 +153,6 @@ static char *destdir, *digest, *fflags, *metafile, *tags; static int compare(int, const char *, size_t, int, const char *, size_t, char **); static char *copy(int, const char *, int, const char *, off_t); -static int create_newfile(const char *, int, struct stat *); static int create_tempfile(const char *, char *, size_t); static char *quiet_mktemp(char *template); static char *digest_file(const char *); @@ -173,7 +168,6 @@ static void metadata_log(const char *, const char *, struct timespec *, const char *, const char *, off_t); static int parseid(const char *, id_t *); static int strip(const char *, int, const char *, char **); -static int trymmap(size_t); static void usage(void); int @@ -341,10 +335,6 @@ main(int argc, char *argv[]) } } - /* need to make a temp copy so we can compare stripped version */ - if (docompare && dostrip) - safecopy = 1; - /* get group and owner id's */ if (group != NULL && !dounpriv) { if (gid_from_group(group, &gid) == -1) { @@ -393,8 +383,8 @@ main(int argc, char *argv[]) err(EX_OSERR, "%s vanished", to_name); if (S_ISLNK(to_sb.st_mode)) { if (argc != 2) { - errno = ENOTDIR; - err(EX_USAGE, "%s", to_name); + errc(EX_CANTCREAT, ENOTDIR, "%s", + to_name); } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -420,14 +410,13 @@ main(int argc, char *argv[]) if (!no_target && !dolink) { if (stat(*argv, &from_sb)) err(EX_OSERR, "%s", *argv); - if (!S_ISREG(to_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", to_name); - } + if (!S_ISREG(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (to_sb.st_dev == from_sb.st_dev && - to_sb.st_ino == from_sb.st_ino) - errx(EX_USAGE, - "%s and %s are the same file", *argv, to_name); + to_sb.st_ino == from_sb.st_ino) { + errx(EX_USAGE, "%s and %s are the same file", + *argv, to_name); + } } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -585,7 +574,7 @@ do_link(const char *from_name, const char *to_name, char tmpl[MAXPATHLEN]; int ret; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -632,7 +621,7 @@ do_symlink(const char *from_name, const char *to_name, { char tmpl[MAXPATHLEN]; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -675,8 +664,10 @@ static void makelink(const char *from_name, const char *to_name, const struct stat *target_sb) { - char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; - struct stat to_sb; + char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; + char *to_name_copy, *d, *ld, *ls, *s; + const char *base, *dir; + struct stat to_sb; /* Try hard links first. */ if (dolink & (LN_HARD|LN_MIXED)) { @@ -737,8 +728,6 @@ makelink(const char *from_name, const char *to_name, } if (dolink & LN_RELATIVE) { - char *to_name_copy, *cp, *d, *ld, *ls, *s; - if (*from_name != '/') { /* this is already a relative link */ do_symlink(from_name, to_name, target_sb); @@ -758,17 +747,23 @@ makelink(const char *from_name, const char *to_name, to_name_copy = strdup(to_name); if (to_name_copy == NULL) err(EX_OSERR, "%s: strdup", to_name); - cp = dirname(to_name_copy); - if (realpath(cp, dst) == NULL) - err(EX_OSERR, "%s: realpath", cp); - /* .. and add the last component. */ - if (strcmp(dst, "/") != 0) { - if (strlcat(dst, "/", sizeof(dst)) > sizeof(dst)) + base = basename(to_name_copy); + if (base == to_name_copy) { + /* destination is a file in cwd */ + (void)strlcpy(dst, "./", sizeof(dst)); + } else if (base == to_name_copy + 1) { + /* destination is a file in the root */ + (void)strlcpy(dst, "/", sizeof(dst)); + } else { + /* all other cases: safe to call dirname() */ + dir = dirname(to_name_copy); + if (realpath(dir, dst) == NULL) + err(EX_OSERR, "%s: realpath", dir); + if (strcmp(dst, "/") != 0 && + strlcat(dst, "/", sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); } - strcpy(to_name_copy, to_name); - cp = basename(to_name_copy); - if (strlcat(dst, cp, sizeof(dst)) > sizeof(dst)) + if (strlcat(dst, base, sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); free(to_name_copy); @@ -821,7 +816,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) struct stat from_sb, temp_sb, to_sb; struct timespec tsb[2]; int devnull, files_match, from_fd, serrno, stripped, target; - int tempcopy, temp_fd, to_fd; + int temp_fd, to_fd; char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; char *digestresult; @@ -835,10 +830,8 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) if (!dolink) { if (stat(from_name, &from_sb)) err(EX_OSERR, "%s", from_name); - if (!S_ISREG(from_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", from_name); - } + if (!S_ISREG(from_sb.st_mode)) + errc(EX_OSERR, EFTYPE, "%s", from_name); } /* Build the target path. */ if (flags & DIRECTORY) { @@ -852,32 +845,18 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } else { devnull = 1; } + if (*to_name == '\0') + errx(EX_USAGE, "destination cannot be an empty string"); target = (lstat(to_name, &to_sb) == 0); if (dolink) { - if (target && !safecopy) { - if (to_sb.st_mode & S_IFDIR && rmdir(to_name) == -1) - err(EX_OSERR, "%s", to_name); -#if HAVE_STRUCT_STAT_ST_FLAGS - if (to_sb.st_flags & NOCHANGEBITS) - (void)chflags(to_name, - to_sb.st_flags & ~NOCHANGEBITS); -#endif - unlink(to_name); - } makelink(from_name, to_name, target ? &to_sb : NULL); return; } - if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) { - errno = EFTYPE; - warn("%s", to_name); - return; - } - - /* Only copy safe if the target exists. */ - tempcopy = safecopy && target; + if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (!devnull && (from_fd = open(from_name, O_RDONLY, 0)) < 0) err(EX_OSERR, "%s", from_name); @@ -899,40 +878,32 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } if (!files_match) { - if (tempcopy) { - to_fd = create_tempfile(to_name, tempfile, - sizeof(tempfile)); - if (to_fd < 0) - err(EX_OSERR, "%s", tempfile); - } else { - if ((to_fd = create_newfile(to_name, target, - &to_sb)) < 0) - err(EX_OSERR, "%s", to_name); - if (verbose) - (void)printf("install: %s -> %s\n", - from_name, to_name); - } + to_fd = create_tempfile(to_name, tempfile, + sizeof(tempfile)); + if (to_fd < 0) + err(EX_OSERR, "%s", tempfile); if (!devnull) { - if (dostrip) - stripped = strip(tempcopy ? tempfile : to_name, - to_fd, from_name, &digestresult); - if (!stripped) - digestresult = copy(from_fd, from_name, to_fd, - tempcopy ? tempfile : to_name, from_sb.st_size); + if (dostrip) { + stripped = strip(tempfile, to_fd, from_name, + &digestresult); + } + if (!stripped) { + digestresult = copy(from_fd, from_name, to_fd, + tempfile, from_sb.st_size); + } } } if (dostrip) { if (!stripped) - (void)strip(tempcopy ? tempfile : to_name, to_fd, - NULL, &digestresult); + (void)strip(tempfile, to_fd, NULL, &digestresult); /* * Re-open our fd on the target, in case * we did not strip in-place. */ close(to_fd); - to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY, 0); + to_fd = open(tempfile, O_RDONLY, 0); if (to_fd < 0) err(EX_OSERR, "stripping %s", to_name); } @@ -976,16 +947,16 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) digestresult = digest_file(tempfile); /* - * Move the new file into place if doing a safe copy - * and the files are different (or just not compared). + * Move the new file into place if the files are different (or + * just not compared). */ - if (tempcopy && !files_match) { + if (!files_match) { #if HAVE_STRUCT_STAT_ST_FLAGS /* Try to turn off the immutable bits. */ if (to_sb.st_flags & NOCHANGEBITS) (void)chflags(to_name, to_sb.st_flags & ~NOCHANGEBITS); #endif - if (dobackup) { + if (target && dobackup) { if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", to_name, suffix) != strlen(to_name) + strlen(suffix)) { unlink(tempfile); @@ -1124,86 +1095,62 @@ compare(int from_fd, const char *from_name __unused, size_t from_len, int to_fd, const char *to_name __unused, size_t to_len, char **dresp) { - char *p, *q; int rv; - int do_digest, done_compare; + int do_digest; DIGEST_CTX ctx; - rv = 0; if (from_len != to_len) return 1; do_digest = (digesttype != DIGEST_NONE && dresp != NULL && *dresp == NULL); if (from_len <= MAX_CMP_SIZE) { + static char *buf, *buf1, *buf2; + static size_t bufsize; + int n1, n2; + if (do_digest) digest_init(&ctx); - done_compare = 0; - if (trymmap(from_len) && trymmap(to_len)) { - p = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - from_fd, (off_t)0); - if (p == MAP_FAILED) - goto out; - q = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - to_fd, (off_t)0); - if (q == MAP_FAILED) { - munmap(p, from_len); - goto out; - } - rv = memcmp(p, q, from_len); - if (do_digest) - digest_update(&ctx, p, from_len); - munmap(p, from_len); - munmap(q, from_len); - done_compare = 1; + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize * 2); + if (buf == NULL) + err(1, "Not enough memory"); + buf1 = buf; + buf2 = buf + bufsize; } - out: - if (!done_compare) { - static char *buf, *buf1, *buf2; - static size_t bufsize; - int n1, n2; - - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + rv = 0; + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + while (rv == 0) { + n1 = read(from_fd, buf1, bufsize); + if (n1 == 0) + break; /* EOF */ + else if (n1 > 0) { + n2 = read(to_fd, buf2, n1); + if (n2 == n1) + rv = memcmp(buf1, buf2, n1); else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize * 2); - if (buf == NULL) - err(1, "Not enough memory"); - buf1 = buf; - buf2 = buf + bufsize; - } - rv = 0; - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); - while (rv == 0) { - n1 = read(from_fd, buf1, bufsize); - if (n1 == 0) - break; /* EOF */ - else if (n1 > 0) { - n2 = read(to_fd, buf2, n1); - if (n2 == n1) - rv = memcmp(buf1, buf2, n1); - else - rv = 1; /* out of sync */ - } else - rv = 1; /* read failure */ - if (do_digest) - digest_update(&ctx, buf1, n1); - } - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); + rv = 1; /* out of sync */ + } else + rv = 1; /* read failure */ + if (do_digest) + digest_update(&ctx, buf1, n1); } - } else + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + } else { rv = 1; /* don't bother in this case */ + } if (do_digest) { if (rv == 0) @@ -1235,65 +1182,6 @@ create_tempfile(const char *path, char *temp, size_t tsize) return (mkstemp(temp)); } -/* - * create_newfile -- - * create a new file, overwriting an existing one if necessary - */ -static int -create_newfile(const char *path, int target, struct stat *sbp) -{ - char backup[MAXPATHLEN]; - int saved_errno = 0; - int newfd; - - if (target) { - /* - * Unlink now... avoid ETXTBSY errors later. Try to turn - * off the append/immutable bits -- if we fail, go ahead, - * it might work. - */ -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags & ~NOCHANGEBITS); -#endif - - if (dobackup) { - if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix) != strlen(path) + strlen(suffix)) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - errx(EX_OSERR, "%s: backup filename too long", - path); - } - (void)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix); - if (verbose) - (void)printf("install: %s -> %s\n", - path, backup); - if (rename(path, backup) < 0) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - err(EX_OSERR, "rename: %s to %s", path, backup); - } - } else - if (unlink(path) < 0) - saved_errno = errno; - } - - newfd = open(path, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR); - if (newfd < 0 && saved_errno != 0) - errno = saved_errno; - return newfd; -} - /* * copy -- * copy from one file to another @@ -1309,28 +1197,23 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, #ifndef BOOTSTRAP_XINSTALL ssize_t ret; #endif - char *p; - int done_copy; DIGEST_CTX ctx; /* Rewind file descriptors. */ - if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(from_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", from_name); - if (lseek(to_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(to_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", to_name); #ifndef BOOTSTRAP_XINSTALL /* Try copy_file_range() if no digest is requested */ if (digesttype == DIGEST_NONE) { - ret = 1; - while (ret > 0) { + do { ret = copy_file_range(from_fd, NULL, to_fd, NULL, - SSIZE_MAX, 0); - } - if (ret == 0) { - /* DIGEST_NONE always returns NULL */ - return (NULL); - } + (size_t)size, 0); + } while (ret > 0); + if (ret == 0) + goto done; if (errno != EINVAL) { serrno = errno; (void)unlink(to_name); @@ -1339,70 +1222,47 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, } /* Fall back */ } - #endif digest_init(&ctx); - done_copy = 0; - if (trymmap((size_t)size) && - (p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED, - from_fd, (off_t)0)) != MAP_FAILED) { - nw = write(to_fd, p, size); - if (nw != size) { + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize); + if (buf == NULL) + err(1, "Not enough memory"); + } + while ((nr = read(from_fd, buf, bufsize)) > 0) { + if ((nw = write(to_fd, buf, nr)) != nr) { serrno = errno; (void)unlink(to_name); if (nw >= 0) { errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, (uintmax_t)size); + "short write to %s: %jd bytes written, " + "%jd bytes asked to write", + to_name, (uintmax_t)nw, + (uintmax_t)size); } else { errno = serrno; err(EX_OSERR, "%s", to_name); } } - digest_update(&ctx, p, size); - (void)munmap(p, size); - done_copy = 1; + digest_update(&ctx, buf, nr); } - if (!done_copy) { - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); - else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize); - if (buf == NULL) - err(1, "Not enough memory"); - } - while ((nr = read(from_fd, buf, bufsize)) > 0) { - if ((nw = write(to_fd, buf, nr)) != nr) { - serrno = errno; - (void)unlink(to_name); - if (nw >= 0) { - errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, - (uintmax_t)size); - } else { - errno = serrno; - err(EX_OSERR, "%s", to_name); - } - } - digest_update(&ctx, buf, nr); - } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); - errno = serrno; - err(EX_OSERR, "%s", from_name); - } + if (nr != 0) { + serrno = errno; + (void)unlink(to_name); + errno = serrno; + err(EX_OSERR, "%s", from_name); } +done: if (safecopy && fsync(to_fd) == -1) { serrno = errno; (void)unlink(to_name); @@ -1635,29 +1495,3 @@ usage(void) exit(EX_USAGE); /* NOTREACHED */ } - -/* - * trymmap -- - * return true (1) if mmap should be tried, false (0) if not. - */ -static int -trymmap(size_t filesize) -{ - /* - * This function existed to skip mmap() for NFS file systems whereas - * nowadays mmap() should be perfectly safe. Nevertheless, using mmap() - * only reduces the number of system calls if we need multiple read() - * syscalls, i.e. if the file size is > MAXBSIZE. However, mmap() is - * more expensive than read() so set the threshold at 4 fewer syscalls. - * Additionally, for larger file size mmap() can significantly increase - * the number of page faults, so avoid it in that case. - * - * Note: the 8MB limit is not based on any meaningful benchmarking - * results, it is simply reusing the same value that was used before - * and also matches bin/cp. - * - * XXX: Maybe we shouldn't bother with mmap() at all, since we use - * MAXBSIZE the syscall overhead of read() shouldn't be too high? - */ - return (filesize > 4 * MAXBSIZE && filesize < 8 * 1024 * 1024); -} From nobody Wed Apr 24 22:12: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 4VPtX83vC1z5JDYD; Wed, 24 Apr 2024 22:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPtX81JJNz4c2t; Wed, 24 Apr 2024 22:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AIFea1F7odXF5ljOXGDqC9ClkDLkQuUNqGoV/8kNofw=; b=OO+GJYrrBhPEtothdW7BgSefdfR/gTw1touk60yEfeAZE5xX4I4nRSne6qCF95oBVqGHpZ m352TyRNjfkpGA0HLhskGZ3icGohANM8qvje5jd2qYMU9RAi4q+B1WTyAKwPPREKNBafVA tC/CrTN9qcBR78QL7Ns5tXqkvqGbO8nXRemF+HAnZOyhheEwdDxCMF3RNlTwg4Rodv82kQ 24gTP2148Qr4YvhYyEdH9aSNZNEfMtlyW9y9bXldyXYkIIQhWkfgEUbE1KHmiXQB+8L4Xj UoB91tJF4bqd/4Dvyn6ehlDMBJJ7rDdxakFqkN6uyL27TU0MKQEfrltFM64Ziw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996760; a=rsa-sha256; cv=none; b=eZZtuLk5EvkFhvk4zdZPRC9dGOjObbK/GrjkdiRVxUeI9z1/Go47NDsXkMiP3Xu8bqv4WO oF1pd2JMSBx+AmE8XSN1sk29Xy4l8Jkl1DbS8I9suEgy8i2udNrdCULBLPQ+I1hUsz8gfd jVassr7w6jEdKYkXMhg/BFI0Yeje6qIT73+i0CHsWO1vi6CjlIJMpa7cknSCOT42r/c/XB SsUJEbdx3SxcSgKJ1oyxb19e/Uuacn4vzXLfwUD79qDCzXmYzjL5SPHGy11q/dKCpxTCH0 A/feGMA5DXMtwYyI+dgX8Gp10unIcs/acvOUOj77a2JHzqhgycjxl3CopoXeTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AIFea1F7odXF5ljOXGDqC9ClkDLkQuUNqGoV/8kNofw=; b=Dno36SLx0CHc8ENsutQt0bC4ejM5h7cxZSmd/IJRURqPBGhrAtesZz/FH/+k7Zbwd67y8k sLWWkrOEXRGQX/rwImFK0tjc0BbxzdvjVcT7sy+8mexbR/zJUUXWmH1WyBKPZAFjbMinW/ a/RCgu/WV0QmpRbGcgRpNbUg6e28OXgmbTByMNj2cEPd/3AsFK+eDraxLKWiMRiyoSYGWx YyBRFMkcOd2DElu4KgfPsfS/myDMVwCE7eiA2c4YNVzsju984o+wULZCPzk5Ks9EJfFFNe TLxC26I/9AsE2N2Y6TdkZ94LMn+mFftKXWL5bKQ/+WRew3YXMtG+7yMZbAIvrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX80wGDzZ3j; Wed, 24 Apr 2024 22:12: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 43OMCeWW070806; Wed, 24 Apr 2024 22:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCewP070803; Wed, 24 Apr 2024 22:12:40 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:40 GMT Message-Id: <202404242212.43OMCewP070803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f3032b76b3c - stable/14 - pf tests: Add option to send fragmented packets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f3032b76b3c077d032fb86b614a5d64e04a7ed4 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f3032b76b3c077d032fb86b614a5d64e04a7ed4 commit 9f3032b76b3c077d032fb86b614a5d64e04a7ed4 Author: Kajetan Staszkiewicz AuthorDate: 2023-10-26 09:14:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:56 +0000 pf tests: Add option to send fragmented packets Add option to send fragmented packets and to properly sniff them by reassembling them by the sniffer itself. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42354 (cherry picked from commit d7c9de2d68ca81c557e069c2b431529cf597886c) pf: Fix packet reassembly Don't drop fragmented packets when reassembly is disabled, they can be matched by rules with "fragment" keyword. Ensure that presence of scrub rules forces old behaviour. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42355 (cherry picked from commit ede5d4ff5b39ccbc193c30fb6c093c7c4de9a464) pf: Update documentation regarding matching, scrubbing and reassembly Update pf documentation: - default behaviour of fragment reassembly - introduction of scrub option for filter rules - disadvantages of using the old scrub ruleset - options supported for match rules - fix missing list block end - remove duplicate description of match filter rule - update example to modern syntax Reviewed by: kp Fragments obtained from: OpenBSD Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42270 (cherry picked from commit 5ed470bdb9da6442d6030cf0a7a8493f759fbb43) --- share/man/man5/pf.conf.5 | 147 ++++++++++++++------- sys/netpfil/pf/pf_norm.c | 51 ++++--- tests/sys/netpfil/common/pft_ping.py | 39 ++++-- tests/sys/netpfil/common/sniffer.py | 18 ++- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/fragmentation_compat.sh | 11 -- .../sys/netpfil/pf/fragmentation_no_reassembly.sh | 130 ++++++++++++++++++ 7 files changed, 308 insertions(+), 89 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 8255a89587be..3193c18760c8 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -401,7 +401,9 @@ set limit frags 20000 .Ed .Pp sets the maximum number of entries in the memory pool used for fragment -reassembly (generated by +reassembly (generated by the +.Ar set reassemble +option or .Ar scrub rules) to 20000. Using @@ -495,6 +497,29 @@ For example: .Bd -literal -offset indent set optimization aggressive .Ed +.It Ar set reassemble yes | no Op Cm no-df +The +.Cm reassemble +option is used to enable or disable the reassembly of fragmented packets, +and can be set to +.Cm yes +or +.Cm no . +If +.Cm no-df +is also specified, fragments with the +.Dq dont-fragment +bit set are reassembled too, +instead of being dropped; +the reassembled packet will have the +.Dq dont-fragment +bit cleared. +The default value is +.Cm no . +.Pp +This option is ignored if there are pre-FreeBSD 14 +.Cm scrub +rules present. .It Ar set block-policy The .Ar block-policy @@ -768,19 +793,21 @@ Used to specify that packets must already be tagged with the given tag in order to match the rule. Inverse tag matching can also be done by specifying the ! operator before the tagged keyword. +.El .Sh TRAFFIC NORMALIZATION -Traffic normalization is used to sanitize packet content in such -a way that there are no ambiguities in packet interpretation on -the receiving side. -The normalizer does IP fragment reassembly to prevent attacks -that confuse intrusion detection systems by sending overlapping -IP fragments. -Packet normalization is invoked with the -.Ar scrub -directive. -.Pp -.Ar scrub -has the following options: +Traffic normalization is a broad umbrella term +for aspects of the packet filter which deal with +verifying packets, packet fragments, spoofed traffic, +and other irregularities. +.Ss Scrub +Scrub involves sanitising packet content in such a way +that there are no ambiguities in packet interpretation on the receiving side. +It is invoked with the +.Cm scrub +option, added to filter rules. +.Pp +Parameters are specified enclosed in parentheses. +At least one of the following parameters must be specified: .Bl -tag -width xxxx .It Ar no-df Clears the @@ -839,22 +866,8 @@ Replaces the IP identification field with random values to compensate for predictable values generated by many hosts. This option only applies to packets that are not fragmented after the optional fragment reassembly. -.It Ar fragment reassemble -Using -.Ar scrub -rules, fragments can be reassembled by normalization. -In this case, fragments are buffered until they form a complete -packet, and only the completed packet is passed on to the filter. -The advantage is that filter rules have to deal only with complete -packets, and can ignore fragments. -The drawback of caching fragments is the additional memory cost. -This is the default behaviour unless no fragment reassemble is specified. -.It Ar no fragment reassemble -Do not reassemble fragments. .It Ar reassemble tcp Statefully normalizes TCP connections. -.Ar scrub reassemble tcp -rules may not have the direction (in/out) specified. .Ar reassemble tcp performs the following normalizations: .Pp @@ -906,6 +919,41 @@ blind attacker would have to guess the timestamp as well. .Pp For example, .Bd -literal -offset indent +match in all scrub (no-df random-id max-mss 1440) +.Ed +.Ss Scrub ruleset (pre-FreeBSD 14) +In order to maintain compatibility with older releases of FreeBSD +.Ar scrub +rules can also be specified in their own ruleset. +In such case they are invoked with the +.Ar scrub +directive. +If there are such rules present they determine packet reassembly behaviour. +When no such rules are present the option +.Ar set reassembly +takes precedence. +The +.Ar scrub +rules can take all parameters specified above for a +.Ar scrub +option of filter rules and 2 more parameters controlling fragment reassembly: +.Bl -tag -width xxxx +.It Ar fragment reassemble +Using +.Ar scrub +rules, fragments can be reassembled by normalization. +In this case, fragments are buffered until they form a complete +packet, and only the completed packet is passed on to the filter. +The advantage is that filter rules have to deal only with complete +packets, and can ignore fragments. +The drawback of caching fragments is the additional memory cost. +This is the default behaviour unless no fragment reassemble is specified. +.It Ar no fragment reassemble +Do not reassemble fragments. +.El +.Pp +For example, +.Bd -literal -offset indent scrub in on $ext_if all fragment reassemble .Ed .Pp @@ -917,6 +965,14 @@ much in the same way as works in the packet filter (see below). This mechanism should be used when it is necessary to exclude specific packets from broader scrub rules. +.Pp +.Ar scrub +rules in the +.Ar scrub +ruleset are evaluated for every packet before stateful filtering. +This means excessive usage of them will cause performance penalty. +.Ar scrub reassemble tcp +rules must not have the direction (in/out) specified. .Sh QUEUEING with ALTQ The ALTQ system is currently not available in the GENERIC kernel nor as loadable modules. @@ -1494,28 +1550,21 @@ rules differ from .Ar block and .Ar pass -rules in that parameters are set every time a packet matches the rule, not only +rules in that parameters are set for every rule a packet matches, not only on the last matching rule. For the following parameters, this means that the parameter effectively becomes "sticky" until explicitly overridden: .Ar queue , .Ar dnpipe , -.Ar dnqueue +.Ar dnqueue , +.Ar rtable , +.Ar scrub . .It Ar pass The packet is passed; state is created unless the .Ar no state option is specified. -.It Ar match -Action is unaltered, the previously matched rule's action still matters. -Match rules apply queue and rtable assignments for every matched packet, -subsequent matching pass or match rules can overwrite the assignment, -if they don't specify a queue or an rtable, respectively, the previously -set value remains. -Additionally, match rules can contain log statements; the is logging done -for each and every matching match rule, so it is possible to log a single -packet multiple times. .El .Pp By default @@ -2597,6 +2646,8 @@ contain the necessary header information for the subprotocol that allows to filter on things such as TCP ports or to perform NAT. .Pp Besides the use of +.Ar set reassemble +option or .Ar scrub rules as described in .Sx TRAFFIC NORMALIZATION @@ -2605,7 +2656,11 @@ above, there are three options for handling fragments in the packet filter. One alternative is to filter individual fragments with filter rules. If no .Ar scrub -rule applies to a fragment, it is passed to the filter. +rule applies to a fragment or +.Ar set reassemble +is set to +.Cm no +, it is passed to the filter. Filter rules with matching IP header parameters decide whether the fragment is passed or blocked, in the same way as complete packets are filtered. @@ -2638,11 +2693,13 @@ rules. .Pp In most cases, the benefits of reassembly outweigh the additional memory cost, and it's recommended to use +.Ar set reassemble +option or .Ar scrub -rules to reassemble -all fragments via the +rules with the .Ar fragment reassemble -modifier. +modifier to reassemble +all fragments. .Pp The memory allocated for fragment caching can be limited using .Xr pfctl 8 . @@ -3007,12 +3064,12 @@ rdr on $ext_if proto tcp from any to any port 80 \e # (157.161.48.183, the only routable address) # and the private network is 10.0.0.0/8, for which we are doing NAT. +# Reassemble incoming traffic +set reassemble yes + # use a macro for the interface name, so it can be changed easily ext_if = \&"kue0\&" -# normalize all incoming traffic -scrub in on $ext_if all fragment reassemble - # block and log everything by default block return log on $ext_if all diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 2625966a0278..a92462c53f15 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1043,14 +1043,22 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, int ip_len; int tag = -1; int verdict; - int srs; + bool scrub_compat; PF_RULES_RASSERT(); r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); - /* Check if there any scrub rules. Lack of scrub rules means enforced - * packet normalization operation just like in OpenBSD. */ - srs = (r != NULL); + /* + * Check if there are any scrub rules, matching or not. + * Lack of scrub rules means: + * - enforced packet normalization operation just like in OpenBSD + * - fragment reassembly depends on V_pf_status.reass + * With scrub rules: + * - packet normalization is performed if there is a matching scrub rule + * - fragment reassembly is performed if the matching rule has no + * PFRULE_FRAGMENT_NOREASS flag + */ + scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) @@ -1076,7 +1084,7 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, break; } - if (srs) { + if (scrub_compat) { /* With scrub rules present IPv4 normalization happens only * if one of rules has matched and it's not a "no scrub" rule */ if (r == NULL || r->action == PF_NOSCRUB) @@ -1087,12 +1095,6 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); pf_rule_to_actions(r, &pd->act); - } else if ((!V_pf_status.reass && (h->ip_off & htons(IP_MF | IP_OFFMASK)))) { - /* With no scrub rules IPv4 fragment reassembly depends on the - * global switch. Fragments can be dropped early if reassembly - * is disabled. */ - REASON_SET(reason, PFRES_NORM); - goto drop; } /* Check for illegal packets */ @@ -1107,9 +1109,10 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, } /* Clear IP_DF if the rule uses the no-df option or we're in no-df mode */ - if ((((r && r->rule_flag & PFRULE_NODF) || - (V_pf_status.reass & PF_REASS_NODF)) && h->ip_off & htons(IP_DF) - )) { + if (((!scrub_compat && V_pf_status.reass & PF_REASS_NODF) || + (r != NULL && r->rule_flag & PFRULE_NODF)) && + (h->ip_off & htons(IP_DF)) + ) { u_int16_t ip_off = h->ip_off; h->ip_off &= htons(~IP_DF); @@ -1143,7 +1146,9 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, goto bad; } - if (r==NULL || !(r->rule_flag & PFRULE_FRAGMENT_NOREASS)) { + if ((!scrub_compat && V_pf_status.reass) || + (r != NULL && !(r->rule_flag & PFRULE_FRAGMENT_NOREASS)) + ) { max = fragoff + ip_len; /* Fully buffer all of the fragments @@ -1203,14 +1208,20 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, int ooff; u_int8_t proto; int terminal; - int srs; + bool scrub_compat; PF_RULES_RASSERT(); r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); - /* Check if there any scrub rules. Lack of scrub rules means enforced - * packet normalization operation just like in OpenBSD. */ - srs = (r != NULL); + /* + * Check if there are any scrub rules, matching or not. + * Lack of scrub rules means: + * - enforced packet normalization operation just like in OpenBSD + * With scrub rules: + * - packet normalization is performed if there is a matching scrub rule + * XXX: Fragment reassembly always performed for IPv6! + */ + scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) @@ -1235,7 +1246,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, break; } - if (srs) { + if (scrub_compat) { /* With scrub rules present IPv6 normalization happens only * if one of rules has matched and it's not a "no scrub" rule */ if (r == NULL || r->action == PF_NOSCRUB) diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index af5b84e34c67..1abf4f609832 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -82,17 +82,29 @@ def prepare_ipv4(dst_address, send_params): def send_icmp_ping(dst_address, sendif, send_params): send_length = send_params['length'] + send_frag_length = send_params['frag_length'] + packets = [] ether = sp.Ether() if ':' in dst_address: ip6 = prepare_ipv6(dst_address, send_params) icmp = sp.ICMPv6EchoRequest(data=sp.raw(build_payload(send_length))) - req = ether / ip6 / icmp + if send_frag_length: + for packet in sp.fragment(ip6 / icmp, fragsize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip6 / icmp) + else: ip = prepare_ipv4(dst_address, send_params) icmp = sp.ICMP(type='echo-request') raw = sp.raw(build_payload(send_length)) - req = ether / ip / icmp / raw - sp.sendp(req, sendif, verbose=False) + if send_frag_length: + for packet in sp.fragment(ip / icmp / raw, fragsize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip / icmp / raw) + for packet in packets: + sp.sendp(packet, sendif, verbose=False) def send_tcp_syn(dst_address, sendif, send_params): @@ -372,7 +384,7 @@ def check_tcp_syn_reply(expect_params, packet): return check_tcp_syn_reply_4(expect_params, packet) -def setup_sniffer(recvif, ping_type, sniff_type, expect_params): +def setup_sniffer(recvif, ping_type, sniff_type, expect_params, defrag): if ping_type == 'icmp' and sniff_type == 'request': checkfn = check_ping_request elif ping_type == 'icmp' and sniff_type == 'reply': @@ -384,7 +396,7 @@ def setup_sniffer(recvif, ping_type, sniff_type, expect_params): else: raise Exception('Unspported ping or sniff type') - return Sniffer(expect_params, checkfn, recvif) + return Sniffer(expect_params, checkfn, recvif, defrag=defrag) def parse_args(): @@ -417,6 +429,8 @@ def parse_args(): parser_send = parser.add_argument_group('Values set in transmitted packets') parser_send.add_argument('--send-flags', nargs=1, type=str, help='IPv4 fragmentation flags') + parser_send.add_argument('--send-frag-length', nargs=1, type=int, + help='Force IP fragmentation with given fragment length') parser_send.add_argument('--send-hlim', nargs=1, type=int, help='IPv6 Hop Limit or IPv4 Time To Live') parser_send.add_argument('--send-mss', nargs=1, type=int, @@ -428,7 +442,7 @@ def parse_args(): parser_send.add_argument('--send-tc', nargs=1, type=int, help='IPv6 Traffic Class or IPv4 DiffServ / ToS') parser_send.add_argument('--send-tcpopt-unaligned', action='store_true', - help='Include unaligned TCP options') + help='Include unaligned TCP options') # Expectations parser_expect = parser.add_argument_group('Values expected in sniffed packets') @@ -467,7 +481,7 @@ def main(): # Standardize parameters which have nargs=1. send_params = {} expect_params = {} - for param_name in ('flags', 'hlim', 'length', 'mss', 'seq', 'tc'): + for param_name in ('flags', 'hlim', 'length', 'mss', 'seq', 'tc', 'frag_length'): param_arg = vars(args).get(f'send_{param_name}') send_params[param_name] = param_arg[0] if param_arg else None param_arg = vars(args).get(f'expect_{param_name}') @@ -488,6 +502,11 @@ def main(): sniffers = [] + if send_params['frag_length']: + defrag = True + else: + defrag = False + if recv_ifs: sniffer_params = copy(expect_params) sniffer_params['src_address'] = None @@ -495,7 +514,8 @@ def main(): for iface in recv_ifs: LOGGER.debug(f'Installing receive sniffer on {iface}') sniffers.append( - setup_sniffer(iface, args.ping_type, 'request', sniffer_params, + setup_sniffer(iface, args.ping_type, 'request', + sniffer_params, defrag, )) if reply_ifs: @@ -505,7 +525,8 @@ def main(): for iface in reply_ifs: LOGGER.debug(f'Installing reply sniffer on {iface}') sniffers.append( - setup_sniffer(iface, args.ping_type, 'reply', sniffer_params, + setup_sniffer(iface, args.ping_type, 'reply', + sniffer_params, defrag, )) LOGGER.debug(f'Installed {len(sniffers)} sniffers') diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py index ab3ddc0aea3c..14305a37278c 100644 --- a/tests/sys/netpfil/common/sniffer.py +++ b/tests/sys/netpfil/common/sniffer.py @@ -30,7 +30,7 @@ import scapy.all as sp import sys class Sniffer(threading.Thread): - def __init__(self, args, check_function, recvif, timeout=3): + def __init__(self, args, check_function, recvif, timeout=3, defrag=False): threading.Thread.__init__(self) self._sem = threading.Semaphore(0) @@ -38,6 +38,7 @@ class Sniffer(threading.Thread): self._timeout = timeout self._recvif = recvif self._check_function = check_function + self._defrag = defrag self.correctPackets = 0 self.start() @@ -55,6 +56,15 @@ class Sniffer(threading.Thread): def run(self): self.packets = [] - self.packets = sp.sniff(iface=self._recvif, - stop_filter=self._checkPacket, timeout=self._timeout, - started_callback=self._startedCb) + if self._defrag: + # With fragment reassembly we can't stop the sniffer after catching + # the good packets, as those have not been reassembled. We must + # wait for sniffer to finish and check returned packets instead. + self.packets = sp.sniff(session=sp.IPSession, iface=self._recvif, + timeout=self._timeout, started_callback=self._startedCb) + for p in self.packets: + self._checkPacket(p) + else: + self.packets = sp.sniff(iface=self._recvif, + stop_filter=self._checkPacket, timeout=self._timeout, + started_callback=self._startedCb) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index d3b187789685..1083f89a5502 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_SH+= altq \ forward \ fragmentation_compat \ fragmentation_pass \ + fragmentation_no_reassembly \ get_state \ icmp \ killstate \ diff --git a/tests/sys/netpfil/pf/fragmentation_compat.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh index f66ebbad6b33..21ce6b734ea1 100644 --- a/tests/sys/netpfil/pf/fragmentation_compat.sh +++ b/tests/sys/netpfil/pf/fragmentation_compat.sh @@ -300,17 +300,6 @@ reassemble_body() atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 jexec alcatraz pfctl -e - pft_set_rules alcatraz \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Single fragment passes - atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 - - # But a fragmented ping does not - atf_check -s exit:2 -o ignore ping -c 1 -s 2000 192.0.2.2 - pft_set_rules alcatraz \ "scrub in" \ "pass out" \ diff --git a/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh new file mode 100644 index 000000000000..fb5c15ac2ff8 --- /dev/null +++ b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh @@ -0,0 +1,130 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2017 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz +# +# 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. + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "match_full_v4" "cleanup" +match_full_v4_head() +{ + atf_set descr 'Matching non-fragmented IPv4 packets' + atf_set require.user root + atf_set require.progs scapy +} + +match_full_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # Only non-fragmented packets are passed + jexec router pfctl -e + pft_set_rules router \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + ping_dummy_check_request exit:0 --ping-type=icmp + ping_dummy_check_request exit:1 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +match_full_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "match_fragment_v4" "cleanup" +match_fragment_v4_head() +{ + atf_set descr 'Matching fragmented IPv4 packets' + atf_set require.user root + atf_set require.progs scapy +} + +match_fragment_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # Only fragmented packets are passed + pft_set_rules router \ + "pass out" \ + "block in" \ + "pass in inet proto icmp fragment" + ping_dummy_check_request exit:1 --ping-type=icmp + ping_dummy_check_request exit:0 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +match_fragment_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "compat_override_v4" "cleanup" +compat_override_v4_head() +{ + atf_set descr 'Scrub rules override "set reassemble" for IPv4' + atf_set require.user root + atf_set require.progs scapy +} + +compat_override_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # The same as match_fragment_v4 but with "set reassemble yes" which + # is ignored because of presence of scrub rules. + # Only fragmented packets are passed. + pft_set_rules router \ + "set reassemble yes" \ + "no scrub" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp fragment" + ping_dummy_check_request exit:1 --ping-type=icmp + ping_dummy_check_request exit:0 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +compat_override_v4_cleanup() +{ + pft_cleanup +} + + +atf_init_test_cases() +{ + atf_add_test_case "match_full_v4" + atf_add_test_case "match_fragment_v4" + atf_add_test_case "compat_override_v4" +} From nobody Wed Apr 24 22:12: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 4VPtX73Cjhz5JDGb; Wed, 24 Apr 2024 22:12: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 4VPtX70WfQz4c9N; Wed, 24 Apr 2024 22:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUWgryrVUwmiKb3xpYlFdiqSptjsnyEax81nzUYY9cE=; b=b2cbvl5baSeQ1ZIkzUshMmuVnsjL1+I1ZjfxN9Btqo8yqqErrRjXj1sJ5scBAvvSbtwaHF LkTR4o6Wg0Y2W2ChRs/Es3LcwCcHDUAPlsuVhu9xct4FClrEPtwD4mpUX+0bfQ8FHRkq0k okf29VBgpSVykyvi1YjpzQrDCJpLx8CaRXmnnNc40Gk5NVhX8e4M0lsVlrQxds5C2jaga+ 7juctk7NEFrEyFQz1DnxNGSZlusn5KaonuzFKVaXYu6Xq12Fw6Uz1PvmOOUMezV7sI9sN4 wJTO5e96nUAecAkwzSaVNPQYc1IC3SYDLft+b1frJ6LmsgQbQunqmESLPVo9Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996759; a=rsa-sha256; cv=none; b=tfKiywmxElZugY4+Zt4diHn5uF1OQp9o6/n3NTE8afpSyiQOcO4xQhxyhAIg0mJlHAxUqP X8qrWjiPHnMsCi+1GgqZVEIHXodgKrj1DVnZg+QNwGQ/I+SQeG0nGy0uFdA86rc3QW0j2V cx9Vf4Zw3q6aui9FffnuYQrx/vmqdKXA99VFg4zJKueYa0vtGosnjJ4Hws6YFhHS2pW17S qJjD4tHR4BHVHtaQiXWXpQ6AGkSxWWK02/DcmcslzcmNaSynKGX5Ss38L7GWdjFPozPsbo A8Pgjwp+eeeUJwaugVImFD79bVPoh6+F0GFIUZMlrU8sNl7Me//m50xGA7wahw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUWgryrVUwmiKb3xpYlFdiqSptjsnyEax81nzUYY9cE=; b=nTIsxpRCr2/t58WeaXdO1Oj/g6moGL65SNU1IfehmxqeAUPWQsQXUKa69iv3uVLX2PfwbF JnDiZkvL+Ilxy/s+/AxWEYehqj0Sk99kvWBa3Jp4oNY9LkJ/IiXetOuBe+Fh5a3qHqcmpS RDoN7WvrhGiBERFpmDm9twLOMWFJPHQs2jUwmKtpFeuBAYs6hWlUSOHep2uJgxcd8epB9l r7M0wwMSJUHp1DlusgpXq8tmCcyyRpQU8nYrpQtlUnqA0vQXLzmr2pd7Tss/Dzes0TO9SV FrjPwS53n7clnvi6ASKb3DJ076YAGZCoDQbs0lFMhC0m7n1aDcQiYgMTcUx92A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtX705dnzYX4; Wed, 24 Apr 2024 22:12: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 43OMCcrJ070752; Wed, 24 Apr 2024 22:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMCcMQ070749; Wed, 24 Apr 2024 22:12:38 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:12:38 GMT Message-Id: <202404242212.43OMCcMQ070749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 760720469681 - stable/14 - cp: Clarify an obscure comment. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 760720469681a2119b4537a6603337834317383b Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=760720469681a2119b4537a6603337834317383b commit 760720469681a2119b4537a6603337834317383b Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-24 22:11:56 +0000 cp: Clarify an obscure comment. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44805 (cherry picked from commit 64d6925d1901637125f9f739282e72c992657dc8) cp: Additional sanity check. Once we've successfully opened the file we've been asked to copy, check that it's of the same type as FTS told us it was. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44806 (cherry picked from commit 9075d4cfad5b339aabdf8033623a2164898c2786) cp: Use warnc(). MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit f070188c3ad6b87ee9ce220b21718333d1bd9d52) --- bin/cp/cp.c | 13 +++++++++---- bin/cp/utils.c | 27 ++++++++++++++++++++------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index af7d5ffac398..a8c57308ae96 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -316,8 +316,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) case FTS_NS: case FTS_DNR: case FTS_ERR: - warnx("%s: %s", - curr->fts_path, strerror(curr->fts_errno)); + warnc(curr->fts_errno, "%s", curr->fts_path); badcp = rval = 1; continue; case FTS_DC: /* Warn, continue. */ @@ -491,13 +490,19 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) switch (curr->fts_statp->st_mode & S_IFMT) { case S_IFLNK: - /* Catch special case of a non-dangling symlink. */ if ((fts_options & FTS_LOGICAL) || ((fts_options & FTS_COMFOLLOW) && curr->fts_level == 0)) { + /* + * We asked FTS to follow links but got + * here anyway, which means the target is + * nonexistent or inaccessible. Let + * copy_file() deal with the error. + */ if (copy_file(curr, dne)) badcp = rval = 1; - } else { + } else { + /* Copy the link. */ if (copy_link(curr, !dne)) badcp = rval = 1; } diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 353d35214844..a2cb2f536843 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -106,21 +106,34 @@ copy_fallback(int from_fd, int to_fd) int copy_file(const FTSENT *entp, int dne) { - struct stat *fs; + struct stat sb, *fs; ssize_t wcount; off_t wtotal; int ch, checkch, from_fd, rval, to_fd; int use_copy_file_range = 1; + fs = entp->fts_statp; from_fd = to_fd = -1; - if (!lflag && !sflag && - (from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) { - warn("%s", entp->fts_path); - return (1); + if (!lflag && !sflag) { + if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 || + fstat(from_fd, &sb) != 0) { + warn("%s", entp->fts_path); + return (1); + } + /* + * Check that the file hasn't been replaced with one of a + * different type. This can happen if we've been asked to + * copy something which is actively being modified and + * lost the race, or if we've been asked to copy something + * like /proc/X/fd/Y which stat(2) reports as S_IFREG but + * is actually something else once you open it. + */ + if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) { + warnx("%s: File changed", entp->fts_path); + return (1); + } } - fs = entp->fts_statp; - /* * If the file exists and we're interactive, verify with the user. * If the file DNE, set the mode to be the from file, minus setuid From nobody Wed Apr 24 22:14: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 4VPtZq5PQhz5JDdl; Wed, 24 Apr 2024 22:14: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 4VPtZq4tCHz4dNl; Wed, 24 Apr 2024 22:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbwcMY7oJ0dr8cBa23TzWJ/HP1YAC2DcqYTjaLeorZ4=; b=FFQ/ZbLEngbGcB7Kf7kZ5R9u4kRKHhqnXxTH/Nj8rZFsUxpHLQN7s/KxYuV/12jNG6nUVm fJ9uCuj8s2C064xvLsO1V+Tvmn8eiuSOXVRtIH/46+hmC+u2sym0R2JHvCY8a7aFIqspdq y6FgxQR5AKK9IdQid84D+0ASMbeDHPF6mB3/Jvn9JVklvTJozK91B2f99Gh8PoPD3OX9c7 3BZLPJgHeWkm0N1Psd/jki7J9LRt/H2nyPzTxsFNHOsetpOigak4upInVkheKgNWhm0CoI LsWwGcnQRkjArZdXEFDhxOjEkwCvUYXOEIGzmc56qnG+12K9Xm5UXyHc2F336Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996899; a=rsa-sha256; cv=none; b=I1CBAyor/rGxok85H2cMeRjZ1U+YTj9eEKOtOEoeIRYe3WA1GFCa5o/+hKPCBFh0Tz3dtk mCcIKV9uG8G8eido6+B5Jfevxsvb3oR/K+ShqWaY1RqRFVVYSv9wzzrRy+Zakb9usJnoA5 zqT5GRuVA7uCk3HVS0RJ/lX35Zns11H6P5RBylaWqSMHR5pnGbkltnK3FQ5S//MTvFwy9l rwGBy6t9utp9JocHoJaNS9F7CaPOyymi5XGyfSoTp9t2Wm9z4dbhfPoj7bUrvPUvPU5q8o 4bHTdybU3y0++W307Ypq6ZpWSrE2guoh/4C7wRKTOwwJFyK0OSgMhU5OwlLcZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbwcMY7oJ0dr8cBa23TzWJ/HP1YAC2DcqYTjaLeorZ4=; b=dr4xbiuyWpJdsMF5vKw5gTt+9yhRkLoMl3crDrOzTQtgHMJkcYoNn5aiP+ril3Tg8hfwNY nacH0w70XVv6aQUG/bNJEamBcBJZhxboIW1P7yq5XTKtgedi75ok640k93wz8KtIuiQUMj SUdlZzkRczXVAGqOBGK4LYKCLercejTzVW8jcsxM6TxCym4z4YoPYY+iYgh2NdFmYKjVIr fMFZXhOc5KXHPr7rK4zLddDcdkhkPXomm028sFTXcSd8MzQx4qWDi/Pcfqt5A+m5JqTFsI B7pUePSsj1q+T0mO9+fPhU8VxBR47Xsl5FJoNmhvtX19Iaha86mdKLURvEH0qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZq4TWTzYvT; Wed, 24 Apr 2024 22:14: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 43OMExtE071293; Wed, 24 Apr 2024 22:14:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMExmi071290; Wed, 24 Apr 2024 22:14:59 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:14:59 GMT Message-Id: <202404242214.43OMExmi071290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: ff28ca091142 - stable/14 - iflib: Add sysctl to request extra MSIX vectors on driver load List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff28ca091142538330b3469be7c9af678db65107 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff28ca091142538330b3469be7c9af678db65107 commit ff28ca091142538330b3469be7c9af678db65107 Author: Eric Joyner AuthorDate: 2023-03-22 19:18:44 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 iflib: Add sysctl to request extra MSIX vectors on driver load Intended to be used with upcoming feature to add sub-interfaces, since those new interfaces will be dynamically created and will need to have spare MSI-X interrupts already allocated for them on driver load. This sysctl is marked as a tunable since it will need to be set before the driver is loaded since MSI-X interrupt allocation and setup is done during the attach process. Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41326 (cherry picked from commit 3c7da27a473e339392121404e06c506df040c16f) --- sys/net/iflib.c | 14 ++++++++++++++ sys/net/iflib.h | 1 + 2 files changed, 15 insertions(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 999a86fabc79..ac27450480c9 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -194,6 +194,7 @@ struct iflib_ctx { #define CORE_OFFSET_UNSPECIFIED 0xffff uint8_t ifc_sysctl_separate_txrx; uint8_t ifc_sysctl_use_logical_cores; + uint16_t ifc_sysctl_extra_msix_vectors; bool ifc_cpus_are_physical_cores; qidx_t ifc_sysctl_ntxds[8]; @@ -264,6 +265,13 @@ iflib_get_sctx(if_ctx_t ctx) return (ctx->ifc_sctx); } +uint16_t +iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx) +{ + + return (ctx->ifc_sysctl_extra_msix_vectors); +} + #define IP_ALIGNED(m) ((((uintptr_t)(m)->m_data) & 0x3) == 0x2) #define CACHE_PTR_INCREMENT (CACHE_LINE_SIZE/sizeof(void*)) #define CACHE_PTR_NEXT(ptr) ((void *)(((uintptr_t)(ptr)+CACHE_LINE_SIZE-1) & (CACHE_LINE_SIZE-1))) @@ -6802,6 +6810,12 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "use_logical_cores", CTLFLAG_RDTUN, &ctx->ifc_sysctl_use_logical_cores, 0, "try to make use of logical cores for TX and RX"); + SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "use_extra_msix_vectors", + CTLFLAG_RDTUN, &ctx->ifc_sysctl_extra_msix_vectors, 0, + "attempt to reserve the given number of extra MSI-X vectors during driver load for the creation of additional interfaces later"); + SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "allocated_msix_vectors", + CTLFLAG_RDTUN, &ctx->ifc_softc_ctx.isc_vectors, 0, + "total # of MSI-X vectors allocated by driver"); /* XXX change for per-queue sizes */ SYSCTL_ADD_PROC(ctx_list, oid_list, OID_AUTO, "override_ntxds", diff --git a/sys/net/iflib.h b/sys/net/iflib.h index b16e2805aab6..5e1adccf202c 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -489,5 +489,6 @@ void iflib_led_create(if_ctx_t ctx); void iflib_add_int_delay_sysctl(if_ctx_t, const char *, const char *, if_int_delay_info_t, int, int); +uint16_t iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx); #endif /* __IFLIB_H_ */ From nobody Wed Apr 24 22:15: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 4VPtZr6hRzz5JDn5; Wed, 24 Apr 2024 22:15: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 4VPtZr69Knz4dNm; Wed, 24 Apr 2024 22:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4BWpbxH2Y30/lYOc55WOXPunD7/JhQLMBH0Tri2w6Y=; b=jHiT4Laij3KJPQ1kDN8owkLYGavSGcNnwGN16Y1+4lohktcDq0INuQGFEJhXLU4+/D87fG Xt+W2lduTbtQCuURhvR2TeBdEwb2dKeXxsTBqEXsFBSEh1fPBreOHNGl52w6tTpJ8Mfn8l NWerDjub5807CHtUu5Y3hQkXlQIl6z/HjJeGVCeQTXDas1h5m6jdp3RA0A07Y+r+h3hnbS 9U5h9bLYO7uMnKNL2Zyy44RepVMKsTK3hTSG+Cq7stxMbtjPVjLAYRWL30/Xrsr5w2cVGe pVZc9UtIp3g5g9GhJ/31rLKv/M0Aeg4c9Z+vBInYbS4KCOPnZoAv+CWhlT/7Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996900; a=rsa-sha256; cv=none; b=GGLWy2YA6NrOk9gg3Y7WVAVwteqpVv0z8PohAbhrstnlakkLbAWT7THY1f5Nz0oKtAYfJQ KVkKBppPteFREuZKg8cfObClm49L+j+h0YHYzviVGpu5SN3WNTKCXkvChniX6iWHMOujT7 p2FFUQxzMZYk/smNPn17Pgzxz+vM2DkJzk8FKA3weQ5TH2omx5HJfVTq1tWRoewqQfMpA9 GAnTV45ELHVexsNysMvIJlBm34Zth/rLefv/As2Rh4egUwuOpr1IZzFzIB4dF8rVy9B2MD u45b2itq4OAipxD+ZEi7GFkx1NV8ygeyVKPhORCMpiNYCHkAPuR+nfexcuQmiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4BWpbxH2Y30/lYOc55WOXPunD7/JhQLMBH0Tri2w6Y=; b=SJ87BRNtTl3mbnOLVEYhAzlxerI94O4Y436hfIsmCwL8Wa8ncWHRSEep0i5UPOwb7AEO/a qSL2xlWyh1bQt6wC86pYtwVk61oKlmp+Dj+B3meAJQdIlJCzwS/qjX4gL+naRLyQI+DS13 3vu9HRWOAzORlwcoAEnPldgltPt08XObLQd2YWW0x9jzRsq18TMX+DcM+saoGrA+Eh5097 WiVPEEC951HbgmFauZtqI6MMS6Rd6RwCpKXJ0Kjxy/Z6OwpeJZilxaPjDoQ4bvd99WBLyH d65FEBrc9y2gehTvujF3iarGuCQmnqwYSEpfcwhESONXSbMlbRQfg5M+FCmciA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZr5nD6zYZb; Wed, 24 Apr 2024 22:15: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 43OMF0s4071360; Wed, 24 Apr 2024 22:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMF09D071357; Wed, 24 Apr 2024 22:15:00 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:00 GMT Message-Id: <202404242215.43OMF09D071357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 59d1c385f681 - stable/14 - iflib: Add subinterface interrupt allocation function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 59d1c385f68168052d2f62717ec2b89b29df17d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=59d1c385f68168052d2f62717ec2b89b29df17d8 commit 59d1c385f68168052d2f62717ec2b89b29df17d8 Author: Eric Joyner AuthorDate: 2023-01-18 00:46:39 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 iflib: Add subinterface interrupt allocation function The ice(4) driver will add the ability to create extra interfaces that hang off of the base interface; to do that the driver requires a method for the subinterface to request hardware interrupt resources from the base interface. Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D39930 (cherry picked from commit ed34a6b6eab9ea39759ccd3f12876a815d271929) --- sys/net/iflib.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- sys/net/iflib.h | 12 +++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index ac27450480c9..01493e90f6bb 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1467,8 +1467,8 @@ iflib_dma_alloc_align(if_ctx_t ctx, int size, int align, iflib_dma_info_t dma, i &dma->idi_tag); if (err) { device_printf(dev, - "%s: bus_dma_tag_create failed: %d\n", - __func__, err); + "%s: bus_dma_tag_create failed: %d (size=%d, align=%d)\n", + __func__, err, size, align); goto fail_0; } @@ -6197,6 +6197,81 @@ iflib_irq_set_affinity(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, return (0); } +/* + * Allocate a hardware interrupt for subctx using the parent (ctx)'s hardware + * resources. + * + * Similar to iflib_irq_alloc_generic(), but for interrupt type IFLIB_INTR_RXTX + * only. + * + * XXX: Could be removed if subctx's dev has its intr resource allocation + * methods replaced with custom ones? + */ +int +iflib_irq_alloc_generic_subctx(if_ctx_t ctx, if_ctx_t subctx, if_irq_t irq, + int rid, iflib_intr_type_t type, + driver_filter_t *filter, void *filter_arg, + int qid, const char *name) +{ + device_t dev, subdev; + struct grouptask *gtask; + struct taskqgroup *tqg; + iflib_filter_info_t info; + gtask_fn_t *fn; + int tqrid, err; + driver_filter_t *intr_fast; + void *q; + + MPASS(ctx != NULL); + MPASS(subctx != NULL); + + tqrid = rid; + dev = ctx->ifc_dev; + subdev = subctx->ifc_dev; + + switch (type) { + case IFLIB_INTR_RXTX: + q = &subctx->ifc_rxqs[qid]; + info = &subctx->ifc_rxqs[qid].ifr_filter_info; + gtask = &subctx->ifc_rxqs[qid].ifr_task; + tqg = qgroup_if_io_tqg; + fn = _task_fn_rx; + intr_fast = iflib_fast_intr_rxtx; + NET_GROUPTASK_INIT(gtask, 0, fn, q); + break; + default: + device_printf(dev, "%s: unknown net intr type for subctx %s (%d)\n", + __func__, device_get_nameunit(subdev), type); + return (EINVAL); + } + + info->ifi_filter = filter; + info->ifi_filter_arg = filter_arg; + info->ifi_task = gtask; + info->ifi_ctx = q; + + NET_GROUPTASK_INIT(gtask, 0, fn, q); + + /* Allocate interrupts from hardware using parent context */ + err = _iflib_irq_alloc(ctx, irq, rid, intr_fast, NULL, info, name); + if (err != 0) { + device_printf(dev, "_iflib_irq_alloc failed for subctx %s: %d\n", + device_get_nameunit(subdev), err); + return (err); + } + + if (tqrid != -1) { + err = iflib_irq_set_affinity(ctx, irq, type, qid, gtask, tqg, q, + name); + if (err) + return (err); + } else { + taskqgroup_attach(tqg, gtask, q, dev, irq->ii_res, name); + } + + return (0); +} + int iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, iflib_intr_type_t type, driver_filter_t *filter, diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 5e1adccf202c..bf40c7429fb8 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -393,6 +393,11 @@ typedef enum { * function. */ #define IFLIB_FEATURE_QUEUE_SELECT_V2 1400073 +/* + * Driver can create subinterfaces with their own Tx/Rx queues + * that all share a single device (or commonly, port) + */ +#define IFLIB_FEATURE_SUB_INTERFACES 1500014 /* * These enum values are used in iflib_needs_restart to indicate to iflib @@ -491,4 +496,11 @@ void iflib_add_int_delay_sysctl(if_ctx_t, const char *, const char *, if_int_delay_info_t, int, int); uint16_t iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx); +/* + * Sub-interface support + */ +int iflib_irq_alloc_generic_subctx(if_ctx_t ctx, if_ctx_t subctx, if_irq_t irq, + int rid, iflib_intr_type_t type, + driver_filter_t *filter, void *filter_arg, + int qid, const char *name); #endif /* __IFLIB_H_ */ From nobody Wed Apr 24 22:15: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 4VPtZt1SqPz5JDdm; Wed, 24 Apr 2024 22:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPtZt0Cjcz4dNq; Wed, 24 Apr 2024 22:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPNNcOWXnEgyJJ2fy4pdslgUNHa6X1XlWJin8MzfecA=; b=KtD5TdMDHuzl3g6EGArJY45/tODlR5r8NS/srBbufb9LnI/tkk2964sTPd/1zIPU1ryZUk rCZ6I3tg8nkijrCubH1O733smPMUzHgkJPpSmmnqUYMkLZ73jMwDq1WXJmKi41U3YD8WsF THP4333gZsV85Dz618bUGw1jxMrUjrSzfiBZxwH+8kFeqM3CxE/ILfW8UrI0lhP8AzmRYQ wkwvzwf7yyjY5miZGLhwHi+SMzuZiXP8wV/g9TnRbZqKGudj6xJZKTr+Ym4ZbBQT8bvr1p EjAdu4HF1yQ6nxH6QTBbPURBEI8dgXPFpp2+qSln/8HlR70gJoTddvBY13ERjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996902; a=rsa-sha256; cv=none; b=jJCTNQ5g6oYRRqO1JWZocP+AoqIkddqI068SADLMNcM/yc2u4h0bG8gTEsuoXwHUVbZnpL NIE7TcC3lhA8wzPIQnCDBCb6ddWgtrBZP819/wEL7dOdy0WfDSwCMTGWPHt/w1HgfO9Qo2 igjVwsqUcW+RsEuDcCO+zC24nMI1fWAjZCfVheKkT1HNvtoqLVivdt6vnZ7rm3yVc9eY5q CXleyIg1INCsuT3nqu8rYnmuB/x4M8afQ3yEVZHK0ZYA1Oh+OQST40U2/NWYSQA6xGlzCL 8hMOih3NjGkXi9Cid44gcbYiPTic2BEcyBsXrPwBbniqrYkUprFGe5MZBF5/Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPNNcOWXnEgyJJ2fy4pdslgUNHa6X1XlWJin8MzfecA=; b=JZMt/tmksM3HrNSrR0WRzGANTqhZPtq1i0TONRbDu+qs4aunTwcCRb91WBl/g3Lopg1lff PQ+zdAt8tamXs5qyiseDWqpJW8duN7hApOed3/f4cVnoB4eVnCXFMwc9u0ZnmxvLXEgri6 7oP5NR4E6lIailc7TkWSGNqUptsfdQeBUnbwqaA9ecYQ73n4iif6gyQvuuU6dEirhpNaGO wHFKIBSp037Tsy58vBXM3Bjzf/IGPjucg+kU7MrI4RMwsIJ7v4RZotIB3RLWGUy8aXm9YH WFP0291+KMO0o7jOrzerEfCIKK4i2fVOkQ4JsRajHKXFkOeGryQU3530WPJIeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZs6xBwzYLZ; Wed, 24 Apr 2024 22:15: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 43OMF1xB071403; Wed, 24 Apr 2024 22:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMF1E4071400; Wed, 24 Apr 2024 22:15:01 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:01 GMT Message-Id: <202404242215.43OMF1E4071400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: eafd6c26f95e - stable/14 - ice_ddp: Update package to 1.3.36.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eafd6c26f95eff33c03bfb20fc3f2b2666cd6988 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=eafd6c26f95eff33c03bfb20fc3f2b2666cd6988 commit eafd6c26f95eff33c03bfb20fc3f2b2666cd6988 Author: Eric Joyner AuthorDate: 2024-02-13 06:39:21 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 ice_ddp: Update package to 1.3.36.0 This is intended to be used with the upcoming ice 1.39.13-k driver update, but is still backwards compatible with previous versions of the driver. Signed-off-by: Eric Joyner Sponsored by: Intel Corporation (cherry picked from commit 768329961dc0c041f7647f1c4549944a2ca168aa) --- sys/conf/files.amd64 | 6 +++--- sys/conf/files.arm64 | 6 +++--- sys/conf/files.powerpc | 6 +++--- .../dev/ice/{ice-1.3.35.0.pkg => ice-1.3.36.0.pkg} | Bin 692776 -> 692776 bytes sys/modules/ice_ddp/Makefile | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 5ef285b70c55..8a5e643913a3 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -196,7 +196,7 @@ dev/ice/irdma_di_if.m optional ice pci \ dev/ice/ice_ddp_common.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -205,8 +205,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ioat/ioat.c optional ioat pci diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 218571d0e23a..fd59014ad461 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -322,7 +322,7 @@ dev/ice/irdma_di_if.m optional ice pci \ dev/ice/ice_ddp_common.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -331,8 +331,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0293efd28fbe..1a0388884ee8 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -95,7 +95,7 @@ dev/ice/irdma_di_if.m optional ice pci powerpc64 | ice pci powerpc64le \ dev/ice/ice_ddp_common.c optional ice pci powerpc64 | ice pci powerpc64le \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp powerpc64 | ice pci powerpc64le \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp powerpc64 | ice pci powerpc64le \ @@ -104,8 +104,8 @@ ice_ddp.fwo optional ice_ddp powerpc64 | ice pci powerpc64le \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp powerpc64 | ice pci powerpc64le \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ixl/if_ixl.c optional ixl pci powerpc64 \ diff --git a/sys/contrib/dev/ice/ice-1.3.35.0.pkg b/sys/contrib/dev/ice/ice-1.3.36.0.pkg similarity index 98% rename from sys/contrib/dev/ice/ice-1.3.35.0.pkg rename to sys/contrib/dev/ice/ice-1.3.36.0.pkg index fc3e8ebc640f..ce5dbf41f557 100644 Binary files a/sys/contrib/dev/ice/ice-1.3.35.0.pkg and b/sys/contrib/dev/ice/ice-1.3.36.0.pkg differ diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile index ad85bc2a9935..7329f0897325 100644 --- a/sys/modules/ice_ddp/Makefile +++ b/sys/modules/ice_ddp/Makefile @@ -1,5 +1,5 @@ KMOD= ice_ddp -FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.35.0.pkg:ice_ddp:0x01032300 +FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.36.0.pkg:ice_ddp:0x01032400 .include From nobody Wed Apr 24 22:15: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 4VPtZv33f2z5JDhk; Wed, 24 Apr 2024 22:15: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 4VPtZv1Vhkz4dGp; Wed, 24 Apr 2024 22:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkUTFnH7bZNRtx2g3O9ZfPpX4wFDOhbxc98r0pwQeP0=; b=KEh0bIG6I3AMggdl46FbsjuOeRWy8QZTdlrHYMdHKFafHPR+bp0QCv5LbsaDGSfFrYT1wo 6J28hNjvWMH0HOzELR2xnCYqAxZpoBhU5p3AP22gopxsfYD86m9kP0Ho8vBKibAUd6UFre 1rrxcXNssDeiRMZOSYXp7YDCsqS2GmtkpZh1NmwdAzeixfcGfyVH/TSBGOoBbAaEfHlqqj 15oP+kv7dX/d1N7oQPaV5W5PBp5o4TO+BL4gs6HAaiEjMsOb7vFgF3gdj9YatDVKiO5xxu Vs0Y+zMRCuzvc8q88LU0Zj6nzZCuETKOhmWINTCDlBMeHrFD4P266QTMZ0+Qhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996903; a=rsa-sha256; cv=none; b=SyGDv6K8plQnXDHZWSfyQhgatrOvW/Tsc9MCqSWN0V0rtWYOFnjwNFc+ClWItmlXpTkrz4 RxkbZXyYsBGr+uxo+VZga1Q7ugSYD85rZz9bO49pOwJ4MJe5bdXQ2V/7jYfX5rFi0t8f75 m581I/QYJWmubf+qbzUWSUO2+X+7HHhHjgDU6ILBIGXgHTN1RXmcszfgo/KtzNNZTWr6K2 jBdHWvP550tRefIqGRnMHEic4k7LAISO5WVp2TOM2Tw90oAcNyJjQTGChjsgQJ0jl+xmsM lW5+iCz+uJJ+0O0+0XzA3m2ry7vhr8QZLv+gUkkt9YcIHsPcvgvqaDwrQMDQ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkUTFnH7bZNRtx2g3O9ZfPpX4wFDOhbxc98r0pwQeP0=; b=gNki1rypvg6VgunCEeTyFt90hd/NWV5AnelRy17Na61KhjkiEWk3L64RwGPvfl2KwT2kcU tJBKpBLJNMRbdHlirgxvEEpm68/cT0mrsTEjGFksP7eqo6rbnlkhUMobaSB2uUJsBQJ081 6dlLNvidgr7dqT7Nx3k5ZMKXmUeg7Zfn6rvbJliYDUIBYEDFW/yj4ORhawp+RspL/hEmS6 8mDsqN7dabC0C1kamcpur+kOz04bEQK1zxK5xnxfgL3Ygx2h4mTjqzCuzXss0UlELH7qyK WuMzvAKfknanw28cd7e8KXogO6eScj6a0Ou1j1OQJUdXBkAgvOA2fumuNG08jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZv0vpFzYX5; Wed, 24 Apr 2024 22:15: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 43OMF3tl071456; Wed, 24 Apr 2024 22:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMF3FR071453; Wed, 24 Apr 2024 22:15:03 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:03 GMT Message-Id: <202404242215.43OMF3FR071453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 988dd5a1f361 - stable/14 - ice(4): Update copyright year to 2024 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 988dd5a1f3613ca0ea6ed2cdb3dbf8aa9e640048 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=988dd5a1f3613ca0ea6ed2cdb3dbf8aa9e640048 commit 988dd5a1f3613ca0ea6ed2cdb3dbf8aa9e640048 Author: Eric Joyner AuthorDate: 2024-02-13 06:25:47 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 ice(4): Update copyright year to 2024 Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D44003 (cherry picked from commit 015f8cc5b0c10336a048f37a7071ea03516de242) --- sys/dev/ice/ice_adminq_cmd.h | 2 +- sys/dev/ice/ice_alloc.h | 2 +- sys/dev/ice/ice_bitops.h | 2 +- sys/dev/ice/ice_common.c | 2 +- sys/dev/ice/ice_common.h | 2 +- sys/dev/ice/ice_common_sysctls.h | 2 +- sys/dev/ice/ice_common_txrx.h | 2 +- sys/dev/ice/ice_controlq.c | 2 +- sys/dev/ice/ice_controlq.h | 2 +- sys/dev/ice/ice_dcb.c | 2 +- sys/dev/ice/ice_dcb.h | 2 +- sys/dev/ice/ice_ddp_common.c | 2 +- sys/dev/ice/ice_ddp_common.h | 2 +- sys/dev/ice/ice_defs.h | 2 +- sys/dev/ice/ice_drv_info.h | 2 +- sys/dev/ice/ice_features.h | 2 +- sys/dev/ice/ice_flex_pipe.c | 2 +- sys/dev/ice/ice_flex_pipe.h | 2 +- sys/dev/ice/ice_flex_type.h | 2 +- sys/dev/ice/ice_flow.c | 2 +- sys/dev/ice/ice_flow.h | 2 +- sys/dev/ice/ice_fw_logging.c | 2 +- sys/dev/ice/ice_fwlog.c | 2 +- sys/dev/ice/ice_fwlog.h | 2 +- sys/dev/ice/ice_hw_autogen.h | 2 +- sys/dev/ice/ice_iflib.h | 2 +- sys/dev/ice/ice_iflib_recovery_txrx.c | 2 +- sys/dev/ice/ice_iflib_sysctls.h | 2 +- sys/dev/ice/ice_iflib_txrx.c | 2 +- sys/dev/ice/ice_lan_tx_rx.h | 2 +- sys/dev/ice/ice_lib.c | 2 +- sys/dev/ice/ice_lib.h | 2 +- sys/dev/ice/ice_nvm.c | 2 +- sys/dev/ice/ice_nvm.h | 2 +- sys/dev/ice/ice_opts.h | 2 +- sys/dev/ice/ice_osdep.c | 2 +- sys/dev/ice/ice_osdep.h | 2 +- sys/dev/ice/ice_protocol_type.h | 2 +- sys/dev/ice/ice_rdma.c | 2 +- sys/dev/ice/ice_rdma.h | 2 +- sys/dev/ice/ice_rdma_internal.h | 2 +- sys/dev/ice/ice_resmgr.c | 2 +- sys/dev/ice/ice_resmgr.h | 2 +- sys/dev/ice/ice_rss.h | 2 +- sys/dev/ice/ice_sched.c | 2 +- sys/dev/ice/ice_sched.h | 2 +- sys/dev/ice/ice_status.h | 2 +- sys/dev/ice/ice_strings.c | 2 +- sys/dev/ice/ice_switch.c | 2 +- sys/dev/ice/ice_switch.h | 2 +- sys/dev/ice/ice_type.h | 2 +- sys/dev/ice/ice_vlan_mode.c | 2 +- sys/dev/ice/ice_vlan_mode.h | 2 +- sys/dev/ice/if_ice_iflib.c | 2 +- sys/dev/ice/irdma_di_if.m | 2 +- sys/dev/ice/irdma_if.m | 2 +- sys/dev/ice/virtchnl.h | 2 +- sys/dev/ice/virtchnl_inline_ipsec.h | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index e4dc14b0162c..31e9583494fc 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_alloc.h b/sys/dev/ice/ice_alloc.h index 4970fae3bcf7..90946143091a 100644 --- a/sys/dev/ice/ice_alloc.h +++ b/sys/dev/ice/ice_alloc.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index 9c20106b994a..c7bf3384675e 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index 0df73583e137..73249cb7add4 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h index 3d96792cf56f..024f6f4cdb01 100644 --- a/sys/dev/ice/ice_common.h +++ b/sys/dev/ice/ice_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common_sysctls.h b/sys/dev/ice/ice_common_sysctls.h index 3ff004152784..37a50296ea81 100644 --- a/sys/dev/ice/ice_common_sysctls.h +++ b/sys/dev/ice/ice_common_sysctls.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common_txrx.h b/sys/dev/ice/ice_common_txrx.h index 4a4d2fc948ed..865c1d27da44 100644 --- a/sys/dev/ice/ice_common_txrx.h +++ b/sys/dev/ice/ice_common_txrx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c index 6568be2d9748..09816d4a812a 100644 --- a/sys/dev/ice/ice_controlq.c +++ b/sys/dev/ice/ice_controlq.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h index b32c753d14c5..047dd1beaf60 100644 --- a/sys/dev/ice/ice_controlq.h +++ b/sys/dev/ice/ice_controlq.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.c b/sys/dev/ice/ice_dcb.c index deb1505fa01c..a06117f90aad 100644 --- a/sys/dev/ice/ice_dcb.c +++ b/sys/dev/ice/ice_dcb.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.h b/sys/dev/ice/ice_dcb.h index 10c8c3cda9e9..ec2200afe200 100644 --- a/sys/dev/ice/ice_dcb.h +++ b/sys/dev/ice/ice_dcb.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_ddp_common.c b/sys/dev/ice/ice_ddp_common.c index 95e65317a4f2..a1573f5ea998 100644 --- a/sys/dev/ice/ice_ddp_common.c +++ b/sys/dev/ice/ice_ddp_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_ddp_common.h b/sys/dev/ice/ice_ddp_common.h index 10f6665d2b12..9305dc83520d 100644 --- a/sys/dev/ice/ice_ddp_common.h +++ b/sys/dev/ice/ice_ddp_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_defs.h b/sys/dev/ice/ice_defs.h index 3b96f9e0bf7c..e9f5192bed9f 100644 --- a/sys/dev/ice/ice_defs.h +++ b/sys/dev/ice/ice_defs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index 41598923dc94..ff13fe99ee27 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h index c259684df4fc..b58af574976d 100644 --- a/sys/dev/ice/ice_features.h +++ b/sys/dev/ice/ice_features.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c index fc31afab9e79..943b37746f9d 100644 --- a/sys/dev/ice/ice_flex_pipe.c +++ b/sys/dev/ice/ice_flex_pipe.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.h b/sys/dev/ice/ice_flex_pipe.h index 16f9334daa83..559905e7fb59 100644 --- a/sys/dev/ice/ice_flex_pipe.h +++ b/sys/dev/ice/ice_flex_pipe.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_type.h b/sys/dev/ice/ice_flex_type.h index 5baa694ebda7..9c8f7b462677 100644 --- a/sys/dev/ice/ice_flex_type.h +++ b/sys/dev/ice/ice_flex_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c index a45bb0408b9d..0cf37159b251 100644 --- a/sys/dev/ice/ice_flow.c +++ b/sys/dev/ice/ice_flow.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flow.h b/sys/dev/ice/ice_flow.h index c6e272b4dd6b..0857b325ca7c 100644 --- a/sys/dev/ice/ice_flow.h +++ b/sys/dev/ice/ice_flow.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fw_logging.c b/sys/dev/ice/ice_fw_logging.c index 57445cc89056..a8caf65aca6d 100644 --- a/sys/dev/ice/ice_fw_logging.c +++ b/sys/dev/ice/ice_fw_logging.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fwlog.c b/sys/dev/ice/ice_fwlog.c index b66860f67cf5..c3c6d9101627 100644 --- a/sys/dev/ice/ice_fwlog.c +++ b/sys/dev/ice/ice_fwlog.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fwlog.h b/sys/dev/ice/ice_fwlog.h index 0aa7db9a8339..41e41de1e670 100644 --- a/sys/dev/ice/ice_fwlog.h +++ b/sys/dev/ice/ice_fwlog.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_hw_autogen.h b/sys/dev/ice/ice_hw_autogen.h index 36d13eb22f52..6b04bff4b722 100644 --- a/sys/dev/ice/ice_hw_autogen.h +++ b/sys/dev/ice/ice_hw_autogen.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib.h b/sys/dev/ice/ice_iflib.h index d89d04985429..e9e09851b82c 100644 --- a/sys/dev/ice/ice_iflib.h +++ b/sys/dev/ice/ice_iflib.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_recovery_txrx.c b/sys/dev/ice/ice_iflib_recovery_txrx.c index 69ee98b46d35..dd90ffb8f21a 100644 --- a/sys/dev/ice/ice_iflib_recovery_txrx.c +++ b/sys/dev/ice/ice_iflib_recovery_txrx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_sysctls.h b/sys/dev/ice/ice_iflib_sysctls.h index 1eac7249447e..a718f5d12943 100644 --- a/sys/dev/ice/ice_iflib_sysctls.h +++ b/sys/dev/ice/ice_iflib_sysctls.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index b74ab610327e..f3087c09702a 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lan_tx_rx.h b/sys/dev/ice/ice_lan_tx_rx.h index 415565b4e99d..860958bffbaf 100644 --- a/sys/dev/ice/ice_lan_tx_rx.h +++ b/sys/dev/ice/ice_lan_tx_rx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 7dcce35b072b..114d2a319669 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h index c07b9458db1f..fd8c8881cdbd 100644 --- a/sys/dev/ice/ice_lib.h +++ b/sys/dev/ice/ice_lib.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_nvm.c b/sys/dev/ice/ice_nvm.c index 42a60e0df1c8..91393c1fc8b3 100644 --- a/sys/dev/ice/ice_nvm.c +++ b/sys/dev/ice/ice_nvm.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_nvm.h b/sys/dev/ice/ice_nvm.h index d359a9ea4e4e..32f791f63102 100644 --- a/sys/dev/ice/ice_nvm.h +++ b/sys/dev/ice/ice_nvm.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_opts.h b/sys/dev/ice/ice_opts.h index 4b11f277debe..479ead0dc41e 100644 --- a/sys/dev/ice/ice_opts.h +++ b/sys/dev/ice/ice_opts.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_osdep.c b/sys/dev/ice/ice_osdep.c index c9ac8e9f97c9..88b4984c290f 100644 --- a/sys/dev/ice/ice_osdep.c +++ b/sys/dev/ice/ice_osdep.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_osdep.h b/sys/dev/ice/ice_osdep.h index c6774588bdaa..ea355ddb31f4 100644 --- a/sys/dev/ice/ice_osdep.h +++ b/sys/dev/ice/ice_osdep.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_protocol_type.h b/sys/dev/ice/ice_protocol_type.h index 0793eb005eca..ced1bc5037dd 100644 --- a/sys/dev/ice/ice_protocol_type.h +++ b/sys/dev/ice/ice_protocol_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma.c b/sys/dev/ice/ice_rdma.c index a614ee500c10..3fe12cec7adc 100644 --- a/sys/dev/ice/ice_rdma.c +++ b/sys/dev/ice/ice_rdma.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma.h b/sys/dev/ice/ice_rdma.h index 6d818f84b6cf..68aa2f2099e7 100644 --- a/sys/dev/ice/ice_rdma.h +++ b/sys/dev/ice/ice_rdma.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma_internal.h b/sys/dev/ice/ice_rdma_internal.h index 20718973af5d..c2ff8757c8c2 100644 --- a/sys/dev/ice/ice_rdma_internal.h +++ b/sys/dev/ice/ice_rdma_internal.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_resmgr.c b/sys/dev/ice/ice_resmgr.c index 547d6035e2bb..824b986fff57 100644 --- a/sys/dev/ice/ice_resmgr.c +++ b/sys/dev/ice/ice_resmgr.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_resmgr.h b/sys/dev/ice/ice_resmgr.h index eef028df4700..0869f5c5654c 100644 --- a/sys/dev/ice/ice_resmgr.h +++ b/sys/dev/ice/ice_resmgr.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rss.h b/sys/dev/ice/ice_rss.h index 0b79bea6f30b..ede1fad5abe7 100644 --- a/sys/dev/ice/ice_rss.h +++ b/sys/dev/ice/ice_rss.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_sched.c b/sys/dev/ice/ice_sched.c index 49a8415132cb..ed9432292c0c 100644 --- a/sys/dev/ice/ice_sched.c +++ b/sys/dev/ice/ice_sched.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_sched.h b/sys/dev/ice/ice_sched.h index 4d9a4480fe58..490a7719a960 100644 --- a/sys/dev/ice/ice_sched.h +++ b/sys/dev/ice/ice_sched.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_status.h b/sys/dev/ice/ice_status.h index 48c8264c4bc5..016d987bac36 100644 --- a/sys/dev/ice/ice_status.h +++ b/sys/dev/ice/ice_status.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_strings.c b/sys/dev/ice/ice_strings.c index 16a1f9a34d56..7feaef163ef6 100644 --- a/sys/dev/ice/ice_strings.c +++ b/sys/dev/ice/ice_strings.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_switch.c b/sys/dev/ice/ice_switch.c index dfa2368e2bee..44be3999d3de 100644 --- a/sys/dev/ice/ice_switch.c +++ b/sys/dev/ice/ice_switch.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_switch.h b/sys/dev/ice/ice_switch.h index e5b0239d491b..70b5df769175 100644 --- a/sys/dev/ice/ice_switch.h +++ b/sys/dev/ice/ice_switch.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_type.h b/sys/dev/ice/ice_type.h index b7bab6a21a20..e153a772f746 100644 --- a/sys/dev/ice/ice_type.h +++ b/sys/dev/ice/ice_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_vlan_mode.c b/sys/dev/ice/ice_vlan_mode.c index 9b298a6ad71a..e0c6d7897607 100644 --- a/sys/dev/ice/ice_vlan_mode.c +++ b/sys/dev/ice/ice_vlan_mode.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_vlan_mode.h b/sys/dev/ice/ice_vlan_mode.h index 1cf4ebb68798..8b1a56c98a3d 100644 --- a/sys/dev/ice/ice_vlan_mode.h +++ b/sys/dev/ice/ice_vlan_mode.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index e43c05081098..fb710d078b42 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/irdma_di_if.m b/sys/dev/ice/irdma_di_if.m index 55564d554c12..61a1817925a2 100644 --- a/sys/dev/ice/irdma_di_if.m +++ b/sys/dev/ice/irdma_di_if.m @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2023, Intel Corporation +# Copyright (c) 2024, Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/irdma_if.m b/sys/dev/ice/irdma_if.m index a78a4b05f7d2..d3aa68bcdf46 100644 --- a/sys/dev/ice/irdma_if.m +++ b/sys/dev/ice/irdma_if.m @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2023, Intel Corporation +# Copyright (c) 2024, Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/virtchnl.h b/sys/dev/ice/virtchnl.h index da281bfa366b..d7a1d3f254bf 100644 --- a/sys/dev/ice/virtchnl.h +++ b/sys/dev/ice/virtchnl.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/virtchnl_inline_ipsec.h b/sys/dev/ice/virtchnl_inline_ipsec.h index ad8cfc1dcebb..adcd9f34c00f 100644 --- a/sys/dev/ice/virtchnl_inline_ipsec.h +++ b/sys/dev/ice/virtchnl_inline_ipsec.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without From nobody Wed Apr 24 22:15: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 4VPtZw6qwNz5JDdq; Wed, 24 Apr 2024 22:15: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 4VPtZw2RCdz4dPP; Wed, 24 Apr 2024 22:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPeIGcF7R20giSt9fQWhf0D+GJJ2MN101s46Fpg4pxI=; b=CTjRPommyMcI5nYfzIWUoH4/rnZIbz0pQzXbXQ3CcwclKeyUYAQda6tZOERRz5ZyTK6Pu0 tUIEZlwXqLimc11I/JiC7pxLomqN6Hs+Rla4plvijRRrATmJf0EG03rittJc+r4aB8KHND Y8rk16k8rL2aq7Xm2zgOVUUHwxhjYEoTGrqFgon2oFyx/GWI+END7OZmjnDEQLLQNzcOCf HD60MLO1Y2Y+KQZbu0tQqM32VsSAvbGd5WPPblgPt66mogg1QQ/Xev2Zsw2k36S3cJFKm1 ILhW7u2kHjGLsZaxLx1qcKrOqSjUAiht0rVmb7zriR/13GLjMCfbGCiMpEgtYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713996904; a=rsa-sha256; cv=none; b=Ag2F7yTk3pFkbgv3Q/a3HXXn4rRnbVjaoSqZDHeOqfqIXcYcB8Q4jlG3LgZVJdawNxJZAI 7Rk7vdohkxPBqDrqVYAm6W/6TpExyOss3MFaV8GKnC/XLoKL0BAjSbR3QBEdf5OFcR6wlA zAbpkgpzVAZEXXUE2vVC21vc9ay2VoqIQgizTUO9LhueqIivE0tqJjnyzqSot0kgUJfN4u v9dl41xE0QYTIt90v43fw8vsteVDAdKi5QHsuctrSVxmQKJE5DNMbomY51I46mN8Ha+ig/ hIyRBpUteSmMxee9BHh6uhTUyFXzXUtMQTzj7Z1sx2aRsQPK+WFki0eyKTkHmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713996904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPeIGcF7R20giSt9fQWhf0D+GJJ2MN101s46Fpg4pxI=; b=kqDxUqn6Fot4MCcQCCc8eXzG0uoUaVH/hV+OZXBIDCG1tEj4ATx6dFRY3fYIfvY5bX75o6 rT3mYnVo4nkmB+0/+EQovQcFMms+Ynh2NjTiVjGGANzFhBlw3jxvTYVOfKNuFxrR4Jat7D vTckUH0VNoOQ+FEnqpUtvv2JX+f2Cq0mEe+Pt88jU6gjZtfPgl4D5nbz5oJPLMhhzDSQM6 gXbsWwDrrS7pi13oxGO8sGWVALlChfpzNpEelsztXBeXE74ryzaAaSSc2jAseSZMV/X+xR 1u/O7TEcgKdLGRGgffdHHh0w2qq/Cb+J+z1QaOOwmCz5F5UwSozWW2t5qIbm1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPtZw20TGzYdh; Wed, 24 Apr 2024 22:15: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 43OMF4EP071500; Wed, 24 Apr 2024 22:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OMF44r071497; Wed, 24 Apr 2024 22:15:04 GMT (envelope-from git) Date: Wed, 24 Apr 2024 22:15:04 GMT Message-Id: <202404242215.43OMF44r071497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: f6de0a7c94e9 - stable/14 - ice(4): Update to 1.39.13-k List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6de0a7c94e9c9e71ef0532e8c06b565abdb7113 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=f6de0a7c94e9c9e71ef0532e8c06b565abdb7113 commit f6de0a7c94e9c9e71ef0532e8c06b565abdb7113 Author: Eric Joyner AuthorDate: 2024-02-13 06:26:26 +0000 Commit: Eric Joyner CommitDate: 2024-04-24 22:14:48 +0000 ice(4): Update to 1.39.13-k - Adds mirror interface functionality - Remove unused virtchnl headers Signed-off-by: Eric Joyner Sponsored by: Intel Corporation Tested by: jeffrey.e.pieper@intel.com Differential Revision: https://reviews.freebsd.org/D44004 (cherry picked from commit 9e54973fc33aa44b77d1c851cb36fcd82dc44cda) --- sys/dev/ice/ice_adminq_cmd.h | 21 +- sys/dev/ice/ice_bitops.h | 4 +- sys/dev/ice/ice_common.c | 43 +- sys/dev/ice/ice_common.h | 8 +- sys/dev/ice/ice_controlq.c | 10 +- sys/dev/ice/ice_controlq.h | 3 +- sys/dev/ice/ice_drv_info.h | 10 +- sys/dev/ice/ice_features.h | 1 - sys/dev/ice/ice_flex_pipe.c | 1 + sys/dev/ice/ice_flow.c | 71 +- sys/dev/ice/ice_flow.h | 8 +- sys/dev/ice/ice_hw_autogen.h | 1 + sys/dev/ice/ice_iflib.h | 32 +- sys/dev/ice/ice_iflib_txrx.c | 352 +++++++++- sys/dev/ice/ice_lib.c | 360 ++++++++-- sys/dev/ice/ice_lib.h | 30 +- sys/dev/ice/ice_nvm.c | 33 +- sys/dev/ice/ice_nvm.h | 1 + sys/dev/ice/ice_protocol_type.h | 1 + sys/dev/ice/ice_sched.c | 7 +- sys/dev/ice/ice_strings.c | 6 + sys/dev/ice/ice_switch.c | 31 +- sys/dev/ice/ice_switch.h | 9 +- sys/dev/ice/ice_type.h | 15 +- sys/dev/ice/if_ice_iflib.c | 1266 ++++++++++++++++++++++++++++++++++- sys/dev/ice/virtchnl_inline_ipsec.h | 594 ---------------- sys/dev/ice/virtchnl_lan_desc.h | 0 27 files changed, 2134 insertions(+), 784 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index 31e9583494fc..70b56144faf2 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -152,6 +152,7 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_WOL_PROXY 0x0008 #define ICE_AQC_CAPS_SRIOV 0x0012 #define ICE_AQC_CAPS_VF 0x0013 +#define ICE_AQC_CAPS_VMDQ 0x0014 #define ICE_AQC_CAPS_802_1QBG 0x0015 #define ICE_AQC_CAPS_802_1BR 0x0016 #define ICE_AQC_CAPS_VSI 0x0017 @@ -184,6 +185,8 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_DYN_FLATTENING 0x008A #define ICE_AQC_CAPS_OROM_RECOVERY_UPDATE 0x0090 #define ICE_AQC_CAPS_ROCEV2_LAG 0x0092 +#define ICE_AQC_BIT_ROCEV2_LAG 0x01 +#define ICE_AQC_BIT_SRIOV_LAG 0x02 u8 major_ver; u8 minor_ver; @@ -358,6 +361,8 @@ struct ice_aqc_set_port_params { #define ICE_AQC_RES_TYPE_FLAG_SHARED BIT(7) #define ICE_AQC_RES_TYPE_FLAG_SCAN_BOTTOM BIT(12) #define ICE_AQC_RES_TYPE_FLAG_IGNORE_INDEX BIT(13) +#define ICE_AQC_RES_TYPE_FLAG_SUBSCRIBE_SHARED BIT(14) +#define ICE_AQC_RES_TYPE_FLAG_SUBSCRIBE_CTL BIT(15) #define ICE_AQC_RES_TYPE_FLAG_DEDICATED 0x00 @@ -2198,6 +2203,14 @@ struct ice_aqc_nvm { #define ICE_AQC_NVM_MINSREV_MOD_ID 0x130 #define ICE_AQC_NVM_TX_TOPO_MOD_ID 0x14B +#define ICE_AQC_NVM_CMPO_MOD_ID 0x153 + +/* Cage Max Power override NVM module */ +struct ice_aqc_nvm_cmpo { + __le16 length; +#define ICE_AQC_NVM_CMPO_ENABLE BIT(8) + __le16 cages_cfg[8]; +}; /* Used for reading and writing MinSRev using 0x0701 and 0x0703. Note that the * type field is excluded from the section when reading and writing from @@ -2509,11 +2522,13 @@ enum ice_lut_type { ICE_LUT_VSI = 0, ICE_LUT_PF = 1, ICE_LUT_GLOBAL = 2, - ICE_LUT_TYPE_MASK = 3 + ICE_LUT_TYPE_MASK = 3, + ICE_LUT_PF_SMALL = 5, /* yields ICE_LUT_PF when &= ICE_LUT_TYPE_MASK */ }; enum ice_lut_size { ICE_LUT_VSI_SIZE = 64, + ICE_LUT_PF_SMALL_SIZE = 128, ICE_LUT_GLOBAL_SIZE = 512, ICE_LUT_PF_SIZE = 2048, }; @@ -2796,7 +2811,7 @@ struct ice_aqc_event_lan_overflow { /* Debug Dump Internal Data (indirect 0xFF08) */ struct ice_aqc_debug_dump_internals { - u8 cluster_id; + __le16 cluster_id; /* Expresses next cluster ID in response */ #define ICE_AQC_DBG_DUMP_CLUSTER_ID_SW 0 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_TXSCHED 2 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_PROFILES 3 @@ -2809,7 +2824,7 @@ struct ice_aqc_debug_dump_internals { #define ICE_AQC_DBG_DUMP_CLUSTER_ID_L2P 8 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_QUEUE_MNG 9 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_FULL_CSR_SPACE 21 - u8 reserved; +#define ICE_AQC_DBG_DUMP_CLUSTER_ID_MNG_TRANSACTIONS 22 __le16 table_id; /* Used only for non-memory clusters */ __le32 idx; /* In table entries for tables, in bytes for memory */ __le32 addr_high; diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index c7bf3384675e..499ee41228c3 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -402,7 +402,7 @@ static inline bool ice_is_any_bit_set(ice_bitmap_t *bitmap, u16 size) } /** - * ice_cp_bitmap - copy bitmaps. + * ice_cp_bitmap - copy bitmaps * @dst: bitmap destination * @src: bitmap to copy from * @size: Size of the bitmaps in bits @@ -460,7 +460,7 @@ ice_bitmap_hweight(ice_bitmap_t *bm, u16 size) } /** - * ice_cmp_bitmap - compares two bitmaps. + * ice_cmp_bitmap - compares two bitmaps * @bmp1: the bitmap to compare * @bmp2: the bitmap to compare with bmp1 * @size: Size of the bitmaps in bits diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index 73249cb7add4..ef487bcfd0f4 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -2319,6 +2319,10 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, ice_debug(hw, ICE_DBG_INIT, "%s: sr_iov_1_1 = %d\n", prefix, caps->sr_iov_1_1); break; + case ICE_AQC_CAPS_VMDQ: + caps->vmdq = (number == 1); + ice_debug(hw, ICE_DBG_INIT, "%s: vmdq = %d\n", prefix, caps->vmdq); + break; case ICE_AQC_CAPS_802_1QBG: caps->evb_802_1_qbg = (number == 1); ice_debug(hw, ICE_DBG_INIT, "%s: evb_802_1_qbg = %d\n", prefix, number); @@ -2404,7 +2408,7 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, ice_debug(hw, ICE_DBG_INIT, "%s: iwarp = %d\n", prefix, caps->iwarp); break; case ICE_AQC_CAPS_ROCEV2_LAG: - caps->roce_lag = (number == 1); + caps->roce_lag = !!(number & ICE_AQC_BIT_ROCEV2_LAG); ice_debug(hw, ICE_DBG_INIT, "%s: roce_lag = %d\n", prefix, caps->roce_lag); break; @@ -2726,6 +2730,10 @@ ice_parse_nac_topo_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, dev_p->nac_topo.mode = LE32_TO_CPU(cap->number); dev_p->nac_topo.id = LE32_TO_CPU(cap->phys_id) & ICE_NAC_TOPO_ID_M; + ice_info(hw, "PF is configured in %s mode with IP instance ID %d\n", + (dev_p->nac_topo.mode == 0) ? "primary" : "secondary", + dev_p->nac_topo.id); + ice_debug(hw, ICE_DBG_INIT, "dev caps: nac topology is_primary = %d\n", !!(dev_p->nac_topo.mode & ICE_NAC_TOPO_PRIMARY_M)); ice_debug(hw, ICE_DBG_INIT, "dev caps: nac topology is_dual = %d\n", @@ -3060,7 +3068,7 @@ void ice_clear_pxe_mode(struct ice_hw *hw) } /** - * ice_aq_set_port_params - set physical port parameters. + * ice_aq_set_port_params - set physical port parameters * @pi: pointer to the port info struct * @bad_frame_vsi: defines the VSI to which bad frames are forwarded * @save_bad_pac: if set packets with errors are forwarded to the bad frames VSI @@ -4058,6 +4066,8 @@ static u16 ice_lut_type_to_size(u16 lut_type) return ICE_LUT_GLOBAL_SIZE; case ICE_LUT_PF: return ICE_LUT_PF_SIZE; + case ICE_LUT_PF_SMALL: + return ICE_LUT_PF_SMALL_SIZE; default: return 0; } @@ -4089,6 +4099,8 @@ int ice_lut_size_to_type(int lut_size) return ICE_LUT_GLOBAL; case ICE_LUT_PF_SIZE: return ICE_LUT_PF; + case ICE_LUT_PF_SMALL_SIZE: + return ICE_LUT_PF_SMALL; default: return -1; } @@ -4116,8 +4128,8 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params vsi_handle = params->vsi_handle; lut = params->lut; - lut_type = params->lut_type; - lut_size = ice_lut_type_to_size(lut_type); + lut_size = ice_lut_type_to_size(params->lut_type); + lut_type = params->lut_type & ICE_LUT_TYPE_MASK; cmd_resp = &desc.params.get_set_rss_lut; if (lut_type == ICE_LUT_GLOBAL) glob_lut_idx = params->global_lut_id; @@ -4773,6 +4785,7 @@ ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx, * @buf: dump buffer * @buf_size: dump buffer size * @ret_buf_size: return buffer size (returned by FW) + * @ret_next_cluster: next cluster to read (returned by FW) * @ret_next_table: next block to read (returned by FW) * @ret_next_index: next index to read (returned by FW) * @cd: pointer to command details structure @@ -4780,10 +4793,10 @@ ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx, * Get internal FW/HW data (0xFF08) for debug purposes. */ enum ice_status -ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, +ice_aq_get_internal_data(struct ice_hw *hw, u16 cluster_id, u16 table_id, u32 start, void *buf, u16 buf_size, u16 *ret_buf_size, - u16 *ret_next_table, u32 *ret_next_index, - struct ice_sq_cd *cd) + u16 *ret_next_cluster, u16 *ret_next_table, + u32 *ret_next_index, struct ice_sq_cd *cd) { struct ice_aqc_debug_dump_internals *cmd; struct ice_aq_desc desc; @@ -4796,7 +4809,7 @@ ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_debug_dump_internals); - cmd->cluster_id = cluster_id; + cmd->cluster_id = CPU_TO_LE16(cluster_id); cmd->table_id = CPU_TO_LE16(table_id); cmd->idx = CPU_TO_LE32(start); @@ -4805,6 +4818,8 @@ ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, if (!status) { if (ret_buf_size) *ret_buf_size = LE16_TO_CPU(desc.datalen); + if (ret_next_cluster) + *ret_next_cluster = LE16_TO_CPU(cmd->cluster_id); if (ret_next_table) *ret_next_table = LE16_TO_CPU(cmd->table_id); if (ret_next_index) @@ -6051,7 +6066,7 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, */ enum ice_status ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, - u16 bus_addr, __le16 addr, u8 params, u8 *data, + u16 bus_addr, __le16 addr, u8 params, const u8 *data, struct ice_sq_cd *cd) { struct ice_aq_desc desc = { 0 }; @@ -6183,8 +6198,6 @@ static bool ice_is_fw_min_ver(struct ice_hw *hw, u8 branch, u8 maj, u8 min, if (hw->fw_min_ver == min && hw->fw_patch >= patch) return true; } - } else if (hw->fw_branch > branch) { - return true; } return false; @@ -6591,10 +6604,14 @@ u32 ice_get_link_speed(u16 index) */ bool ice_fw_supports_fec_dis_auto(struct ice_hw *hw) { - return ice_is_fw_min_ver(hw, ICE_FW_FEC_DIS_AUTO_BRANCH, + return ice_is_fw_min_ver(hw, ICE_FW_VER_BRANCH_E810, ICE_FW_FEC_DIS_AUTO_MAJ, ICE_FW_FEC_DIS_AUTO_MIN, - ICE_FW_FEC_DIS_AUTO_PATCH); + ICE_FW_FEC_DIS_AUTO_PATCH) || + ice_is_fw_min_ver(hw, ICE_FW_VER_BRANCH_E82X, + ICE_FW_FEC_DIS_AUTO_MAJ_E82X, + ICE_FW_FEC_DIS_AUTO_MIN_E82X, + ICE_FW_FEC_DIS_AUTO_PATCH_E82X); } /** diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h index 024f6f4cdb01..3abfba874b9c 100644 --- a/sys/dev/ice/ice_common.h +++ b/sys/dev/ice/ice_common.h @@ -88,10 +88,10 @@ enum ice_status ice_get_caps(struct ice_hw *hw); void ice_set_safe_mode_caps(struct ice_hw *hw); enum ice_status -ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, +ice_aq_get_internal_data(struct ice_hw *hw, u16 cluster_id, u16 table_id, u32 start, void *buf, u16 buf_size, u16 *ret_buf_size, - u16 *ret_next_table, u32 *ret_next_index, - struct ice_sq_cd *cd); + u16 *ret_next_cluster, u16 *ret_next_table, + u32 *ret_next_index, struct ice_sq_cd *cd); enum ice_status ice_set_mac_type(struct ice_hw *hw); @@ -352,7 +352,7 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, struct ice_sq_cd *cd); enum ice_status ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, - u16 bus_addr, __le16 addr, u8 params, u8 *data, + u16 bus_addr, __le16 addr, u8 params, const u8 *data, struct ice_sq_cd *cd); enum ice_status ice_aq_set_health_status_config(struct ice_hw *hw, u8 event_source, diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c index 09816d4a812a..8aa2a7f765a2 100644 --- a/sys/dev/ice/ice_controlq.c +++ b/sys/dev/ice/ice_controlq.c @@ -482,7 +482,7 @@ shutdown_sq_out: } /** - * ice_aq_ver_check - Check the reported AQ API version. + * ice_aq_ver_check - Check the reported AQ API version * @hw: pointer to the hardware structure * * Checks if the driver should load on a given AQ API version. @@ -1037,12 +1037,18 @@ ice_sq_send_cmd_nolock(struct ice_hw *hw, struct ice_ctl_q_info *cq, if (cq->sq.next_to_use == cq->sq.count) cq->sq.next_to_use = 0; wr32(hw, cq->sq.tail, cq->sq.next_to_use); + ice_flush(hw); + + /* Wait a short time before initial ice_sq_done() check, to allow + * hardware time for completion. + */ + ice_usec_delay(5, false); do { if (ice_sq_done(hw, cq)) break; - ice_usec_delay(ICE_CTL_Q_SQ_CMD_USEC, false); + ice_usec_delay(10, false); total_delay++; } while (total_delay < cq->sq_cmd_timeout); diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h index 047dd1beaf60..d48d53a37161 100644 --- a/sys/dev/ice/ice_controlq.h +++ b/sys/dev/ice/ice_controlq.h @@ -60,8 +60,7 @@ enum ice_ctl_q { }; /* Control Queue timeout settings - max delay 1s */ -#define ICE_CTL_Q_SQ_CMD_TIMEOUT 10000 /* Count 10000 times */ -#define ICE_CTL_Q_SQ_CMD_USEC 100 /* Check every 100usec */ +#define ICE_CTL_Q_SQ_CMD_TIMEOUT 100000 /* Count 100000 times */ #define ICE_CTL_Q_ADMIN_INIT_TIMEOUT 10 /* Count 10 times */ #define ICE_CTL_Q_ADMIN_INIT_MSEC 100 /* Check every 100msec */ diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index ff13fe99ee27..8e1200e08a64 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -62,16 +62,16 @@ * @var ice_rc_version * @brief driver release candidate version number */ -const char ice_driver_version[] = "1.37.11-k"; +const char ice_driver_version[] = "1.39.13-k"; const uint8_t ice_major_version = 1; -const uint8_t ice_minor_version = 37; -const uint8_t ice_patch_version = 11; +const uint8_t ice_minor_version = 39; +const uint8_t ice_patch_version = 13; const uint8_t ice_rc_version = 0; #define PVIDV(vendor, devid, name) \ - PVID(vendor, devid, name " - 1.37.11-k") + PVID(vendor, devid, name " - 1.39.13-k") #define PVIDV_OEM(vendor, devid, svid, sdevid, revid, name) \ - PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.37.11-k") + PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.39.13-k") /** * @var ice_vendor_info_array diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h index b58af574976d..03b8c63af291 100644 --- a/sys/dev/ice/ice_features.h +++ b/sys/dev/ice/ice_features.h @@ -89,7 +89,6 @@ enum feat_list { static inline void ice_disable_unsupported_features(ice_bitmap_t __unused *bitmap) { - ice_clear_bit(ICE_FEATURE_SRIOV, bitmap); #ifndef DEV_NETMAP ice_clear_bit(ICE_FEATURE_NETMAP, bitmap); #endif diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c index 943b37746f9d..f103e2aa6e71 100644 --- a/sys/dev/ice/ice_flex_pipe.c +++ b/sys/dev/ice/ice_flex_pipe.c @@ -672,6 +672,7 @@ enum ice_status ice_replay_tunnels(struct ice_hw *hw) if (status) { ice_debug(hw, ICE_DBG_PKG, "ERR: 0x%x - destroy tunnel port 0x%x\n", status, port); + hw->tnl.tbl[i].ref = refs; break; } diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c index 0cf37159b251..c04f86445767 100644 --- a/sys/dev/ice/ice_flow.c +++ b/sys/dev/ice/ice_flow.c @@ -404,12 +404,11 @@ struct ice_flow_prof_params { }; #define ICE_FLOW_SEG_HDRS_L3_MASK \ - (ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV6 | \ - ICE_FLOW_SEG_HDR_ARP) + (ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_ARP) #define ICE_FLOW_SEG_HDRS_L4_MASK \ (ICE_FLOW_SEG_HDR_ICMP | ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | \ ICE_FLOW_SEG_HDR_SCTP) -/* mask for L4 protocols that are NOT part of IPV4/6 OTHER PTYPE groups */ +/* mask for L4 protocols that are NOT part of IPv4/6 OTHER PTYPE groups */ #define ICE_FLOW_SEG_HDRS_L4_MASK_NO_OTHER \ (ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_SCTP) @@ -483,15 +482,13 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params) if ((hdrs & ICE_FLOW_SEG_HDR_IPV4) && (hdrs & ICE_FLOW_SEG_HDR_IPV_OTHER)) { - src = i ? - (const ice_bitmap_t *)ice_ptypes_ipv4_il : + src = i ? (const ice_bitmap_t *)ice_ptypes_ipv4_il : (const ice_bitmap_t *)ice_ptypes_ipv4_ofos_all; ice_and_bitmap(params->ptypes, params->ptypes, src, ICE_FLOW_PTYPE_MAX); } else if ((hdrs & ICE_FLOW_SEG_HDR_IPV6) && (hdrs & ICE_FLOW_SEG_HDR_IPV_OTHER)) { - src = i ? - (const ice_bitmap_t *)ice_ptypes_ipv6_il : + src = i ? (const ice_bitmap_t *)ice_ptypes_ipv6_il : (const ice_bitmap_t *)ice_ptypes_ipv6_ofos_all; ice_and_bitmap(params->ptypes, params->ptypes, src, ICE_FLOW_PTYPE_MAX); @@ -645,8 +642,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params, case ICE_FLOW_FIELD_IDX_ICMP_TYPE: case ICE_FLOW_FIELD_IDX_ICMP_CODE: /* ICMP type and code share the same extraction seq. entry */ - prot_id = (params->prof->segs[seg].hdrs & - ICE_FLOW_SEG_HDR_IPV4) ? + prot_id = (params->prof->segs[seg].hdrs & ICE_FLOW_SEG_HDR_IPV4) ? ICE_PROT_ICMP_IL : ICE_PROT_ICMPV6_IL; sib = fld == ICE_FLOW_FIELD_IDX_ICMP_TYPE ? ICE_FLOW_FIELD_IDX_ICMP_CODE : @@ -1301,20 +1297,20 @@ ice_flow_set_rss_seg_info(struct ice_flow_seg_info *segs, u8 seg_cnt, /* set outer most header */ if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 | - ICE_FLOW_SEG_HDR_IPV_FRAG | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_IPV_FRAG | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 | - ICE_FLOW_SEG_HDR_IPV_FRAG | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_IPV_FRAG | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 | - ICE_FLOW_SEG_HDR_GRE | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_GRE | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 | - ICE_FLOW_SEG_HDR_GRE | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_GRE | + ICE_FLOW_SEG_HDR_IPV_OTHER; if (seg->hdrs & ~ICE_FLOW_RSS_SEG_HDR_VAL_MASKS) return ICE_ERR_PARAM; @@ -1418,11 +1414,14 @@ ice_get_rss_hdr_type(struct ice_flow_prof *prof) if (prof->segs_cnt == ICE_FLOW_SEG_SINGLE) { hdr_type = ICE_RSS_OUTER_HEADERS; } else if (prof->segs_cnt == ICE_FLOW_SEG_MAX) { - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs == ICE_FLOW_SEG_HDR_NONE) + const struct ice_flow_seg_info *s; + + s = &prof->segs[ICE_RSS_OUTER_HEADERS]; + if (s->hdrs == ICE_FLOW_SEG_HDR_NONE) hdr_type = ICE_RSS_INNER_HEADERS; - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs & ICE_FLOW_SEG_HDR_IPV4) + if (s->hdrs & ICE_FLOW_SEG_HDR_IPV4) hdr_type = ICE_RSS_INNER_HEADERS_W_OUTER_IPV4; - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs & ICE_FLOW_SEG_HDR_IPV6) + if (s->hdrs & ICE_FLOW_SEG_HDR_IPV6) hdr_type = ICE_RSS_INNER_HEADERS_W_OUTER_IPV6; } @@ -1529,13 +1528,14 @@ ice_add_rss_list(struct ice_hw *hw, u16 vsi_handle, struct ice_flow_prof *prof) * [62:63] - Encapsulation flag: * 0 if non-tunneled * 1 if tunneled - * 2 for tunneled with outer ipv4 - * 3 for tunneled with outer ipv6 + * 2 for tunneled with outer IPv4 + * 3 for tunneled with outer IPv6 */ -#define ICE_FLOW_GEN_PROFID(hash, hdr, encap) \ - ((u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ +#define ICE_FLOW_GEN_PROFID(hash, hdr, encap) \ + ((u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ (((u64)(hdr) << ICE_FLOW_PROF_HDR_S) & ICE_FLOW_PROF_HDR_M) | \ - (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & ICE_FLOW_PROF_ENCAP_M))) + (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & \ + ICE_FLOW_PROF_ENCAP_M))) /** * ice_add_rss_cfg_sync - add an RSS configuration @@ -1559,7 +1559,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, return ICE_ERR_PARAM; segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ? - ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX; + ICE_FLOW_SEG_SINGLE : + ICE_FLOW_SEG_MAX; segs = (struct ice_flow_seg_info *)ice_calloc(hw, segs_cnt, sizeof(*segs)); @@ -1663,18 +1664,16 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, struct ice_rss_hash_cfg local_cfg; enum ice_status status; - if (!ice_is_vsi_valid(hw, vsi_handle) || - !cfg || cfg->hdr_type > ICE_RSS_ANY_HEADERS || + if (!ice_is_vsi_valid(hw, vsi_handle) || !cfg || + cfg->hdr_type > ICE_RSS_ANY_HEADERS || cfg->hash_flds == ICE_HASH_INVALID) return ICE_ERR_PARAM; + ice_acquire_lock(&hw->rss_locks); local_cfg = *cfg; if (cfg->hdr_type < ICE_RSS_ANY_HEADERS) { - ice_acquire_lock(&hw->rss_locks); status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); - ice_release_lock(&hw->rss_locks); } else { - ice_acquire_lock(&hw->rss_locks); local_cfg.hdr_type = ICE_RSS_OUTER_HEADERS; status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); if (!status) { @@ -1682,8 +1681,8 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); } - ice_release_lock(&hw->rss_locks); } + ice_release_lock(&hw->rss_locks); return status; } @@ -1707,7 +1706,8 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u8 segs_cnt; segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ? - ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX; + ICE_FLOW_SEG_SINGLE : + ICE_FLOW_SEG_MAX; segs = (struct ice_flow_seg_info *)ice_calloc(hw, segs_cnt, sizeof(*segs)); if (!segs) @@ -1762,8 +1762,8 @@ ice_rem_rss_cfg(struct ice_hw *hw, u16 vsi_handle, struct ice_rss_hash_cfg local_cfg; enum ice_status status; - if (!ice_is_vsi_valid(hw, vsi_handle) || - !cfg || cfg->hdr_type > ICE_RSS_ANY_HEADERS || + if (!ice_is_vsi_valid(hw, vsi_handle) || !cfg || + cfg->hdr_type > ICE_RSS_ANY_HEADERS || cfg->hash_flds == ICE_HASH_INVALID) return ICE_ERR_PARAM; @@ -1774,7 +1774,6 @@ ice_rem_rss_cfg(struct ice_hw *hw, u16 vsi_handle, } else { local_cfg.hdr_type = ICE_RSS_OUTER_HEADERS; status = ice_rem_rss_cfg_sync(hw, vsi_handle, &local_cfg); - if (!status) { local_cfg.hdr_type = ICE_RSS_INNER_HEADERS; status = ice_rem_rss_cfg_sync(hw, vsi_handle, diff --git a/sys/dev/ice/ice_flow.h b/sys/dev/ice/ice_flow.h index 0857b325ca7c..31c369c144e0 100644 --- a/sys/dev/ice/ice_flow.h +++ b/sys/dev/ice/ice_flow.h @@ -188,14 +188,14 @@ enum ice_flow_avf_hdr_field { enum ice_rss_cfg_hdr_type { ICE_RSS_OUTER_HEADERS, /* take outer headers as inputset. */ ICE_RSS_INNER_HEADERS, /* take inner headers as inputset. */ - /* take inner headers as inputset for packet with outer ipv4. */ + /* take inner headers as inputset for packet with outer IPv4. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV4, - /* take inner headers as inputset for packet with outer ipv6. */ + /* take inner headers as inputset for packet with outer IPv6. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV6, /* take outer headers first then inner headers as inputset */ - /* take inner as inputset for GTPoGRE with outer ipv4 + gre. */ + /* take inner as inputset for GTPoGRE with outer IPv4 + GRE. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE, - /* take inner as inputset for GTPoGRE with outer ipv6 + gre. */ + /* take inner as inputset for GTPoGRE with outer IPv6 + GRE. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE, ICE_RSS_ANY_HEADERS }; diff --git a/sys/dev/ice/ice_hw_autogen.h b/sys/dev/ice/ice_hw_autogen.h index 6b04bff4b722..8e59ebc76835 100644 --- a/sys/dev/ice/ice_hw_autogen.h +++ b/sys/dev/ice/ice_hw_autogen.h @@ -5476,6 +5476,7 @@ #define GL_MNG_FW_RAM_STAT_MNG_MEM_ECC_ERR_S 1 #define GL_MNG_FW_RAM_STAT_MNG_MEM_ECC_ERR_M BIT(1) #define GL_MNG_FWSM 0x000B6134 /* Reset Source: POR */ +#define GL_MNG_FWSM_FW_LOADING_M BIT(30) #define GL_MNG_FWSM_FW_MODES_S 0 #define GL_MNG_FWSM_FW_MODES_M MAKEMASK(0x7, 0) #define GL_MNG_FWSM_RSV0_S 3 diff --git a/sys/dev/ice/ice_iflib.h b/sys/dev/ice/ice_iflib.h index e9e09851b82c..4ac5fffe5b7e 100644 --- a/sys/dev/ice/ice_iflib.h +++ b/sys/dev/ice/ice_iflib.h @@ -192,6 +192,29 @@ struct ice_rx_queue { struct if_irq que_irq; }; +/** + * @struct ice_mirr_if + * @brief structure representing a mirroring interface + */ +struct ice_mirr_if { + struct ice_softc *back; + struct ifnet *ifp; + struct ice_vsi *vsi; + + device_t subdev; + if_ctx_t subctx; + if_softc_ctx_t subscctx; + + u16 num_irq_vectors; + u16 *if_imap; + u16 *os_imap; + struct ice_irq_vector *rx_irqvs; + + u32 state; + + bool if_attached; +}; + /** * @struct ice_softc * @brief main structure representing one device @@ -262,7 +285,7 @@ struct ice_softc { struct ice_resmgr rx_qmgr; /* Interrupt allocation manager */ - struct ice_resmgr imgr; + struct ice_resmgr dev_imgr; u16 *pf_imap; int lan_vectors; @@ -302,7 +325,7 @@ struct ice_softc { /* NVM link override settings */ struct ice_link_default_override_tlv ldo_tlv; - u16 fw_debug_dump_cluster_mask; + u32 fw_debug_dump_cluster_mask; struct sx *iflib_ctx_lock; @@ -310,6 +333,11 @@ struct ice_softc { ice_declare_bitmap(feat_cap, ICE_FEATURE_COUNT); ice_declare_bitmap(feat_en, ICE_FEATURE_COUNT); + struct ice_resmgr os_imgr; + /* For mirror interface */ + struct ice_mirr_if *mirr_if; + int extra_vectors; + int last_rid; }; #endif /* _ICE_IFLIB_H_ */ diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index f3087c09702a..a090717e7c5e 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -44,6 +44,18 @@ /* Tx/Rx hotpath utility functions */ #include "ice_common_txrx.h" +/* + * Driver private implementations + */ +static int _ice_ift_txd_encap(struct ice_tx_queue *txq, if_pkt_info_t pi); +static int _ice_ift_txd_credits_update(struct ice_softc *sc, struct ice_tx_queue *txq, bool clear); +static int _ice_ift_rxd_available(struct ice_rx_queue *rxq, qidx_t pidx, qidx_t budget); +static int _ice_ift_rxd_pkt_get(struct ice_rx_queue *rxq, if_rxd_info_t ri); +static void _ice_ift_rxd_refill(struct ice_rx_queue *rxq, uint32_t pidx, + uint64_t *paddrs, uint16_t count); +static void _ice_ift_rxd_flush(struct ice_softc *sc, struct ice_rx_queue *rxq, + uint32_t pidx); + /* * iflib txrx method declarations */ @@ -55,6 +67,13 @@ static int ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t static void ice_ift_rxd_flush(void *arg, uint16_t rxqid, uint8_t flidx, qidx_t pidx); static void ice_ift_rxd_refill(void *arg, if_rxd_update_t iru); static qidx_t ice_ift_queue_select(void *arg, struct mbuf *m, if_pkt_info_t pi); +static int ice_ift_txd_credits_update_subif(void *arg, uint16_t txqid, bool clear); +static int ice_ift_txd_encap_subif(void *arg, if_pkt_info_t pi); +static void ice_ift_txd_flush_subif(void *arg, uint16_t txqid, qidx_t pidx); +static int ice_ift_rxd_available_subif(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget); +static int ice_ift_rxd_pkt_get_subif(void *arg, if_rxd_info_t ri); +static void ice_ift_rxd_refill_subif(void *arg, if_rxd_update_t iru); +static void ice_ift_rxd_flush_subif(void *arg, uint16_t rxqid, uint8_t flidx, qidx_t pidx); /* Macro to help extract the NIC mode flexible Rx descriptor fields from the * advanced 32byte Rx descriptors. @@ -82,8 +101,27 @@ struct if_txrx ice_txrx = { }; /** - * ice_ift_txd_encap - prepare Tx descriptors for a packet - * @arg: the iflib softc structure pointer + * @var ice_subif_txrx + * @brief Tx/Rx operations for the iflib stack, for subinterfaces + * + * Structure defining the Tx and Rx related operations that iflib can request + * the subinterface driver to perform. These are the main entry points for the + * hot path of the transmit and receive paths in the iflib driver. + */ +struct if_txrx ice_subif_txrx = { + .ift_txd_credits_update = ice_ift_txd_credits_update_subif, + .ift_txd_encap = ice_ift_txd_encap_subif, + .ift_txd_flush = ice_ift_txd_flush_subif, + .ift_rxd_available = ice_ift_rxd_available_subif, + .ift_rxd_pkt_get = ice_ift_rxd_pkt_get_subif, + .ift_rxd_refill = ice_ift_rxd_refill_subif, + .ift_rxd_flush = ice_ift_rxd_flush_subif, + .ift_txq_select_v2 = NULL, +}; + +/** + * _ice_ift_txd_encap - prepare Tx descriptors for a packet + * @txq: driver's TX queue context * @pi: packet info * * Prepares and encapsulates the given packet into into Tx descriptors, in @@ -94,10 +132,8 @@ struct if_txrx ice_txrx = { * Return 0 on success, non-zero error code on failure. */ static int -ice_ift_txd_encap(void *arg, if_pkt_info_t pi) +_ice_ift_txd_encap(struct ice_tx_queue *txq, if_pkt_info_t pi) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[pi->ipi_qsidx]; int nsegs = pi->ipi_nsegs; bus_dma_segment_t *segs = pi->ipi_segs; struct ice_tx_desc *txd = NULL; @@ -156,6 +192,27 @@ ice_ift_txd_encap(void *arg, if_pkt_info_t pi) return (0); } +/** + * ice_ift_txd_encap - prepare Tx descriptors for a packet + * @arg: the iflib softc structure pointer + * @pi: packet info + * + * Prepares and encapsulates the given packet into Tx descriptors, in + * preparation for sending to the transmit engine. Sets the necessary context + * descriptors for TSO and other offloads, and prepares the last descriptor + * for the writeback status. + * + * Return 0 on success, non-zero error code on failure. + */ +static int +ice_ift_txd_encap(void *arg, if_pkt_info_t pi) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[pi->ipi_qsidx]; + + return _ice_ift_txd_encap(txq, pi); +} + /** * ice_ift_txd_flush - Flush Tx descriptors to hardware * @arg: device specific softc pointer @@ -176,9 +233,9 @@ ice_ift_txd_flush(void *arg, uint16_t txqid, qidx_t pidx) } /** - * ice_ift_txd_credits_update - cleanup Tx descriptors - * @arg: device private softc - * @txqid: the Tx queue to update + * _ice_ift_txd_credits_update - cleanup Tx descriptors + * @sc: device private softc + * @txq: the Tx queue to update * @clear: if false, only report, do not actually clean * * If clear is false, iflib is asking if we *could* clean up any Tx @@ -186,13 +243,12 @@ ice_ift_txd_flush(void *arg, uint16_t txqid, qidx_t pidx) * * If clear is true, iflib is requesting to cleanup and reclaim used Tx * descriptors. + * + * Called by other txd_credits_update functions passed to iflib. */ static int -ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) +_ice_ift_txd_credits_update(struct ice_softc *sc __unused, struct ice_tx_queue *txq, bool clear) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[txqid]; - qidx_t processed = 0; qidx_t cur, prev, ntxd, rs_cidx; int32_t delta; @@ -235,9 +291,28 @@ ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) } /** - * ice_ift_rxd_available - Return number of available Rx packets + * ice_ift_txd_credits_update - cleanup PF VSI Tx descriptors * @arg: device private softc - * @rxqid: the Rx queue id + * @txqid: the Tx queue to update + * @clear: if false, only report, do not actually clean + * + * Wrapper for _ice_ift_txd_credits_update() meant for TX queues that + * belong to the PF VSI. + * + * @see _ice_ift_txd_credits_update() + */ +static int +ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[txqid]; + + return _ice_ift_txd_credits_update(sc, txq, clear); +} + +/** + * _ice_ift_rxd_available - Return number of available Rx packets + * @rxq: RX queue driver structure * @pidx: descriptor start point * @budget: maximum Rx budget * @@ -245,10 +320,8 @@ ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) * of the given budget. */ static int -ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) +_ice_ift_rxd_available(struct ice_rx_queue *rxq, qidx_t pidx, qidx_t budget) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[rxqid]; union ice_32b_rx_flex_desc *rxd; uint16_t status0; int cnt, i, nrxd; @@ -270,21 +343,54 @@ ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) return (cnt); } +/** + * ice_ift_rxd_available - Return number of available Rx packets + * @arg: device private softc + * @rxqid: the Rx queue id + * @pidx: descriptor start point + * @budget: maximum Rx budget + * + * Wrapper for _ice_ift_rxd_available() that provides a function pointer + * that iflib requires for RX processing. + */ +static int +ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[rxqid]; + + return _ice_ift_rxd_available(rxq, pidx, budget); +} + /** * ice_ift_rxd_pkt_get - Called by iflib to send data to upper layer * @arg: device specific softc * @ri: receive packet info * - * This function is called by iflib, and executes in ithread context. It is - * called by iflib to obtain data which has been DMA'ed into host memory. - * Returns zero on success, and EBADMSG on failure. + * Wrapper function for _ice_ift_rxd_pkt_get() that provides a function pointer + * used by iflib for RX packet processing. */ static int ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) { struct ice_softc *sc = (struct ice_softc *)arg; - if_softc_ctx_t scctx = sc->scctx; struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[ri->iri_qsidx]; + + return _ice_ift_rxd_pkt_get(rxq, ri); +} + +/** + * _ice_ift_rxd_pkt_get - Called by iflib to send data to upper layer + * @rxq: RX queue driver structure + * @ri: receive packet info + * + * This function is called by iflib, and executes in ithread context. It is + * called by iflib to obtain data which has been DMA'ed into host memory. + * Returns zero on success, and EBADMSG on failure. + */ +static int +_ice_ift_rxd_pkt_get(struct ice_rx_queue *rxq, if_rxd_info_t ri) +{ union ice_32b_rx_flex_desc *cur; u16 status0, plen, ptype; bool eop; @@ -341,7 +447,7 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) /* Get packet type and set checksum flags */ ptype = le16toh(cur->wb.ptype_flex_flags0) & ICE_RX_FLEX_DESC_PTYPE_M; - if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0) + if ((if_getcapenable(ri->iri_ifp) & IFCAP_RXCSUM) != 0) ice_rx_checksum(rxq, &ri->iri_csum_flags, &ri->iri_csum_data, status0, ptype); @@ -357,16 +463,14 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) * @arg: device specific softc structure * @iru: the Rx descriptor update structure * - * Update the Rx descriptor indices for a given queue, assigning new physical - * addresses to the descriptors, preparing them for re-use by the hardware. + * Wrapper function for _ice_ift_rxd_refill() that provides a function pointer + * used by iflib for RX packet processing. */ static void ice_ift_rxd_refill(void *arg, if_rxd_update_t iru) { struct ice_softc *sc = (struct ice_softc *)arg; struct ice_rx_queue *rxq; - uint32_t next_pidx; - int i; uint64_t *paddrs; uint32_t pidx; uint16_t qsidx, count; @@ -378,6 +482,26 @@ ice_ift_rxd_refill(void *arg, if_rxd_update_t iru) rxq = &(sc->pf_vsi.rx_queues[qsidx]); + _ice_ift_rxd_refill(rxq, pidx, paddrs, count); +} + +/** + * _ice_ift_rxd_refill - Prepare Rx descriptors for re-use by hardware + * @rxq: RX queue driver structure + * @pidx: first index to refill + * @paddrs: physical addresses to use *** 3364 LINES SKIPPED *** From nobody Wed Apr 24 23:47: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 4VPwf70wBMz5JN43; Wed, 24 Apr 2024 23:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPwf70RTnz4nJn; Wed, 24 Apr 2024 23:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714002479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AAj5BqJUOvLcu6p7hNh7go5h5SFY4RS1BP9HLPQ4Fp0=; b=qiUlkKiDH+ttLINKDD4A8yVcGesghqU2QyT4MDNQzOtJ/0lpnk+eMJC3UB367an7sXFCXQ PLPiOOH5BUw6D+/BBPY4w0cR/kBurHBLVR8xB20G/uu2Bd9MM4HC6kaYa8JbuV2Cjd4HIn 9KOgT09LsuTxqTrWXgGVTjQyHk01qYCIr3KhFnU4s8xdoOz290hrXx1Dx3LZ44PLh5CMNi UDA5OeNM5hzm3GEUEgKq3At/c+muiUjEz7HthLEVHFfPaQF/4cJIMXRfXyLE2tfxK8bweu lTIeKr3p77s+pU5B6ryEY6OcCe+kmCuj5qHxKtvG9dZxKLV3WtaumNGWg1ME9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714002479; a=rsa-sha256; cv=none; b=HoVvBn6AZDuzPgUl43qPqQbpSE1L3y2k4MPD0+MFhLQky5qCh4VeOSDp3DldjKDFZmNlK0 XlgpLtBTsMFlZIH3odlfK1++LltNSWEqqISk3EFboYu9xNEDcLkIULie9S+Z3AHl9RfJpc qneZgcfvRy3RI/FS6BLYpoQVnaGjIJqVWnloyuaVUngiUT/s4pvRYrikxSNQp2K8MWc3Z3 56Ofpbw7g1VZeb4Svxgoqd+H+mNbfGxEnLZy3mAEBWQ62xOwJtjRZmiMWfSYNcQrqvRDQn 2sL6LBIVFpDI0hmDzy7HCyY2u2Jem2I9Nz1AVFLFbjbh21uuzXGQisxYD25JIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714002479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AAj5BqJUOvLcu6p7hNh7go5h5SFY4RS1BP9HLPQ4Fp0=; b=ljcqXGriDYZci7/spH4uAyNH68uiqMMcYEApb6hWdTYrsk0+sQ0vISmsMVphpKO4ZxEffY vPH+9NX131ZCPi4j+R1CcFnKkkiLEo33uvclgNjsV+2B0g6SVcQjEeot5ypDahga5jBrYY PuJKP332B6SwsK1HZJFytiOdZDmRjveLTiI/N9+vO3wrCQaauxiqboJFF9mwDOh9u/aKzx AEYMIdgmulXkTJWUPUec9ybV5oXajTOaQCARxl8f/H0ysn4+CHD0JdsLiSFR8sts+CeuIo l6cP8tInMT/CkKEyeY3vo2rA2nYnXFn+FspGEnXl1OajMopMkz3wqBys9ouiWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPwf7032mzcFQ; Wed, 24 Apr 2024 23:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ONlwtp023041; Wed, 24 Apr 2024 23:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ONlwHx023038; Wed, 24 Apr 2024 23:47:58 GMT (envelope-from git) Date: Wed, 24 Apr 2024 23:47:58 GMT Message-Id: <202404242347.43ONlwHx023038@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: 99ec4feefba6 - stable/14 - mfc-candidates: use stable/14 as default MFC-to branch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99ec4feefba680f9d674bcddae360b731138249f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=99ec4feefba680f9d674bcddae360b731138249f commit 99ec4feefba680f9d674bcddae360b731138249f Author: Ed Maste AuthorDate: 2024-04-22 17:54:52 +0000 Commit: Ed Maste CommitDate: 2024-04-24 23:47:33 +0000 mfc-candidates: use stable/14 as default MFC-to branch This tool is typically invoked from within a working tree containing the desired MFC target branch, which is detected automatically. It also has a default for when it is invoked from elsewhere. Switch the default to the most recent branch, stable/14. Sponsored by: The FreeBSD Foundation (cherry picked from commit 76a8625bc71da3fa63eef5abb4782553d2588f5c) --- tools/tools/git/mfc-candidates.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index 76ff9b4d53c6..6610f539fef0 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -41,7 +41,7 @@ if [ "${repo}" = "ports.git" ]; then qtr=$(((month-1) / 3 + 1)) to_branch="freebsd/${year}Q${qtr}" elif [ "${repo}" = "src.git" ]; then - to_branch=freebsd/stable/13 + to_branch=freebsd/stable/14 # If pwd is a stable or release branch tree, default to it. cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null) case $cur_branch in From nobody Wed Apr 24 23:58: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 4VPwtT0DGxz5JNv8; Wed, 24 Apr 2024 23:58: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 4VPwtS4bphz4sgx; Wed, 24 Apr 2024 23:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymLEnw5tmXJf4gwaydG6VeKuvDf5x83vwuvzLhzhwIo=; b=J1dofEOca1cUbSL10nZ+56PpwyKmOLFf3+iesLVXIzQIUh64d4LDX2Sm49ccUjybecrCOS EOEWRo/CtMqnuON4E2VRsAeqElUNDHqwcx6Eo0x+0rPa1hBVSd0m5yIDjjvm/MJhk4Szto sV0QMeyF+/4sloWBqZQLoVfvrnmFN24ag2b2EHg/IAXUfF3zgMJ/IpZjoVoUcsvNh9/HHq lFu4Pa8G58OVzhk88wuFLHx4igZLA7EyRUhWUXoXuLi8e1IZ896a81G0d52Ev/FGQ6/bzL zPGekC7P31CROGtARs8ulzTbXrz1RsHPbEPkCcPHQsLixvDX66MLIWZQ3PJ7VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714003120; a=rsa-sha256; cv=none; b=Z35gQz54pajqoNBRQxNBn8FWE1ryO+srPdToIHmsnHDaaPjhaf6EGYt1hmauxXzergmqn0 rfjkg8AE3dF58ugAm15ZcwHU9WQ0zPvWkIIJpGJfHarObM8AxYu0ZH8/n0rkAxycCBXkSw 8fqYYxxd1onVxx0VytExN7fHL4zj0GKm6CWyrWOTQyZL9tJO/uSefIHs+Qo2r28CpautDJ JXwKaY8d3osylPF1daLbKMr4BPoIFOgkDWDSLTjuKK5nIHUvCNaKbDE/kgDid2tL/QNsJZ jetxB7ZDQAbZeymaqjR4zx5FcBSqTnD73oR6N/lPcvoxegAi4QXhFXJJrrdnFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymLEnw5tmXJf4gwaydG6VeKuvDf5x83vwuvzLhzhwIo=; b=AGNgjDuJqOD61AR7z5j+Wkb9gXPkOqdNCmbKY6CPganTI716W8IxyrzjBvQouJV12PtSF3 rA95+FRh0RNSiUhnKTixtuBOvoPpo9bi4HWXrfdJZ6Yswm1kj/m8ZMnLzKWSFLhXlK016D 46SzG4XxpoztPh4Yhmf498draLmTDWEcoF+7uvRkQqEz2lC4fkoZ152Qmc0FTywH5CM62G OSf2GLTU5zalTViX8d0eBKG4As7qRZXvg7SIkKy1ISd70Dm8GGi/h/o330nEb4gtMQJC/z JqKJwPuVDxwwA9tXERImPXrFoDxKINRO/wL0bHBA6nf50pleUCMq4/+gjTu2nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPwtS45jszcKc; Wed, 24 Apr 2024 23:58: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 43ONweCL040358; Wed, 24 Apr 2024 23:58:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ONweEK040355; Wed, 24 Apr 2024 23:58:40 GMT (envelope-from git) Date: Wed, 24 Apr 2024 23:58:40 GMT Message-Id: <202404242358.43ONweEK040355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c7a5881d7a6a - stable/14 - Add support for Intel Atom S1200 UART List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c7a5881d7a6a37881bb65837e42829ee68a3883c Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c7a5881d7a6a37881bb65837e42829ee68a3883c commit c7a5881d7a6a37881bb65837e42829ee68a3883c Author: Henrich Hartzer AuthorDate: 2024-04-19 22:52:49 +0000 Commit: Warner Losh CommitDate: 2024-04-24 23:57:55 +0000 Add support for Intel Atom S1200 UART PR: 278316 Signed-off-by: Henrich Hartzer Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1164 (cherry picked from commit 1f2776e123603042944aad9f41ceb46b5b28d8ae) --- sys/dev/uart/uart_bus_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index f2da02d68f27..3b69439c75f0 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -136,6 +136,8 @@ static const struct pci_id pci_ns8250_ids[] = { { 0x1d0f, 0x8250, 0x1d0f, 0, "Amazon PCI serial device", 0x10 }, { 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10, 8 * DEFAULT_RCLK }, +{ 0x8086, 0x0c5f, 0xffff, 0, "Atom Processor S1200 UART", + 0x10 | PCI_NO_MSI }, { 0x8086, 0x0f0a, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#1", 0x10, 24 * DEFAULT_RCLK, 2 }, { 0x8086, 0x0f0c, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#2", 0x10, From nobody Wed Apr 24 23:58: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 4VPwtV01Dyz5JP0c; Wed, 24 Apr 2024 23:58: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 4VPwtT58mlz4sNd; Wed, 24 Apr 2024 23:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQ/ID2XJVRKSlz/X62TvR97z7n8G5pOlR+VGisAit/w=; b=CRQJOtUTi8NcHdGWujlxBJ+miueZSLbOsL0kJlqCwgFrZVuK2UwGajTNZlp1w3NJjVIGJF ez2OKDB7cvxPVVy9Lv+K3cF73FcoGOetP2j0HtVz8MTfWmL+5UEPSz4BZkmlBQ8GTOOcZT 8Ax+6Vvuawztxxqm9nt4rnZ4/ybUo5Pkpkp0+EIgLlQIujJiTV37CQ0dYstWfylfV0+vna zmAJ/qK68liDvDU72tDWbecj0QMBp3sS8r6HvVr2PXqnHu4EH5TRkqgwSnGCbIcBem2Do2 R5xh3A/4KrFFV+YvdQU3WbladzRzgwgKHvQSAeyMY5p4YEdEV9yMuOZtVW91Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714003121; a=rsa-sha256; cv=none; b=rFFpUlXbF1HK4yeT8pjR2tVC5H24ALzHqugNwvd5T5+gnzT/kmKOPsVdaXuk9iwNZ1ylGy +iUR8mFAUSrFWhx7g3MO7EO2SjqZK7y+S9mFMOUUSKUjXl+vx5RidIpwxndqAQ81+VJKao 3Tl948fmLmvOxutKfntzH45lszqmkpD8hyov3QJxq0aV0tNqSQhLONRcwYs5YVHHBWjC7m e29hbUlcH93uXpWcjGvH06pQ0xaHa8NSOffY7UsXZRZh9nBeu7AFVdeYYGn13Ap05wPpzf KtHokzSq1oUiEvfoHs2tHha1iiKzCfszMDm4GsRvfN/Z6eXYiYBLBVr1NILTHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714003121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQ/ID2XJVRKSlz/X62TvR97z7n8G5pOlR+VGisAit/w=; b=GnnalriSsvn7CzYwtgFtEoeeTe7MbQvdi1NekjzoMbxADzRns1ZaCAAlz8PFTjoHzlIAGr 6Lf9l1hMdTl/p7RNuHRpWY1N20Vf+dIePaoLxx/ZXtdQKThE2xFMbHNA5bau6xKs/2KwOs TqUTB9HpnLJ++BJFgqrJaBOH05grQImeB06xLMSjIDkC3btb7i6lnN3H2V45VY7a+rv+Ye ZXB1aXtHUmdGGyfSFDYL823eQzzTzEbwKsenClQtJAeIoY4NdRdMkCaQXxm0hnH4Y9OOBg qgwrXx3N/mu8Sb+XaSDCcGsMJMv0V8ySheDUPh7ynh4xy8T8s33UT3Kpl7WhXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VPwtT4n6gzcKd; Wed, 24 Apr 2024 23:58: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 43ONwf7p040400; Wed, 24 Apr 2024 23:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ONwfnT040397; Wed, 24 Apr 2024 23:58:41 GMT (envelope-from git) Date: Wed, 24 Apr 2024 23:58:41 GMT Message-Id: <202404242358.43ONwfnT040397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9857f824ec77 - stable/14 - arm_kernel_bothdr.awk: Update to latest ota List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9857f824ec77cdc27c82e0871356eb2e9662fc86 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9857f824ec77cdc27c82e0871356eb2e9662fc86 commit 9857f824ec77cdc27c82e0871356eb2e9662fc86 Author: Warner Losh AuthorDate: 2024-04-15 21:07:46 +0000 Commit: Warner Losh CommitDate: 2024-04-24 23:57:55 +0000 arm_kernel_bothdr.awk: Update to latest ota The latest ota is the first one in FreeBSD that treats 0 + "0xf" as being '0' instead of '15'. Don't use this old trick anymore to convert from hexidecimal to a number. Write a function to do that instead. This fixes kernel.bin building on arm*. awk on 14 doesn't need this, but to build FreeBSD stable/14's kernel.bin on 15 we'll need it, so fast MFC. MFC After: 3 days Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44801 (cherry picked from commit de22251127cd0e89ce1edb56c58b202496a97ba3) --- sys/tools/arm_kernel_boothdr.awk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/tools/arm_kernel_boothdr.awk b/sys/tools/arm_kernel_boothdr.awk index dcc65ab40b66..e0f193f7922c 100644 --- a/sys/tools/arm_kernel_boothdr.awk +++ b/sys/tools/arm_kernel_boothdr.awk @@ -47,6 +47,10 @@ BEGIN { } gHdrType = hdrtype + for (i = 0; i < 16; i++) { + hex[sprintf("%x", i)] = i; + hex[sprintf("%X", i)] = i; + } } function addr_to_offset(addr) { @@ -56,11 +60,13 @@ function addr_to_offset(addr) { function hexstr_to_num(str) { - # Prepend a 0x onto the string, then coerce it to a number by doing - # arithmetic with it, which makes awk run it through strtod(), - # which handles hex numbers that have a 0x prefix. + sum = 0; + len = length(str); + for (i = 1; i <= len; i++) { + sum = sum * 16 + hex[substr(str, i, 1)]; + } - return 0 + ("0x" str) + return sum; } function write_le32(num) { From nobody Thu Apr 25 04:00: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 4VQ2Fk0vRvz5JpW8; Thu, 25 Apr 2024 04:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ2Fk0QZXz4LM9; Thu, 25 Apr 2024 04:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nc2L4sn+pEus17Tu9DBS1sGRDCCqRorGaA5Hz5+pbs=; b=lvgCMExK26oz6p4yVWMeArAKW4HMGg1k38W7vBsisJGajcorN/7RVE3YXHMyEmMOJS7GV4 w6VdLOrN6Lk1i8+pdD2LcZBL5iSypnTJftyTCAlbRG383FZ8WMDGgvit6lQ61MG6V1HEjv qrhK2BlPnDDD8yrsA9PCTtTc0J4FGG6k0ETEHLf9BtPJ6ToJNqqCTQdV0yWGKyhQGAO98p /wNXA221IONDuiLwx7vpCd9zfiYvY5J+hHCi00FHO+EGWTpTFHXgusE86teNanZ91d/1V+ 6ev/QHa7OQPo9GUeujMAYLPErX9NUS6ZetjBfIiLYV0bwYIv9z5z7cMBxUtu+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017642; a=rsa-sha256; cv=none; b=JrxsYU+cRdNLzSq1RIpZHoAlsRSJNPiPCvE3H6UkLc9gvCzTeWRAu0E7XwgiJygE6Vj58P YYAP8FOvAhpW9YONw17I5qcICfASMuCbL8L1YbN5j7qD/QOciyN8I/xOmlBAsHeUqy96Ph MUn7sG6Dn7myhBpO10GjBb9IHLhPchBBY2ws7Xi8E+Tg5eTKmMEfrOy2EfeONANyonqY3P GjzsmBYap74DG9pGuF2FFVwef+5wIxVhQStszbiKCpQ9pHejhcR2eiWxQgfWi7T+INSV2l tYnKiagY+oCh605fLisBIDOPrQfXhDEEcQiZmSLh4a2C+eT+zh7Fu+t7JEZ4zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nc2L4sn+pEus17Tu9DBS1sGRDCCqRorGaA5Hz5+pbs=; b=JzFlAPejOz+FX0HNlcz4HY9vN/noZdu8oVsNfCy0RNwOltgFlgIiGChKnBRSEYv0PqyHV0 orIC3ED1XWCnoOSQ1nFePc+ItXznZzGVlPbETO+gvJVx2dBCEInWC/OqjvVpK5HzU7C5SJ aECMg800y3QGqBDRTJEMb9wQM/huvGcnaojzr573mwBx8gOTrnRjf+AiX3XTF5nxw8vsbS zj+08TGZ14UJDGjG/KtJou8EVmhXFKHBDZWAZEPfhI9g/FX3OxFLOho3rJ++dbrqS7oLSW Uuw7ReyfL737bLE1qkddum01VgRlbncW5uot9l+KxM9K3lLtT11tIn3vYNrOoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fk01Lfzkgg; Thu, 25 Apr 2024 04:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43P40fta055935; Thu, 25 Apr 2024 04:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40fM2055932; Thu, 25 Apr 2024 04:00:41 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:41 GMT Message-Id: <202404250400.43P40fM2055932@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: 7c3092e343c3 - stable/14 - ahc(4)/ahd(4): fix target mode on ARM List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c3092e343c368ce4988f7aca3a49fe13e5ff6dc Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7c3092e343c368ce4988f7aca3a49fe13e5ff6dc commit 7c3092e343c368ce4988f7aca3a49fe13e5ff6dc Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:58:58 +0000 ahc(4)/ahd(4): fix target mode on ARM One of the comments in ahc_execute_scb() notes that the CAM direction is actually w.r.t. the initiator. As a consequence, all of our sync ops end up being wrong because the direction is flipped from that of the transfer. Fix it to do proper invalidation and avoid spewing random garbage out on the SCSI bus. Reported and tested by: HP van Braam Reviewed by: imp, mav (cherry picked from commit 9dcf39575efb2ff32f955d9e04e04af28d45d798) --- sys/dev/aic7xxx/aic79xx_osm.c | 35 +++++++++++++++++++++-------------- sys/dev/aic7xxx/aic7xxx_osm.c | 35 +++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index df73b3fadfa4..4a1e3336fe5f 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -303,6 +303,25 @@ ahd_platform_intr(void *arg) ahd_unlock(ahd); } +static void +ahd_sync_ccb(struct ahd_softc *ahd, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -324,13 +343,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, true); bus_dmamap_unload(ahd->buffer_dmat, scb->dmamap); } @@ -961,7 +974,6 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, scb->sg_count = 0; if (nsegments != 0) { void *sg; - bus_dmasync_op_t op; u_int i; /* Copy the segments into our SG list */ @@ -971,13 +983,8 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, /*last*/i == 1); dm_segs++; } - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index 46c87defa3a5..04037773c528 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -302,6 +302,25 @@ ahc_platform_intr(void *arg) ahc_unlock(ahc); } +static void +ahc_sync_ccb(struct ahc_softc *ahc, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -333,13 +352,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, true); bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); } @@ -943,7 +956,6 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, if (nsegments != 0) { struct ahc_dma_seg *sg; bus_dma_segment_t *end_seg; - bus_dmasync_op_t op; end_seg = dm_segs + nsegments; @@ -968,12 +980,7 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, */ scb->hscb->sgptr = aic_htole32(scb->sg_list_phys|SG_FULL_RESID); - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; From nobody Thu Apr 25 04:00: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 4VQ2Fl3Wlmz5Jpcn; Thu, 25 Apr 2024 04:00: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 4VQ2Fl1Wszz4LXS; Thu, 25 Apr 2024 04:00:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bT3knw5r1IMG/RmLrp1P0EQhzNVpprd6Cvz7tBCJFgQ=; b=p+9dIbjEDpq1qeBfEI4xwJCl3R+aji0eCkfuk4nVgHiSL/4APsOKVq9+2HEKR4d++erem7 Vtl6HoP46Inb9jTYDP/IrwnlV0IDusXJ+7csmL/mvBxePzKCClT1saSVzOEPgREUrsOUXH S31rNVoKx5e8Ta3eAA2QR69r2MDEqGJzPdqmcdMNaUquhJ3jtE87Oy+E6NjbPmIJ1egD2t 7WL8zrKPird4PwHuQzKvZ6/nNRiDMxHY05EKRJBs9m24ObNr+1KrKMpom4ahhijF/Ld/r+ Ts3IN3vlxTHngxsL8oWJAsCrKo+Zb5+OCzmprL2gZq7pevllD3Qgq6HiwO7/AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017643; a=rsa-sha256; cv=none; b=v3bFshO8ZhEPmzDSS7R2uG6ldIGynQpwEhMviT3eQH0jErd4e0V2PN3Yqv5x2/Tijtr2/G TOQR94UYM8n3RKFqv0PYyFLeDD+Frw1Zrmso6erNuzXpS+6U9PvPXjwaxtWrxjgE+vZ6Xo PbgxQfWcTa5XkgHpjW1RDH7CQCBcPYnL4hm6z6b/RuGpXulMwTXuE3vSZw48DHi692YGCg dQLOaL3b94Pq3yqNtPdDvM0xZnDPSMbUAkMxdURiM+nUa7AwnrQPgHsP/5ab4EHEvUxcoL 4Vo1nuyWgjMge2QKHLiEZNlGxKA9dQh3T5aXmeWtIPJeERyIZc8wDxPxGAdSCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bT3knw5r1IMG/RmLrp1P0EQhzNVpprd6Cvz7tBCJFgQ=; b=WX3CcKogZxHl3KA47uln1OynIJfAR7EELes5BJnMmZ0nDkpSe1JgjDt3jLvcU8DWSaifA8 ClHJ6OVULm6n58QauXRX4pHL7EpdvGXc93HQXYcYgUSBmMK/HhdRxiw4GI4qZ2bPRu8dJI QXSUj/ihyRV+KEoQ8fscUgpVzQWGWDVh5KboOUooQwXIzwQcKYZ+wPvICFvuYzmHSkfuyi kl04X8lrWnfmN+lWwCgwRPCgH0NJDWcPaUDk6jNXUZNMxhF8TcF4Km4IFp9V9Xm0F3aM2f dcq6cSoY3nNMiXZQ85qubt1+h9IBXL5Log+WvFsbF8jVuHtBYbYXuBH0RDL7Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fl12yPzk8L; Thu, 25 Apr 2024 04:00: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 43P40hGr055991; Thu, 25 Apr 2024 04:00:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40hTB055988; Thu, 25 Apr 2024 04:00:43 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:43 GMT Message-Id: <202404250400.43P40hTB055988@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: 60a4a8532b74 - stable/14 - ahc(4): resolve some minor nits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60a4a8532b74e01c26d6f9d9b2d46e42f410e7b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=60a4a8532b74e01c26d6f9d9b2d46e42f410e7b1 commit 60a4a8532b74e01c26d6f9d9b2d46e42f410e7b1 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:59:03 +0000 ahc(4): resolve some minor nits In ahc_init(), qoutfifo is already assigned to effectively the same value a couple lines up, except in the first assignment it uses the proper definition; keep the more descriptive assignment. ahc_targetcmd_offset() gets the offset wrong entirely; as per the area of ahc_init() this diff also touches, targetcmds is laid out first in the shared map and it's followed by the qoutfifo. As a result, we'd generally be getting negative offsets here. We can't actually do a partial sync anyways, so there was no consequence to getting this wrong. Reviewed by: imp, mav (cherry picked from commit b5e0cc2fa44f52f16fc0b9c3f1709bc0f43fe2d0) --- sys/dev/aic7xxx/aic7xxx.c | 1 - sys/dev/aic7xxx/aic7xxx_inline.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 9934fbcc41bb..4d97d8ee6367 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -4931,7 +4931,6 @@ ahc_init(struct ahc_softc *ahc) for (i = 0; i < AHC_TMODE_CMDS; i++) ahc->targetcmds[i].cmd_valid = 0; ahc_sync_tqinfifo(ahc, BUS_DMASYNC_PREREAD); - ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[256]; } ahc->qinfifo = &ahc->qoutfifo[256]; diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h index ac043ddb8bbd..6a6501b72c13 100644 --- a/sys/dev/aic7xxx/aic7xxx_inline.h +++ b/sys/dev/aic7xxx/aic7xxx_inline.h @@ -217,7 +217,7 @@ ahc_sync_sglist(struct ahc_softc *ahc, struct scb *scb, int op) static __inline uint32_t ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index) { - return (((uint8_t *)&ahc->targetcmds[index]) - ahc->qoutfifo); + return (((uint8_t *)&ahc->targetcmds[index]) - (uint8_t *)ahc->targetcmds); } /******************************** Debugging ***********************************/ From nobody Thu Apr 25 04:00: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 4VQ2Fn4z5Xz5JpkD; Thu, 25 Apr 2024 04:00: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 4VQ2Fm4Y2nz4LgZ; Thu, 25 Apr 2024 04:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56EPwbUl2upzR9hbJkgiys37T6ASDV+AUCXX6ysdezw=; b=jIz0hIdmAx47rdxR1mZshLI60AjLi108KY077/4IPtnWla84PNIuTnVntm84HwUhgQ1/tz Zn6MELnzze8NstupIxWd/2c/vYD+IcstV/AreGH2ZAPYJXnK2EZUfnkFFR4b9SIE4zrrdd 5ECN3L/RkTPfIbB+ipqXGLpBpSvwrG9GIaLQncLY/n66jo/DlUhIiuR8jfle4INbUCAaa0 I8c8wB0A0yKy6BEzw0YzTNNiFPw4YFyMDNuCJAX+gllemd7O5kGT6BmC0CnBIjlELM/bl0 7npR0/9HGJISO+KZ5qnn679Ix+dbWShdU/g0lV9pNkLhaKSmt/1mhkbY2QWOyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017644; a=rsa-sha256; cv=none; b=QOkY2h4Ebj/p50aV8pVr6y8Il+v+JRgA8TMiIgV2Nrz8P/6HsARZUNXMR/Y28lkA7msH+M U44eziNGZYjs//s+Ou3qD1j4rkfWhbBV4iSxLhyVVzyu5vrjEyRvTlMkMVobLvND5jnvD+ /vFJ0/6Zw3+A4Ur904qwVqRknHwNdrU5Y/25SMY1Jh9YNngHfYy3fKHhb4XfHhTr06TWQ4 J+jTgTcJ2wkQcyKNLwKqW0y1j86YUyV8RuxZoarAPeX6atgvM4PmMgZGggNmT110VITxEt yTNAlLDDqE2ZF3MiJs9tScypL3SzQPZXoRqnQNQeAa5Fe2Sa17mKQndSrV87tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56EPwbUl2upzR9hbJkgiys37T6ASDV+AUCXX6ysdezw=; b=YGo8oHYxNZcTMNQ09q7yrM7f6JolHI4TRAbx25J+YylEbOQj1AuIGyCOi4EXGPDwj+XYix OCRpd0iKVh7+Gv/mnTMccQu03s/eiIexqC3ZluySSqUF0MJTF5nDHOPYct2JYHdJUYdWKS hCQYlDKAHGqh2E8b18+Z9JoJYW52XsQhshTySTMpwLrGStgCHes5njQB8uKAqul9LKfpzE otbYCiGQb7MToZvh58uTKHY8LEpIbbSLknuziXyyftfM/yH9hLi9GPKDYNOfhgKhXWe5Jw hTR9kossjobCXRpPse7+GA0x7toQU36V8LR8E4/KKAaAZUc+a/OuPV0+4M2vaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fm49FTzkX4; Thu, 25 Apr 2024 04:00: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 43P40iE2056134; Thu, 25 Apr 2024 04:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40isB056131; Thu, 25 Apr 2024 04:00:44 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:44 GMT Message-Id: <202404250400.43P40isB056131@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: cef3d542b700 - stable/13 - ahc(4)/ahd(4): fix target mode on ARM List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cef3d542b7009f7823f09cfd12ac671c0fbf87a7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cef3d542b7009f7823f09cfd12ac671c0fbf87a7 commit cef3d542b7009f7823f09cfd12ac671c0fbf87a7 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:59:14 +0000 ahc(4)/ahd(4): fix target mode on ARM One of the comments in ahc_execute_scb() notes that the CAM direction is actually w.r.t. the initiator. As a consequence, all of our sync ops end up being wrong because the direction is flipped from that of the transfer. Fix it to do proper invalidation and avoid spewing random garbage out on the SCSI bus. Reported and tested by: HP van Braam Reviewed by: imp, mav (cherry picked from commit 9dcf39575efb2ff32f955d9e04e04af28d45d798) --- sys/dev/aic7xxx/aic79xx_osm.c | 35 +++++++++++++++++++++-------------- sys/dev/aic7xxx/aic7xxx_osm.c | 35 +++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index c59770291786..d06a9c6e686b 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -302,6 +302,25 @@ ahd_platform_intr(void *arg) ahd_unlock(ahd); } +static void +ahd_sync_ccb(struct ahd_softc *ahd, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -323,13 +342,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, true); bus_dmamap_unload(ahd->buffer_dmat, scb->dmamap); } @@ -960,7 +973,6 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, scb->sg_count = 0; if (nsegments != 0) { void *sg; - bus_dmasync_op_t op; u_int i; /* Copy the segments into our SG list */ @@ -970,13 +982,8 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, /*last*/i == 1); dm_segs++; } - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index d2eb8528849a..d8d8115e5aab 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -303,6 +303,25 @@ ahc_platform_intr(void *arg) ahc_unlock(ahc); } +static void +ahc_sync_ccb(struct ahc_softc *ahc, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -334,13 +353,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, true); bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); } @@ -944,7 +957,6 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, if (nsegments != 0) { struct ahc_dma_seg *sg; bus_dma_segment_t *end_seg; - bus_dmasync_op_t op; end_seg = dm_segs + nsegments; @@ -969,12 +981,7 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, */ scb->hscb->sgptr = aic_htole32(scb->sg_list_phys|SG_FULL_RESID); - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; From nobody Thu Apr 25 04:00: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 4VQ2Fp3xDrz5JpXM; Thu, 25 Apr 2024 04:00: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 4VQ2Fn5GJfz4LZs; Thu, 25 Apr 2024 04:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYgmJUwxhsTFzw9h41DfssOtwLu/PuiLJ6kvQkA3Ccg=; b=V7KD7AN3lX6ZN81+UXCsKjXThE4JiJL032QYYM9ub33TaTtsEQIGBqBHDJQBoP3rPwaNK2 Op2TY7Hga/UrnKCA84e4BllHG4FpO7WN+grDcaLNVGXq3ESphHL8M19BkZl0/wuptKbBcm tagNXYC3HlAtc2nTGYxbrUiWJq4nGnX7AzPAZtv3rwYrpwERTC4h1xFR8Jg5Iaz3greT4d Gq7dNzTTv35dfpPPgNnjSaHd/z1T6O6Rlp3n3cyJnp4YhbGC0gLdMX2OGCR5pKCXLlbY0P 6z6kYDO4f6w2po+wS3AFog2dHnL7dUeXyITQH2njePOKIaUMqsLnjSQAcq0zFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714017645; a=rsa-sha256; cv=none; b=vyZSKHaidpf2YMzAlQX1AhYMpcji8x2LHx5H2hDKJT8BQfbxXtNYiNccr/P9wrB2YiTXCU 2pRDubolad4pu1X00NVHzZgbVk1AwT0eI2c1EtpIzQ80TWQY+uLFWQHLzjeanOWigPUQNl oq4AZrUfkFYcFUGvPl5lHVOYJWHAp5huzlNcbHj3GNfWDNpWNtsIIFJY+N2yMGi2piwSbD lwOo1go5qTzkd0gCt4F2PtkXxEq5RSpAbCbGof/4WfdEY3cR62kufhGn3VIQhibmn0/mnU KyIGnfBATq/MgZaJrRNmhyhGd78UcjHUDVL6eASHFLOluwaut390z8koT0WutQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714017645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYgmJUwxhsTFzw9h41DfssOtwLu/PuiLJ6kvQkA3Ccg=; b=A+AHCMkfwm0/FcO+DTIRlXonI9jsKIr2Hs5+qH7Kkfp47yNTBeXDVChykkKy/7XFt/zts7 VGpf3SqUyYXjSoFBI5S03DGsigR7o/lLnWGeST+RSBtOtaxsC2nrG9rcEoKzNkTf+Jjf1G CYo5L7z/UsGEMa39CuGHtZrsf0zMi8PGPotJBUx9MuHEe3FqePo6gDsZqXEjZ1orHgVUG6 Gw5/tH/KUa18uZn2AamwH0UChYXNNvyoEPGZx6q2b1w51LcE8kM7V9Wqyr2u53DZlwANhL c2WKvz3o7MK41S5Qz41V9eSomSDdo2B6Ze+g9AIbNY0jX+YFwUUvo0oyTXMOpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ2Fn4st3zkX5; Thu, 25 Apr 2024 04:00: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 43P40jV8056177; Thu, 25 Apr 2024 04:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P40jO8056174; Thu, 25 Apr 2024 04:00:45 GMT (envelope-from git) Date: Thu, 25 Apr 2024 04:00:45 GMT Message-Id: <202404250400.43P40jO8056174@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: fac45b6b9a58 - stable/13 - ahc(4): resolve some minor nits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fac45b6b9a58911a13c2709407863dbf8b7fd5b7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fac45b6b9a58911a13c2709407863dbf8b7fd5b7 commit fac45b6b9a58911a13c2709407863dbf8b7fd5b7 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-25 03:59:20 +0000 ahc(4): resolve some minor nits In ahc_init(), qoutfifo is already assigned to effectively the same value a couple lines up, except in the first assignment it uses the proper definition; keep the more descriptive assignment. ahc_targetcmd_offset() gets the offset wrong entirely; as per the area of ahc_init() this diff also touches, targetcmds is laid out first in the shared map and it's followed by the qoutfifo. As a result, we'd generally be getting negative offsets here. We can't actually do a partial sync anyways, so there was no consequence to getting this wrong. Reviewed by: imp, mav (cherry picked from commit b5e0cc2fa44f52f16fc0b9c3f1709bc0f43fe2d0) --- sys/dev/aic7xxx/aic7xxx.c | 1 - sys/dev/aic7xxx/aic7xxx_inline.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 91bc68121067..141a0b526c97 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -4937,7 +4937,6 @@ ahc_init(struct ahc_softc *ahc) for (i = 0; i < AHC_TMODE_CMDS; i++) ahc->targetcmds[i].cmd_valid = 0; ahc_sync_tqinfifo(ahc, BUS_DMASYNC_PREREAD); - ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[256]; } ahc->qinfifo = &ahc->qoutfifo[256]; diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h index ac043ddb8bbd..6a6501b72c13 100644 --- a/sys/dev/aic7xxx/aic7xxx_inline.h +++ b/sys/dev/aic7xxx/aic7xxx_inline.h @@ -217,7 +217,7 @@ ahc_sync_sglist(struct ahc_softc *ahc, struct scb *scb, int op) static __inline uint32_t ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index) { - return (((uint8_t *)&ahc->targetcmds[index]) - ahc->qoutfifo); + return (((uint8_t *)&ahc->targetcmds[index]) - (uint8_t *)ahc->targetcmds); } /******************************** Debugging ***********************************/ From nobody Thu Apr 25 06:17: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 4VQ5HH2FNcz5K3rN; Thu, 25 Apr 2024 06:17: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 4VQ5HH1ZlLz4XHF; Thu, 25 Apr 2024 06:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TErUUtdKuP8K1Wh1kC9+/bF8WxagBX9OYZgcnGsAqT8=; b=dR6Lo8os01Dd15CfS7h6vbepb51bNM6ruEqVo300HtSyFFuGQxmon7ylCWwxLTM9Kj6Sog obd47+W1Bj2YmOHZ8fJKU19Lpz6ZkGRFRZ38BsS1zSoMzcygC66xFptY5FnEXCL4VPJ4a/ H7RThGlhhbPLj2NXb1R1qe6UJiYEp0GRxhB6IwyyChD0Yx1JcHac47+d+cpbtGPq6tpasV Pv5zRrdsRdWPydzUSoq7wKrz4r54vkGVuPa7SpwbpG+s/y8m92RQ6WUh0jFc5UzR7kyDkJ F7fcMX5uPmsA7Zc5n2gipuTzeA+ISRczFqooBpznRkgardcC08T46Ik31kG9QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025835; a=rsa-sha256; cv=none; b=wLNItVJVQnBiMEPvNpudoF9vwAiyewr4L3kaGU8UTUz+5yUpRXvpAY/vKIMZXbz4sYcwNT CVKdvDCQnfgbo0bDr0siwxFfKJaRHxFpD8/DiKmR9G3CmDyfMeUxd9wdOmsLceCYvsoVcn nClrTZPs0w1fqk5O2L77mhGw82SZS7blW2cV3RFQBOHdR4jkH4rNY33H3euNG0PtnulYHf OYdMHeTjQDFmRJtucwlovSGM8MzPLpRm0laM92buh1fz0aC2RYI/wuXgsk6J3qPZFd/Y17 Mf4Qs3vprmj+RIpIJ5iOq+huCugu6E4vGGIeNLX+36Vjlvs/wjUm0KXYAeUCVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TErUUtdKuP8K1Wh1kC9+/bF8WxagBX9OYZgcnGsAqT8=; b=FFI0dkVLytv5a1SCi4HjfLGjTGvj0kCH9Dxv26kEURWh8W5gm9rvj9CPoWRbHArBpkVrvV gYs0rdpyHrzUGd93zsM6DurV0bV6njboJykvH9lnDUuAdLBl2sp5uP77hvurFhR45+eDpm VIr6yT7xe4Zm0Pn4pGx0+B/WQKxLKXQfzXHhlV7jguI6h+xOCCaPIld+Xwo6aRfS2xs6ay CK2wL0kRk71UaiUyAjoYsSak5SYr9ZzN1KcyQIrWqquuNyQrSfDqVXnCRDcjmB2zTqhm0S tPwIM20b8PACQTNJDRZLEAiCyhZ+ZTk0Gc5JtRuSuI6KGA91qAs/RMfkbeF/mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5HH14G0zp0t; Thu, 25 Apr 2024 06:17: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 43P6HFVJ083306; Thu, 25 Apr 2024 06:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HFA4083303; Thu, 25 Apr 2024 06:17:15 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:15 GMT Message-Id: <202404250617.43P6HFA4083303@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: 176336c65a49 - stable/14 - mwlstats: Fix a typo in an error 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 176336c65a49d1262b89dc394d0345eea529d441 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=176336c65a49d1262b89dc394d0345eea529d441 commit 176336c65a49d1262b89dc394d0345eea529d441 Author: Gordon Bergling AuthorDate: 2024-04-20 12:02:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:16:42 +0000 mwlstats: Fix a typo in an error message - s/the the/the/ (cherry picked from commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4) --- tools/tools/mwl/mwlstats/mwlstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c index 925ed62de716..c9f6fe1ada2b 100644 --- a/tools/tools/mwl/mwlstats/mwlstats.c +++ b/tools/tools/mwl/mwlstats/mwlstats.c @@ -126,7 +126,7 @@ static const struct fmt mwlstats[] = { #define S_RX_FRAGERROR AFTER(S_RX_OVERFLOW) { 6, "rxfrag", "rxfrag", "rx failed in f/w due to defrag" }, #define S_RX_MEMERROR AFTER(S_RX_FRAGERROR) - { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of of memory" }, + { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of memory" }, #define S_PTRERROR AFTER(S_RX_MEMERROR) { 6, "badptr", "badptr", "MAC internal pointer problem" }, #define S_TX_UNDERFLOW AFTER(S_PTRERROR) From nobody Thu Apr 25 06:17: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 4VQ5HJ2XNqz5K3pB; Thu, 25 Apr 2024 06:17: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 4VQ5HJ1wdxz4XF4; Thu, 25 Apr 2024 06:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0DTjTXscsczHDAczDuwZTK63AVSM3Td6JTu2WvQ+8ZE=; b=ytPwhw7uIPXypXvlsYVLxhZ1+XTtyRZh98hAcqPJjupDKxfGg+uITVhplPaCkaqL2StGuF 4pNLX3JVzMaxnP5B1HhM3GxBYG1Be3/pftZ5IC9n6fB+RxcfnjkeAnW3GBjYZxwM94Gvj8 Li4BO22jD+7A4IC58Jcsg7kgssTUcEcuXjz8W0D63RjFBQA2mAz0lHWDo0RbbGFvXxB5yf 8+rawcRiFrvxE4Nlr8FPst1lKIQE41LQIVXFyaV5cmwamutkaRmlcjI2xfQVE+7FgKQy46 IGUaIg4nzYQp4u5HC2iSBoZJnuWGzuhzOsaBLf+1yGgFyRuDUOTSCXbu35SAlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025836; a=rsa-sha256; cv=none; b=pmv2PVeqhncPFyKc3opWk8eHMhPjychcqP+OI+hTLygPyC5IKQq+v9PpyGVL9YC6OmVW5v vhh8KKGAqXweuDQwxWLnHwvk9bA4465jHgY9JnrgrIOe0Rlk3MYsq7aguyCbbbA5UyDKN+ o1CbpcHlYVUJobZgg69q+1lWQyxoyV3WD2OSrbeKgIdTEfVLfIH3/b9DAkmdx5b+4OI344 YdF+AfyCoVE+VqzkMuDRph3zZ4lrALQiKs6joept8EgshuxJkGlgecxXBGHHu8NVZo69ND OKM6ALXrb1dYNc8yDdD42G85q2T1V9etkOsyvmML3JFxifhrp2b2dbLhalE6TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0DTjTXscsczHDAczDuwZTK63AVSM3Td6JTu2WvQ+8ZE=; b=xl7+Rooa82wCe61/REsWE3BrY1jtTgt3hFQAfIF7rrLqoro+tUtXth02TVfkcu7chE2/kY ixT6zqOdMPJbKLRm+FT8BxmQoGIdcVWpbB0Js0eXre9eOR1yQt/3cLoy7IBSBnOM2f/atG MzhIWq7njT3UT54Me+bsMzlIEDYGb57VLSjyusIMw9EIEygpj0EPT/osKeXz5IdoUOA3Gy zy9qJdMIIn72ed6/bseEm5AHehmiiwH0/h7j6pLRwVIi8D9iN93BRfDGExFdU/CgxxRCF7 FsaawlbVi6d5a+KImGelBGfrpkpM0QroIS66AaPEM2jUjUcOjlV3qpKlfLWtTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5HJ1WxYzp43; Thu, 25 Apr 2024 06:17: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 43P6HGpC083360; Thu, 25 Apr 2024 06:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HGUS083357; Thu, 25 Apr 2024 06:17:16 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:16 GMT Message-Id: <202404250617.43P6HGUS083357@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: 068465dddc96 - stable/14 - sys: Remove two double words 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 068465dddc9696bbb7162437c2a1a314baf91e9e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=068465dddc9696bbb7162437c2a1a314baf91e9e commit 068465dddc9696bbb7162437c2a1a314baf91e9e Author: Gordon Bergling AuthorDate: 2024-04-20 12:04:31 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:04 +0000 sys: Remove two double words in source code comments - s/of of/of/ (cherry picked from commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9) --- sys/sys/link_elf.h | 2 +- sys/sys/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h index 2ef044032f58..9752bdff55dc 100644 --- a/sys/sys/link_elf.h +++ b/sys/sys/link_elf.h @@ -58,7 +58,7 @@ typedef struct link_map { caddr_t l_base; /* Base Address of library */ const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ + struct link_map *l_next, *l_prev; /* linked list of mapped libs */ caddr_t l_addr; /* Load Offset of library */ const char *l_refname; /* object we are filtering for */ } Link_map; diff --git a/sys/sys/types.h b/sys/sys/types.h index b97ad9b5cccb..a3c90c2f33cd 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -319,7 +319,7 @@ typedef _Bool bool; * The major and minor numbers are encoded in dev_t as MMMmmmMm (where * letters correspond to bytes). The encoding of the lower 4 bytes is * constrained by compatibility with 16-bit and 32-bit dev_t's. The - * encoding of of the upper 4 bytes is the least unnatural one consistent + * encoding of the upper 4 bytes is the least unnatural one consistent * with this and other constraints. Also, the decoding of the m bytes by * minor() is unnatural to maximize compatibility subject to not discarding * bits. The upper m byte is shifted into the position of the lower M byte From nobody Thu Apr 25 06:17: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 4VQ5Hv3fpfz5K3pK; Thu, 25 Apr 2024 06:17: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 4VQ5Hv2fg3z4Y1X; Thu, 25 Apr 2024 06:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TsqsohHi3a6rKDr3JCz1NaZf2DgVFYc5G1Fe7iG5LEg=; b=l4Ai8+7Hetk1fPjN/s6q2Hr9PwOBLWSh7Q7fEkSnZ80kGR/fgG+RZTe5V9Yz6RBPTDYuS0 UT8vH9wkw3LpJtYAlxNWkEDwBmzajCVJO1tAiRONB5u/6pfOMpC4/TMVazuacRXQnteIru TOKTa7py3UTjh2S36t/DgtrLBdI547sS+TxDlAPIYzbQoxmXObUGwILY3FXh8oeCaLncCH o3ihe2Ccs4P/QqeURKepGCQ2aPWuJb0oGd/lrpFJP+TZXgXgeWE463EW4ylWMGWXHFZBxR SjvjX3ib1o6N4C4W8FVN4POwn5Zusgjxv8gRcsgd1hp1Vp3k73czeMYBBu/Bkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025867; a=rsa-sha256; cv=none; b=e2aP8Szue9qKLSPIgHo/4eTlJQfTULRgrYkvh1IEt8wRwY9wbbK2eeuVd6yR+YYf+ZWYIy 6tr7wN+jx1heI9EXQTqXvpLfwDYVN52aDZv27Ny0yaUUre136gvfpOCW9zNR220iz7jqth ZlBDm9xxE03768R8yCPFa+L0kLI7/cEPLKb2gr2D7gZfswyGKSHLmSIBGfKyQGdLOV/yU5 g25EiwsrrIzenEH1S6HX8zrHKXYbVF6lampwu0MGfPYpv3KdHpynsLYJxKQHLRlTatGVtk 6sX7BvBly0EApBj9S7HtfiSh+PX1gCa0rtjemfuuaag3OnEordc3uAT4q8W6Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TsqsohHi3a6rKDr3JCz1NaZf2DgVFYc5G1Fe7iG5LEg=; b=YxxPM7kgrQJRaNsLRAY3xckJj9LrufQl/R5QO3sQQ6Z3tzOj8xPWNP9nteCOML+vT7uUm0 GJWMQJD6BDCjlIyR/m32lCzr/IBQYO3goS3uWm+RHoBgMYMYSUZ90OjRDvW3mCZYQ5jEsR 2y1xeo4mnCix3hgB7FajfugwFRlHIzv/FEYgHc4LY9PLLHVA4yP2yj1zWDIl0Jsj3Sn7mD FD2RI+O3aQETL4NGYnRm9j8j00YP5JuWeVezRLV3AwxbPjovLKVfV224Nm0xbKV+kG0s14 Nwz94Ige8fN09pSTtXoaQQeWHMqMF8+f5/VAWWXWNJBfhBFu9Phq3WGQWKRA6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5Hv2GC3znPT; Thu, 25 Apr 2024 06:17: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 43P6HlWi083568; Thu, 25 Apr 2024 06:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HlBU083565; Thu, 25 Apr 2024 06:17:47 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:47 GMT Message-Id: <202404250617.43P6HlBU083565@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: ce775a889af2 - stable/13 - sys: Remove two double words 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ce775a889af2017c3119a364608030076ff9621e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ce775a889af2017c3119a364608030076ff9621e commit ce775a889af2017c3119a364608030076ff9621e Author: Gordon Bergling AuthorDate: 2024-04-20 12:04:31 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:28 +0000 sys: Remove two double words in source code comments - s/of of/of/ (cherry picked from commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9) --- sys/sys/link_elf.h | 2 +- sys/sys/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h index a4be4180d55d..2d4bb6b65edc 100644 --- a/sys/sys/link_elf.h +++ b/sys/sys/link_elf.h @@ -61,7 +61,7 @@ typedef struct link_map { #endif const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ + struct link_map *l_next, *l_prev; /* linked list of mapped libs */ caddr_t l_addr; /* Load Offset of library */ const char *l_refname; /* object we are filtering for */ } Link_map; diff --git a/sys/sys/types.h b/sys/sys/types.h index d2337cd32c45..a30a08224354 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -378,7 +378,7 @@ __bitcount64(__uint64_t _x) * The major and minor numbers are encoded in dev_t as MMMmmmMm (where * letters correspond to bytes). The encoding of the lower 4 bytes is * constrained by compatibility with 16-bit and 32-bit dev_t's. The - * encoding of of the upper 4 bytes is the least unnatural one consistent + * encoding of the upper 4 bytes is the least unnatural one consistent * with this and other constraints. Also, the decoding of the m bytes by * minor() is unnatural to maximize compatibility subject to not discarding * bits. The upper m byte is shifted into the position of the lower M byte From nobody Thu Apr 25 06:17: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 4VQ5Hw4D8sz5K3rQ; Thu, 25 Apr 2024 06:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ5Hw3fr8z4XtX; Thu, 25 Apr 2024 06:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdueZ1/e0fnNfMRJ7/n2c5Ny+x8Z8F8DtrfdEnzTmEA=; b=RGeDNuv4V6Oq9SOExs3x6CC/rsxNm/NLBcGAjFVw6gmaD/OJXvKrmagWYj5kTMRPcuULTe EnKIv31Fo2an2uK5IPjMPwzvu0aHEvVd6iiHnV/Y4F7rPaPG1+KFjiDuR+yxter60KSgkl kMozqX9KOsxXHV39hoV+j6fQVLTAHCTd1ojPvrBk+TaXsdthGJhlf5XqJULlgNWc8XL/gE JIDDHTBbQ4uNKp8WJfzw9gwReFG46o4PsOxsSSV1IK9gFJh443vDDLHEzTIf8V2Iq75h36 x05dnp00THhWhgNRIBmBE7P+OrV8o03TizEzwO4HCvWbFesim78Q+mIV9EnUmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025868; a=rsa-sha256; cv=none; b=FE3YJ+heL1JfmU8KfvgXCaDy0b+oW0ONgHq1+hlDWdiiHg8OLo+Wit0iSstypJhj573GsT 1vctdbawO7WYqDrT8nIVg1CPDL+tBpsi5VAGrg07xp1sF4uHJ1VvVUasKc59XVovT0BMBi jb+m3L9r9NHHwXudgO2uBtzVuLbC3azYaSKGnhriBxHWjJ48HMrRW0nmnZbruJHj9FGQy6 +4B/U8abvWSLdazCg1S0KuKgQxFzNin52Lc4oiJAD7sBcxKmziECUhxQovMz9pyJPhBDjx 8X0Nw2amWZd3ln+O+rmFEVh0sXn49IXWe7l2Jz0NTO6if2rQ5HGCdbSbhotIvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdueZ1/e0fnNfMRJ7/n2c5Ny+x8Z8F8DtrfdEnzTmEA=; b=MyIMkS0RFPuW42nZ3GAyRoc5sHEPdONK1/bWXLcbT9sLiHu2wE46h+gSisZqmW3Fge9ebb gXVPBW8Gq2uZj/4Nq8PdUfeFKF47yU/MAtxjHPYxjBBSmSsgG8Z1PVpgaFNGSxA3eNCkl5 u0ij5wkVM2GcHNsu/fWnn983tElem7IafSLYYHHp2e7CbLanc6yWXgDwm4IVZ3dtlGUvZJ 804cRS9rfZ1VHE3DeBaDZ2xUiaK+J4tMuh3XTDUa3ZQYxXHOCh+ZiMk9LE1ukgRb7Murym 6db0+b03qDhw9nGitRfMvqWEjRBxtmiLakcfOU3VmWCrjZuNOo8MIZdMWkm/8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5Hw3HD4zp44; Thu, 25 Apr 2024 06:17: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 43P6HmSn083619; Thu, 25 Apr 2024 06:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6HmtZ083616; Thu, 25 Apr 2024 06:17:48 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:17:48 GMT Message-Id: <202404250617.43P6HmtZ083616@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: 1002fa246b59 - stable/13 - mwlstats: Fix a typo in an error 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1002fa246b59c71a5861e248900be6d7e0ffb711 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1002fa246b59c71a5861e248900be6d7e0ffb711 commit 1002fa246b59c71a5861e248900be6d7e0ffb711 Author: Gordon Bergling AuthorDate: 2024-04-20 12:02:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:38 +0000 mwlstats: Fix a typo in an error message - s/the the/the/ (cherry picked from commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4) --- tools/tools/mwl/mwlstats/mwlstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c index 925ed62de716..c9f6fe1ada2b 100644 --- a/tools/tools/mwl/mwlstats/mwlstats.c +++ b/tools/tools/mwl/mwlstats/mwlstats.c @@ -126,7 +126,7 @@ static const struct fmt mwlstats[] = { #define S_RX_FRAGERROR AFTER(S_RX_OVERFLOW) { 6, "rxfrag", "rxfrag", "rx failed in f/w due to defrag" }, #define S_RX_MEMERROR AFTER(S_RX_FRAGERROR) - { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of of memory" }, + { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of memory" }, #define S_PTRERROR AFTER(S_RX_MEMERROR) { 6, "badptr", "badptr", "MAC internal pointer problem" }, #define S_TX_UNDERFLOW AFTER(S_PTRERROR) From nobody Thu Apr 25 06:18: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 4VQ5JK1f82z5K3pR; Thu, 25 Apr 2024 06:18: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 4VQ5JK1CwZz4YXw; Thu, 25 Apr 2024 06:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HPYu9vXt/Z3yaNrstfUcSY7qKi1Wh5mYqbHSGe0K9QA=; b=GMxAN3NaDQdG1KN1DnaoGyF2eKMUnmZ6DNkjWlmmDxcIXG0ltOE5y1vhERE4cVwu0scZEg lsYGw/4QPcSH+WpDJ3bINAnpt74PnDgWMd5t8eUMweSDxM7EekGJTyYCqMk1vH1op/IvVh AynCvnynhvACthy+U4vWUH5Ymqd85Y+M2XXIalsE55Soeb0H9mkb3ZdTWM5z+sB7YJW90r S9OWW3YbhnVeDx5yxP4eOEnu1KNl2ctQ9gLwmULjOMc02vwxvMAcOkMZPpu3Y+Lb28ZEFP BczWJACsteixm5fb0+fAv63FkoAc99bgLiqS6w95u+evGaHT1DdGCGhGFJWwjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025889; a=rsa-sha256; cv=none; b=BMQLKnHwieLKTW94CmUk9KUX2012PyFvs5MIwmLmjG6Nje7a0k3RSHSTxIo40ajmZII+Ou GFYlZYnPkBvAPBjRtlUTof0MjBgyz+78yUUAl/3cFLG+ETvQztX/ofk44qQUJ0+WivmWaN ehAWchh2nYaAoXsL0/jvHPcXVi5NAZmAnlR5Bx7z9VeeuW+V9t+SsO/k2Cqp87Pz39oPhQ zlFhVC0qDzww0K9GBM/St9IT1jwWNWbpGiFUcAepH8ABnZd8oP/192GTvmeCAxme6qttMm TBeu2QtUhVVyQAZufbhGEjyBhejidzGUbdcqVacv6o6TnOmB9mh88oMW0SVlxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HPYu9vXt/Z3yaNrstfUcSY7qKi1Wh5mYqbHSGe0K9QA=; b=LxprfVNMX01lniHby1p0tD8NDU6ErVLAQZEyeof9LB7llccd38nG3re5kXagg5M/nbo3nZ LrkOZ/i5SDVqXY18i3cbhpOfbXKj+d5Bnd1tRSWYayxZRH/O/O3mRZT6H2VZPtR0Jo+i8O 7O4qJV7k+C68ZPR1TjqHzQAp8gBscjD3cLX4MlEpjswRA/ugrlg0plpZO2fMspU/QVrHXb kAeR+ihIpZ9AOP/puGLn9avufzvRoU9XpBhJJMJ95587PAsHAiISLTadiFiFy3ckvm1Pva Wyqgc4Wv0k3ovRofOaAD49W6UYawK5QiDaKBx0ZLekMIyJLRgEuCI0KJrv/8+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5JK0qbczp45; Thu, 25 Apr 2024 06:18: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 43P6I9o0083813; Thu, 25 Apr 2024 06:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6I9GC083810; Thu, 25 Apr 2024 06:18:09 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:18:09 GMT Message-Id: <202404250618.43P6I9GC083810@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: 0cb97c19b1d2 - stable/12 - mwlstats: Fix a typo in an error 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0cb97c19b1d22e28918b3ea9c6df57c43a2f3e5d Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0cb97c19b1d22e28918b3ea9c6df57c43a2f3e5d commit 0cb97c19b1d22e28918b3ea9c6df57c43a2f3e5d Author: Gordon Bergling AuthorDate: 2024-04-20 12:02:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:17:58 +0000 mwlstats: Fix a typo in an error message - s/the the/the/ (cherry picked from commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4) --- tools/tools/mwl/mwlstats/mwlstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c index 00d0c75a2376..e38cb6efd53f 100644 --- a/tools/tools/mwl/mwlstats/mwlstats.c +++ b/tools/tools/mwl/mwlstats/mwlstats.c @@ -128,7 +128,7 @@ static const struct fmt mwlstats[] = { #define S_RX_FRAGERROR AFTER(S_RX_OVERFLOW) { 6, "rxfrag", "rxfrag", "rx failed in f/w due to defrag" }, #define S_RX_MEMERROR AFTER(S_RX_FRAGERROR) - { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of of memory" }, + { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of memory" }, #define S_PTRERROR AFTER(S_RX_MEMERROR) { 6, "badptr", "badptr", "MAC internal pointer problem" }, #define S_TX_UNDERFLOW AFTER(S_PTRERROR) From nobody Thu Apr 25 06:18: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 4VQ5Jc3mKYz5K3pp; Thu, 25 Apr 2024 06:18: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 4VQ5Jc3HGhz4Yn6; Thu, 25 Apr 2024 06:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3YPMPXlDOQwZ3gn63xHdkjDqNz+aSBkF7Ji3iPjFRdU=; b=n8ziBEMil1Gg2NCSk2nFkUnyZ6URerKQcaFiZBeKbTWMUsYDWDqMIoU5rGQAYswNTeSv5d GtIGqMapy9crxpopgbQBSRHNJmx5WoDz/mx4vF0P0vSNfJxE8gW9owJ3a/5X34Dh7ULnb8 1mux3pddJiEbKqufTz7LxW9grdsavF/3t0L5XWsEBNgCwh4uAJjJUPkBK1DRRiBTNI3mXw dDCnWLe41yXM69uU//DsynE6x+ivoPQQwKfZlo/iUnpgPUN93znVK24Q6u+S0a16BJ0usr /m6Zd9R2Z4QkOv/RzrIF34HxahJXbW4FK1OKqNRtLsuHj3ObohZjmqhVcyZeXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714025904; a=rsa-sha256; cv=none; b=TMMraWIudtiN0HMokIVtpMboGYGz54eUVs6PED7KSmM1IpyTt+Fcq1AH7reeBPlnsEjezm OgXYgXGzjSoiVnirH86utmE0oYbXVMS4xLP2E0IdFiZtgCMJEJ8NzXoKs0dXUE3lamGs1B e/j4JmDRGWXB2VTB1TQgS2V7+NscVycs53bF1PA+8ayBlkB850gA6Upa2+IT/NSIESaz4P neR+9a7MBBymMXmDNF3sx35bvtRaIev2L99H8ZVAXOkj+i3N3zmgKERrChUdyOgJWbfj3o 9E54+rq1+06eFYl1N5dF+ggniuijOsV7rmAZfi6n9opqRzMJNCs9Bwl0CPfMpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714025904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3YPMPXlDOQwZ3gn63xHdkjDqNz+aSBkF7Ji3iPjFRdU=; b=baUISJfTtW1HC/h7y2aABWg5/SvHuhcuxb8HdDmAQTytLG4VAYFP+ZyLLlIjnfsvoy+dzQ Pi72qyh+hdLfy6/QeI+T0ErDyecoTJAsshCFUBwLJ0/Os6htioJOZDrbe/aMmRe/XND6kH VZC5HQnFCluX0nyk7SuBcWG8XLFI9EAmZaIq/ts4Ma5T3tLfhmId5Wj2kC52ystqHURsfm Hwn7quScs5UNg8v6jhxLTdwrVLNi4idLAFfOTQb+KdpJht5fJUxuyrYk7JfcdJRWN9B71N hwHgQjyp5wX2/+p0/qHnhWhZ7FkkIovzChJn4YBWVgwTCaI56iC+3h+wUt7uyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQ5Jc2tq2znqD; Thu, 25 Apr 2024 06:18: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 43P6IOa6083986; Thu, 25 Apr 2024 06:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P6IOJX083983; Thu, 25 Apr 2024 06:18:24 GMT (envelope-from git) Date: Thu, 25 Apr 2024 06:18:24 GMT Message-Id: <202404250618.43P6IOJX083983@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: 2e9bfb6a0071 - stable/12 - sys: Remove two double words 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2e9bfb6a00717660e33ee828b451f258d2b2bb4a Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2e9bfb6a00717660e33ee828b451f258d2b2bb4a commit 2e9bfb6a00717660e33ee828b451f258d2b2bb4a Author: Gordon Bergling AuthorDate: 2024-04-20 12:04:31 +0000 Commit: Gordon Bergling CommitDate: 2024-04-25 06:18:14 +0000 sys: Remove two double words in source code comments - s/of of/of/ (cherry picked from commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9) --- sys/sys/link_elf.h | 2 +- sys/sys/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h index 8e41a670bec0..8b76f3fcdb43 100644 --- a/sys/sys/link_elf.h +++ b/sys/sys/link_elf.h @@ -63,7 +63,7 @@ typedef struct link_map { #endif const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ + struct link_map *l_next, *l_prev; /* linked list of mapped libs */ caddr_t l_addr; /* Load Offset of library */ const char *l_refname; /* object we are filtering for */ } Link_map; diff --git a/sys/sys/types.h b/sys/sys/types.h index 72889f3d5a93..0312e99cb0de 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -379,7 +379,7 @@ __bitcount64(__uint64_t _x) * The major and minor numbers are encoded in dev_t as MMMmmmMm (where * letters correspond to bytes). The encoding of the lower 4 bytes is * constrained by compatibility with 16-bit and 32-bit dev_t's. The - * encoding of of the upper 4 bytes is the least unnatural one consistent + * encoding of the upper 4 bytes is the least unnatural one consistent * with this and other constraints. Also, the decoding of the m bytes by * minor() is unnatural to maximize compatibility subject to not discarding * bits. The upper m byte is shifted into the position of the lower M byte From nobody Thu Apr 25 13:20: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 4VQGh75bPrz5HjJh; Thu, 25 Apr 2024 13:20: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 4VQGh758LYz3xs3; Thu, 25 Apr 2024 13:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA1r/4f77a/3/bQbE+h+THWrf6lLWbm7r664gz6p8II=; b=x+lwG2QvBdQaq8HrdRyniFMu9P7yMyqB4qVmxm+Kmod5xcGbYhdN669EG+GSPTP4t8LTFH QIeEPesoBpnVVd6gTX8nnyvzsEwsOOKd90nneS7FoSUnw9QDcPkZGRHNeiFJtcMHtNHkie c1IJno3rXf6aAN5x0fnwlatVyTJn3zgVwTRYIj5m5dLj/NEe8uyzxDBbdc9EnOi0UQA5qF yyg0nm1TCFaIoVwDJ0p6yaFXkrnBasTol9ctDs6RRqZNt6gyKwzb8oG0g2XftP4C07PhUw JbaQW+mTmCFVp/tTeXEr8dRHOX7aubg48VviVQSWh3hJfl7TOkA5OkNb2316RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714051255; a=rsa-sha256; cv=none; b=YVkZnZ+Pe8CL9yJ/nN3Kl3hh9wpPhGJPiinaynyQZG2Raom54e/b4aANiOuf9v9Hws69zu JLcnGAyKDOXODwxxZdobd+3JnLfg42mZ9p2uxzvBxh25fhMjAKgkOQrtxcaok2ZmT3Y7Zs 2VFU/eGdjz+G3bO8+GYCcs7UEoiPJOUlne/TvJZRcHrRjfpAD7KePaZN3B8bNPXMcMbN2q Vghyi1CjgpzskWUbngF8G2nUoNVYUAl+8PFLQuISD6+TRS8SYosKhkLJUwF6nhIiF/TUqG 42bvxw6JomSnolVTtCK8/1hsGJW+dKNTghhTU0HspgDLus/0uxeb6xisuTCU+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA1r/4f77a/3/bQbE+h+THWrf6lLWbm7r664gz6p8II=; b=w2fOi7zfAKPE/XnQvPugcv0PtmWAK25yvVvatg8qh8AR4yvf/UKy8fcICXHXHfMYOAMSut rvQ0mhPe8/UQB717W9Tl+66KL47k0MY8jQJvaeuBzXyYxQJyPFvReUShW59TrzC9V6qOah hwtD4xGS6jv2jZKm86hKXX5AdZxSfy33UMS9rFKl6pSPrMnojMXjXZuc+ee7yWpBykkRXx k2NrfWL3JNcXkzUcPUbLbpO2vJ7HWdjeoiMYwSSagMrEKV/1J5JmhsBot9eKSOgH7iNTNK iFEqzWg0TZbRgyCpsB3/7yLTHki+jD0UqC/A/bUtW7TfUQyPqwQQ8+zcTSMEzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQGh74m3dz10mm; Thu, 25 Apr 2024 13:20: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 43PDKtTm001731; Thu, 25 Apr 2024 13:20:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDKtwP001728; Thu, 25 Apr 2024 13:20:55 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:20:55 GMT Message-Id: <202404251320.43PDKtwP001728@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: eff68b69dfa2 - stable/14 - mv: Set file flags after setting file times List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eff68b69dfa234f757b370b46596f7c8d604e05d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eff68b69dfa234f757b370b46596f7c8d604e05d commit eff68b69dfa234f757b370b46596f7c8d604e05d Author: Ricardo Branco AuthorDate: 2024-03-16 17:13:10 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:20:16 +0000 mv: Set file flags after setting file times Some file flags prevent modification of file times, so they should be set later. This matches NetBSD's behaviour. Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1138 (cherry picked from commit 428f86fd2ff1fd2b073d556fac273c8c7f457376) --- bin/mv/mv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 1320f603b3c4..dba71f55e5dc 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -331,6 +331,12 @@ err: if (unlink(to)) */ preserve_fd_acls(from_fd, to_fd, from, to); (void)close(from_fd); + + ts[0] = sbp->st_atim; + ts[1] = sbp->st_mtim; + if (futimens(to_fd, ts)) + warn("%s: set times", to); + /* * XXX * NFS doesn't support chflags; ignore errors unless there's reason @@ -351,11 +357,6 @@ err: if (unlink(to)) } else warn("%s: cannot stat", to); - ts[0] = sbp->st_atim; - ts[1] = sbp->st_mtim; - if (futimens(to_fd, ts)) - warn("%s: set times", to); - if (close(to_fd)) { warn("%s", to); return (1); From nobody Thu Apr 25 13:20: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 4VQGh9084qz5Hj1S; Thu, 25 Apr 2024 13:20: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 4VQGh85yrcz3xs4; Thu, 25 Apr 2024 13:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gfZzblpp8cVtv7AWDHokM6vmRG6pXo9YBMAQP9MaQ0=; b=hbR9i8KIfR+OCH2ffcAab7esC3Nnb/YC/CZVutFUMI9S/Swzuc7tQUVLhO/RxcqCwzZEXJ 4/3IbRkIZQk0kszSR5vztGFV0yibsfhq9RDehtLjq/qopXcocjkxafjTWQlGRp+h11rR/j kNa21NmCZFYLUmBZ5gCvedWKOEuJ/CNa7S+LVkkhsvOi/vychQ0CA8nSXhTD9if8qxHozq XXPunPXGowpb+8Rx/IwA+QJnpOOzF37rqvvh9XLjFPJoZfaFLYdT/vVbGDpC8Msjlp+nVW o+0e/WgYGW6tP87XOij912ActPNC5Ywb8eVCaS4+Jdj0qxWZBK0uiRcER0m4Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714051256; a=rsa-sha256; cv=none; b=wXoqQzUeTg0JEJbiiPoV7+S+u0GC0rZ4FB8zCWtn5On9nTwtRU8alT0IyXtpaejbXJIcxD kRROoAO9WaoEdw9h1TDuOpn6t1Q0PpaTfumTFU5EGXJvkV+7u3vLyevjPzPDCH2pFH7Ge3 ljBcPyIkPb0en0Uyo6RC1OSs465X3Rz9E7feyGH0bnc8AZ3j8LZAe+iBtZ5196H3f5m5m2 kQFQAz1oFXNGauAtBboiYiCi6EJYbgDYW9PPJRXQI4Cq1/aSrRoZEhyT8mfaSz3Wi+aUOk RP01XNj9TDLFv//AFL0b4zSOuXmUgRQ0eiSoQ1EgSfyHEiiv/Xcy+77qoIjQJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3gfZzblpp8cVtv7AWDHokM6vmRG6pXo9YBMAQP9MaQ0=; b=K8TECUZ8vrFE4NY5dW3hWOIGOLehCu2bY4xxkKr0fKKJi/egh2l9p/QpHsxZJjbIlP8srW tknQpiU3EjMHux8FX6hO8QFKkjJErErDb/YD00QTKjpMfB06xLqiqmYWUecj+Hb+QhVvHx eO+ABx76p8RLie8dhbHNmMFwCwLI7uz3/lRl3477Asc6Kp4+AlDH4aFIXHTfBSZkkzoOV4 t8zUEihjpQlM4B2bgeZ0ZMUIS5Q/WfNWrBIN+83XgPv73EV2PS8wfxiH5YyWh4fGewVJUa XmHj+cQuCqpkb3w8R9lR4rBZcxJ0tNoSfZNVcP3U3Y3CtCHuvi1pue9WYVv82g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQGh85Zwsz11K2; Thu, 25 Apr 2024 13:20: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 43PDKuqb001782; Thu, 25 Apr 2024 13:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDKuQp001779; Thu, 25 Apr 2024 13:20:56 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:20:56 GMT Message-Id: <202404251320.43PDKuQp001779@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: 32004d854a2d - stable/14 - nfsserver: Rate-limit messages about requests from unprivileged ports List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 commit 32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 Author: Mark Johnston AuthorDate: 2024-04-17 14:36:58 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:20:16 +0000 nfsserver: Rate-limit messages about requests from unprivileged ports If access from unreserved ports is disabled, then a remote host can cause an NFS server to log a message by sending a packet. This is useful for diagnosing problems but bad for resiliency in the case where the server is being spammed with a large number of rejected requests. Limit prints to once per second (racily). Reviewed by: rmacklem, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44819 (cherry picked from commit b7e4666d7b69c22699a9299687018a892a5dad5b) --- sys/fs/nfsserver/nfs_nfsdkrpc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index 25f9c05d6f0b..022f7403d28b 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -191,6 +191,12 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) port = ntohs(sin->sin_port); if (port >= IPPORT_RESERVED && nd.nd_procnum != NFSPROC_NULL) { + static struct timeval privport_ratecheck = { + .tv_sec = 0, .tv_usec = 0 + }; + static const struct timeval privport_ratecheck_int = { + .tv_sec = 1, .tv_usec = 0 + }; #ifdef INET6 char buf[INET6_ADDRSTRLEN]; #else @@ -208,15 +214,19 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) (buf)) #endif #endif - printf("NFS request from unprivileged port (%s:%d)\n", + if (ratecheck(&privport_ratecheck, + &privport_ratecheck_int)) { + printf( + "NFS request from unprivileged port (%s:%d)\n", #ifdef INET6 - sin->sin_family == AF_INET6 ? - ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : + sin->sin_family == AF_INET6 ? + ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : #if defined(KLD_MODULE) #undef ip6_sprintf #endif #endif - inet_ntoa_r(sin->sin_addr, buf), port); + inet_ntoa_r(sin->sin_addr, buf), port); + } svcerr_weakauth(rqst); svc_freereq(rqst); m_freem(nd.nd_mrep); From nobody Thu Apr 25 13:20: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 4VQGhB55kdz5Hj1W; Thu, 25 Apr 2024 13:20: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 4VQGhB17vKz3xsD; Thu, 25 Apr 2024 13:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EpuYknRT/8Ru1LLwJIh/upaLGPeaaBzJq0cH9XzQWyE=; b=LzFgCJAdOBJO8ByCQrO7qy7Fr4n3MZP8V0jYJWpJhj99iCiYuBvx41Nm5miy/qt+hwutbz HqeqFskaPQr7N0SsQeGtxQC5DxtynI+yaoyS4GCqqOo2KmlBE2QnPToNS5o1vj8dp5ySo8 3D2eKsXd1tUZAM+AXcPMZNhFI81X5i70z3sPP7m8kdohgb1yGrR6qNQAR7rL5Xq+OYXM/S RPjk0nTpKs7X/80ltRMEo46dhn46HHnzmDmcInRSReMk2XyT2YBpgTpcx8eUl+eBJfCiKa eK+s7Bim1YRxZHRA8dN/1K0UCWJ+ERX0b7iqSMa6WqPPEzDf8N1y1EbW06yeog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714051258; a=rsa-sha256; cv=none; b=LyU2cM9ZLpBYg2itdcQ5mlJs7sdfHgmDCV/JsNTrYZi2DOIpLR6UCyU+7gOfuXMD7fMQSe VXhttJS89Ip5fjmMEm8A5CWsa7ob5zrbWFdpjHwX9fNQdVh+utjXvpzOTPxJZbAfFgledU AlgVvLUjZO7CUKOcbLPMvtpI6lMWnfevhoAaFg8n9cDc5Wtoj6/WTUKbSbhUtleijqFTas d5b1sHsVdlp+DWas6ISz473K4qWMS+Q3K4MM6owxdjpVZg3lKz8IG43CLPypwb2pwXOC5t bDA4M/XgNICifihNK8VR3sJ0Pg/WXmYVB0UczimWYdviRtrQZ5rNoiTla65AwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EpuYknRT/8Ru1LLwJIh/upaLGPeaaBzJq0cH9XzQWyE=; b=wyadnSGfbmrVmjiMomoHMq0N9n6hx+/buLWvDPfAR5WbrtrL2Nf8lBLCJAncpAe2G3OfVF HYz9fpdCwZyjxBsOERhGltqtqUS2vCTCihJNHx2qOjdeY/56zp4dpWkWBVMFZHUECfmGTL dO1DFm3g180YNL5ihoUU4KPl1Z76M51KefoQyt+4XqRzbXkHp0VSCtyGUBhtwfb7V22J7I rfsqpqeHkyBEJEKBdhX5uOcwURjZFPD0vYsmU+TPGOX9VE9QwaLQ8UCzlbWwnX9gZCiD90 mT9ym0J0GJCNXrQjZND99WX4CVDq22Xr2Zz/CJCFnt45gOJNFlOpa9FJW/agtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VQGh96bNPz11VF; Thu, 25 Apr 2024 13:20: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 43PDKvPf001831; Thu, 25 Apr 2024 13:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDKvPL001828; Thu, 25 Apr 2024 13:20:57 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:20:57 GMT Message-Id: <202404251320.43PDKvPL001828@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: a2eaf1cdd625 - stable/14 - dumpon: fix set but not used variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2eaf1cdd62576be5e29155e4f10eeb4593e2992 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a2eaf1cdd62576be5e29155e4f10eeb4593e2992 commit a2eaf1cdd62576be5e29155e4f10eeb4593e2992 Author: inkeliz AuthorDate: 2024-04-17 21:22:44 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:20:18 +0000 dumpon: fix set but not used variable Signed-off-by: inkeliz Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1178 (cherry picked from commit 464b1ab216d5f78054626524addf99f5c622da96) --- sbin/dumpon/dumpon.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index 81144e33bc71..eb890e250fbb 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -475,20 +475,23 @@ main(int argc, char *argv[]) struct diocskerneldump_arg ndconf, *kdap; struct addrinfo hints, *res; const char *dev, *pubkeyfile, *server, *client, *gateway; - int ch, error, fd, cipher; + int ch, error, fd; bool gzip, list, netdump, zstd, insert, rflag; uint8_t ins_idx; +#ifdef HAVE_CRYPTO + int cipher = KERNELDUMP_ENC_NONE; +#endif gzip = list = netdump = zstd = insert = rflag = false; kdap = NULL; pubkeyfile = NULL; server = client = gateway = NULL; ins_idx = KDA_APPEND; - cipher = KERNELDUMP_ENC_NONE; while ((ch = getopt(argc, argv, "C:c:g:i:k:lrs:vZz")) != -1) switch ((char)ch) { case 'C': +#ifdef HAVE_CRYPTO if (strcasecmp(optarg, "chacha") == 0 || strcasecmp(optarg, "chacha20") == 0) cipher = KERNELDUMP_ENC_CHACHA20; @@ -499,6 +502,11 @@ main(int argc, char *argv[]) errx(EX_USAGE, "Unrecognized cipher algorithm " "'%s'", optarg); break; +#else + errx(EX_USAGE, + "Built without crypto support, -C is unhandled."); + break; +#endif case 'c': client = optarg; break; From nobody Fri Apr 26 19:27: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 4VR2mc6Vrpz5J4fc; Fri, 26 Apr 2024 19:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VR2mc62rjz4584; Fri, 26 Apr 2024 19:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714159648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HZSQ6vNF2zE2YJr1ofc25jOWvchj0abwFeOXmcUFW0=; b=E304mLXwazFiE28TFNnGgm1tdn2XRg6wcgUUC7s0ziPxA/1vhZPJUV+mdxeBDGlE/RUCVy A+bvSqPVW8xDYuguIvUaRz1mxfMshkUa4LFFt1kjcsg4uMAL0eA3H88J2j+VTyYjePp2DI viN6uZ1d5YDEZJOa6j4q9wThjFY8Di9RSZV9L5gyKU8Efv0S2Seb7OG2eXVh1tfpIDb3u0 nxCH6NfFqIQkFkPZJf+HE0hgtI/rm7Hd+ed1GntplKuoVvMkCX/ux9WYAguGp47KYBD6gO e9InrKV1L17vwofzOml1v8AUO3cRhVWdzFoSjtGCnvTKIGcKsvuOZmWf0yBtjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714159648; a=rsa-sha256; cv=none; b=OVMxeHnifiWptlVfFzZN7Llf+jQBW17n8TAuUGZNkG9fC8DlZUhd6PrU3POXxRuyDImnYZ CMqYYMXYfo0NOt5KyAV9pqD01XWKi+KOR5pedSoLpv6rU2tCR314xMbEiW84zMLYLtxBvd 2tM/hCh6/rOIinNxlDn5h/mSVDJsR18HVTO5eNfCtp9KEE5h5hE0zWUMv3NHht+5YOLLt6 aETqGiK8BPCRDWDyUMt1s+PxuzShic6bCilZffHXWD1ogOH7RG1oOPv7O8YYYDV8Fhs589 qOW5gHkyx3c8piC9EaQS9Kz2ALOVlyexurm+Mg6ygAk/WymbFRueu6HNib6BBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714159648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HZSQ6vNF2zE2YJr1ofc25jOWvchj0abwFeOXmcUFW0=; b=d6awQIFvpBgRgtS5fAQssqGQe+7thCq56e6OZ05t/zWCtfXzHbJvLJ/KJUUy7T/bquH3fp 0QuoQEyR5L06pPslmHxA9tAypRIOTcvLIj/R9RjDMcmZGzI4DwG686tDRkmNCTry7q47XZ oVgtFFgm6H87vqRqPTUP48rwcwfRsmpW38+VPwpVzPBAOZHsbHPssu1ACw5hw4PlBeBFlL yD18noGE3fny7E9yQR+JMidRP9+mMZfPS5PwRu2uIc1xuq83AO37F+ya3UEE3kY4iHtxfV eBUS+I0PyJ1OLfGfSpkcCXIcWIQd6Mr9puBkhBSqjQ+ubVoGMpteuvyL9aasNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VR2mc5WQ5ztpw; Fri, 26 Apr 2024 19:27: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 43QJRS6D051995; Fri, 26 Apr 2024 19:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QJRSoK051992; Fri, 26 Apr 2024 19:27:28 GMT (envelope-from git) Date: Fri, 26 Apr 2024 19:27:28 GMT Message-Id: <202404261927.43QJRSoK051992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: d5ad60b75f47 - stable/14 - libgcc_s: expose __divmoddi4 on i386 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d5ad60b75f47feda1a8676f186030beab539df26 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ad60b75f47feda1a8676f186030beab539df26 commit d5ad60b75f47feda1a8676f186030beab539df26 Author: Brooks Davis AuthorDate: 2024-04-19 21:52:42 +0000 Commit: Brooks Davis CommitDate: 2024-04-26 18:30:42 +0000 libgcc_s: expose __divmoddi4 on i386 GCC has used this for some time (since 7.0) and apparently we were getting away with using the hidden symbol, but when linking with --no-undefined-version we get an error unless it's properly exported. (For anyone who wonders at the assymetry, __udivmoddi4 is indeed much older and was introduced with GCC 3.0.) MFC after: 3 days Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D44878 (cherry picked from commit 44e89340fe349abc020732958c6debd12b5adf2c) --- lib/libgcc_s/Symbol.map | 6 ++++++ lib/libgcc_s/Versions.def | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map index 2aa31ec34542..ea5baaef6645 100644 --- a/lib/libgcc_s/Symbol.map +++ b/lib/libgcc_s/Symbol.map @@ -180,3 +180,9 @@ GCC_4.6.0 { __trunctfxf2; __unordtf2; }; + +GCC_7.0.0 { +#ifdef __i386__ + __divmoddi4; +#endif +}; diff --git a/lib/libgcc_s/Versions.def b/lib/libgcc_s/Versions.def index d28e9042f744..526387e055df 100644 --- a/lib/libgcc_s/Versions.def +++ b/lib/libgcc_s/Versions.def @@ -31,3 +31,6 @@ GCC_4.3.0 { GCC_4.6.0 { } GCC_4.3.0; + +GCC_7.0.0 { +} GCC_4.6.0; From nobody Sat Apr 27 03:02: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 4VRDsZ0bhKz5HKx1; Sat, 27 Apr 2024 03:02: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 4VRDsZ04kzz4rLs; Sat, 27 Apr 2024 03:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsYTOPD5S2NWbQ0Q+9V39+oYOzclOPD6JVwboUXuJuk=; b=dL2BXWkZCRHkgC0a4NA36P7bfU96PmO7q2+oYNaLQqgc0jaYH3YqN2AJERdTeDPGgXSFG7 c8d9f9Bzid9B/2jTqOTgiBesVnbtaA8caNZErve1GaaKhaMukexH4B0gQzyx5oE4P8bC/W wWwfpchcO9v4s7VCfXHFBtaLZ++WDuj2n0M9k1dENGK8CKD7vcavrEutW+MKkvUU04sagB fQu/UcUQb+l4iHIi07pRnWkJHx4RAWCg1QJw1UhhHhWl3znx7X7+mTdKQe73WBbq2Bttzu ddQyFSZT2fJ8Vfx7SI00r3yPVSoPmxjxwJmpsX3Y38EnU6rWMix4yD8RAp6wxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714186946; a=rsa-sha256; cv=none; b=RMuvdeEbXyaUd8Vz+BQwh900LTS0CiS6LSdKKCL4OLpd36eTS1k29Ji3QbSk/8XEp9uDLQ 1IqiK918iWWD7nVl5mcBTNDrBgzQmTWpZRzX+f5ItXRHBz/vGYPdSyfX2k/3FCuy2vLe8X dL5kedH17XaV9zvriqNs34oVoI5qTq8T4jMnUPrZVeLz5rqmsWQywWpjeP+N+2wbyZzcx7 JIFs4NsdOc7qkAYU7E+ygimgP0Bo7WGFwCJfGF8fFgddcpaP77c8uVFb5eQsgevgRalByu gIcLynreqPziVcpa9U9kVhGlqbH8DS3XxSgjOx/Oq1wHRTWUPkGUFmpnaO0KxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsYTOPD5S2NWbQ0Q+9V39+oYOzclOPD6JVwboUXuJuk=; b=x+vl/uKUnJvTruFd+RMWIpalacbah4WWTRjhShC3Qq87ICJhYjUdBkweN17u93TfCLEfM1 NX2ia8ThXxnL/gGW5f9WLkjXTELPk4/Z0zUJEnqSOK9imNDzmxpXmwRk4Tk0u9YpkUGd4R RX9On57X6G2mJ0DVaO9HQdPXoQR2wVD+nnT29gFxVSyfIhaKrZjP/JzWGymincRakoELhU UyLdmiEhvPmsbiX7uBLUPaohvi/Kg7wUUZwAiiuWR27c7ADNG2VpbfxI6E560E8+yJun9O BsVYUyyR60wCxDg1/9nBPiPVYRhew1cNHsqpD3aHfHrGk4DRDx/8LZp0FA/z5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRDsY6nXgz1823; Sat, 27 Apr 2024 03:02: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 43R32PcU029898; Sat, 27 Apr 2024 03:02:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R32P0e029895; Sat, 27 Apr 2024 03:02:25 GMT (envelope-from git) Date: Sat, 27 Apr 2024 03:02:25 GMT Message-Id: <202404270302.43R32P0e029895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 75f1323c15cb - stable/14 - libpmc: Import AMD Zen 4 PMU events List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 75f1323c15cb95e55c0d55dcd468967857762815 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=75f1323c15cb95e55c0d55dcd468967857762815 commit 75f1323c15cb95e55c0d55dcd468967857762815 Author: Alexander Motin AuthorDate: 2024-04-20 15:54:04 +0000 Commit: Alexander Motin CommitDate: 2024-04-27 03:02:10 +0000 libpmc: Import AMD Zen 4 PMU events MFC after: 1 week (cherry picked from commit 278d6950943a9fec2bddb037b547c04a847c54ba) --- lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json | 82 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json | 828 +++++++++++++++ lib/libpmc/pmu-events/arch/x86/amdzen4/core.json | 122 +++ .../pmu-events/arch/x86/amdzen4/data-fabric.json | 1090 ++++++++++++++++++++ .../arch/x86/amdzen4/floating-point.json | 818 +++++++++++++++ .../arch/x86/amdzen4/memory-controller.json | 101 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/memory.json | 174 ++++ lib/libpmc/pmu-events/arch/x86/amdzen4/other.json | 138 +++ .../pmu-events/arch/x86/amdzen4/pipeline.json | 98 ++ .../pmu-events/arch/x86/amdzen4/recommended.json | 418 ++++++++ lib/libpmc/pmu-events/arch/x86/mapfile.csv | 3 +- 11 files changed, 3871 insertions(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json new file mode 100644 index 000000000000..208c646c59ca --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json @@ -0,0 +1,82 @@ +[ + { + "EventName": "bp_l2_btb_correct", + "EventCode": "0x8b", + "BriefDescription": "L2 branch prediction overrides existing prediction (speculative)." + }, + { + "EventName": "bp_dyn_ind_pred", + "EventCode": "0x8e", + "BriefDescription": "Dynamic indirect predictions (branch used the indirect predictor to make a prediction)." + }, + { + "EventName": "bp_de_redirect", + "EventCode": "0x91", + "BriefDescription": "Instruction decoder corrects the predicted target and resteers the branch predictor." + }, + { + "EventName": "ex_ret_brn", + "EventCode": "0xc2", + "BriefDescription": "Retired branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_misp", + "EventCode": "0xc3", + "BriefDescription": "Retired branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_tkn", + "EventCode": "0xc4", + "BriefDescription": "Retired taken branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_tkn_misp", + "EventCode": "0xc5", + "BriefDescription": "Retired taken branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_far", + "EventCode": "0xc6", + "BriefDescription": "Retired far control transfers (far call/jump/return, IRET, SYSCALL and SYSRET, plus exceptions and interrupts). Far control transfers are not subject to branch prediction." + }, + { + "EventName": "ex_ret_near_ret", + "EventCode": "0xc8", + "BriefDescription": "Retired near returns (RET or RET Iw)." + }, + { + "EventName": "ex_ret_near_ret_mispred", + "EventCode": "0xc9", + "BriefDescription": "Retired near returns mispredicted. Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_brn_ind_misp", + "EventCode": "0xca", + "BriefDescription": "Retired indirect branch instructions mispredicted (only EX mispredicts). Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_ind_brch_instr", + "EventCode": "0xcc", + "BriefDescription": "Retired indirect branch instructions." + }, + { + "EventName": "ex_ret_cond", + "EventCode": "0xd1", + "BriefDescription": "Retired conditional branch instructions." + }, + { + "EventName": "ex_ret_msprd_brnch_instr_dir_msmtch", + "EventCode": "0x1c7", + "BriefDescription": "Retired branch instructions mispredicted due to direction mismatch." + }, + { + "EventName": "ex_ret_uncond_brnch_instr_mispred", + "EventCode": "0x1c8", + "BriefDescription": "Retired unconditional indirect branch instructions mispredicted." + }, + { + "EventName": "ex_ret_uncond_brnch_instr", + "EventCode": "0x1c9", + "BriefDescription": "Retired unconditional branch instructions." + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json new file mode 100644 index 000000000000..e6d710cf3ce2 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json @@ -0,0 +1,828 @@ +[ + { + "EventName": "ls_mab_alloc.load_store_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for load-store allocations.", + "UMask": "0x3f" + }, + { + "EventName": "ls_mab_alloc.hardware_prefetcher_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for hardware prefetcher allocations.", + "UMask": "0x40" + }, + { + "EventName": "ls_mab_alloc.all_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for all types of allocations.", + "UMask": "0x7f" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_l2", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_ccx", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_dmnd_fills_from_sys.near_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_near", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_dmnd_fills_from_sys.far_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_far", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_dmnd_fills_from_sys.alternate_memories", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_dmnd_fills_from_sys.all", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_any_fills_from_sys.local_l2", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_any_fills_from_sys.local_ccx", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_any_fills_from_sys.local_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache or L3 cache or different L2 cache in the same CCX.", + "UMask": "0x03" + }, + { + "EventName": "ls_any_fills_from_sys.near_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_near", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_any_fills_from_sys.far_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_any_fills_from_sys.remote_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same or a different NUMA node.", + "UMask": "0x14" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_far", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.far_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either cache of another CCX, DRAM or MMIO when the address was in a different NUMA node (same or different socket).", + "UMask": "0x50" + }, + { + "EventName": "ls_any_fills_from_sys.all_dram_io", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.alternate_memories", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_any_fills_from_sys.all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_pref_instr_disp.prefetch", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchT0 (move data to all cache levels), T1 (move data to all cache levels except L1) and T2 (move data to all cache levels except L1 and L2).", + "UMask": "0x01" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_w", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchW (move data to L1 cache and mark it modifiable).", + "UMask": "0x02" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_nta", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchNTA (move data with minimum cache pollution i.e. non-temporal access).", + "UMask": "0x04" + }, + { + "EventName": "ls_pref_instr_disp.all", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of all types.", + "UMask": "0x07" + }, + { + "EventName": "ls_inef_sw_pref.data_pipe_sw_pf_dc_hit", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a data cache hit.", + "UMask": "0x01" + }, + { + "EventName": "ls_inef_sw_pref.mab_mch_cnt", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a match on an already allocated Miss Address Buffer (MAB).", + "UMask": "0x02" + }, + { + "EventName": "ls_inef_sw_pref.all", + "EventCode": "0x52", + "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "UMask": "0x03" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_l2", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_ccx", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_sw_pf_dc_fills.near_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_near", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_sw_pf_dc_fills.far_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_far", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_sw_pf_dc_fills.alternate_memories", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_sw_pf_dc_fills.all", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_l2", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_ccx", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_hw_pf_dc_fills.near_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_near", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_hw_pf_dc_fills.far_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_far", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_hw_pf_dc_fills.alternate_memories", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_hw_pf_dc_fills.all", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_alloc_mab_count", + "EventCode": "0x5f", + "BriefDescription": "In-flight L1 data cache misses i.e. Miss Address Buffer (MAB) allocations each cycle." + }, + { + "EventName": "l2_request_g1.group2", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of non-cacheable type (non-cached data and instructions reads, self-modifying code checks).", + "UMask": "0x01" + }, + { + "EventName": "l2_request_g1.l2_hw_pf", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: from hardware prefetchers to prefetch directly into L2 (hit or miss).", + "UMask": "0x02" + }, + { + "EventName": "l2_request_g1.prefetch_l2_cmd", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: prefetch directly into L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_request_g1.change_to_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache state change to writable, check L2 for current state.", + "UMask": "0x08" + }, + { + "EventName": "l2_request_g1.cacheable_ic_read", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: instruction cache reads.", + "UMask": "0x10" + }, + { + "EventName": "l2_request_g1.ls_rd_blk_c_s", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache shared reads.", + "UMask": "0x20" + }, + { + "EventName": "l2_request_g1.rd_blk_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache stores.", + "UMask": "0x40" + }, + { + "EventName": "l2_request_g1.rd_blk_l", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache reads including hardware and software prefetch.", + "UMask": "0x80" + }, + { + "EventName": "l2_request_g1.all_dc", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types from L1 data cache (including prefetches).", + "UMask": "0xe8" + }, + { + "EventName": "l2_request_g1.all_no_prefetch", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types not including prefetches.", + "UMask": "0xf9" + }, + { + "EventName": "l2_request_g1.all", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_miss", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache request miss in L2.", + "UMask": "0x01" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit non-modifiable line in L2.", + "UMask": "0x02" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit modifiable line in L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_cache_req_stat.ic_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache hits.", + "UMask": "0x06" + }, + { + "EventName": "l2_cache_req_stat.ic_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache access.", + "UMask": "0x07" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_c", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache request miss in L2.", + "UMask": "0x08" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_miss_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache misses.", + "UMask": "0x09" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache store or state change hit in L2.", + "UMask": "0x10" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit non-modifiable line in L2.", + "UMask": "0x20" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit modifiable line in L2.", + "UMask": "0x40" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_cs", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache shared read hit in L2.", + "UMask": "0x80" + }, + { + "EventName": "l2_cache_req_stat.dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache hits.", + "UMask": "0xf0" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache hits.", + "UMask": "0xf6" + }, + { + "EventName": "l2_cache_req_stat.dc_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache access.", + "UMask": "0xf8" + }, + { + "EventName": "l2_cache_req_stat.all", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache access.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_hit_l2.l2_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_hit_l2.l2_next_line", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_hit_l2.l2_up_down", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_hit_l2.l2_burst", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_hit_l2.l2_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stride (fetch additional lines into L2 cache when each access is at a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_hit_l2.l1_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_hit_l2.l1_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_hit_l2.l1_region", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_hit_l2.all", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_next_line", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_up_down", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_burst", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_region", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.all", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_next_line", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_up_down", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_burst", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_region", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_l3.all", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of all types.", + "UMask": "0xff" + }, + { + "EventName": "ic_cache_fill_l2", + "EventCode": "0x82", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from the L2 cache." + }, + { + "EventName": "ic_cache_fill_sys", + "EventCode": "0x83", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from system memory or another cache." + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_hit", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache hits.", + "UMask": "0x07" + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_miss", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache misses.", + "UMask": "0x18" + }, + { + "EventName": "ic_tag_hit_miss.all_instruction_cache_accesses", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache accesses of all types.", + "UMask": "0x1f" + }, + { + "EventName": "op_cache_hit_miss.op_cache_hit", + "EventCode": "0x28f", + "BriefDescription": "Op cache hits.", + "UMask": "0x03" + }, + { + "EventName": "op_cache_hit_miss.op_cache_miss", + "EventCode": "0x28f", + "BriefDescription": "Op cache misses.", + "UMask": "0x04" + }, + { + "EventName": "op_cache_hit_miss.all_op_cache_accesses", + "EventCode": "0x28f", + "BriefDescription": "Op cache accesses of all types.", + "UMask": "0x07" + }, + { + "EventName": "l3_lookup_state.l3_miss", + "EventCode": "0x04", + "BriefDescription": "L3 cache misses.", + "UMask": "0x01", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.l3_hit", + "EventCode": "0x04", + "BriefDescription": "L3 cache hits.", + "UMask": "0xfe", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.all_coherent_accesses_to_l3", + "EventCode": "0x04", + "BriefDescription": "L3 cache requests for all coherent accesses.", + "UMask": "0xff", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.near_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.far_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.all", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.near_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.far_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.all", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json new file mode 100644 index 000000000000..a56a41828bd4 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json @@ -0,0 +1,122 @@ +[ + { + "EventName": "ls_locks.bus_lock", + "EventCode": "0x25", + "BriefDescription": "Retired Lock instructions which caused a bus lock.", + "UMask": "0x01" + }, + { + "EventName": "ls_ret_cl_flush", + "EventCode": "0x26", + "BriefDescription": "Retired CLFLUSH instructions." + }, + { + "EventName": "ls_ret_cpuid", + "EventCode": "0x27", + "BriefDescription": "Retired CPUID instructions." + }, + { + "EventName": "ls_smi_rx", + "EventCode": "0x2b", + "BriefDescription": "SMIs received." + }, + { + "EventName": "ls_int_taken", + "EventCode": "0x2c", + "BriefDescription": "Interrupts taken." + }, + { + "EventName": "ls_not_halted_cyc", *** 2984 LINES SKIPPED *** From nobody Sat Apr 27 03:02: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 4VRDtB6wzcz5HKjl; Sat, 27 Apr 2024 03:02: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 4VRDtB50fCz4rpM; Sat, 27 Apr 2024 03:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HlYoHbBwMMKsYdXMFMEfGuj/zjbckmzwDjg6+JbXlI8=; b=yUN1JGYx+RJPkBfgZ2O5yAVSFsXtrPSdimZXCZD+TTgEcvNX3Qt3Yw5OnnU/Rw/8UMlwXj MxVwvviAeAt2amE9lG3QkHmRlMfhD/P/B1cYJ/nfLfzWS7dWjWghY/1vkJn+lBPXwmN8oW QC6LOqbhWdGXaiMTtYvjzlbP6cmfC4SU9/+8Y53b8Lx3NZljgZgAOeptsdI8yJvTl7iPaK 5N5X44QS0SR7m7mNXWYieE9zF/nMd6rWXNf5xHGXRkDrk32Pye2sZqUB0cQ8l7arI8GRvJ b8Va3wgDt8U3u19mY/cQk4KBki3n5eckoKtBbajikhOoE+vqYFd/B2sJZVwsRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714186978; a=rsa-sha256; cv=none; b=rTjzLDXKHh09IO8Ss5gzipt8pyMI5lOFFjaUhRTbIF/x4IrxATfUqE7e0qj0buWUYeG5fN shKJn8t3ntnvjdXbjQ6Mv5ho54RXYA2I/5zqhWcWRpaV4aAj2dtJnIyS8ZS4mwnlh0Ir0k +pqAcbIl4uZYopXVimftP5ToJrlqKV+/sN+ROtYLWMsqQ8rLeNoU3+EEdVPygHP/D/MNdP fNAKDyiX9JcWo1LIZws5CPB5d75y/n9WglNkFJyrk2ilfQ/zcQ1LCqPb3dFOkFwyEWP7sp zJjvGNruThI1W0dOPLh6ybZV5ldFgR8qEGWu+sS7Kb+s1KuZ+mlu785eMI7mpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714186978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HlYoHbBwMMKsYdXMFMEfGuj/zjbckmzwDjg6+JbXlI8=; b=OUHlEBxORsKOsVzwmYHiiU+67PhLVoFvjBTQg9Wq2IKbGPqq5X4C+j3/OWl4Ey+opbPTGS E1ReJgP8QHuI5J6SsiXjltde6OaHufu1BYHpNgLajQkZSo0lDuAsKWDHvZI8TU6jRc2ZZe mEgVQvV+VabAvGb6Vn//enLmUfLJaRORAF1EKx9OR6ZJD2R3bkPIV9UwSNAtje5hD1Y1Y1 pBNKpIBD1U9Z4jo1KQTaFE05TVt1dA/ZviiZ9ZCh9yCFl+ZReQEDFAokzWHjZWqzCoewhb aJtdVmaYAgqzhWnVDXawp8ClWzYg/63/UlJvKBkzoDx5JHKq409daKCQFRA1Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRDtB4bhNz18GN; Sat, 27 Apr 2024 03:02: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 43R32wV9030934; Sat, 27 Apr 2024 03:02:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R32wJC030931; Sat, 27 Apr 2024 03:02:58 GMT (envelope-from git) Date: Sat, 27 Apr 2024 03:02:58 GMT Message-Id: <202404270302.43R32wJC030931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: a36b9f244287 - stable/13 - libpmc: Import AMD Zen 4 PMU events List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a36b9f2442875961a3dd85a9808c594b0cf6137f Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a36b9f2442875961a3dd85a9808c594b0cf6137f commit a36b9f2442875961a3dd85a9808c594b0cf6137f Author: Alexander Motin AuthorDate: 2024-04-20 15:54:04 +0000 Commit: Alexander Motin CommitDate: 2024-04-27 03:02:51 +0000 libpmc: Import AMD Zen 4 PMU events MFC after: 1 week (cherry picked from commit 278d6950943a9fec2bddb037b547c04a847c54ba) --- lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json | 82 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json | 828 +++++++++++++++ lib/libpmc/pmu-events/arch/x86/amdzen4/core.json | 122 +++ .../pmu-events/arch/x86/amdzen4/data-fabric.json | 1090 ++++++++++++++++++++ .../arch/x86/amdzen4/floating-point.json | 818 +++++++++++++++ .../arch/x86/amdzen4/memory-controller.json | 101 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/memory.json | 174 ++++ lib/libpmc/pmu-events/arch/x86/amdzen4/other.json | 138 +++ .../pmu-events/arch/x86/amdzen4/pipeline.json | 98 ++ .../pmu-events/arch/x86/amdzen4/recommended.json | 418 ++++++++ lib/libpmc/pmu-events/arch/x86/mapfile.csv | 3 +- 11 files changed, 3871 insertions(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json new file mode 100644 index 000000000000..208c646c59ca --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json @@ -0,0 +1,82 @@ +[ + { + "EventName": "bp_l2_btb_correct", + "EventCode": "0x8b", + "BriefDescription": "L2 branch prediction overrides existing prediction (speculative)." + }, + { + "EventName": "bp_dyn_ind_pred", + "EventCode": "0x8e", + "BriefDescription": "Dynamic indirect predictions (branch used the indirect predictor to make a prediction)." + }, + { + "EventName": "bp_de_redirect", + "EventCode": "0x91", + "BriefDescription": "Instruction decoder corrects the predicted target and resteers the branch predictor." + }, + { + "EventName": "ex_ret_brn", + "EventCode": "0xc2", + "BriefDescription": "Retired branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_misp", + "EventCode": "0xc3", + "BriefDescription": "Retired branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_tkn", + "EventCode": "0xc4", + "BriefDescription": "Retired taken branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_tkn_misp", + "EventCode": "0xc5", + "BriefDescription": "Retired taken branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_far", + "EventCode": "0xc6", + "BriefDescription": "Retired far control transfers (far call/jump/return, IRET, SYSCALL and SYSRET, plus exceptions and interrupts). Far control transfers are not subject to branch prediction." + }, + { + "EventName": "ex_ret_near_ret", + "EventCode": "0xc8", + "BriefDescription": "Retired near returns (RET or RET Iw)." + }, + { + "EventName": "ex_ret_near_ret_mispred", + "EventCode": "0xc9", + "BriefDescription": "Retired near returns mispredicted. Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_brn_ind_misp", + "EventCode": "0xca", + "BriefDescription": "Retired indirect branch instructions mispredicted (only EX mispredicts). Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_ind_brch_instr", + "EventCode": "0xcc", + "BriefDescription": "Retired indirect branch instructions." + }, + { + "EventName": "ex_ret_cond", + "EventCode": "0xd1", + "BriefDescription": "Retired conditional branch instructions." + }, + { + "EventName": "ex_ret_msprd_brnch_instr_dir_msmtch", + "EventCode": "0x1c7", + "BriefDescription": "Retired branch instructions mispredicted due to direction mismatch." + }, + { + "EventName": "ex_ret_uncond_brnch_instr_mispred", + "EventCode": "0x1c8", + "BriefDescription": "Retired unconditional indirect branch instructions mispredicted." + }, + { + "EventName": "ex_ret_uncond_brnch_instr", + "EventCode": "0x1c9", + "BriefDescription": "Retired unconditional branch instructions." + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json new file mode 100644 index 000000000000..e6d710cf3ce2 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json @@ -0,0 +1,828 @@ +[ + { + "EventName": "ls_mab_alloc.load_store_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for load-store allocations.", + "UMask": "0x3f" + }, + { + "EventName": "ls_mab_alloc.hardware_prefetcher_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for hardware prefetcher allocations.", + "UMask": "0x40" + }, + { + "EventName": "ls_mab_alloc.all_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for all types of allocations.", + "UMask": "0x7f" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_l2", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_ccx", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_dmnd_fills_from_sys.near_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_near", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_dmnd_fills_from_sys.far_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_far", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_dmnd_fills_from_sys.alternate_memories", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_dmnd_fills_from_sys.all", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_any_fills_from_sys.local_l2", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_any_fills_from_sys.local_ccx", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_any_fills_from_sys.local_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache or L3 cache or different L2 cache in the same CCX.", + "UMask": "0x03" + }, + { + "EventName": "ls_any_fills_from_sys.near_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_near", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_any_fills_from_sys.far_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_any_fills_from_sys.remote_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same or a different NUMA node.", + "UMask": "0x14" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_far", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.far_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either cache of another CCX, DRAM or MMIO when the address was in a different NUMA node (same or different socket).", + "UMask": "0x50" + }, + { + "EventName": "ls_any_fills_from_sys.all_dram_io", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.alternate_memories", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_any_fills_from_sys.all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_pref_instr_disp.prefetch", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchT0 (move data to all cache levels), T1 (move data to all cache levels except L1) and T2 (move data to all cache levels except L1 and L2).", + "UMask": "0x01" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_w", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchW (move data to L1 cache and mark it modifiable).", + "UMask": "0x02" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_nta", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchNTA (move data with minimum cache pollution i.e. non-temporal access).", + "UMask": "0x04" + }, + { + "EventName": "ls_pref_instr_disp.all", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of all types.", + "UMask": "0x07" + }, + { + "EventName": "ls_inef_sw_pref.data_pipe_sw_pf_dc_hit", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a data cache hit.", + "UMask": "0x01" + }, + { + "EventName": "ls_inef_sw_pref.mab_mch_cnt", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a match on an already allocated Miss Address Buffer (MAB).", + "UMask": "0x02" + }, + { + "EventName": "ls_inef_sw_pref.all", + "EventCode": "0x52", + "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "UMask": "0x03" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_l2", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_ccx", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_sw_pf_dc_fills.near_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_near", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_sw_pf_dc_fills.far_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_far", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_sw_pf_dc_fills.alternate_memories", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_sw_pf_dc_fills.all", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_l2", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_ccx", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_hw_pf_dc_fills.near_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_near", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_hw_pf_dc_fills.far_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_far", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_hw_pf_dc_fills.alternate_memories", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_hw_pf_dc_fills.all", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_alloc_mab_count", + "EventCode": "0x5f", + "BriefDescription": "In-flight L1 data cache misses i.e. Miss Address Buffer (MAB) allocations each cycle." + }, + { + "EventName": "l2_request_g1.group2", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of non-cacheable type (non-cached data and instructions reads, self-modifying code checks).", + "UMask": "0x01" + }, + { + "EventName": "l2_request_g1.l2_hw_pf", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: from hardware prefetchers to prefetch directly into L2 (hit or miss).", + "UMask": "0x02" + }, + { + "EventName": "l2_request_g1.prefetch_l2_cmd", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: prefetch directly into L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_request_g1.change_to_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache state change to writable, check L2 for current state.", + "UMask": "0x08" + }, + { + "EventName": "l2_request_g1.cacheable_ic_read", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: instruction cache reads.", + "UMask": "0x10" + }, + { + "EventName": "l2_request_g1.ls_rd_blk_c_s", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache shared reads.", + "UMask": "0x20" + }, + { + "EventName": "l2_request_g1.rd_blk_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache stores.", + "UMask": "0x40" + }, + { + "EventName": "l2_request_g1.rd_blk_l", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache reads including hardware and software prefetch.", + "UMask": "0x80" + }, + { + "EventName": "l2_request_g1.all_dc", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types from L1 data cache (including prefetches).", + "UMask": "0xe8" + }, + { + "EventName": "l2_request_g1.all_no_prefetch", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types not including prefetches.", + "UMask": "0xf9" + }, + { + "EventName": "l2_request_g1.all", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_miss", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache request miss in L2.", + "UMask": "0x01" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit non-modifiable line in L2.", + "UMask": "0x02" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit modifiable line in L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_cache_req_stat.ic_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache hits.", + "UMask": "0x06" + }, + { + "EventName": "l2_cache_req_stat.ic_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache access.", + "UMask": "0x07" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_c", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache request miss in L2.", + "UMask": "0x08" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_miss_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache misses.", + "UMask": "0x09" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache store or state change hit in L2.", + "UMask": "0x10" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit non-modifiable line in L2.", + "UMask": "0x20" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit modifiable line in L2.", + "UMask": "0x40" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_cs", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache shared read hit in L2.", + "UMask": "0x80" + }, + { + "EventName": "l2_cache_req_stat.dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache hits.", + "UMask": "0xf0" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache hits.", + "UMask": "0xf6" + }, + { + "EventName": "l2_cache_req_stat.dc_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache access.", + "UMask": "0xf8" + }, + { + "EventName": "l2_cache_req_stat.all", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache access.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_hit_l2.l2_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_hit_l2.l2_next_line", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_hit_l2.l2_up_down", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_hit_l2.l2_burst", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_hit_l2.l2_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stride (fetch additional lines into L2 cache when each access is at a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_hit_l2.l1_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_hit_l2.l1_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_hit_l2.l1_region", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_hit_l2.all", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_next_line", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_up_down", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_burst", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_region", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.all", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_next_line", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_up_down", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_burst", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_region", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_l3.all", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of all types.", + "UMask": "0xff" + }, + { + "EventName": "ic_cache_fill_l2", + "EventCode": "0x82", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from the L2 cache." + }, + { + "EventName": "ic_cache_fill_sys", + "EventCode": "0x83", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from system memory or another cache." + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_hit", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache hits.", + "UMask": "0x07" + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_miss", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache misses.", + "UMask": "0x18" + }, + { + "EventName": "ic_tag_hit_miss.all_instruction_cache_accesses", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache accesses of all types.", + "UMask": "0x1f" + }, + { + "EventName": "op_cache_hit_miss.op_cache_hit", + "EventCode": "0x28f", + "BriefDescription": "Op cache hits.", + "UMask": "0x03" + }, + { + "EventName": "op_cache_hit_miss.op_cache_miss", + "EventCode": "0x28f", + "BriefDescription": "Op cache misses.", + "UMask": "0x04" + }, + { + "EventName": "op_cache_hit_miss.all_op_cache_accesses", + "EventCode": "0x28f", + "BriefDescription": "Op cache accesses of all types.", + "UMask": "0x07" + }, + { + "EventName": "l3_lookup_state.l3_miss", + "EventCode": "0x04", + "BriefDescription": "L3 cache misses.", + "UMask": "0x01", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.l3_hit", + "EventCode": "0x04", + "BriefDescription": "L3 cache hits.", + "UMask": "0xfe", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.all_coherent_accesses_to_l3", + "EventCode": "0x04", + "BriefDescription": "L3 cache requests for all coherent accesses.", + "UMask": "0xff", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.near_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.far_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.all", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.near_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.far_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.all", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json new file mode 100644 index 000000000000..a56a41828bd4 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json @@ -0,0 +1,122 @@ +[ + { + "EventName": "ls_locks.bus_lock", + "EventCode": "0x25", + "BriefDescription": "Retired Lock instructions which caused a bus lock.", + "UMask": "0x01" + }, + { + "EventName": "ls_ret_cl_flush", + "EventCode": "0x26", + "BriefDescription": "Retired CLFLUSH instructions." + }, + { + "EventName": "ls_ret_cpuid", + "EventCode": "0x27", + "BriefDescription": "Retired CPUID instructions." + }, + { + "EventName": "ls_smi_rx", + "EventCode": "0x2b", + "BriefDescription": "SMIs received." + }, + { + "EventName": "ls_int_taken", + "EventCode": "0x2c", + "BriefDescription": "Interrupts taken." + }, + { + "EventName": "ls_not_halted_cyc", *** 2984 LINES SKIPPED *** From nobody Sat Apr 27 05:49: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 4VRJZw1MZZz5HrxS; Sat, 27 Apr 2024 05:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRJZw0hTGz58t0; Sat, 27 Apr 2024 05:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvLPDSkKxok/u+hjIco5SwUCioVwKdAtKD91mjBchP0=; b=bmATsT/eLrrJ73+7aDRmoetJr+v0gKopLO9nm8k0kdqMYCbEAiG21W7YPJurWYcmiSYiI4 I9bscOfIoF7TZJPbpHYOfe/oie5bpZqD3TXZQUtu7vIxnJIdegCSnd/zBKP+YGHWIeE3jg NU7nS3hWedXdGITGi6T5e8Xdr/TKKC6AmevPeu5OOFdUJWX+CNw6DSZ4tJydzaVEkBtGA/ rtNaaXBhj8DHQJq10US8LKDfLN6z5JdMHyG61ZbhonFEe7wCRXhrLm7ba4lt1qUL37/4/2 W7h7IRJ8ceyvWlBEFfHPYtA/8zvxwEC6As7/NBFMGfvjWOVm/55ZJRxvZ86W6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197000; a=rsa-sha256; cv=none; b=tkzwr2lmVmXKWQvhgTDhiKgjaFg/r/Bc6hARXNSlqM89QrVL0+bFhs5ECx7Y52lWoM4TQX +elUFJIcpBaYmIgCWumnplE3F12TLMxX+/xXa5Bc9hZlgkXdTCsYBXOCVfSw/EVCVdrADq 0pyhJA/2jrRUKRoqTbBAKehI7Ng2vuezZf5HVLghuQR/Mht367AMQRAOHVf2PNnq3UcRdY NIJQ+zBQwma9W+JXSk0GdJNhYpUzPzoGfOuNJwaHluA94XXjyWP4KstcCNrkmiYP17Lx6G BwT6psq1b7SAXjBgwdHm77IhPwpOny2nn5jyiM2Q4dac5+RkixMHEQCFXdhqOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvLPDSkKxok/u+hjIco5SwUCioVwKdAtKD91mjBchP0=; b=Y5oKIzzIaYM4FKFzi9/hJ435jy1p77guCiOUIGU06eLKAi64ySgT279//4wN0cDLPI5vA/ EgbKNFJxanjDHxUoteu72/NvmkIsc5THMXHm7SvKwzXJWMnTUK6m14kvYOQpLX59NSVAKH cK7OgV7+QukpTcDI9q2lHx72FO6UXR/+aa3YbWAdKYN318Z4iKKGFrbcGI7bZptO9hGTg/ dQrfWc3FkqaHBA5/woRBaFbaAt/dKV+JEgzEzRTzUtQigxZFIM/4Fy2w88iPnoH2VjRpHO 2h6XuUMRRXD30yuoYh4clEmGZ2BTR9YU7QoyOmgIS0bn9H/I5KIC46MFidYtEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJZw02pXzFDC; Sat, 27 Apr 2024 05:50: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 43R5nxqB000431; Sat, 27 Apr 2024 05:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5nxBt000428; Sat, 27 Apr 2024 05:49:59 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:49:59 GMT Message-Id: <202404270549.43R5nxBt000428@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: 8ca6066eb00f - stable/14 - i386: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ca6066eb00f8f03fe16ba041bd9827bf61c3939 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8ca6066eb00f8f03fe16ba041bd9827bf61c3939 commit 8ca6066eb00f8f03fe16ba041bd9827bf61c3939 Author: Gordon Bergling AuthorDate: 2024-04-20 12:13:33 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:49:27 +0000 i386: Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit e6c45f377d5b3bc28fc51a67c40dfa45c2087895) --- sys/i386/include/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index dae829b2c0f6..5aca9fb15181 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -91,7 +91,7 @@ __mbu(void) */ /* - * Always use lock prefixes. The result is slighly less optimal for + * Always use lock prefixes. The result is slightly less optimal for * UP systems, but it matters less now, and sometimes UP is emulated * over SMP. * From nobody Sat Apr 27 05:50: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 4VRJZx3DRdz5Hs80; Sat, 27 Apr 2024 05:50: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 4VRJZx20j4z58fB; Sat, 27 Apr 2024 05:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Puni1LfPYw0YlHxGjt0GkIDidEmsz6510fvcfwXfb0=; b=MH80dxLa/VTWDQO/E1LBbQaRYkRqL3IwZRnfVIxJH22BE60TaZ8470nDhQDZwYvs8qLO/m /dwrLZSPCtsYrtqZqDGeajSgUJ+v1Mc1sGdWbNfHIwHWKWvX/vQ2U9P18FvVPEvd7pFMGV lY0vXxDhmInYveya4xSStjWsyCEsxvJaMATJXJhbvlNvkkgm98oMm9UjtnglqJOEEm0Lg1 pUhIWvxZk73gOMHILKmsRXRSqMbczIYux7zHRBDuzNkaOfWoLK45qdJ61Ogx10g/4Zi8ho r7AI/FKcoxGSLAXkkSmcc6VmXA5ST3ODr0XvHU0bOYRsZQsQqi6ejTNS3ziInA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197001; a=rsa-sha256; cv=none; b=v+oy7/FFHb6mY9JcIVkOXjKzYZfC1ZiOWE8VQwu9oiIG/sxOxUprmtj/+DPCnETAAQaL1J rAP4qZ1uw3LxN/QKf8QHETMlZgm1BHbPASCJhH+PeuMDeN4/Bho49C0JjQGziLUKChG28s pJ7EQvKeR9l00eWtr0MfwWclTj2p3J1uPienzpsmH0a4RBAR+/8Ze2US6OGQlv7SvKFmNz KIf260FDQoI2MhaK7XH8rVk9w8hu7tej1W5s6S0RNC+eeW1UKOVVhALGhr8aCtVODqrI+N FbPoETd8Urr7QsoYzuGBFA1OWTAdWbRIPo880q80nfhIwo99keC+2v3SLuCJdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Puni1LfPYw0YlHxGjt0GkIDidEmsz6510fvcfwXfb0=; b=tp0FQQK29+ROk1iNfhgepB2hlTUNyJkAP01PbE5Elx4hzhIUG0PYLD1fHz5yRrZ0KLdJGf d1rH91cVbT7qsV5QGySB5E/N3bBxnd8MlYkxTklDrFAoHUAhKQnWvW+PRWAyJhB5goQAGr /W95wo5/S2hgvMaiBoraDCmARsUnm00GgV+kwtn0i9284m2vfgBr9WGa6TFTjHfeolw4OL HQxMaNQUbHyClMuhWJGs5ZwMayH1Nmkd0tg3qtx4haHB4i3wyyVKwcz0DHqmsaFw1gVQon 1PMKJDCe19YR9+LGsnwk0A6Oyi7VG9wiXw27ZHTvsCgyvxKNMfGmo+DqDW0mmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJZx0bVZz1CsG; Sat, 27 Apr 2024 05:50: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 43R5o03p002200; Sat, 27 Apr 2024 05:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5o0gp002179; Sat, 27 Apr 2024 05:50:00 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:50:00 GMT Message-Id: <202404270550.43R5o0gp002179@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: 4f8ee76d2a33 - stable/14 - ds1307(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f8ee76d2a33ad09e5bf4453f3700e66e3947cec Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4f8ee76d2a33ad09e5bf4453f3700e66e3947cec commit 4f8ee76d2a33ad09e5bf4453f3700e66e3947cec Author: Gordon Bergling AuthorDate: 2024-04-20 12:14:21 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:49:47 +0000 ds1307(4): Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit fa3b320668ba6068014337bbbb05dbd39ac8dfb6) --- sys/dev/iicbus/rtc/ds1307.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/rtc/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c index cc232bae0e94..7c9d006b2146 100644 --- a/sys/dev/iicbus/rtc/ds1307.c +++ b/sys/dev/iicbus/rtc/ds1307.c @@ -471,7 +471,7 @@ ds1307_gettime(device_t dev, struct timespec *ts) /* * If the chip is in AM/PM mode remember that. * The EPSON uses a 1 to signify 24 hour mode, while the DS uses a 0, - * in slighly different positions. + * in slightly different positions. */ if (sc->chiptype == TYPE_EPSON_RX8035) ampm_mode = !(data[DS1307_HOUR] & RX8035_HOUR_USE_24); From nobody Sat Apr 27 05:50: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 4VRJbT6lc3z5HsHN; Sat, 27 Apr 2024 05:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRJbT648Nz59W2; Sat, 27 Apr 2024 05:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HhWnM62eMugRWZKGQHef2SX/pT5jhqgpSKiPRnao5Cc=; b=rEdijI8cjHSKYiwIqhZMK+UUgj4IfRF34f8SzIOItC8lLHshISzh27DeFvweJAV0sKJ62Z 11oZuQ8FWJndwEHm6AetpDpgdjUFic4fIKyOVf6fPhPDHYYIfo4EM8qgCbc/ZOrrUXtLov Nplv8dnx0+alOYDBFa7LgF1ZcTT+FJ6Dvi7DOTTEB3pDyizm+kLD3JNJsqV1MU3Uv/F//X 7LOXr7Gkowu/xT+udwNweti1pfY/rqTBEaPQBuFAgQEajWLNGk5TSudJ/vL8o/tctJXff4 zXF7BP4aZRrhfoybzQREMlm8GW9rO3v/fK0Lxis/7kCLvuDyM0AmoHOC2pYd+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197029; a=rsa-sha256; cv=none; b=On+uVsNhqQ0hQ1VIOnst7AzCRoQ834QZ81Et+7HVOW7fOj66dCFPZJNuh2fHq6jDBP/iex Cwq+D3OipNtNPTkLfDYdiMpN3rR/+CuNspss3EzDNnES+GV58opMzs6JWkTZxF3nf1fzpe TtGjCYg8VcB451yj7HZK/x4rdCwQpytbb7ldo5Om7Bi3GA7HEusFJcaHzexL2faP/ACzi3 G48StlxDAI6m7zK1bo3+jP8zG8uiEXJ0KHk0zXrKC0cekAKn/+Wb+7qMSzvII1+pyr0p6u H8sN7pLmCylBitaVR9U0EUqKK8yjONlxBti+bZ5F+m7OcZmw+oEkBDyCsYCVGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HhWnM62eMugRWZKGQHef2SX/pT5jhqgpSKiPRnao5Cc=; b=B/R1lbfK8oqTcMN5Tdx+F2CrLgf+4kIeyunSx6xDrNmTe5tBvTvziTVKwDQURGeNfQf9c3 QCTiUitpkuBvAHyr7CbBim2YHMYkZxlVdtE92C/t8gZK+0O0UHSrsq+cqFHZjM16BX+R8/ ezaFsLbMy0XcP/S6oLKqN7joQKONEmPoap0n9Fzk7k3usr4t8inRgkWHip5CXoB6H6Htad 6W5TIvuXYfnRWTAGt4xPTB/MxL0fgkai1jWRc01Oe5IjcaggvVBoG3iYY1c743cE6rVunA HLW77d4xh80pG8lmKNsVqjYxKIsZqZWHsljO2aau07AoDhGkMJkACw6Vs5lb4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJbT4kdJzFB1; Sat, 27 Apr 2024 05:50: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 43R5oTsc009290; Sat, 27 Apr 2024 05:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5oTRe009287; Sat, 27 Apr 2024 05:50:29 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:50:29 GMT Message-Id: <202404270550.43R5oTRe009287@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: 3f8208145440 - stable/13 - i386: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3f8208145440e7f30e07dcc255fcd864481d3612 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3f8208145440e7f30e07dcc255fcd864481d3612 commit 3f8208145440e7f30e07dcc255fcd864481d3612 Author: Gordon Bergling AuthorDate: 2024-04-20 12:13:33 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:50:11 +0000 i386: Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit e6c45f377d5b3bc28fc51a67c40dfa45c2087895) --- sys/i386/include/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index 99ffb41aef90..96fcfcaed2c7 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -131,7 +131,7 @@ void atomic_subtract_64(volatile uint64_t *, uint64_t); #else /* !__GNUCLIKE_ASM */ /* - * Always use lock prefixes. The result is slighly less optimal for + * Always use lock prefixes. The result is slightly less optimal for * UP systems, but it matters less now, and sometimes UP is emulated * over SMP. * From nobody Sat Apr 27 05:50: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 4VRJbW1M9Lz5HsMq; Sat, 27 Apr 2024 05:50: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 4VRJbV6KC0z3wc7; Sat, 27 Apr 2024 05:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1vLi/UO+B9U/gdj9MLGvb5A3XtPrr5nD2lB9lt7298=; b=vnysWWxknhJP5eaGDmo9CP2+GiMe5MxSeWqAuXiWdD1Vuu5YkXO1VdE0vSFyolLjuUAtQS XYBN87BEg433hDMSkvy7JK2Eq2xPciIj5plr3TYtMy5FAQYdR7qNNbbM9nb5+dTGNNr3WN HLRYmboi/nDXenzniIQ6gMUJPOaR3wXUBJPFN3YDJEQzBUifyrPLg1ZvmxIsFGRdPsde/8 LAVvKDHQEShYbkHLQq972xeCUHzaXV0YDAWjWWrZGKyj/B2hLgre5hBnZ18ZVH2U/kuQgD f2Dvs3Yc2sjWrmNzQrbZqH9DnOPCKy7mRRcqNyVkLFpJMu3AahaAlKqA1f3/fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714197030; a=rsa-sha256; cv=none; b=CsYsWhrkVV1go4UB79qioQx0l8hHa3I7Jh+GnvWoTX7keMfFoimh3n5nOQEuUt2axN7K2g C8LbN2P0bgNA0lzZibHaNKEcWw9QFgk9qCqVWAaSckcADtGyzfM469j5KnNZcm4eiaFy+o 9UWiF0Vd3fHqsJuHaJWjKl/zpSVzkmjVrJ1CVmSdsREUnxahpxLvWh5/SuS+yJeBpsaBT+ hcA82U4ozjf6VIA6f6sIYJAjueZ8O3E3r69ctFK6CJvdsttzFoc0i7cm0eEHdkqzmImldR LTo36jh69G/CsPstxKOzjL447Vcw9lmFGnPQNXHmtbsGWyrvy47VPMsP3XwB/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714197030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1vLi/UO+B9U/gdj9MLGvb5A3XtPrr5nD2lB9lt7298=; b=dEN3hWqhPl4HsBeVe62imOMBd69mTDIfZYlNytZjohPJjMbX365x4ZUO0kgGHop86z4G8N 9x1UMxwqOHpyWQYouOaFRXpxn+xFvoUjgsf1PukZcmSZCJR7YLstwQIWKLXxCi60hVTO3X gQcfSUOUbbtBERxmkf5j/OrBburlib1HPMubkF5VtR7bkIscvEsdtl2Lrsh2s0y/hsgL5g EUFn9DoVwVDQIBtYf/B4Zcmt0POVFo+jIHCvCXpN+j3tZFwpDZVIMl/m3Gjo44TJJDv6BH Y5eIwkHKnAH+8YchUDpzbpTC9KzlEotKSLj8lswmXbBdRQUXgTfP8Ak1WfJvQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRJbV5mbKz1CsH; Sat, 27 Apr 2024 05:50: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 43R5oU6N009346; Sat, 27 Apr 2024 05:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R5oU6w009343; Sat, 27 Apr 2024 05:50:30 GMT (envelope-from git) Date: Sat, 27 Apr 2024 05:50:30 GMT Message-Id: <202404270550.43R5oU6w009343@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: 5da0bdbf28b1 - stable/13 - ds1307(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5da0bdbf28b11db13b8b728ef1dda1dbe4fac50f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5da0bdbf28b11db13b8b728ef1dda1dbe4fac50f commit 5da0bdbf28b11db13b8b728ef1dda1dbe4fac50f Author: Gordon Bergling AuthorDate: 2024-04-20 12:14:21 +0000 Commit: Gordon Bergling CommitDate: 2024-04-27 05:50:20 +0000 ds1307(4): Fix a typo in a source code comment - s/slighly/slightly/ (cherry picked from commit fa3b320668ba6068014337bbbb05dbd39ac8dfb6) --- sys/dev/iicbus/ds1307.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/ds1307.c index 8fe425f40a4a..abc66779494c 100644 --- a/sys/dev/iicbus/ds1307.c +++ b/sys/dev/iicbus/ds1307.c @@ -471,7 +471,7 @@ ds1307_gettime(device_t dev, struct timespec *ts) /* * If the chip is in AM/PM mode remember that. * The EPSON uses a 1 to signify 24 hour mode, while the DS uses a 0, - * in slighly different positions. + * in slightly different positions. */ if (sc->chiptype == TYPE_EPSON_RX8035) ampm_mode = !(data[DS1307_HOUR] & RX8035_HOUR_USE_24); From nobody Sat Apr 27 07:07: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 4VRLJm67nbz5J103; Sat, 27 Apr 2024 07:07: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 4VRLJm5dhkz44bK; Sat, 27 Apr 2024 07:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqzyDkd8hDOlf3hUGytRx1PpXJnbZZH4D3KMhufHPYQ=; b=bvVNKsaspaMmA4oQqtzXSGh613f6SqqazCZ8+yOiuo++C/C/vitgW4kvuB3KroeKYkrvHX gkpE7Q+LnW1ngRwwaIvsxYtCa08YCojwvLxKpl6sKOUMVP10B3OrwktA08NoU71roGPRpZ +bqKoN7B9qtqlTT4XZRS4cxaOop/ZOGDXB6u7gHmySoUuXl/PIpywrmOOI4U/RWJDHMnt+ ngE8o5ercwVwwqeXWx6MNweGbh9Obb5XmxqgOf9J0HyXbnj/9yic6uEPRfU5oGoVGDPJKP UBKcEqbArHcqzhpikmSxC4Q4CyOJVbNIvFvKzL4kIURaucs8Qt0mQZLSY1QSMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714201672; a=rsa-sha256; cv=none; b=jdWErrhbv74mjgsz8Ecw5FMZ545KUgrg8MhC0wGjI1GGV3nz3noS+GgKoanl5szsbyJCLZ RQfFdbYtJOk5k5yAdipNkArgp8oPfNjQhOOfCJ3WJxGWtPDvoAs5IG5UGIUqarMd70oiej 53v4g3jMI4tc9VVZcLel16ZiKPagZtey8ChNHZVwAGSWOW4yh3CEYp90qum7rSYdvt2L7y QOXiYYITcdi99MsqulM8bjMXht/rjukHgLsYhAezLpNrVewEX9PfoOpZ/1xtnAzTYU5ZTJ CVjcaIbrUZjowGhEZ6ifKFnKU003EhfEvokPLYQcJTI1aYEzeLnzt/5BE9UvtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqzyDkd8hDOlf3hUGytRx1PpXJnbZZH4D3KMhufHPYQ=; b=fyUjmRDiT0GyABMbuV1KWn0aw0W2Ag9lTwtTYNtffmKdvhtc6xEuLz/a5PM4oP76v9Imht 18O3E9ab4w8Ap9IRm4+HGQh5J8hIfEq7m12Zvg/J8hrauvrNjy5Nen4piKFUAo0Gpi31Vt nAOMFapj2sk9SSkW1rdp+R2tTJEcrZbcpmQ9DE9tCaWScfG4Iw6wGyuuPpegAg8NckA4nx AqQD41luQSnN4l56EUL7UMrwlHArDVnRF405SauGYJ+NYkirWWrgUfU1i9h1WpyVBRjfP+ L06pTH7JjzEFHS+WDM5Ajm7G/IRWqChsq8ZlwCROFE+YnrfbWSl0zCaLOS7ssg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRLJm59tzzGHt; Sat, 27 Apr 2024 07:07: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 43R77qwa036768; Sat, 27 Apr 2024 07:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R77qqE036765; Sat, 27 Apr 2024 07:07:52 GMT (envelope-from git) Date: Sat, 27 Apr 2024 07:07:52 GMT Message-Id: <202404270707.43R77qqE036765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 5132cb42607b - stable/14 - MFV: less: Do not trust st_size if it equals zero List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5132cb42607bf7e1cc640e7c4ff4a1e9cfa3916d Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=5132cb42607bf7e1cc640e7c4ff4a1e9cfa3916d commit 5132cb42607bf7e1cc640e7c4ff4a1e9cfa3916d Author: Ricardo Branco AuthorDate: 2024-04-24 05:29:46 +0000 Commit: Xin LI CommitDate: 2024-04-27 07:07:32 +0000 MFV: less: Do not trust st_size if it equals zero This is a smaller version of upstream 1fafd968b48e5cea6c85f126d77071a8de707a55 to address the issue that less not being able to operate on files residing in pseudo-filesystems that advertize a zero size value. PR: bin/276133 (cherry picked from commit cae336280b0d7ad3d49788c5fc0986f91328eb50) --- contrib/less/ch.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/less/ch.c b/contrib/less/ch.c index fd53b2d66e38..51045438a296 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -700,7 +700,6 @@ public void ch_flush(void) ch_block = 0; /* ch_fpos / LBUFSIZE; */ ch_offset = 0; /* ch_fpos % LBUFSIZE; */ -#if HAVE_PROCFS /* * This is a kludge to workaround a Linux kernel bug: files in * /proc have a size of 0 according to fstat() but have readable @@ -709,17 +708,9 @@ public void ch_flush(void) */ if (ch_fsize == 0) { - struct statfs st; - if (fstatfs(ch_file, &st) == 0) - { - if (st.f_type == PROC_SUPER_MAGIC) - { - ch_fsize = NULL_POSITION; - ch_flags &= ~CH_CANSEEK; - } - } + ch_fsize = NULL_POSITION; + ch_flags &= ~CH_CANSEEK; } -#endif if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK) { From nobody Sat Apr 27 07:08: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 4VRLKS2GMLz5J0xB; Sat, 27 Apr 2024 07:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRLKS0c49z44Tv; Sat, 27 Apr 2024 07:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a6oHJPF9IPfYc6Aa3iFsZ99jKYnJJA8C+3gO4wOhotM=; b=aenj40V53K7PRQ5loxHfcZxsgRlbGuvbSThvaRCpO94lzIhVI0cuY9rXWBzGoDcTsHY25j u0TMhg9LFNX/h3FHImBzWYADqrZXs58PctJp6zcEnQw1o056O1+u+GvG/LU3XZ75X+J4cL iYP5NZXGF5+ifEsbmSrCoW+KfC8IoNZa5nbDe7VWqTyoUdU4bAc+o75qxL6WQ6YteeSFEc xKLH5sOa8ebgYpCcUoNANGCc55Ra7bvRq/9/Ws5+SgJ1zRwi1SZ/Y+RcYl32hwzbDFk8yY QVaNyP39zu0TZHYWFELoz/8VQ8kd3lOxSIfcuttKWEevyRwrSLBYADVB4DFzKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714201708; a=rsa-sha256; cv=none; b=L3L+9qUd5ZOTYyixpul//qYXEfEShAkSExKy3IrTeIo1lkTD0SKH0wZJ5pRQefW6gbzgBv WaJrl5mZH09hnmHnub7YtKXYuo7VohkkrPvHbpt4/rCv+Qv/ZcT1Yisbj5XZUVWyd6popv pOG/2jQ71qR7bsKW5RxD8Nssysm6U8wge1Me7Q2nB8N6q2ILWEbPLuUqr7BeksvTX/rngB plbl4G8oE7Vr24hYeYT625M6Lre37JMaSR52gA2zoMMB9YaNQfgg2pfIOpMOt8hJN5JLy0 2mUMnpjuCpUbHPUGu7LvA2e32H+XKHcqQKf1ijODOKSRRWsTsAn1mYehEDROgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714201708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a6oHJPF9IPfYc6Aa3iFsZ99jKYnJJA8C+3gO4wOhotM=; b=JFfVVGkt1ugDJdWgYnMl+w4DSRY3rxutJgfx+D+UV+DBXINqwqg3agmPn14jOxg+JPQsHr U65rKtRa2pluQ/C+xMn2LzS51blX2bllyojKyUOr9vzliBAULofR5RDDWjXifvog6jBYeM Wg8f6OvKBxiF/kzw2HB3GzJq5hyHC7XklIL6asi/8wwkS0cDSg+QwSjIEstApUTBCkSir6 2lwCcPFMMMVVjCxeX97Whd/Pho1rhVBmsPoj6E4eyCGx4TK7V6Y2RiEbTnEDm18nmZKCUr RVYgP9VAfH8P6TSL+lcuquMvTVdOW/PIIpQ/lgv5l5BO3zQqDr0V4rb+0UhUoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRLKR6SBVzGvK; Sat, 27 Apr 2024 07:08: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 43R78Rxb037010; Sat, 27 Apr 2024 07:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R78ROD037007; Sat, 27 Apr 2024 07:08:27 GMT (envelope-from git) Date: Sat, 27 Apr 2024 07:08:27 GMT Message-Id: <202404270708.43R78ROD037007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 302d0acea8a0 - stable/13 - MFV: less: Do not trust st_size if it equals zero List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 302d0acea8a0bc18a26b5e0f1a7870b09dc58d16 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=302d0acea8a0bc18a26b5e0f1a7870b09dc58d16 commit 302d0acea8a0bc18a26b5e0f1a7870b09dc58d16 Author: Ricardo Branco AuthorDate: 2024-04-24 05:29:46 +0000 Commit: Xin LI CommitDate: 2024-04-27 07:08:17 +0000 MFV: less: Do not trust st_size if it equals zero This is a smaller version of upstream 1fafd968b48e5cea6c85f126d77071a8de707a55 to address the issue that less not being able to operate on files residing in pseudo-filesystems that advertize a zero size value. PR: bin/276133 (cherry picked from commit cae336280b0d7ad3d49788c5fc0986f91328eb50) --- contrib/less/ch.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/less/ch.c b/contrib/less/ch.c index fd53b2d66e38..51045438a296 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -700,7 +700,6 @@ public void ch_flush(void) ch_block = 0; /* ch_fpos / LBUFSIZE; */ ch_offset = 0; /* ch_fpos % LBUFSIZE; */ -#if HAVE_PROCFS /* * This is a kludge to workaround a Linux kernel bug: files in * /proc have a size of 0 according to fstat() but have readable @@ -709,17 +708,9 @@ public void ch_flush(void) */ if (ch_fsize == 0) { - struct statfs st; - if (fstatfs(ch_file, &st) == 0) - { - if (st.f_type == PROC_SUPER_MAGIC) - { - ch_fsize = NULL_POSITION; - ch_flags &= ~CH_CANSEEK; - } - } + ch_fsize = NULL_POSITION; + ch_flags &= ~CH_CANSEEK; } -#endif if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK) { From nobody Sat Apr 27 13:03: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 4VRVBs2TGbz5J4sJ; Sat, 27 Apr 2024 13:03: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 4VRVBs1fKRz4jrp; Sat, 27 Apr 2024 13:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714222997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkcmEIVfz6ogm0Vgm+9P1uystdx+UF0D0DibSmgVkec=; b=ZNE1ywuCoC4Ak5yyKAOqE7NBcBjvVYf5yRBfxNYN0oveZVMhVa19r4sXM9P5fkdyuGZ3Lk +25zrZQQ3OHVaBGukcfiIxoU4DM9/E72nUomwXHUffanJDtEwyUPqX8yA1gA5nuaR4QA31 Cw3XkqUa30mNAqXU8zuTxNDSeiE7fQKmhQ/l5Ci3ttvKKF2Qosk6SSEX2jGYJ9dRFcI/2D WWO9CxcOfCZBxkSISZyj/YhXB0RpfvhZcxoQAjtlAFcPA8tJ80rCvFUVArkgmsDQszBSZr jbssjGZxkL0W+VwtT6a1p2EOOtE1hZ0cogWhMjshkLmrJe/SyctnO2n+KDINEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714222997; a=rsa-sha256; cv=none; b=Od54nr9VRHC+mx87by8Zw3/iuQBv8IS5DrPl13lu7FQfdLMljZ5IodhN4A7UXSrm+OIh+D cOe8zEMzof2YLmdMBuy8TP0fKTE4cgfjC5KFst4mp77NRxk0oFFYvdcyEBNjzXMkeV8xsF nn/h0cYGxuF/CWUjp3jdOkXv0hvKFbJVqqp3tM4W+ruddIBrbKJdGnQVWJ1tALx7p4LcwQ c8uMr0SPtZan30cbiimpas2QSfcT8OHuqXeVysnNBcjh4hBTAT48v6WR68WrYJzIhY3+89 uBplwb2w1NL0NTeEODSZtCPS1edan/8wae2OvW9ZlBOX1IiMS0mZVZTYec+f9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714222997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkcmEIVfz6ogm0Vgm+9P1uystdx+UF0D0DibSmgVkec=; b=IAuHsQjYA9/5uNzufNUUAM/BWn9zZRuex/zrZA5D+qFwRAdflIXmAsiVMPBbrXUQYVdr5i X1wUAIe2auaC23nwCZsk7FOz/YrFbiax1COHTYkz/qGPwc+f4+L+MNvGh6OCpSW7NOj20u 50ZFzp8lGgR0qv07ZHBUx9rsCdBESDFlDLZr5e0brqC1IPr2s82CXv8oM+5tlD0SaMRcVS Z/m4VnKL+rmLLHHqL4YXMtEZ+haaS/2pXgEWmAEfIbNtC/7Q7sVPgmqQ7We2NKHjnMovb4 M6FanxwlIPaEmNK4LhnoXi/K+tXn1f9T+DFr6UGNmeNtQzCg2uxERNkUNBNEBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRVBs1C8NzRpl; Sat, 27 Apr 2024 13:03: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 43RD3HoZ045461; Sat, 27 Apr 2024 13:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RD3HIC045458; Sat, 27 Apr 2024 13:03:17 GMT (envelope-from git) Date: Sat, 27 Apr 2024 13:03:17 GMT Message-Id: <202404271303.43RD3HIC045458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8c81694af438 - stable/14 - linux: ignore setsockopt(IPV6_RECVERR) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c81694af438fee9071f826efcc9f1633c50ab3d Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8c81694af438fee9071f826efcc9f1633c50ab3d commit 8c81694af438fee9071f826efcc9f1633c50ab3d Author: Lexi Winter AuthorDate: 2024-04-22 21:58:11 +0000 Commit: Warner Losh CommitDate: 2024-04-27 12:59:46 +0000 linux: ignore setsockopt(IPV6_RECVERR) Under Linux, the socket options IP_RECVERR and IPV6_RECVERR are used to receive socket errors via a dedicated 'error queue' which can be retrieved via recvmsg(). FreeBSD does not support this functionality. For IPv4, the sysctl compat.linux.ignore_ip_recverr can be set to 1 to silently ignore attempts to set IP_RECVERR and return success to the application, which is wrong, but is required for (among other things) a functional DNS client in recent versions of glibc. Add support for ignoring IPV6_RECVERR, controlled by the same sysctl. This fixes DNS in Linux when using IPv6 resolvers. Reviewed by: imp, Jose Luis Duran Pull Request: https://github.com/freebsd/freebsd-src/pull/1118 (cherry picked from commit ca63710d3668cf6f3cb4faf065d8b4eeffa028ad) --- sys/compat/linux/linux_socket.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a5ed5c5c62db..705a64de8ede 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -501,6 +501,11 @@ linux_to_bsd_ip6_sockopt(int opt) "unsupported IPv6 socket option IPV6_RECVFRAGSIZE (%d)", opt); return (-2); + case LINUX_IPV6_RECVERR: + LINUX_RATELIMIT_MSG_OPT1( + "unsupported IPv6 socket option IPV6_RECVERR (%d), you can not get extended reliability info in linux programs", + opt); + return (-2); /* unknown sockopts */ default: @@ -2110,6 +2115,14 @@ linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) name = linux_to_bsd_ip_sockopt(args->optname); break; case IPPROTO_IPV6: + if (args->optname == LINUX_IPV6_RECVERR && + linux_ignore_ip_recverr) { + /* + * XXX: This is a hack to unbreak DNS resolution + * with glibc 2.30 and above. + */ + return (0); + } name = linux_to_bsd_ip6_sockopt(args->optname); break; case IPPROTO_TCP: From nobody Sat Apr 27 14:46: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 4VRXTZ2nWvz5JGB2; Sat, 27 Apr 2024 14:46: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 4VRXTZ0Zjlz41hL; Sat, 27 Apr 2024 14:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqZLzV8KhdT0sdizWPXKUac9w8HXIv2AHf3WaHvO5vc=; b=N7Bi0S6qfrBbclE6v0nTEzLJqVn1wUg1c+xV9H3NSSah2JJWEOb1gNpFmNkplz68Q8ylg4 Ovx/ao4drvHSqbK3f8g5bKhZwneU0hknRa1IYNSg2jyvrSR54xPSkQ912aS9geMea/oUyQ XPmOgPJABK117ag5Z8t3ZEMS3+9rBosFPScInLSFsdE6QqJhbPQ/uxSyySLtCux8Wnskzi kVeQxKOnUKNDSbonFhgm0hAc++sR5oFX1igiYQnveogl079MlJ2BsBa/kwjQaMOOj4BVU/ RyM3IYo5YPG1MOMeMJr5SBrZTWUzO6uFnNvPsAHN3sU2EMl8l5FhGJWcl7BWcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229170; a=rsa-sha256; cv=none; b=MjcBiz/b7AFPQpRHn99R2YbviFhx1NFnHTtNCPqb+f1g7CVnDH9us4t71Mxfc73JKGAzIM bLqBEsbS5XRBk3CljRnCIdBh5kFiCjtbmqXWyx3SgFcd1DJwCjBaCGvUglXZcJUHGOQnR3 rNbGtq41YVLGqQ5UXHP1BwOpb7nm2nXjwqALtHE5R4ENZkbgYZxeIzQ/6AE3QRndub9Vx1 ZXXEKb24D5jmxj6w93llH0gw42wmlev40vEv9ISU9xi37fIjlgS0rYYhn/Nj2dYk+NIfcA bCvLKDNVWKk1iufm59FD6+Q7QanWQraYJgINhWmOkqeRcJQRXVktbFivqVOidA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqZLzV8KhdT0sdizWPXKUac9w8HXIv2AHf3WaHvO5vc=; b=X9ZTAD8ba9wWG+9N8Fx59BBc3492Gf3r4io1Fv/z95g3uhcuMHLmepOs6cTO0ne5uFmeDV HIBSJGq1QJU+HsMC2+DQsfgD+W77/nKeRKWTPisuw0eOzFeacbVasXExKXArF2qSr843YT 66x6JEgMNR/MXkQDfziTYYobLPz7rLtQo/l06JLWKBWQnreclq7AxuLVNVl2vz3KNoKru9 LArYuN4pPp1vuo4hj+ndRyL4Vq6s+t2FdYXlrfNcCJ9QVwQA4sPX6no227PCH1sGNls8P0 g2ATqEokYUj5Ze27UyIiLRO6qoMdPrY4ovt4TwS+XRUKFP6NMLd9Yr3ENdZXiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXTZ08K4zWF1; Sat, 27 Apr 2024 14:46: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 43REk9KH015229; Sat, 27 Apr 2024 14:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REk9dZ015226; Sat, 27 Apr 2024 14:46:09 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:46:09 GMT Message-Id: <202404271446.43REk9dZ015226@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: d776dd5fbd48 - stable/14 - Support ARP for 802 networks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d776dd5fbd484acdf00f6df55583e9aa53226859 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d776dd5fbd484acdf00f6df55583e9aa53226859 commit d776dd5fbd484acdf00f6df55583e9aa53226859 Author: Denny Page AuthorDate: 2024-04-13 17:16:08 +0000 Commit: Ed Maste CommitDate: 2024-04-27 14:45:22 +0000 Support ARP for 802 networks This is used by 802.3 Ethernet. (Also be used by 802.4 Token Bus and 802.5 Token Ring, but we don't support those.) This was accidentally removed along with FDDI support in commit 0437c8e3b198, presumably because comments implied it was used only by FDDI or Token Ring. Fixes: 0437c8e3b198 ("Remove support for FDDI networks.") Reviewed-by: emaste Signed-off-by: Denny Page Pull-request: https://github.com/freebsd/freebsd-src/pull/1166 (cherry picked from commit fcdf9a19893b9b5beb7a21407de507f0ae4c500b) --- sys/net/if_arp.h | 2 +- sys/netinet/if_ether.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 0319807dbfd2..f201fd67cab4 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -47,7 +47,7 @@ struct arphdr { u_short ar_hrd; /* format of hardware address */ #define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_IEEE802 6 /* 802.2 networks (ethernet/tb/tr) */ #define ARPHRD_FRELAY 15 /* frame relay hardware format */ #define ARPHRD_IEEE1394 24 /* firewire hardware format */ #define ARPHRD_INFINIBAND 32 /* infiniband hardware format */ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index df564b210f9b..a14671528f18 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -684,6 +684,10 @@ arpintr(struct mbuf *m) hlen = ETHER_ADDR_LEN; /* RFC 826 */ layer = "ethernet"; break; + case ARPHRD_IEEE802: + hlen = ETHER_ADDR_LEN; + layer = "ieee802"; + break; case ARPHRD_INFINIBAND: hlen = 20; /* RFC 4391, INFINIBAND_ALEN */ layer = "infiniband"; From nobody Sat Apr 27 14:47: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 4VRXWK5HqWz5JGSN; Sat, 27 Apr 2024 14:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRXWK4gnCz41xg; Sat, 27 Apr 2024 14:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uWsxkLedtYTxC+rhHWDyfZvZ3eS7qnABiEnBmKAko14=; b=TnkxiLVYZCW/wjP7yKlllviO5NUpYtuoLn/3HCvC19Q8Uxq/mQORtWpRcL84nHMfqZCkNX LLq1yzrtggqrREwUZ7a5otrRDEG0w9cJoXDf4cQNx6WERFeOWCRuXO/Hc5FfhLIxgU7y/h C5MuqupddrEsxRR1XxNX/CoMLb8XZ4/1GUXFKxYM82mNObHHmNKd7v1WEt2uCe2CUNLZqK sboSM8RRw/CI45bxjIyqRtLnHcHfcKM2zclKeij2DHaWHoza9FVgn+iFnUKA74eEPwzb6g PlxvQCeE06oH+DXA0YwXip0h5TXPy52K5hYSTOAhKR4bOKf6ezohq1yNk1T1xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229261; a=rsa-sha256; cv=none; b=YE4VT0sX01uaCcUCBLWX6T+0srtMN9d+LtK2OerjO7NrWwVLO2pasTRhFd0aKLEwCpVCrb ngFNHXJaDULygw/5YcVw/BuzQnjfLgBl8ziGHnOK4R3yWCQeCMNeevSJ6AQen2ImuAOq2L cFawGlidcA+x9f7vkO9KR3uHUtbNSYeKvT5R/Neot8ALlO6gfhyTuEEM0i39hV2a4hhpDs L5krPo9b1o8HnkAbh6h4Ob5jn74Ldh9qr44LobDoGAYnRXgpPMOQTiXHdXkBK8nX2LwlBQ Ap0AvI4n2TXWY08PxUK4cEvlygRKnBoW3oSrGP6Uqr2i3wN8k6rb+kAdwAqQJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uWsxkLedtYTxC+rhHWDyfZvZ3eS7qnABiEnBmKAko14=; b=F2tMT2HUbcYj37n7J8R2IHA0GEDXwZ5z6y2Cy3oVhzvdIBJlV+h6IVMV2QpfkhEkfzdpjP UOcNJP4Pke1YJbP6NKCChm1FSGpA/UYhWbxamlLCtysqOlWQ2ImOFjAXfrTnEpmVo9QBpB d44YetSIXvyGqU8KpvwPT4my0HqMj41AsmvYk/zn+mZARdOoHD/GdH22frhemMI+w32kTe 5eMOQqmB9ita9Drqg9zvXjMCSlmqmga6NBisHI/ac5owL9CPjAD8pdLnHLMA1J80Y56ZIr MerWR+uP24Hl+PNMprfzYbVwDdJ9fpxJiiifBmUOlTRtbqYogpcR42crT1/KXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXWK4HDPzWcR; Sat, 27 Apr 2024 14:47: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 43RElfUp015568; Sat, 27 Apr 2024 14:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RElfG9015565; Sat, 27 Apr 2024 14:47:41 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:47:41 GMT Message-Id: <202404271447.43RElfG9015565@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: 90499f6efd57 - stable/13 - Support ARP for 802 networks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 90499f6efd57754563223bce1ec173669f1ce8a1 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=90499f6efd57754563223bce1ec173669f1ce8a1 commit 90499f6efd57754563223bce1ec173669f1ce8a1 Author: Denny Page AuthorDate: 2024-04-13 17:16:08 +0000 Commit: Ed Maste CommitDate: 2024-04-27 14:47:16 +0000 Support ARP for 802 networks This is used by 802.3 Ethernet. (Also be used by 802.4 Token Bus and 802.5 Token Ring, but we don't support those.) This was accidentally removed along with FDDI support in commit 0437c8e3b198, presumably because comments implied it was used only by FDDI or Token Ring. Fixes: 0437c8e3b198 ("Remove support for FDDI networks.") Reviewed-by: emaste Signed-off-by: Denny Page Pull-request: https://github.com/freebsd/freebsd-src/pull/1166 (cherry picked from commit fcdf9a19893b9b5beb7a21407de507f0ae4c500b) (cherry picked from commit d776dd5fbd484acdf00f6df55583e9aa53226859) --- sys/net/if_arp.h | 2 +- sys/netinet/if_ether.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 0319807dbfd2..f201fd67cab4 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -47,7 +47,7 @@ struct arphdr { u_short ar_hrd; /* format of hardware address */ #define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* token-ring hardware format */ +#define ARPHRD_IEEE802 6 /* 802.2 networks (ethernet/tb/tr) */ #define ARPHRD_FRELAY 15 /* frame relay hardware format */ #define ARPHRD_IEEE1394 24 /* firewire hardware format */ #define ARPHRD_INFINIBAND 32 /* infiniband hardware format */ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index cd5055e31533..9c72f9268ae5 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -684,6 +684,10 @@ arpintr(struct mbuf *m) hlen = ETHER_ADDR_LEN; /* RFC 826 */ layer = "ethernet"; break; + case ARPHRD_IEEE802: + hlen = ETHER_ADDR_LEN; + layer = "ieee802"; + break; case ARPHRD_INFINIBAND: hlen = 20; /* RFC 4391, INFINIBAND_ALEN */ layer = "infiniband"; From nobody Sat Apr 27 14:58: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 4VRXm54q4Kz5JH6P; Sat, 27 Apr 2024 14:58: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 4VRXm549mdz42r3; Sat, 27 Apr 2024 14:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S636cxuU6kHwVnLea9gLtWWOa3DdcK/NwxPDSNATvKg=; b=yea+Tqd5OkgW/dYqRI7BWSEkHKmDyISXCFx8n2C18ogeoGJ8oOfL3J3jplYloFvJ3zjP75 yrmp0MiQXvntrOEk9X5Ar/BZ3UqDxNjDTcwxjzhLAEYr1RsMJi5ZPg2nmMWUfwVYr/vlI9 CMczthvmIlwBjYyK9d9MxgDNDuzCZX7IwNV3Wk1oVfni7TdGSI0NHFdmbTJh9xbn4G2nSl NOGK80yjCwsbt6Hz1t6fqKTOSZqiqQP451lHb++pO0O4f53YKkDsElTpr27u1LD4V5/I8y SCmSEANDFqFJOvrnB2VAmhIZITn6PUKdyqUuSCYnY/BiKBd0eJJkyXfikg6lPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229925; a=rsa-sha256; cv=none; b=Pb+/i2+sCUhRsdsUP2jtc0oy+dGUBICytV1V+mDVYsTrTbFAgIue9c1ri4DNfGnPq6g2fN dkguXRJZeG1K+92W98LUOylv2rVT1cczv3e5oWz/W0Pu+1blIvzqIFQR2eu6Ob6tBPxEgH w3Lc0lTSVRwS2MY5zma8FFxbrhZNsabwjtxzdUhN6/HeOhREDTITKE1h/f4P1p+lUpqhsU WaJm69wz4WJH6eml+l28fcnjA0IC9ZXZY7179I4IYU7doiSdD357bG/+nCUBVe7NRI56wI rf2+aOGaaT+zmpDryAZE49knH3HXtNaOBZ6V32bnSG1ukJ4GsqXY2exHrsKJbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S636cxuU6kHwVnLea9gLtWWOa3DdcK/NwxPDSNATvKg=; b=gl1JNW6Dt2oxefWUq1UOLyVRc/MAX4hZqKigVzZx1/BMx8SStpmDs/b4FU3pxYXVIiGvap MN9zLqfTNsEbcof01AShi/aiLHOb3/GVI1OURjmp4+Z4IlJQtRDZkCTlbJRcJqCb7lUtYM GnqnpZoje7QdAZypL+H8z96NmxN9yxt/T9EeyWC2PJnqKqmHDOcO4ESMm7/k4fscOu0J0+ 7VUaPJdi3ly2jHFzqNzNUR9BRhdG9lJKEKevJoudIIwrSL00fIuuEkJUN2o0xD+F/MmL1p AjCVsNJRX87b2J36FICaqJBURO3UWvCS0wCoLW4crHUbG5Y8m6bIAdmhWduF+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXm53gMGzX4w; Sat, 27 Apr 2024 14:58: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 43REwjkX032478; Sat, 27 Apr 2024 14:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwjHI032475; Sat, 27 Apr 2024 14:58:45 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:45 GMT Message-Id: <202404271458.43REwjHI032475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1d06b45463bf - stable/13 - Fix MNT_IGNORE for devfs, fdescfs and nullfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d06b45463bf404b5010f2370cb39b68a32da323 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1d06b45463bf404b5010f2370cb39b68a32da323 commit 1d06b45463bf404b5010f2370cb39b68a32da323 Author: Doug Rabson AuthorDate: 2023-08-26 09:32:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:39 +0000 Fix MNT_IGNORE for devfs, fdescfs and nullfs The MNT_IGNORE flag can be used to mark certain filesystem mounts so that utilities such as df(1) and mount(8) can filter out those mounts by default. This can be used, for instance, to reduce the noise from running container workloads inside jails which often have at least three and sometimes as many as ten mounts per container. The flag is supplied by the nmount(2) system call and is recorded so that it can be reported by statfs(2). Unfortunately several filesystems override the default behaviour and mask out the flag, defeating its purpose. This change preserves the MNT_IGNORE flag for those filesystems so that it can be reported correctly. MFC after: 1 week (cherry picked from commit b5c4616582cebdcf4dee909a3c2f5b113c4ae59e) --- sys/fs/devfs/devfs_vfsops.c | 2 +- sys/fs/fdescfs/fdesc_vfsops.c | 2 +- sys/fs/nullfs/null_vfsops.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index a81a63ebf27a..dbc29fbe4d78 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -224,7 +224,7 @@ static int devfs_statfs(struct mount *mp, struct statfs *sbp) { - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 309134798374..30924580dece 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -219,7 +219,7 @@ fdesc_statfs(struct mount *mp, struct statfs *sbp) freefd += (lim - fdp->fd_nfiles); FILEDESC_SUNLOCK(fdp); - sbp->f_flags = 0; + sbp->f_flags = mp->mnt_flag & MNT_IGNORE; sbp->f_bsize = DEV_BSIZE; sbp->f_iosize = DEV_BSIZE; sbp->f_blocks = 2; /* 1K to keep df happy */ diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 77ead04b1616..271f5bf249fc 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -337,7 +337,7 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED)) | + MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; From nobody Sat Apr 27 14:58: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 4VRXm659HBz5JH8V; Sat, 27 Apr 2024 14:58: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 4VRXm64WVvz4321; Sat, 27 Apr 2024 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oidC/Nk0wE/UVZpOic7/TX5UL/TQ9It8olMgCtPtJU4=; b=HdlPUoiEo/qUI5N8VwfmLXzzOqCoIgw8uISCemnpi18ciMtpKKnvLZgSuEhNEPpt6g82Ep No/EPxIhdwvD2T8S1mHUUMfO2qzj9Rh/sHF1DpJeDXVOQEPBlXKVLs3q9JtNxPGitsWbnu HTS4vicShnCm4TNnt43gn9Z6W3m3R7t9q7U1qF5MsTVmwQLTYuAo/f5FE32Xi9M+1S/jRx uccFJvVPQiQmI6BYlYsgxj1mX4lsk1qnN2uZqzTthQwyV45aq1exrRu36R7TkHHWn6u8DE Vwu3uAEG2NVG2YNB4BmJ7I8HDEryAIg3kXHs6S/dYxmr+r3bJIvGL/TCbOmKCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229926; a=rsa-sha256; cv=none; b=ASZ+mVmWc6M7ivyVzm2Bj/ESOvYqJEmZFEh2CDozl4BR2cQFaUgUoAn99zNGtffysv3yv6 RlOX4eedj5aa8iNDET2yj6nH65kTk9OVy/DMfO1OmB5TDqnDAbK20Fi7Lz3Aqz6j2/oSf+ +ZpdCuMgJGanN/tPF0FSXKc+hKHGZWfHwptjnwQhbRIaof7vedIyie6VJ6njSGLvlt9BkW AA7PKMRHg7a4S4HHuYWQTg86kEDk/knwzKaT1pNHnBF9LOpZyZv0REAjjF9fqEQltd+7fu busuihbArQPlp5fft0zMRzKDQsxg6sfaKOU8SBxnchv66kqvIF7w4uW3h0BwRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oidC/Nk0wE/UVZpOic7/TX5UL/TQ9It8olMgCtPtJU4=; b=aiFsnX1LTJjf+Ukt1EPg89pMKpTPwGpFd7nj/8tK5B5KuSAwFQa48NAtUTA/wXXu7wlHBv OcJDsC/hqypM/3Ym5t8/UxkGksonpX3Xf2kkJ2HRQQHoN6Cn0nU4ySJTIXibJVsJoHGh6u LSLjPJdpeLFSCTCInV7BD1O4FT0i1y+xlC/bZExy6SaogeceySnjNGXkfHW9mw26uBiH6S 2a+ACZdQuGhHztahcRDdrTt7sKLc5feLQCX1PK704JDXMkD3DL1LqPOq5+gbeEsD7BKidP sq/ES2JTtdBP3v2mjJksJUXM3vSCzbLSV04UV0K/SCemtOgrLkN+4y5WUCG6+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXm646dszX4x; Sat, 27 Apr 2024 14:58: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 43REwkOY032528; Sat, 27 Apr 2024 14:58:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwkkr032525; Sat, 27 Apr 2024 14:58:46 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:46 GMT Message-Id: <202404271458.43REwkkr032525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 82c8a5f4f18c - stable/13 - nullfs: Show correct exported flag. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 commit 82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-13 15:20:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:40 +0000 nullfs: Show correct exported flag. MFC after: 3 days Reviewed by: allanjude, kib Differential Revision: https://reviews.freebsd.org/D44773 (cherry picked from commit 2b258dd17caf329bc549f93d9858b74109a479d7) --- sys/fs/nullfs/null_vfsops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 271f5bf249fc..01ab822de087 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -336,9 +336,10 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; - sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | - (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); + sbp->f_flags &= MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | MNT_UNION | + MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_EXPORTED | MNT_IGNORE; + mstat->f_flags &= ~(MNT_ROOTFS | MNT_AUTOMOUNTED | MNT_EXPORTED); + sbp->f_flags |= mstat->f_flags; sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; sbp->f_blocks = mstat->f_blocks; From nobody Sat Apr 27 14:58: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 4VRXm82stgz5JGFj; Sat, 27 Apr 2024 14:58: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 4VRXm75Wzgz432T; Sat, 27 Apr 2024 14:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YrakTBjXlk/TiNxwqWXV3x5xXpiU1OjjgE3n0fHlI3Q=; b=dGbSmJhiWpNODMMk8N20NxhlE7VwXdk29AhDbb18SMrIb6xVL/8AK6OWyIo9NQJ2ixMGwj sma16B+4XDDJ+ZZyE+LY5hPV5juVQssqh92ZOIzh/1UlOGoq/llwBUry9PKoPSuRD0R6Kb jYmbrrimpp5XLQ6b07ApVboCvzdCHbfa1Zp2GiXLm2Er6AZDABpLQ2eqhWm2ddBl6rYacf C88kwbjT6CC43N0o2DKjWEqmODJeQabMYDw8aE2jLptWNbYQpv/L0tcLyTyYKNYazYv2KJ jOLqHiFP18ur9l8ANLSAodjBAbvWrw+nvCv/IQBR2EGkqzXjS2PJ7OhJAtbi+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229927; a=rsa-sha256; cv=none; b=QLlSj4DLGS/azUdGDiJya0Pqs0WpW9MjXA++muzhZF3sDdTQgP9SBdlxKhhBdweLM09lJx S9Ldx4skrFcKnyYzcDlqoHYhD4mwUDhAw15+/UD+SZsA5NRrghmkZ0wnY5H7yoL7NKW6UF t+Jh0K0EEpmX/pt5ISU5wPtQ/AxelZYj6q/mehsgTAHIjW8z6yzETgi7zmUr0nADMrOtDy NK107IKXfwGdJ70dkaDM9+OyCS7OacYjrsEtfHV5ZjLxuMZeWakBu429EnnLB0ri4OjmYk Z+5Jr3n4zx9naX/CQPuNgDysI98oV7gvusaJubDyG7A/oIcyXx9fFQFZXReLJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YrakTBjXlk/TiNxwqWXV3x5xXpiU1OjjgE3n0fHlI3Q=; b=SKaQ8xNOZCeziRgkhCy8ilwIHz1NwoibOXcJ7fdaRXsoHbUXTpsSCEKhQ8gIAu3J5ZeFuI gjCgbwkyqFUaMGJz9JRVOxTCM8F64G+BPp2upvrqS3gcg9U4zICqysf1r287g5KNb4bNuW JCrawSTsGrWF2xY3Lp9WgY8VfMT3l2vsIx0Iw2EiRbj4pCnAqSbTE7hDf6ExEEpKkzCPkT ovQegEYitSkCoxtfn++rPCjjLreYYz5y7tzrev7fotVMp2pG4iyqAvmlX5b2HDablj47Ku hRem14XkGa7TGn3Vp/CPfuxPhDCklpj+CosE9wb4mxfSiIb5DibEH6SvsbEKvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXm757vnzX02; Sat, 27 Apr 2024 14:58: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 43REwlUb032578; Sat, 27 Apr 2024 14:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwlOT032575; Sat, 27 Apr 2024 14:58:47 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:47 GMT Message-Id: <202404271458.43REwlOT032575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 44101eb5803e - stable/13 - install: Always use a temporary file. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44101eb5803e602be442d2305d800264af963b42 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=44101eb5803e602be442d2305d800264af963b42 commit 44101eb5803e602be442d2305d800264af963b42 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-12 17:30:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:40 +0000 install: Always use a temporary file. Previously, we would only use a temporary file if explicitly asked to with the `-S` option, and even then, only if the target file already existed. This meant that an outside observer looking for the target file might see a partial file, and might see the file disappear and then reappear. With this patch, we always use a temporary file, ensuring atomicity. The downside is slightly increased disk usage. The upside is never having to worry about, for instance, cron jobs randomly failing if they happen to run simultaneously with `make installworld`. The `-S` option is retained, partly for compatibility, and partly to control the use of `fsync(2)`, which has a non-negligible cost (approximately 10% increase in wall time for `make installworld`). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: 0mp, brooks, imp, markj Differential Revision: https://reviews.freebsd.org/D44742 (cherry picked from commit e5035d08578e372d40b4e2d4c3574b7583549bd6) install: Simplify path construction. There's no need to copy the path twice to split it into base and dir. We simply call `basename()` first, then handle the two trivial cases in which it isn't safe to call `dirname()`. While here, add an early check that the destination is not an empty string. This would always fail eventually, so it may as well fail right away. Also add a test case for this shortcut. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44743 (cherry picked from commit 17dc7017d7375b3463d65adffe1eb980b0f86795) install: Remove the mmap(2) option. We already removed it from cp(1) over a year ago but never followed up here. Do so now, for the same reasons: significant complexity for little to no benefit. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44809 (cherry picked from commit a0439a1b820fa0e742c00d095f5f5c06f5f19432) install: Assorted nitpickery. * Use `errc()` instead of manually setting `errno` before calling `err()`. * Change one warning into a fatal error. * Drop some unnecessary casts. * `strlcat()` bounds checks were off-by-one. This does not matter in practice because the subsequent code renders an overrun harmless. * We were passing `SSIZE_MAX` to `copy_file_range()` instead of the requested size. This only matters if we're asked to install a file which is still being written to while we are copying it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44810 (cherry picked from commit 000a533e6d1db9878296b32d1cc212e11a2cc718) --- usr.bin/xinstall/install.1 | 31 +-- usr.bin/xinstall/tests/install_test.sh | 8 + usr.bin/xinstall/xinstall.c | 407 ++++++++++----------------------- 3 files changed, 142 insertions(+), 304 deletions(-) diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1 index 346b0f428121..193892c4a2b9 100644 --- a/usr.bin/xinstall/install.1 +++ b/usr.bin/xinstall/install.1 @@ -27,7 +27,7 @@ .\" .\" From: @(#)install.1 8.1 (Berkeley) 6/6/93 .\" -.Dd August 4, 2022 +.Dd April 16, 2024 .Dt INSTALL 1 .Os .Sh NAME @@ -227,16 +227,18 @@ Copy the file, as if the except if the target file does not already exist or is different, then preserve the access and modification times of the source file. .It Fl S -Safe copy. -Normally, +Flush each file to disk after copying. +This has a non-negligible impact on performance, but reduces the risk +of being left with a partial file if the system crashes or loses power +shortly after .Nm -unlinks an existing target before installing the new file. -With the +runs. +.Pp +Historically, .Fl S -flag a temporary file is used and then renamed to be -the target. -The reason this is safer is that if the copy or -rename fails, the existing target is left untouched. +also enabled the use of temporary files to ensure atomicity when +replacing an existing target. +Temporary files are no longer optional. .It Fl s .Nm exec's the command @@ -302,15 +304,7 @@ Ports Collection. .Sh FILES .Bl -tag -width "INS@XXXXXX" -compact .It Pa INS@XXXXXX -If either -.Fl S -option is specified, or the -.Fl C -or -.Fl p -option is used in conjunction with the -.Fl s -option, temporary files named +Temporary files named .Pa INS@XXXXXX , where .Pa XXXXXX @@ -333,7 +327,6 @@ The default was changed to copy in .Xr cp 1 , .Xr mv 1 , .Xr strip 1 , -.Xr mmap 2 , .Xr getgrnam 3 , .Xr getpwnam 3 , .Xr chown 8 diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index cbe95f0dfbf3..b35706521ec3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -25,6 +25,13 @@ # # +atf_test_case copy_to_empty +copy_to_empty_body() { + printf 'test\n123\r456\r\n789\0z' >testf + atf_check -s not-exit:0 -e match:"empty string" \ + install testf "" +} + copy_to_nonexistent_with_opts() { printf 'test\n123\r456\r\n789\0z' >testf atf_check install "$@" testf copyf @@ -497,6 +504,7 @@ set_optional_exec_body() } atf_init_test_cases() { + atf_add_test_case copy_to_empty atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe atf_add_test_case copy_to_nonexistent_comparing diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index f1fe1a969377..efd37150246b 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -42,10 +42,6 @@ static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif /* not lint */ #endif -#include -#include -#include -#include #include #include #include @@ -157,7 +153,6 @@ static char *destdir, *digest, *fflags, *metafile, *tags; static int compare(int, const char *, size_t, int, const char *, size_t, char **); static char *copy(int, const char *, int, const char *, off_t); -static int create_newfile(const char *, int, struct stat *); static int create_tempfile(const char *, char *, size_t); static char *quiet_mktemp(char *template); static char *digest_file(const char *); @@ -173,7 +168,6 @@ static void metadata_log(const char *, const char *, struct timespec *, const char *, const char *, off_t); static int parseid(const char *, id_t *); static int strip(const char *, int, const char *, char **); -static int trymmap(size_t); static void usage(void); int @@ -341,10 +335,6 @@ main(int argc, char *argv[]) } } - /* need to make a temp copy so we can compare stripped version */ - if (docompare && dostrip) - safecopy = 1; - /* get group and owner id's */ if (group != NULL && !dounpriv) { if (gid_from_group(group, &gid) == -1) { @@ -393,8 +383,8 @@ main(int argc, char *argv[]) err(EX_OSERR, "%s vanished", to_name); if (S_ISLNK(to_sb.st_mode)) { if (argc != 2) { - errno = ENOTDIR; - err(EX_USAGE, "%s", to_name); + errc(EX_CANTCREAT, ENOTDIR, "%s", + to_name); } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -420,14 +410,13 @@ main(int argc, char *argv[]) if (!no_target && !dolink) { if (stat(*argv, &from_sb)) err(EX_OSERR, "%s", *argv); - if (!S_ISREG(to_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", to_name); - } + if (!S_ISREG(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (to_sb.st_dev == from_sb.st_dev && - to_sb.st_ino == from_sb.st_ino) - errx(EX_USAGE, - "%s and %s are the same file", *argv, to_name); + to_sb.st_ino == from_sb.st_ino) { + errx(EX_USAGE, "%s and %s are the same file", + *argv, to_name); + } } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -585,7 +574,7 @@ do_link(const char *from_name, const char *to_name, char tmpl[MAXPATHLEN]; int ret; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -632,7 +621,7 @@ do_symlink(const char *from_name, const char *to_name, { char tmpl[MAXPATHLEN]; - if (safecopy && target_sb != NULL) { + if (target_sb != NULL) { (void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name); /* This usage is safe. */ if (quiet_mktemp(tmpl) == NULL) @@ -675,8 +664,10 @@ static void makelink(const char *from_name, const char *to_name, const struct stat *target_sb) { - char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; - struct stat to_sb; + char src[MAXPATHLEN], dst[MAXPATHLEN], lnk[MAXPATHLEN]; + char *to_name_copy, *d, *ld, *ls, *s; + const char *base, *dir; + struct stat to_sb; /* Try hard links first. */ if (dolink & (LN_HARD|LN_MIXED)) { @@ -737,8 +728,6 @@ makelink(const char *from_name, const char *to_name, } if (dolink & LN_RELATIVE) { - char *to_name_copy, *cp, *d, *ld, *ls, *s; - if (*from_name != '/') { /* this is already a relative link */ do_symlink(from_name, to_name, target_sb); @@ -758,17 +747,23 @@ makelink(const char *from_name, const char *to_name, to_name_copy = strdup(to_name); if (to_name_copy == NULL) err(EX_OSERR, "%s: strdup", to_name); - cp = dirname(to_name_copy); - if (realpath(cp, dst) == NULL) - err(EX_OSERR, "%s: realpath", cp); - /* .. and add the last component. */ - if (strcmp(dst, "/") != 0) { - if (strlcat(dst, "/", sizeof(dst)) > sizeof(dst)) + base = basename(to_name_copy); + if (base == to_name_copy) { + /* destination is a file in cwd */ + (void)strlcpy(dst, "./", sizeof(dst)); + } else if (base == to_name_copy + 1) { + /* destination is a file in the root */ + (void)strlcpy(dst, "/", sizeof(dst)); + } else { + /* all other cases: safe to call dirname() */ + dir = dirname(to_name_copy); + if (realpath(dir, dst) == NULL) + err(EX_OSERR, "%s: realpath", dir); + if (strcmp(dst, "/") != 0 && + strlcat(dst, "/", sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); } - strcpy(to_name_copy, to_name); - cp = basename(to_name_copy); - if (strlcat(dst, cp, sizeof(dst)) > sizeof(dst)) + if (strlcat(dst, base, sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); free(to_name_copy); @@ -821,7 +816,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) struct stat from_sb, temp_sb, to_sb; struct timespec tsb[2]; int devnull, files_match, from_fd, serrno, stripped, target; - int tempcopy, temp_fd, to_fd; + int temp_fd, to_fd; char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; char *digestresult; @@ -835,10 +830,8 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) if (!dolink) { if (stat(from_name, &from_sb)) err(EX_OSERR, "%s", from_name); - if (!S_ISREG(from_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", from_name); - } + if (!S_ISREG(from_sb.st_mode)) + errc(EX_OSERR, EFTYPE, "%s", from_name); } /* Build the target path. */ if (flags & DIRECTORY) { @@ -852,32 +845,18 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } else { devnull = 1; } + if (*to_name == '\0') + errx(EX_USAGE, "destination cannot be an empty string"); target = (lstat(to_name, &to_sb) == 0); if (dolink) { - if (target && !safecopy) { - if (to_sb.st_mode & S_IFDIR && rmdir(to_name) == -1) - err(EX_OSERR, "%s", to_name); -#if HAVE_STRUCT_STAT_ST_FLAGS - if (to_sb.st_flags & NOCHANGEBITS) - (void)chflags(to_name, - to_sb.st_flags & ~NOCHANGEBITS); -#endif - unlink(to_name); - } makelink(from_name, to_name, target ? &to_sb : NULL); return; } - if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) { - errno = EFTYPE; - warn("%s", to_name); - return; - } - - /* Only copy safe if the target exists. */ - tempcopy = safecopy && target; + if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (!devnull && (from_fd = open(from_name, O_RDONLY, 0)) < 0) err(EX_OSERR, "%s", from_name); @@ -899,40 +878,32 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } if (!files_match) { - if (tempcopy) { - to_fd = create_tempfile(to_name, tempfile, - sizeof(tempfile)); - if (to_fd < 0) - err(EX_OSERR, "%s", tempfile); - } else { - if ((to_fd = create_newfile(to_name, target, - &to_sb)) < 0) - err(EX_OSERR, "%s", to_name); - if (verbose) - (void)printf("install: %s -> %s\n", - from_name, to_name); - } + to_fd = create_tempfile(to_name, tempfile, + sizeof(tempfile)); + if (to_fd < 0) + err(EX_OSERR, "%s", tempfile); if (!devnull) { - if (dostrip) - stripped = strip(tempcopy ? tempfile : to_name, - to_fd, from_name, &digestresult); - if (!stripped) - digestresult = copy(from_fd, from_name, to_fd, - tempcopy ? tempfile : to_name, from_sb.st_size); + if (dostrip) { + stripped = strip(tempfile, to_fd, from_name, + &digestresult); + } + if (!stripped) { + digestresult = copy(from_fd, from_name, to_fd, + tempfile, from_sb.st_size); + } } } if (dostrip) { if (!stripped) - (void)strip(tempcopy ? tempfile : to_name, to_fd, - NULL, &digestresult); + (void)strip(tempfile, to_fd, NULL, &digestresult); /* * Re-open our fd on the target, in case * we did not strip in-place. */ close(to_fd); - to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY, 0); + to_fd = open(tempfile, O_RDONLY, 0); if (to_fd < 0) err(EX_OSERR, "stripping %s", to_name); } @@ -976,16 +947,16 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) digestresult = digest_file(tempfile); /* - * Move the new file into place if doing a safe copy - * and the files are different (or just not compared). + * Move the new file into place if the files are different (or + * just not compared). */ - if (tempcopy && !files_match) { + if (!files_match) { #if HAVE_STRUCT_STAT_ST_FLAGS /* Try to turn off the immutable bits. */ if (to_sb.st_flags & NOCHANGEBITS) (void)chflags(to_name, to_sb.st_flags & ~NOCHANGEBITS); #endif - if (dobackup) { + if (target && dobackup) { if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", to_name, suffix) != strlen(to_name) + strlen(suffix)) { unlink(tempfile); @@ -1124,86 +1095,62 @@ compare(int from_fd, const char *from_name __unused, size_t from_len, int to_fd, const char *to_name __unused, size_t to_len, char **dresp) { - char *p, *q; int rv; - int do_digest, done_compare; + int do_digest; DIGEST_CTX ctx; - rv = 0; if (from_len != to_len) return 1; do_digest = (digesttype != DIGEST_NONE && dresp != NULL && *dresp == NULL); if (from_len <= MAX_CMP_SIZE) { + static char *buf, *buf1, *buf2; + static size_t bufsize; + int n1, n2; + if (do_digest) digest_init(&ctx); - done_compare = 0; - if (trymmap(from_len) && trymmap(to_len)) { - p = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - from_fd, (off_t)0); - if (p == MAP_FAILED) - goto out; - q = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - to_fd, (off_t)0); - if (q == MAP_FAILED) { - munmap(p, from_len); - goto out; - } - rv = memcmp(p, q, from_len); - if (do_digest) - digest_update(&ctx, p, from_len); - munmap(p, from_len); - munmap(q, from_len); - done_compare = 1; + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize * 2); + if (buf == NULL) + err(1, "Not enough memory"); + buf1 = buf; + buf2 = buf + bufsize; } - out: - if (!done_compare) { - static char *buf, *buf1, *buf2; - static size_t bufsize; - int n1, n2; - - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + rv = 0; + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + while (rv == 0) { + n1 = read(from_fd, buf1, bufsize); + if (n1 == 0) + break; /* EOF */ + else if (n1 > 0) { + n2 = read(to_fd, buf2, n1); + if (n2 == n1) + rv = memcmp(buf1, buf2, n1); else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize * 2); - if (buf == NULL) - err(1, "Not enough memory"); - buf1 = buf; - buf2 = buf + bufsize; - } - rv = 0; - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); - while (rv == 0) { - n1 = read(from_fd, buf1, bufsize); - if (n1 == 0) - break; /* EOF */ - else if (n1 > 0) { - n2 = read(to_fd, buf2, n1); - if (n2 == n1) - rv = memcmp(buf1, buf2, n1); - else - rv = 1; /* out of sync */ - } else - rv = 1; /* read failure */ - if (do_digest) - digest_update(&ctx, buf1, n1); - } - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); + rv = 1; /* out of sync */ + } else + rv = 1; /* read failure */ + if (do_digest) + digest_update(&ctx, buf1, n1); } - } else + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + } else { rv = 1; /* don't bother in this case */ + } if (do_digest) { if (rv == 0) @@ -1235,65 +1182,6 @@ create_tempfile(const char *path, char *temp, size_t tsize) return (mkstemp(temp)); } -/* - * create_newfile -- - * create a new file, overwriting an existing one if necessary - */ -static int -create_newfile(const char *path, int target, struct stat *sbp) -{ - char backup[MAXPATHLEN]; - int saved_errno = 0; - int newfd; - - if (target) { - /* - * Unlink now... avoid ETXTBSY errors later. Try to turn - * off the append/immutable bits -- if we fail, go ahead, - * it might work. - */ -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags & ~NOCHANGEBITS); -#endif - - if (dobackup) { - if ((size_t)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix) != strlen(path) + strlen(suffix)) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - errx(EX_OSERR, "%s: backup filename too long", - path); - } - (void)snprintf(backup, MAXPATHLEN, "%s%s", - path, suffix); - if (verbose) - (void)printf("install: %s -> %s\n", - path, backup); - if (rename(path, backup) < 0) { - saved_errno = errno; -#if HAVE_STRUCT_STAT_ST_FLAGS - if (sbp->st_flags & NOCHANGEBITS) - (void)chflags(path, sbp->st_flags); -#endif - errno = saved_errno; - err(EX_OSERR, "rename: %s to %s", path, backup); - } - } else - if (unlink(path) < 0) - saved_errno = errno; - } - - newfd = open(path, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR); - if (newfd < 0 && saved_errno != 0) - errno = saved_errno; - return newfd; -} - /* * copy -- * copy from one file to another @@ -1306,77 +1194,52 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, static size_t bufsize; int nr, nw; int serrno; - char *p; - int done_copy; DIGEST_CTX ctx; /* Rewind file descriptors. */ - if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(from_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", from_name); - if (lseek(to_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(to_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", to_name); digest_init(&ctx); - done_copy = 0; - if (trymmap((size_t)size) && - (p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED, - from_fd, (off_t)0)) != MAP_FAILED) { - nw = write(to_fd, p, size); - if (nw != size) { + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize); + if (buf == NULL) + err(1, "Not enough memory"); + } + while ((nr = read(from_fd, buf, bufsize)) > 0) { + if ((nw = write(to_fd, buf, nr)) != nr) { serrno = errno; (void)unlink(to_name); if (nw >= 0) { errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, (uintmax_t)size); + "short write to %s: %jd bytes written, " + "%jd bytes asked to write", + to_name, (uintmax_t)nw, + (uintmax_t)size); } else { errno = serrno; err(EX_OSERR, "%s", to_name); } } - digest_update(&ctx, p, size); - (void)munmap(p, size); - done_copy = 1; + digest_update(&ctx, buf, nr); } - if (!done_copy) { - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); - else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize); - if (buf == NULL) - err(1, "Not enough memory"); - } - while ((nr = read(from_fd, buf, bufsize)) > 0) { - if ((nw = write(to_fd, buf, nr)) != nr) { - serrno = errno; - (void)unlink(to_name); - if (nw >= 0) { - errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, - (uintmax_t)size); - } else { - errno = serrno; - err(EX_OSERR, "%s", to_name); - } - } - digest_update(&ctx, buf, nr); - } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); - errno = serrno; - err(EX_OSERR, "%s", from_name); - } + if (nr != 0) { + serrno = errno; + (void)unlink(to_name); + errno = serrno; + err(EX_OSERR, "%s", from_name); } if (safecopy && fsync(to_fd) == -1) { serrno = errno; @@ -1600,29 +1463,3 @@ usage(void) exit(EX_USAGE); /* NOTREACHED */ } - -/* - * trymmap -- - * return true (1) if mmap should be tried, false (0) if not. - */ -static int -trymmap(size_t filesize) -{ - /* - * This function existed to skip mmap() for NFS file systems whereas - * nowadays mmap() should be perfectly safe. Nevertheless, using mmap() - * only reduces the number of system calls if we need multiple read() - * syscalls, i.e. if the file size is > MAXBSIZE. However, mmap() is - * more expensive than read() so set the threshold at 4 fewer syscalls. - * Additionally, for larger file size mmap() can significantly increase - * the number of page faults, so avoid it in that case. - * - * Note: the 8MB limit is not based on any meaningful benchmarking - * results, it is simply reusing the same value that was used before - * and also matches bin/cp. - * - * XXX: Maybe we shouldn't bother with mmap() at all, since we use - * MAXBSIZE the syscall overhead of read() shouldn't be too high? - */ - return (filesize > 4 * MAXBSIZE && filesize < 8 * 1024 * 1024); -} From nobody Sat Apr 27 14:58: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 4VRXm924Xmz5JGsp; Sat, 27 Apr 2024 14:58: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 4VRXm90gdbz42rk; Sat, 27 Apr 2024 14:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+PV8hAxpO41QDGF3mgogNU0h8qSxcOUg7eRciShvbc=; b=aaPT+1cV6x/HKb8uvrHkH2s3bNBu3pLQ4e5+AQgmoCQ3wrTwOwtfXovMTOvpSsl5/i3YVR 4ZypdHU7Xol1BA6zqgfm+GdVZ331t0fT4wijSbrFftxZ/aKBooPR9vaRJE1wpVB4h/I2vw CZJJhHm5UR9kap+jm4Or0x25Z1cjdUdPLTEXCmzQp2gf5DytRp1qs0xPGD4mJjm4ogyGjN A/zrij5GBr/vGXhSFpX5Ww48S19lQ+rc4cUZ65DLS3+z5GWBO2ZFjHCai5yKPCaX95XIMf RO0vaTfUjoeGe6Twq3Txfignz1bK3ZkM98qEaDqWUgH7nej80CHV7MV3XKnJMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229929; a=rsa-sha256; cv=none; b=kzf+2GbNKID22U913gxIgs+9UFnEoTZd51ZhQUj1cbNrAjxsGvkxuZSRf7lsZcNL4+0ijZ y0hw4m3dPetJzyeiIAI+B2RWiNc38dh15wYc8DqlWTU2BUsCNKH16S6GBMxV+oUNqZ1rQF 6AyhF82FaeraNvTQHYonQSv3w9G5eqkSUOP/rFTgB5XMbvTQbfyTqf5OIcLPhzC87EkpZV ZAbf9EOLvM2bsACtEcm/iOlRPB2wDWCF7EDsLnDXiVVGMLbAChGcHsGeu2KUcxp0A22utA PUlvmpOmp4dnJtCUsmc8eUQk1Od6n4o3zKV1RNVoc40oCFpG0BOL/CBnuGLSCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+PV8hAxpO41QDGF3mgogNU0h8qSxcOUg7eRciShvbc=; b=oInqOgCL01Bmxce74Vs/nqefakxVhhzuIAH/ZHTdWAKam6iZgafh4y8OHxewxWOAX+J2XR etdQrE+uQ8AI3woGfU864s286FQxpZo6kiBQ9/4HuG6OWbDJUnBhsE22gnci4Rr0SXSLMr 0/MpeDWt1IWFdeud8vnzCRzP4mY/Jla1fhsSneaCImBk2WrQWrcBKnVmAospoi31P2La/R /PS6rYcRHPrjvIXhdgGGqNQVoSMBnXiBtImjSq8rH5Ac4Z4w+0vRBMaw3YadkzYEodslAw mZczqLXw3gTP0arxzmPgM4eTbTGwMFShcvkAZYr9bnPaTDDm6kUCg4EjWgraFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRXm868lSzWlD; Sat, 27 Apr 2024 14:58: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 43REwmFI032623; Sat, 27 Apr 2024 14:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwmsr032620; Sat, 27 Apr 2024 14:58:48 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:48 GMT Message-Id: <202404271458.43REwmsr032620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 17997507040c - stable/13 - cp: Clarify an obscure comment. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17997507040c4ad1c6a25ce93c3981ee19ce28c0 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=17997507040c4ad1c6a25ce93c3981ee19ce28c0 commit 17997507040c4ad1c6a25ce93c3981ee19ce28c0 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:40 +0000 cp: Clarify an obscure comment. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44805 (cherry picked from commit 64d6925d1901637125f9f739282e72c992657dc8) cp: Additional sanity check. Once we've successfully opened the file we've been asked to copy, check that it's of the same type as FTS told us it was. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44806 (cherry picked from commit 9075d4cfad5b339aabdf8033623a2164898c2786) cp: Use warnc(). MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit f070188c3ad6b87ee9ce220b21718333d1bd9d52) --- bin/cp/cp.c | 13 +++++++++---- bin/cp/utils.c | 27 ++++++++++++++++++++------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index af7d5ffac398..a8c57308ae96 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -316,8 +316,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) case FTS_NS: case FTS_DNR: case FTS_ERR: - warnx("%s: %s", - curr->fts_path, strerror(curr->fts_errno)); + warnc(curr->fts_errno, "%s", curr->fts_path); badcp = rval = 1; continue; case FTS_DC: /* Warn, continue. */ @@ -491,13 +490,19 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) switch (curr->fts_statp->st_mode & S_IFMT) { case S_IFLNK: - /* Catch special case of a non-dangling symlink. */ if ((fts_options & FTS_LOGICAL) || ((fts_options & FTS_COMFOLLOW) && curr->fts_level == 0)) { + /* + * We asked FTS to follow links but got + * here anyway, which means the target is + * nonexistent or inaccessible. Let + * copy_file() deal with the error. + */ if (copy_file(curr, dne)) badcp = rval = 1; - } else { + } else { + /* Copy the link. */ if (copy_link(curr, !dne)) badcp = rval = 1; } diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 0bb5157e3f57..9f6ef888c7ea 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -106,21 +106,34 @@ copy_fallback(int from_fd, int to_fd) int copy_file(const FTSENT *entp, int dne) { - struct stat *fs; + struct stat sb, *fs; ssize_t wcount; off_t wtotal; int ch, checkch, from_fd, rval, to_fd; int use_copy_file_range = 1; + fs = entp->fts_statp; from_fd = to_fd = -1; - if (!lflag && !sflag && - (from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) { - warn("%s", entp->fts_path); - return (1); + if (!lflag && !sflag) { + if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 || + fstat(from_fd, &sb) != 0) { + warn("%s", entp->fts_path); + return (1); + } + /* + * Check that the file hasn't been replaced with one of a + * different type. This can happen if we've been asked to + * copy something which is actively being modified and + * lost the race, or if we've been asked to copy something + * like /proc/X/fd/Y which stat(2) reports as S_IFREG but + * is actually something else once you open it. + */ + if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) { + warnx("%s: File changed", entp->fts_path); + return (1); + } } - fs = entp->fts_statp; - /* * If the file exists and we're interactive, verify with the user. * If the file DNE, set the mode to be the from file, minus setuid From nobody Sat Apr 27 17:46: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 4VRcTh357Yz5JYQH; Sat, 27 Apr 2024 17:46: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 4VRcTg6fHxz4cg0; Sat, 27 Apr 2024 17:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714239991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJ8quz4v64ffauJq07kQYdegH9cebyDCQoonxRBugEQ=; b=vSk/4GSSGtDzGlJM/MqBxvO0yBRwwVm9TLSDXBNdMJoSXMFR1avHD1ksZG/RUJs4Zp/mWC /snkiyaScQbwT6zgnPG4C0djjLyxEwKV4U8gDbc1rLuBMOJTNFy5WJ48A2e7d6bNqqX1UX H0MSakvO2pGM/Un2CaHV3e4vYZTu8TnMNwIwMdlJJBeg7IG9X4IqemCWv/lJK1bRd3UES1 dM+nlOciqR0qnwYvH1EVE6Kju2A3yWZDeN1Z++HBnqYRc+ZcEbbSPGoD2+yyIPaSc2zOS7 tM2fILkx1jBiV9Xb5Opdfb840OM3OrgRlGTZMe5z90D84uywvEktR4jg0ju1Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714239991; a=rsa-sha256; cv=none; b=swDaApWuLkODQ1HTL/2vrKLDlK6lxuTJSfv+vR76zWLlAzrVYZjswYsvr65JfW4wKnWUxq l/VXpU63goIC7xkY5aAoThkjnFE+AmUUpi6WalhD7WpZvU9mr24HLJHD8aBGNgx3qxq/OG vhlEOYgJVyKGLjI+Zyu5WIzML6sqQbRBWWH805OmLnWuTdM8bvbTlXE68/BK3EShrGcixB YhFCNsO7PidXAmcRZYFHGc9JCVgSIkirZPNDhSt5CAqHAcTSGch80R94K43cI26Y0EW7UN 1PMkok6KmWr9HRaj5u5nh7nhbupuQHW+qCK+RrCXSg1sNhYsEtRfJVcsHIZTaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714239991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJ8quz4v64ffauJq07kQYdegH9cebyDCQoonxRBugEQ=; b=fTJNy5uV+3Qs+oRSZan8w8Zi3ySeqH6I4LIWLD7abUFyLPCYBq+n9rLfrT6UBT4Q49MGmR dm51cQARM2SQlq8u6/mtCrqQt0bUjRTPJyJS1VZJGxNzDbRaLYKcH02GlI53EI6a1XH10/ ZNrGLSylm2O3cbrvTTFZ5ve+Odk3gDlJSY07kC2mfp6907pUbgveNZDrfldbx3OGKuBv6E K9+HyFosWG/LNut/cQpHQFhLl/8efe91lzEqS5b4JD2CPOSG0hcLmEdJZVrOWI7tcgxh0y nCqbhO+cT0w92JA1nGIbNgi3e8M28BXUCpz0LBxEPGqgZhwqB4IpYA4a/H/KuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRcTg6FSZzrPB; Sat, 27 Apr 2024 17:46: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 43RHkVmL020324; Sat, 27 Apr 2024 17:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RHkVLN020321; Sat, 27 Apr 2024 17:46:31 GMT (envelope-from git) Date: Sat, 27 Apr 2024 17:46:31 GMT Message-Id: <202404271746.43RHkVLN020321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: c8d6c9351a92 - stable/14 - unionfs_lookup(): fix wild accesses to vnode private data List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8d6c9351a9255becf3a772be441d4648b998306 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d6c9351a9255becf3a772be441d4648b998306 commit c8d6c9351a9255becf3a772be441d4648b998306 Author: Jason A. Harmening AuthorDate: 2024-02-18 00:19:32 +0000 Commit: Jason A. Harmening CommitDate: 2024-04-27 17:42:36 +0000 unionfs_lookup(): fix wild accesses to vnode private data There are a few spots in which unionfs_lookup() accesses unionfs vnode private data without holding the corresponding vnode lock or interlock. Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D44601 (cherry picked from commit b18029bc59d2ed6b0eeeb233189cf713b34b467c) --- sys/fs/unionfs/union_vnops.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 5a2d4751ed4f..eff437fbcad3 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -81,7 +81,7 @@ static int unionfs_lookup(struct vop_cachedlookup_args *ap) { - struct unionfs_node *dunp; + struct unionfs_node *dunp, *unp; struct vnode *dvp, *udvp, *ldvp, *vp, *uvp, *lvp, *dtmpvp; struct vattr va; struct componentname *cnp; @@ -141,6 +141,9 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) if (dtmpvp == udvp && ldvp != NULLVP) { VOP_UNLOCK(udvp); vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); + dunp = VTOUNIONFS(dvp); + if (error == 0 && dunp == NULL) + error = ENOENT; } if (error == 0) { @@ -154,14 +157,15 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) VOP_UNLOCK(vp); vrele(vp); + dtmpvp = dunp->un_dvp; + vref(dtmpvp); VOP_UNLOCK(dvp); - *(ap->a_vpp) = dunp->un_dvp; - vref(dunp->un_dvp); + *(ap->a_vpp) = dtmpvp; if (nameiop == DELETE || nameiop == RENAME) - vn_lock(dunp->un_dvp, LK_EXCLUSIVE | LK_RETRY); + vn_lock(dtmpvp, LK_EXCLUSIVE | LK_RETRY); else if (cnp->cn_lkflags & LK_TYPE_MASK) - vn_lock(dunp->un_dvp, cnp->cn_lkflags | + vn_lock(dtmpvp, cnp->cn_lkflags | LK_RETRY); vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); @@ -274,8 +278,12 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); lockflag = 1; } - error = unionfs_mkshadowdir(MOUNTTOUNIONFSMOUNT(dvp->v_mount), - udvp, VTOUNIONFS(vp), cnp, td); + unp = VTOUNIONFS(vp); + if (unp == NULL) + error = ENOENT; + else + error = unionfs_mkshadowdir(MOUNTTOUNIONFSMOUNT(dvp->v_mount), + udvp, unp, cnp, td); if (lockflag != 0) VOP_UNLOCK(vp); if (error != 0) { From nobody Sun Apr 28 00:36: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 4VRnZv5gkYz5KBKd; Sun, 28 Apr 2024 00:36: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 4VRnZv3gYFz4RKd; Sun, 28 Apr 2024 00:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714264599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mrf0AlnaZyB2OizQHN9mT60OwmjUzxe3aW0iuWEJU3g=; b=iI6X4nGx138hy1dVYZKz0kezmqtrunvi5OrJ1fW6oASyPdHRBCK2aMOY1sqxslfdCyYbKf 7PgckxDSrxEUEdn4HrK1uAv2I/15YR4azSpVLRkpHL3mlUr8aWA9xCx5FMzi0D7leD/EoW Vi99ikVQCi6p9S/rJPjc/4zf6GoNlVNlMdi88pK26q1bJ+Xarw2N2Eig0O2N8u65wb9WYD XQ0RozoadIoLXpSIaGspzTSia3ZFPSak1OyvMGQ9SWM7VXFasYzdqWPwAe9m53SMrIyZRh CLINiR5ex7EQArwc0uTbJpeQIZWfprxOPBzrjj1uODVp6wutfAdX9lX4R2TVew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714264599; a=rsa-sha256; cv=none; b=rsmgzNgwDHLjO8VIbPr2pRSpHvFxngr2cQ5ynbI0XeGbpzaMalX8W13PaU7aDkHDrjxUkl kCTtcaP/kbYl/RVJWkn/WlYgM6WmxsOlbOQRUkWOUWARxrn8uf6L2V6FpBtDaE9IwFaZs7 ImELTcJIBgFA4TreX7tAQFG4NgPdE+ifZN1QO2mxzUy3fJsQhOoUV36wKj+BQiEfLSYcgi RzMuxDrXM+mPDGF7wUIbaI7f4gFzphaLpUCO+5YolbRxkXBelN9tdjeucPGkSwOB+4yCr5 BfKF25y663kXGJYzOHnN8Ag/ZemGkuQb+px84qUpZBuph8aP4Rov5J8wVxaqhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714264599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mrf0AlnaZyB2OizQHN9mT60OwmjUzxe3aW0iuWEJU3g=; b=bLxJrJKth2V8yWEPEVPBtqB1rLEnHC7fBSSgxjYU0CRp6MW/FKEFpf1rO0DrQPKWCcUmEM wfCs6UO7sET9wPxrz4zvxda+cb+WtNBYtRQXYt9zcEalljM8cQfbmvzEsP4V9NHxO764TO bO/RmGnXt8q0cCfoLAGuBBq+62a8/FcJifuiA6AInVSl0wGEIFk6nQrJQAlqJQeGp/T9cn Sl4R2KvlucnjgBoLuAfqJffve+SsMR0SOidN0IvW3tbyW6j5dws4SdcBvi7+bqEWGLO2Fr 6cCnaSaoLPyKyf3iVXGIlTsW2785yMQIbUw7dWNdh/pdlVUAeqQ9WCqS4zJ09A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRnZv3GB1z13Ff; Sun, 28 Apr 2024 00:36: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 43S0adke012966; Sun, 28 Apr 2024 00:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S0adE5012963; Sun, 28 Apr 2024 00:36:39 GMT (envelope-from git) Date: Sun, 28 Apr 2024 00:36:39 GMT Message-Id: <202404280036.43S0adE5012963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 2fe5dc8691d5 - stable/14 - nfscl: Revert part of commit 196787f79e67 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fe5dc8691d5b90b06818b417da9b01683b49e68 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2fe5dc8691d5b90b06818b417da9b01683b49e68 commit 2fe5dc8691d5b90b06818b417da9b01683b49e68 Author: Rick Macklem AuthorDate: 2024-04-25 19:32:02 +0000 Commit: Rick Macklem CommitDate: 2024-04-28 00:35:22 +0000 nfscl: Revert part of commit 196787f79e67 Commit 196787f79e67 erroneously assumed that the client code for Open/Claim_deleg_cur_FH was broken, but it was not. It was actually wireshark that was broken and indicated that the correct XDR was bogus. This reverts the part of 196787f79e67 that changed the arguments for Open/Claim_deleg_cur_FH. Found during the IETF bakeathon testing event this week. (cherry picked from commit 8efba70d7914324890b1f8fe3079036eb2b5c3db) --- sys/fs/nfsclient/nfs_clrpcops.c | 33 ++++++++++----------------------- sys/fs/nfsclient/nfs_clstate.c | 23 +---------------------- sys/fs/nfsclient/nfsmount.h | 1 - 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 09660730d485..75bb5236cb65 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -561,34 +561,21 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, *tl = txdr_unsigned(delegtype); } else { if (dp != NULL) { - if (NFSHASNFSV4N(nmp)) { + if (NFSHASNFSV4N(nmp)) *tl = txdr_unsigned( NFSV4OPEN_CLAIMDELEGATECURFH); - NFSLOCKMNT(nmp); - if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) != - 0) { - NFSUNLOCKMNT(nmp); - /* - * Add a stateID argument to make old - * broken FreeBSD NFSv4.1/4.2 servers - * happy. - */ - NFSM_BUILD(tl, uint32_t *,NFSX_STATEID); - *tl++ = 0; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; - } else - NFSUNLOCKMNT(nmp); - } else { + else *tl = txdr_unsigned(NFSV4OPEN_CLAIMDELEGATECUR); - NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); + NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); + if (NFSHASNFSV4N(nmp)) + *tl++ = 0; + else *tl++ = dp->nfsdl_stateid.seqid; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; + *tl++ = dp->nfsdl_stateid.other[0]; + *tl++ = dp->nfsdl_stateid.other[1]; + *tl = dp->nfsdl_stateid.other[2]; + if (!NFSHASNFSV4N(nmp)) (void)nfsm_strtom(nd, name, namelen); - } } else if (NFSHASNFSV4N(nmp)) { *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); } else { diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index ebc11efea637..9fbaa6e63a56 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -4512,7 +4512,6 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, { int error; struct nfscldeleg *dp; - bool try_busted_xdr; dp = *ndpp; do { @@ -4520,29 +4519,9 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, error = nfsrpc_openrpc(nmp, vp, fhp, fhlen, newfhp, newfhlen, mode, op, name, namelen, ndpp, reclaim, delegtype, cred, p, 0, 0); - try_busted_xdr = false; if (error == NFSERR_DELAY) (void) nfs_catnap(PZERO, error, "nfstryop"); - else if (error == NFSERR_EXPIRED && NFSHASNFSV4N(nmp) && - reclaim == 0 && dp != NULL) { - /* This case is a Claim_Deleg_Cur_FH Open. */ - NFSLOCKMNT(nmp); - if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) == 0) { - /* - * Old FreeBSD NFSv4.1/4.2 servers erroneously - * expect a stateID argument for Open - * Claim_Deleg_Cur_FH and interpret the - * Getattr reply as a stateID. This results - * in an NFSERR_EXPIRED failure. - * Setting NFSMNTP_BUGGYFBSDSRV makes the Open - * send a stateID, in violation of RFC8881. - */ - try_busted_xdr = true; - nmp->nm_privflag |= NFSMNTP_BUGGYFBSDSRV; - } - NFSUNLOCKMNT(nmp); - } - } while (error == NFSERR_DELAY || try_busted_xdr); + } while (error == NFSERR_DELAY); if (error == EAUTH || error == EACCES) { /* Try again using system credentials */ newnfs_setroot(cred); diff --git a/sys/fs/nfsclient/nfsmount.h b/sys/fs/nfsclient/nfsmount.h index 7571add27b9c..37b84a015dab 100644 --- a/sys/fs/nfsclient/nfsmount.h +++ b/sys/fs/nfsclient/nfsmount.h @@ -124,7 +124,6 @@ struct nfsmount { #define NFSMNTP_DELEGISSUED 0x00000400 #define NFSMNTP_NODEALLOCATE 0x00000800 #define NFSMNTP_FAKEROOTFH 0x00001000 -#define NFSMNTP_BUGGYFBSDSRV 0x00002000 /* New mount flags only used by the kernel via nmount(2). */ #define NFSMNT_TLS 0x00000001 From nobody Sun Apr 28 01:37: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 4VRpxS5G3sz5HKN6; Sun, 28 Apr 2024 01:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRpxS4hYZz4Xxq; Sun, 28 Apr 2024 01:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVnJiXVE99Br+4XfOzo8LgsGRwTVXvX/AUqckD7cjqk=; b=Kr9mVFg389I46OqCzxSSPqKP6ovCqFuYUcHuKYF1Hrpg+2QV2oKfYi1AZjW9xE5+uFwMGZ OCw1hxZaHK9BwbP5EkCLU7pDPVrpCutX7YHorSJKn41qo+LsipenWEn8sZEnK6kT9RHCpf rtZyIJVQj86m7I0MvwcXptC2ZA5FfEU/YYYftitK3CvFjqLa9ioRYOHGckGw4cTJ8rtHTi 6T5zETP5KGV3z8nSrAgGEi2PvnqcjhuznuVXCDQhJOBc9lNg1SC8g9WqQ5o0FThI3z0vM3 p5M1ZXcTdamD81fp5KttzkzXyFwkrbCoWBDU0Ny34WtTeVRKGYm0kJPu6LLaEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714268268; a=rsa-sha256; cv=none; b=JgR63Cc8CbUOSbmjGBUFi24b3NVHI92M9nsjJSiyqt8liiUKw/9p/I9nhxeonzNVffezd6 zAlXK0Kb+nhpqFWBZcMq7EX2e5uKOBDgHLG9ZCxQee3F9XxuyD7O0pif+Snm+D243kWjN8 5xPbf6nEdxeo4P5mkzBPmzFFsUl9KzdF8SFgO/jKwhwGhpTyDYCkP9A09x0KXxKPlVAEyU zLQ5nWTPqE6945ujo1fdVq2AhXvHT7FIOibUdkr7y//NgOFIEv04+mEK+/X1lwHTEWWBx3 S976WadIR9R57sKvNZGGyO9Nua75TwwaPqtbMXxrCL+7pufnMep/csk3UOs/oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVnJiXVE99Br+4XfOzo8LgsGRwTVXvX/AUqckD7cjqk=; b=Jt1r0kBaHhYbt7Mh5TLuMUULKcPQDtz8xU4o6bljcDmmBLuium5xX7Mx+/4quaIEwhPCPj yGmL9e5ItzKDsw5YbfGrig1xru+ZISkzaiFLsR66zKFJiFffsooqF1HeE9p54Cmp8ZjAts Tduy5qYcn0BabhsGR1pjV2FRe6nyegEuRAm/6+KbxnrPCEHnTrRbaRK4mCthvPIZg8/ZHx mLpYCSCAkmptW1TqzV/d7qTPubgMa0KxIPmMpXqgV1h9nQSTpHQbcy6pR2uoo+iSacWePq 1761K64x19NiFjRsEwN1/KPunMuhfiHE1q61PQ8XWkCN3FNOdxJWGJCD/6tekA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRpxS3s1cz15Ks; Sun, 28 Apr 2024 01:37: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 43S1bmRq014017; Sun, 28 Apr 2024 01:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S1bmSd014014; Sun, 28 Apr 2024 01:37:48 GMT (envelope-from git) Date: Sun, 28 Apr 2024 01:37:48 GMT Message-Id: <202404280137.43S1bmSd014014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: aab71045646b - stable/14 - Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aab71045646b7cd17a96a4fa73635a558ab40805 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=aab71045646b7cd17a96a4fa73635a558ab40805 commit aab71045646b7cd17a96a4fa73635a558ab40805 Author: Rick Macklem AuthorDate: 2024-04-25 16:41:23 +0000 Commit: Rick Macklem CommitDate: 2024-04-28 01:36:04 +0000 Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" This reverts commit f300335d9aebf2e99862bf783978bd44ede23550. It turns out that the old code was correct and it was wireshark that was broken and indicated that the RPC's XDR was bogus. Found during IETF bakeathon testing this week. (cherry picked from commit 54c3aa02e926268ba5551cd7d28fddf38b3589a2) --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++-------- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 899e88508b60..8141ee6cbdb6 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3003,18 +3003,12 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == + NFSV4OPEN_CLAIMDELEGATECURFH) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; - } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { - /* Fill in most of the stateid from the clientid. */ - stateid.seqid = 0; - stateid.other[0] = clientid.lval[0]; - stateid.other[1] = clientid.lval[1]; - stateid.other[2] = 0; - stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index da57ebde7a52..c73840277022 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2568,10 +2568,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2582,8 +2578,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2834,10 +2830,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2848,8 +2840,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Sun Apr 28 01:42: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 4VRq2R4hldz5HKyV; Sun, 28 Apr 2024 01:42: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 4VRq2R4Gftz4YL3; Sun, 28 Apr 2024 01:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROXVjeUn1TpZjVkDTlPRMhxSzo7V/C7KTUwCe0pLaOc=; b=UpmkppWfuuFxtT45N+JzdR8GnFForM+sIs12WB+v1OMPRnQH8Kqg8IwI3QTn2BUbC3dFIj TysQqFXnJ5hXpSMeEk0xcyHX9srRxajt8eR8Co6vmy0unxJM+9Z2/X44QECekR6CI2ywZx dWVbS77Mb8jEibZduLs448ff1K+Ln59dCIf/P8vFOIh5/NBh2vQY2FhCB77wRlKdO1IMAW h++Jqzen9P5L7moKAT9w7oAzuLHnfdvchbef0qzdF3MilIJUYFZT6eBbxkzvq4V3e+2wKw N7MmRPRZ2L94TubtMQd5noT9lEAj6tRKX5tARzExPwYP2pBpIIh0JcIRQZ6b8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714268527; a=rsa-sha256; cv=none; b=UDpBlQPtfLqjOUVheSfjsNl24yIBPLhGd4paGF54HDGdVbp4UXTwdoRL7wRyja9Fh+NuAP YASD2g5JAsgiNHCKkcr2QD9WEETvjkDXKQLAkbvGtpjkK887B1OtmcGC6gSo7wFKGP/eLh zN9Yx2sHcuqImHhRgYb3QQuWK9kg/o/3mXVipot0IvwXuwx6zWZ31zb53SQ1YwSD7cy6tv Es+DbqY+IUqRdSA97+977VYfV0VnSzez/mdxLFYm68MtVNmkNoign6p7JQe4D53tJLd1dx jRC4YMQWMnSZgGyQ2CbYx1YdiaCNtxcjLCVU0yiMmCM+6DveHzmnsQZs1a+zdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714268527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROXVjeUn1TpZjVkDTlPRMhxSzo7V/C7KTUwCe0pLaOc=; b=ZOiMxN8giPZxcmM51w2IoF7Mvbs5i6ur98B4mr9gpiKWve2gUG6MCXkdXvqaupjgpl3p1J uEP2X9QsbrhC91jAqjzTnEyFov2aje7Mth+V2OpmBeTty4zdUTrd9SgFlFeeqFmzAXRrnC 3AG4pIlSuf1jX4JNqjjN/IZyrcd3xtescvvSFHSTv+04wsysaXX6qVSb5y7S4MCyo884xn lEt2XCo5o4OZcTCTf+DF8gccHSVg+TLibrtgIyS86sJ2+UVKNqmiTW6YAsx445/ZRlwHhJ n25/wrBIy47DBDBjFVMxILD2h1ZlSSBZBdV68/cr1FBqpZ9N3O66S/XCe2Ufew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRq2R3tdJz15Hx; Sun, 28 Apr 2024 01:42: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 43S1g7Fl027107; Sun, 28 Apr 2024 01:42:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S1g7Qx027104; Sun, 28 Apr 2024 01:42:07 GMT (envelope-from git) Date: Sun, 28 Apr 2024 01:42:07 GMT Message-Id: <202404280142.43S1g7Qx027104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: fba90651e430 - stable/13 - Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fba90651e4308508465d7bb02b8d55759922a312 Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fba90651e4308508465d7bb02b8d55759922a312 commit fba90651e4308508465d7bb02b8d55759922a312 Author: Rick Macklem AuthorDate: 2024-04-25 16:41:23 +0000 Commit: Rick Macklem CommitDate: 2024-04-28 01:41:12 +0000 Revert "nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH" This reverts commit f300335d9aebf2e99862bf783978bd44ede23550. It turns out that the old code was correct and it was wireshark that was broken and indicated that the RPC's XDR was bogus. Found during IETF bakeathon testing this week. (cherry picked from commit 54c3aa02e926268ba5551cd7d28fddf38b3589a2) --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++-------- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index c1ba36347b4c..437f4b1c685d 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3006,18 +3006,12 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == + NFSV4OPEN_CLAIMDELEGATECURFH) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; - } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { - /* Fill in most of the stateid from the clientid. */ - stateid.seqid = 0; - stateid.other[0] = clientid.lval[0]; - stateid.other[1] = clientid.lval[1]; - stateid.other[2] = 0; - stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index f54459947f44..06d0b79f10d5 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2555,10 +2555,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2569,8 +2565,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2821,10 +2817,6 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. - * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides - * the clientid, which is the first two "other" elements - * for the stateid. This should be sufficient, since there - * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2835,8 +2827,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - stateidp->other[0] == stp->ls_stateid.other[0] && - stateidp->other[1] == stp->ls_stateid.other[1]) + !NFSBCMP(stateidp->other, stp->ls_stateid.other, + NFSX_STATEIDOTHER)) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Sun Apr 28 05:20: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 4VRvty4VgLz5HxfK; Sun, 28 Apr 2024 05:20: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 4VRvty1bmvz4tR6; Sun, 28 Apr 2024 05:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLYJ6HXR+c8JcWyU0Lkji7cqe98uLje59jxok7uUn3U=; b=ljL+vfDsw6bz79cEuUiGn53bzoOjkaY4BVUiTq+r88YnCMVKcwCb4b3sieG5IrUCQWD9c3 IguOqriCgOuklusYyOPL3/MWrXD2QkhAA3SI8K+fAyxx3fGYz0vOduwfWIbfjW2cbE1fB+ Ve+PrvBMYZathHVybY5jyYprBRs/QNYIcScgRlWvZ8nQMdNkmwwEMEMg8KEiJM+V71oEDe wKpVeMjcYHhJ2YG9Z5s5UMzFUj2AQpKiwcgZRnVkWORk8YP8P1/jfzZIAXD74UYvgawiW2 WYRLiyt/tR2/Irf0mCalN5Q7bbpfdjMyZvx/9FDaHQDZsAmO3DqUGmUYqY+6Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281658; a=rsa-sha256; cv=none; b=irExsFQrxT7e5HykArqoVLWXnRmY0//m1zqnT0bZ7MqhPK5lVEwy2S8SM6WlpU36fT7Ipy +rf9bwVtOGc7OCQh4jQtTuwU+NimHsdr81mMgLAH2tWWDt5PPvlyEoJPnfhX3oWmdaWIvm 7TW+41VbFkM/W3SmqhQmXP+QCM1niHQL6RD7g9i/dmfXNgxGjSIX0Q1WqfraIeW66/URmr WyRLX8oiN0WD5GDke6mODfgtckkP2ere5i4FprG/uDTG5bQlXmgPnyX6E32FfMaIN5mBLn qZhZ824RpiWXPG6h40/eGDYFi7AL/6SnLKnSF2WvWj7/QE8EzYiCJBx+lyIIZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLYJ6HXR+c8JcWyU0Lkji7cqe98uLje59jxok7uUn3U=; b=PjBkrAHa9SmbYLI3SN+2rbFFO7PYnAnVdtXulVTkgRcoRTfGLy5Araq/RvBLvyDf2kQmvW KfdccOTCBadKWdZnmwKJexgEyYrHUIohLe65tBomuoQIXPOzGG99XiPDkeycRwjEKmATFE 5Efv/4ScsamFttonoJ685WQksKBcdbnSbvruCFb5QzxNcksPvxOLZTuvHbHb2fGwOgtnVd rGyCwUP+jYw6BszwcYZcgVTmRwZWIcKhfLgRkKKdG5qNK2z9HbDZa/OmxZT5oUSdEdn7F4 eq6XuFagb0Keu90ERSmiHoVC8HzS5vAlmKDOv11hNqNr+8Et2VzhB+p1b8ikGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvty1BnWz1BWR; Sun, 28 Apr 2024 05:20: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 43S5KwCH096854; Sun, 28 Apr 2024 05:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5Kw4W096851; Sun, 28 Apr 2024 05:20:58 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:20:58 GMT Message-Id: <202404280520.43S5Kw4W096851@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: 025a5f6b2540 - stable/14 - vmm(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 025a5f6b2540682c69ac63f7754ce74b43441034 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=025a5f6b2540682c69ac63f7754ce74b43441034 commit 025a5f6b2540682c69ac63f7754ce74b43441034 Author: Gordon Bergling AuthorDate: 2024-04-21 07:44:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:20:46 +0000 vmm(4): Fix a typo in a kernel message - s/cant/can't/ (cherry picked from commit 8b5c5cae92d5b44f03636540a787fd6e994ce816) --- sys/amd64/vmm/amd/ivrs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index 7dd68d8aea95..34aebc62fed4 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -416,7 +416,7 @@ ivhd_identify(driver_t *driver, device_t parent) if (ivhd_devs[i] == NULL) { ivhd_devs[i] = device_find_child(parent, "ivhd", i); if (ivhd_devs[i] == NULL) { - printf("AMD-Vi: cant find ivhd%d\n", i); + printf("AMD-Vi: can't find ivhd%d\n", i); break; } } From nobody Sun Apr 28 05:21: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 4VRvw21HFLz5HxQv; Sun, 28 Apr 2024 05:21: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 4VRvw20qStz4v2B; Sun, 28 Apr 2024 05:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Exq51H1Bpvvl3BhrJHa29HVJ4bfMNoROpZCFq5iu5OA=; b=SozCiF6+Ke2DcFfoYC5P/t70tce6bqNUADgKrrSwtYL5H2+LtEO+pCrviUIqUggOoKYI0/ 2cYvSBaoYuX5hcZzkOrzYzCFEL2K+YF/C8H8bk/7JZSCInmwcvNwW6HI9SwCZOXkWD8Al/ tvjEjGgG8sevZoVLtCZfMVkQGRQz1ZPbZ6uMuUJvfmKNa6ZAmhf6L7W5OWd8kO0F0uc8I0 XIZFxy3W5VM6BDcqUYKIRI4oRuoHgZttfL8F9Jufv+OaAoT2VcvUdzJu3fRFXPedFW9uKJ 9SS34Zt03imv4yJPCmbdrhmjpcaGLq6fV1NYroWQGYlY7RhtxZIkuoAfvyZKNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281714; a=rsa-sha256; cv=none; b=nfjZPF42kgQ2LLb/NGDSTYdyY3ToXrh94BH1o3ZqnvEZ5igrDnKyGkw7J3XummhBUViW7w V/3WifFMzjSz1xwPnfShZ4F0qFc1kDi2QuaEo2QyPHzWlBgwN2Uaoi6rnB+zJ7BkHBypfG N1wUJYhGQebSYDnuTl5R+Akn3iRbV3H4Jnj7OLHe5ct2DHYiSI5pkHru0SMQ7lUOfpSbPQ yydPDF0TQB4hFrSZSKpO26iQNZOXYxPg8EoNXRPDptBhEUIEnVQ0syijyG0HsEKo6kkeSm idODIT82sOM1gN8UIKE0VcMaRL3Ky/LXdvWgLCHlcmTFafbab150gEq/6b6J0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Exq51H1Bpvvl3BhrJHa29HVJ4bfMNoROpZCFq5iu5OA=; b=ndghSQZY77dDuaqOkrk/tCvYU3QW4lLp7/SoIIt7xAktMf7iF+NSWqXp8SAwU6zb7kfS60 wdJfIT+aXzUyhAmOzXGEJAuO/KyDzyhhm9uvs8k1xYv/EvU21x0C92lvNsj41mq4U3H9Nu 2igoxUyYiJSro8tiJIOvV/8ODMJSLW+NJ5yIWLi010tmOeQEwl1lSTHhUWuac8kNdsmfLI j8TcM1rlLHoCEkgWjqlEV76NF8Xj2RO+E5gKHDS/ouFumjLMNJmwDwGhYCBMrSOK0twDgk z1xHfm24i2u+2E4KJB9+hmogzbV72oJ/xcsj8blG6Sc0mg8fwcw4UQjh3PtTyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvw20RfRz1BBv; Sun, 28 Apr 2024 05:21: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 43S5Lrke002231; Sun, 28 Apr 2024 05:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5LrtL002228; Sun, 28 Apr 2024 05:21:53 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:21:53 GMT Message-Id: <202404280521.43S5LrtL002228@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: 5f9d770bdce7 - stable/13 - wtap: Fix typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5f9d770bdce792cac5f5b4bd4db5c69c5b02821c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5f9d770bdce792cac5f5b4bd4db5c69c5b02821c commit 5f9d770bdce792cac5f5b4bd4db5c69c5b02821c Author: Gordon Bergling AuthorDate: 2024-04-21 07:47:24 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:21:33 +0000 wtap: Fix typos in kernel messages - s/cant/can't/ (cherry picked from commit 026520a5f2d2ec01e19494c37b87448df86ef21a) --- sys/dev/wtap/if_wtap.c | 2 +- sys/dev/wtap/wtap_hal/hal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 08f840c6dc0c..05487572c242 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -538,7 +538,7 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) struct wtap_vap *avp = WTAP_VAP(vap); if(ni == NULL){ - printf("m->m_pkthdr.rcvif is NULL we cant radiotap_tx\n"); + printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n"); }else{ if (ieee80211_radiotap_active_vap(vap)) ieee80211_radiotap_tx(vap, m); diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c index 14041ec2b89c..46c67f8e1a3a 100644 --- a/sys/dev/wtap/wtap_hal/hal.c +++ b/sys/dev/wtap/wtap_hal/hal.c @@ -188,7 +188,7 @@ new_wtap(struct wtap_hal *hal, int32_t id) MTX_DEF | MTX_RECURSE); if(wtap_attach(hal->hal_devs[id], macaddr)){ - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); return -1; } @@ -206,7 +206,7 @@ free_wtap(struct wtap_hal *hal, int32_t id) } if(wtap_detach(hal->hal_devs[id])) - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); mtx_destroy(&hal->hal_devs[id]->sc_mtx); free(hal->hal_devs[id], M_WTAP); hal->hal_devs[id] = NULL; From nobody Sun Apr 28 05:21: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 4VRvw32vgbz5HxQw; Sun, 28 Apr 2024 05:21: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 4VRvw31rDvz4v0W; Sun, 28 Apr 2024 05:21:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFwovyG/RIeoq8RIhXOK01CPA8OXbrCpKKipua9u8Gc=; b=dNi4mV+OgGcdcREHP6nIsvUGSG+1aEKDsC+KZiSNEPttBPhRywpBmPFDR4/wmlQvK0KYuZ G3dqKpGAL14M5+hafXUwA4C9n3vwAg3L7V2pYXHk8kmZxw3ouJK6orlTP/Oqi1VOF1zRX/ IsxsAxeKhtvOemODq6wkiQTauiQTqm2s2TKugEXVVOz9A0Y0pcYvocGFIpMpM77hSkYX/R aQ8MXlBLMGctrtlzLNfI2cjJEBoqZe3axW3COSqftNTdBrjEvexrEfwVoI3O4a4EMcZLMr ITi7YzdJs/Wnk8aAJSSTiyjdG03nthHeDZUTFr/0tVayFkxnCjUoQTfhYkppSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281715; a=rsa-sha256; cv=none; b=yC8lbd60dX85cGcEgE069I1Sv2U6fasP2A5P/sEW5SR2VZcR3oH2iFM2lZNjLx2vu5eNns zCcLqPyWoa0KtEp6Sl2PPUUiv8kXRLITiurK20pZeqqkLUbDL19AsHb8sirZVwZJZ12tBy k+GZrQmC2htNvkupqYNFQzOMDxAW0hUgxLwGPTVQtgHz0areUAUBQfTxrFI9qai68gwWdA QaQu2GZm9Yf8Ss//wOMZwMg6PXbQd0Vm7+Ryq4u6l/ZuLAQ0FRvFO/rIIR9/Dx81sZ+8MM +9e+E7NO2+V931nIpzPUUxsreESCvcUtsSe3F74vmuhesMFpScElKtnFrF0BNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFwovyG/RIeoq8RIhXOK01CPA8OXbrCpKKipua9u8Gc=; b=fFcdD0LVTZc3sUYUxbbDHJ/UDPYVZ/VKFnPtackENZ09ARu47MSmydrEgfpPJzPg7LU3Aw RRcl5hbdBFviS5OtZT3QJ19GiIWlz+BO5KzS82XKhE9bGLDp3Nt5fpduPwucEbuopCGmmP xtW4wUQOPAknWDYDXeNxGZ1fH6FLSTpW25mtwgvAsnht1GbYaKCOSlIPJhOSrV3vvUZZua FcJA/xOfxIoOgKxyrEY1gM/dKZo8A6uj6okIQxB8sdOluyebSg3chi7SFCR20ZQkDIPZVv 2BoXM+eZoBMfn0AwrMlBmIV4s2xZ4MR7lmw0YwR7c99t7rPfsMvmTAh1wHB5Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvw31SQmz1C2L; Sun, 28 Apr 2024 05:21: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 43S5Lt2N002288; Sun, 28 Apr 2024 05:21:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5Lt9G002285; Sun, 28 Apr 2024 05:21:55 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:21:55 GMT Message-Id: <202404280521.43S5Lt9G002285@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: 3ad3a5f32bf0 - stable/13 - vmm(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ad3a5f32bf0fd65ca05fdb3a59aaf2271d6ecb7 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3ad3a5f32bf0fd65ca05fdb3a59aaf2271d6ecb7 commit 3ad3a5f32bf0fd65ca05fdb3a59aaf2271d6ecb7 Author: Gordon Bergling AuthorDate: 2024-04-21 07:44:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:21:41 +0000 vmm(4): Fix a typo in a kernel message - s/cant/can't/ (cherry picked from commit 8b5c5cae92d5b44f03636540a787fd6e994ce816) --- sys/amd64/vmm/amd/ivrs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index f45e292b11a2..1aa00c6849f1 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -416,7 +416,7 @@ ivhd_identify(driver_t *driver, device_t parent) if (ivhd_devs[i] == NULL) { ivhd_devs[i] = device_find_child(parent, "ivhd", i); if (ivhd_devs[i] == NULL) { - printf("AMD-Vi: cant find ivhd%d\n", i); + printf("AMD-Vi: can't find ivhd%d\n", i); break; } } From nobody Sun Apr 28 05:22: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 4VRvx84bl2z5HxRB; Sun, 28 Apr 2024 05:22: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 4VRvx83rnGz4vYx; Sun, 28 Apr 2024 05:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNTKflqwIh9O/wyUWGqmBLy7GciMNd4SOS3oU/7ft/Q=; b=isd1j5isNOWyLlmHGXWtlIL0oLRC8zposPkbganHyCNUypBmWy69L/R72i+vLZfWsVLEfZ GW4wS30XV3tQElP4vBtoVWxAa+F04oPVJFRFLthcMLs+0YwQEekYrMTqlnXy0ibZvNgcR0 M0736CPC10uubCIBj8USXDHzVBNpXVJmf5T1K4UNHm3RAe/1pIw/C3H/vpSGUNWFk4y4eX Q2xqOTUhtb726cyy+Cac39L0LgW/NcQxw/49m/nCZMmCePcLkBRyBTkBXsaSyrc2c+WQeJ bx0oeU0usUgfN7yJXfuMeKIabmGK9K8RTo6KwG5foCGRksf2lM75E7NjQIvCGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281772; a=rsa-sha256; cv=none; b=wZLvapbKDSqLVldzGo9jrGRlZyCffWmd33fBZqbFSYICkkcHTs4xV7jjaQ4Ru1mxJ9uj9F rtKqPRg3+3LJlgx6NBwPYUh34lxURTnAnYjkOuGaqfOBNxgJJbkBVHiI1Zoim/w+fDYiWt RZ9wWUwgKfNQoWojP1FMSYeAyonyRDN9sNArLoeyAcR7XpFTcbCwtKgEru3JkeT8Jc96qJ nCNcuX+nOB6S0aSOc2oKx6JG5mvDgFgx60Dafs7hxAfJFylKEb/cRXbMyKtlCpAi9hy+/J U4QIoCuiW1miVWbUbrjqPwEHjMLOzFbdDjikkod7MdjNfYAjA1r2igb3mJxnrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNTKflqwIh9O/wyUWGqmBLy7GciMNd4SOS3oU/7ft/Q=; b=ajwDJZ/k/wpjK7Apf/ddi+VLAbOprGsYBtxvFi6ekzRXYt8oEVCXzwWqdvuNa2SpnWzxK7 /nYUnbMX/7rp07pi0ABN3vv0bDq7U6mHHjzZn91vKo0dPoANpIGW2/gFd49PXpsoSIJOYR A7UMMZ6T9638bsV7f7Aydzd9/MNCCPflriMbdH4BdKZO63fo7Ghznt4HfGIbboLQmBFHw+ gkj1EN5B0cIpagp/o3oDICIBdnn6/QWAiQ6cnampiLC45PRgxmY7IQmnNRWSGiaVSUkY4h JSPRxwPzNuaMU2Yu0zbZsflY7CjR+0/7zvso3uj3ZffIQtckN9D8W5X18zEL3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvx83S63z1C3C; Sun, 28 Apr 2024 05:22: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 43S5MqWk003453; Sun, 28 Apr 2024 05:22:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5MqCV003450; Sun, 28 Apr 2024 05:22:52 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:22:52 GMT Message-Id: <202404280522.43S5MqCV003450@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: cd79c46103aa - stable/12 - vmm(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: cd79c46103aadae5c04e3c01b936a7fdefa899c8 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cd79c46103aadae5c04e3c01b936a7fdefa899c8 commit cd79c46103aadae5c04e3c01b936a7fdefa899c8 Author: Gordon Bergling AuthorDate: 2024-04-21 07:44:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:22:31 +0000 vmm(4): Fix a typo in a kernel message - s/cant/can't/ (cherry picked from commit 8b5c5cae92d5b44f03636540a787fd6e994ce816) --- sys/amd64/vmm/amd/ivrs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index 86a9f558e32a..6f264a8482e5 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -419,7 +419,7 @@ ivhd_identify(driver_t *driver, device_t parent) if (ivhd_devs[i] == NULL) { ivhd_devs[i] = device_find_child(parent, "ivhd", i); if (ivhd_devs[i] == NULL) { - printf("AMD-Vi: cant find ivhd%d\n", i); + printf("AMD-Vi: can't find ivhd%d\n", i); break; } } From nobody Sun Apr 28 05:22: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 4VRvx95Sp0z5HxWr; Sun, 28 Apr 2024 05:22: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 4VRvx94nXLz4vRJ; Sun, 28 Apr 2024 05:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjJjk5ejBVad+w5/09CcH1WcFzWpAgU7ZT+2NsqCW7g=; b=j3bmimV7JtPysV86wF0ciYWP8Fc++lwIgyamkDBsJSIqz1LAUsIIz1BNxeuoZv8e7xiMk1 Iki36X0TkvOtgEltATfnG/dxdeGGjOZQ64vRc2K5e7SwpWrNm4bkXBuoG0rWdkDwIFu/Wu tCQICV4tLkA3Y6f/hA5EySc+D4AeiGh+UHnYe3LDjVbkvGqu4H+a9jCuW6KcwukL9xz3ph 8K3oa+dxo6JS4a5yJzxWTzvFFhHHcLRobY6XJkE1C7nPzNcTQTTftHgn8tuRuZ36PmCuUG Blyrmc2UwZdEPAdnd8JENeZHEfw0YcJmBS34N+vyBKwKY/hb1z/jnLlX+RTW4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714281773; a=rsa-sha256; cv=none; b=JIxoEK8c9N0c5PUgMSGVdjA2RsW/HWLqy4k9m5hjhxqyRfcO/erlpOauGgAT6dC5Ld1MnA 0Af5gytQdmByKMSiB90TS+cU2I79g04kwvqDNNR+92BKCWEN5sZ4aCW/P0NvH6Lcc2lhKS SZUhdogRMN0luklgU0GeNw98sF5eVacA5Hnl7EG1HETNKqDDpM1z32jZw/hxqQ3c+ssi+Q WXNXafyaKpKqTmmRYIOttLljNn3ooBXlqsZoXFZ1sEk9qSd8hb7ur8ucSM8DEc5tezLEB6 MQYqnHhC3BawuRScp0kQmCUjQQ4xstwXs+X4jHAVFFzI3amJ6yyfuBx7sjzwVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714281773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjJjk5ejBVad+w5/09CcH1WcFzWpAgU7ZT+2NsqCW7g=; b=DUM6S+S8RoxAW/W3joUDYc5tcrSOtpHnkjSevQ/H0FqoajjTB/ssB/7yLzHBVQTQCCzdiV dAu3gTcnEtcl9JsnnS28AjqH/NTTTYVIgfZDJGJhxMrgyMs9rY2tfeDkZcljhCjGmIKJQg Kxl92wiqXpE1vF7iFjpDBzWY9y1gcnP1ScRVEfXfBkMPAm/FJ7LpLLmO3Gp9AIGD3LdTf6 dqpTSVmbKaDRZydgDBbgkjP+9ZShDMOwfRODmEFuOcjbPuta5iAC1xv6AtAPzK9WPJUd0O SDY1qsh+oDNWwOAAMGzCQmgHyIMkbyvlbS/6hXAuONddqwnpLdz8k+17oZw/nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRvx94Lfpz1C2V; Sun, 28 Apr 2024 05:22: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 43S5Mr9V003500; Sun, 28 Apr 2024 05:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S5MrWe003497; Sun, 28 Apr 2024 05:22:53 GMT (envelope-from git) Date: Sun, 28 Apr 2024 05:22:53 GMT Message-Id: <202404280522.43S5MrWe003497@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: f3e5aa50fc46 - stable/12 - wtap: Fix typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f3e5aa50fc46f3a96411f9424653d210c9792866 Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f3e5aa50fc46f3a96411f9424653d210c9792866 commit f3e5aa50fc46f3a96411f9424653d210c9792866 Author: Gordon Bergling AuthorDate: 2024-04-21 07:47:24 +0000 Commit: Gordon Bergling CommitDate: 2024-04-28 05:22:44 +0000 wtap: Fix typos in kernel messages - s/cant/can't/ (cherry picked from commit 026520a5f2d2ec01e19494c37b87448df86ef21a) --- sys/dev/wtap/if_wtap.c | 2 +- sys/dev/wtap/wtap_hal/hal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 8f50c00a1f11..1ba2adf1f51a 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -571,7 +571,7 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) struct wtap_vap *avp = WTAP_VAP(vap); if(ni == NULL){ - printf("m->m_pkthdr.rcvif is NULL we cant radiotap_tx\n"); + printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n"); }else{ if (ieee80211_radiotap_active_vap(vap)) ieee80211_radiotap_tx(vap, m); diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c index b76fae1d6299..fb21833ac739 100644 --- a/sys/dev/wtap/wtap_hal/hal.c +++ b/sys/dev/wtap/wtap_hal/hal.c @@ -190,7 +190,7 @@ new_wtap(struct wtap_hal *hal, int32_t id) MTX_DEF | MTX_RECURSE); if(wtap_attach(hal->hal_devs[id], macaddr)){ - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); return -1; } @@ -208,7 +208,7 @@ free_wtap(struct wtap_hal *hal, int32_t id) } if(wtap_detach(hal->hal_devs[id])) - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); mtx_destroy(&hal->hal_devs[id]->sc_mtx); free(hal->hal_devs[id], M_WTAP); hal->hal_devs[id] = NULL; From nobody Sun Apr 28 08:04: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 4VRzX00dlzz5JD7W; Sun, 28 Apr 2024 08: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 4VRzWz6vsCz49C3; Sun, 28 Apr 2024 08:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNuR39TXRZAlGBe5ECSoKdYon5yA+5L+V3Z/cQPQOKQ=; b=cqQms0dgJz7iIlF7dbFbBX24tke7xEY9/wmmNGDlNhXqvvhhAm+W1i0xmXXpoBTMhWf3BT fZ3t2xjhrED0+b0T9hFf54Xoib1f6WIQNQ8P0HPxcuxHEetou8uo+2o0O6nKvUIEQe0/Tk kLfchwQlwV+/hydHg0dXFNnSt+FYol4gpp0RvPEHiZdvTOFvtVWvqlvaSUGfax3a2egQA0 frw1q6qcKdKmOlDdjGQyIoJnqWaiFspgt99YTag01x/LkA46wUSlH75U3NBQMHadEkUeHh MZzq/hKphW50k+Xr6qnkiLHtkJWtHYhTKL5H6Hb3V9nZOsKoli41of8D/lv38w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714291488; a=rsa-sha256; cv=none; b=YnmAQrH8Bl/hgc0nMtfjhO3EKbC6dSPQ6C0RGI3eGvdoapnrI9jEJ2CqQvrgAy+PMw3wXj gmGIHTDoo+fNafDTpjf4CTaYgSPCq6x2V3z+G+mDNxg1gLO5rJ0fphphpkQGEeIdDIBgLM E9nyri11jNuYYTzuWNMjAnhzZUIdYK+k5/qO9DbeJy/CYqoJ5xXyN9/wyAcGwre+aWT8hz puPTZq4MYVz6m1R6fZQJsPtmT/Ou1ZjzWMT0+mw6Q3Tjz0Fs/pEq1QDm4Ot8mzaAu4+tDI WbJj/BoX1btYIS6A4waRxlTCh5pMcQ0hJYPORrnB3xLu3dBySqinjeJlJdSQrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNuR39TXRZAlGBe5ECSoKdYon5yA+5L+V3Z/cQPQOKQ=; b=CD21mIgZ+Us78sqcfx7goUZ8NcBmDWdOUpSELxeg3i8fFhOtc0GQ5fj5whk7VcVzi2e5t6 3io1LifIpaEulzbSbD5X36qWxlE2q3Nd3IufWRkTHJcuv3+5cup0hHifWDa8659ct+SwH6 0feaCYYLxiZC+AzwWgA/MmHPT2WOoLK363m8U3dWf12fYzVn1uSdIb1pauBLkf2E17rWQ0 7Pn5+Z9SiOs+lhimCInWbBkqXHlcQcKyBUpRfILdn66F3/uYnb6mzwzHifFMp/A3+Zicbu AUZrsrZpzc193mW/nE0EWiH8lrMRxC0o/VjTo1gkMJIS10phZ0WC+SS4eWdgeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRzWz6VwnzHKF; Sun, 28 Apr 2024 08:04: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 43S84lUx075757; Sun, 28 Apr 2024 08:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S84lk3075754; Sun, 28 Apr 2024 08:04:47 GMT (envelope-from git) Date: Sun, 28 Apr 2024 08:04:47 GMT Message-Id: <202404280804.43S84lk3075754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9e6098a91168 - stable/14 - Skip building libclang_rt when WITHOUT_CLANG is 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e6098a91168e4c90f6d38295f2876fe0e0fe190 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9e6098a91168e4c90f6d38295f2876fe0e0fe190 commit 9e6098a91168e4c90f6d38295f2876fe0e0fe190 Author: Dimitry Andric AuthorDate: 2024-04-25 15:05:29 +0000 Commit: Dimitry Andric CommitDate: 2024-04-28 08:03:37 +0000 Skip building libclang_rt when WITHOUT_CLANG is used As noted in bug 277096, when building a pkgbase repository using WITHOUT_CROSS_COMPILER and WITHOUT_TOOLCHAIN (which sets WITHOUT_CLANG), the following residual files are left over: /usr/lib/clang/18/lib/freebsd/libclang_rt.asan-x86_64.so /usr/lib/clang/18/share/asan_ignore_list.txt /usr/lib/clang/18/share/cfi_ignore_list.txt /usr/lib/clang/18/share/msan_ignore_list.txt This is because the lib/libclang_rt directory is still descended into, even if WITHOUT_CLANG is used. Fix it by not descending into the libclang_rt directory in that case. PR: 277096 Reported by: Siva Mahadevan MFC after: 3 days (cherry picked from commit 514773a5486d1fa4f2d5acb5af1766965c20765b) --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index 6c0574e76afb..294e2b695bdc 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -179,7 +179,7 @@ SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats # The libraries under libclang_rt can only be built by clang. -.if ${COMPILER_TYPE} == "clang" +.if ${COMPILER_TYPE} == "clang" && ${MK_CLANG} != "no" _libclang_rt= libclang_rt .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all) .error Requested build with sanitizers but cannot build runtime libraries! From nobody Sun Apr 28 08: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 4VRzX11NBWz5JDVp; Sun, 28 Apr 2024 08:04: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 4VRzX10p7Tz49WD; Sun, 28 Apr 2024 08:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmxoPIcJS2t9+o1aOz+YF7OWZv02WEfqsvNScGBxEIw=; b=hXX2Z4V/wAYskQqfhMKbu4n81C7UlmyWjY8APITh2tzA1oZhnN/dKc2b0rukRlPGEajXl0 GWZr8U7uZNWTOp+159NzTZZiFdpL+Btfev1ruSZZD6swQlHAgF/rh8ZsYlFXugyy/ljvaH piqQm2FdY29M8TSUtrfySynVzbRX0zkaPVd9y7Q2b20+0bUlxMFimDvCjA0ozirKcxPstu u39RA2J01/Wla28pQAnQqHbcN/hfwSPsWmtdUwm/wmcfxt5z2PkXuZ0MTvU3xrhwAhBmaq ZClM2XunuyvYV6EV8MYFsLavSVCKWOgoly3oL+sqs7vI3r9gCbMXG363Ey/pZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714291489; a=rsa-sha256; cv=none; b=XXJ1/VPbJig8JE/uTaGFmDvBDw8oN+SyEvY3Z0xO2Arwvg4apHZAma6X0iaDsASP6wVdrJ G9qkjDVhA3PLY/kuwGZYljOruBptUaisb2Bw+i0GhhzzM1g7G4GA1dej0SUfYPxhMmLmjq wYkpYL2cYzlc0X/Zolw7e3HdXbq3KN5aB13BpQTdDXrbQ8U9tlL00I9NAGnQxt1Fw5rlQg M7sRYXt/Kxt8B3NJxoC4gQb/T8dnbUKmfe0Gh87ZKqTmsahXldBVmFmGFYDM0FTpPRE5G0 Ltd7gvzk8S/v0EAxXFzus6oOB/kHUgGakQzO2BvcMh/hOZQ3daouamBtNxD8EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmxoPIcJS2t9+o1aOz+YF7OWZv02WEfqsvNScGBxEIw=; b=Po3xNF2ErFp7aMJBZhD6CDCSErAO3fwNktZrfZ4D9cwCeX3GLDXhfVDbTHXf4pdGEfXi63 ekcBznKd1bphXM1UGTJXtgoQ1VNeYm+yzrtF3e1lF+lOaQrezzz/VP+PNrI2AwZbHMAiDb mekbUtiuAyquppv3ufitxptYyL99ls1B7uTTh+UnTSHjEHb1W4VFC6hxEajywrAes/Kvyj coCbBIv/88IMPVA64bHHl5KAcN0nBPK0VNgtFR33+hHM8ZUxp/0Gvrc4mBosHOtmEu0YGj zBdQIrY9n+bop6607SyeJQbsmJMK8VxE4+epNZ/dlkBVyuiBK9N2Mkj9PBPNMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRzX10QM7zHVJ; Sun, 28 Apr 2024 08:04: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 43S84mp3075808; Sun, 28 Apr 2024 08: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 43S84m4t075805; Sun, 28 Apr 2024 08:04:48 GMT (envelope-from git) Date: Sun, 28 Apr 2024 08:04:48 GMT Message-Id: <202404280804.43S84m4t075805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 43fae14940a5 - stable/14 - Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 43fae14940a5db63e30acd48c2d1a2fcc35f6aaf Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=43fae14940a5db63e30acd48c2d1a2fcc35f6aaf commit 43fae14940a5db63e30acd48c2d1a2fcc35f6aaf Author: Dimitry Andric AuthorDate: 2024-04-25 16:47:31 +0000 Commit: Dimitry Andric CommitDate: 2024-04-28 08:03:46 +0000 Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): [sanitizer_symbolizer] Cast arguments for format strings in markup (#89815) When compiling the common sanitizer libraries, there are many warnings about format specifiers, similar to: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:31:32: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 31 | buffer->AppendF(kFormatData, DI->start); | ~~~~~~~~~~~ ^~~~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:33:46: note: format string is defined here 33 | constexpr const char *kFormatData = "{{{data:%p}}}"; | ^~ | %lu compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:46:43: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 46 | buffer->AppendF(kFormatFrame, frame_no, address); | ~~~~~~~~~~~~ ^~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:36:48: note: format string is defined here 36 | constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; | ^~ | %lu ... This is because `uptr` is dependent on the platform, and can be either `unsigned long long`, `unsigned long`, or `unsigned int`. To fix the warnings, cast the arguments to the expected type of the format strings. PR: 276104 Reported by: pstef MFC after: 3 days (cherry picked from commit f08bf5a3acf146b17794fbde41279645ddbaa086) --- .../lib/sanitizer_common/sanitizer_symbolizer_markup.cpp | 10 ++++++---- .../sanitizer_common/sanitizer_symbolizer_markup_constants.h | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp index b2a1069a9a61..31d91ef3c739 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp @@ -28,7 +28,7 @@ void MarkupStackTracePrinter::RenderData(InternalScopedString *buffer, const char *format, const DataInfo *DI, const char *strip_path_prefix) { RenderContext(buffer); - buffer->AppendF(kFormatData, DI->start); + buffer->AppendF(kFormatData, reinterpret_cast(DI->start)); } bool MarkupStackTracePrinter::RenderNeedsSymbolization(const char *format) { @@ -43,12 +43,13 @@ void MarkupStackTracePrinter::RenderFrame(InternalScopedString *buffer, const char *strip_path_prefix) { CHECK(!RenderNeedsSymbolization(format)); RenderContext(buffer); - buffer->AppendF(kFormatFrame, frame_no, address); + buffer->AppendF(kFormatFrame, frame_no, reinterpret_cast(address)); } bool MarkupSymbolizerTool::SymbolizePC(uptr addr, SymbolizedStack *stack) { char buffer[kFormatFunctionMax]; - internal_snprintf(buffer, sizeof(buffer), kFormatFunction, addr); + internal_snprintf(buffer, sizeof(buffer), kFormatFunction, + reinterpret_cast(addr)); stack->info.function = internal_strdup(buffer); return true; } @@ -118,7 +119,8 @@ static void RenderMmaps(InternalScopedString *buffer, // module.base_address == dlpi_addr // range.beg == dlpi_addr + p_vaddr // relative address == p_vaddr == range.beg - module.base_address - buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId, + buffer->AppendF(kFormatMmap, reinterpret_cast(range.beg), + range.end - range.beg, static_cast(moduleId), accessBuffer.data(), range.beg - module.base_address()); buffer->Append("\n"); diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h index 83643504e128..a43661eaecf2 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h @@ -33,13 +33,13 @@ constexpr uptr kFormatFunctionMax = 64; // More than big enough for 64-bit hex. constexpr const char *kFormatData = "{{{data:%p}}}"; // One frame in a backtrace (printed on a line by itself). -constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; +constexpr const char *kFormatFrame = "{{{bt:%d:%p}}}"; // Module contextual element. -constexpr const char *kFormatModule = "{{{module:%d:%s:elf:%s}}}"; +constexpr const char *kFormatModule = "{{{module:%zu:%s:elf:%s}}}"; // mmap for a module segment. -constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}"; +constexpr const char *kFormatMmap = "{{{mmap:%p:0x%zx:load:%d:%s:0x%zx}}}"; // Dump trigger element. #define FORMAT_DUMPFILE "{{{dumpfile:%s:%s}}}" From nobody Sun Apr 28 08: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 4VRzXQ37Cfz5JDVs; Sun, 28 Apr 2024 08: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 4VRzXQ2bmQz49vv; Sun, 28 Apr 2024 08: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=1714291510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yQ2M004TPoj/A86LItY6kXxJkWxyqSDPgUrKkDj1C6g=; b=cT7UjyhuYcW+8h6OB33DcuBBh+uYCgYPYQDCkt5kTsrxDnG6kW4kcCNtYIuXHc9BahhHwi rM4nJlagVl4gszJ4CzZ4nBNShWvC130Bf72vVXbGFpzwUgVZjz6mmcHz+shqp1ZaYF1Pzi c4auxBoqYozqNoNBi2aAbm5ZoBrCVfei8cghFxf3xzN5GqQhFGQ3DbPHwFxcIJQwXtjsTG vWC+NNDdo4bvqgx4Gt7oA4omwdemCXHnOcVpR89FYsKsFCUI9a0l7SeLml/Ti4Nw3GVUys tEkrMGnhRZvBeFIg1q2SeMcRziFK8FHSFBQNp6C/uI4WsQMWR8V4AfXaUH/JUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714291510; a=rsa-sha256; cv=none; b=KKY432/ZeBVyVm255LFQ3KjYG6RTqGSTtTxUIzlT/VUKC57THxavp/s3NK976tJxZ8hRly gtTurZiCTmJU75ugSnidVZ+uB6qoCp/z0N3KVH6KvHRI7L1wfN7J/a29ThBbhRTjII5Ac4 0ikdtuxqq2i6ZuxrQEUGxmD/4b9b+sPB5OIECXwnfOk2koNPFUd5fc1mTGe1FxyZ0+RaPh wJf3e+3eiNQbVOZvfQkPZk7nCpBQr5UM7jMvgNeRfOaoD9Nwvfz8NPjWS5f78pr/OZfbF1 9uam8e+TGTakjsIL8i6ceEanO275xPN9r/5HYhniJL/4lz7FP0KJBzGwhtV2SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yQ2M004TPoj/A86LItY6kXxJkWxyqSDPgUrKkDj1C6g=; b=bq+eEc5n6H7QcYwlo2SD2jGVpetpDkzGuBtjYdiOAFtsDHW8wL99X7Sk5EKfqpCYx7BTky pDO7pnUyLdESaaJDwxyWlG2yldg5/2fyOhq5N/Q2LTeE/nyjbAo5N4qwONjM+jpgrrCzDH lDUZ8sYK2hEcqkTrGwGkhkXOxfG4zssK31+TcOnRyBiOoWNahnGzaHUyGlDIkg4HQ4BnaN UaTBbHzA8NbvgvXL1ierfadOX+0q5hoeiGwJTETc0hYd4GBbySS/hG4flpA4zkNrc5fd3m hIJZea8ex316vOETWVg0eF/CCwxdEHn1BVxmV71W9Y50qWPAkdnrA4YDSNGVvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRzXQ1vFYzHPr; Sun, 28 Apr 2024 08: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 43S85AEv076025; Sun, 28 Apr 2024 08: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 43S85Aeo076022; Sun, 28 Apr 2024 08:05:10 GMT (envelope-from git) Date: Sun, 28 Apr 2024 08:05:10 GMT Message-Id: <202404280805.43S85Aeo076022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b9b248b1df62 - stable/13 - Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9b248b1df62579913ce93ef4583e185e798a717 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b9b248b1df62579913ce93ef4583e185e798a717 commit b9b248b1df62579913ce93ef4583e185e798a717 Author: Dimitry Andric AuthorDate: 2024-04-25 16:47:31 +0000 Commit: Dimitry Andric CommitDate: 2024-04-28 08:04:33 +0000 Merge commit 0f329e0246d1 from llvm-project (by Dimitry Andric): [sanitizer_symbolizer] Cast arguments for format strings in markup (#89815) When compiling the common sanitizer libraries, there are many warnings about format specifiers, similar to: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:31:32: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 31 | buffer->AppendF(kFormatData, DI->start); | ~~~~~~~~~~~ ^~~~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:33:46: note: format string is defined here 33 | constexpr const char *kFormatData = "{{{data:%p}}}"; | ^~ | %lu compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:46:43: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat] 46 | buffer->AppendF(kFormatFrame, frame_no, address); | ~~~~~~~~~~~~ ^~~~~~~ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:36:48: note: format string is defined here 36 | constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; | ^~ | %lu ... This is because `uptr` is dependent on the platform, and can be either `unsigned long long`, `unsigned long`, or `unsigned int`. To fix the warnings, cast the arguments to the expected type of the format strings. PR: 276104 Reported by: pstef MFC after: 3 days (cherry picked from commit f08bf5a3acf146b17794fbde41279645ddbaa086) --- .../lib/sanitizer_common/sanitizer_symbolizer_markup.cpp | 10 ++++++---- .../sanitizer_common/sanitizer_symbolizer_markup_constants.h | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp index b2a1069a9a61..31d91ef3c739 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp @@ -28,7 +28,7 @@ void MarkupStackTracePrinter::RenderData(InternalScopedString *buffer, const char *format, const DataInfo *DI, const char *strip_path_prefix) { RenderContext(buffer); - buffer->AppendF(kFormatData, DI->start); + buffer->AppendF(kFormatData, reinterpret_cast(DI->start)); } bool MarkupStackTracePrinter::RenderNeedsSymbolization(const char *format) { @@ -43,12 +43,13 @@ void MarkupStackTracePrinter::RenderFrame(InternalScopedString *buffer, const char *strip_path_prefix) { CHECK(!RenderNeedsSymbolization(format)); RenderContext(buffer); - buffer->AppendF(kFormatFrame, frame_no, address); + buffer->AppendF(kFormatFrame, frame_no, reinterpret_cast(address)); } bool MarkupSymbolizerTool::SymbolizePC(uptr addr, SymbolizedStack *stack) { char buffer[kFormatFunctionMax]; - internal_snprintf(buffer, sizeof(buffer), kFormatFunction, addr); + internal_snprintf(buffer, sizeof(buffer), kFormatFunction, + reinterpret_cast(addr)); stack->info.function = internal_strdup(buffer); return true; } @@ -118,7 +119,8 @@ static void RenderMmaps(InternalScopedString *buffer, // module.base_address == dlpi_addr // range.beg == dlpi_addr + p_vaddr // relative address == p_vaddr == range.beg - module.base_address - buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId, + buffer->AppendF(kFormatMmap, reinterpret_cast(range.beg), + range.end - range.beg, static_cast(moduleId), accessBuffer.data(), range.beg - module.base_address()); buffer->Append("\n"); diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h index 83643504e128..a43661eaecf2 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h @@ -33,13 +33,13 @@ constexpr uptr kFormatFunctionMax = 64; // More than big enough for 64-bit hex. constexpr const char *kFormatData = "{{{data:%p}}}"; // One frame in a backtrace (printed on a line by itself). -constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}"; +constexpr const char *kFormatFrame = "{{{bt:%d:%p}}}"; // Module contextual element. -constexpr const char *kFormatModule = "{{{module:%d:%s:elf:%s}}}"; +constexpr const char *kFormatModule = "{{{module:%zu:%s:elf:%s}}}"; // mmap for a module segment. -constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}"; +constexpr const char *kFormatMmap = "{{{mmap:%p:0x%zx:load:%d:%s:0x%zx}}}"; // Dump trigger element. #define FORMAT_DUMPFILE "{{{dumpfile:%s:%s}}}" From nobody Sun Apr 28 18:29: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 4VSFNJ0pNcz5JjhW; Sun, 28 Apr 2024 18:29: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 4VSFNJ08JYz55rn; Sun, 28 Apr 2024 18:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5uYXKXXYQGJEUoQHq5i843AdELygRdOX3RAwUBIqpY=; b=ipZERwADwQWnHfdUNHloanGVnfQQjJad5Dupmd1XtPOMLeDvQxKxd6rG4zgY+Fp+3FGCNa aJOFPT9F1UV+lIvUM/jPTek4yq/xXXNk3dHewI4NhQxigNa8MHT+v50cg/LXiBpUGUN9Ii OCaB9rcK161r644hfD0pzdYFegSU3yrYugrXimsJYrqTTjhlWc9NQ+5KyZBHpGoI5celGL yAHMkblkZbqILVlhTtCZruG/CxO1PK99IAcnN3ag0c5ZoFLayEDl/NkyPtud5mxfntm50t LCCwkVKtgBtPcKsSRqJfmKMmH3kB+tapUiolg9/mwmM4wXW/Dq5iyJRfVDcGSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714328944; a=rsa-sha256; cv=none; b=eC7S9zS1Y5vSgunm6stAlWBL0uJDiyUBtP87GYUmTtA/0XBYYKomM+WViHkJwKI2QB0usc rmaVYk4ncAyRk8DA6bNLxI9jfcFMTjQy1D9r4xiD3XCwQgUO4uUU4kQ+L6TLNKCzAUD6yh TBE6vlshQJgcCreEHh58WrdeuVpRiNNvO0ZePXcRexEFOSX6nsROiLXXY6XuqSSCzj5I3V aBj41KIxBMthX2rBno4lRhOoC/r47iUcfcAONDW2C2OI/wZb3Zfx7NOpKyix783MC9pHpb lwfQJaVUh4kB1PQX5ccdBtnF9WiYSNdv1yZH8b3ptzpSoLGHDHOR8cYMHjw/pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5uYXKXXYQGJEUoQHq5i843AdELygRdOX3RAwUBIqpY=; b=XFbfEOPDWF26kwH1RUXi5mgGLwp0ctuZF/jvYhYvHYrhw9whj3nP8uqMF4/Be1FAzqS+V3 y9f7bGWoO6N1EdV7BR2cDdM/6yYeWpVB0eSFy88WFIj6MDs//r+IXhpi27YpRUTbMc5Sla Pi5CqvE34O3cAAef8R+YlIXtsjuFv2EekVu8r5JZ9Alls8CUXhDiYxc0AsJ2vYAkXFYY+4 EwYSRZN7tilGCgD3QVdtn7UXtVQKAobXE0YL/YEDyXhc+dZgEsR7HOEZmOxvXGKnelbzv6 OaSokGevt9z3Zyacoh+F9QomAZkai/BmWZXJPhK1ByoS8ytopXyPxQybq+UuZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSFNH6rqQzbtt; Sun, 28 Apr 2024 18:29: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 43SIT3Zc026589; Sun, 28 Apr 2024 18:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SIT35b026586; Sun, 28 Apr 2024 18:29:03 GMT (envelope-from git) Date: Sun, 28 Apr 2024 18:29:03 GMT Message-Id: <202404281829.43SIT35b026586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: bb27b83033d0 - stable/14 - sync.8: Document that the "sync dance" is not a thing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb27b83033d0a9a6425ceb508ad51cfb0cf266ea Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=bb27b83033d0a9a6425ceb508ad51cfb0cf266ea commit bb27b83033d0a9a6425ceb508ad51cfb0cf266ea Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-23 14:12:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-28 18:28:43 +0000 sync.8: Document that the "sync dance" is not a thing People still believe that it is essential to run sync(8) a couple of times before a reboot/halt. Document that this has not been necessary for a long time now. Reviewed by: imp, bcr, Pau Amma MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D33233 (cherry picked from commit 177ba183076bd6fe6b29b1d657b954cca256506b) --- bin/sync/sync.8 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/bin/sync/sync.8 b/bin/sync/sync.8 index 732d813880e2..222e9edf59f9 100644 --- a/bin/sync/sync.8 +++ b/bin/sync/sync.8 @@ -28,7 +28,7 @@ .\" .\" @(#)sync.8 8.1 (Berkeley) 5/31/93 .\" -.Dd May 31, 1993 +.Dd April 25, 2024 .Dt SYNC 8 .Os .Sh NAME @@ -71,3 +71,31 @@ A .Nm utility appeared in .At v4 . +.Pp +On systems older than +.Bx 4.0 , +commands like +.Xr reboot 8 +and +.Xr halt 8 +were unavailable. +The shutdown procedure involved running +.Nm , +waiting for the lights to stop, +and turning off the machine. +.Pp +Issuing three separate +.Nm +commands (one line each) was a placebo that would generally suffice in +.At v7 +machines that were otherwise quiesced systems. +It replaced the one-per-line +.Nm +as a substitute for waiting. +.Pp +.Bx 4.0 +introduced +.Xr reboot 2 +and +.Xr sync 2 +which rendered this trick obsolete. From nobody Sun Apr 28 18:29: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 4VSFP44D7Vz5Jjpr; Sun, 28 Apr 2024 18:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSFP42V4Wz561q; Sun, 28 Apr 2024 18:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KV+6PARgQnrTb5b+ajANG2YySrCe5emJ7PliKfLNq8=; b=mGsunC/9rLmEg+gvGHDQQ+WnddmWI3JDpGU4Xo1AEo4Nqq4ynRampFnddeN5rlpVOYdCev fmb2xPFjOguNPaepHob+DHbRPq4jqMauLbB/LVn2oNJp5u33cbAQyIiwTul2/yVDwVwyYN w79Aa+AH1W25DNKG4qGH2CoYPqdBtutbJblfr9YY4Nb4zHVouaO92ynNpkXiK9phOPVxj2 E0Sg0/C0qusQzmSqURzGiClpse5eLeNOjXIjaVWVFI4RYF5x33SPZb5wNBaIxpD+d2S1Wu siRCYNNZHwr1l1tO5P3tINOSkCR1Bf49MJtXjDoCxjI3Vtw+W/fWOHyOQbOLew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714328984; a=rsa-sha256; cv=none; b=yuQNIcvrBOlhZpTaSca8Amo8Vojt4Fo4/vHb4X48xfRODF3UYJlWSAE7mu0HqOIAOoEpAV Ix3YkBZZa5B/Ha2RmLChB9z6k+YUZKF86GM90A34KvB9svT4p9bsP5LF+lJU2U8t2iKWcS 5Zl4nQkfukPu2j7IQxQacPnnKyvVqhTrGbbkAqRLwxDXoDq9WHXonrrbB8AWOB9HTY4tWX 9RQFcjB3IRc43mvtH7NKJaZmQDJqf/Wb3dACUaVciM3HH+xnBfkSpo4z+2CwfuB7CNFe+W 7yBzFri+jH2xiUtgHH3JXnyfp4/9Ab0kYtY3YTTCwon2MUzoENfy95TDU35Q1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KV+6PARgQnrTb5b+ajANG2YySrCe5emJ7PliKfLNq8=; b=Y+hipgWavOnpDgDxOLcqzXcuEMDO4+lM7wQgduuCf850mo5p6wgJqdVMxqrw8qCaoTGahM Hod+xB8NeHRfC6LZHo8DU6cEejEjEqSjWbCuBCNITfds9GDuyS0Ochbt8CgjFLazQ1Xtde G5hm6KInn9oRmFgokAx/bgphCGgmJMkgw4OqTYwAxk/TMleDDviN7HTEwlNYgK4af5my3i K+pF9kqqX1jyzarCEHh/qRs0ZsW2pzl3QLX/zkG3hqbJX4bxDPq7CqhAbXvUNrfasnGkYh biYXnf/1SxgsOQgTIlOcvKtDzEfSRi0MGKdQFGMAlylFsPmSMpDZDDOydl6z5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSFP425W9zc5c; Sun, 28 Apr 2024 18:29: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 43SITiiV026831; Sun, 28 Apr 2024 18:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SITiZF026828; Sun, 28 Apr 2024 18:29:44 GMT (envelope-from git) Date: Sun, 28 Apr 2024 18:29:44 GMT Message-Id: <202404281829.43SITiZF026828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5119386711a8 - stable/13 - sync.8: Document that the "sync dance" is not a thing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5119386711a88f86dfb3ec3eb609d0d2c6a4f050 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=5119386711a88f86dfb3ec3eb609d0d2c6a4f050 commit 5119386711a88f86dfb3ec3eb609d0d2c6a4f050 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-23 14:12:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-28 18:29:36 +0000 sync.8: Document that the "sync dance" is not a thing People still believe that it is essential to run sync(8) a couple of times before a reboot/halt. Document that this has not been necessary for a long time now. Reviewed by: imp, bcr, Pau Amma MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D33233 (cherry picked from commit 177ba183076bd6fe6b29b1d657b954cca256506b) --- bin/sync/sync.8 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/bin/sync/sync.8 b/bin/sync/sync.8 index 732d813880e2..222e9edf59f9 100644 --- a/bin/sync/sync.8 +++ b/bin/sync/sync.8 @@ -28,7 +28,7 @@ .\" .\" @(#)sync.8 8.1 (Berkeley) 5/31/93 .\" -.Dd May 31, 1993 +.Dd April 25, 2024 .Dt SYNC 8 .Os .Sh NAME @@ -71,3 +71,31 @@ A .Nm utility appeared in .At v4 . +.Pp +On systems older than +.Bx 4.0 , +commands like +.Xr reboot 8 +and +.Xr halt 8 +were unavailable. +The shutdown procedure involved running +.Nm , +waiting for the lights to stop, +and turning off the machine. +.Pp +Issuing three separate +.Nm +commands (one line each) was a placebo that would generally suffice in +.At v7 +machines that were otherwise quiesced systems. +It replaced the one-per-line +.Nm +as a substitute for waiting. +.Pp +.Bx 4.0 +introduced +.Xr reboot 2 +and +.Xr sync 2 +which rendered this trick obsolete.