From nobody Mon Feb 10 06:55:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YrwMW5qM6z5nT4l; Mon, 10 Feb 2025 06:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YrwMW4gnZz3qNy; Mon, 10 Feb 2025 06:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739170551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m7LWqhDcjdRRDQEnJWegNsSmvH25S4xOrELuSxH9iHM=; b=mlkRgoaFERM42K9q46ErbEemHnTylDAfgKD/vRAHvDWele8TW8NYlHABB20Ar71kmaueRc NTC95KYrrnlq7wQGRNWF9LMU69cyZZmZHGOEZw4OKVQ0RyJcC6JOHXQGhTLBBVgf9TWFbm XCQUJxEYaGbsQ2LDUqiqUFI6s/v/NG14VdNNH9AliVdupUprwgvpAbZ/nnFqs8slTLMUB2 fTgZhj0JcN8daqlFXi3cfg/dq/ARvF04QdNHzD8zIAPH5bd9OFZ7POG8f9BzOVa864SSbP qmm0nJDGWkhKhtYeVeQ5xzvUhTQBNFiGe6OSljEukYWYYrRQaZye2O3JMYwD8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739170551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m7LWqhDcjdRRDQEnJWegNsSmvH25S4xOrELuSxH9iHM=; b=kqjacLDhZRNkk8hzrmFB3jOd1HN118D0pSRk3t5ACdM0rno9oJGDdFPaWtG8JEZRufxv1/ crqkVmkpsy1rW/WyOWuEILcc934Hj+LKViDNYqR68Ujll35KJxL1ip24WAUcCfIYrVzhYJ nc0YULTy3VqUXjbsjS61rH3f00Vwcm11+hNhQHTGQPWnzTmoINMvI+AHcmc/7ZOOg7/ylW f4UOrD5kBIE8nT30BymP/ayJmahXfMzmmQ6ko2tPlQkmEsaK4I1pz2k1VVtc2lLPR65lnu nPKAIIu66JqGHbTvi67DZjT4V2L5CBNYbb7PR/jTu4mmCGPZURhTLw3tIEWzmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739170551; a=rsa-sha256; cv=none; b=iG3mCAzmF8ocNnZYKG3/2khUL7xzY0rvm5jPxNykP7ODHq0jlMQkjk9sw5nSeErg2Ksvj2 c4nrBcWkoMIhJiKozXW7Rt4JylMjy4+v5vNvmn72NIKVNiSQz1HZq453NcawkCZDt0Zi4H cSX4o61p8nWOtneqGvSmv/F85N+Ghs0GCsZafYpyyeGaXpDElDsG9r++Msc8jNLfQaOLa/ SudSSpBPkvZ6nMnY6jyGLrtrHtmfHGW+6vfwgQq0EOGoRFw/oQ57yt4S8QR3u0sL99faN7 zfQzo8S4s3WyLuOpwRAmUW5ziPi++V9L+GoF2Yii22BHeGrTTaTzoKyyVlEKxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YrwMW3ZNqz15d; Mon, 10 Feb 2025 06:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51A6tpI8029140; Mon, 10 Feb 2025 06:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51A6tpHD029137; Mon, 10 Feb 2025 06:55:51 GMT (envelope-from git) Date: Mon, 10 Feb 2025 06:55:51 GMT Message-Id: <202502100655.51A6tpHD029137@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: f424cf5940d7 - stable/14 - mlx4ib(4): Fix some typos in device 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/14 X-Git-Reftype: branch X-Git-Commit: f424cf5940d7427d471ab935647994918d2746bc Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f424cf5940d7427d471ab935647994918d2746bc commit f424cf5940d7427d471ab935647994918d2746bc Author: Gordon Bergling AuthorDate: 2025-02-05 10:31:12 +0000 Commit: Gordon Bergling CommitDate: 2025-02-10 06:54:24 +0000 mlx4ib(4): Fix some typos in device messages - s/availible/available/ (cherry picked from commit 84e3ffac12a8dcfeae0a5e0b25afe447ff2d5fa8) --- sys/dev/mlx4/mlx4_core/mlx4_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx4/mlx4_core/mlx4_cmd.c b/sys/dev/mlx4/mlx4_core/mlx4_cmd.c index 45d06104448d..54256ab1e124 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_cmd.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_cmd.c @@ -1960,7 +1960,7 @@ static void mlx4_allocate_port_vpps(struct mlx4_dev *dev, int port) err = mlx4_ALLOCATE_VPP_get(dev, port, &availible_vpp, vpp_param); if (err) { - mlx4_info(dev, "Failed query availible VPPs\n"); + mlx4_info(dev, "Failed query available VPPs\n"); return; } @@ -1982,12 +1982,12 @@ static void mlx4_allocate_port_vpps(struct mlx4_dev *dev, int port) /* Query actual allocated VPP, just to make sure */ err = mlx4_ALLOCATE_VPP_get(dev, port, &availible_vpp, vpp_param); if (err) { - mlx4_info(dev, "Failed query availible VPPs\n"); + mlx4_info(dev, "Failed query available VPPs\n"); return; } port_qos->num_of_qos_vfs = num_vfs; - mlx4_dbg(dev, "Port %d Availible VPPs %d\n", port, availible_vpp); + mlx4_dbg(dev, "Port %d Available VPPs %d\n", port, availible_vpp); for (i = 0; i < MLX4_NUM_UP; i++) mlx4_dbg(dev, "Port %d UP %d Allocated %d VPPs\n", port, i, @@ -2884,7 +2884,7 @@ static int mlx4_set_vport_qos(struct mlx4_priv *priv, int slave, int port, memset(vpp_qos, 0, sizeof(struct mlx4_vport_qos_param) * MLX4_NUM_UP); if (slave > port_qos->num_of_qos_vfs) { - mlx4_info(dev, "No availible VPP resources for this VF\n"); + mlx4_info(dev, "No available VPP resources for this VF\n"); return -EINVAL; } From nobody Mon Feb 10 06:57:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YrwPQ21tKz5nTNF; Mon, 10 Feb 2025 06:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YrwPQ1ZHPz3r87; Mon, 10 Feb 2025 06:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739170650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y1jAMtXroEoxF1Qz0ZAUvpxSuoI/Ef6KLJktL7UqdPo=; b=hoXHwfD+4dKX7Ak/qLu1c6PdUs8kNtIrI0YbLIRss0JGJQwPsSP2UucmTQcTsjG7XJ5kdT 4JnOogZaXk+eWN33NtAD4wxRK403xgyMD8QgpNon2fKF1lljRoULUQMgI4XgMLSE/E/5a9 ihSD/yjOB2NZ8nGnx+f7J8QceHprhAkWM4qnNAw6SwlJxgGG/YS2c2BbbLPWVf/JWnIDNq jLMfxMq5DvHvZr0nxGISEfKhIWNjhw4w8MMI3IpAUtLsn73wUcj29e7ZLdDdwBYBRWdYN0 OGtjSwIKQ5PE+H/8GcPtC0d8I4vBtA841AHS5QJypP/kTYzxTKEW/5vzaLIshQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739170650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y1jAMtXroEoxF1Qz0ZAUvpxSuoI/Ef6KLJktL7UqdPo=; b=IIboFJmpq/zs+O69QTA8YzRn6BfOJ449L2mdOUbfJgwyxT00vTbWjAEfmaFcnuSmSRZWcp SSC9oydfMO06TPN8pc7XVmqpBfXy4Yjz45FxkFv6sBLjhpDJljucSzmR0r93QDgAHdkJZd j/ztzl+yL8IWS/+MRZ6IaEpG81XqK8FTj6Ih9uOdnkyzTXWJL/wtUvO1GjAnDOEPfNWMiO 3G180IJgNJsUaXNVBNocpydbvSsihh0ZFkeJkvQC+DLTCx7fAMhXcG9n6r7Yqmng1vqCfS ZdfDd9R+uIgXNcuB0POimYRxZh5uM0W07Iu86iy6GNFgOCUDQxdIsWOSz9ClkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739170650; a=rsa-sha256; cv=none; b=JSyxmVempQ3CaPUM2RAm9VSsi1odR2yHQvQI2mnkD0NFJt2DFVxe3C21MjDdj2ix7aAUff s/i5AJw8tMo5hz5TprEg3DsmgAt4eFAJslXpSsJhcyRiZBa+yhCwG5CJIXx5JJ6o+D7TwI YUPJyA3IvGKyYPjvLOC3gX4wNNX5iDujGDgKD+ABHc/5IvrEECdQhASJ4Gsk2A46A3S3kl 4c4tViHEWaw3R283n2OoqhGpDuDeD+zJE1+sZzeageCnUm4/eFRgXetoPDcBkQpTMCt4hQ LrOeARAVFYgW6AEdJiTnyigeXUXZA8g2jQHqhF/eGlbXHoLov/cjuv/KqXlZcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YrwPQ0k0sz191; Mon, 10 Feb 2025 06:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51A6vUsc029722; Mon, 10 Feb 2025 06:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51A6vUNp029719; Mon, 10 Feb 2025 06:57:30 GMT (envelope-from git) Date: Mon, 10 Feb 2025 06:57:30 GMT Message-Id: <202502100657.51A6vUNp029719@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: d9c36c812b5b - stable/13 - mlx4ib(4): Fix some typos in device 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: d9c36c812b5bb03759bc0b3f4a3cb0e16ea5d98d Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d9c36c812b5bb03759bc0b3f4a3cb0e16ea5d98d commit d9c36c812b5bb03759bc0b3f4a3cb0e16ea5d98d Author: Gordon Bergling AuthorDate: 2025-02-05 10:31:12 +0000 Commit: Gordon Bergling CommitDate: 2025-02-10 06:56:05 +0000 mlx4ib(4): Fix some typos in device messages - s/availible/available/ (cherry picked from commit 84e3ffac12a8dcfeae0a5e0b25afe447ff2d5fa8) --- sys/dev/mlx4/mlx4_core/mlx4_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx4/mlx4_core/mlx4_cmd.c b/sys/dev/mlx4/mlx4_core/mlx4_cmd.c index 502fe5ca76f6..9d55354d0110 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_cmd.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_cmd.c @@ -1960,7 +1960,7 @@ static void mlx4_allocate_port_vpps(struct mlx4_dev *dev, int port) err = mlx4_ALLOCATE_VPP_get(dev, port, &availible_vpp, vpp_param); if (err) { - mlx4_info(dev, "Failed query availible VPPs\n"); + mlx4_info(dev, "Failed query available VPPs\n"); return; } @@ -1982,12 +1982,12 @@ static void mlx4_allocate_port_vpps(struct mlx4_dev *dev, int port) /* Query actual allocated VPP, just to make sure */ err = mlx4_ALLOCATE_VPP_get(dev, port, &availible_vpp, vpp_param); if (err) { - mlx4_info(dev, "Failed query availible VPPs\n"); + mlx4_info(dev, "Failed query available VPPs\n"); return; } port_qos->num_of_qos_vfs = num_vfs; - mlx4_dbg(dev, "Port %d Availible VPPs %d\n", port, availible_vpp); + mlx4_dbg(dev, "Port %d Available VPPs %d\n", port, availible_vpp); for (i = 0; i < MLX4_NUM_UP; i++) mlx4_dbg(dev, "Port %d UP %d Allocated %d VPPs\n", port, i, @@ -2884,7 +2884,7 @@ static int mlx4_set_vport_qos(struct mlx4_priv *priv, int slave, int port, memset(vpp_qos, 0, sizeof(struct mlx4_vport_qos_param) * MLX4_NUM_UP); if (slave > port_qos->num_of_qos_vfs) { - mlx4_info(dev, "No availible VPP resources for this VF\n"); + mlx4_info(dev, "No available VPP resources for this VF\n"); return -EINVAL; } From nobody Mon Feb 10 07:39:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YrxKs3CXHz5nW9Q; Mon, 10 Feb 2025 07:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YrxKr6ctkz47m4; Mon, 10 Feb 2025 07:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739173168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=290aFS/b/NG5AeSQfXIGQsv/W4pLOaRXUnwFW5fnAWc=; b=E9lutCLJ9lcxVRFCUqDISpeCYTAm2zzfYoYN8S3r0qJj9Mnj+WzWUQGecegdse4hoU7xzY ytnavQuvv0b+BWPcrcwns/y1ztECCOxznLKp71NZI7Km3YQpUDQWjjf4JB0M+QgJvBQ/8o yPlLVXVewGrNnE7O2iQQshqmwug1v0hL2QK49Ah1dhxgqrFt3aoQ/3GwwT5fPb8IPoWwpm PdfC25SpnhZS/ApqG9h5ZcHQzuUalCngUkStctk9h++Vaz54Og9i5qt9vGpW+DN3txE9NL wAw/pyMusLYUs1lcxYu0wyKv+MXAkKJQ++T6gZ2MZn8iXjMpNxAr1WTa8m7Qyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739173168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=290aFS/b/NG5AeSQfXIGQsv/W4pLOaRXUnwFW5fnAWc=; b=Fid74VRjAgUEOX9PSDfIMCKEU5Rofq+Sb5H8Jp3Aq23/BFX/wv3ycPUrRPiF26IM6/3Amn Kt1l88npq+uZ0zyfrZ4g9aYNE18IU3/ULsJFVbevK7e9rucybiDqjmHzIff4L7dArZXz7W Btoc4d8ncnbtqBp0iZ8rku+cVZ1uGa133rEggchh7r9qfdJxwEONYRyhVyR7r8LD3ixaTG 6lq7SiV9lJsqz2n9pBR/L3g3Mrzq089N0vFm+i8Rx7xcYGfW+/y4p/KOAWrDRDD08oO7iE xZEt7pRCmC5slhQGU9kP+BMOf/+9fiiPOjt3x2SbKZwESLHYX0qqglpWNElx0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739173168; a=rsa-sha256; cv=none; b=EDGDYkoQRi/FshtRZ9F6pB7nVxe7ERmU4e8exxxi4y3PLE2viKXIp//FvhfAJV3BOYtBoU 3DAuC1H2cnu8C0SpWCxWFVXyKlOA44yqjCIWLlDryBNBg6DtNtDvR/9cPbDbyhP13H8wf9 r4WpLvpZ6owU4nCkrHykmqUWkg726rqyASon55LaH6pfBzbed3Q2fzhi9kIBe8aIE9EZdB kyM/mIIr5DJfzdr+hxogBz8VP45GpR11IVD3o3UvsLutSm9T1bqsNaDuHP6J+6/KSNXhmf BHMNeerRVDQO5RAKOucLV9lbnZRRmZsNlDYiOfufZmaWqh+vUid5KuEZEYaJtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YrxKr613Hz2t4; Mon, 10 Feb 2025 07:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51A7dS6t006096; Mon, 10 Feb 2025 07:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51A7dSP0006093; Mon, 10 Feb 2025 07:39:28 GMT (envelope-from git) Date: Mon, 10 Feb 2025 07:39:28 GMT Message-Id: <202502100739.51A7dSP0006093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: dfe803fdbc54 - releng/13.5 - Defer the January 19, 2038 date limit in UFS1 filesystems to February 7, 2106 List-Id: Commits to the stable branches 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: dfe803fdbc54e65aaf23c56d53eeeefdef8e42aa Auto-Submitted: auto-generated The branch releng/13.5 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=dfe803fdbc54e65aaf23c56d53eeeefdef8e42aa commit dfe803fdbc54e65aaf23c56d53eeeefdef8e42aa Author: Kirk McKusick AuthorDate: 2025-01-28 01:39:45 +0000 Commit: Kirk McKusick CommitDate: 2025-02-10 07:38:51 +0000 Defer the January 19, 2038 date limit in UFS1 filesystems to February 7, 2106 Standardize the definition of a UFS dinode. Differential Revision: https://reviews.freebsd.org/D48472 (cherry picked from commit 1111a44301da39d7b7459c784230e1405e8980f8) (cherry picked from commit aa90fbed151de512ab6e59f75df009533a15751f) (cherry picked from commit 256389eaf158acaf67f0530764be8af68edee78c) (cherry picked from commit 6cd973d903c8f214d84daf91eb75047631bf1618) (cherry picked from commit e1ebda4458bbaf7d85fb803e20f3afc5441f24d9) (cherry picked from commit 6f87402a02f0801942fe8f0d9a8f7f3e04dfbb01) Approved-by: re (cperciva) --- lib/libufs/inode.c | 14 ++++++- lib/libufs/libufs.h | 10 +---- sbin/dump/traverse.c | 4 -- sbin/fsck_ffs/fsck.h | 4 -- sbin/fsck_ffs/inode.c | 30 +++++++++++++-- sbin/newfs/mkfs.c | 4 -- sbin/quotacheck/quotacheck.c | 4 -- share/man/man7/ffs.7 | 6 ++- stand/libsa/ufs.c | 11 ++---- sys/ufs/ffs/ffs_alloc.c | 3 +- sys/ufs/ffs/ffs_extern.h | 1 + sys/ufs/ffs/ffs_subr.c | 61 +++++++++++++++++++++++++++++++ sys/ufs/ffs/ffs_vfsops.c | 6 +++ sys/ufs/ufs/dinode.h | 26 ++++++++++--- sys/ufs/ufs/inode.h | 9 ++--- usr.sbin/makefs/ffs.c | 22 +++++------ usr.sbin/makefs/ffs/ufs_inode.h | 81 +++++++++++++++++++---------------------- usr.sbin/quot/quot.c | 4 -- 18 files changed, 192 insertions(+), 108 deletions(-) diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c index 780e863928aa..48f2e8b0ff08 100644 --- a/lib/libufs/inode.c +++ b/lib/libufs/inode.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -52,6 +53,7 @@ getinode(struct uufsd *disk, union dinodep *dp, ino_t inum) ino_t min, max; caddr_t inoblock; struct fs *fs; + struct timespec now; ERROR(disk, NULL); @@ -72,6 +74,10 @@ getinode(struct uufsd *disk, union dinodep *dp, ino_t inum) } disk->d_inoblock = inoblock; } + if (clock_gettime(CLOCK_REALTIME_FAST, &now) != 0) { + ERROR(disk, "cannot get current time of day"); + return (-1); + } if (inum >= min && inum < max) goto gotit; bread(disk, fsbtodb(fs, ino_to_fsba(fs, inum)), inoblock, @@ -81,6 +87,8 @@ getinode(struct uufsd *disk, union dinodep *dp, ino_t inum) gotit: switch (disk->d_ufs) { case 1: disk->d_dp.dp1 = &((struct ufs1_dinode *)inoblock)[inum - min]; + if (ffs_oldfscompat_inode_read(fs, disk->d_dp, now.tv_sec)) + putinode(disk); if (dp != NULL) *dp = disk->d_dp; return (0); @@ -88,8 +96,12 @@ gotit: switch (disk->d_ufs) { disk->d_dp.dp2 = &((struct ufs2_dinode *)inoblock)[inum - min]; if (dp != NULL) *dp = disk->d_dp; - if (ffs_verify_dinode_ckhash(fs, disk->d_dp.dp2) == 0) + if (ffs_verify_dinode_ckhash(fs, disk->d_dp.dp2) == 0) { + if (ffs_oldfscompat_inode_read(fs, disk->d_dp, + now.tv_sec)) + putinode(disk); return (0); + } ERROR(disk, "check-hash failed for inode read from disk"); return (-1); default: diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h index b26e0c263ce3..8acb365f1f44 100644 --- a/lib/libufs/libufs.h +++ b/lib/libufs/libufs.h @@ -29,14 +29,7 @@ #ifndef __LIBUFS_H__ #define __LIBUFS_H__ - -/* - * libufs structures. - */ -union dinodep { - struct ufs1_dinode *dp1; - struct ufs2_dinode *dp2; -}; +#include /* * userland ufs disk. @@ -107,6 +100,7 @@ void ffs_clusteracct(struct fs *, struct cg *, ufs1_daddr_t, int); void ffs_fragacct(struct fs *, int, int32_t [], int); int ffs_isblock(struct fs *, u_char *, ufs1_daddr_t); int ffs_isfreeblock(struct fs *, u_char *, ufs1_daddr_t); +bool ffs_oldfscompat_inode_read(struct fs *, union dinodep, time_t); void ffs_setblock(struct fs *, u_char *, ufs1_daddr_t); int ffs_sbget(void *, struct fs **, off_t, char *, int (*)(void *, off_t, void **, int)); diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 281cffcdf6f2..e18c2ac86bf7 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -57,10 +57,6 @@ static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #include "dump.h" -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock->fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 1a4cc24e63db..899d70e3dcfc 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -76,10 +76,6 @@ #define INOBUFSIZE 64*1024 /* size of buffer to read inodes in pass1 */ #define ZEROBUFSIZE (dev_bsize * 128) /* size of zero buffer used by -Z */ -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock.fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 3db8a5e5c23d..f7b9b941fdb4 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -53,6 +53,7 @@ static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; #include "fsck.h" struct bufarea *icachebp; /* inode cache buffer */ +static time_t now; /* current time of day */ static int iblock(struct inodesc *, off_t isize, int type); static ufs2_daddr_t indir_blkatoff(ufs2_daddr_t, ino_t, ufs_lbn_t, ufs_lbn_t, @@ -436,6 +437,7 @@ void ginode(ino_t inumber, struct inode *ip) { ufs2_daddr_t iblk; + union dinodep dpp; struct ufs2_dinode *dp; if (inumber < UFS_ROOTINO || inumber >= maxino) @@ -473,11 +475,14 @@ ginode(ino_t inumber, struct inode *ip) if (sblock.fs_magic == FS_UFS1_MAGIC) { ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode1[inumber - ip->i_bp->b_index]; + dpp.dp1 = (struct ufs1_dinode *)ip->i_dp; + if (ffs_oldfscompat_inode_read(&sblock, dpp, now)) + inodirty(ip); return; } ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode2[inumber - ip->i_bp->b_index]; - dp = (struct ufs2_dinode *)ip->i_dp; + dpp.dp2 = dp = (struct ufs2_dinode *)ip->i_dp; /* Do not check hash of inodes being created */ if (dp->di_mode != 0 && ffs_verify_dinode_ckhash(&sblock, dp)) { pwarn("INODE CHECK-HASH FAILED"); @@ -489,6 +494,8 @@ ginode(ino_t inumber, struct inode *ip) inodirty(ip); } } + if (ffs_oldfscompat_inode_read(&sblock, dpp, now)) + inodirty(ip); } /* @@ -527,6 +534,7 @@ getnextinode(ino_t inumber, int rebuiltcg) mode_t mode; ufs2_daddr_t ndb, blk; union dinode *dp; + union dinodep dpp; struct inode ip; static caddr_t nextinop; @@ -557,10 +565,13 @@ getnextinode(ino_t inumber, int rebuiltcg) nextinop = inobuf.b_un.b_buf; } dp = (union dinode *)nextinop; - if (sblock.fs_magic == FS_UFS1_MAGIC) + if (sblock.fs_magic == FS_UFS1_MAGIC) { nextinop += sizeof(struct ufs1_dinode); - else + dpp.dp1 = (struct ufs1_dinode *)dp; + } else { nextinop += sizeof(struct ufs2_dinode); + dpp.dp2 = (struct ufs2_dinode *)dp; + } if ((ckhashadd & CK_INODE) != 0) { ffs_update_dinode_ckhash(&sblock, (struct ufs2_dinode *)dp); dirty(&inobuf); @@ -579,6 +590,8 @@ getnextinode(ino_t inumber, int rebuiltcg) dirty(&inobuf); } } + if (ffs_oldfscompat_inode_read(&sblock, dpp, now)) + dirty(&inobuf); if (rebuiltcg && (char *)dp == inobuf.b_un.b_buf) { /* * Try to determine if we have reached the end of the @@ -632,8 +645,19 @@ getnextinode(ino_t inumber, int rebuiltcg) void setinodebuf(int cg, ino_t inosused) { + struct timespec time; ino_t inum; + /* + * Get the current value of the present time. + * This will happen before each cylinder group is scanned. + * If for some reason getting the time fails, we will use + * the last time that the superblock was updated. + */ + if (clock_gettime(CLOCK_REALTIME_FAST, &time) == 0) + now = time.tv_sec; + else + now = sblock.fs_time; inum = cg * sblock.fs_ipg; lastvalidinum = inum + inosused - 1; nextinum = inum; diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index a9bae0c64703..0ba99a22a006 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -95,10 +95,6 @@ static struct csum *fscs; #define sblock disk.d_fs #define acg disk.d_cg -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock.fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index fbc8fbce5e77..2ae163545953 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -89,10 +89,6 @@ union { long dev_bsize = 1; ino_t maxino; -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock.fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/share/man/man7/ffs.7 b/share/man/man7/ffs.7 index 7d003443f32a..a1a319ae47dd 100644 --- a/share/man/man7/ffs.7 +++ b/share/man/man7/ffs.7 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 3, 2020 +.Dd January 19, 2025 .Dt FFS 7 .Os .Sh NAME @@ -285,6 +285,10 @@ upon reallocating file system blocks to be contiguous. Enable support for the rearrangement of blocks to be contiguous. .Pq Default: 1 . +.It Va vfs.ffs.prttimechgs +Print a console message when timestamps for UFS1 filesystems are found +to be in the future and are changed to be the present time. +.Pq Default: 0 . .El .Sh HISTORY The diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 6c2de232ddbd..8911a84ee3c2 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -111,10 +111,7 @@ struct fs_ops ufs_fsops = { struct file { off_t f_seekp; /* seek pointer */ struct fs *f_fs; /* pointer to super-block */ - union dinode { - struct ufs1_dinode di1; - struct ufs2_dinode di2; - } f_di; /* copy of on-disk inode */ + union dinode f_dp; /* copy of on-disk inode */ int f_nindir[UFS_NIADDR]; /* number of blocks mapped by indirect block at level i */ @@ -130,7 +127,7 @@ struct file { }; #define DIP(fp, field) \ ((fp)->f_fs->fs_magic == FS_UFS1_MAGIC ? \ - (fp)->f_di.di1.field : (fp)->f_di.di2.field) + (fp)->f_dp.dp1.field : (fp)->f_dp.dp2.field) typedef struct ufs_mnt { char *um_dev; @@ -188,10 +185,10 @@ read_inode(ino_t inumber, struct open_file *f) } if (fp->f_fs->fs_magic == FS_UFS1_MAGIC) - fp->f_di.di1 = ((struct ufs1_dinode *)buf) + fp->f_dp.dp1 = ((struct ufs1_dinode *)buf) [ino_to_fsbo(fs, inumber)]; else - fp->f_di.di2 = ((struct ufs2_dinode *)buf) + fp->f_dp.dp2 = ((struct ufs2_dinode *)buf) [ino_to_fsbo(fs, inumber)]; /* diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 09028456435e..163ef4a11e50 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -491,8 +491,7 @@ nospace: * allocation will be used. */ -SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, - "FFS filesystem"); +SYSCTL_DECL(_vfs_ffs); static int doasyncfree = 1; SYSCTL_INT(_vfs_ffs, OID_AUTO, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 2e9b485d482b..15688943fa34 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -85,6 +85,7 @@ int ffs_inotovp(struct mount *, ino_t, uint64_t, int, struct vnode **, int ffs_isblock(struct fs *, uint8_t *, ufs1_daddr_t); int ffs_isfreeblock(struct fs *, uint8_t *, ufs1_daddr_t); void ffs_oldfscompat_write(struct fs *); +bool ffs_oldfscompat_inode_read(struct fs *, union dinodep, time_t); int ffs_own_mount(const struct mount *mp); int ffs_reallocblks(struct vop_reallocblks_args *); int ffs_realloccg(struct inode *, ufs2_daddr_t, ufs2_daddr_t, diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 351559882ca2..af0e2ac74427 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -35,6 +35,7 @@ #include #ifndef _KERNEL +#include #include #include #include @@ -66,6 +67,7 @@ struct malloc_type; #include #include #include +#include #include #include @@ -396,6 +398,65 @@ ffs_oldfscompat_write(struct fs *fs) } } +/* + * Sanity checks for loading old filesystem inodes. + * + * XXX - Parts get retired eventually. + * Unfortunately new bits get added. + */ +static int prttimechgs = 0; +#ifdef _KERNEL +SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "FFS filesystem"); + +SYSCTL_INT(_vfs_ffs, OID_AUTO, prttimechgs, CTLFLAG_RWTUN, &prttimechgs, 0, + "print UFS1 time changes made to inodes"); +#endif /* _KERNEL */ +bool +ffs_oldfscompat_inode_read(struct fs *fs, union dinodep dp, time_t now) +{ + bool change; + + change = false; + switch (fs->fs_magic) { + case FS_UFS2_MAGIC: + /* No changes for now */ + break; + + case FS_UFS1_MAGIC: + /* + * With the change to unsigned time values in UFS1, times set + * before Jan 1, 1970 will appear to be in the future. Check + * for future times and set them to be the current time. + */ + if (dp.dp1->di_ctime > now) { + if (prttimechgs) + printf("ctime %ud changed to %ld\n", + dp.dp1->di_ctime, (long)now); + dp.dp1->di_ctime = now; + change = true; + } + if (dp.dp1->di_mtime > now) { + if (prttimechgs) + printf("mtime %ud changed to %ld\n", + dp.dp1->di_mtime, (long)now); + dp.dp1->di_mtime = now; + dp.dp1->di_ctime = now; + change = true; + } + if (dp.dp1->di_atime > now) { + if (prttimechgs) + printf("atime %ud changed to %ld\n", + dp.dp1->di_atime, (long)now); + dp.dp1->di_atime = now; + dp.dp1->di_ctime = now; + change = true; + } + break; + } + return (change); +} + /* * Verify the filesystem values. */ diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index a77784b32d78..2cc22ffa32d4 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -205,6 +205,9 @@ ffs_load_inode(struct buf *bp, struct inode *ip, struct fs *fs, ino_t ino) ip->i_gen = dip1->di_gen; ip->i_uid = dip1->di_uid; ip->i_gid = dip1->di_gid; + if (ffs_oldfscompat_inode_read(fs, ip->i_dp, time_second) && + fs->fs_ronly == 0) + UFS_INODE_SET_FLAG(ip, IN_MODIFIED); return (0); } dip2 = ((struct ufs2_dinode *)bp->b_data + ino_to_fsbo(fs, ino)); @@ -224,6 +227,9 @@ ffs_load_inode(struct buf *bp, struct inode *ip, struct fs *fs, ino_t ino) ip->i_gen = dip2->di_gen; ip->i_uid = dip2->di_uid; ip->i_gid = dip2->di_gid; + if (ffs_oldfscompat_inode_read(fs, ip->i_dp, time_second) && + fs->fs_ronly == 0) + UFS_INODE_SET_FLAG(ip, IN_MODIFIED); return (0); } diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index b4117a99c262..49f7fd91aa26 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -113,12 +113,13 @@ typedef int64_t ufs_time_t; #define IFWHT 0160000 /* Whiteout. */ /* - * A dinode contains all the meta-data associated with a UFS2 file. - * This structure defines the on-disk format of a dinode. Since + * Each UFS filesystem version defines the on-disk format of its dinode. + * + * A UFS2 dinode contains all the meta-data associated with a UFS2 file. + * This structure defines the on-disk format of a UFS2 dinode. Since * this structure describes an on-disk structure, all its fields * are defined by types with precise widths. */ - #define UFS_NXADDR 2 /* External addresses in inode. */ #define UFS_NDADDR 12 /* Direct addresses in inode. */ #define UFS_NIADDR 3 /* Indirect addresses in inode. */ @@ -186,11 +187,11 @@ struct ufs1_dinode { uint32_t di_dirdepth; /* 4: IFDIR: depth from root dir */ }; uint64_t di_size; /* 8: File byte count. */ - int32_t di_atime; /* 16: Last access time. */ + uint32_t di_atime; /* 16: Last access time. */ int32_t di_atimensec; /* 20: Last access time. */ - int32_t di_mtime; /* 24: Last modified time. */ + uint32_t di_mtime; /* 24: Last modified time. */ int32_t di_mtimensec; /* 28: Last modified time. */ - int32_t di_ctime; /* 32: Last inode change time. */ + uint32_t di_ctime; /* 32: Last inode change time. */ int32_t di_ctimensec; /* 36: Last inode change time. */ union { struct { @@ -212,4 +213,17 @@ struct ufs1_dinode { #define UFS_LINK_MAX 65500 /* leave a few spare for special values */ +/* + * These structures hold or reference an on-disk dinode. + */ +union dinode { + struct ufs1_dinode dp1; + struct ufs2_dinode dp2; +}; + +union dinodep { + struct ufs1_dinode *dp1; + struct ufs2_dinode *dp2; +}; + #endif /* _UFS_UFS_DINODE_H_ */ diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index afe49bdba882..0fae4c11e309 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -89,10 +89,7 @@ struct inode { /* * The real copy of the on-disk inode. */ - union { - struct ufs1_dinode *din1; /* UFS1 on-disk dinode. */ - struct ufs2_dinode *din2; /* UFS2 on-disk dinode. */ - } dinode_u; + union dinodep i_dp; /* On-disk dinode */ ino_t i_number; /* The identity of the inode. */ uint32_t i_flag; /* flags, see below */ @@ -203,8 +200,8 @@ struct inode { #define i_dirhash i_un.dirhash #define i_snapblklist i_un.snapblklist -#define i_din1 dinode_u.din1 -#define i_din2 dinode_u.din2 +#define i_din1 i_dp.dp1 +#define i_din2 i_dp.dp2 #ifdef _KERNEL diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index cc83f2f2d3d2..c42641fff778 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -108,7 +108,7 @@ #undef DIP #define DIP(dp, field) \ ((ffs_opts->version == 1) ? \ - (dp)->ffs1_din.di_##field : (dp)->ffs2_din.di_##field) + (dp)->dp1.di_##field : (dp)->dp2.di_##field) /* * Various file system defaults (cribbed from newfs(8)). @@ -855,10 +855,10 @@ ffs_populate_dir(const char *dir, fsnode *root, fsinfo_t *fsopts) /* build on-disk inode */ if (ffs_opts->version == 1) - membuf = ffs_build_dinode1(&din.ffs1_din, &dirbuf, cur, + membuf = ffs_build_dinode1(&din.dp1, &dirbuf, cur, root, fsopts); else - membuf = ffs_build_dinode2(&din.ffs2_din, &dirbuf, cur, + membuf = ffs_build_dinode2(&din.dp2, &dirbuf, cur, root, fsopts); if (debug & DEBUG_FS_POPULATE_NODE) { @@ -944,11 +944,11 @@ ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts) in.i_number = ino; in.i_size = DIP(din, size); if (ffs_opts->version == 1) - memcpy(&in.i_din.ffs1_din, &din->ffs1_din, - sizeof(in.i_din.ffs1_din)); + memcpy(&in.i_din.dp1, &din->dp1, + sizeof(in.i_din.dp1)); else - memcpy(&in.i_din.ffs2_din, &din->ffs2_din, - sizeof(in.i_din.ffs2_din)); + memcpy(&in.i_din.dp2, &din->dp2, + sizeof(in.i_din.dp2)); if (DIP(din, size) == 0) goto write_inode_and_leave; /* mmm, cheating */ @@ -1178,16 +1178,16 @@ ffs_write_inode(union dinode *dp, uint32_t ino, const fsinfo_t *fsopts) ffs_rdfs(d, fs->fs_bsize, buf, fsopts); if (fsopts->needswap) { if (ffs_opts->version == 1) - ffs_dinode1_swap(&dp->ffs1_din, + ffs_dinode1_swap(&dp->dp1, &dp1[ino_to_fsbo(fs, ino)]); else - ffs_dinode2_swap(&dp->ffs2_din, + ffs_dinode2_swap(&dp->dp2, &dp2[ino_to_fsbo(fs, ino)]); } else { if (ffs_opts->version == 1) - dp1[ino_to_fsbo(fs, ino)] = dp->ffs1_din; + dp1[ino_to_fsbo(fs, ino)] = dp->dp1; else - dp2[ino_to_fsbo(fs, ino)] = dp->ffs2_din; + dp2[ino_to_fsbo(fs, ino)] = dp->dp2; } ffs_wtfs(d, fs->fs_bsize, buf, fsopts); free(buf); diff --git a/usr.sbin/makefs/ffs/ufs_inode.h b/usr.sbin/makefs/ffs/ufs_inode.h index 67581dda3359..e84fa57f6540 100644 --- a/usr.sbin/makefs/ffs/ufs_inode.h +++ b/usr.sbin/makefs/ffs/ufs_inode.h @@ -39,11 +39,6 @@ * @(#)inode.h 8.9 (Berkeley) 5/14/95 */ -union dinode { - struct ufs1_dinode ffs1_din; - struct ufs2_dinode ffs2_din; -}; - struct inode { ino_t i_number; /* The identity of the inode. */ struct vnode *i_devvp; /* vnode pointer (contains fsopts) */ @@ -52,45 +47,45 @@ struct inode { uint64_t i_size; }; -#define i_ffs1_atime i_din.ffs1_din.di_atime -#define i_ffs1_atimensec i_din.ffs1_din.di_atimensec -#define i_ffs1_blocks i_din.ffs1_din.di_blocks -#define i_ffs1_ctime i_din.ffs1_din.di_ctime -#define i_ffs1_ctimensec i_din.ffs1_din.di_ctimensec -#define i_ffs1_db i_din.ffs1_din.di_db -#define i_ffs1_flags i_din.ffs1_din.di_flags -#define i_ffs1_gen i_din.ffs1_din.di_gen -#define i_ffs11_gid i_din.ffs1_din.di_gid -#define i_ffs1_ib i_din.ffs1_din.di_ib -#define i_ffs1_mode i_din.ffs1_din.di_mode -#define i_ffs1_mtime i_din.ffs1_din.di_mtime -#define i_ffs1_mtimensec i_din.ffs1_din.di_mtimensec -#define i_ffs1_nlink i_din.ffs1_din.di_nlink -#define i_ffs1_rdev i_din.ffs1_din.di_rdev -#define i_ffs1_shortlink i_din.ffs1_din.di_shortlink -#define i_ffs1_size i_din.ffs1_din.di_size -#define i_ffs1_uid i_din.ffs1_din.di_uid +#define i_ffs1_atime i_din.dp1.di_atime +#define i_ffs1_atimensec i_din.dp1.di_atimensec +#define i_ffs1_blocks i_din.dp1.di_blocks +#define i_ffs1_ctime i_din.dp1.di_ctime +#define i_ffs1_ctimensec i_din.dp1.di_ctimensec +#define i_ffs1_db i_din.dp1.di_db +#define i_ffs1_flags i_din.dp1.di_flags +#define i_ffs1_gen i_din.dp1.di_gen +#define i_ffs11_gid i_din.dp1.di_gid +#define i_ffs1_ib i_din.dp1.di_ib +#define i_ffs1_mode i_din.dp1.di_mode +#define i_ffs1_mtime i_din.dp1.di_mtime +#define i_ffs1_mtimensec i_din.dp1.di_mtimensec +#define i_ffs1_nlink i_din.dp1.di_nlink +#define i_ffs1_rdev i_din.dp1.di_rdev +#define i_ffs1_shortlink i_din.dp1.di_shortlink +#define i_ffs1_size i_din.dp1.di_size +#define i_ffs1_uid i_din.dp1.di_uid -#define i_ffs2_atime i_din.ffs2_din.di_atime -#define i_ffs2_atimensec i_din.ffs2_din.di_atimensec -#define i_ffs2_blocks i_din.ffs2_din.di_blocks -#define i_ffs2_ctime i_din.ffs2_din.di_ctime -#define i_ffs2_ctimensec i_din.ffs2_din.di_ctimensec -#define i_ffs2_birthtime i_din.ffs2_din.di_birthtime -#define i_ffs2_birthnsec i_din.ffs2_din.di_birthnsec -#define i_ffs2_db i_din.ffs2_din.di_db -#define i_ffs2_flags i_din.ffs2_din.di_flags -#define i_ffs2_gen i_din.ffs2_din.di_gen -#define i_ffs21_gid i_din.ffs2_din.di_gid -#define i_ffs2_ib i_din.ffs2_din.di_ib -#define i_ffs2_mode i_din.ffs2_din.di_mode -#define i_ffs2_mtime i_din.ffs2_din.di_mtime -#define i_ffs2_mtimensec i_din.ffs2_din.di_mtimensec -#define i_ffs2_nlink i_din.ffs2_din.di_nlink -#define i_ffs2_rdev i_din.ffs2_din.di_rdev -#define i_ffs2_shortlink i_din.ffs2_din.di_shortlink -#define i_ffs2_size i_din.ffs2_din.di_size -#define i_ffs2_uid i_din.ffs2_din.di_uid +#define i_ffs2_atime i_din.dp2.di_atime +#define i_ffs2_atimensec i_din.dp2.di_atimensec +#define i_ffs2_blocks i_din.dp2.di_blocks +#define i_ffs2_ctime i_din.dp2.di_ctime +#define i_ffs2_ctimensec i_din.dp2.di_ctimensec +#define i_ffs2_birthtime i_din.dp2.di_birthtime +#define i_ffs2_birthnsec i_din.dp2.di_birthnsec +#define i_ffs2_db i_din.dp2.di_db +#define i_ffs2_flags i_din.dp2.di_flags +#define i_ffs2_gen i_din.dp2.di_gen +#define i_ffs21_gid i_din.dp2.di_gid +#define i_ffs2_ib i_din.dp2.di_ib +#define i_ffs2_mode i_din.dp2.di_mode +#define i_ffs2_mtime i_din.dp2.di_mtime +#define i_ffs2_mtimensec i_din.dp2.di_mtimensec +#define i_ffs2_nlink i_din.dp2.di_nlink +#define i_ffs2_rdev i_din.dp2.di_rdev +#define i_ffs2_shortlink i_din.dp2.di_shortlink +#define i_ffs2_size i_din.dp2.di_size +#define i_ffs2_uid i_din.dp2.di_uid #undef DIP #define DIP(ip, field) \ diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index e1f8b96acbc6..037db7ba3f55 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -98,10 +98,6 @@ static void quot(char *, char *); (((fs)->fs_magic == FS_UFS1_MAGIC ? sizeof(struct ufs1_dinode) : \ sizeof(struct ufs2_dinode)) * INOCNT(fs)) -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(fs, dp, field) \ (((fs)->fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) From nobody Mon Feb 10 11:15:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys26s2gwJz5nlCr; Mon, 10 Feb 2025 11:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys26r5sZlz3gsw; Mon, 10 Feb 2025 11:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNOCKtI2ueONyI5L9NPnt1TQThLDuIKAwVAyM9TfOt4=; b=X2Q4bzGsqusD9Gc5PW7jOmjg6oyN0nZKYNm58t7bzzFdTO1YIlHyLF0e1YBGJGY++df6OE SdoJoBa0AUpY265Dg6VsjJJtvlwEcuGC6wPcdRm0J9xzTEF1slbeZPEvcjVE1LrUSVizST tNJLl21N97qar1rAZr6S1JbqGSAS5RWfw4egyh3GHVt8xfauOkB1QHixYo/wNIa2EHL5pK ErjGrzJG5Tgxf4qGLWmisGrORj2USG5IKSLzxXSnakLSlkaJiY876kZq6ROMOiyYdGhLz4 0lLJ4OsJ7gsoXbAJxtDTrCMwNbR0GuPj07Z7hSDqxracJaqrfr8ZbGOonwLn/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNOCKtI2ueONyI5L9NPnt1TQThLDuIKAwVAyM9TfOt4=; b=gIzMxsU6v9lP5ltnIrn3GWPrb7swmuovLH9qVaiKlYeyh+GCcsl+9nnFcADgQ+Ixdvv2ZB 1++szvOZnL/JLGh7Z/dZoAKIIYVgzy9rANat28cTh3KAOVorF4MyO99K4Cbhug5qVuEnpk EOjCmWP2lB36KUN8gj6gp1qrbsiEHq1BpB8VOAObL7lcOT0iPdUKRXS5f0U9/KS8KiICXj WVZWSWZ6+VGMPr4QBZQgKs/rPCuRLnAN6i99zKFzniYubzojn7328PRCRpiDMOzQ6kZhpE A4TiTK9vuBCbvPTfKEKkwI9UHoQkk5ge/nwCYD1SAdhlRJ9U7a5qCXkXKKZotg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739186116; a=rsa-sha256; cv=none; b=SutucxSTvnbcvWKFr6fEDWhH+wuSnfNeR5evdyrrkI331sdbwez1aqTSvc3KDoIN1jXHmc YHNpzZDDji6TdcgZlvVKb7lOZmKGU8O7LZjljppjfAFlNfDp8GeNSuRsTVZa2MJAc0NLqk M/kmR2TOKJY/Ie9xavx2+MO3t9ceqDZEhOPntvi79sTe5BbZuwQTDoTFSBaUGDuv9dKDMt iA7gEhU3I7s2QH/5heRs8+VXar0TYR6DdBLbqDi1AQTrf2BXcIpm+HdKJg47XZMODof5fr r3V6hAQyaZ7qCiObB5OvkapeIxDBNRqLbR2qzlrlIIwZ93OqXwTk5I1Ly7p0+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys26r5KQbz7kx; Mon, 10 Feb 2025 11:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51ABFGMf016235; Mon, 10 Feb 2025 11:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51ABFGAC016232; Mon, 10 Feb 2025 11:15:16 GMT (envelope-from git) Date: Mon, 10 Feb 2025 11:15:16 GMT Message-Id: <202502101115.51ABFGAC016232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 7443532d5eed - stable/14 - drm2: Remove one more implementation of ilog2() List-Id: Commits to the stable branches 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7443532d5eeda853af76434d99727b2ea76d03bd Auto-Submitted: auto-generated The branch stable/14 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=7443532d5eeda853af76434d99727b2ea76d03bd commit 7443532d5eeda853af76434d99727b2ea76d03bd Author: Mark Johnston AuthorDate: 2024-06-05 22:18:19 +0000 Commit: Doug Moore CommitDate: 2025-02-10 10:28:24 +0000 drm2: Remove one more implementation of ilog2() Reviewed by: dougm Fixes: b0056b31e900 ("libkern: add ilog2 macro") Differential Revision: https://reviews.freebsd.org/D45504 (cherry picked from commit c70c791f06601309201f6ca99d39fee83f5dd368) --- sys/dev/drm2/drm_os_freebsd.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/drm2/drm_os_freebsd.h b/sys/dev/drm2/drm_os_freebsd.h index 0ce0dede6d73..58523a33da2a 100644 --- a/sys/dev/drm2/drm_os_freebsd.h +++ b/sys/dev/drm2/drm_os_freebsd.h @@ -297,13 +297,6 @@ get_unaligned_le32(const void *p) } #endif -static inline unsigned long -ilog2(unsigned long x) -{ - - return (flsl(x) - 1); -} - int64_t timeval_to_ns(const struct timeval *tv); struct timeval ns_to_timeval(const int64_t nsec); From nobody Mon Feb 10 11:15:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys26q4vX6z5nlHr; Mon, 10 Feb 2025 11:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys26q4Z38z3gwx; Mon, 10 Feb 2025 11:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v1F043cXhaatdXC58biNk/tr3CckL7hfmlTESv9f9fA=; b=dtxKGBXnB3NMObW070DhUFlH0dB33zsnMPF8q5M1BcBDhA0b9bcKvfStzLkMvyxUbxZFdh E7qYoSZcsCNouJIp0VSaTZjQac3dKdFFGhbPdKR1eOvvXElcmnKPM8xP9UHBXqwo5KyNqs 5qnoQ6sKVvUSHWs2cm/OTm98tkpEqn9TvFhngDSaCSDGkPW/sWLCbriDrunYJBe+W/KV8Z LqAPcEZDJWHw8TU+DHEtLyGf1MNbLW70NM8AKBYE4h43sMJOwPMG7Ab47rbqxY8KSSyY5T 5w9qHcLD2pwHKHw/qLGEVqSqoifuT1CFcGtemUc5Y14hK0fnQaFWKurEPluQzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v1F043cXhaatdXC58biNk/tr3CckL7hfmlTESv9f9fA=; b=I9qtwzItl/3rLT/pNOiM1Ou0zE9GCuWsa4U9yYzp0vSJNnEjL1E++hQ1MrxMKZwrC2LtUu MGDLS7QVhzwx1nEtk1VKcjkNDlVmaAbTPpTeeHztJVEeJBJrmfLa7ZJBF9AEZzrpSsunMC W6LFSeqnxALtknUwyzEPkNDnqQGQNoalr0Zse1AwNEig3yDXWesjjkOBmw8aogQioUe9vG 8JXQ9LCPq712VZ7zDqGzhp9oiFqp338qGcd78XHCRIY49sfsEVQf4bfDCZaZoy8uVLK7gD n6G+Baus8FX7VeQ8ph3WxnyBxni/KrCWMS+xkgTk9wR1GV7GzQTHPp3pve20wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739186115; a=rsa-sha256; cv=none; b=OtwCKZHe0ELQ2r1+wiX0mtQ1lUNLjEqoITwM9Mmmgt8lsXjjbvg3pr0IqCbN5/WlebQ7Zs jqIrLd2sMdxvP6b2p/FazgN2gUmsa9i89dXywlcEZ19wqDNiYQ7+94eL8QA4V96zyXWb0x PARKFsSMJ6t0LSI4ffGTpNufAWAFALQuatxfy7OmX8umdV6Iui5MOrrtxnS0xtfdfCIixh pZt0A+1L64ZqMQYUM4Tr1R0mvIU1Ew08P+EvcqPzYHzX1kwyH4kV7sgLW1rY/beYmsHvgL NcjrWLDzbGMbPxNgAL98hoQhVrlKsShWt+9oVdJk7VDw3geLCWHSeTGIAke0qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys26q47cGz8H8; Mon, 10 Feb 2025 11:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51ABFFZj016199; Mon, 10 Feb 2025 11:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51ABFF5i016196; Mon, 10 Feb 2025 11:15:15 GMT (envelope-from git) Date: Mon, 10 Feb 2025 11:15:15 GMT Message-Id: <202502101115.51ABFF5i016196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 4ed1837853b1 - stable/14 - libkern: add ilog2 macro List-Id: Commits to the stable branches 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ed1837853b17850f2a83ef41fc306da6bcc6f86 Auto-Submitted: auto-generated The branch stable/14 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=4ed1837853b17850f2a83ef41fc306da6bcc6f86 commit 4ed1837853b17850f2a83ef41fc306da6bcc6f86 Author: Doug Moore AuthorDate: 2024-06-03 16:37:55 +0000 Commit: Doug Moore CommitDate: 2025-02-10 10:27:12 +0000 libkern: add ilog2 macro The kernel source contains several definitions of an ilog2 function; some are slower than necessary, and one of them is incorrect. Elimininate them all and define an ilog2 macro in libkern to replace them, in a way that is fast, correct for all argument types, and, in a GENERIC kernel, includes a check for an invalid zero parameter. Folks at Microsoft have verified that having a correct ilog2 definition for their MANA driver doesn't break it. Reviewed by: alc, markj, mhorne (older version), jhibbits (older version) Differential Revision: https://reviews.freebsd.org/D45170 Differential Revision: https://reviews.freebsd.org/D45235 (cherry picked from commit b0056b31e90029553894d17c441cbb2c06d31412) --- sys/amd64/include/cpufunc.h | 4 - sys/arm64/iommu/smmu.c | 9 -- sys/compat/linuxkpi/common/include/linux/log2.h | 73 ---------------- sys/dev/bxe/bxe.h | 10 --- sys/dev/bxe/ecore_sp.h | 2 +- sys/dev/cxgbe/osdep.h | 8 -- sys/dev/enetc/enetc_hw.h | 1 - sys/dev/mana/gdma_util.h | 9 -- sys/dev/qat/qat/qat_ocf.c | 2 +- sys/i386/include/cpufunc.h | 9 -- sys/powerpc/booke/pmap.c | 1 - sys/powerpc/booke/pmap_32.c | 13 --- sys/powerpc/booke/pmap_64.c | 13 --- sys/sys/libkern.h | 106 ++++++++++++++++++++++++ 14 files changed, 108 insertions(+), 152 deletions(-) diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index b9893b8896d8..ca53d73b0186 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -65,10 +65,6 @@ breakpoint(void) #define bsfq(mask) __builtin_ctzl(mask) -#define bsrl(mask) (__builtin_clz(mask) ^ 0x1f) - -#define bsrq(mask) (__builtin_clzl(mask) ^ 0x3f) - static __inline void clflush(u_long addr) { diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index d09f33a9a49f..f5bdfb77f6a0 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -310,15 +310,6 @@ smmu_write_ack(struct smmu_softc *sc, uint32_t reg, return (0); } -static inline int -ilog2(long x) -{ - - KASSERT(x > 0 && powerof2(x), ("%s: invalid arg %ld", __func__, x)); - - return (flsl(x) - 1); -} - static int smmu_init_queue(struct smmu_softc *sc, struct smmu_queue *q, uint32_t prod_off, uint32_t cons_off, uint32_t dwords) diff --git a/sys/compat/linuxkpi/common/include/linux/log2.h b/sys/compat/linuxkpi/common/include/linux/log2.h index 27e91a8bdbe0..2d54c75c7c23 100644 --- a/sys/compat/linuxkpi/common/include/linux/log2.h +++ b/sys/compat/linuxkpi/common/include/linux/log2.h @@ -51,79 +51,6 @@ rounddown_pow_of_two(unsigned long x) return (1UL << (flsl(x) - 1)); } -#define ilog2(n) \ -( \ - __builtin_constant_p(n) ? ( \ - (n) < 1 ? -1 : \ - (n) & (1ULL << 63) ? 63 : \ - (n) & (1ULL << 62) ? 62 : \ - (n) & (1ULL << 61) ? 61 : \ - (n) & (1ULL << 60) ? 60 : \ - (n) & (1ULL << 59) ? 59 : \ - (n) & (1ULL << 58) ? 58 : \ - (n) & (1ULL << 57) ? 57 : \ - (n) & (1ULL << 56) ? 56 : \ - (n) & (1ULL << 55) ? 55 : \ - (n) & (1ULL << 54) ? 54 : \ - (n) & (1ULL << 53) ? 53 : \ - (n) & (1ULL << 52) ? 52 : \ - (n) & (1ULL << 51) ? 51 : \ - (n) & (1ULL << 50) ? 50 : \ - (n) & (1ULL << 49) ? 49 : \ - (n) & (1ULL << 48) ? 48 : \ - (n) & (1ULL << 47) ? 47 : \ - (n) & (1ULL << 46) ? 46 : \ - (n) & (1ULL << 45) ? 45 : \ - (n) & (1ULL << 44) ? 44 : \ - (n) & (1ULL << 43) ? 43 : \ - (n) & (1ULL << 42) ? 42 : \ - (n) & (1ULL << 41) ? 41 : \ - (n) & (1ULL << 40) ? 40 : \ - (n) & (1ULL << 39) ? 39 : \ - (n) & (1ULL << 38) ? 38 : \ - (n) & (1ULL << 37) ? 37 : \ - (n) & (1ULL << 36) ? 36 : \ - (n) & (1ULL << 35) ? 35 : \ - (n) & (1ULL << 34) ? 34 : \ - (n) & (1ULL << 33) ? 33 : \ - (n) & (1ULL << 32) ? 32 : \ - (n) & (1ULL << 31) ? 31 : \ - (n) & (1ULL << 30) ? 30 : \ - (n) & (1ULL << 29) ? 29 : \ - (n) & (1ULL << 28) ? 28 : \ - (n) & (1ULL << 27) ? 27 : \ - (n) & (1ULL << 26) ? 26 : \ - (n) & (1ULL << 25) ? 25 : \ - (n) & (1ULL << 24) ? 24 : \ - (n) & (1ULL << 23) ? 23 : \ - (n) & (1ULL << 22) ? 22 : \ - (n) & (1ULL << 21) ? 21 : \ - (n) & (1ULL << 20) ? 20 : \ - (n) & (1ULL << 19) ? 19 : \ - (n) & (1ULL << 18) ? 18 : \ - (n) & (1ULL << 17) ? 17 : \ - (n) & (1ULL << 16) ? 16 : \ - (n) & (1ULL << 15) ? 15 : \ - (n) & (1ULL << 14) ? 14 : \ - (n) & (1ULL << 13) ? 13 : \ - (n) & (1ULL << 12) ? 12 : \ - (n) & (1ULL << 11) ? 11 : \ - (n) & (1ULL << 10) ? 10 : \ - (n) & (1ULL << 9) ? 9 : \ - (n) & (1ULL << 8) ? 8 : \ - (n) & (1ULL << 7) ? 7 : \ - (n) & (1ULL << 6) ? 6 : \ - (n) & (1ULL << 5) ? 5 : \ - (n) & (1ULL << 4) ? 4 : \ - (n) & (1ULL << 3) ? 3 : \ - (n) & (1ULL << 2) ? 2 : \ - (n) & (1ULL << 1) ? 1 : \ - (n) & (1ULL << 0) ? 0 : \ - -1) : \ - (sizeof(n) <= 4) ? \ - fls((u32)(n)) - 1 : flsll((u64)(n)) - 1 \ -) - #define order_base_2(x) ilog2(roundup_pow_of_two(x)) #endif /* _LINUXKPI_LINUX_LOG2_H_ */ diff --git a/sys/dev/bxe/bxe.h b/sys/dev/bxe/bxe.h index cdef017ac32a..a6313c8304d6 100644 --- a/sys/dev/bxe/bxe.h +++ b/sys/dev/bxe/bxe.h @@ -127,16 +127,6 @@ #ifndef roundup #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) #endif -#ifndef ilog2 -static inline -int bxe_ilog2(int x) -{ - int log = 0; - while (x >>= 1) log++; - return (log); -} -#define ilog2(x) bxe_ilog2(x) -#endif #include "ecore_sp.h" diff --git a/sys/dev/bxe/ecore_sp.h b/sys/dev/bxe/ecore_sp.h index f39c908f7530..917f27549c1b 100644 --- a/sys/dev/bxe/ecore_sp.h +++ b/sys/dev/bxe/ecore_sp.h @@ -159,7 +159,7 @@ typedef struct mtx ECORE_MUTEX_SPIN; #define ECORE_FREE(_s, _buf, _size) free(_buf, M_TEMP) #define SC_ILT(sc) ((sc)->ilt) -#define ILOG2(x) bxe_ilog2(x) +#define ILOG2(x) ilog2(x) #define ECORE_ILT_ZALLOC(x, y, size) \ do { \ diff --git a/sys/dev/cxgbe/osdep.h b/sys/dev/cxgbe/osdep.h index 39675339dd2c..b8692692fd43 100644 --- a/sys/dev/cxgbe/osdep.h +++ b/sys/dev/cxgbe/osdep.h @@ -130,14 +130,6 @@ typedef boolean_t bool; #define PCI_EXP_LNKSTA_NLW PCIEM_LINK_STA_WIDTH #define PCI_EXP_DEVCTL2 PCIER_DEVICE_CTL2 -static inline int -ilog2(long x) -{ - KASSERT(x > 0 && powerof2(x), ("%s: invalid arg %ld", __func__, x)); - - return (flsl(x) - 1); -} - static inline char * strstrip(char *s) { diff --git a/sys/dev/enetc/enetc_hw.h b/sys/dev/enetc/enetc_hw.h index 507c4657453d..323d5529f50a 100644 --- a/sys/dev/enetc/enetc_hw.h +++ b/sys/dev/enetc/enetc_hw.h @@ -9,7 +9,6 @@ #define BIT(x) (1UL << (x)) #define GENMASK(h, l) (((~0U) - (1U << (l)) + 1) & (~0U >> (32 - 1 - (h)))) -#define ilog2(x) (flsl(x) - 1) #define PCI_VENDOR_FREESCALE 0x1957 diff --git a/sys/dev/mana/gdma_util.h b/sys/dev/mana/gdma_util.h index 822c831b9d70..37c2653d5ec9 100644 --- a/sys/dev/mana/gdma_util.h +++ b/sys/dev/mana/gdma_util.h @@ -170,15 +170,6 @@ find_first_zero_bit(const unsigned long *p, unsigned long max) return (max); } -static inline unsigned long -ilog2(unsigned long x) -{ - unsigned long log = x; - while (x >>= 1) - log++; - return (log); -} - static inline unsigned long roundup_pow_of_two(unsigned long x) { diff --git a/sys/dev/qat/qat/qat_ocf.c b/sys/dev/qat/qat/qat_ocf.c index 8958c7b82e49..b25135b6a678 100644 --- a/sys/dev/qat/qat/qat_ocf.c +++ b/sys/dev/qat/qat/qat_ocf.c @@ -517,7 +517,7 @@ qat_ocf_session_init(device_t dev, M_NOWAIT, 0, ~1UL, - 1 << (bsrl(sessionCtxSize - 1) + 1), + 1 << (ilog2(sessionCtxSize - 1) + 1), 0); if (NULL == sessionCtx) { device_printf(dev, "unable to allocate memory for session\n"); diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index bf643e6da21f..4bed57b5afbf 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -63,15 +63,6 @@ bsfl(u_int mask) return (result); } -static __inline __pure2 u_int -bsrl(u_int mask) -{ - u_int result; - - __asm("bsrl %1,%0" : "=r" (result) : "rm" (mask) : "cc"); - return (result); -} - static __inline void clflush(u_long addr) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 00653fa6d90c..2d7aaa900589 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -239,7 +239,6 @@ static __inline uint32_t tlb_calc_wimg(vm_paddr_t pa, vm_memattr_t ma); static vm_size_t tsize2size(unsigned int); static unsigned int size2tsize(vm_size_t); -static unsigned long ilog2(unsigned long); static void set_mas4_defaults(void); diff --git a/sys/powerpc/booke/pmap_32.c b/sys/powerpc/booke/pmap_32.c index c823bd640c6d..d7d7f5e99bcf 100644 --- a/sys/powerpc/booke/pmap_32.c +++ b/sys/powerpc/booke/pmap_32.c @@ -116,7 +116,6 @@ static unsigned int kernel_ptbls; /* Number of KVA ptbls. */ #define VM_MAPDEV_BASE ((vm_offset_t)VM_MAXUSER_ADDRESS + PAGE_SIZE) static void tid_flush(tlbtid_t tid); -static unsigned long ilog2(unsigned long); /**************************************************************************/ /* Page table management */ @@ -931,18 +930,6 @@ mmu_booke_quick_remove_page(vm_offset_t addr) /* TID handling */ /**************************************************************************/ -/* - * Return the largest uint value log such that 2^log <= num. - */ -static unsigned long -ilog2(unsigned long num) -{ - long lz; - - __asm ("cntlzw %0, %1" : "=r" (lz) : "r" (num)); - return (31 - lz); -} - /* * Invalidate all TLB0 entries which match the given TID. Note this is * dedicated for cases when invalidations should NOT be propagated to other diff --git a/sys/powerpc/booke/pmap_64.c b/sys/powerpc/booke/pmap_64.c index 968d9d9aa472..d8a0dba9ab23 100644 --- a/sys/powerpc/booke/pmap_64.c +++ b/sys/powerpc/booke/pmap_64.c @@ -125,7 +125,6 @@ static pte_t ****kernel_ptbl_root; #define VM_MAPDEV_PA_MAX 0x4000000000000000 /* Don't encroach on DMAP */ static void tid_flush(tlbtid_t tid); -static unsigned long ilog2(unsigned long); /**************************************************************************/ /* Page table management */ @@ -746,18 +745,6 @@ mmu_booke_quick_remove_page(vm_offset_t addr) /* TID handling */ /**************************************************************************/ -/* - * Return the largest uint value log such that 2^log <= num. - */ -static unsigned long -ilog2(unsigned long num) -{ - long lz; - - __asm ("cntlzd %0, %1" : "=r" (lz) : "r" (num)); - return (63 - lz); -} - /* * Invalidate all TLB0 entries which match the given TID. Note this is * dedicated for cases when invalidations should NOT be propagated to other diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 92698a3f9b23..6e10ec428090 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -189,6 +189,112 @@ flsll(long long mask) 8 * sizeof(mask) - __builtin_clzll((unsigned long long)mask)); } +static __inline __pure2 int +ilog2_int(int n) +{ + + MPASS(n != 0); + return (8 * sizeof(n) - 1 - __builtin_clz((u_int)n)); +} + +static __inline __pure2 int +ilog2_long(long n) +{ + + MPASS(n != 0); + return (8 * sizeof(n) - 1 - __builtin_clzl((u_long)n)); +} + +static __inline __pure2 int +ilog2_long_long(long long n) +{ + + MPASS(n != 0); + return (8 * sizeof(n) - 1 - + __builtin_clzll((unsigned long long)n)); +} + +#define ilog2_var(n) \ + _Generic((n), \ + default: ilog2_int, \ + long: ilog2_long, \ + unsigned long: ilog2_long, \ + long long: ilog2_long_long, \ + unsigned long long: ilog2_long_long \ + )(n) + +#define ilog2(n) \ +( \ + __builtin_constant_p(n) ? ( \ + (n) < 1 ? -1 : \ + (n) & (1ULL << 63) ? 63 : \ + (n) & (1ULL << 62) ? 62 : \ + (n) & (1ULL << 61) ? 61 : \ + (n) & (1ULL << 60) ? 60 : \ + (n) & (1ULL << 59) ? 59 : \ + (n) & (1ULL << 58) ? 58 : \ + (n) & (1ULL << 57) ? 57 : \ + (n) & (1ULL << 56) ? 56 : \ + (n) & (1ULL << 55) ? 55 : \ + (n) & (1ULL << 54) ? 54 : \ + (n) & (1ULL << 53) ? 53 : \ + (n) & (1ULL << 52) ? 52 : \ + (n) & (1ULL << 51) ? 51 : \ + (n) & (1ULL << 50) ? 50 : \ + (n) & (1ULL << 49) ? 49 : \ + (n) & (1ULL << 48) ? 48 : \ + (n) & (1ULL << 47) ? 47 : \ + (n) & (1ULL << 46) ? 46 : \ + (n) & (1ULL << 45) ? 45 : \ + (n) & (1ULL << 44) ? 44 : \ + (n) & (1ULL << 43) ? 43 : \ + (n) & (1ULL << 42) ? 42 : \ + (n) & (1ULL << 41) ? 41 : \ + (n) & (1ULL << 40) ? 40 : \ + (n) & (1ULL << 39) ? 39 : \ + (n) & (1ULL << 38) ? 38 : \ + (n) & (1ULL << 37) ? 37 : \ + (n) & (1ULL << 36) ? 36 : \ + (n) & (1ULL << 35) ? 35 : \ + (n) & (1ULL << 34) ? 34 : \ + (n) & (1ULL << 33) ? 33 : \ + (n) & (1ULL << 32) ? 32 : \ + (n) & (1ULL << 31) ? 31 : \ + (n) & (1ULL << 30) ? 30 : \ + (n) & (1ULL << 29) ? 29 : \ + (n) & (1ULL << 28) ? 28 : \ + (n) & (1ULL << 27) ? 27 : \ + (n) & (1ULL << 26) ? 26 : \ + (n) & (1ULL << 25) ? 25 : \ + (n) & (1ULL << 24) ? 24 : \ + (n) & (1ULL << 23) ? 23 : \ + (n) & (1ULL << 22) ? 22 : \ + (n) & (1ULL << 21) ? 21 : \ + (n) & (1ULL << 20) ? 20 : \ + (n) & (1ULL << 19) ? 19 : \ + (n) & (1ULL << 18) ? 18 : \ + (n) & (1ULL << 17) ? 17 : \ + (n) & (1ULL << 16) ? 16 : \ + (n) & (1ULL << 15) ? 15 : \ + (n) & (1ULL << 14) ? 14 : \ + (n) & (1ULL << 13) ? 13 : \ + (n) & (1ULL << 12) ? 12 : \ + (n) & (1ULL << 11) ? 11 : \ + (n) & (1ULL << 10) ? 10 : \ + (n) & (1ULL << 9) ? 9 : \ + (n) & (1ULL << 8) ? 8 : \ + (n) & (1ULL << 7) ? 7 : \ + (n) & (1ULL << 6) ? 6 : \ + (n) & (1ULL << 5) ? 5 : \ + (n) & (1ULL << 4) ? 4 : \ + (n) & (1ULL << 3) ? 3 : \ + (n) & (1ULL << 2) ? 2 : \ + (n) & (1ULL << 1) ? 1 : \ + (n) & (1ULL << 0) ? 0 : \ + -1) : \ + ilog2_var(n) \ +) + #define bitcount64(x) __bitcount64((uint64_t)(x)) #define bitcount32(x) __bitcount32((uint32_t)(x)) #define bitcount16(x) __bitcount16((uint16_t)(x)) From nobody Mon Feb 10 11:15:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys26t6LbZz5nlKs; Mon, 10 Feb 2025 11:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys26s6jZ4z3h2F; Mon, 10 Feb 2025 11:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qo1vZkNVBZYURhrNUHj44WVlLcxJr7OFsPKNu/eiVsk=; b=UAgxL2sgNK9t+3wUMYem+Qa8DbL9YpMqXM7KaRTVQOmNYgs+Rc6V+PKYg/MdBwmOUnTf+Q EHDVclQMDJ8KZSz/yzbSQEFlYa60rhq0AnKGVaQ0LJEGzWz6rnW/jFFo/4PlEXGMQOtzfu OaZ9sQkxZ2strmQBdTJJzea8jFfx7ZTkFE1Gs0camVPyKhd2vaf9Oggfz3U2K6iub+AgVE HAy1GghDYrI0NOVEo1FxCgyBKZRUTz2Bb//T0LK+PfOxMRTLszgEi9Q/pyUialMWQEKJEA YMGsL64tOci5XJm5cfO3YshDUdxfI3kcotsPPWXpR74X7y/jJk8KD6j9BH6Hcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qo1vZkNVBZYURhrNUHj44WVlLcxJr7OFsPKNu/eiVsk=; b=a08h9dJ2H4ofbz8mGQWFAerrlWNWX2g/8GsdGKcRHQ4beQjcpvN2OhNkJF5B8lYBg33xaX HevUh3lKVMx5Whc8VkdMMclMCSkseH7izJg6x0E5NSFdxGWZPE5I7wQEtQjBGpJCaJoG/h INNlE4Wmop7a4zTkpqAWRY11eE6OiruB+Nd1IOdVDAh/YyxQHf0Uy9ZPWaWma2OgcKLlpq 8zKLeyThrAyjVJbc+AIWxxjsVsdTUh/TqQasB6KFWQ/x0zTu/bq4BFYL700VJ2ffWTZFD2 ge9fAj78rUQD8hKh8Fm03xpSo4MkADDaVuKjw/ZghfQUcG233uo/dqLaH8GImw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739186118; a=rsa-sha256; cv=none; b=HmpYJfa1mbE08zmpxg5tx7n/ad2B1u9RjfcUQNs9RHG/sZeU6E7v+qi6xycsyKc4a6jr0l VuyMxJ4VvtGqIzpFFGPfqtbcYpNXZSCPtB2xG2Wj0FHh8D13pOEOK8ABjb9p+9UjOYUdEE 02VK+Hof/Rg5s2Ro4Wh1v0E7JEThLEqvS4X5tOuvLf2zPXZ+nLG08aSLMwUL0ldO5hRn6O 8LXwxUAnwea6SSxoTb+o/f9WeiloJdflJ7l3+cz7aqTf3tijqQcNcLG0tRElwPuya4K39B ek1PMxgJ0Bl+Z6/I8GZWYuug6+9R3t28Zzs/EdVR5ttvZyB3Gjd/zszm2OqDfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys26s6K1rz8WL; Mon, 10 Feb 2025 11:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51ABFHIO016269; Mon, 10 Feb 2025 11:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51ABFH2T016266; Mon, 10 Feb 2025 11:15:17 GMT (envelope-from git) Date: Mon, 10 Feb 2025 11:15:17 GMT Message-Id: <202502101115.51ABFH2T016266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 6f309b9d5654 - stable/14 - log2: move log2 functions from linuxkpi to libkern List-Id: Commits to the stable branches 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f309b9d5654b0ddada8d66c23ce028ba009dbcd Auto-Submitted: auto-generated The branch stable/14 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=6f309b9d5654b0ddada8d66c23ce028ba009dbcd commit 6f309b9d5654b0ddada8d66c23ce028ba009dbcd Author: Doug Moore AuthorDate: 2024-06-24 07:00:31 +0000 Commit: Doug Moore CommitDate: 2025-02-10 10:29:23 +0000 log2: move log2 functions from linuxkpi to libkern Linux has a header file that defines an ilog2 function and some simple functions/macros that use it: roundup_pow_of_two, is_power_of_2, rounddown_pow_of_two, and order_base_2. This change moves three of those simple functions (all but is_power_of_2) from linuxkpi to libkern. It also deletes a few implementations of these functions that have previously been copied into code for various device drivers, so that they can use the libkern version. The is_power_of_2 macro was not moved because powerof2 in param.h provides almost the same service already (except that they disagree about whether 0 is a power of two). Since the linux definitions of these functions were copied into FreeBSD 11 years ago, linux has improved them, and this change provides those improvements. In particular, a giant table of log values for evaluating ilog2 for constant values is no longer necessary. Reviewed by: alc, markj (previous version) Differential Revision: https://reviews.freebsd.org/D45536 (cherry picked from commit c8b0c33b03ac072413b27bed2bdae2ae27426f3a) --- sys/compat/linuxkpi/common/include/linux/log2.h | 23 ++----- sys/dev/drm2/drm_os_freebsd.h | 7 --- sys/dev/mana/gdma_util.h | 12 ---- sys/dev/qlnx/qlnxe/bcm_osal.h | 18 ------ sys/sys/libkern.h | 82 ++++--------------------- 5 files changed, 15 insertions(+), 127 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/log2.h b/sys/compat/linuxkpi/common/include/linux/log2.h index 2d54c75c7c23..660e9adb6fa9 100644 --- a/sys/compat/linuxkpi/common/include/linux/log2.h +++ b/sys/compat/linuxkpi/common/include/linux/log2.h @@ -33,24 +33,9 @@ #include -static inline unsigned long -roundup_pow_of_two(unsigned long x) -{ - return (1UL << flsl(x - 1)); -} - -static inline int -is_power_of_2(unsigned long n) -{ - return (n == roundup_pow_of_two(n)); -} - -static inline unsigned long -rounddown_pow_of_two(unsigned long x) -{ - return (1UL << (flsl(x) - 1)); -} - -#define order_base_2(x) ilog2(roundup_pow_of_two(x)) +#define is_power_of_2(n) ({ \ + __typeof(n) _n = (n); \ + _n != 0 && (_n & (_n - 1)) == 0; \ +}) #endif /* _LINUXKPI_LINUX_LOG2_H_ */ diff --git a/sys/dev/drm2/drm_os_freebsd.h b/sys/dev/drm2/drm_os_freebsd.h index 58523a33da2a..b2a2e82b748b 100644 --- a/sys/dev/drm2/drm_os_freebsd.h +++ b/sys/dev/drm2/drm_os_freebsd.h @@ -234,13 +234,6 @@ typedef void irqreturn_t; #define div_u64(n, d) ((n) / (d)) #define hweight32(i) bitcount32(i) -static inline unsigned long -roundup_pow_of_two(unsigned long x) -{ - - return (1UL << flsl(x - 1)); -} - /** * ror32 - rotate a 32-bit value right * @word: value to rotate diff --git a/sys/dev/mana/gdma_util.h b/sys/dev/mana/gdma_util.h index 37c2653d5ec9..1efa315bbcfe 100644 --- a/sys/dev/mana/gdma_util.h +++ b/sys/dev/mana/gdma_util.h @@ -170,18 +170,6 @@ find_first_zero_bit(const unsigned long *p, unsigned long max) return (max); } -static inline unsigned long -roundup_pow_of_two(unsigned long x) -{ - return (1UL << flsl(x - 1)); -} - -static inline int -is_power_of_2(unsigned long n) -{ - return (n == roundup_pow_of_two(n)); -} - struct completion { unsigned int done; struct mtx lock; diff --git a/sys/dev/qlnx/qlnxe/bcm_osal.h b/sys/dev/qlnx/qlnxe/bcm_osal.h index c820532c9e0a..7148fd3f6215 100644 --- a/sys/dev/qlnx/qlnxe/bcm_osal.h +++ b/sys/dev/qlnx/qlnxe/bcm_osal.h @@ -102,24 +102,6 @@ extern void qlnx_vf_flr_update(void *p_hwfn); #ifndef QLNX_RDMA -static __inline unsigned long -roundup_pow_of_two(unsigned long x) -{ - return (1UL << flsl(x - 1)); -} - -static __inline int -is_power_of_2(unsigned long n) -{ - return (n == roundup_pow_of_two(n)); -} - -static __inline unsigned long -rounddown_pow_of_two(unsigned long x) -{ - return (1UL << (flsl(x) - 1)); -} - #define max_t(type, val1, val2) \ ((type)(val1) > (type)(val2) ? (type)(val1) : (val2)) #define min_t(type, val1, val2) \ diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 6e10ec428090..a10289d72dc7 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -223,77 +223,17 @@ ilog2_long_long(long long n) unsigned long long: ilog2_long_long \ )(n) -#define ilog2(n) \ -( \ - __builtin_constant_p(n) ? ( \ - (n) < 1 ? -1 : \ - (n) & (1ULL << 63) ? 63 : \ - (n) & (1ULL << 62) ? 62 : \ - (n) & (1ULL << 61) ? 61 : \ - (n) & (1ULL << 60) ? 60 : \ - (n) & (1ULL << 59) ? 59 : \ - (n) & (1ULL << 58) ? 58 : \ - (n) & (1ULL << 57) ? 57 : \ - (n) & (1ULL << 56) ? 56 : \ - (n) & (1ULL << 55) ? 55 : \ - (n) & (1ULL << 54) ? 54 : \ - (n) & (1ULL << 53) ? 53 : \ - (n) & (1ULL << 52) ? 52 : \ - (n) & (1ULL << 51) ? 51 : \ - (n) & (1ULL << 50) ? 50 : \ - (n) & (1ULL << 49) ? 49 : \ - (n) & (1ULL << 48) ? 48 : \ - (n) & (1ULL << 47) ? 47 : \ - (n) & (1ULL << 46) ? 46 : \ - (n) & (1ULL << 45) ? 45 : \ - (n) & (1ULL << 44) ? 44 : \ - (n) & (1ULL << 43) ? 43 : \ - (n) & (1ULL << 42) ? 42 : \ - (n) & (1ULL << 41) ? 41 : \ - (n) & (1ULL << 40) ? 40 : \ - (n) & (1ULL << 39) ? 39 : \ - (n) & (1ULL << 38) ? 38 : \ - (n) & (1ULL << 37) ? 37 : \ - (n) & (1ULL << 36) ? 36 : \ - (n) & (1ULL << 35) ? 35 : \ - (n) & (1ULL << 34) ? 34 : \ - (n) & (1ULL << 33) ? 33 : \ - (n) & (1ULL << 32) ? 32 : \ - (n) & (1ULL << 31) ? 31 : \ - (n) & (1ULL << 30) ? 30 : \ - (n) & (1ULL << 29) ? 29 : \ - (n) & (1ULL << 28) ? 28 : \ - (n) & (1ULL << 27) ? 27 : \ - (n) & (1ULL << 26) ? 26 : \ - (n) & (1ULL << 25) ? 25 : \ - (n) & (1ULL << 24) ? 24 : \ - (n) & (1ULL << 23) ? 23 : \ - (n) & (1ULL << 22) ? 22 : \ - (n) & (1ULL << 21) ? 21 : \ - (n) & (1ULL << 20) ? 20 : \ - (n) & (1ULL << 19) ? 19 : \ - (n) & (1ULL << 18) ? 18 : \ - (n) & (1ULL << 17) ? 17 : \ - (n) & (1ULL << 16) ? 16 : \ - (n) & (1ULL << 15) ? 15 : \ - (n) & (1ULL << 14) ? 14 : \ - (n) & (1ULL << 13) ? 13 : \ - (n) & (1ULL << 12) ? 12 : \ - (n) & (1ULL << 11) ? 11 : \ - (n) & (1ULL << 10) ? 10 : \ - (n) & (1ULL << 9) ? 9 : \ - (n) & (1ULL << 8) ? 8 : \ - (n) & (1ULL << 7) ? 7 : \ - (n) & (1ULL << 6) ? 6 : \ - (n) & (1ULL << 5) ? 5 : \ - (n) & (1ULL << 4) ? 4 : \ - (n) & (1ULL << 3) ? 3 : \ - (n) & (1ULL << 2) ? 2 : \ - (n) & (1ULL << 1) ? 1 : \ - (n) & (1ULL << 0) ? 0 : \ - -1) : \ - ilog2_var(n) \ -) +#define ilog2_const(n) \ + (8 * (int)sizeof(unsigned long long) - 1 - \ + __builtin_clzll(n)) + +#define ilog2(n) (__builtin_constant_p(n) ? ilog2_const(n) : ilog2_var(n)) +#define rounddown_pow_of_two(n) ((__typeof(n))1 << ilog2(n)) +#define order_base_2(n) ({ \ + __typeof(n) _n = (n); \ + _n == 1 ? 0 : 1 + ilog2(_n - 1); \ +}) +#define roundup_pow_of_two(n) ((__typeof(n))1 << order_base_2(n)) #define bitcount64(x) __bitcount64((uint64_t)(x)) #define bitcount32(x) __bitcount32((uint32_t)(x)) From nobody Mon Feb 10 11:15:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys26v2zHSz5nlNQ; Mon, 10 Feb 2025 11:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys26v0WNfz3h6B; Mon, 10 Feb 2025 11:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=henna4l6uSx0ns5iHrxZHHX26TlH8QFRYsTA+QBk2pw=; b=Jpte0e1vjuZt6yS5YleBRCScx0YtXCuIQFJSURp61Kj8daotbU1gwNE2dVtMhML0tvbK0h CK10r7dtV2h9CHqqy7BjvzeisY4v9vn5+D3/6J8nEk1fZe0yGmFcSz7HPWso5Ey6vCls7r wVJELAWlznRgVtDOWhZc27uvwq0iJSZfj1dcReoO428X7gyAjOFRE4vuQJuzuwKjz5iLr3 g8nIT0bGJqPYvDtp5rJI8mQiM7Ip633lorNFKdwrVRl44p8gpTuAoCuPx25Zs8+CQ2EHGY Gc5r4fnjfKDRTx7C8U1H0H8AyelbogORF8egxhzBkXeTj9jZAJjyuYIfJ9cqTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=henna4l6uSx0ns5iHrxZHHX26TlH8QFRYsTA+QBk2pw=; b=Aus2oFjAYs27PG1KKBRC9N1ROio2S6Z19jRgJIh7+uC9FHuFtSsH2dFHGjcRkRvUtot5BX mN7mSym82Wi6RT6hawc2OWLsLNjC5MMKcxzEsAYIl8P9z1YIqK1/W6VPxcMIXl9WhINHe5 l3Cv5at9oC1nzjMCcLJ25NsjnA4eaWyIcqVbXrH6gMCoF3SzaPjLmWgm8mjSf4ehgt+002 12M+EoYOmz6hh46J+3d/ifLSOM/aRC/QKUiaObRgxR1jv3DcmtOQTSOO4Uzv5D7iPesh0z JPE9OCy8W+2opjMqfVFewAQ2mlH+cytC1ClvIWAATcbUG6NJC7dvK6dWwWSTbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739186119; a=rsa-sha256; cv=none; b=y07fOZ768lLll28Xxzh9tG+TXX9YIkWPGZAcoPnN/0lhK9BGyBUKsfutNVq1DCdM81KPga nw5uU4HoqANnkJYqUhY3DWWZHGJnQw5zQVrz3f5DQmBxgdL42X4ilg/enqiC5FBrlA8bpe S/ua3XdjEpvLWAguRvXtPGDz/uiayIHBlWkwmnaIvt6iyghmlnDrW1cYkdVxgnxye2yIXJ CE6q4Rzp+GM6M5QoQ9KIGm+ieGmzenp2md4Zwfxk6CdD7fkp6KFAURrU0da8iOlEGd8/CZ A4kH3iBWLn5bK5Ube2zXB042H8FOFSxs1wlTnC3we9L5qAQcm8L7e4U042QSEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys26v07NPz8L5; Mon, 10 Feb 2025 11:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51ABFI23016301; Mon, 10 Feb 2025 11:15:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51ABFISj016298; Mon, 10 Feb 2025 11:15:18 GMT (envelope-from git) Date: Mon, 10 Feb 2025 11:15:18 GMT Message-Id: <202502101115.51ABFISj016298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 7bcc7a0b88cc - stable/14 - libkern: avoid local var in order_base_2() List-Id: Commits to the stable branches 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b Auto-Submitted: auto-generated The branch stable/14 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b commit 7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b Author: Doug Moore AuthorDate: 2024-09-27 23:43:07 +0000 Commit: Doug Moore CommitDate: 2025-02-10 10:30:05 +0000 libkern: avoid local var in order_base_2() order_base_2(n) is implemented with a variable, which keeps it from being used at file scope. Implement it instead as ilog2(2*n-1), which produces a different result when 2*n overflows, which appears unlikely in practice. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D46826 (cherry picked from commit b7cbf741d55468ba34305a14ac3acc1c286af034) --- sys/sys/libkern.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index a10289d72dc7..835e5ffaf0b7 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -229,10 +229,7 @@ ilog2_long_long(long long n) #define ilog2(n) (__builtin_constant_p(n) ? ilog2_const(n) : ilog2_var(n)) #define rounddown_pow_of_two(n) ((__typeof(n))1 << ilog2(n)) -#define order_base_2(n) ({ \ - __typeof(n) _n = (n); \ - _n == 1 ? 0 : 1 + ilog2(_n - 1); \ -}) +#define order_base_2(n) ilog2(2*(n)-1) #define roundup_pow_of_two(n) ((__typeof(n))1 << order_base_2(n)) #define bitcount64(x) __bitcount64((uint64_t)(x)) From nobody Mon Feb 10 11:15:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys26w6QLlz5nlHs; Mon, 10 Feb 2025 11:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys26w131Pz3grL; Mon, 10 Feb 2025 11:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7vdo+G4sXBcMFznokvspphlWX8TWX0/UX2GMnYrn3o=; b=QFQu4KDpo6dvnY2f+14nIZdCO3odbYPPUPzrmPItqPjVswpLyAXA1B7DBbMuWjscNeXVYO JxedYFqRwRIhF9RRQgvQcrrUdIiJ9a853USbTQoj+7ERLDontyVR0HdRybMM7GX+b7Dfzv dxCPmeK6ocC+ym2f5nrN4DRmL2LNQNDSLdvO4db04gASXnh/D5LeCaus1lIFDFkIxWtKsl W0dfEwkdCBoaOXcGMpkohqND+B16ps//MrfRGGxh4r2J0WTCUrKVmMRBtAwRsiRLtqajWV MjfwwzyZZ8Jo1xQPc0vvURIiCd8NavtQtod+OdmAAT+Nx55NbtbSjbkl61bOxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739186120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7vdo+G4sXBcMFznokvspphlWX8TWX0/UX2GMnYrn3o=; b=d9aVv9liyLXbSqWOVHj+XW1LwXP0iULVYURBuhZXssbacjIDwCEtJSNVxqzez6C3eE1sOG Zujj9/GYebTLSHHiLtSYbuCNdDqTsLafp7aQWRNv/oRWM3rEU3ydNayhnllhNge+pCnOeF 9A83fovyMFKgETIT7gO4h44pqLTiLtxCYe5KI7pvi6iZEGSh25V1VNSL5Iw/j/FD95hHwm JB/oqTzgWuwBkB9R6526LfZ6hUDiBxgx2g5VbQ+zL5MCaPCwtolAQJ22sXhUPsTyqVS9n1 aOCC064aOAFhzpw0En6D7VMBA+BXa5CdIXgkmsRjbFwwzFESRYwc89kn0XOivw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739186120; a=rsa-sha256; cv=none; b=uYpQ7nWcUocTfRhQSc+hudb3klCSSnhQIyV0RnsA5iSvQ76nZhZHZ5pzRIAzyOJHJY/WCK xlZTesvxKJGKdaPHOCy2w801HP9mBEsAs+lnEg1UuIGeBfahVZBMuD+/vErvEFQBB18h/8 mAfLFeCMOwruBfEebhAOaUlGo4v9ACKDeL5UxkztQTMgwa/e1i6dPIt9ryDC+mMfLEwjdW 4l00brPKdFvRcDwh6y8fsxyppQwISxihaINgEb59bvyyGFgE5esYFalO35DgJ8A5yGkoRu yr4xPkm80mEC5m/2JZWCGzX3JfWlH4mq1JpALuEVCvHZQUo9blMeucqFT4xk+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys26w0dHrz7ky; Mon, 10 Feb 2025 11:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51ABFJlG016341; Mon, 10 Feb 2025 11:15:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51ABFJIA016338; Mon, 10 Feb 2025 11:15:19 GMT (envelope-from git) Date: Mon, 10 Feb 2025 11:15:19 GMT Message-Id: <202502101115.51ABFJIA016338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 16b7da6f7abe - stable/14 - dev/mana: replace power2 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16b7da6f7abea88a34f09651516e9093fc4e8b68 Auto-Submitted: auto-generated The branch stable/14 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=16b7da6f7abea88a34f09651516e9093fc4e8b68 commit 16b7da6f7abea88a34f09651516e9093fc4e8b68 Author: Doug Moore AuthorDate: 2024-06-24 06:55:01 +0000 Commit: Doug Moore CommitDate: 2025-02-10 10:50:32 +0000 dev/mana: replace power2 function Replace is_power_of_2(length) with power2(length). When length != 0, as in this case, they produce the same result. This will allow an implementation of is_power_of_two to be dropped. Reviewed by: alc, markj Differential Revision: https://reviews.freebsd.org/D45536 (cherry picked from commit a94ed493b50752cee09245fc312c63b00331f217) --- sys/dev/mana/gdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index 090f6382b071..70985f4fbf65 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -939,7 +939,7 @@ mana_gd_create_dma_region(struct gdma_dev *gd, int err; int i; - if (length < PAGE_SIZE || !is_power_of_2(length)) { + if (length < PAGE_SIZE || !powerof2(length)) { mana_err(NULL, "gmi size incorrect: %u\n", length); return EINVAL; } From nobody Mon Feb 10 14:16:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys68F2xL0z5mDDV; Mon, 10 Feb 2025 14:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys68F26bqz43GG; Mon, 10 Feb 2025 14:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739197005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1g2c1gwyqf7LMmbygnDnGnS9+DQkkQKlWiPOJSmjqDk=; b=x9AnbuJohBHYcb9LUPTGPRDp9XIiIa6XQDcW6U5axYgHvpXDeaP/O0r5J9BIkjau11ZHmc UoCTZzn2yuVsaDEOePTwNNCkm1HcbAZjVcg4YmiL8O9269PmviUt+ybWtvMYQFb7/8H0dE 2U6kE59xc/fXvQEfOSvDF364mTV7JlgqerB1HDKTh9mPffsbsjo9eGWH/bAFYo6vaSwdHN aZ2TkCYxwUIS+6ZQm6PgwpdB7F8AHX10dPEqUdeWcDkGHbogQunLztCKFsWTahtJKzyOoj /pcma6zapBrYWRZLozcso7hm+MpBNNxdQYQ/bJA5WK2enHWVBBtK/vyxshenuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739197005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1g2c1gwyqf7LMmbygnDnGnS9+DQkkQKlWiPOJSmjqDk=; b=vYXju3rCXFjBrDLtAtz+jCsFqruR9h9lomUAOpEnde8I6kdMYWqzcO8AULrv6J+qgVvpMH pMI+NaNqCiPGlXOpTtvRKZyP2Am/l0ek1EN0J4vfRVduEfhpmGO41EITDh7nrgIBYX4JrO KSb6LQy6q3U7vlDV3pxeU73U1f4GJ/22/6s/mrHxK3ProMDgm3VFrS1cD+iW94NonRmKvE RG8Q5HT4vmKGs/9ycQWY5gm4YpZHkeElPG0bQF35ZQLEp5O4DYdEVtHn1gi3yLlfV42bt7 pYQIISvvKo7Pvr/rdWkY29ZQx7mcRyGfTo+IZZkZ/wyjZpN2VEXT9g6q14EJPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739197005; a=rsa-sha256; cv=none; b=LOalonz3ie/Ear8c4AF5usJctH3D1OaeUgs8Gs+e6zSGg43It9a5dIiQxr/5WJrKDYRFDp mD2rspqo5yosUkgCaFrHci2pAQaq/HqMVekRRfNk/uGy+qNziY9t0Y+DrNZnB1xefjhTc7 1mW7SsqL0mrhUvM1z4Nrj5mAwA4PLMw5TNliosFEHxswA/3P/SEVV89q3HRINLUfHW/EGM ZS6atZ66a97eZAR+VpP1VHeRHSRtFCPJHC/CEyZUHmnwq+ZGM5zM5nDEZ+WuQnHt8dbDsa jMBi81i0Tb5nzWYKwhzeC4+r91J/P1i6UNiNTx1VvElMItIuQ46cg5hjbieKrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys68F1LWzzDN7; Mon, 10 Feb 2025 14:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEGi6o053159; Mon, 10 Feb 2025 14:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEGiFO053156; Mon, 10 Feb 2025 14:16:44 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:16:44 GMT Message-Id: <202502101416.51AEGiFO053156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 2ee9d7dcdbe1 - stable/14 - libkern: don't use MPASS List-Id: Commits to the stable branches 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ee9d7dcdbe143ad3535723aaeac284c2586a963 Auto-Submitted: auto-generated The branch stable/14 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee9d7dcdbe143ad3535723aaeac284c2586a963 commit 2ee9d7dcdbe143ad3535723aaeac284c2586a963 Author: Doug Moore AuthorDate: 2024-06-03 18:20:00 +0000 Commit: Doug Moore CommitDate: 2025-02-10 14:16:25 +0000 libkern: don't use MPASS Using MPASS in libkern breaks buildworld. Replace MPASS with KASSERT in three places. (cherry picked from commit 08f6f78f81e21b21dd002a9389436b0333cb3488) --- sys/sys/libkern.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 835e5ffaf0b7..a792a61aa8ce 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -193,7 +193,7 @@ static __inline __pure2 int ilog2_int(int n) { - MPASS(n != 0); + KASSERT(n != 0, ("ilog argument must be nonzero")); return (8 * sizeof(n) - 1 - __builtin_clz((u_int)n)); } @@ -201,7 +201,7 @@ static __inline __pure2 int ilog2_long(long n) { - MPASS(n != 0); + KASSERT(n != 0, ("ilog argument must be nonzero")); return (8 * sizeof(n) - 1 - __builtin_clzl((u_long)n)); } @@ -209,7 +209,7 @@ static __inline __pure2 int ilog2_long_long(long long n) { - MPASS(n != 0); + KASSERT(n != 0, ("ilog argument must be nonzero")); return (8 * sizeof(n) - 1 - __builtin_clzll((unsigned long long)n)); } From nobody Mon Feb 10 14:52:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xT2dLbz5mGmC; Mon, 10 Feb 2025 14:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xS440hz4LPH; Mon, 10 Feb 2025 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F5wCjC0tFSBN7QIFg6LYDRm23kdoqew/g3kj17OwMKo=; b=BizM+ZMXkbMeuVYe7KunFrKWmaPNrJ73U7n0aZx9WERwzA5WRx6PkZnJ6S8HcDSxqYTI4U sdN60/5GSI8H7IsFzNAIGFWbKYkTw3YOrx1na8EPVEjm+dUzts5xnkAt0nx3SdV0IFIz+0 iYO1s4ys4+qF/lJrR+d4exdhwXZOAZqtU3w67KUU8h9/VxVif1I7MwauzssDjaMRSXw5ak YzkEdp/8dhD69P4dKYyoMqxF51IfAC+XuOl7rbKWJbLGhNJP8DRr9O1KPzOGS0vwe2XRPI wsdBJFPezlJVexr1pmTEb4RtvP75tiaRzjHLnflPDo262/qOMWPjxlL9mcc1bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F5wCjC0tFSBN7QIFg6LYDRm23kdoqew/g3kj17OwMKo=; b=KpK0j4UDHzzV7AngDubdjS/6nslOvCpNpJp226bYaOMazB+7Ojt/pP0kSIC51cCm9klZWL 0JBcLE8EM1p5hxVadLae668eDujMQf+/SpT2LwcmB4ZYzoCWn292j7X1tN+xVrsUanNv+g fkKQMtKrYtC8w165scY/w3QjNqNQfDDEZ32/QFIyzo6jZ6Ofze8hQzdIIRzUsOkZI/64Z0 u6tr8H+VA4NhxfU4Ue4nKYk3f8u0weg5XvMDow6tH2V/+FmwgmV1WchuBIrVdwQoffDgYq Q4wf+S2Ar9EGhezxH/4LZeNMpDN9wJ+7gPA6bMhVls2VEVw+3E6xHCeQpwpvUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199148; a=rsa-sha256; cv=none; b=QFIqt6lPkeDiJBRIGUA3SYr3GHp5vCrrX2IaHBnn135GKASUuNDtwjZsp/Ueh4DaiSxVJi DCTtPEQgKsQdOR2tI8M/Y4AU7gbvJsFMZk2AmH2GKAakKRoOCRHVPC+PnYpJoUJFRz16R7 G8n5JvXgrTlGgIKUzhkmWTDwpD8l16Bz4KN8x7exbeECW2Iqovuuf6pGXEl+G0BcI8F36d kk0K7sxGYBEKd8aSRBL6sovUcWKBbGrI6za4j1lamnWjHHHAGo8hA2ZosBCmM5EUlmXLAt /82rGXbKbedmaqC6KtICQ4/8oFYnw6Y0gPP3hNqU6vXTLR/gg7SFRIiVeVOIYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xS3gMSzXWj; Mon, 10 Feb 2025 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqSuY027499; Mon, 10 Feb 2025 14:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqSg3027496; Mon, 10 Feb 2025 14:52:28 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:28 GMT Message-Id: <202502101452.51AEqSg3027496@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: c57e8af7d5dc - stable/14 - LinuxKPI: 802.11: adjustments for v6.11 iwlwifi, rtw88 and rtw89 List-Id: Commits to the stable branches 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: c57e8af7d5dce6e5c9b616336ba4594ede6f110b Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c57e8af7d5dce6e5c9b616336ba4594ede6f110b commit c57e8af7d5dce6e5c9b616336ba4594ede6f110b Author: Bjoern A. Zeeb AuthorDate: 2024-10-28 12:15:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:06 +0000 LinuxKPI: 802.11: adjustments for v6.11 iwlwifi, rtw88 and rtw89 Bring in the LinuxKPI 802.11 compat bits which are altering the mac80211 KPI. * In struct ieee80211_bss_conf chandef -> chanreq. * Various struct ieee80211_ops gained a link_id arguemnt, stop gained a suspend flag. * Various functions gained a link_id argument. * ieee80211_tx_status() was renamed to ieee80211_tx_status_skb() Sponsored by: The FreeBSD Foundation (cherry picked from commit 7b43f4d064195bcf66816cb9fe350a1392fe24ce) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 22 ++++++++++++---------- sys/compat/linuxkpi/common/src/linux_80211.c | 14 +++++++------- sys/compat/linuxkpi/common/src/linux_80211.h | 2 +- .../linuxkpi/common/src/linux_80211_macops.c | 6 +++--- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 6dbf07c85bb8..dff152caf140 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -297,7 +297,7 @@ struct ieee80211_bss_conf { uint8_t transmitter_bssid[ETH_ALEN]; struct ieee80211_ftm_responder_params *ftmr_params; struct ieee80211_p2p_noa_attr p2p_noa_attr; - struct cfg80211_chan_def chandef; + struct ieee80211_chanreq chanreq; __be32 arp_addr_list[1]; /* XXX TODO */ struct ieee80211_rate *beacon_rate; struct { @@ -796,7 +796,9 @@ enum ieee80211_vif_driver_flags { IEEE80211_VIF_BEACON_FILTER = BIT(0), IEEE80211_VIF_SUPPORTS_CQM_RSSI = BIT(1), IEEE80211_VIF_SUPPORTS_UAPSD = BIT(2), +#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION < 60600) /* v6.6 */ IEEE80211_VIF_DISABLE_SMPS_OVERRIDE = BIT(3), /* Renamed to IEEE80211_VIF_EML_ACTIVE. */ +#endif IEEE80211_VIF_EML_ACTIVE = BIT(4), IEEE80211_VIF_IGNORE_OFDMA_WIDER_BW = BIT(5), }; @@ -970,7 +972,7 @@ enum ieee80211_offload_flags { struct ieee80211_ops { /* TODO FIXME */ int (*start)(struct ieee80211_hw *); - void (*stop)(struct ieee80211_hw *); + void (*stop)(struct ieee80211_hw *, bool); int (*config)(struct ieee80211_hw *, u32); void (*reconfig_complete)(struct ieee80211_hw *, enum ieee80211_reconfig_type); @@ -993,7 +995,7 @@ struct ieee80211_ops { void (*mgd_prepare_tx)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_prep_tx_info *); void (*mgd_complete_tx)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_prep_tx_info *); - void (*mgd_protect_tdls_discover)(struct ieee80211_hw *, struct ieee80211_vif *); + void (*mgd_protect_tdls_discover)(struct ieee80211_hw *, struct ieee80211_vif *, unsigned int); void (*flush)(struct ieee80211_hw *, struct ieee80211_vif *, u32, bool); void (*flush_sta)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); @@ -1024,10 +1026,10 @@ struct ieee80211_ops { bool (*can_aggregate_in_amsdu)(struct ieee80211_hw *, struct sk_buff *, struct sk_buff *); int (*pre_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel_switch *); - int (*post_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *); + int (*post_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *); void (*channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel_switch *); void (*channel_switch_beacon)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_chan_def *); - void (*abort_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *); + void (*abort_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *); void (*channel_switch_rx_beacon)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel_switch *); int (*tdls_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, u8, struct cfg80211_chan_def *, struct sk_buff *, u32); void (*tdls_cancel_channel_switch)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); @@ -1561,7 +1563,7 @@ ieee80211_beacon_loss(struct ieee80211_vif *vif) } static __inline void -ieee80211_chswitch_done(struct ieee80211_vif *vif, bool t) +ieee80211_chswitch_done(struct ieee80211_vif *vif, bool t, uint32_t link_id) { TODO(); } @@ -1587,7 +1589,7 @@ ieee80211_csa_update_counter(struct ieee80211_vif *vif) } static __inline void -ieee80211_csa_finish(struct ieee80211_vif *vif) +ieee80211_csa_finish(struct ieee80211_vif *vif, uint32_t link_id) { TODO(); } @@ -2111,7 +2113,7 @@ ieee80211_queue_work(struct ieee80211_hw *hw, struct work_struct *w) } static __inline void -ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) +ieee80211_tx_status_skb(struct ieee80211_hw *hw, struct sk_buff *skb) { linuxkpi_ieee80211_tx_status(hw, skb); } @@ -2225,7 +2227,7 @@ ieee80211_beacon_set_cntdwn(struct ieee80211_vif *vif, u8 counter) } static __inline int -ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif) +ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif, uint32_t link_id) { TODO(); return (-1); @@ -2240,7 +2242,7 @@ ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *vht_cap, uint32_t chanwidth, } static __inline bool -ieee80211_beacon_cntdwn_is_complete(struct ieee80211_vif *vif) +ieee80211_beacon_cntdwn_is_complete(struct ieee80211_vif *vif, uint32_t link_id) { TODO(); return (true); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d2c2a020399d..5aa86ab7ebec 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1270,9 +1270,9 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } else { error = lkpi_80211_mo_add_chanctx(hw, chanctx_conf); if (error == 0 || error == EOPNOTSUPP) { - vif->bss_conf.chandef.chan = chanctx_conf->def.chan; - vif->bss_conf.chandef.width = chanctx_conf->def.width; - vif->bss_conf.chandef.center_freq1 = + vif->bss_conf.chanreq.oper.chan = chanctx_conf->def.chan; + vif->bss_conf.chanreq.oper.width = chanctx_conf->def.width; + vif->bss_conf.chanreq.oper.center_freq1 = chanctx_conf->def.center_freq1; #ifdef LKPI_80211_HT if (vif->bss_conf.chandef.width == NL80211_CHAN_WIDTH_40) { @@ -1283,7 +1283,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif->bss_conf.chandef.center_freq1 -= 10; } #endif - vif->bss_conf.chandef.center_freq2 = + vif->bss_conf.chanreq.oper.center_freq2 = chanctx_conf->def.center_freq2; } else { ic_printf(vap->iv_ic, "%s:%d: mo_add_chanctx " @@ -2841,7 +2841,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], lvif->lvif_ifllevent = EVENTHANDLER_REGISTER(iflladdr_event, lkpi_vif_iflladdr, vif, EVENTHANDLER_PRI_ANY); vif->bss_conf.link_id = 0; /* Non-MLO operation. */ - vif->bss_conf.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; + vif->bss_conf.chanreq.oper.width = NL80211_CHAN_WIDTH_20_NOHT; vif->bss_conf.use_short_preamble = false; /* vap->iv_flags IEEE80211_F_SHPREAMBLE */ vif->bss_conf.use_short_slot = false; /* vap->iv_flags IEEE80211_F_SHSLOT */ vif->bss_conf.qos = false; @@ -3027,7 +3027,7 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap) lkpi_80211_mo_remove_interface(hw, vif); /* Single VAP, so we can do this here. */ - lkpi_80211_mo_stop(hw); + lkpi_80211_mo_stop(hw, false); /* XXX SUSPEND */ mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); @@ -3084,7 +3084,7 @@ lkpi_ic_parent(struct ieee80211com *ic) start_all = true; } else { #ifdef HW_START_STOP - lkpi_80211_mo_stop(hw); + lkpi_80211_mo_stop(hw, false); /* XXX SUSPEND */ #endif } LKPI_80211_LHW_UNLOCK(lhw); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index b6ac3e85f80f..8605ec86ad1b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -392,7 +392,7 @@ struct lkpi_wiphy { mtx_assert(&(_ltxq)->ltxq_mtx, MA_NOTOWNED) int lkpi_80211_mo_start(struct ieee80211_hw *); -void lkpi_80211_mo_stop(struct ieee80211_hw *); +void lkpi_80211_mo_stop(struct ieee80211_hw *, bool); int lkpi_80211_mo_get_antenna(struct ieee80211_hw *, u32 *, u32 *); int lkpi_80211_mo_set_frag_threshold(struct ieee80211_hw *, uint32_t); int lkpi_80211_mo_set_rts_threshold(struct ieee80211_hw *, uint32_t); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 06bf1a58fef1..e60ccbdeb4ce 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -75,7 +75,7 @@ out: } void -lkpi_80211_mo_stop(struct ieee80211_hw *hw) +lkpi_80211_mo_stop(struct ieee80211_hw *hw, bool suspend) { struct lkpi_hw *lhw; @@ -83,8 +83,8 @@ lkpi_80211_mo_stop(struct ieee80211_hw *hw) if (lhw->ops->stop == NULL) return; - LKPI_80211_TRACE_MO("hw %p", hw); - lhw->ops->stop(hw); + LKPI_80211_TRACE_MO("hw %p suspend %d", hw, suspend); + lhw->ops->stop(hw, suspend); lhw->sc_flags &= ~LKPI_MAC80211_DRV_STARTED; } From nobody Mon Feb 10 14:52:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xV3KM0z5mGgq; Mon, 10 Feb 2025 14:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xV07dYz4L8s; Mon, 10 Feb 2025 14:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BkGmo+bzET8MiMCdBGEeAqi5K+lgk/JpAPJuA3MNjaI=; b=sZ+0hA14B6cCtcXurkoxDE6Te3AvGwgph1ds2426N64yR1IlsrmKzR938GJ1JLlhFJvplh rOXz0R5wDNqaYjFtpgsKcbwZj74nItz0uAbzTJiLhHNtB5YUgwT/c/KJBCYCBU2sveyNjk 3Pn7z09VNl5He/6/uEtDM+8jCF2ASw4i24JBqw5grmnWko3pcP+8xkxctE65QHrvsbOCXr Qb0EExKrSBNeF5Hwnh+8LhDIHceU85K4MKJt/J4n4toXUHa1nD5uupwc37GIj/iGy4lj5a XSf0VB1T7W0PaAtVHL9NfdI8B6Opa/Ty/fFG3CyB2DuQfrRZ2jgYv+nGn4mRMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BkGmo+bzET8MiMCdBGEeAqi5K+lgk/JpAPJuA3MNjaI=; b=srjt/p4p0YDkybZLdZt5v/BVBqD3eauVrDmCrpP+JLtnsbEHw8da27lh8P9j/ZMXSwaFvF 7XrljKiXH6MMEQlwUQLQRXtmhtNH8HHZ5K4V4TqwWgYzURYPn3Q4AhFJlMaalwlPYxYly3 2uFbkxhd3JiRGExHaDDXlNOVdfsmrLHvDJJRKCuyokiJ+v9FdONUUI8BtVrMhz0Y9ZwQzK NvtoeYcOKZPoSLgEEYpyyYYRPoquGx/NvHHUbEbMvUehp3qS+X6Nun/oDNQPvQJr31tczB P352Q9kAdCHpb7HdURjhmVskvR9iN4a5odhV454IMHmM8Cji8CxFEDfTXahPfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199150; a=rsa-sha256; cv=none; b=oRT/KjmpXDLDN954gDsdT8MdH3DzWMwLuXJwfyCi+yRZm6ohHi+6tWorihlm5W0isUgIwd C/PTIRQlqxFV9iguHHncs96ZwuM89/RZa7zxZ23F4WtChSKpYc6PkBlJ+I2FCnwFPlcaDm d6Mh4wheEap8WMlq0ldWl3eenJ3FpXhF9FG6+XBrMlF8VoYbukDZoIdd2XMUQWEH2I58AE +OrgF2dsaMq6B4P/Et3MGUdmjF0fbupPtHoiHwhMkbWUcV3hh2o+FUBQlISfk6Fqbb0EVJ KaSAQ5ymG/elR/gfE6wYR5M9W/1cfqBSWu/KLOF7VuKMCeATEhNrhTNRrTMmwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xT6rhPzX74; Mon, 10 Feb 2025 14:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqTRS027540; Mon, 10 Feb 2025 14:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqTsm027532; Mon, 10 Feb 2025 14:52:29 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:29 GMT Message-Id: <202502101452.51AEqTsm027532@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: f4e352ef16d6 - stable/14 - iwlwifi: update Intel's iwlwifi/mvm driver. List-Id: Commits to the stable branches 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: f4e352ef16d6afb4f2238ecdf925d531f8b9e995 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f4e352ef16d6afb4f2238ecdf925d531f8b9e995 commit f4e352ef16d6afb4f2238ecdf925d531f8b9e995 Author: Bjoern A. Zeeb AuthorDate: 2024-09-27 21:53:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:07 +0000 iwlwifi: update Intel's iwlwifi/mvm driver. This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 98f7e32f20d28ec452afb208f9cffc08448a2652 ( tag: v6.11 ). Sponsored by: The FreeBSD Foundation (cherry picked from commit a4128aad8503277614f2d214011ef60a19447b83) --- share/man/man4/iwlwifi.4 | 12 +- share/man/man4/iwlwififw.4 | 238 ++- sys/contrib/dev/iwlwifi/cfg/22000.c | 4 +- sys/contrib/dev/iwlwifi/cfg/ax210.c | 12 +- sys/contrib/dev/iwlwifi/cfg/bz.c | 29 +- sys/contrib/dev/iwlwifi/cfg/sc.c | 48 +- sys/contrib/dev/iwlwifi/fw/acpi.c | 649 ++----- sys/contrib/dev/iwlwifi/fw/acpi.h | 220 +-- sys/contrib/dev/iwlwifi/fw/api/alive.h | 6 +- sys/contrib/dev/iwlwifi/fw/api/binding.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/coex.h | 81 +- sys/contrib/dev/iwlwifi/fw/api/commands.h | 30 + sys/contrib/dev/iwlwifi/fw/api/config.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/d3.h | 107 +- sys/contrib/dev/iwlwifi/fw/api/datapath.h | 36 +- sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h | 81 +- sys/contrib/dev/iwlwifi/fw/api/debug.h | 40 +- sys/contrib/dev/iwlwifi/fw/api/location.h | 160 +- sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h | 60 +- sys/contrib/dev/iwlwifi/fw/api/mac.h | 17 +- sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h | 198 +- sys/contrib/dev/iwlwifi/fw/api/offload.h | 8 +- sys/contrib/dev/iwlwifi/fw/api/phy-ctxt.h | 24 +- sys/contrib/dev/iwlwifi/fw/api/phy.h | 9 +- sys/contrib/dev/iwlwifi/fw/api/power.h | 134 +- sys/contrib/dev/iwlwifi/fw/api/rfi.h | 7 +- sys/contrib/dev/iwlwifi/fw/api/rs.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/rx.h | 26 +- sys/contrib/dev/iwlwifi/fw/api/scan.h | 49 +- sys/contrib/dev/iwlwifi/fw/api/sta.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/stats.h | 153 +- sys/contrib/dev/iwlwifi/fw/api/time-event.h | 80 +- sys/contrib/dev/iwlwifi/fw/api/tx.h | 23 +- sys/contrib/dev/iwlwifi/fw/api/txq.h | 14 +- sys/contrib/dev/iwlwifi/fw/dbg.c | 295 ++- sys/contrib/dev/iwlwifi/fw/dbg.h | 4 +- sys/contrib/dev/iwlwifi/fw/debugfs.c | 17 +- sys/contrib/dev/iwlwifi/fw/dump.c | 3 +- sys/contrib/dev/iwlwifi/fw/error-dump.h | 33 +- sys/contrib/dev/iwlwifi/fw/file.h | 71 +- sys/contrib/dev/iwlwifi/fw/img.h | 4 +- sys/contrib/dev/iwlwifi/fw/init.c | 7 +- sys/contrib/dev/iwlwifi/fw/notif-wait.h | 3 +- sys/contrib/dev/iwlwifi/fw/pnvm.c | 49 +- sys/contrib/dev/iwlwifi/fw/regulatory.c | 639 +++++++ sys/contrib/dev/iwlwifi/fw/regulatory.h | 220 +++ sys/contrib/dev/iwlwifi/fw/rs.c | 1 - sys/contrib/dev/iwlwifi/fw/runtime.h | 30 +- sys/contrib/dev/iwlwifi/fw/uefi.c | 462 ++++- sys/contrib/dev/iwlwifi/fw/uefi.h | 245 ++- sys/contrib/dev/iwlwifi/iwl-config.h | 43 +- sys/contrib/dev/iwlwifi/iwl-context-info-gen3.h | 13 +- sys/contrib/dev/iwlwifi/iwl-csr.h | 10 +- sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c | 94 +- sys/contrib/dev/iwlwifi/iwl-dbg-tlv.h | 6 +- sys/contrib/dev/iwlwifi/iwl-debug.c | 5 +- sys/contrib/dev/iwlwifi/iwl-devtrace.h | 2 + sys/contrib/dev/iwlwifi/iwl-drv.c | 151 +- sys/contrib/dev/iwlwifi/iwl-drv.h | 12 +- sys/contrib/dev/iwlwifi/iwl-eeprom-parse.c | 879 --------- sys/contrib/dev/iwlwifi/iwl-eeprom-read.c | 397 ---- sys/contrib/dev/iwlwifi/iwl-eeprom-read.h | 12 - sys/contrib/dev/iwlwifi/iwl-fh.h | 85 +- sys/contrib/dev/iwlwifi/iwl-io.c | 4 +- sys/contrib/dev/iwlwifi/iwl-modparams.h | 21 +- sys/contrib/dev/iwlwifi/iwl-nvm-parse.c | 223 ++- sys/contrib/dev/iwlwifi/iwl-nvm-parse.h | 23 +- sys/contrib/dev/iwlwifi/iwl-nvm-utils.c | 118 ++ .../{iwl-eeprom-parse.h => iwl-nvm-utils.h} | 19 +- sys/contrib/dev/iwlwifi/iwl-op-mode.h | 32 +- sys/contrib/dev/iwlwifi/iwl-prph.h | 42 +- sys/contrib/dev/iwlwifi/iwl-trans.c | 456 ++++- sys/contrib/dev/iwlwifi/iwl-trans.h | 736 ++------ sys/contrib/dev/iwlwifi/mei/iwl-mei.h | 7 +- sys/contrib/dev/iwlwifi/mvm/coex.c | 124 +- sys/contrib/dev/iwlwifi/mvm/constants.h | 26 +- sys/contrib/dev/iwlwifi/mvm/d3.c | 649 ++++++- sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 272 ++- sys/contrib/dev/iwlwifi/mvm/debugfs.c | 418 ++--- sys/contrib/dev/iwlwifi/mvm/debugfs.h | 1 + sys/contrib/dev/iwlwifi/mvm/ftm-initiator.c | 277 ++- sys/contrib/dev/iwlwifi/mvm/ftm-responder.c | 49 +- sys/contrib/dev/iwlwifi/mvm/fw.c | 522 ++---- sys/contrib/dev/iwlwifi/mvm/link.c | 953 +++++++++- sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c | 117 +- sys/contrib/dev/iwlwifi/mvm/mac80211.c | 1423 +++++++++------ sys/contrib/dev/iwlwifi/mvm/mld-key.c | 42 +- sys/contrib/dev/iwlwifi/mvm/mld-mac.c | 11 +- sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 672 ++++--- sys/contrib/dev/iwlwifi/mvm/mld-sta.c | 98 +- sys/contrib/dev/iwlwifi/mvm/mvm.h | 592 ++++-- sys/contrib/dev/iwlwifi/mvm/nvm.c | 19 +- sys/contrib/dev/iwlwifi/mvm/offloading.c | 8 +- sys/contrib/dev/iwlwifi/mvm/ops.c | 319 +++- sys/contrib/dev/iwlwifi/mvm/phy-ctxt.c | 115 +- sys/contrib/dev/iwlwifi/mvm/power.c | 179 +- sys/contrib/dev/iwlwifi/mvm/rfi.c | 8 +- sys/contrib/dev/iwlwifi/mvm/rs-fw.c | 33 +- sys/contrib/dev/iwlwifi/mvm/rx.c | 329 +++- sys/contrib/dev/iwlwifi/mvm/rxmq.c | 473 ++--- sys/contrib/dev/iwlwifi/mvm/scan.c | 694 +++++-- sys/contrib/dev/iwlwifi/mvm/sf.c | 5 +- sys/contrib/dev/iwlwifi/mvm/sta.c | 258 ++- sys/contrib/dev/iwlwifi/mvm/sta.h | 47 +- sys/contrib/dev/iwlwifi/mvm/tdls.c | 39 +- sys/contrib/dev/iwlwifi/mvm/testmode.h | 92 + sys/contrib/dev/iwlwifi/mvm/time-event.c | 470 ++++- sys/contrib/dev/iwlwifi/mvm/time-event.h | 21 +- sys/contrib/dev/iwlwifi/mvm/tt.c | 146 +- sys/contrib/dev/iwlwifi/mvm/tx.c | 325 ++-- sys/contrib/dev/iwlwifi/mvm/utils.c | 99 +- sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c | 42 +- sys/contrib/dev/iwlwifi/pcie/ctxt-info.c | 6 +- sys/contrib/dev/iwlwifi/pcie/drv.c | 211 ++- sys/contrib/dev/iwlwifi/pcie/internal.h | 362 +++- sys/contrib/dev/iwlwifi/pcie/rx.c | 47 +- sys/contrib/dev/iwlwifi/pcie/trans-gen2.c | 29 +- sys/contrib/dev/iwlwifi/pcie/trans.c | 482 ++--- sys/contrib/dev/iwlwifi/pcie/tx-gen2.c | 1191 +++++++++++- sys/contrib/dev/iwlwifi/pcie/tx.c | 1270 +++++++++++-- sys/contrib/dev/iwlwifi/queue/tx.c | 1903 -------------------- sys/contrib/dev/iwlwifi/queue/tx.h | 183 -- sys/contrib/dev/iwlwifi/tests/Makefile | 7 + sys/contrib/dev/iwlwifi/tests/devinfo.c | 78 + sys/contrib/dev/iwlwifi/tests/module.c | 10 + sys/modules/iwlwifi/Makefile | 7 +- usr.sbin/fwget/pci/pci_network_intel | 33 +- 127 files changed, 14821 insertions(+), 9009 deletions(-) diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index b4dce91f1ee4..04317c22936f 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -220,15 +220,19 @@ Intel(R) Wi-Fi 6 AX101 .It Intel(R) Wi-Fi 6 AX203 .It -Intel(R) Wi-Fi 6E AX221 160MHz -.It Intel(R) Wi-Fi 6E AX231 160MHz .It -Intel(R) TBD Bz device +Intel(R) Wi-Fi 7 BE201 320MHz +.It +Intel(R) Wi-Fi 7 BE200 320MHz .It -Intel(R) Wi-Fi 6 AX204 160MHz +Intel(R) Wi-Fi 7 BE202 160MHz .It Intel(R) TBD Sc device +.It +Intel(R) TBD Sc2 device +.It +Intel(R) TBD Sc2f device .\" -------------------------------------------------------------------- .El .Sh SEE ALSO diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4 index debd0cda36b5..491a634e70b5 100644 --- a/share/man/man4/iwlwififw.4 +++ b/share/man/man4/iwlwififw.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2021-2023 The FreeBSD Foundation +.\" Copyright (c) 2021-2024 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd October 12, 2024 .Dt iwlwififw 4 .Os .Sh NAME @@ -43,13 +43,18 @@ models supported by the .Xr iwlwifi 4 driver. .Pp +One can use +.Xr fwget 8 +to install the correct firmware package. +.Pp .Bl -column -compact "Vendor" "Device" "Subv. " "Subd. " "Firmware-Prefix" .It Ar Name .It Ar Vendor Ta Ar Device Ta Ar Subv. Ta Ar Subd. Ta Ar Firmware-Prefix -.\" --------------------------------------------------------------------- -.\" This list is manually generated from a sysctl and post-processing. -.\" Edits will be overwritten on next update. -.\" --------------------------------------------------------------------- +.% --------------------------------------------------------------------- +.% This list is manually generated from a sysctl and post-processing +.% by sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh generating the list. +.% Edits will be overwritten on next update. +.% --------------------------------------------------------------------- .It "" .It Intel(R) Dual Band Wireless AC 7260 .It 0x8086 Ta 0x08b1 Ta any Ta 0x4070 Ta iwlwifi-7260 @@ -735,6 +740,198 @@ driver. .It Intel(R) Dual Band Wireless AC 8265 .It 0x8086 Ta 0x24fd Ta any Ta 0x9074 Ta iwlwifi-8265 .It "" +.It (unknown) +.It 0x8086 Ta 0x2526 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x271b Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x271c Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x30dc Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x31dc Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x9df0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa370 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x02f0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x06f0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x34f0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x3df0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x4df0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x43f0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa0f0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x2723 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x2725 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x7a70 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x7af0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x51f0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x51f1 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x54f0 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x7f70 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x2729 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x7e40 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x2727 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x272d Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x272b Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 000000 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0090 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0094 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0098 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x009c Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x00c0 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x00c4 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x00e0 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x00e4 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x00e8 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x00ec Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0100 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0110 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0114 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0118 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x011c Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0310 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0314 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0510 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x0a10 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x1671 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x1672 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x1771 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x1772 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x1791 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x1792 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x4090 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x40c4 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x40e0 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x4110 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xa840 Ta any Ta 0x4314 Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x7740 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x4d40 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xe440 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xe340 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0xd340 Ta any Ta any Ta (unknown) +.It "" +.It (unknown) +.It 0x8086 Ta 0x6e70 Ta any Ta any Ta (unknown) +.It "" .It Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz .It 0x8086 Ta 0x2526 Ta any Ta 0x1550 Ta iwlwifi-9260-th-b0-jf-b0 .It "" @@ -1290,9 +1487,6 @@ driver. .It Intel(R) Wi-Fi 6E AX211 160MHz .It 0x8086 Ta any Ta any Ta any Ta (null) .It "" -.It Intel(R) Wi-Fi 6E AX221 160MHz -.It 0x8086 Ta any Ta any Ta any Ta (null) -.It "" .It Intel(R) Wi-Fi 6E AX231 160MHz .It 0x8086 Ta any Ta any Ta any Ta (null) .It "" @@ -1311,9 +1505,6 @@ driver. .It Intel(R) Wi-Fi 6E AX411 160MHz .It 0x8086 Ta any Ta any Ta any Ta iwlwifi-so-a0-gf4-a0 .It "" -.It Intel(R) TBD Bz device -.It 0x8086 Ta any Ta any Ta any Ta (null) -.It "" .It Intel(R) Wireless-AC 9560 160MHz .It 0x8086 Ta any Ta any Ta any Ta iwlwifi-so-a0-jf-b0 .It "" @@ -1332,14 +1523,23 @@ driver. .It Intel(R) Wireless-AC 9462 .It 0x8086 Ta any Ta any Ta any Ta iwlwifi-so-a0-jf-b0 .It "" -.It Intel(R) Wi-Fi 6 AX204 160MHz -.It 0x8086 Ta any Ta any Ta any Ta iwlwifi-so-a0-mr-a0 +.It Intel(R) Wi-Fi 7 BE201 320MHz +.It 0x8086 Ta any Ta any Ta any Ta (null) +.It "" +.It Intel(R) Wi-Fi 7 BE200 320MHz +.It 0x8086 Ta any Ta any Ta any Ta (null) .It "" -.It Intel(R) Wi-Fi 6 AX204 160MHz +.It Intel(R) Wi-Fi 7 BE202 160MHz .It 0x8086 Ta any Ta any Ta any Ta (null) .It "" .It Intel(R) TBD Sc device .It 0x8086 Ta any Ta any Ta any Ta (null) +.It "" +.It Intel(R) TBD Sc2 device +.It 0x8086 Ta any Ta any Ta any Ta (null) +.It "" +.It Intel(R) TBD Sc2f device +.It 0x8086 Ta any Ta any Ta any Ta (null) .\" --------------------------------------------------------------------- .El .Pp @@ -1350,10 +1550,14 @@ in the above listing). .Sh FILES A copy of the .Xr iwlwifi 4 -firmware license is installed at -.Em /usr/share/doc/legal/intel_iwlwifi_firmware.LICENCE . +firmware license is installed along with the +.Pa wifi-firmware-iwlwifi-kmod +package or the +.Pa ports/net/wifi-firmware-iwlwifi-kmod +port (or each of its flavors). .Sh SEE ALSO .Xr iwlwifi 4 , +.Xr fwget 8 , .Xr firmware 9 .Sh HISTORY The diff --git a/sys/contrib/dev/iwlwifi/cfg/22000.c b/sys/contrib/dev/iwlwifi/cfg/22000.c index d594694206b3..2e2fcb3807ef 100644 --- a/sys/contrib/dev/iwlwifi/cfg/22000.c +++ b/sys/contrib/dev/iwlwifi/cfg/22000.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation */ #include #include @@ -13,7 +13,7 @@ #define IWL_22000_UCODE_API_MAX 77 /* Lowest firmware API version supported */ -#define IWL_22000_UCODE_API_MIN 50 +#define IWL_22000_UCODE_API_MIN 77 /* NVM versions */ #define IWL_22000_NVM_VERSION 0x0a1d diff --git a/sys/contrib/dev/iwlwifi/cfg/ax210.c b/sys/contrib/dev/iwlwifi/cfg/ax210.c index 8d5f9dce71d5..975e8aed1526 100644 --- a/sys/contrib/dev/iwlwifi/cfg/ax210.c +++ b/sys/contrib/dev/iwlwifi/cfg/ax210.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation */ #include #include @@ -10,10 +10,10 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_AX210_UCODE_API_MAX 83 +#define IWL_AX210_UCODE_API_MAX 89 /* Lowest firmware API version supported */ -#define IWL_AX210_UCODE_API_MIN 59 +#define IWL_AX210_UCODE_API_MIN 77 /* NVM versions */ #define IWL_AX210_NVM_VERSION 0x0a1d @@ -299,3 +299,9 @@ MODULE_FIRMWARE(IWL_MA_B_HR_B_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_MA_B_GF_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_MA_B_GF4_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_MA_B_MR_A_FW_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX)); + +MODULE_FIRMWARE("iwlwifi-so-a0-gf-a0.pnvm"); +MODULE_FIRMWARE("iwlwifi-so-a0-gf4-a0.pnvm"); +MODULE_FIRMWARE("iwlwifi-ty-a0-gf-a0.pnvm"); +MODULE_FIRMWARE("iwlwifi-ma-b0-gf-a0.pnvm"); +MODULE_FIRMWARE("iwlwifi-ma-b0-gf4-a0.pnvm"); diff --git a/sys/contrib/dev/iwlwifi/cfg/bz.c b/sys/contrib/dev/iwlwifi/cfg/bz.c index b9893b22e41d..3b6b8b410be5 100644 --- a/sys/contrib/dev/iwlwifi/cfg/bz.c +++ b/sys/contrib/dev/iwlwifi/cfg/bz.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation */ #include #include @@ -10,10 +10,10 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_BZ_UCODE_API_MAX 83 +#define IWL_BZ_UCODE_API_MAX 92 /* Lowest firmware API version supported */ -#define IWL_BZ_UCODE_API_MIN 80 +#define IWL_BZ_UCODE_API_MIN 90 /* NVM versions */ #define IWL_BZ_NVM_VERSION 0x0a1d @@ -129,17 +129,11 @@ static const struct iwl_base_params iwl_bz_base_params = { IWL_DEVICE_BZ_COMMON, \ .ht_params = &iwl_22000_ht_params -#define IWL_DEVICE_GL_A \ - IWL_DEVICE_BZ_COMMON, \ - .ht_params = &iwl_gl_a_ht_params - /* - * If the device doesn't support HE, no need to have that many buffers. - * These sizes were picked according to 8 MSDUs inside 256 A-MSDUs in an + * This size was picked according to 8 MSDUs inside 512 A-MSDUs in an * A-MPDU, with additional overhead to account for processing time. */ -#define IWL_NUM_RBDS_NON_HE 512 -#define IWL_NUM_RBDS_BZ_HE 4096 +#define IWL_NUM_RBDS_BZ_EHT (512 * 16) const struct iwl_cfg_trans_params iwl_bz_trans_cfg = { .device_family = IWL_DEVICE_FAMILY_BZ, @@ -155,21 +149,24 @@ const struct iwl_cfg_trans_params iwl_bz_trans_cfg = { }; const char iwl_bz_name[] = "Intel(R) TBD Bz device"; +const char iwl_fm_name[] = "Intel(R) Wi-Fi 7 BE201 320MHz"; +const char iwl_gl_name[] = "Intel(R) Wi-Fi 7 BE200 320MHz"; +const char iwl_mtp_name[] = "Intel(R) Wi-Fi 7 BE202 160MHz"; const struct iwl_cfg iwl_cfg_bz = { .fw_name_mac = "bz", .uhb_supported = true, IWL_DEVICE_BZ, - .features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM, - .num_rbds = IWL_NUM_RBDS_BZ_HE, + .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, + .num_rbds = IWL_NUM_RBDS_BZ_EHT, }; const struct iwl_cfg iwl_cfg_gl = { .fw_name_mac = "gl", .uhb_supported = true, IWL_DEVICE_BZ, - .features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM, - .num_rbds = IWL_NUM_RBDS_BZ_HE, + .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, + .num_rbds = IWL_NUM_RBDS_BZ_EHT, }; @@ -181,3 +178,5 @@ MODULE_FIRMWARE(IWL_BZ_A_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_BZ_A_FM4_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_GL_C_FM_C_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX)); + +MODULE_FIRMWARE("iwlwifi-gl-c0-fm-c0.pnvm"); diff --git a/sys/contrib/dev/iwlwifi/cfg/sc.c b/sys/contrib/dev/iwlwifi/cfg/sc.c index ad283fd22e2a..4ccb0b7bdc20 100644 --- a/sys/contrib/dev/iwlwifi/cfg/sc.c +++ b/sys/contrib/dev/iwlwifi/cfg/sc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation */ #include #include @@ -10,10 +10,10 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_SC_UCODE_API_MAX 83 +#define IWL_SC_UCODE_API_MAX 92 /* Lowest firmware API version supported */ -#define IWL_SC_UCODE_API_MIN 82 +#define IWL_SC_UCODE_API_MIN 90 /* NVM versions */ #define IWL_SC_NVM_VERSION 0x0a1d @@ -33,6 +33,10 @@ #define IWL_SC_A_GF_A_FW_PRE "iwlwifi-sc-a0-gf-a0" #define IWL_SC_A_GF4_A_FW_PRE "iwlwifi-sc-a0-gf4-a0" #define IWL_SC_A_WH_A_FW_PRE "iwlwifi-sc-a0-wh-a0" +#define IWL_SC2_A_FM_C_FW_PRE "iwlwifi-sc2-a0-fm-c0" +#define IWL_SC2_A_WH_A_FW_PRE "iwlwifi-sc2-a0-wh-a0" +#define IWL_SC2F_A_FM_C_FW_PRE "iwlwifi-sc2f-a0-fm-c0" +#define IWL_SC2F_A_WH_A_FW_PRE "iwlwifi-sc2f-a0-wh-a0" #define IWL_SC_A_FM_B_FW_MODULE_FIRMWARE(api) \ IWL_SC_A_FM_B_FW_PRE "-" __stringify(api) ".ucode" @@ -48,6 +52,14 @@ IWL_SC_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode" #define IWL_SC_A_WH_A_FW_MODULE_FIRMWARE(api) \ IWL_SC_A_WH_A_FW_PRE "-" __stringify(api) ".ucode" +#define IWL_SC2_A_FM_C_FW_MODULE_FIRMWARE(api) \ + IWL_SC2_A_FM_C_FW_PRE "-" __stringify(api) ".ucode" +#define IWL_SC2_A_WH_A_FW_MODULE_FIRMWARE(api) \ + IWL_SC2_A_WH_A_FW_PRE "-" __stringify(api) ".ucode" +#define IWL_SC2F_A_FM_C_FW_MODULE_FIRMWARE(api) \ + IWL_SC2F_A_FM_C_FW_PRE "-" __stringify(api) ".ucode" +#define IWL_SC2F_A_WH_A_FW_MODULE_FIRMWARE(api) \ + IWL_SC2F_A_WH_A_FW_PRE "-" __stringify(api) ".ucode" static const struct iwl_base_params iwl_sc_base_params = { .eeprom_size = OTP_LOW_IMAGE_SIZE_32K, @@ -124,15 +136,16 @@ static const struct iwl_base_params iwl_sc_base_params = { #define IWL_DEVICE_SC \ IWL_DEVICE_BZ_COMMON, \ + .uhb_supported = true, \ + .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, \ + .num_rbds = IWL_NUM_RBDS_SC_EHT, \ .ht_params = &iwl_22000_ht_params /* - * If the device doesn't support HE, no need to have that many buffers. - * These sizes were picked according to 8 MSDUs inside 256 A-MSDUs in an + * This size was picked according to 8 MSDUs inside 512 A-MSDUs in an * A-MPDU, with additional overhead to account for processing time. */ -#define IWL_NUM_RBDS_NON_HE 512 -#define IWL_NUM_RBDS_SC_HE 4096 +#define IWL_NUM_RBDS_SC_EHT (512 * 16) const struct iwl_cfg_trans_params iwl_sc_trans_cfg = { .device_family = IWL_DEVICE_FAMILY_SC, @@ -151,10 +164,21 @@ const char iwl_sc_name[] = "Intel(R) TBD Sc device"; const struct iwl_cfg iwl_cfg_sc = { .fw_name_mac = "sc", - .uhb_supported = true, IWL_DEVICE_SC, - .features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM, - .num_rbds = IWL_NUM_RBDS_SC_HE, +}; + +const char iwl_sc2_name[] = "Intel(R) TBD Sc2 device"; + +const struct iwl_cfg iwl_cfg_sc2 = { + .fw_name_mac = "sc2", + IWL_DEVICE_SC, +}; + +const char iwl_sc2f_name[] = "Intel(R) TBD Sc2f device"; + +const struct iwl_cfg iwl_cfg_sc2f = { + .fw_name_mac = "sc2f", + IWL_DEVICE_SC, }; MODULE_FIRMWARE(IWL_SC_A_FM_B_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); @@ -164,3 +188,7 @@ MODULE_FIRMWARE(IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_SC_A_GF_A_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_SC_A_GF4_A_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_SC_A_WH_A_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC2_A_FM_C_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC2_A_WH_A_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC2F_A_FM_C_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC2F_A_WH_A_FW_MODULE_FIRMWARE(IWL_SC_UCODE_API_MAX)); diff --git a/sys/contrib/dev/iwlwifi/fw/acpi.c b/sys/contrib/dev/iwlwifi/fw/acpi.c index dfe8357036eb..8c8880b44827 100644 --- a/sys/contrib/dev/iwlwifi/fw/acpi.c +++ b/sys/contrib/dev/iwlwifi/fw/acpi.c @@ -1,10 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2017 Intel Deutschland GmbH - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation */ #include -#include #include "iwl-drv.h" #include "iwl-debug.h" #include "acpi.h" @@ -13,63 +12,22 @@ const guid_t iwl_guid = GUID_INIT(0xF21202BF, 0x8F78, 0x4DC6, 0xA5, 0xB3, 0x1F, 0x73, 0x8E, 0x28, 0x5A, 0xDE); -IWL_EXPORT_SYMBOL(iwl_guid); -const guid_t iwl_rfi_guid = GUID_INIT(0x7266172C, 0x220B, 0x4B29, - 0x81, 0x4F, 0x75, 0xE4, - 0xDD, 0x26, 0xB5, 0xFD); -IWL_EXPORT_SYMBOL(iwl_rfi_guid); - -static const struct dmi_system_id dmi_ppag_approved_list[] = { - { .ident = "HP", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "HP"), - }, - }, - { .ident = "SAMSUNG", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD"), - }, - }, - { .ident = "MSFT", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), - }, - }, - { .ident = "ASUS", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - }, - }, - { .ident = "GOOGLE-HP", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Google"), - DMI_MATCH(DMI_BOARD_VENDOR, "HP"), - }, - }, - { .ident = "GOOGLE-ASUS", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Google"), - DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek COMPUTER INC."), - }, - }, - { .ident = "GOOGLE-SAMSUNG", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Google"), - DMI_MATCH(DMI_BOARD_VENDOR, "SAMSUNG ELECTRONICS CO., LTD"), - }, - }, - { .ident = "DELL", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - }, - }, - { .ident = "DELL", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Alienware"), - }, - }, - {} +static const size_t acpi_dsm_size[DSM_FUNC_NUM_FUNCS] = { + [DSM_FUNC_QUERY] = sizeof(u32), + [DSM_FUNC_DISABLE_SRD] = sizeof(u8), + [DSM_FUNC_ENABLE_INDONESIA_5G2] = sizeof(u8), + [DSM_FUNC_ENABLE_6E] = sizeof(u32), + [DSM_FUNC_REGULATORY_CONFIG] = sizeof(u32), + /* Not supported in driver */ + [5] = (size_t)0, + [DSM_FUNC_11AX_ENABLEMENT] = sizeof(u32), + [DSM_FUNC_ENABLE_UNII4_CHAN] = sizeof(u32), + [DSM_FUNC_ACTIVATE_CHANNEL] = sizeof(u32), + [DSM_FUNC_FORCE_DISABLE_CHANNELS] = sizeof(u32), + [DSM_FUNC_ENERGY_DETECTION_THRESHOLD] = sizeof(u32), + [DSM_FUNC_RFI_CONFIG] = sizeof(u32), + [DSM_FUNC_ENABLE_11BE] = sizeof(u32), }; static int iwl_acpi_get_handle(struct device *dev, acpi_string method, @@ -195,46 +153,41 @@ out: } /* - * Evaluate a DSM with no arguments and a u8 return value, + * This function receives a DSM function number, calculates its expected size + * according to Intel BIOS spec, and fills in the value in a 32-bit field. + * In case the expected size is smaller than 32-bit, padding will be added. */ -int iwl_acpi_get_dsm_u8(struct device *dev, int rev, int func, - const guid_t *guid, u8 *value) +int iwl_acpi_get_dsm(struct iwl_fw_runtime *fwrt, + enum iwl_dsm_funcs func, u32 *value) { + size_t expected_size; + u64 tmp; int ret; - u64 val; - ret = iwl_acpi_get_dsm_integer(dev, rev, func, - guid, &val, sizeof(u8)); + BUILD_BUG_ON(ARRAY_SIZE(acpi_dsm_size) != DSM_FUNC_NUM_FUNCS); - if (ret < 0) - return ret; - - /* cast val (u64) to be u8 */ - *value = (u8)val; - return 0; -} -IWL_EXPORT_SYMBOL(iwl_acpi_get_dsm_u8); + if (WARN_ON(func >= ARRAY_SIZE(acpi_dsm_size))) + return -EINVAL; -/* - * Evaluate a DSM with no arguments and a u32 return value, - */ -int iwl_acpi_get_dsm_u32(struct device *dev, int rev, int func, - const guid_t *guid, u32 *value) -{ - int ret; - u64 val; + expected_size = acpi_dsm_size[func]; - ret = iwl_acpi_get_dsm_integer(dev, rev, func, - guid, &val, sizeof(u32)); + /* Currently all ACPI DSMs are either 8-bit or 32-bit */ + if (expected_size != sizeof(u8) && expected_size != sizeof(u32)) + return -EOPNOTSUPP; - if (ret < 0) + ret = iwl_acpi_get_dsm_integer(fwrt->dev, ACPI_DSM_REV, func, + &iwl_guid, &tmp, expected_size); + if (ret) return ret; - /* cast val (u64) to be u32 */ - *value = (u32)val; + if ((expected_size == sizeof(u8) && tmp != (u8)tmp) || + (expected_size == sizeof(u32) && tmp != (u32)tmp)) + IWL_DEBUG_RADIO(fwrt, + "DSM value overflows the expected size, truncating\n"); + *value = (u32)tmp; + return 0; } -IWL_EXPORT_SYMBOL(iwl_acpi_get_dsm_u32); static union acpi_object * iwl_acpi_get_wifi_pkg_range(struct device *dev, @@ -302,9 +255,8 @@ iwl_acpi_get_wifi_pkg(struct device *dev, tbl_rev); } - -int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, - union iwl_tas_config_cmd *cmd, int fw_ver) +int iwl_acpi_get_tas_table(struct iwl_fw_runtime *fwrt, + struct iwl_tas_data *tas_data) { union acpi_object *wifi_pkg, *data; int ret, tbl_rev, i, block_list_size, enabled; @@ -326,22 +278,9 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, ACPI_TYPE_INTEGER) { u32 tas_selection = (u32)wifi_pkg->package.elements[1].integer.value; - u16 override_iec = - (tas_selection & ACPI_WTAS_OVERRIDE_IEC_MSK) >> ACPI_WTAS_OVERRIDE_IEC_POS; - u16 enabled_iec = (tas_selection & ACPI_WTAS_ENABLE_IEC_MSK) >> - ACPI_WTAS_ENABLE_IEC_POS; - u8 usa_tas_uhb = (tas_selection & ACPI_WTAS_USA_UHB_MSK) >> ACPI_WTAS_USA_UHB_POS; - - enabled = tas_selection & ACPI_WTAS_ENABLED_MSK; - if (fw_ver <= 3) { - cmd->v3.override_tas_iec = cpu_to_le16(override_iec); - cmd->v3.enable_tas_iec = cpu_to_le16(enabled_iec); - } else { - cmd->v4.usa_tas_uhb_allowed = usa_tas_uhb; - cmd->v4.override_tas_iec = (u8)override_iec; - cmd->v4.enable_tas_iec = (u8)enabled_iec; - } + enabled = iwl_parse_tas_selection(fwrt, tas_data, + tas_selection); } else if (tbl_rev == 0 && wifi_pkg->package.elements[1].type == ACPI_TYPE_INTEGER) { @@ -360,22 +299,16 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, IWL_DEBUG_RADIO(fwrt, "Reading TAS table revision %d\n", tbl_rev); if (wifi_pkg->package.elements[2].type != ACPI_TYPE_INTEGER || wifi_pkg->package.elements[2].integer.value > - APCI_WTAS_BLACK_LIST_MAX) { + IWL_WTAS_BLACK_LIST_MAX) { IWL_DEBUG_RADIO(fwrt, "TAS invalid array size %llu\n", wifi_pkg->package.elements[2].integer.value); ret = -EINVAL; goto out_free; } block_list_size = wifi_pkg->package.elements[2].integer.value; - cmd->v4.block_list_size = cpu_to_le32(block_list_size); + tas_data->block_list_size = cpu_to_le32(block_list_size); IWL_DEBUG_RADIO(fwrt, "TAS array size %u\n", block_list_size); - if (block_list_size > APCI_WTAS_BLACK_LIST_MAX) { - IWL_DEBUG_RADIO(fwrt, "TAS invalid array size value %u\n", - block_list_size); - ret = -EINVAL; - goto out_free; - } for (i = 0; i < block_list_size; i++) { u32 country; @@ -389,7 +322,7 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, } country = wifi_pkg->package.elements[3 + i].integer.value; - cmd->v4.block_list_array[i] = cpu_to_le32(country); + tas_data->block_list_array[i] = cpu_to_le32(country); IWL_DEBUG_RADIO(fwrt, "TAS block list country %d\n", country); } @@ -398,19 +331,19 @@ out_free: kfree(data); return ret; } -IWL_EXPORT_SYMBOL(iwl_acpi_get_tas); -int iwl_acpi_get_mcc(struct device *dev, char *mcc) +int iwl_acpi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc) { union acpi_object *wifi_pkg, *data; u32 mcc_val; int ret, tbl_rev; - data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD); + data = iwl_acpi_get_object(fwrt->dev, ACPI_WRDD_METHOD); if (IS_ERR(data)) return PTR_ERR(data); - wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE, + wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data, + ACPI_WRDD_WIFI_DATA_SIZE, &tbl_rev); *** 36914 LINES SKIPPED *** From nobody Mon Feb 10 14:52:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xW6Lplz5mH3m; Mon, 10 Feb 2025 14:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xW11kLz4LRX; Mon, 10 Feb 2025 14:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k/Nc/vgdgncHc+2oPIo0E5cRdC9Ou5gn8Z8T1m4uVOQ=; b=Fu6Tu1b/Zyl0v77gjCbRmWdkr26L84T2mKNG/FRe3sHJBjg5MJh01qh73AH5qYjzgZQBwN HrW8r6C0livTizh9wtp2xzeWN7BIK2EQKFv5fIu1tpvihYg2JSzbkRy9ylIP1RQud4NNPv 7m/4m3yMkH0SFK1UmdsE4+SlXpQk18gRLIyR+CToPoPK1qHNm0h+tsry/tIO8AKqeLZ8ph rthATJb6VS0NfNm8+JSgfFK9yjND7ZkK9UZjYC0xrpZ/IjqJcCQDjr3P8bxXXbd90PU20u S9WOcIpotjRJUJmkUMd9C6NBunm8K1K2EjZDEoOe+ig09LpJvKF7YTRAd9Ie/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k/Nc/vgdgncHc+2oPIo0E5cRdC9Ou5gn8Z8T1m4uVOQ=; b=g5xGJ29iUl5eugXQudWOZQkKiDWaYqD3nXxDSQLGSTB56lKltv/OXAg9QPy3OMptDmlmMa +vlpc+xjnQNIV61CTpNcSTDSIvl+BH8jzqENZ9VlxSsDi88ofFa1BhIXgxL0awQDBbyTl8 tkjXCVoYSKdg4YosobK4SagXVaDfQl3476mfZW+HVnSKsqvl1yXk1uFIhHar/dRasiIzzq T6aGBi7nqNKZcIvAy48uN1g+liooqAJY7BttPKjM7EWUzujZLp0ET8UdAxki3w8Ds4LrTX ZLfxlMuEqkBo/BQ8JNCSZ/hfYnt88DGdjETZayLIZfyr10hb6SEc5U46Y+NJ8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199151; a=rsa-sha256; cv=none; b=X+JG/wbIcChXNUC1GO7nSmiaFfvLR/9q7Ec/eXTQeF+Or7UdRaamfzLDbyT8OvegL3b3yU Zfq7lXu6+DJFIzHfsQBlatUkkT6gqLx/7YnRylEWhL2/OLBrTbe3JAm0tE2vqTElNda6Ng qkywHXR8jooRzp+uAHBIOLF/SWm4UV/GmbCkSMEC6GIlqDUoaXwffCmyCR5901Q9uvhh7G 7KVCRuAE5sBk5N6SDfNobYb3hQbAx3xlFhS4VFDaY8DtXS3jMVDsuueVKYWBI7qVCKdChH PGjE8My/oydJ0W90iUziG6uCCMmL31pLMxwd+MSXT4sM4T1Ww2wWmxhZ9qf08Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xW0bmdzX75; Mon, 10 Feb 2025 14:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqUST027578; Mon, 10 Feb 2025 14:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqUAQ027575; Mon, 10 Feb 2025 14:52:30 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:30 GMT Message-Id: <202502101452.51AEqUAQ027575@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: 1ff77e61c64e - stable/14 - iwlwifi: avoid (hard) hang on loading module List-Id: Commits to the stable branches 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: 1ff77e61c64e80d4532f8433ccdad656e969d62f Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff77e61c64e80d4532f8433ccdad656e969d62f commit 1ff77e61c64e80d4532f8433ccdad656e969d62f Author: Bjoern A. Zeeb AuthorDate: 2024-12-08 20:24:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:07 +0000 iwlwifi: avoid (hard) hang on loading module For certain users or chipsets (reports were for CNVi devices but we are not sure if this is limited or specific to them) loading if_iwlwifi hangs. The reason for this is that a SYSINIT (module_load_order()) has not yet run in this case and the Linux driver tries to load the chipsets-specific module. On FreeBSD all supported sub-modules are part of if_iwlwifi so we do not have to load them separately but calling into kern_kldload via LinuxKPI request_module while loading the module gives us a hard hang. iwlwifi calls request_module_nowait() so we can simply skip over this and continue and the SYSINIT will do the job later if no other dependencies fail. Sponsored by: The FreeBSD Foundation PR: 282789 Tested by: Ruslan Makhmatkhanov, Pete Wright Differential Revision: https://reviews.freebsd.org/D47994 (cherry picked from commit 87e140a5c6f89eea7ea6320d1ae34566492abfc0) (cherry picked from commit 5d09d1070737c43738e433b547af1a90c0f10bf1) --- sys/contrib/dev/iwlwifi/iwl-drv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/iwl-drv.c b/sys/contrib/dev/iwlwifi/iwl-drv.c index 7f4746e5591e..b99204d87283 100644 --- a/sys/contrib/dev/iwlwifi/iwl-drv.c +++ b/sys/contrib/dev/iwlwifi/iwl-drv.c @@ -1749,7 +1749,20 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) goto out_unbind; } } else { +#if defined(__linux__) request_module_nowait("%s", op->name); +#elif defined(__FreeBSD__) + /* + * In FreeBSD if_iwlwifi contains all drv modules in a single + * module. SYSINIT will do the job later. We cannot call + * into kern_kldload() while being called from kern_kldload(): + * LinuxKPI request_module[_nowait] will hang hard. + * Given this is request_module_nowait() we can simply skip it. + */ + if (bootverbose) + printf("%s: module '%s' not yet available; will be initialized in a moment\n", + __func__, op->name); +#endif } mutex_unlock(&iwlwifi_opmode_table_mtx); From nobody Mon Feb 10 14:52:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xZ4brPz5mH1q; Mon, 10 Feb 2025 14:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xZ1w2hz4LX4; Mon, 10 Feb 2025 14:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4gCsl/oSs+wVw8QDoFHdgQbmN14WCp3sibINoviCdA=; b=NEjIwvKL59QGH8NjDQKdgE7Z1W483XCBaIRuyey0yf0WH0tWC52bZ29qb6xXpyOYc3h0s4 UKWuDai0oyMEkivr24SZTqwlnBtKWg9erxQJ5BEGDSYESjUeRlCtAWSII/4V0NtJnrFCqx Y29c7iMW3pMv0YzjiNXMZyhjB/1JGEBiwhgwZ3RW8t6BfQ5P+lLLtk8YLbq0PM1ND2DSa0 UM+4n2MtUT7W8iNgRwdMAspHFdAwYkoaQ0xQDuhDrtwKc96C6WaO8NFVpbatsjUH4cB/4O ag3otqCKoy6BUmRcQcK4Y8GJLLXqcavBiq9c2yC6EU2Uu5DnVKCMYdakqGjcqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4gCsl/oSs+wVw8QDoFHdgQbmN14WCp3sibINoviCdA=; b=Noy4kLKpCPo1T/dVSIiONywLAUQZyC91Qtshdx/arrdGvejKtTkO+/g/lRqGjJSXDCuzY1 zOWqsomxgVwcW+6U8ow8bRktdl/W8cFdwUdi5qNnewYxASPuAQt17dYDqv92Hn8u0ipOGY ykw/2urZU7IoQusspvTqhQNFpkGg/UPJZ07/zXbQRqVn6JRN0rZDr0eJPTSHbY/FXTGzHp qmToL82gYjKDYLsAy8O75qUnuX2R7RvpYbGSG/0NuPf2ELJp2ckzUePpbNsGJgw3uI+6qn XZXcde/k0iJMm75vyJAGpT0wJxPUFSP0r899WzuteM0jUdIvFYQNcSVg8woOHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199154; a=rsa-sha256; cv=none; b=q5NfsXXQtE+pUvrJt6aoZKJaGeuRFMyVX6ZkK/dYoC0aDH8SgvVut8B1aDpREkfZKLGBmZ bA55m+EvvXvZ3657Z479g7u9b++l8yrudkRRmAtzWGyH7H1Ay++mM6Ly34aSiJlcx5FTJ6 3MgTN5MI+Ww3GDdzJmLl9AfDwhHD5Z6IMrs8WVeiuSu4EF+BF30FDa7QLweNUblIG8SUb6 k31YvLJMG2ZOl9U5dEaQQdhOhzm9zEo+bVApoptQa09ckXW6iQAOnMyG7l0yozVK0qUYkq TmZ7BicWFma7qSCGr6vC6M+A6ZiQW3tFzNf/vcGGvsG8pcgYZmcUXNmlX81QiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xZ1G8kzXWD; Mon, 10 Feb 2025 14:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqYCS027659; Mon, 10 Feb 2025 14:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqXTY027656; Mon, 10 Feb 2025 14:52:33 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:33 GMT Message-Id: <202502101452.51AEqXTY027656@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: e6698f06149c - stable/14 - rtw89: update Realtek's rtw89 driver. List-Id: Commits to the stable branches 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: e6698f06149c838b0fff3b1eec206bb79e971130 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e6698f06149c838b0fff3b1eec206bb79e971130 commit e6698f06149c838b0fff3b1eec206bb79e971130 Author: Bjoern A. Zeeb AuthorDate: 2024-10-04 00:00:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:07 +0000 rtw89: update Realtek's rtw89 driver. This adds support for the Realtek 8922AE PCI wireless network (Wi-Fi 7) adapter. This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 98f7e32f20d28ec452afb208f9cffc08448a2652 ( tag: v6.11 ). Sponsored by: The FreeBSD Foundation (cherry picked from commit 6d67aabd63555ab62a2f2b7f52a75ef100a2fe75) --- sys/contrib/dev/rtw89/Kconfig | 19 + sys/contrib/dev/rtw89/Makefile | 18 +- sys/contrib/dev/rtw89/acpi.c | 131 +- sys/contrib/dev/rtw89/acpi.h | 53 +- sys/contrib/dev/rtw89/cam.c | 277 +- sys/contrib/dev/rtw89/cam.h | 180 +- sys/contrib/dev/rtw89/chan.c | 2305 +++++++++++++- sys/contrib/dev/rtw89/chan.h | 48 + sys/contrib/dev/rtw89/coex.c | 2996 +++++++++++++++--- sys/contrib/dev/rtw89/coex.h | 176 ++ sys/contrib/dev/rtw89/core.c | 1233 ++++++-- sys/contrib/dev/rtw89/core.h | 1468 ++++++++- sys/contrib/dev/rtw89/debug.c | 440 ++- sys/contrib/dev/rtw89/debug.h | 19 +- sys/contrib/dev/rtw89/efuse.c | 11 +- sys/contrib/dev/rtw89/efuse.h | 18 +- sys/contrib/dev/rtw89/efuse_be.c | 562 ++++ sys/contrib/dev/rtw89/fw.c | 4264 ++++++++++++++++++++++--- sys/contrib/dev/rtw89/fw.h | 2637 ++++++++++------ sys/contrib/dev/rtw89/mac.c | 1738 ++++++++--- sys/contrib/dev/rtw89/mac.h | 377 ++- sys/contrib/dev/rtw89/mac80211.c | 138 +- sys/contrib/dev/rtw89/mac_be.c | 2606 ++++++++++++++++ sys/contrib/dev/rtw89/pci.c | 794 ++++- sys/contrib/dev/rtw89/pci.h | 623 +++- sys/contrib/dev/rtw89/pci_be.c | 618 ++++ sys/contrib/dev/rtw89/phy.c | 2610 ++++++++++++++-- sys/contrib/dev/rtw89/phy.h | 429 ++- sys/contrib/dev/rtw89/phy_be.c | 1002 ++++++ sys/contrib/dev/rtw89/ps.c | 97 +- sys/contrib/dev/rtw89/ps.h | 8 + sys/contrib/dev/rtw89/reg.h | 4292 ++++++++++++++++++++++++- sys/contrib/dev/rtw89/regd.c | 522 +++- sys/contrib/dev/rtw89/rtw8851b.c | 243 +- sys/contrib/dev/rtw89/rtw8851b_table.c | 1409 +++++---- sys/contrib/dev/rtw89/rtw8851b_table.h | 3 - sys/contrib/dev/rtw89/rtw8851be.c | 7 + sys/contrib/dev/rtw89/rtw8852a.c | 158 +- sys/contrib/dev/rtw89/rtw8852a_table.c | 2 + sys/contrib/dev/rtw89/rtw8852a_table.h | 1 - sys/contrib/dev/rtw89/rtw8852ae.c | 7 + sys/contrib/dev/rtw89/rtw8852b.c | 1988 +----------- sys/contrib/dev/rtw89/rtw8852b.h | 122 - sys/contrib/dev/rtw89/rtw8852b_common.c | 2053 ++++++++++++ sys/contrib/dev/rtw89/rtw8852b_common.h | 388 +++ sys/contrib/dev/rtw89/rtw8852b_rfk.c | 25 +- sys/contrib/dev/rtw89/rtw8852b_table.c | 459 +-- sys/contrib/dev/rtw89/rtw8852b_table.h | 3 - sys/contrib/dev/rtw89/rtw8852be.c | 7 + sys/contrib/dev/rtw89/rtw8852bt.h | 13 + sys/contrib/dev/rtw89/rtw8852bt_rfk.c | 4019 ++++++++++++++++++++++++ sys/contrib/dev/rtw89/rtw8852bt_rfk.h | 22 + sys/contrib/dev/rtw89/rtw8852bt_rfk_table.c | 490 +++ sys/contrib/dev/rtw89/rtw8852bt_rfk_table.h | 38 + sys/contrib/dev/rtw89/rtw8852c.c | 231 +- sys/contrib/dev/rtw89/rtw8852c.h | 20 +- sys/contrib/dev/rtw89/rtw8852c_rfk.c | 93 +- sys/contrib/dev/rtw89/rtw8852c_rfk.h | 3 + sys/contrib/dev/rtw89/rtw8852c_rfk_table.c | 42 +- sys/contrib/dev/rtw89/rtw8852c_table.c | 4488 +++++++++++++++------------ sys/contrib/dev/rtw89/rtw8852c_table.h | 3 - sys/contrib/dev/rtw89/rtw8852ce.c | 29 + sys/contrib/dev/rtw89/rtw8922a.c | 2639 ++++++++++++++++ sys/contrib/dev/rtw89/rtw8922a.h | 73 + sys/contrib/dev/rtw89/rtw8922a_rfk.c | 391 +++ sys/contrib/dev/rtw89/rtw8922a_rfk.h | 18 + sys/contrib/dev/rtw89/rtw8922ae.c | 94 + sys/contrib/dev/rtw89/sar.c | 222 +- sys/contrib/dev/rtw89/sar.h | 14 +- sys/contrib/dev/rtw89/ser.c | 44 +- sys/contrib/dev/rtw89/txrx.h | 279 ++ sys/contrib/dev/rtw89/util.c | 106 + sys/contrib/dev/rtw89/util.h | 5 + sys/contrib/dev/rtw89/wow.c | 787 ++++- sys/contrib/dev/rtw89/wow.h | 87 + sys/modules/rtw89/Makefile | 11 +- 76 files changed, 45373 insertions(+), 8472 deletions(-) diff --git a/sys/contrib/dev/rtw89/Kconfig b/sys/contrib/dev/rtw89/Kconfig index 90ffbab7cc4c..3c9f864805b1 100644 --- a/sys/contrib/dev/rtw89/Kconfig +++ b/sys/contrib/dev/rtw89/Kconfig @@ -22,12 +22,18 @@ config RTW89_8851B config RTW89_8852A tristate +config RTW89_8852B_COMMON + tristate + config RTW89_8852B tristate config RTW89_8852C tristate +config RTW89_8922A + tristate + config RTW89_8851BE tristate "Realtek 8851BE PCI wireless network (Wi-Fi 6) adapter" depends on PCI @@ -56,6 +62,7 @@ config RTW89_8852BE select RTW89_CORE select RTW89_PCI select RTW89_8852B + select RTW89_8852B_COMMON help Select this option will enable support for 8852BE chipset @@ -72,6 +79,18 @@ config RTW89_8852CE 802.11ax PCIe wireless network (Wi-Fi 6E) adapter +config RTW89_8922AE + tristate "Realtek 8922AE PCI wireless network (Wi-Fi 7) adapter" + depends on PCI + select RTW89_CORE + select RTW89_PCI + select RTW89_8922A + help + Select this option will enable support for 8922AE chipset + + 802.11be PCIe wireless network (Wi-Fi 7) adapter + supporting 2x2 2GHz/5GHz/6GHz 4096-QAM 160MHz channels. + config RTW89_DEBUG bool diff --git a/sys/contrib/dev/rtw89/Makefile b/sys/contrib/dev/rtw89/Makefile index 41940099af1b..1f1050a7a89d 100644 --- a/sys/contrib/dev/rtw89/Makefile +++ b/sys/contrib/dev/rtw89/Makefile @@ -4,17 +4,21 @@ obj-$(CONFIG_RTW89_CORE) += rtw89_core.o rtw89_core-y += core.o \ mac80211.o \ mac.o \ + mac_be.o \ phy.o \ + phy_be.o \ fw.o \ cam.o \ efuse.o \ + efuse_be.o \ regd.o \ sar.o \ coex.o \ ps.o \ chan.o \ ser.o \ - acpi.o + acpi.o \ + util.o rtw89_core-$(CONFIG_PM) += wow.o @@ -36,6 +40,9 @@ rtw89_8852a-objs := rtw8852a.o \ obj-$(CONFIG_RTW89_8852AE) += rtw89_8852ae.o rtw89_8852ae-objs := rtw8852ae.o +obj-$(CONFIG_RTW89_8852B_COMMON) += rtw89_8852b_common.o +rtw89_8852b_common-objs := rtw8852b_common.o + obj-$(CONFIG_RTW89_8852B) += rtw89_8852b.o rtw89_8852b-objs := rtw8852b.o \ rtw8852b_table.o \ @@ -54,8 +61,15 @@ rtw89_8852c-objs := rtw8852c.o \ obj-$(CONFIG_RTW89_8852CE) += rtw89_8852ce.o rtw89_8852ce-objs := rtw8852ce.o +obj-$(CONFIG_RTW89_8922A) += rtw89_8922a.o +rtw89_8922a-objs := rtw8922a.o \ + rtw8922a_rfk.o + +obj-$(CONFIG_RTW89_8922AE) += rtw89_8922ae.o +rtw89_8922ae-objs := rtw8922ae.o + rtw89_core-$(CONFIG_RTW89_DEBUG) += debug.o obj-$(CONFIG_RTW89_PCI) += rtw89_pci.o -rtw89_pci-y := pci.o +rtw89_pci-y := pci.o pci_be.o diff --git a/sys/contrib/dev/rtw89/acpi.c b/sys/contrib/dev/rtw89/acpi.c index 83252c861c82..272795188f99 100644 --- a/sys/contrib/dev/rtw89/acpi.c +++ b/sys/contrib/dev/rtw89/acpi.c @@ -13,27 +13,118 @@ static const guid_t rtw89_guid = GUID_INIT(0xD2A8C3E8, 0x4B69, 0x4F00, 0x82, 0xBD, 0xFE, 0x86, 0x07, 0x80, 0x3A, 0xA7); -static int rtw89_acpi_dsm_get(struct rtw89_dev *rtwdev, union acpi_object *obj, - u8 *value) +static +int rtw89_acpi_dsm_get_value(struct rtw89_dev *rtwdev, union acpi_object *obj, + u8 *value) { - switch (obj->type) { - case ACPI_TYPE_INTEGER: - *value = (u8)obj->integer.value; - break; - case ACPI_TYPE_BUFFER: - *value = obj->buffer.pointer[0]; - break; - default: - rtw89_debug(rtwdev, RTW89_DBG_UNEXP, - "acpi dsm return unhandled type: %d\n", obj->type); + if (obj->type != ACPI_TYPE_INTEGER) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, + "acpi: expect integer but type: %d\n", obj->type); return -EINVAL; } + *value = (u8)obj->integer.value; + return 0; +} + +static bool chk_acpi_policy_6ghz_sig(const struct rtw89_acpi_policy_6ghz *p) +{ + return p->signature[0] == 0x00 && + p->signature[1] == 0xE0 && + p->signature[2] == 0x4C; +} + +static +int rtw89_acpi_dsm_get_policy_6ghz(struct rtw89_dev *rtwdev, + union acpi_object *obj, + struct rtw89_acpi_policy_6ghz **policy_6ghz) +{ + const struct rtw89_acpi_policy_6ghz *ptr; + u32 expect_len; + u32 len; + + if (obj->type != ACPI_TYPE_BUFFER) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, + "acpi: expect buffer but type: %d\n", obj->type); + return -EINVAL; + } + + len = obj->buffer.length; + if (len < sizeof(*ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", + __func__, len); + return -EINVAL; + } + + ptr = (typeof(ptr))obj->buffer.pointer; + if (!chk_acpi_policy_6ghz_sig(ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: bad signature\n", __func__); + return -EINVAL; + } + + expect_len = struct_size(ptr, country_list, ptr->country_count); + if (len < expect_len) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: expect %u but length: %u\n", + __func__, expect_len, len); + return -EINVAL; + } + + *policy_6ghz = kmemdup(ptr, expect_len, GFP_KERNEL); + if (!*policy_6ghz) + return -ENOMEM; + + rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "policy_6ghz: ", *policy_6ghz, + expect_len); + return 0; +} + +static bool chk_acpi_policy_6ghz_sp_sig(const struct rtw89_acpi_policy_6ghz_sp *p) +{ + return p->signature[0] == 0x52 && + p->signature[1] == 0x54 && + p->signature[2] == 0x4B && + p->signature[3] == 0x07; +} + +static +int rtw89_acpi_dsm_get_policy_6ghz_sp(struct rtw89_dev *rtwdev, + union acpi_object *obj, + struct rtw89_acpi_policy_6ghz_sp **policy) +{ + const struct rtw89_acpi_policy_6ghz_sp *ptr; + u32 buf_len; + + if (obj->type != ACPI_TYPE_BUFFER) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, + "acpi: expect buffer but type: %d\n", obj->type); + return -EINVAL; + } + + buf_len = obj->buffer.length; + if (buf_len < sizeof(*ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", + __func__, buf_len); + return -EINVAL; + } + + ptr = (typeof(ptr))obj->buffer.pointer; + if (!chk_acpi_policy_6ghz_sp_sig(ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: bad signature\n", __func__); + return -EINVAL; + } + + *policy = kmemdup(ptr, sizeof(*ptr), GFP_KERNEL); + if (!*policy) + return -ENOMEM; + + rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "policy_6ghz_sp: ", *policy, + sizeof(*ptr)); return 0; } int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, - enum rtw89_acpi_dsm_func func, u8 *value) + enum rtw89_acpi_dsm_func func, + struct rtw89_acpi_dsm_result *res) { union acpi_object *obj; int ret; @@ -41,19 +132,27 @@ int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, obj = acpi_evaluate_dsm(ACPI_HANDLE(rtwdev->dev), &rtw89_guid, 0, func, NULL); if (!obj) { - rtw89_debug(rtwdev, RTW89_DBG_UNEXP, + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "acpi dsm fail to evaluate func: %d\n", func); return -ENOENT; } - ret = rtw89_acpi_dsm_get(rtwdev, obj, value); + if (func == RTW89_ACPI_DSM_FUNC_6G_BP) + ret = rtw89_acpi_dsm_get_policy_6ghz(rtwdev, obj, + &res->u.policy_6ghz); + else if (func == RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP) + ret = rtw89_acpi_dsm_get_policy_6ghz_sp(rtwdev, obj, + &res->u.policy_6ghz_sp); + else + ret = rtw89_acpi_dsm_get_value(rtwdev, obj, &res->u.value); ACPI_FREE(obj); return ret; } #elif defined(__FreeBSD__) int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, - enum rtw89_acpi_dsm_func func, u8 *value) + enum rtw89_acpi_dsm_func func, + struct rtw89_acpi_dsm_result *res) { return -ENOENT; } diff --git a/sys/contrib/dev/rtw89/acpi.h b/sys/contrib/dev/rtw89/acpi.h index ed74d8ceb733..d274be1775bf 100644 --- a/sys/contrib/dev/rtw89/acpi.h +++ b/sys/contrib/dev/rtw89/acpi.h @@ -12,10 +12,59 @@ enum rtw89_acpi_dsm_func { RTW89_ACPI_DSM_FUNC_6G_DIS = 3, RTW89_ACPI_DSM_FUNC_6G_BP = 4, RTW89_ACPI_DSM_FUNC_TAS_EN = 5, - RTW89_ACPI_DSM_FUNC_59G_EN = 6, + RTW89_ACPI_DSM_FUNC_UNII4_SUP = 6, + RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP = 7, +}; + +enum rtw89_acpi_conf_unii4 { + RTW89_ACPI_CONF_UNII4_FCC = BIT(0), + RTW89_ACPI_CONF_UNII4_IC = BIT(1), +}; + +enum rtw89_acpi_policy_mode { + RTW89_ACPI_POLICY_BLOCK = 0, + RTW89_ACPI_POLICY_ALLOW = 1, +}; + +struct rtw89_acpi_country_code { + /* below are allowed: + * * ISO alpha2 country code + * * EU for countries in Europe + */ + char alpha2[2]; +} __packed; + +struct rtw89_acpi_policy_6ghz { + u8 signature[3]; + u8 rsvd; + u8 policy_mode; + u8 country_count; + struct rtw89_acpi_country_code country_list[] __counted_by(country_count); +} __packed; + +enum rtw89_acpi_conf_6ghz_sp { + RTW89_ACPI_CONF_6GHZ_SP_US = BIT(0), +}; + +struct rtw89_acpi_policy_6ghz_sp { + u8 signature[4]; + u8 revision; + u8 override; + u8 conf; + u8 rsvd; +} __packed; + +struct rtw89_acpi_dsm_result { + union { + u8 value; + /* caller needs to free it after using */ + struct rtw89_acpi_policy_6ghz *policy_6ghz; + struct rtw89_acpi_policy_6ghz_sp *policy_6ghz_sp; + } u; }; int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, - enum rtw89_acpi_dsm_func func, u8 *value); + enum rtw89_acpi_dsm_func func, + struct rtw89_acpi_dsm_result *res); #endif diff --git a/sys/contrib/dev/rtw89/cam.c b/sys/contrib/dev/rtw89/cam.c index f5301c2bbf13..4557c6e035a9 100644 --- a/sys/contrib/dev/rtw89/cam.c +++ b/sys/contrib/dev/rtw89/cam.c @@ -150,8 +150,6 @@ static int rtw89_cam_get_addr_cam_key_idx(struct rtw89_addr_cam_entry *addr_cam, case RTW89_ADDR_CAM_SEC_NONE: return -EINVAL; case RTW89_ADDR_CAM_SEC_ALL_UNI: - if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) - return -EINVAL; idx = find_first_zero_bit(addr_cam->sec_cam_map, RTW89_SEC_CAM_IN_ADDR_CAM); if (idx >= RTW89_SEC_CAM_IN_ADDR_CAM) @@ -213,6 +211,46 @@ static int rtw89_cam_get_addr_cam_key_idx(struct rtw89_addr_cam_entry *addr_cam, return 0; } +static int rtw89_cam_detach_sec_cam(struct rtw89_dev *rtwdev, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, + const struct rtw89_sec_cam_entry *sec_cam, + bool inform_fw) +{ + struct rtw89_sta *rtwsta = sta_to_rtwsta_safe(sta); + struct rtw89_vif *rtwvif; + struct rtw89_addr_cam_entry *addr_cam; + unsigned int i; + int ret = 0; + + if (!vif) { + rtw89_err(rtwdev, "No iface for deleting sec cam\n"); + return -EINVAL; + } + + rtwvif = (struct rtw89_vif *)vif->drv_priv; + addr_cam = rtw89_get_addr_cam_of(rtwvif, rtwsta); + + for_each_set_bit(i, addr_cam->sec_cam_map, RTW89_SEC_CAM_IN_ADDR_CAM) { + if (addr_cam->sec_ent[i] != sec_cam->sec_cam_idx) + continue; + + clear_bit(i, addr_cam->sec_cam_map); + } + + if (inform_fw) { + ret = rtw89_chip_h2c_dctl_sec_cam(rtwdev, rtwvif, rtwsta); + if (ret) + rtw89_err(rtwdev, + "failed to update dctl cam del key: %d\n", ret); + ret = rtw89_fw_h2c_cam(rtwdev, rtwvif, rtwsta, NULL); + if (ret) + rtw89_err(rtwdev, "failed to update cam del key: %d\n", ret); + } + + return ret; +} + static int rtw89_cam_attach_sec_cam(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_sta *sta, @@ -232,6 +270,11 @@ static int rtw89_cam_attach_sec_cam(struct rtw89_dev *rtwdev, rtwvif = (struct rtw89_vif *)vif->drv_priv; addr_cam = rtw89_get_addr_cam_of(rtwvif, rtwsta); + + if (key->cipher == WLAN_CIPHER_SUITE_WEP40 || + key->cipher == WLAN_CIPHER_SUITE_WEP104) + addr_cam->sec_ent_mode = RTW89_ADDR_CAM_SEC_ALL_UNI; + ret = rtw89_cam_get_addr_cam_key_idx(addr_cam, sec_cam, key, &key_idx); if (ret) { rtw89_err(rtwdev, "failed to get addr cam key idx %d, %d\n", @@ -239,10 +282,8 @@ static int rtw89_cam_attach_sec_cam(struct rtw89_dev *rtwdev, return ret; } - key->hw_key_idx = key_idx; addr_cam->sec_ent_keyid[key_idx] = key->keyidx; addr_cam->sec_ent[key_idx] = sec_cam->sec_cam_idx; - addr_cam->sec_entries[key_idx] = sec_cam; set_bit(key_idx, addr_cam->sec_cam_map); ret = rtw89_chip_h2c_dctl_sec_cam(rtwdev, rtwvif, rtwsta); if (ret) { @@ -255,7 +296,6 @@ static int rtw89_cam_attach_sec_cam(struct rtw89_dev *rtwdev, rtw89_err(rtwdev, "failed to update addr cam sec entry: %d\n", ret); clear_bit(key_idx, addr_cam->sec_cam_map); - addr_cam->sec_entries[key_idx] = NULL; return ret; } @@ -292,6 +332,9 @@ static int rtw89_cam_sec_key_install(struct rtw89_dev *rtwdev, goto err_release_cam; } + key->hw_key_idx = sec_cam_idx; + cam_info->sec_entries[sec_cam_idx] = sec_cam; + sec_cam->sec_cam_idx = sec_cam_idx; sec_cam->type = hw_key_type; sec_cam->len = RTW89_SEC_CAM_LEN; @@ -313,6 +356,7 @@ static int rtw89_cam_sec_key_install(struct rtw89_dev *rtwdev, return 0; err_release_cam: + cam_info->sec_entries[sec_cam_idx] = NULL; kfree(sec_cam); clear_bit(sec_cam_idx, cam_info->sec_cam_map); if (ext_key) @@ -356,6 +400,9 @@ int rtw89_cam_sec_key_add(struct rtw89_dev *rtwdev, key->flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX; ext_key = true; break; + case WLAN_CIPHER_SUITE_AES_CMAC: + hw_key_type = RTW89_SEC_KEY_TYPE_BIP_CCMP128; + break; default: return -EOPNOTSUPP; } @@ -380,42 +427,22 @@ int rtw89_cam_sec_key_del(struct rtw89_dev *rtwdev, struct ieee80211_key_conf *key, bool inform_fw) { - struct rtw89_sta *rtwsta = sta_to_rtwsta_safe(sta); struct rtw89_cam_info *cam_info = &rtwdev->cam_info; - struct rtw89_vif *rtwvif; - struct rtw89_addr_cam_entry *addr_cam; - struct rtw89_sec_cam_entry *sec_cam; - u8 key_idx = key->hw_key_idx; + const struct rtw89_sec_cam_entry *sec_cam; u8 sec_cam_idx; - int ret = 0; - - if (!vif) { - rtw89_err(rtwdev, "No iface for deleting sec cam\n"); - return -EINVAL; - } + int ret; - rtwvif = (struct rtw89_vif *)vif->drv_priv; - addr_cam = rtw89_get_addr_cam_of(rtwvif, rtwsta); - sec_cam = addr_cam->sec_entries[key_idx]; + sec_cam_idx = key->hw_key_idx; + sec_cam = cam_info->sec_entries[sec_cam_idx]; if (!sec_cam) return -EINVAL; - /* detach sec cam from addr cam */ - clear_bit(key_idx, addr_cam->sec_cam_map); - addr_cam->sec_entries[key_idx] = NULL; - if (inform_fw) { - ret = rtw89_chip_h2c_dctl_sec_cam(rtwdev, rtwvif, rtwsta); - if (ret) - rtw89_err(rtwdev, "failed to update dctl cam del key: %d\n", ret); - ret = rtw89_fw_h2c_cam(rtwdev, rtwvif, rtwsta, NULL); - if (ret) - rtw89_err(rtwdev, "failed to update cam del key: %d\n", ret); - } + ret = rtw89_cam_detach_sec_cam(rtwdev, vif, sta, sec_cam, inform_fw); /* clear valid bit in addr cam will disable sec cam, * so we don't need to send H2C command again */ - sec_cam_idx = sec_cam->sec_cam_idx; + cam_info->sec_entries[sec_cam_idx] = NULL; clear_bit(sec_cam_idx, cam_info->sec_cam_map); if (sec_cam->ext_key) clear_bit(sec_cam_idx + 1, cam_info->sec_cam_map); @@ -488,6 +515,21 @@ static int rtw89_cam_get_avail_addr_cam(struct rtw89_dev *rtwdev, return 0; } +static u8 rtw89_get_addr_cam_entry_size(struct rtw89_dev *rtwdev) +{ + const struct rtw89_chip_info *chip = rtwdev->chip; + + switch (chip->chip_id) { + case RTL8852A: + case RTL8852B: + case RTL8851B: + case RTL8852BT: + return ADDR_CAM_ENT_SIZE; + default: + return ADDR_CAM_ENT_SHORT_SIZE; + } +} + int rtw89_cam_init_addr_cam(struct rtw89_dev *rtwdev, struct rtw89_addr_cam_entry *addr_cam, const struct rtw89_bssid_cam_entry *bssid_cam) @@ -509,7 +551,7 @@ int rtw89_cam_init_addr_cam(struct rtw89_dev *rtwdev, } addr_cam->addr_cam_idx = addr_cam_idx; - addr_cam->len = ADDR_CAM_ENT_SIZE; + addr_cam->len = rtw89_get_addr_cam_entry_size(rtwdev); addr_cam->offset = 0; addr_cam->valid = true; addr_cam->addr_mask = 0; @@ -739,27 +781,158 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev, void rtw89_cam_fill_dctl_sec_cam_info_v1(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, struct rtw89_sta *rtwsta, - u8 *cmd) + struct rtw89_h2c_dctlinfo_ud_v1 *h2c) { struct rtw89_addr_cam_entry *addr_cam = rtw89_get_addr_cam_of(rtwvif, rtwsta); + struct rtw89_wow_param *rtw_wow = &rtwdev->wow; + u8 *ptk_tx_iv = rtw_wow->key_info.ptk_tx_iv; + + h2c->c0 = le32_encode_bits(rtwsta ? rtwsta->mac_id : rtwvif->mac_id, + DCTLINFO_V1_C0_MACID) | + le32_encode_bits(1, DCTLINFO_V1_C0_OP); + + h2c->w4 = le32_encode_bits(addr_cam->sec_ent_keyid[0], + DCTLINFO_V1_W4_SEC_ENT0_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[1], + DCTLINFO_V1_W4_SEC_ENT1_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[2], + DCTLINFO_V1_W4_SEC_ENT2_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[3], + DCTLINFO_V1_W4_SEC_ENT3_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[4], + DCTLINFO_V1_W4_SEC_ENT4_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[5], + DCTLINFO_V1_W4_SEC_ENT5_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[6], + DCTLINFO_V1_W4_SEC_ENT6_KEYID); + h2c->m4 = cpu_to_le32(DCTLINFO_V1_W4_SEC_ENT0_KEYID | + DCTLINFO_V1_W4_SEC_ENT1_KEYID | + DCTLINFO_V1_W4_SEC_ENT2_KEYID | + DCTLINFO_V1_W4_SEC_ENT3_KEYID | + DCTLINFO_V1_W4_SEC_ENT4_KEYID | + DCTLINFO_V1_W4_SEC_ENT5_KEYID | + DCTLINFO_V1_W4_SEC_ENT6_KEYID); + + h2c->w5 = le32_encode_bits(addr_cam->sec_cam_map[0] & 0xff, + DCTLINFO_V1_W5_SEC_ENT_VALID) | + le32_encode_bits(addr_cam->sec_ent[0], + DCTLINFO_V1_W5_SEC_ENT0) | + le32_encode_bits(addr_cam->sec_ent[1], + DCTLINFO_V1_W5_SEC_ENT1) | + le32_encode_bits(addr_cam->sec_ent[2], + DCTLINFO_V1_W5_SEC_ENT2); + h2c->m5 = cpu_to_le32(DCTLINFO_V1_W5_SEC_ENT_VALID | + DCTLINFO_V1_W5_SEC_ENT0 | + DCTLINFO_V1_W5_SEC_ENT1 | + DCTLINFO_V1_W5_SEC_ENT2); + + h2c->w6 = le32_encode_bits(addr_cam->sec_ent[3], + DCTLINFO_V1_W6_SEC_ENT3) | + le32_encode_bits(addr_cam->sec_ent[4], + DCTLINFO_V1_W6_SEC_ENT4) | + le32_encode_bits(addr_cam->sec_ent[5], + DCTLINFO_V1_W6_SEC_ENT5) | + le32_encode_bits(addr_cam->sec_ent[6], + DCTLINFO_V1_W6_SEC_ENT6); + h2c->m6 = cpu_to_le32(DCTLINFO_V1_W6_SEC_ENT3 | + DCTLINFO_V1_W6_SEC_ENT4 | + DCTLINFO_V1_W6_SEC_ENT5 | + DCTLINFO_V1_W6_SEC_ENT6); + + if (rtw_wow->ptk_alg) { + h2c->w0 = le32_encode_bits(ptk_tx_iv[0] | ptk_tx_iv[1] << 8, + DCTLINFO_V1_W0_AES_IV_L); + h2c->m0 = cpu_to_le32(DCTLINFO_V1_W0_AES_IV_L); + + h2c->w1 = le32_encode_bits(ptk_tx_iv[4] | + ptk_tx_iv[5] << 8 | + ptk_tx_iv[6] << 16 | + ptk_tx_iv[7] << 24, + DCTLINFO_V1_W1_AES_IV_H); + h2c->m1 = cpu_to_le32(DCTLINFO_V1_W1_AES_IV_H); + + h2c->w4 |= le32_encode_bits(rtw_wow->ptk_keyidx, + DCTLINFO_V1_W4_SEC_KEY_ID); + h2c->m4 |= cpu_to_le32(DCTLINFO_V1_W4_SEC_KEY_ID); + } +} - SET_DCTL_MACID_V1(cmd, rtwsta ? rtwsta->mac_id : rtwvif->mac_id); - SET_DCTL_OPERATION_V1(cmd, 1); - - SET_DCTL_SEC_ENT0_KEYID_V1(cmd, addr_cam->sec_ent_keyid[0]); - SET_DCTL_SEC_ENT1_KEYID_V1(cmd, addr_cam->sec_ent_keyid[1]); - SET_DCTL_SEC_ENT2_KEYID_V1(cmd, addr_cam->sec_ent_keyid[2]); - SET_DCTL_SEC_ENT3_KEYID_V1(cmd, addr_cam->sec_ent_keyid[3]); - SET_DCTL_SEC_ENT4_KEYID_V1(cmd, addr_cam->sec_ent_keyid[4]); - SET_DCTL_SEC_ENT5_KEYID_V1(cmd, addr_cam->sec_ent_keyid[5]); - SET_DCTL_SEC_ENT6_KEYID_V1(cmd, addr_cam->sec_ent_keyid[6]); - - SET_DCTL_SEC_ENT_VALID_V1(cmd, addr_cam->sec_cam_map[0] & 0xff); - SET_DCTL_SEC_ENT0_V1(cmd, addr_cam->sec_ent[0]); - SET_DCTL_SEC_ENT1_V1(cmd, addr_cam->sec_ent[1]); - SET_DCTL_SEC_ENT2_V1(cmd, addr_cam->sec_ent[2]); - SET_DCTL_SEC_ENT3_V1(cmd, addr_cam->sec_ent[3]); - SET_DCTL_SEC_ENT4_V1(cmd, addr_cam->sec_ent[4]); - SET_DCTL_SEC_ENT5_V1(cmd, addr_cam->sec_ent[5]); - SET_DCTL_SEC_ENT6_V1(cmd, addr_cam->sec_ent[6]); +void rtw89_cam_fill_dctl_sec_cam_info_v2(struct rtw89_dev *rtwdev, + struct rtw89_vif *rtwvif, + struct rtw89_sta *rtwsta, + struct rtw89_h2c_dctlinfo_ud_v2 *h2c) +{ + struct rtw89_addr_cam_entry *addr_cam = rtw89_get_addr_cam_of(rtwvif, rtwsta); + struct rtw89_wow_param *rtw_wow = &rtwdev->wow; + u8 *ptk_tx_iv = rtw_wow->key_info.ptk_tx_iv; + + h2c->c0 = le32_encode_bits(rtwsta ? rtwsta->mac_id : rtwvif->mac_id, + DCTLINFO_V2_C0_MACID) | + le32_encode_bits(1, DCTLINFO_V2_C0_OP); + + h2c->w4 = le32_encode_bits(addr_cam->sec_ent_keyid[0], + DCTLINFO_V2_W4_SEC_ENT0_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[1], + DCTLINFO_V2_W4_SEC_ENT1_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[2], + DCTLINFO_V2_W4_SEC_ENT2_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[3], + DCTLINFO_V2_W4_SEC_ENT3_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[4], + DCTLINFO_V2_W4_SEC_ENT4_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[5], + DCTLINFO_V2_W4_SEC_ENT5_KEYID) | + le32_encode_bits(addr_cam->sec_ent_keyid[6], + DCTLINFO_V2_W4_SEC_ENT6_KEYID); + h2c->m4 = cpu_to_le32(DCTLINFO_V2_W4_SEC_ENT0_KEYID | + DCTLINFO_V2_W4_SEC_ENT1_KEYID | + DCTLINFO_V2_W4_SEC_ENT2_KEYID | + DCTLINFO_V2_W4_SEC_ENT3_KEYID | + DCTLINFO_V2_W4_SEC_ENT4_KEYID | + DCTLINFO_V2_W4_SEC_ENT5_KEYID | + DCTLINFO_V2_W4_SEC_ENT6_KEYID); + + h2c->w5 = le32_encode_bits(addr_cam->sec_cam_map[0], + DCTLINFO_V2_W5_SEC_ENT_VALID_V1) | + le32_encode_bits(addr_cam->sec_ent[0], + DCTLINFO_V2_W5_SEC_ENT0_V1); + h2c->m5 = cpu_to_le32(DCTLINFO_V2_W5_SEC_ENT_VALID_V1 | + DCTLINFO_V2_W5_SEC_ENT0_V1); + + h2c->w6 = le32_encode_bits(addr_cam->sec_ent[1], + DCTLINFO_V2_W6_SEC_ENT1_V1) | + le32_encode_bits(addr_cam->sec_ent[2], + DCTLINFO_V2_W6_SEC_ENT2_V1) | + le32_encode_bits(addr_cam->sec_ent[3], + DCTLINFO_V2_W6_SEC_ENT3_V1) | + le32_encode_bits(addr_cam->sec_ent[4], + DCTLINFO_V2_W6_SEC_ENT4_V1); + h2c->m6 = cpu_to_le32(DCTLINFO_V2_W6_SEC_ENT1_V1 | + DCTLINFO_V2_W6_SEC_ENT2_V1 | + DCTLINFO_V2_W6_SEC_ENT3_V1 | + DCTLINFO_V2_W6_SEC_ENT4_V1); + + h2c->w7 = le32_encode_bits(addr_cam->sec_ent[5], + DCTLINFO_V2_W7_SEC_ENT5_V1) | + le32_encode_bits(addr_cam->sec_ent[6], + DCTLINFO_V2_W7_SEC_ENT6_V1); + h2c->m7 = cpu_to_le32(DCTLINFO_V2_W7_SEC_ENT5_V1 | + DCTLINFO_V2_W7_SEC_ENT6_V1); + + if (rtw_wow->ptk_alg) { + h2c->w0 = le32_encode_bits(ptk_tx_iv[0] | ptk_tx_iv[1] << 8, + DCTLINFO_V2_W0_AES_IV_L); + h2c->m0 = cpu_to_le32(DCTLINFO_V2_W0_AES_IV_L); + + h2c->w1 = le32_encode_bits(ptk_tx_iv[4] | + ptk_tx_iv[5] << 8 | + ptk_tx_iv[6] << 16 | + ptk_tx_iv[7] << 24, + DCTLINFO_V2_W1_AES_IV_H); + h2c->m1 = cpu_to_le32(DCTLINFO_V2_W1_AES_IV_H); + + h2c->w4 |= le32_encode_bits(rtw_wow->ptk_keyidx, + DCTLINFO_V2_W4_SEC_KEY_ID); + h2c->m4 |= cpu_to_le32(DCTLINFO_V2_W4_SEC_KEY_ID); + } } diff --git a/sys/contrib/dev/rtw89/cam.h b/sys/contrib/dev/rtw89/cam.h index 83c160a614e6..5d7b624c2dd4 100644 --- a/sys/contrib/dev/rtw89/cam.h +++ b/sys/contrib/dev/rtw89/cam.h @@ -352,6 +352,180 @@ static inline void FWCMD_SET_ADDR_BSSID_BSSID5(void *cmd, u32 value) le32p_replace_bits((__le32 *)(cmd) + 14, value, GENMASK(31, 24)); } +struct rtw89_h2c_dctlinfo_ud_v1 { + __le32 c0; + __le32 w0; + __le32 w1; + __le32 w2; + __le32 w3; + __le32 w4; + __le32 w5; + __le32 w6; + __le32 w7; + __le32 m0; + __le32 m1; + __le32 m2; + __le32 m3; + __le32 m4; + __le32 m5; + __le32 m6; + __le32 m7; +} __packed; + +#define DCTLINFO_V1_C0_MACID GENMASK(6, 0) +#define DCTLINFO_V1_C0_OP BIT(7) + +#define DCTLINFO_V1_W0_QOS_FIELD_H GENMASK(7, 0) +#define DCTLINFO_V1_W0_HW_EXSEQ_MACID GENMASK(14, 8) +#define DCTLINFO_V1_W0_QOS_DATA BIT(15) +#define DCTLINFO_V1_W0_AES_IV_L GENMASK(31, 16) +#define DCTLINFO_V1_W0_ALL GENMASK(31, 0) +#define DCTLINFO_V1_W1_AES_IV_H GENMASK(31, 0) +#define DCTLINFO_V1_W1_ALL GENMASK(31, 0) +#define DCTLINFO_V1_W2_SEQ0 GENMASK(11, 0) +#define DCTLINFO_V1_W2_SEQ1 GENMASK(23, 12) +#define DCTLINFO_V1_W2_AMSDU_MAX_LEN GENMASK(26, 24) +#define DCTLINFO_V1_W2_STA_AMSDU_EN BIT(27) +#define DCTLINFO_V1_W2_CHKSUM_OFLD_EN BIT(28) +#define DCTLINFO_V1_W2_WITH_LLC BIT(29) +#define DCTLINFO_V1_W2_ALL GENMASK(29, 0) +#define DCTLINFO_V1_W3_SEQ2 GENMASK(11, 0) +#define DCTLINFO_V1_W3_SEQ3 GENMASK(23, 12) +#define DCTLINFO_V1_W3_TGT_IND GENMASK(27, 24) +#define DCTLINFO_V1_W3_TGT_IND_EN BIT(28) +#define DCTLINFO_V1_W3_HTC_LB GENMASK(31, 29) +#define DCTLINFO_V1_W3_ALL GENMASK(31, 0) +#define DCTLINFO_V1_W4_MHDR_LEN GENMASK(4, 0) +#define DCTLINFO_V1_W4_VLAN_TAG_VALID BIT(5) +#define DCTLINFO_V1_W4_VLAN_TAG_SEL GENMASK(7, 6) +#define DCTLINFO_V1_W4_HTC_ORDER BIT(8) +#define DCTLINFO_V1_W4_SEC_KEY_ID GENMASK(10, 9) +#define DCTLINFO_V1_W4_WAPI BIT(15) +#define DCTLINFO_V1_W4_SEC_ENT_MODE GENMASK(17, 16) +#define DCTLINFO_V1_W4_SEC_ENT0_KEYID GENMASK(19, 18) +#define DCTLINFO_V1_W4_SEC_ENT1_KEYID GENMASK(21, 20) +#define DCTLINFO_V1_W4_SEC_ENT2_KEYID GENMASK(23, 22) +#define DCTLINFO_V1_W4_SEC_ENT3_KEYID GENMASK(25, 24) +#define DCTLINFO_V1_W4_SEC_ENT4_KEYID GENMASK(27, 26) +#define DCTLINFO_V1_W4_SEC_ENT5_KEYID GENMASK(29, 28) +#define DCTLINFO_V1_W4_SEC_ENT6_KEYID GENMASK(31, 30) +#define DCTLINFO_V1_W4_ALL (GENMASK(31, 15) | GENMASK(10, 0)) +#define DCTLINFO_V1_W5_SEC_ENT_VALID GENMASK(7, 0) +#define DCTLINFO_V1_W5_SEC_ENT0 GENMASK(15, 8) +#define DCTLINFO_V1_W5_SEC_ENT1 GENMASK(23, 16) +#define DCTLINFO_V1_W5_SEC_ENT2 GENMASK(31, 24) +#define DCTLINFO_V1_W5_ALL GENMASK(31, 0) +#define DCTLINFO_V1_W6_SEC_ENT3 GENMASK(7, 0) +#define DCTLINFO_V1_W6_SEC_ENT4 GENMASK(15, 8) +#define DCTLINFO_V1_W6_SEC_ENT5 GENMASK(23, 16) +#define DCTLINFO_V1_W6_SEC_ENT6 GENMASK(31, 24) +#define DCTLINFO_V1_W6_ALL GENMASK(31, 0) + +struct rtw89_h2c_dctlinfo_ud_v2 { + __le32 c0; + __le32 w0; + __le32 w1; + __le32 w2; + __le32 w3; + __le32 w4; + __le32 w5; + __le32 w6; + __le32 w7; + __le32 w8; + __le32 w9; + __le32 w10; + __le32 w11; + __le32 w12; + __le32 w13; + __le32 w14; + __le32 w15; + __le32 m0; + __le32 m1; + __le32 m2; + __le32 m3; + __le32 m4; + __le32 m5; + __le32 m6; + __le32 m7; + __le32 m8; + __le32 m9; + __le32 m10; + __le32 m11; + __le32 m12; + __le32 m13; + __le32 m14; + __le32 m15; +} __packed; + +#define DCTLINFO_V2_C0_MACID GENMASK(6, 0) +#define DCTLINFO_V2_C0_OP BIT(7) + +#define DCTLINFO_V2_W0_QOS_FIELD_H GENMASK(7, 0) +#define DCTLINFO_V2_W0_HW_EXSEQ_MACID GENMASK(14, 8) +#define DCTLINFO_V2_W0_QOS_DATA BIT(15) +#define DCTLINFO_V2_W0_AES_IV_L GENMASK(31, 16) +#define DCTLINFO_V2_W0_ALL GENMASK(31, 0) +#define DCTLINFO_V2_W1_AES_IV_H GENMASK(31, 0) +#define DCTLINFO_V2_W1_ALL GENMASK(31, 0) +#define DCTLINFO_V2_W2_SEQ0 GENMASK(11, 0) +#define DCTLINFO_V2_W2_SEQ1 GENMASK(23, 12) +#define DCTLINFO_V2_W2_AMSDU_MAX_LEN GENMASK(26, 24) +#define DCTLINFO_V2_W2_STA_AMSDU_EN BIT(27) +#define DCTLINFO_V2_W2_CHKSUM_OFLD_EN BIT(28) +#define DCTLINFO_V2_W2_WITH_LLC BIT(29) +#define DCTLINFO_V2_W2_NAT25_EN BIT(30) +#define DCTLINFO_V2_W2_IS_MLD BIT(31) +#define DCTLINFO_V2_W2_ALL GENMASK(31, 0) +#define DCTLINFO_V2_W3_SEQ2 GENMASK(11, 0) +#define DCTLINFO_V2_W3_SEQ3 GENMASK(23, 12) +#define DCTLINFO_V2_W3_TGT_IND GENMASK(27, 24) +#define DCTLINFO_V2_W3_TGT_IND_EN BIT(28) +#define DCTLINFO_V2_W3_HTC_LB GENMASK(31, 29) +#define DCTLINFO_V2_W3_ALL GENMASK(31, 0) +#define DCTLINFO_V2_W4_VLAN_TAG_SEL GENMASK(7, 5) +#define DCTLINFO_V2_W4_HTC_ORDER BIT(8) +#define DCTLINFO_V2_W4_SEC_KEY_ID GENMASK(10, 9) +#define DCTLINFO_V2_W4_VLAN_RX_DYNAMIC_PCP_EN BIT(11) +#define DCTLINFO_V2_W4_VLAN_RX_PKT_DROP BIT(12) +#define DCTLINFO_V2_W4_VLAN_RX_VALID BIT(13) +#define DCTLINFO_V2_W4_VLAN_TX_VALID BIT(14) +#define DCTLINFO_V2_W4_WAPI BIT(15) +#define DCTLINFO_V2_W4_SEC_ENT_MODE GENMASK(17, 16) +#define DCTLINFO_V2_W4_SEC_ENT0_KEYID GENMASK(19, 18) +#define DCTLINFO_V2_W4_SEC_ENT1_KEYID GENMASK(21, 20) +#define DCTLINFO_V2_W4_SEC_ENT2_KEYID GENMASK(23, 22) +#define DCTLINFO_V2_W4_SEC_ENT3_KEYID GENMASK(25, 24) +#define DCTLINFO_V2_W4_SEC_ENT4_KEYID GENMASK(27, 26) +#define DCTLINFO_V2_W4_SEC_ENT5_KEYID GENMASK(29, 28) +#define DCTLINFO_V2_W4_SEC_ENT6_KEYID GENMASK(31, 30) +#define DCTLINFO_V2_W4_ALL GENMASK(31, 5) +#define DCTLINFO_V2_W5_SEC_ENT7_KEYID GENMASK(1, 0) +#define DCTLINFO_V2_W5_SEC_ENT8_KEYID GENMASK(3, 2) +#define DCTLINFO_V2_W5_SEC_ENT_VALID_V1 GENMASK(23, 8) +#define DCTLINFO_V2_W5_SEC_ENT0_V1 GENMASK(31, 24) +#define DCTLINFO_V2_W5_ALL (GENMASK(31, 8) | GENMASK(3, 0)) +#define DCTLINFO_V2_W6_SEC_ENT1_V1 GENMASK(7, 0) +#define DCTLINFO_V2_W6_SEC_ENT2_V1 GENMASK(15, 8) +#define DCTLINFO_V2_W6_SEC_ENT3_V1 GENMASK(23, 16) +#define DCTLINFO_V2_W6_SEC_ENT4_V1 GENMASK(31, 24) +#define DCTLINFO_V2_W6_ALL GENMASK(31, 0) +#define DCTLINFO_V2_W7_SEC_ENT5_V1 GENMASK(7, 0) +#define DCTLINFO_V2_W7_SEC_ENT6_V1 GENMASK(15, 8) +#define DCTLINFO_V2_W7_SEC_ENT7 GENMASK(23, 16) +#define DCTLINFO_V2_W7_SEC_ENT8 GENMASK(31, 24) +#define DCTLINFO_V2_W7_ALL GENMASK(31, 0) *** 84014 LINES SKIPPED *** From nobody Mon Feb 10 14:52:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xY2Nj1z5mH8b; Mon, 10 Feb 2025 14:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xX1rTNz4LML; Mon, 10 Feb 2025 14:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2J3wUDOmBmp7Prrak4P/mk9y/OubvSeitNShF2rcL4=; b=GUVZH3PbI2YPo4lXQiNuqQoVm2h5Fv6IIZaqzt4PaT7Jz8ebfNdBFeRac2SMNCBSk/v/rH lG4+rbGPms6VfrRJeH1V+dHdtXphdX3U5q+4HKpA/EXHGljv19uyH5ipbgrw6YCJLmoZlV 9mQ8PsH8fBDo+teE2Tbu8HtctjlkVlLmAOy5KlN/kbvpR2pEaoLEgPxaNK5fSC0ndZthXQ eXrrdoyuByRvcwJkImZOUEIdJtvU6t1Ve2jb+Le5UL+1IdbX6bbXtkrvPkwjyufqLdbbOE pn/0Mx/wYbJ/q/v7hCL5XMdY5UddseV7RRIwL2zbf3vL/i8i7sumGYN8rwh2ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2J3wUDOmBmp7Prrak4P/mk9y/OubvSeitNShF2rcL4=; b=Q4shB4H2dpkn1o/NRC5d5YdtoiuPmay75dm2pgaNd1jWM6KMZZ4sCZlFfNBcSE3c1c0TiT NMP6FsR4BXHLzncwYPpfbMxFaCaG50BvUjQzaVMCbRGPBNUFhJtfEShxKMiMNjX/xQ/27O 4jGvyto/uecctp3WlIyNYKPZwqoXrMi4Fm/YZnHh09Y5YSs3tIUNjyKqx0l6U+OsBr93pl C6qHHxYJj8Oh148Ob8jJvrwvEGub75S23sXL4g5RJQGOeBAQgU+oFKYn/7iV1BBj2k5Ib+ QADnrQ+HkKihA9lXRMWBwxU+Zy1WeNb9Bmgnk7HcY770YUlSpjUcXxUp+hB6wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199152; a=rsa-sha256; cv=none; b=c0yx+0RyZK0kxs8ut/FGpTuNchIKlIQXxiJ3ZoVSN0huOq7oKut/u4/xLxEksY7ivgFJaq GgqKuv1TgcHXT5rk/EPTuVYOya8Yd7Jm5rntgfEZUrJ1E+GSlm56DPkkMyayaIOUkSrbiH NWdnbcvehZdkHysuIN5vxuaqQwuuQ7iaa3JcM3Ofz4o3bTkjnw7u2HhDLtCli4tNqaIHKJ IMVSJIXuankB8M/JovfO+SOXdW/MWhr6NWUfcKI9loz05iz3qUBop4J3hQ5WHvmbEu3Bcj SKxj4NPV7ZeNnJu9kJXX4CYM4V1AIVRa7xmV1xvc67VIWafQdxZbJyxhqni+ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xX1NFfzXWC; Mon, 10 Feb 2025 14:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqWeo027622; Mon, 10 Feb 2025 14:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqWNJ027618; Mon, 10 Feb 2025 14:52:32 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:32 GMT Message-Id: <202502101452.51AEqWNJ027618@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: 3de0d1929d19 - stable/14 - rtw88: update Realtek's rtw88 driver. List-Id: Commits to the stable branches 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: 3de0d1929d19d519d8c14b4b15186ad3f9e0d2b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3de0d1929d19d519d8c14b4b15186ad3f9e0d2b7 commit 3de0d1929d19d519d8c14b4b15186ad3f9e0d2b7 Author: Bjoern A. Zeeb AuthorDate: 2024-09-24 23:50:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:07 +0000 rtw88: update Realtek's rtw88 driver. This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 98f7e32f20d28ec452afb208f9cffc08448a2652 ( tag: v6.11 ). Sponsored by: The FreeBSD Foundation (cherry picked from commit 11c53278a8a3e86e14377f09bbaa7bad193d3713) --- sys/contrib/dev/rtw88/Makefile | 9 + sys/contrib/dev/rtw88/coex.c | 4 +- sys/contrib/dev/rtw88/debug.c | 54 +- sys/contrib/dev/rtw88/debug.h | 23 +- sys/contrib/dev/rtw88/fw.c | 92 +- sys/contrib/dev/rtw88/fw.h | 5 + sys/contrib/dev/rtw88/mac.c | 27 +- sys/contrib/dev/rtw88/mac80211.c | 12 +- sys/contrib/dev/rtw88/main.c | 25 +- sys/contrib/dev/rtw88/main.h | 27 +- sys/contrib/dev/rtw88/pci.c | 28 +- sys/contrib/dev/rtw88/pci.h | 2 +- sys/contrib/dev/rtw88/phy.c | 3 + sys/contrib/dev/rtw88/ps.c | 2 + sys/contrib/dev/rtw88/reg.h | 27 + sys/contrib/dev/rtw88/regd.c | 24 +- sys/contrib/dev/rtw88/regd.h | 2 + sys/contrib/dev/rtw88/rtw8703b.c | 2122 +++++++++++++++++++++++++++++++ sys/contrib/dev/rtw88/rtw8703b.h | 102 ++ sys/contrib/dev/rtw88/rtw8703b_tables.c | 902 +++++++++++++ sys/contrib/dev/rtw88/rtw8703b_tables.h | 14 + sys/contrib/dev/rtw88/rtw8723cs.c | 34 + sys/contrib/dev/rtw88/rtw8723d.c | 674 +--------- sys/contrib/dev/rtw88/rtw8723d.h | 268 +--- sys/contrib/dev/rtw88/rtw8723x.c | 724 +++++++++++ sys/contrib/dev/rtw88/rtw8723x.h | 518 ++++++++ sys/contrib/dev/rtw88/rtw8821c.c | 70 +- sys/contrib/dev/rtw88/rtw8821c.h | 1 + sys/contrib/dev/rtw88/rtw8821c_table.c | 1154 ++++++++++++----- sys/contrib/dev/rtw88/rtw8821cu.c | 40 +- sys/contrib/dev/rtw88/rtw8822b.c | 1 + sys/contrib/dev/rtw88/rtw8822c.c | 1 + sys/contrib/dev/rtw88/rtw8822c_table.c | 1239 ++++++++---------- sys/contrib/dev/rtw88/rtw8822cu.c | 4 +- sys/contrib/dev/rtw88/rx.h | 2 + sys/contrib/dev/rtw88/sar.c | 4 + sys/contrib/dev/rtw88/sdio.c | 35 +- sys/contrib/dev/rtw88/tx.c | 3 +- sys/contrib/dev/rtw88/usb.c | 87 +- sys/modules/rtw88/Makefile | 2 + 40 files changed, 6278 insertions(+), 2089 deletions(-) diff --git a/sys/contrib/dev/rtw88/Makefile b/sys/contrib/dev/rtw88/Makefile index fd212c09d88a..8f47359b4380 100644 --- a/sys/contrib/dev/rtw88/Makefile +++ b/sys/contrib/dev/rtw88/Makefile @@ -44,6 +44,15 @@ rtw88_8822cs-objs := rtw8822cs.o obj-$(CONFIG_RTW88_8822CU) += rtw88_8822cu.o rtw88_8822cu-objs := rtw8822cu.o +obj-$(CONFIG_RTW88_8723X) += rtw88_8723x.o +rtw88_8723x-objs := rtw8723x.o + +obj-$(CONFIG_RTW88_8703B) += rtw88_8703b.o +rtw88_8703b-objs := rtw8703b.o rtw8703b_tables.o + +obj-$(CONFIG_RTW88_8723CS) += rtw88_8723cs.o +rtw88_8723cs-objs := rtw8723cs.o + obj-$(CONFIG_RTW88_8723D) += rtw88_8723d.o rtw88_8723d-objs := rtw8723d.o rtw8723d_table.o diff --git a/sys/contrib/dev/rtw88/coex.c b/sys/contrib/dev/rtw88/coex.c index 86467d2f8888..de3332eb7a22 100644 --- a/sys/contrib/dev/rtw88/coex.c +++ b/sys/contrib/dev/rtw88/coex.c @@ -3937,7 +3937,9 @@ void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m) lte_coex = rtw_coex_read_indirect_reg(rtwdev, 0x38); bt_coex = rtw_coex_read_indirect_reg(rtwdev, 0x54); - if (!coex_stat->bt_disabled && !coex_stat->bt_mailbox_reply) { + if (!coex_stat->wl_under_ips && + (!coex_stat->wl_under_lps || coex_stat->wl_force_lps_ctrl) && + !coex_stat->bt_disabled && !coex_stat->bt_mailbox_reply) { rtw_coex_get_bt_supported_version(rtwdev, &coex_stat->bt_supported_version); rtw_coex_get_bt_patch_version(rtwdev, &coex_stat->patch_ver); diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c index d745c774aa6f..e84f25b34c46 100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@ -316,23 +316,13 @@ static ssize_t rtw_debugfs_set_single_input(struct file *filp, { struct seq_file *seqpriv = (struct seq_file *)filp->private_data; struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; - struct rtw_dev *rtwdev = debugfs_priv->rtwdev; - char tmp[32 + 1]; u32 input; - int num; int ret; - ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = kstrtou32_from_user(buffer, count, 0, &input); if (ret) return ret; - num = kstrtoint(tmp, 0, &input); - - if (num) { - rtw_warn(rtwdev, "kstrtoint failed\n"); - return num; - } - debugfs_priv->cb_data = input; return count; @@ -485,19 +475,12 @@ static ssize_t rtw_debugfs_set_fix_rate(struct file *filp, struct rtw_dev *rtwdev = debugfs_priv->rtwdev; struct rtw_dm_info *dm_info = &rtwdev->dm_info; u8 fix_rate; - char tmp[32 + 1]; int ret; - ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = kstrtou8_from_user(buffer, count, 0, &fix_rate); if (ret) return ret; - ret = kstrtou8(tmp, 0, &fix_rate); - if (ret) { - rtw_warn(rtwdev, "invalid args, [rate]\n"); - return ret; - } - dm_info->fix_rate = fix_rate; return count; @@ -879,20 +862,13 @@ static ssize_t rtw_debugfs_set_coex_enable(struct file *filp, struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; struct rtw_dev *rtwdev = debugfs_priv->rtwdev; struct rtw_coex *coex = &rtwdev->coex; - char tmp[32 + 1]; bool enable; int ret; - ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = kstrtobool_from_user(buffer, count, &enable); if (ret) return ret; - ret = kstrtobool(tmp, &enable); - if (ret) { - rtw_warn(rtwdev, "invalid arguments\n"); - return ret; - } - mutex_lock(&rtwdev->mutex); coex->manual_control = !enable; mutex_unlock(&rtwdev->mutex); @@ -951,18 +927,13 @@ static ssize_t rtw_debugfs_set_fw_crash(struct file *filp, struct seq_file *seqpriv = (struct seq_file *)filp->private_data; struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; struct rtw_dev *rtwdev = debugfs_priv->rtwdev; - char tmp[32 + 1]; bool input; int ret; - ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = kstrtobool_from_user(buffer, count, &input); if (ret) return ret; - ret = kstrtobool(tmp, &input); - if (ret) - return -EINVAL; - if (!input) return -EINVAL; @@ -1030,11 +1001,12 @@ static ssize_t rtw_debugfs_set_dm_cap(struct file *filp, struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; struct rtw_dev *rtwdev = debugfs_priv->rtwdev; struct rtw_dm_info *dm_info = &rtwdev->dm_info; - int bit; + int ret, bit; bool en; - if (kstrtoint_from_user(buffer, count, 10, &bit)) - return -EINVAL; + ret = kstrtoint_from_user(buffer, count, 10, &bit); + if (ret) + return ret; en = bit > 0; bit = abs(bit); @@ -1233,9 +1205,9 @@ static struct rtw_debugfs_priv rtw_debug_priv_dm_cap = { #define rtw_debugfs_add_core(name, mode, fopname, parent) \ do { \ rtw_debug_priv_ ##name.rtwdev = rtwdev; \ - if (!debugfs_create_file(#name, mode, \ + if (IS_ERR(debugfs_create_file(#name, mode, \ parent, &rtw_debug_priv_ ##name,\ - &file_ops_ ##fopname)) \ + &file_ops_ ##fopname))) \ pr_debug("Unable to initialize debugfs:%s\n", \ #name); \ } while (0) @@ -1314,8 +1286,8 @@ void rtw_debugfs_init(struct rtw_dev *rtwdev) #ifdef CONFIG_RTW88_DEBUG -void __rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, - const char *fmt, ...) +void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, + const char *fmt, ...) { struct va_format vaf = { .fmt = fmt, @@ -1334,6 +1306,6 @@ void __rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, va_end(args); } -EXPORT_SYMBOL(__rtw_dbg); +EXPORT_SYMBOL(rtw_dbg); #endif /* CONFIG_RTW88_DEBUG */ diff --git a/sys/contrib/dev/rtw88/debug.h b/sys/contrib/dev/rtw88/debug.h index e826102083cf..0e48c56451a4 100644 --- a/sys/contrib/dev/rtw88/debug.h +++ b/sys/contrib/dev/rtw88/debug.h @@ -27,8 +27,9 @@ enum rtw_debug_mask { RTW_DBG_SDIO = 0x00040000, #if defined(__FreeBSD__) - RTW_DBG_IO_RW = 0x80000000, + RTW_DBG_IO_RW = 0x10000000, #endif + RTW_DBG_UNEXP = 0x80000000, RTW_DBG_ALL = 0xffffffff }; @@ -46,20 +47,26 @@ static inline void rtw_debugfs_init(struct rtw_dev *rtwdev) {} #ifdef CONFIG_RTW88_DEBUG __printf(3, 4) -void __rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, - const char *fmt, ...); +void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, + const char *fmt, ...); -#if defined(__linux__) -#define rtw_dbg(rtwdev, a...) __rtw_dbg(rtwdev, ##a) -#elif defined(__FreeBSD__) -#define rtw_dbg(rtwdev, ...) __rtw_dbg(rtwdev, __VA_ARGS__) -#endif +static inline bool rtw_dbg_is_enabled(struct rtw_dev *rtwdev, + enum rtw_debug_mask mask) +{ + return !!(rtw_debug_mask & mask); +} #else static inline void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, const char *fmt, ...) {} +static inline bool rtw_dbg_is_enabled(struct rtw_dev *rtwdev, + enum rtw_debug_mask mask) +{ + return false; +} + #endif /* CONFIG_RTW88_DEBUG */ #define rtw_info(rtwdev, a...) dev_info(rtwdev->dev, ##a) diff --git a/sys/contrib/dev/rtw88/fw.c b/sys/contrib/dev/rtw88/fw.c index f7fecc48fd39..745e37ea0093 100644 --- a/sys/contrib/dev/rtw88/fw.c +++ b/sys/contrib/dev/rtw88/fw.c @@ -17,6 +17,79 @@ #include "phy.h" #include "mac.h" +static const struct rtw_hw_reg_desc fw_h2c_regs[] = { + {REG_FWIMR, MASKDWORD, "FWIMR"}, + {REG_FWIMR, BIT_FS_H2CCMD_INT_EN, "FWIMR enable"}, + {REG_FWISR, MASKDWORD, "FWISR"}, + {REG_FWISR, BIT_FS_H2CCMD_INT, "FWISR enable"}, + {REG_HMETFR, BIT_INT_BOX_ALL, "BoxBitMap"}, + {REG_HMEBOX0, MASKDWORD, "MSG 0"}, + {REG_HMEBOX0_EX, MASKDWORD, "MSG_EX 0"}, + {REG_HMEBOX1, MASKDWORD, "MSG 1"}, + {REG_HMEBOX1_EX, MASKDWORD, "MSG_EX 1"}, + {REG_HMEBOX2, MASKDWORD, "MSG 2"}, + {REG_HMEBOX2_EX, MASKDWORD, "MSG_EX 2"}, + {REG_HMEBOX3, MASKDWORD, "MSG 3"}, + {REG_HMEBOX3_EX, MASKDWORD, "MSG_EX 3"}, + {REG_FT1IMR, MASKDWORD, "FT1IMR"}, + {REG_FT1IMR, BIT_FS_H2C_CMD_OK_INT_EN, "FT1IMR enable"}, + {REG_FT1ISR, MASKDWORD, "FT1ISR"}, + {REG_FT1ISR, BIT_FS_H2C_CMD_OK_INT, "FT1ISR enable "}, +}; + +static const struct rtw_hw_reg_desc fw_c2h_regs[] = { + {REG_FWIMR, MASKDWORD, "FWIMR"}, + {REG_FWIMR, BIT_FS_H2CCMD_INT_EN, "CPWM"}, + {REG_FWIMR, BIT_FS_HRCV_INT_EN, "HRECV"}, + {REG_FWISR, MASKDWORD, "FWISR"}, + {REG_FWISR, BIT_FS_H2CCMD_INT, "CPWM"}, + {REG_FWISR, BIT_FS_HRCV_INT, "HRECV"}, + {REG_CPWM, MASKDWORD, "REG_CPWM"}, +}; + +static const struct rtw_hw_reg_desc fw_core_regs[] = { + {REG_ARFR2_V1, MASKDWORD, "EPC"}, + {REG_ARFRH2_V1, MASKDWORD, "BADADDR"}, + {REG_ARFR3_V1, MASKDWORD, "CAUSE"}, + {REG_ARFR3_V1, BIT_EXC_CODE, "ExcCode"}, + {REG_ARFRH3_V1, MASKDWORD, "Status"}, + {REG_ARFR4, MASKDWORD, "SP"}, + {REG_ARFRH4, MASKDWORD, "RA"}, + {REG_FW_DBG6, MASKDWORD, "DBG 6"}, + {REG_FW_DBG7, MASKDWORD, "DBG 7"}, +}; + +static void _rtw_fw_dump_dbg_info(struct rtw_dev *rtwdev, + const struct rtw_hw_reg_desc regs[], u32 size) +{ + const struct rtw_hw_reg_desc *reg; + u32 val; + int i; + + for (i = 0; i < size; i++) { + reg = ®s[i]; + val = rtw_read32_mask(rtwdev, reg->addr, reg->mask); + + rtw_dbg(rtwdev, RTW_DBG_FW, "[%s]addr:0x%x mask:0x%x value:0x%x\n", + reg->desc, reg->addr, reg->mask, val); + } +} + +void rtw_fw_dump_dbg_info(struct rtw_dev *rtwdev) +{ + int i; + + if (!rtw_dbg_is_enabled(rtwdev, RTW_DBG_FW)) + return; + + _rtw_fw_dump_dbg_info(rtwdev, fw_h2c_regs, ARRAY_SIZE(fw_h2c_regs)); + _rtw_fw_dump_dbg_info(rtwdev, fw_c2h_regs, ARRAY_SIZE(fw_c2h_regs)); + for (i = 0 ; i < RTW_DEBUG_DUMP_TIMES; i++) { + rtw_dbg(rtwdev, RTW_DBG_FW, "Firmware Coredump %dth\n", i + 1); + _rtw_fw_dump_dbg_info(rtwdev, fw_core_regs, ARRAY_SIZE(fw_core_regs)); + } +} + static void rtw_fw_c2h_cmd_handle_ext(struct rtw_dev *rtwdev, struct sk_buff *skb) { @@ -349,6 +422,7 @@ static void rtw_fw_send_h2c_command_register(struct rtw_dev *rtwdev, if (ret) { rtw_err(rtwdev, "failed to send h2c command\n"); + rtw_fw_dump_dbg_info(rtwdev); return; } @@ -709,12 +783,18 @@ void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect, static const u8 rssi_min = 0, rssi_max = 100, rssi_offset = 100; struct rtw_sta_info *si = sta ? (struct rtw_sta_info *)sta->drv_priv : NULL; - s32 threshold = bss_conf->cqm_rssi_thold + rssi_offset; + s32 thold = RTW_DEFAULT_CQM_THOLD; + u32 hyst = RTW_DEFAULT_CQM_HYST; u8 h2c_pkt[H2C_PKT_SIZE] = {0}; if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_BCN_FILTER)) return; + if (bss_conf->cqm_rssi_thold) + thold = bss_conf->cqm_rssi_thold; + if (bss_conf->cqm_rssi_hyst) + hyst = bss_conf->cqm_rssi_hyst; + if (!connect) { SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_BCN_FILTER_OFFLOAD_P1); SET_BCN_FILTER_OFFLOAD_P1_ENABLE(h2c_pkt, connect); @@ -731,15 +811,15 @@ void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect, rtw_fw_send_h2c_command(rtwdev, h2c_pkt); memset(h2c_pkt, 0, sizeof(h2c_pkt)); - threshold = clamp_t(s32, threshold, rssi_min, rssi_max); + thold = clamp_t(s32, thold + rssi_offset, rssi_min, rssi_max); SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_BCN_FILTER_OFFLOAD_P1); SET_BCN_FILTER_OFFLOAD_P1_ENABLE(h2c_pkt, connect); SET_BCN_FILTER_OFFLOAD_P1_OFFLOAD_MODE(h2c_pkt, BCN_FILTER_OFFLOAD_MODE_DEFAULT); - SET_BCN_FILTER_OFFLOAD_P1_THRESHOLD(h2c_pkt, (u8)threshold); + SET_BCN_FILTER_OFFLOAD_P1_THRESHOLD(h2c_pkt, thold); SET_BCN_FILTER_OFFLOAD_P1_BCN_LOSS_CNT(h2c_pkt, BCN_LOSS_CNT); SET_BCN_FILTER_OFFLOAD_P1_MACID(h2c_pkt, si->mac_id); - SET_BCN_FILTER_OFFLOAD_P1_HYST(h2c_pkt, bss_conf->cqm_rssi_hyst); + SET_BCN_FILTER_OFFLOAD_P1_HYST(h2c_pkt, hyst); SET_BCN_FILTER_OFFLOAD_P1_BCN_INTERVAL(h2c_pkt, bss_conf->beacon_int); rtw_fw_send_h2c_command(rtwdev, h2c_pkt); } @@ -924,7 +1004,7 @@ static u8 rtw_get_rsvd_page_probe_req_location(struct rtw_dev *rtwdev, if (rsvd_pkt->type != RSVD_PROBE_REQ) continue; if ((!ssid && !rsvd_pkt->ssid) || - rtw_ssid_equal(rsvd_pkt->ssid, ssid)) + cfg80211_ssid_eq(rsvd_pkt->ssid, ssid)) location = rsvd_pkt->page; } @@ -941,7 +1021,7 @@ static u16 rtw_get_rsvd_page_probe_req_size(struct rtw_dev *rtwdev, if (rsvd_pkt->type != RSVD_PROBE_REQ) continue; if ((!ssid && !rsvd_pkt->ssid) || - rtw_ssid_equal(rsvd_pkt->ssid, ssid)) + cfg80211_ssid_eq(rsvd_pkt->ssid, ssid)) size = rsvd_pkt->probe_req_size; } diff --git a/sys/contrib/dev/rtw88/fw.h b/sys/contrib/dev/rtw88/fw.h index 43ccdf9965ac..e999c24e4634 100644 --- a/sys/contrib/dev/rtw88/fw.h +++ b/sys/contrib/dev/rtw88/fw.h @@ -29,6 +29,8 @@ #define BCN_FILTER_CONNECTION_LOSS 1 #define BCN_FILTER_CONNECTED 2 #define BCN_FILTER_NOTIFY_BEACON_LOSS 3 +#define RTW_DEFAULT_CQM_THOLD -70 +#define RTW_DEFAULT_CQM_HYST 4 #define SCAN_NOTIFY_TIMEOUT msecs_to_jiffies(10) @@ -44,6 +46,8 @@ #define RTW_OLD_PROBE_PG_CNT 2 #define RTW_PROBE_PG_CNT 4 +#define RTW_DEBUG_DUMP_TIMES 10 + enum rtw_c2h_cmd_id { C2H_CCX_TX_RPT = 0x03, C2H_BT_INFO = 0x09, @@ -808,6 +812,7 @@ static inline bool rtw_fw_feature_ext_check(struct rtw_fw_state *fw, return !!(fw->feature_ext & feature); } +void rtw_fw_dump_dbg_info(struct rtw_dev *rtwdev); void rtw_fw_c2h_cmd_rx_irqsafe(struct rtw_dev *rtwdev, u32 pkt_offset, struct sk_buff *skb); void rtw_fw_c2h_cmd_handle(struct rtw_dev *rtwdev, struct sk_buff *skb); diff --git a/sys/contrib/dev/rtw88/mac.c b/sys/contrib/dev/rtw88/mac.c index 298663b03580..564f5988ee82 100644 --- a/sys/contrib/dev/rtw88/mac.c +++ b/sys/contrib/dev/rtw88/mac.c @@ -309,6 +309,13 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq; ret = rtw_pwr_seq_parser(rtwdev, pwr_seq); + if (pwr_on && rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB) { + if (chip->id == RTW_CHIP_TYPE_8822C || + chip->id == RTW_CHIP_TYPE_8822B || + chip->id == RTW_CHIP_TYPE_8821C) + rtw_write8_clr(rtwdev, REG_SYS_STATUS1 + 1, BIT(0)); + } + if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) rtw_write32(rtwdev, REG_SDIO_HIMR, imr); @@ -936,6 +943,12 @@ static int __rtw_download_firmware_legacy(struct rtw_dev *rtwdev, { int ret = 0; + /* reset firmware if still present */ + if (rtwdev->chip->id == RTW_CHIP_TYPE_8703B && + rtw_read8_mask(rtwdev, REG_MCUFW_CTRL, BIT_RAM_DL_SEL)) { + rtw_write8(rtwdev, REG_MCUFW_CTRL, 0x00); + } + en_download_firmware_legacy(rtwdev, true); ret = download_firmware_legacy(rtwdev, fw->firmware->data, fw->firmware->size); en_download_firmware_legacy(rtwdev, false); @@ -1026,14 +1039,15 @@ static void __rtw_mac_flush_prio_queue(struct rtw_dev *rtwdev, msleep(20); } - /* priority queue is still not empty, throw a warning, + /* priority queue is still not empty, throw a debug message * * Note that if we want to flush the tx queue when having a lot of * traffic (ex, 100Mbps up), some of the packets could be dropped. * And it requires like ~2secs to flush the full priority queue. */ if (!drop) - rtw_warn(rtwdev, "timed out to flush queue %d\n", prio_queue); + rtw_dbg(rtwdev, RTW_DBG_UNEXP, + "timed out to flush queue %d\n", prio_queue); } static void rtw_mac_flush_prio_queues(struct rtw_dev *rtwdev, @@ -1187,6 +1201,15 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev, rtw_write16(rtwdev, REG_FIFOPAGE_CTRL_2 + 2, fifo->rsvd_boundary); rtw_write16(rtwdev, REG_BCNQ1_BDNY_V1, fifo->rsvd_boundary); rtw_write32(rtwdev, REG_RXFF_BNDY, chip->rxff_size - C2H_PKT_BUF - 1); + + if (rtwdev->hci.type == RTW_HCI_TYPE_USB) { + rtw_write8_mask(rtwdev, REG_AUTO_LLT_V1, BIT_MASK_BLK_DESC_NUM, + chip->usb_tx_agg_desc_num); + + rtw_write8(rtwdev, REG_AUTO_LLT_V1 + 3, chip->usb_tx_agg_desc_num); + rtw_write8_set(rtwdev, REG_TXDMA_OFFSET_CHK + 1, BIT(1)); + } + rtw_write8_set(rtwdev, REG_AUTO_LLT_V1, BIT_AUTO_INIT_LLT_V1); if (!check_hw_ready(rtwdev, REG_AUTO_LLT_V1, BIT_AUTO_INIT_LLT_V1, 0)) diff --git a/sys/contrib/dev/rtw88/mac80211.c b/sys/contrib/dev/rtw88/mac80211.c index d01c5268191f..c158cb2e795a 100644 --- a/sys/contrib/dev/rtw88/mac80211.c +++ b/sys/contrib/dev/rtw88/mac80211.c @@ -62,7 +62,7 @@ static int rtw_ops_start(struct ieee80211_hw *hw) return ret; } -static void rtw_ops_stop(struct ieee80211_hw *hw) +static void rtw_ops_stop(struct ieee80211_hw *hw, bool suspend) { struct rtw_dev *rtwdev = hw->priv; @@ -293,9 +293,9 @@ static void rtw_ops_configure_filter(struct ieee80211_hw *hw, if (changed_flags & FIF_ALLMULTI) { if (*new_flags & FIF_ALLMULTI) - rtwdev->hal.rcr |= BIT_AM | BIT_AB; + rtwdev->hal.rcr |= BIT_AM; else - rtwdev->hal.rcr &= ~(BIT_AM | BIT_AB); + rtwdev->hal.rcr &= ~(BIT_AM); } if (changed_flags & FIF_FCSFAIL) { if (*new_flags & FIF_FCSFAIL) @@ -399,6 +399,8 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, rtw_coex_media_status_notify(rtwdev, vif->cfg.assoc); if (rtw_bf_support) rtw_bf_assoc(rtwdev, vif, conf); + + rtw_fw_beacon_filter_config(rtwdev, true, vif); } else { rtw_leave_lps(rtwdev); rtw_bf_disassoc(rtwdev, vif, conf); @@ -940,6 +942,10 @@ static void rtw_ops_sta_rc_update(struct ieee80211_hw *hw, } const struct ieee80211_ops rtw_ops = { + .add_chanctx = ieee80211_emulate_add_chanctx, + .remove_chanctx = ieee80211_emulate_remove_chanctx, + .change_chanctx = ieee80211_emulate_change_chanctx, + .switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx, .tx = rtw_ops_tx, .wake_tx_queue = rtw_ops_wake_tx_queue, .start = rtw_ops_start, diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c index cb4e0f92ae12..de94f750200e 100644 --- a/sys/contrib/dev/rtw88/main.c +++ b/sys/contrib/dev/rtw88/main.c @@ -231,9 +231,6 @@ static void rtw_watch_dog_work(struct work_struct *work) else clear_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags); - rtw_coex_wl_status_check(rtwdev); - rtw_coex_query_bt_hid_list(rtwdev); - if (busy_traffic != test_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags)) rtw_coex_wl_status_change_notify(rtwdev, 0); @@ -261,6 +258,8 @@ static void rtw_watch_dog_work(struct work_struct *work) /* make sure BB/RF is working for dynamic mech */ rtw_leave_lps(rtwdev); + rtw_coex_wl_status_check(rtwdev); + rtw_coex_query_bt_hid_list(rtwdev); rtw_phy_dynamic_mechanism(rtwdev); @@ -2030,6 +2029,11 @@ static int rtw_chip_efuse_info_setup(struct rtw_dev *rtwdev) efuse->ext_pa_5g = efuse->pa_type_5g & BIT(0) ? 1 : 0; efuse->ext_lna_2g = efuse->lna_type_5g & BIT(3) ? 1 : 0; + if (!is_valid_ether_addr(efuse->addr)) { + eth_random_addr(efuse->addr); + dev_warn(rtwdev->dev, "efuse MAC invalid, using random\n"); + } + out_disable: rtw_chip_efuse_disable(rtwdev); @@ -2049,8 +2053,6 @@ static int rtw_chip_board_info_setup(struct rtw_dev *rtwdev) rtw_phy_setup_phy_cond(rtwdev, hal->pkg_type); rtw_phy_init_tx_power(rtwdev); - if (rfe_def->agc_btg_tbl) - rtw_load_table(rtwdev, rfe_def->agc_btg_tbl); rtw_load_table(rtwdev, rfe_def->phy_pg_tbl); rtw_load_table(rtwdev, rfe_def->txpwr_lmt_tbl); rtw_phy_tx_power_by_rate_config(hal); @@ -2227,6 +2229,7 @@ EXPORT_SYMBOL(rtw_core_deinit); int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) { + bool sta_mode_only = rtwdev->hci.type == RTW_HCI_TYPE_SDIO; struct rtw_hal *hal = &rtwdev->hal; int max_tx_headroom = 0; int ret; @@ -2255,10 +2258,12 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) ieee80211_hw_set(hw, TX_AMSDU); ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS); - hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_AP) | - BIT(NL80211_IFTYPE_ADHOC) | - BIT(NL80211_IFTYPE_MESH_POINT); + if (sta_mode_only) + hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); + else + hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_ADHOC); hw->wiphy->available_antennas_tx = hal->antenna_tx; hw->wiphy->available_antennas_rx = hal->antenna_rx; @@ -2269,7 +2274,7 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) hw->wiphy->max_scan_ssids = RTW_SCAN_MAX_SSIDS; hw->wiphy->max_scan_ie_len = rtw_get_max_scan_ie_len(rtwdev); - if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C) { + if (!sta_mode_only && rtwdev->chip->id == RTW_CHIP_TYPE_8822C) { hw->wiphy->iface_combinations = rtw_iface_combs; hw->wiphy->n_iface_combinations = ARRAY_SIZE(rtw_iface_combs); } diff --git a/sys/contrib/dev/rtw88/main.h b/sys/contrib/dev/rtw88/main.h index e1d903bb88ee..8d754237db31 100644 --- a/sys/contrib/dev/rtw88/main.h +++ b/sys/contrib/dev/rtw88/main.h @@ -195,6 +195,7 @@ enum rtw_chip_type { RTW_CHIP_TYPE_8822C, RTW_CHIP_TYPE_8723D, RTW_CHIP_TYPE_8821C, + RTW_CHIP_TYPE_8703B, }; enum rtw_tx_queue_type { @@ -350,8 +351,10 @@ enum rtw_regulatory_domains { RTW_REGD_UKRAINE = 7, RTW_REGD_MEXICO = 8, RTW_REGD_CN = 9, - RTW_REGD_WW, + RTW_REGD_QATAR = 10, + RTW_REGD_UK = 11, + RTW_REGD_WW, RTW_REGD_MAX }; @@ -530,6 +533,12 @@ struct rtw_hw_reg { u32 mask; }; +struct rtw_hw_reg_desc { + u32 addr; + u32 mask; + const char *desc; +}; + struct rtw_ltecoex_addr { u32 ctrl; u32 wdata; @@ -1196,6 +1205,8 @@ struct rtw_chip_info { u16 fw_fifo_addr[RTW_FW_FIFO_MAX]; const struct rtw_fwcd_segs *fwcd_segs; + u8 usb_tx_agg_desc_num; + u8 default_1ss_tx_path; bool path_div_supported; @@ -1700,11 +1711,13 @@ struct rtw_dm_info { s8 delta_power_index[RTW_RF_PATH_MAX]; s8 delta_power_index_last[RTW_RF_PATH_MAX]; u8 default_ofdm_index; + u8 default_cck_index; bool pwr_trk_triggered; bool pwr_trk_init_trigger; struct ewma_thermal avg_thermal[RTW_RF_PATH_MAX]; s8 txagc_remnant_cck; s8 txagc_remnant_ofdm; + u8 rx_cck_agc_report_type; /* backup dack results for each path and I/Q */ u32 dack_adck[RTW_RF_PATH_MAX]; @@ -2090,18 +2103,6 @@ static inline struct ieee80211_vif *rtwvif_to_vif(struct rtw_vif *rtwvif) return container_of(p, struct ieee80211_vif, drv_priv); } -static inline bool rtw_ssid_equal(struct cfg80211_ssid *a, - struct cfg80211_ssid *b) -{ - if (!a || !b || a->ssid_len != b->ssid_len) - return false; - - if (memcmp(a->ssid, b->ssid, a->ssid_len)) - return false; - - return true; -} - static inline void rtw_chip_efuse_grant_on(struct rtw_dev *rtwdev) { if (rtwdev->chip->ops->efuse_grant) diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c index 7554bac4902a..82e08f14f9b7 100644 --- a/sys/contrib/dev/rtw88/pci.c +++ b/sys/contrib/dev/rtw88/pci.c @@ -780,7 +780,8 @@ static void __pci_flush_queue(struct rtw_dev *rtwdev, u8 pci_q, bool drop) } if (!drop) - rtw_warn(rtwdev, "timed out to flush pci tx ring[%d]\n", pci_q); + rtw_dbg(rtwdev, RTW_DBG_UNEXP, + "timed out to flush pci tx ring[%d]\n", pci_q); } static void __rtw_pci_flush_queues(struct rtw_dev *rtwdev, u32 pci_queues, @@ -1529,6 +1530,7 @@ static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev) { struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; const struct rtw_chip_info *chip = rtwdev->chip; + struct rtw_efuse *efuse = &rtwdev->efuse; struct pci_dev *pdev = rtwpci->pdev; const struct rtw_intf_phy_para *para; u16 cut; @@ -1577,6 +1579,9 @@ static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev) rtw_err(rtwdev, "failed to set PCI cap, ret = %d\n", ret); } + + if (chip->id == RTW_CHIP_TYPE_8822C && efuse->rfe_option == 5) + rtw_write32_mask(rtwdev, REG_ANAPARSW_MAC_0, BIT_CF_L_V2, 0x1); } static int __maybe_unused rtw_pci_suspend(struct device *dev) @@ -1687,7 +1692,7 @@ static struct rtw_hci_ops rtw_pci_ops = { static int rtw_pci_request_irq(struct rtw_dev *rtwdev, struct pci_dev *pdev) { - unsigned int flags = PCI_IRQ_LEGACY; + unsigned int flags = PCI_IRQ_INTX; int ret; if (!rtw_disable_msi) @@ -1756,12 +1761,16 @@ static int rtw_pci_napi_poll(struct napi_struct *napi, int budget) return work_done; } -static void rtw_pci_napi_init(struct rtw_dev *rtwdev) +static int rtw_pci_napi_init(struct rtw_dev *rtwdev) { struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; - init_dummy_netdev(&rtwpci->netdev); - netif_napi_add(&rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll); + rtwpci->netdev = alloc_netdev_dummy(0); + if (!rtwpci->netdev) + return -ENOMEM; + + netif_napi_add(rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll); + return 0; } static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev) @@ -1770,6 +1779,7 @@ static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev) rtw_pci_napi_stop(rtwdev); netif_napi_del(&rtwpci->napi); + free_netdev(rtwpci->netdev); } int rtw_pci_probe(struct pci_dev *pdev, @@ -1819,7 +1829,11 @@ int rtw_pci_probe(struct pci_dev *pdev, goto err_pci_declaim; } - rtw_pci_napi_init(rtwdev); + ret = rtw_pci_napi_init(rtwdev); + if (ret) { + rtw_err(rtwdev, "failed to setup NAPI\n"); + goto err_pci_declaim; + } ret = rtw_chip_info_setup(rtwdev); if (ret) { @@ -1907,7 +1921,7 @@ void rtw_pci_shutdown(struct pci_dev *pdev) EXPORT_SYMBOL(rtw_pci_shutdown); MODULE_AUTHOR("Realtek Corporation"); -MODULE_DESCRIPTION("Realtek 802.11ac wireless PCI driver"); +MODULE_DESCRIPTION("Realtek PCI 802.11ac wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); #if defined(__FreeBSD__) MODULE_VERSION(rtw_pci, 1); diff --git a/sys/contrib/dev/rtw88/pci.h b/sys/contrib/dev/rtw88/pci.h index 0c37efd8c66f..13988db1cb4c 100644 --- a/sys/contrib/dev/rtw88/pci.h +++ b/sys/contrib/dev/rtw88/pci.h @@ -215,7 +215,7 @@ struct rtw_pci { bool running; /* napi structure */ - struct net_device netdev; + struct net_device *netdev; struct napi_struct napi; u16 rx_tag; diff --git a/sys/contrib/dev/rtw88/phy.c b/sys/contrib/dev/rtw88/phy.c index 128e75a81bf3..37ef80c9091d 100644 --- a/sys/contrib/dev/rtw88/phy.c +++ b/sys/contrib/dev/rtw88/phy.c @@ -1761,12 +1761,15 @@ static void rtw_load_rfk_table(struct rtw_dev *rtwdev) void rtw_phy_load_tables(struct rtw_dev *rtwdev) { + const struct rtw_rfe_def *rfe_def = rtw_get_rfe_def(rtwdev); const struct rtw_chip_info *chip = rtwdev->chip; u8 rf_path; rtw_load_table(rtwdev, chip->mac_tbl); rtw_load_table(rtwdev, chip->bb_tbl); rtw_load_table(rtwdev, chip->agc_tbl); + if (rfe_def->agc_btg_tbl) + rtw_load_table(rtwdev, rfe_def->agc_btg_tbl); rtw_load_rfk_table(rtwdev); for (rf_path = 0; rf_path < rtwdev->hal.rf_path_num; rf_path++) { diff --git a/sys/contrib/dev/rtw88/ps.c b/sys/contrib/dev/rtw88/ps.c index 07e8cbd436cd..add5a20b8432 100644 --- a/sys/contrib/dev/rtw88/ps.c +++ b/sys/contrib/dev/rtw88/ps.c @@ -104,6 +104,7 @@ void rtw_power_mode_change(struct rtw_dev *rtwdev, bool enter) */ WARN(1, "firmware failed to ack driver for %s Deep Power mode\n", enter ? "entering" : "leaving"); + rtw_fw_dump_dbg_info(rtwdev); } } EXPORT_SYMBOL(rtw_power_mode_change); @@ -164,6 +165,7 @@ static void rtw_fw_leave_lps_check(struct rtw_dev *rtwdev) if (ret) { rtw_write32_clr(rtwdev, REG_TCR, BIT_PWRMGT_HWDATA_EN); rtw_warn(rtwdev, "firmware failed to leave lps state\n"); + rtw_fw_dump_dbg_info(rtwdev); } } diff --git a/sys/contrib/dev/rtw88/reg.h b/sys/contrib/dev/rtw88/reg.h index 7c6c11d50ff3..02ef9a77316b 100644 --- a/sys/contrib/dev/rtw88/reg.h +++ b/sys/contrib/dev/rtw88/reg.h @@ -224,12 +224,25 @@ #define REG_RXFF_BNDY 0x011C #define REG_FE1IMR 0x0120 #define BIT_FS_RXDONE BIT(16) +#define REG_CPWM 0x012C +#define REG_FWIMR 0x0130 +#define BIT_FS_H2CCMD_INT_EN BIT(4) +#define BIT_FS_HRCV_INT_EN BIT(5) +#define REG_FWISR 0x0134 +#define BIT_FS_H2CCMD_INT BIT(4) +#define BIT_FS_HRCV_INT BIT(5) #define REG_PKTBUF_DBG_CTRL 0x0140 #define REG_C2HEVT 0x01A0 #define REG_MCUTST_1 0x01C0 #define REG_MCUTST_II 0x01C4 #define REG_WOWLAN_WAKE_REASON 0x01C7 #define REG_HMETFR 0x01CC +#define BIT_INT_BOX0 BIT(0) +#define BIT_INT_BOX1 BIT(1) +#define BIT_INT_BOX2 BIT(2) +#define BIT_INT_BOX3 BIT(3) +#define BIT_INT_BOX_ALL (BIT_INT_BOX0 | BIT_INT_BOX1 | BIT_INT_BOX2 | \ + BIT_INT_BOX3) #define REG_HMEBOX0 0x01D0 #define REG_HMEBOX1 0x01D4 #define REG_HMEBOX2 0x01D8 @@ -257,6 +270,7 @@ #define BIT_MASK_BCN_HEAD_1_V1 0xfff #define REG_AUTO_LLT_V1 0x0208 #define BIT_AUTO_INIT_LLT_V1 BIT(0) +#define BIT_MASK_BLK_DESC_NUM GENMASK(7, 4) #define REG_DWBCN0_CTRL 0x0208 #define BIT_BCN_VALID BIT(16) #define REG_TXDMA_OFFSET_CHK 0x020C @@ -338,6 +352,11 @@ #define BIT_EN_GNT_BT_AWAKE BIT(3) #define BIT_EN_EOF_V1 BIT(2) #define REG_DATA_SC 0x0483 +#define REG_ARFR2_V1 0x048C +#define REG_ARFRH2_V1 0x0490 +#define REG_ARFR3_V1 0x0494 +#define BIT_EXC_CODE GENMASK(6, 2) +#define REG_ARFRH3_V1 0x0498 #define REG_ARFR4 0x049C #define BIT_WL_RFK BIT(0) #define REG_ARFRH4 0x04A0 @@ -539,6 +558,9 @@ #define REG_RFE_INV16 0x0cbe #define BIT_RFE_BUF_EN BIT(3) +#define REG_ANAPARSW_MAC_0 0x1010 +#define BIT_CF_L_V2 GENMASK(29, 28) + #define REG_ANAPAR_XTAL_0 0x1040 #define BIT_XCAP_0 GENMASK(23, 10) #define REG_CPU_DMEM_CON 0x1080 @@ -548,11 +570,16 @@ #define REG_H2C_PKT_READADDR 0x10D0 #define REG_H2C_PKT_WRITEADDR 0x10D4 +#define REG_FW_DBG6 0x10F8 #define REG_FW_DBG7 0x10FC #define FW_KEY_MASK 0xffffff00 #define REG_CR_EXT 0x1100 +#define REG_FT1IMR 0x1138 +#define BIT_FS_H2C_CMD_OK_INT_EN BIT(25) +#define REG_FT1ISR 0x113c +#define BIT_FS_H2C_CMD_OK_INT BIT(25) #define REG_DDMA_CH0SA 0x1200 #define REG_DDMA_CH0DA 0x1204 #define REG_DDMA_CH0CTRL 0x1208 diff --git a/sys/contrib/dev/rtw88/regd.c b/sys/contrib/dev/rtw88/regd.c index 2f547cbcf6da..7f3b2ea3f2a5 100644 --- a/sys/contrib/dev/rtw88/regd.c +++ b/sys/contrib/dev/rtw88/regd.c @@ -70,16 +70,16 @@ static const struct rtw_regulatory rtw_reg_map[] = { COUNTRY_REGD_ENT("BY", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("BZ", RTW_REGD_FCC, RTW_REGD_FCC), COUNTRY_REGD_ENT("CA", RTW_REGD_IC, RTW_REGD_IC), - COUNTRY_REGD_ENT("CC", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("CC", RTW_REGD_ACMA, RTW_REGD_ACMA), COUNTRY_REGD_ENT("CD", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("CF", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("CG", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("CH", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("CI", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("CK", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("CL", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("CL", RTW_REGD_CHILE, RTW_REGD_CHILE), COUNTRY_REGD_ENT("CM", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("CN", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("CN", RTW_REGD_CN, RTW_REGD_CN), COUNTRY_REGD_ENT("CO", RTW_REGD_FCC, RTW_REGD_FCC), COUNTRY_REGD_ENT("CR", RTW_REGD_FCC, RTW_REGD_FCC), COUNTRY_REGD_ENT("CV", RTW_REGD_ETSI, RTW_REGD_ETSI), @@ -106,7 +106,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { COUNTRY_REGD_ENT("FO", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("FR", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("GA", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("GB", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("GB", RTW_REGD_UK, RTW_REGD_UK), COUNTRY_REGD_ENT("GD", RTW_REGD_FCC, RTW_REGD_FCC), COUNTRY_REGD_ENT("GE", RTW_REGD_ETSI, RTW_REGD_ETSI), COUNTRY_REGD_ENT("GF", RTW_REGD_ETSI, RTW_REGD_ETSI), @@ -214,7 +214,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { *** 12010 LINES SKIPPED *** From nobody Mon Feb 10 14:52:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xc5cbDz5mGdT; Mon, 10 Feb 2025 14:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xc3vb8z4LPX; Mon, 10 Feb 2025 14:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NcLr/S5xr54SCTIlY2X6oqFJoW3Px2wtH98gl6cJmk=; b=gagYfmHwyM270iEk5htpeW9/NWGyHu3mWQZuI55cmjKs+A6YWxUjFjSxxqUKjzhUjTBcQq 1lGkdZVt2pxcauuP4NkMtVpGBXgnls5Ca855pEJq4IVfn+Eiu+EBO9a87L3bqyDwHGrPU2 hQ/a37arVzeJZc9hR/NF0DJUo/YmI1UhJAdybAZkEzMqj4I2/fnKbm7dET5Ma3/h9EGqOe WJaj0vfeDvWRg7t2t3bX0UXzjs3EYBqakBRY8TMIWiaz+gkrBDH1tjaW0CH1ZD3YHo8Rr6 Ko1J6vG+AlH2l4KYJ9dsrtfcNbJBnTi4rVQPJEylTbaE7TlthVKO81Nm4Dot9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NcLr/S5xr54SCTIlY2X6oqFJoW3Px2wtH98gl6cJmk=; b=o+9BPxhrlVoCQo2xdMt4sTM0DjHMbR2SSv9DrVtf/r5c2B1SB5hMtfTmSJSw2vmyRkJ9HV DGc/qeFAqc4d9VPlB5sSdALXJxOqjFpwmuKTfXupHBij/sVD3o0hrwH3EIEIHRyFm9vF0E ftjbeSWs84/YSeZ+Yi3zPvfLvPf+EVWWpBONETrQvdAqKSaveE3zews76Z30FAa/fFkXeC TjwxP++3JwIQ2CzzIp3/FB0d/WmfLMkjUHNGS5LathyZR18ryg+qMJrSV6H3i6hCpK/0hQ 65lpgS4nzEjxFNMElTVhOn0tIlcrajsqtvICsQxpc/A1UAIXL5QZk99XGb4AyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199156; a=rsa-sha256; cv=none; b=wLmWFvc3gjcL/f58NhMpnYEK7awJ1+vsDP+PgcpaAV3F7cdaoR3gA5eHVhd8RjkbDK2Kkv yXhZBo8oCX2OuBSY9CA2w+01gxk20XVBA2F2FP8/FIjM0V1NBsvK2P6LCBiBqIOh9eODi3 b7YFJ9EPLh1bem4e97bGJIL/TRsu5YIbu8bYFk7UDFc960rNVC2iaj71nwUBsGAz1hpWKV dRLypsDjyU93aHpanqRz4TSMyYztWN1YNOS5iVbGBTfH2ekN/yG3BSQ3EOC05HeFH8mSeJ zDHxkjOQf3KpmyFR5izuSqimiDKrzOPiZTKp1m7/AoIEKkoKWQLDhlfNFX+yOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xb3sktzWgR; Mon, 10 Feb 2025 14:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqZbv027696; Mon, 10 Feb 2025 14:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqZRP027693; Mon, 10 Feb 2025 14:52:35 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:35 GMT Message-Id: <202502101452.51AEqZRP027693@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: 25017e9971d6 - stable/14 - LinuxKPI: firmware: change order filenames trying to load firmware List-Id: Commits to the stable branches 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: 25017e9971d6fe56618dcb5a5fb999f1c1d9e5fe Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=25017e9971d6fe56618dcb5a5fb999f1c1d9e5fe commit 25017e9971d6fe56618dcb5a5fb999f1c1d9e5fe Author: Bjoern A. Zeeb AuthorDate: 2024-11-20 13:12:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:08 +0000 LinuxKPI: firmware: change order filenames trying to load firmware Given we have the support in main and stable/14 to load plain firmware files from /boot/firmware/ make use of that. Switch the order to try the original unmangled filename and path first before trying any replacements. This reduces time and console noise (especially under bootverbose). Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D47682 (cherry picked from commit 30d2f84ef2cba12c67c62a9fe4e1d8e22cf27bf9) --- sys/compat/linuxkpi/common/src/linux_firmware.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_firmware.c b/sys/compat/linuxkpi/common/src/linux_firmware.c index 17da91381280..12658df5ce83 100644 --- a/sys/compat/linuxkpi/common/src/linux_firmware.c +++ b/sys/compat/linuxkpi/common/src/linux_firmware.c @@ -88,17 +88,17 @@ _linuxkpi_request_firmware(const char *fw_name, const struct linuxkpi_firmware * * way rather than adding more name-mangling-hacks here in the future * (though we could if needed). */ - /* (1) Try any name removed of path. */ - fwimg = strrchr(fw_name, '/'); - if (fwimg != NULL) - fwimg++; - if (fwimg == NULL || *fwimg == '\0') - fwimg = fw_name; - fbdfw = firmware_get_flags(fwimg, flags); - /* (2) Try the original name if we have not yet. */ - if (fbdfw == NULL && fwimg != fw_name) { - fwimg = fw_name; - fbdfw = firmware_get_flags(fwimg, flags); + /* (1) Try the original name. */ + fbdfw = firmware_get_flags(fw_name, flags); + /* (2) Try any name removed of path, if we have not yet. */ + if (fbdfw == NULL) { + fwimg = strrchr(fw_name, '/'); + if (fwimg != NULL) + fwimg++; + if (fwimg == NULL || *fwimg == '\0') + fwimg = fw_name; + if (fwimg != fw_name) + fbdfw = firmware_get_flags(fwimg, flags); } /* (3) Flatten '/', '.' and '-' to '_' and try with adjusted name. */ if (fbdfw == NULL && From nobody Mon Feb 10 14:52:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xd23DJz5mH1t; Mon, 10 Feb 2025 14:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xc4LZFz4LX7; Mon, 10 Feb 2025 14:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W4QnykDaOi8CJLW8OLhx9MiXvWWPyc9l3eVK4/3mNiU=; b=prGt2Js/G2D57DqdWyqZqgP98X3sW+CTu0Z2tZIbHTeyhcWCJgvGlNhcTI9P9sQzfcsB2F IzQjw3iL8t2od8hgBxJCVVOKJ3sM+UpzOj06WhZGDkfvaIlIEWPdxmN1NmD3954zpDUBPr hXyX55BBWsHptG1xzdB58wBVfWbSLNfw60VCItwHT9H6HjJ/IEAcwjTURzptwLidKbSjSx bNu2EFmazToLyGadNn9M5nhgU9gcupwmYGSowmVGshEMJze2ZEU+ZWjVLnrM/e1JbAQsC5 o1bJgFwax5JVjnZ+SsbqoS1oqVaGH8W9oNz7I0y50y+m4gChIarJpQgRNyKu4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W4QnykDaOi8CJLW8OLhx9MiXvWWPyc9l3eVK4/3mNiU=; b=DNfvUO1MKFyb2Mvv4fzINZlSwUa2eMBwc0B9kdG5ipPO8hDm+MmXLFymR9grNuLgYjIyfq wfpzi0w2jCkoF2AABZvwpY+M8x/83IILlfxXCXU81bJr6/d0j+KwkvBiX+0iEpkOfOih5j oZl+gCPJNlmdQm85BBeTG6ILhnYt1TCJbzcKNb1mYk0qGsqXoNw3QAzV0EWSAScW3ra5DO wMYPDjUeHQg/ahz1SEFYar1HRM/uoezX5m+aGA2k6Xscta2S2vhko9u8nL4TMzX87dMYmI MteyXu6hwbhZpXd6ONeozAtwLmnm+dxcUSce7pKAHMIs7pSXwJg+KM5qEbc4Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199156; a=rsa-sha256; cv=none; b=Ar5gETBpEIVNqfeEtYgw/RlcfJFXSokY4tAPQcBrbfAwwALSixMyef7iEYKxcPFBORjNZy k2LwpEmpzHXktlxooNvIjyE1YAY8DwdAThSQO22IryAZGPdvpfKlazf7UTUVFoWuxDrnUD MimVcPco7e2IkRCxw6wkKBfKbsMc8g+XyUfKwms5HRZjxImJ0DkMpZfvMQl2Rek8DLC1aN 9HKKfx0nnBTF4/US1uGmObIcnozhDXXOa93rfHiBzQY48I+hTjKvyBvj+m6+W/v2SEZQ1L LsavXelXVFE/byvYnMWURjFRgz7B6IVI5Q6GPuAL4klSDrpgId1vL0B9BoohJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xc38rKzWgS; Mon, 10 Feb 2025 14:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqa0p027746; Mon, 10 Feb 2025 14:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqasE027742; Mon, 10 Feb 2025 14:52:36 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:36 GMT Message-Id: <202502101452.51AEqasE027742@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: e7f646183711 - stable/14 - net80211: add missing reference for struct ieee80211_vht_mcs_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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e7f6461837115adba224d0b81d0a12e11cabee35 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e7f6461837115adba224d0b81d0a12e11cabee35 commit e7f6461837115adba224d0b81d0a12e11cabee35 Author: Bjoern A. Zeeb AuthorDate: 2024-11-28 23:28:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:08 +0000 net80211: add missing reference for struct ieee80211_vht_mcs_info Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D47836 (cherry picked from commit 4294f1cac15300046369d7e464ce96363839757c) --- sys/net80211/ieee80211.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 47e496bf42a1..fe5e1088e130 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -856,6 +856,7 @@ enum ieee80211_vht_mcs_support { IEEE80211_VHT_MCS_NOT_SUPPORTED = 3 /* not supported */ }; +/* 802.11ac-2013, 8.4.2.160.3 Supported VHT-MCS and NSS Set field */ struct ieee80211_vht_mcs_info { uint16_t rx_mcs_map; uint16_t rx_highest; From nobody Mon Feb 10 14:52:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xf6pHdz5mH1v; Mon, 10 Feb 2025 14:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xd5pczz4LZ6; Mon, 10 Feb 2025 14:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wiCAZ7k9pm1P/edVrBM8mRMAodfktrUJA9h771k1JRM=; b=qvznS0q47fmXZPkh+OpGlXbKwyPfXTZQbu80YQg9P1KuBRC565QTeGal3xLBGn+GQiUjD+ Vll6TjmxhPRi0aEMBIqYpNpRn9S455EPODga6vPqfooj4c+bbSw+5eA1CreMUKaSOWaAyB EITffAdbLzgXJc92g62aYE02Cdu3ipC7HYZt2o+tdOWyRpLs80wzleSYEWjAgVqfiagoLC h6hFV4yynPj/rmtxt+W697LS8mag0LIWtep3cxHui9YSL7paxOtMhiV+QpKXkl7EoLKd7V UJ9s8eQhkCmlLYEfAC/B79+hxyRgNEJwPK2V+zkMjIkmovn45ITptxje2XNMVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wiCAZ7k9pm1P/edVrBM8mRMAodfktrUJA9h771k1JRM=; b=Lg+SMFI3DDhKDQm11M8z8OdvqookLs69cDTYOjxe4NsV2xs2RoKSMKpfLvb/KMDt5GEuuT ktEDdDYYF7p5GsVEcOvlUBYDYFU/f2GDCe/5Rt2TF8K3a2zX9ke7z1T7epOBSICIf3V2Oi gDontclxw94WIMOOGyvC92O0XS1QO68Ov5B+mZ9TQnOlVA9MCVD5bP5nsik4DVaSw5Bjtu Jcd9RRuf3ZOuTlcZFjORbneA5i0vIqksBgA1pdtDASbq0S60wy8Uk8+iDIE2ig8VH4We+2 jUlYwgdTrd6Gnn0dQubE9V24Rj6cwvEhAkB6WjEZ8d3pnb1YPveLQqzapgeJkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199157; a=rsa-sha256; cv=none; b=GhBIhhb9HlGoEesqW7DMgIvT26ozbcf6UzZekaxcTSkx8r8PTM/WdFAQcsMzdLO27iA4Bw aVXA5E4P2UJmk7OrvB4Ic8vFmtg+edAcJaK2pBB5zkoKOtsu6If31mBJmPKCauiRALid4n KqecvkrcPGLtDDOZW5cTBmE49dnaQQvbOLT4FbhOpK4/jFvsVAz3fdlS/ng0as5ZZMBkz8 tiNy2JWI8Id8CsIRNCy8zS1lmYHOEJdpTcZt01phZ3YJpEMDUH8jvLGjyyzrdztJsrV+XK YBuDVHIMm00Pcqx8wm/WhkI4vmRh0xTKcOfMypY5VoH06pfA3w2EI8u47Hy/fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xd3cW1zXWF; Mon, 10 Feb 2025 14:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqbK9027783; Mon, 10 Feb 2025 14:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqb6E027780; Mon, 10 Feb 2025 14:52:37 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:37 GMT Message-Id: <202502101452.51AEqb6E027780@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: b6d4dc0b30f2 - stable/14 - net80211: name IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_{NONE -> NO160} List-Id: Commits to the stable branches 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: b6d4dc0b30f26b5f1add8b501ffb10fe5947a326 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b6d4dc0b30f26b5f1add8b501ffb10fe5947a326 commit b6d4dc0b30f26b5f1add8b501ffb10fe5947a326 Author: Bjoern A. Zeeb AuthorDate: 2024-11-28 23:37:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:08 +0000 net80211: name IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_{NONE -> NO160} IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_NONE is confusing as the field does indicate that the STA does not support 160 (or 80+80) Mhz. [802.11ac: Table 8-183v-Subfields of the VHT Capabilities Info field] All the other bits are related to the support of 160Mhz so make it clear that it does not mean that we do not support any VHT CHAN WIDTH but merely do not support the optional 160/80+80. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D47837 (cherry picked from commit 116102101a566ec8924b397c1523d362008fb35c) --- sys/net80211/ieee80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index fe5e1088e130..af411016a170 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -899,7 +899,7 @@ struct ieee80211_vht_operation { #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK 0x0000000C #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK_S 2 -#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_NONE 0 +#define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_NO160 0 #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160MHZ 1 #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160_80P80MHZ 2 #define IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_RESERVED 3 From nobody Mon Feb 10 14:52:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xh4JN5z5mGh4; Mon, 10 Feb 2025 14:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xf67Fnz4L9N; Mon, 10 Feb 2025 14:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFOYh5c1EVgzbgapVDTovFcMjpGDc5w2HcNWV7M79D0=; b=MUf3XNvcMg9DIMN2a+Gy3/ekt5CHuGEOtAw1IZ/3J3aCSmn0R1brsla48rPcHG+94bRRD/ dcfZotDYcFPymO7KBRmjT2Lif4WY2he5SKuvE7NskgbNb31KckORwlwWXxjrIL2/LmigoG yRTAB9ENQ7d2JQtZDsXw0H5EnazBIY7QQ4Il5BdfnnDOvYCycaJM6uSs+LdmrPdHwTLKJ7 C/OPUXJrbY+1JPNo6qh1QwwS43dWxwp8kdkXHSjmLZrkGxUXMVo9lSsU6lDrID5rNcnZDb aVUtYPNTNKXWAy//9dtktKsvQY+BOlIxntDteXdERn6OgD/BRxPSN+kY5/22uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFOYh5c1EVgzbgapVDTovFcMjpGDc5w2HcNWV7M79D0=; b=PJ/jhX4phePY0Qrz5mNy9m1Vc/2G1Qm7ivbrIldWI5BGfdCigElBU7QhGyad2gvO7pJ5pF jMM98q4B/2pEEIXhmEWQKhRXD2tiu25jp9TvvjYYW4T6qTEefUkf5t6mWUKINGLPFk6jZ3 /6GRdK3RnlrDqQZjUR8621rB+MTOfewfe0w7BUdVdQNH640mUMb40WNF6sQk2XDRYgfqDj VLbd1dv2MclI5aZYTAKvWOlovgKd9sNngFMQTX1sTUv27l8KNHpQCUdt5gCf0zpZ+6AWca SYiCMXfD7V+p4LsdUiZIdCsXuZR1+gcR/SD1Jj4THJhHMGBspx+rXEMMGU/kjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199158; a=rsa-sha256; cv=none; b=Hcj2aNH0LpI0s7x1ll/dDafcZtFARFG+AJl8fcUF5NXmoWf9kRjSw1KVfFJ1wLngs1ScFv 1TJQWW44BDUThHLE7F69tPymO1czn9p+RC9HJjDjIAm8+RRCkptezsRFZ4xUA/2QCjqa7v qU6ln+RJuBbUGu2b5bGMMLhvT9i2K95W0wyaNuvNgi38HTZKgGuCyTmZ2HLluFm50uXcFH 8kIH+vLUKdCJP1PSlpeOh/AU+ySKi7dt7Pv+YXGOPM4zR5aRn/v8myW/8Fu59fh4Lil0N6 sWduSNZ+KTXVtjzyH9bPuvB5mwswkv5op6HyFkoN0rB0wrDFv/Chieyl7VTLRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xf4P96zXJx; Mon, 10 Feb 2025 14:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqcpf027820; Mon, 10 Feb 2025 14:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqc1t027817; Mon, 10 Feb 2025 14:52:38 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:38 GMT Message-Id: <202502101452.51AEqc1t027817@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: 36ace2a923e1 - stable/14 - net80211: 11ac: add options to manage VHT STBC List-Id: Commits to the stable branches 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: 36ace2a923e1e1d51dc775d85c95001cb7e9430e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=36ace2a923e1e1d51dc775d85c95001cb7e9430e commit 36ace2a923e1e1d51dc775d85c95001cb7e9430e Author: Bjoern A. Zeeb AuthorDate: 2024-11-28 23:54:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:08 +0000 net80211: 11ac: add options to manage VHT STBC Add IEEE80211_FVHT_STBC_(TX|RX) flags to allow userspace to manage if STBC will be allowed for VHT RX/TX. For RX this will only allow us to turn it off but no fine grained control of the number of supported spatial streams. Introduce IEEE80211_FVHT_CHANWIDTH_MASK as a helper to make the spelling out of the IEEE80211_FVHT_MASK more readable. Update ifconfig to allow setting of these flags. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D47838 (cherry picked from commit 243f6925bf818a64f3c996c6a89fec6c8a6ff058) --- sbin/ifconfig/ifieee80211.c | 8 ++++++++ sys/net80211/ieee80211.c | 4 ++++ sys/net80211/ieee80211_ioctl.c | 20 ++++++++++++++++++++ sys/net80211/ieee80211_var.h | 12 ++++++++++-- sys/net80211/ieee80211_vht.c | 6 ++---- 5 files changed, 44 insertions(+), 6 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index c6875785f8f5..25de7fb13632 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -135,6 +135,8 @@ #define IEEE80211_FVHT_USEVHT80 0x000000004 /* CONF: Use VHT80 */ #define IEEE80211_FVHT_USEVHT160 0x000000008 /* CONF: Use VHT160 */ #define IEEE80211_FVHT_USEVHT80P80 0x000000010 /* CONF: Use VHT 80+80 */ +#define IEEE80211_FVHT_STBC_TX 0x00000020 /* CONF: STBC tx enabled */ +#define IEEE80211_FVHT_STBC_RX 0x00000040 /* CONF: STBC rx enabled */ #endif /* Helper macros unified. */ @@ -6038,6 +6040,12 @@ static struct cmd ieee80211_cmds[] = { DEF_CMD("-vht160", -IEEE80211_FVHT_USEVHT160, set80211vhtconf), DEF_CMD("vht80p80", IEEE80211_FVHT_USEVHT80P80, set80211vhtconf), DEF_CMD("-vht80p80", -IEEE80211_FVHT_USEVHT80P80, set80211vhtconf), + DEF_CMD("vhtstbctx", IEEE80211_FVHT_STBC_TX, set80211vhtconf), + DEF_CMD("-vhtstbctx", -IEEE80211_FVHT_STBC_TX, set80211vhtconf), + DEF_CMD("vhtstbcrx", IEEE80211_FVHT_STBC_RX, set80211vhtconf), + DEF_CMD("-vhtstbcrx", -IEEE80211_FVHT_STBC_RX, set80211vhtconf), + DEF_CMD("vhtstbc", (IEEE80211_FVHT_STBC_TX|IEEE80211_FVHT_STBC_RX), set80211vhtconf), + DEF_CMD("-vhtstbc", -(IEEE80211_FVHT_STBC_TX|IEEE80211_FVHT_STBC_RX), set80211vhtconf), DEF_CMD("rifs", 1, set80211rifs), DEF_CMD("-rifs", 0, set80211rifs), DEF_CMD("smps", IEEE80211_HTCAP_SMPS_ENA, set80211smps), diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 4afa3f3e9749..9fb424887834 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -710,6 +710,8 @@ ieee80211_vap_attach(struct ieee80211vap *vap, ifm_change_cb_t media_change, ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80); + ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_STBC_TX); + ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_STBC_RX); IEEE80211_UNLOCK(ic); return 1; @@ -767,6 +769,8 @@ ieee80211_vap_detach(struct ieee80211vap *vap) ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80); + ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_STBC_TX); + ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_STBC_RX); /* NB: this handles the bpfdetach done below */ ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_BPF); diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index d5b242b679d0..8432bf4bcbfd 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -3502,6 +3502,26 @@ ieee80211_ioctl_set80211(struct ieee80211vap *vap, u_long cmd, struct ieee80211r else ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_USEVHT80P80); + /* Check if we can do STBC TX/RX before changing the setting. */ + if ((ireq->i_val & IEEE80211_FVHT_STBC_TX) && + ((vap->iv_vht_cap.vht_cap_info & IEEE80211_VHTCAP_TXSTBC) == 0)) + return EOPNOTSUPP; + if ((ireq->i_val & IEEE80211_FVHT_STBC_RX) && + ((vap->iv_vht_cap.vht_cap_info & IEEE80211_VHTCAP_RXSTBC_MASK) == 0)) + return EOPNOTSUPP; + + /* TX */ + if (ireq->i_val & IEEE80211_FVHT_STBC_TX) + ieee80211_syncflag_vht(vap, IEEE80211_FVHT_STBC_TX); + else + ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_STBC_TX); + + /* RX */ + if (ireq->i_val & IEEE80211_FVHT_STBC_RX) + ieee80211_syncflag_vht(vap, IEEE80211_FVHT_STBC_RX); + else + ieee80211_syncflag_vht(vap, -IEEE80211_FVHT_STBC_RX); + error = ENETRESET; break; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index d41fb1e6559c..4c5dbcb7cfc0 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -733,12 +733,20 @@ MALLOC_DECLARE(M_80211_VAP); #define IEEE80211_FVHT_USEVHT80 0x000000004 /* CONF: Use VHT80 */ #define IEEE80211_FVHT_USEVHT160 0x000000008 /* CONF: Use VHT160 */ #define IEEE80211_FVHT_USEVHT80P80 0x000000010 /* CONF: Use VHT 80+80 */ -#define IEEE80211_FVHT_MASK \ +#define IEEE80211_FVHT_STBC_TX 0x00000020 /* CONF: STBC tx enabled */ +#define IEEE80211_FVHT_STBC_RX 0x00000040 /* CONF: STBC rx enabled */ + +#define IEEE80211_FVHT_CHANWIDTH_MASK \ (IEEE80211_FVHT_VHT | IEEE80211_FVHT_USEVHT40 | \ IEEE80211_FVHT_USEVHT80 | IEEE80211_FVHT_USEVHT160 | \ IEEE80211_FVHT_USEVHT80P80) + +#define IEEE80211_FVHT_MASK \ + (IEEE80211_FVHT_CHANWIDTH_MASK | \ + IEEE80211_FVHT_STBC_TX | IEEE80211_FVHT_STBC_RX) + #define IEEE80211_VFHT_BITS \ - "\20\1VHT\2VHT40\3VHT80\4VHT160\5VHT80P80" + "\20\1VHT\2VHT40\3VHT80\4VHT160\5VHT80P80\6STBC_TX\7STBC_RX" #define IEEE80211_COM_DETACHED 0x00000001 /* ieee80211_ifdetach called */ #define IEEE80211_COM_REF_ADD 0x00000002 /* add / remove reference */ diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 77a36a395d5c..6e7171631850 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -443,8 +443,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_RXSTBC_MASK); } val = MIN(val1, val2); - /* XXX For now, use the 11n config flag */ - if ((vap->iv_flags_ht & IEEE80211_FHT_STBC_TX) == 0) + if ((vap->iv_vht_flags & IEEE80211_FVHT_STBC_TX) == 0) val = 0; new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_TXSTBC); @@ -457,8 +456,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_TXSTBC); } val = MIN(val1, val2); - /* XXX For now, use the 11n config flag */ - if ((vap->iv_flags_ht & IEEE80211_FHT_STBC_RX) == 0) + if ((vap->iv_vht_flags & IEEE80211_FVHT_STBC_RX) == 0) val = 0; new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_RXSTBC_MASK); From nobody Mon Feb 10 14:52:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xk0F6Lz5mH20; Mon, 10 Feb 2025 14:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xh3BSjz4LV1; Mon, 10 Feb 2025 14:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4tPTL2rXr0qIMDVSphjjWYIRZ5w6uyYV3HUs/Ha8MM=; b=nKTjI3GFSlUuwPaqey4xlgCl2dFPeSCoXapNHZzVEXjP7Ao+ygrGpLTlLPFUWvqRiiw5iD QYI8occmn5sUe3zDI1XooXkUeXzF42CjBxmVXtlehBVx1bBwzUXAg/m3CA4muGpw+YySMK zuMPtKqLgJLgIadVwLY0yKChP1l1aWfkW+MuQGA9dibW6xpT6a7XmiA5jKQbe+c74UX/XE FcXTjz9DPBmdsKFvTgh+Cu7rQZ6yRwHbMw+uBd+nV+9umfa3Qk4VjEwncFX+LqWGeDyjXU XOkhGAyjjr9RFwX7IkVXdMPEZBjzHiTqzjAXwVTFLuqjAqkELpND0XxdtsVCoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4tPTL2rXr0qIMDVSphjjWYIRZ5w6uyYV3HUs/Ha8MM=; b=yjLxfAagA5IZjG9SN7AeKXgKj2k9SJufDsWTxPCvxMMR3T2hAOFpF0GZDl9sEX6LU8hgyw 46YQbDM6eZUxs45fVjyTOv/AKK+Ya/wasZZsDSA8rC/dPF5aCKoK7HXyVXE4XWCmpfN6YD 68dt9JEW6eJWsdlrV3dK05UeHLglwUyVLgHZRKivdqaCB6Na+4rNR6mvls6SN+lMQj8JPy nAIwUefTZhJPAxvtfqQOOFAq0Mb9SNnSM2WW6Alub7uuPaZ/QXs6dIGimmtwiCSv/maYYg /aXffTwm2AY+0QHjj4KP6FkJU5oyvhrv8XR9OPJpRqHy6oHDt20ZyLooshIk1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199160; a=rsa-sha256; cv=none; b=fWzttjKXpYQY8VvrhzLDdO+qifjZ/uD+PXWRtqAFY/E469DElHI7MltceX8Z9blZl4yO6D +oN3npGePSQqgrl6WBjxKgcPY0CaShHqz9Vwnpx/JEaF7/GwxVfzYDBLcygygxRN38MN+a BrFvPHNQ7EFM/B6+2vjawtKli7toxnCQKQwtW4MkCv9OPNDbflwjRf9a7V9pJNLy7PArvy t3i10/3tQwPMIDf7oSBkd4Achqo0yCR3i4cDnqV6uD3WwCeFyn4sKGhAalM/frmjeAygOn yWUJ3WbdYesK989X2VKhPOZeO7BbIZYWDIfi1GdLG1hiBcNOeS6eAZ7knye8qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xg5JLyzXJw; Mon, 10 Feb 2025 14:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqdMu027857; Mon, 10 Feb 2025 14:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqdAU027854; Mon, 10 Feb 2025 14:52:39 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:39 GMT Message-Id: <202502101452.51AEqdAU027854@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: c5978cd3e49a - stable/14 - net80211 / LinuxKPI 802.11: use enum ieee80211_sta_rx_bw for ni_chw List-Id: Commits to the stable branches 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: c5978cd3e49a462fe799ff745208b7b0f7ac7ab1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c5978cd3e49a462fe799ff745208b7b0f7ac7ab1 commit c5978cd3e49a462fe799ff745208b7b0f7ac7ab1 Author: Bjoern A. Zeeb AuthorDate: 2024-12-03 17:43:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:08 +0000 net80211 / LinuxKPI 802.11: use enum ieee80211_sta_rx_bw for ni_chw net80211 node ni_chw currently encodes the channel width as Mhz number. LinuxKPI 802.11 uses enum ieee80211_sta_rx_bw for the same. Rather than keeping the "20" and "40" throughout the code (eventually expanded to 80/160/320) switch them over to use the enum throughout. Once we get to 320Mhz channel widths we would otherwise also need to extend the uint8_t in struct ieee80211_node; making enum ieee80211_sta_rx_bw __packed allows us for lots more channel widths without breaking the KBI. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D47891 (cherry picked from commit ca389486a9599768e0ba69dca13c208020623083) (cherry picked from commit 2c8b0d6205f6f98855773e3a82640b50abb2f2f6) --- .../linuxkpi/common/include/linux/ieee80211.h | 8 ------ sys/dev/ath/ath_rate/sample/sample.c | 8 +++--- sys/dev/ath/if_ath_tx_ht.c | 6 ++-- sys/dev/mwl/if_mwl.c | 2 +- sys/net80211/ieee80211_ddb.c | 5 ++-- sys/net80211/ieee80211_ht.c | 18 ++++++------ sys/net80211/ieee80211_node.c | 7 +++-- sys/net80211/ieee80211_node.h | 33 +++++++++++++++++++++- sys/net80211/ieee80211_sta.c | 2 +- 9 files changed, 58 insertions(+), 31 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 865d85c6f7b7..58ebbcfe0097 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -387,14 +387,6 @@ enum ieee80211_sta_state { IEEE80211_STA_AUTHORIZED = 4, /* 802.1x */ }; -enum ieee80211_sta_rx_bw { - IEEE80211_STA_RX_BW_20, - IEEE80211_STA_RX_BW_40, - IEEE80211_STA_RX_BW_80, - IEEE80211_STA_RX_BW_160, - IEEE80211_STA_RX_BW_320, -}; - enum ieee80211_tx_info_flags { /* XXX TODO .. right shift numbers - not sure where that came from? */ IEEE80211_TX_CTL_AMPDU = BIT(0), diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c index 8e70699f708d..58eea8f64993 100644 --- a/sys/dev/ath/ath_rate/sample/sample.c +++ b/sys/dev/ath/ath_rate/sample/sample.c @@ -179,7 +179,7 @@ ath_rate_sample_find_min_pktlength(struct ath_softc *sc, const struct txschedule *sched = &sn->sched[rix0]; int max_pkt_length = 65530; // ATH_AGGR_MAXSIZE // Note: this may not be true in all cases; need to check? - int is_ht40 = (an->an_node.ni_chw == 40); + int is_ht40 = (an->an_node.ni_chw == IEEE80211_STA_RX_BW_40); // Note: not great, but good enough.. int idx = is_ht40 ? MCS_HT40 : MCS_HT20; @@ -973,7 +973,7 @@ update_stats(struct ath_softc *sc, struct ath_node *an, const int size_bin = size_to_bin(frame_size); const int size = bin_to_size(size_bin); int tt; - int is_ht40 = (an->an_node.ni_chw == 40); + int is_ht40 = (an->an_node.ni_chw == IEEE80211_STA_RX_BW_40); int pct; if (!IS_RATE_DEFINED(sn, rix0)) @@ -1359,7 +1359,7 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni) continue; printf(" %d %s/%d", dot11rate(rt, rix), dot11rate_label(rt, rix), calc_usecs_unicast_packet(sc, 1600, rix, 0,0, - (ni->ni_chw == 40))); + (ni->ni_chw == IEEE80211_STA_RX_BW_40))); } printf("\n"); } @@ -1390,7 +1390,7 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni) sn->stats[y][rix].perfect_tx_time = calc_usecs_unicast_packet(sc, size, rix, 0, 0, - (ni->ni_chw == 40)); + (ni->ni_chw == IEEE80211_STA_RX_BW_40)); sn->stats[y][rix].average_tx_time = sn->stats[y][rix].perfect_tx_time; } diff --git a/sys/dev/ath/if_ath_tx_ht.c b/sys/dev/ath/if_ath_tx_ht.c index ca69d4558d76..62299249bb4f 100644 --- a/sys/dev/ath/if_ath_tx_ht.c +++ b/sys/dev/ath/if_ath_tx_ht.c @@ -284,7 +284,7 @@ ath_tx_rate_fill_rcflags(struct ath_softc *sc, struct ath_buf *bf) if (IS_HT_RATE(rate)) { rc[i].flags |= ATH_RC_HT_FLAG; - if (ni->ni_chw == 40) + if (ni->ni_chw == IEEE80211_STA_RX_BW_40) rc[i].flags |= ATH_RC_CW40_FLAG; /* @@ -296,7 +296,7 @@ ath_tx_rate_fill_rcflags(struct ath_softc *sc, struct ath_buf *bf) * and doesn't return the fractional part, so * we are always "out" by some amount. */ - if (ni->ni_chw == 40 && + if (ni->ni_chw == IEEE80211_STA_RX_BW_40 && ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI40 && ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40 && vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40 && @@ -304,7 +304,7 @@ ath_tx_rate_fill_rcflags(struct ath_softc *sc, struct ath_buf *bf) rc[i].flags |= ATH_RC_SGI_FLAG; } - if (ni->ni_chw == 20 && + if (ni->ni_chw == IEEE80211_STA_RX_BW_20 && ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI20 && ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20 && vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20 && diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index e0144a13e967..2d9b146c9f60 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -4021,7 +4021,7 @@ mkpeerinfo(MWL_HAL_PEERINFO *pi, const struct ieee80211_node *ni) pi->HTCapabilitiesInfo &= ~IEEE80211_HTCAP_SHORTGI40; if ((vap->iv_flags_ht & IEEE80211_FHT_SHORTGI20) == 0) pi->HTCapabilitiesInfo &= ~IEEE80211_HTCAP_SHORTGI20; - if (ni->ni_chw != 40) + if (ni->ni_chw != IEEE80211_STA_RX_BW_40) pi->HTCapabilitiesInfo &= ~IEEE80211_HTCAP_CHWIDTH40; } return pi; diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index eca893fa6810..05b370eafa38 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -294,8 +294,9 @@ _db_show_sta(const struct ieee80211_node *ni) db_printf("\thtcap %b htparam 0x%x htctlchan %u ht2ndchan %u\n", ni->ni_htcap, IEEE80211_HTCAP_BITS, ni->ni_htparam, ni->ni_htctlchan, ni->ni_ht2ndchan); - db_printf("\thtopmode 0x%x htstbc 0x%x chw %u\n", - ni->ni_htopmode, ni->ni_htstbc, ni->ni_chw); + db_printf("\thtopmode 0x%x htstbc 0x%x chw %d (%s)\n", + ni->ni_htopmode, ni->ni_htstbc, + ni->ni_chw, ieee80211_ni_chw_to_str(ni->ni_chw)); /* XXX ampdu state */ for (i = 0; i < WME_NUM_TID; i++) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index cb981014fdb9..5da404a92120 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1477,7 +1477,7 @@ ieee80211_ht_wds_init(struct ieee80211_node *ni) ni->ni_htcap |= IEEE80211_HTCAP_SHORTGI20; if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { ni->ni_htcap |= IEEE80211_HTCAP_CHWIDTH40; - ni->ni_chw = 40; + ni->ni_chw = IEEE80211_STA_RX_BW_40; if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan)) ni->ni_ht2ndchan = IEEE80211_HTINFO_2NDCHAN_ABOVE; else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan)) @@ -1485,7 +1485,7 @@ ieee80211_ht_wds_init(struct ieee80211_node *ni) if (vap->iv_flags_ht & IEEE80211_FHT_SHORTGI40) ni->ni_htcap |= IEEE80211_HTCAP_SHORTGI40; } else { - ni->ni_chw = 20; + ni->ni_chw = IEEE80211_STA_RX_BW_20; ni->ni_ht2ndchan = IEEE80211_HTINFO_2NDCHAN_NONE; } ni->ni_htctlchan = ni->ni_chan->ic_ieee; @@ -1581,7 +1581,7 @@ ieee80211_ht_node_join(struct ieee80211_node *ni) if (ni->ni_flags & IEEE80211_NODE_HT) { vap->iv_ht_sta_assoc++; - if (ni->ni_chw == 40) + if (ni->ni_chw == IEEE80211_STA_RX_BW_40) vap->iv_ht40_sta_assoc++; } htinfo_update(vap); @@ -1599,7 +1599,7 @@ ieee80211_ht_node_leave(struct ieee80211_node *ni) if (ni->ni_flags & IEEE80211_NODE_HT) { vap->iv_ht_sta_assoc--; - if (ni->ni_chw == 40) + if (ni->ni_chw == IEEE80211_STA_RX_BW_40) vap->iv_ht40_sta_assoc--; } htinfo_update(vap); @@ -1827,7 +1827,8 @@ htinfo_update_chw(struct ieee80211_node *ni, int htflags, int vhtflags) done: /* update node's (11n) tx channel width */ - ni->ni_chw = IEEE80211_IS_CHAN_HT40(ni->ni_chan)? 40 : 20; + ni->ni_chw = IEEE80211_IS_CHAN_HT40(ni->ni_chan) ? + IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20; return (ret); } @@ -2603,11 +2604,12 @@ ht_recv_action_ht_txchwidth(struct ieee80211_node *ni, { int chw; - chw = (frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040) ? 40 : 20; + chw = (frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040) ? + IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20; IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, - "%s: HT txchwidth, width %d%s", - __func__, chw, ni->ni_chw != chw ? "*" : ""); + "%s: HT txchwidth, width %d%s (%s)", __func__, + chw, ni->ni_chw != chw ? "*" : "", ieee80211_ni_chw_to_str(chw)); if (chw != ni->ni_chw) { /* XXX does this need to change the ht40 station count? */ ni->ni_chw = chw; diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 8f8dc5f378b8..17ddc8533e41 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2672,8 +2672,9 @@ ieee80211_dump_node(struct ieee80211_node_table *nt __unused, printf("\thtcap %x htparam %x htctlchan %u ht2ndchan %u\n", ni->ni_htcap, ni->ni_htparam, ni->ni_htctlchan, ni->ni_ht2ndchan); - printf("\thtopmode %x htstbc %x htchw %u\n", - ni->ni_htopmode, ni->ni_htstbc, ni->ni_chw); + printf("\thtopmode %x htstbc %x htchw %d (%s)\n", + ni->ni_htopmode, ni->ni_htstbc, + ni->ni_chw, ieee80211_ni_chw_to_str(ni->ni_chw)); printf("\tvhtcap %x freq1 %d freq2 %d vhtbasicmcs %x\n", ni->ni_vhtcap, (int) ni->ni_vht_chan1, (int) ni->ni_vht_chan2, (int) ni->ni_vht_basicmcs); @@ -2831,7 +2832,7 @@ ieee80211_node_join(struct ieee80211_node *ni, int resp) ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", /* XXX update for VHT string */ ni->ni_flags & IEEE80211_NODE_HT ? - (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", + (ni->ni_chw == IEEE80211_STA_RX_BW_40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", ni->ni_flags & IEEE80211_NODE_AMSDU ? " (+AMSDU)" : "", ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 954e8e03563f..0039c743544c 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -108,6 +108,37 @@ enum ieee80211_mesh_mlstate { #define IEEE80211_MESH_MLSTATE_BITS \ "\20\1IDLE\2OPENSNT\2OPENRCV\3CONFIRMRCV\4ESTABLISHED\5HOLDING" +/* + * This structure is shared with LinuxKPI 802.11 code describing up-to + * which channel width the station can receive. + * Rather than using hardcoded MHz values for the channel width use an enum with + * flags. This allows us to keep the uint8_t slot for ni_chw in + * struct ieee80211_node and means we do not have to sync to the value for + * LinuxKPI. + * + * NB: BW_20 needs to 0 and values need to be sorted! Cannot make it + * bitfield-alike for use with %b. + */ +enum ieee80211_sta_rx_bw { + IEEE80211_STA_RX_BW_20 = 0x00, + IEEE80211_STA_RX_BW_40, + IEEE80211_STA_RX_BW_80, + IEEE80211_STA_RX_BW_160, + IEEE80211_STA_RX_BW_320, +} __packed; + +static inline const char * +ieee80211_ni_chw_to_str(enum ieee80211_sta_rx_bw bw) +{ + switch (bw) { + case IEEE80211_STA_RX_BW_20: return ("BW_20"); + case IEEE80211_STA_RX_BW_40: return ("BW_40"); + case IEEE80211_STA_RX_BW_80: return ("BW_80"); + case IEEE80211_STA_RX_BW_160: return ("BW_160"); + case IEEE80211_STA_RX_BW_320: return ("BW_320"); + } +} + /* * Node specific information. Note that drivers are expected * to derive from this structure to add device-specific per-node @@ -222,7 +253,7 @@ struct ieee80211_node { uint8_t ni_ht2ndchan; /* HT 2nd channel */ uint8_t ni_htopmode; /* HT operating mode */ uint8_t ni_htstbc; /* HT */ - uint8_t ni_chw; /* negotiated channel width */ + enum ieee80211_sta_rx_bw ni_chw; /* negotiated channel width */ struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */ struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_TID]; struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID]; diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index bb3e6fb86a9d..63b418a3ac34 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -1942,7 +1942,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, vap->iv_flags&IEEE80211_F_USEPROT ? ", protection" : "", ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", ni->ni_flags & IEEE80211_NODE_HT ? - (ni->ni_chw == 40 ? ", HT40" : ", HT20") : "", + (ni->ni_chw == IEEE80211_STA_RX_BW_40 ? ", HT40" : ", HT20") : "", ni->ni_flags & IEEE80211_NODE_AMPDU ? " (+AMPDU)" : "", ni->ni_flags & IEEE80211_NODE_AMSDU ? " (+AMSDU)" : "", ni->ni_flags & IEEE80211_NODE_MIMO_RTS ? " (+SMPS-DYN)" : From nobody Mon Feb 10 14:52:41 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xl0Bd4z5mH23; Mon, 10 Feb 2025 14:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xj72NYz4LgG; Mon, 10 Feb 2025 14:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQ4cxHWKpKDb+i7Bu1Xnh6xox2NeLXGCCr2spS42Od8=; b=aG2Q1W95FQ7akvENUphTHprWZsvdz7zA3CS9ED9LDMwtdFCdr9wHkaf3/wCG/8kCRFPyZU LUxA4UsLzAufWd5PAgPbuOA7YLvwh0rZH007tKJzH1108C7NkWlJ14CDvtGJjyBGBrFyfe E48I/lTPsurTwflYAZRm/GPvVp/bZdxsizopRTgh7l9cmkZXinbJB7BfAI0FMoOlp5pQFB /+5lOwtTmgptfQkmohL5F9YyRfqRYFSJilclaFTz3y1OZo3YYnvAezm0Z+Tu4YOzaayom7 +FoT7JyjARFL/NpeMKVFifgp94Zf+KAr9gyZvpi1lGerzmdWELwHQldPVpd3bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQ4cxHWKpKDb+i7Bu1Xnh6xox2NeLXGCCr2spS42Od8=; b=puyCaCVTviEquoCzjkc0PD97slPsq+iaXAFL7rRy6vHVqHvEgXwofHMndAgPu4CFEXA4W2 3cL3hYdzmrTn3/BKH5VFSHIbLyWcpP0B+YLix6Xbpt+FLQEUqVxfiV2tCtnXhu3Y+CrXvx qw0fu/EtYnAFrAV9QHU2RO//KkLAMSKVKG89P20z2wvJnMkV+t5wb1KfCklbvMH9QtUjj6 h1zwdOHw/TEQuv7t6liBSYdvRIMdEWeq6tKXExFAF6VA0LhBZfob4lpfskaFVKrRgT76uf zr90Q3s7826sxWjMJ4hTI/dmi+A6RIbAKHNFRqxvD+FGwn33iaW5JlQwOr1UgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199162; a=rsa-sha256; cv=none; b=mhit5ln2TGhmo3AfftHvhPCiHmB7VDP9+qwtsBX7Z9Ru4eQR68dk76NkmrIx40e/sokuhi BMo0NsuRrq2o5J/VQaWHACE4xOMfXH3OEqrQB/5jbBvjEvl+L4P2xrZ5tqKeXFVSkbopjq ac7bMiMgOfoRE7LchcCLoRPIhWlw0d0LApoAtrP4ZGyeKWceyc1XqCjPSU0LJrdgYug6sH tja0BOs/RWCAU5Obj4GqbAtHcUlwYI6R4C7ISHGE8dxbYj7eEiTsD6mT2v7U5TSDFMgyTs c9bep9YZJKdTC/DOVuOuXc+aRWTPlNbjrJ1BVZY+mAA5e6JzL5BWVmu7KfTCqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xj66K9zX78; Mon, 10 Feb 2025 14:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqfDi027935; Mon, 10 Feb 2025 14:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqfdY027931; Mon, 10 Feb 2025 14:52:41 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:41 GMT Message-Id: <202502101452.51AEqfdY027931@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: 1a083d59b61a - stable/14 - net80211: HT: check for feature support in ht_recv_action_ht_txchwidth() List-Id: Commits to the stable branches 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: 1a083d59b61a687c865f16b9bba4820e820bde2a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1a083d59b61a687c865f16b9bba4820e820bde2a commit 1a083d59b61a687c865f16b9bba4820e820bde2a Author: Bjoern A. Zeeb AuthorDate: 2024-12-01 20:16:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: HT: check for feature support in ht_recv_action_ht_txchwidth() ht_recv_action_ht_txchwidth() can blindly change the channel width to 40 Mhz whether or not that is supported. If 20/40 is not supported there is nothing to do as the channel width cannot change in that case. While here mark unused arguments with __unused. Sponosred by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D47857 (cherry picked from commit 30e8252353d95cc77f787ef784942a551d3e0567) --- sys/net80211/ieee80211_ht.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 5da404a92120..e7b3afe17fdc 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -2599,11 +2599,15 @@ ht_recv_action_ba_delba(struct ieee80211_node *ni, static int ht_recv_action_ht_txchwidth(struct ieee80211_node *ni, - const struct ieee80211_frame *wh, - const uint8_t *frm, const uint8_t *efrm) + const struct ieee80211_frame *wh __unused, + const uint8_t *frm, const uint8_t *efrm __unused) { int chw; + /* If 20/40 is not supported the chw cannot change. */ + if ((ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) == 0) + return (0); + chw = (frm[2] == IEEE80211_A_HT_TXCHWIDTH_2040) ? IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20; From nobody Mon Feb 10 14:52:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xk2mFJz5mH22; Mon, 10 Feb 2025 14:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xh6DxFz4L9W; Mon, 10 Feb 2025 14:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GayNcW2NiMAGihxp+ojrjlVbNEFOIWyzGdDa7ouHCIE=; b=k3tdyfA2dtnzQziZIbfHLOo0EJMOhOwJtlqWIkwmjHZMpYMWSovR4wGRaXUmC6HEizLmCD k4gQ3xWFXbxslfSLgSU/aLwQzS8/4yy6jqXkEwUzXPIotZj8JjWEU89u4k+4k1jHJY3gPw fDPB+XEEehDFdKyue1qNbRWOax1yIW2wfpC5JdAlwAcJPgDkgmIJ6Z5/9MSuzzd130zaky A459KTFb5Dp+bEHG3z91BTzx/Pk8Lg+haWaurfwwHVvTvyO/PnDLfhy8jUKMnq4JvC2s/i sFNk21RnL6IwGR/Yus8SelB6q/SBtOQkOFwDDilreNpM2SMePQ5+SawAJL7BUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GayNcW2NiMAGihxp+ojrjlVbNEFOIWyzGdDa7ouHCIE=; b=VJDVNJ527yMEKGUoYdwCJB0XBzyj9J8M9EaRdP/IoM8Tmif+QI12OWqeD3MRBLvW7Pts2I h3BzXn7VIwqeLLEWx10YID4MSjICgavuJrGtfPAbc656o7hZpsVEtW8kwLUzPr63LHObQp uiBiReY0sECnmoDNmscRg0DT8ahPPVXXa4xOhXagbw+LlF/UJPVsjb3ZljCwx1NRlFcd4s f/IjyVqgu15S4JhBf1vzysnAcvVJ00VEDdQv16lQBhUMrK7oRx0+Mr/+Oobgim53xOhHsm oj/Q62Mxyj6TxJP+XkNp7o91pjkfVVif2oMaivzueYRwtDQe7Kx7Ub8EHDj3zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199160; a=rsa-sha256; cv=none; b=y1G6yiR2Y2FPBnMzZXvqlI2U0h5P6QYOQMkEPpRSqaGIHg22If10Hq8Kr6H4WT469Y3N0/ qA2gW+DAx1ohpRS5MG8De+z/8htamXqnlpGjQb2Y1h07NoJVr6iem/q15qSI8tSQeXEWeK kCH0PQjCNtw1YaGQzWqlYWx+ka3PbblnHho0JXIUlzJqbeeINZ+MqiFl9Xo7fSmer4ap6l rVKMJalb+BCebG74yvqE1sJKR8eCxHu0jK0oyfSoME5ZR7z1w5kH/VHEJ2TepQhmZU6XGu 751fKKu99KIMRkVrw4qBnroFMB6o8dkuhfX1+AvImKCscKZqki3kowCoiUKzmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xh5bxgzX77; Mon, 10 Feb 2025 14:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqe0w027894; Mon, 10 Feb 2025 14:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqeUU027891; Mon, 10 Feb 2025 14:52:40 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:40 GMT Message-Id: <202502101452.51AEqeUU027891@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: 1a472e9357f3 - stable/14 - net80211: HT: add missing bit descriptions for IEEE80211_AGGR_BITS List-Id: Commits to the stable branches 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: 1a472e9357f392644a1ee0e24adeb78e8cf66c20 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1a472e9357f392644a1ee0e24adeb78e8cf66c20 commit 1a472e9357f392644a1ee0e24adeb78e8cf66c20 Author: Bjoern A. Zeeb AuthorDate: 2024-12-01 20:22:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:08 +0000 net80211: HT: add missing bit descriptions for IEEE80211_AGGR_BITS The print mask for IEEE80211_AGGR_BITS is missing three fields. Add them for completness. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D47858 (cherry picked from commit 8437d7d6a4d6827ccb78c06341c6e3d847da44dd) --- sys/net80211/ieee80211_ht.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ht.h b/sys/net80211/ieee80211_ht.h index 6ba791065d15..3f7b430ea6ce 100644 --- a/sys/net80211/ieee80211_ht.h +++ b/sys/net80211/ieee80211_ht.h @@ -87,7 +87,8 @@ struct ieee80211_tx_ampdu { (IEEE80211_AGGR_RUNNING|IEEE80211_AGGR_XCHGPEND|IEEE80211_AGGR_NAK)) != 0) #define IEEE80211_AGGR_BITS \ - "\20\1IMMEDIATE\2XCHGPEND\3RUNNING\4SETUP\5NAK" + "\20\1IMMEDIATE\2XCHGPEND\3RUNNING\4SETUP\5NAK" \ + "\6BARPEND\7WAITRX\10AMSDU" /* * Traffic estimator support. We estimate packets/sec for From nobody Mon Feb 10 14:52:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xm4Vxpz5mH7M; Mon, 10 Feb 2025 14:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xl14dbz4LjT; Mon, 10 Feb 2025 14:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jeTjsK0HnA5pP5K870S8zd4cLdOqz5iGlGRai2YFp9s=; b=wKwu82/cKhzdwzCHZRKPZwjcbtTTs8PtUjDknxHYw+UlFgfIG7186cpbr4By2VSTh97HTi Zx+uz+5K4tpqDSxeBjvnLsjQ9dRp9isVZ4DkssCQ+RLUoaOKBSTpjFRXfW7CsSDVSCJZ3c 3Y/vdwI0rQfnolBFa+ZFdKDQSLNUzJoygtHyUmXpsWq/ISBUgxFTSO+vdTljWnH2PA8Clq PdyjrlkAkQrVVJnrqu1UnBY1R1NNvn7tN5fsCj/Fr+bcnDyyHtyZuzufzHmdnNP0yBZ6pY SOQnGgwpCRxAbEMGGlZ2Rn4M59Os2+Kqhfkaf26r4mbcBipCphukoGshsl1BDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jeTjsK0HnA5pP5K870S8zd4cLdOqz5iGlGRai2YFp9s=; b=JB5f8DSn6HABRUtmfqcjpSyaz0Y2EwMQbvcpnJlAa4zBlrC/A2K43tt1qyiApjVAqnEqY2 nndvIxcMXVJyg1YovVXN75e6/NgTqED+A158Qy67WApceJyQbUUwnnkab5NQrqymh38Ck/ Snka1BWmsIwruFnhmDZ+UYs1bKDwDtsOrjontaTWttYyNC2mgD6KSjM05YBqRvjxvCeslu YDXOWjO1othHGKUF4qrYbcQW23Zv1gLUEpP6esIILrrVQnSaqXEwadV3tG/R7SJ2cj2cCX Ins2kL/dKOuueSO593mO22kT4jSOLKCAEWUaMWST/W2bIv5P8MmHfhRu55XC9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199163; a=rsa-sha256; cv=none; b=U/s/6y7XYtPMcgFV6o1lb+N4hFoPFhOsjXL9OvnuUiCqfgAXJFx7MXM9OnqLUHEIBbgjvX heaWbvFmvyoQSg8aH5nHH5ThlaUUeeDgW+UoN2LcI05EnvlHZrzM/vWzcMgRMszZRCHjLq OPYjopfRBFIBNRwcXzbw/MdDdgWJEI0Vkdtl/IsePodOCHeN4D2JXRUTPUoHEvEQTvpclB 3j90pQN7buJXzTAOpj7q+vyv4vzXYnacr930r5rGqyBSvsPZkRVZU8CVIMxTgBGNQv0EuW 4BsUBRUlB4YxrUpKnMh4Bl5FPcEXIfZPT+Yx6GHnHjcCYqqKCy4RbmoMvofnwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xk71RBzXWG; Mon, 10 Feb 2025 14:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqgnv027973; Mon, 10 Feb 2025 14:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqg3x027970; Mon, 10 Feb 2025 14:52:42 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:42 GMT Message-Id: <202502101452.51AEqg3x027970@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: 594d6c7141b7 - stable/14 - net80211: correct typo s/Insure/Ensure/ List-Id: Commits to the stable branches 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: 594d6c7141b7f5a7845044982b946479a6c5fd27 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=594d6c7141b7f5a7845044982b946479a6c5fd27 commit 594d6c7141b7f5a7845044982b946479a6c5fd27 Author: Bjoern A. Zeeb AuthorDate: 2025-01-07 11:56:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: correct typo s/Insure/Ensure/ No functional changes. Sposnored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D48358 (cherry picked from commit e6d40f90110ad8026f1af3fa68f836463936ea78) --- sys/net80211/ieee80211_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 6a1182b52480..bdbe52720f6e 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -666,7 +666,7 @@ ieee80211_crypto_decap(struct ieee80211_node *ni, struct mbuf *m, int hdrlen, k = &ni->ni_ucastkey; /* - * Insure crypto header is contiguous and long enough for all + * Ensure crypto header is contiguous and long enough for all * decap work. */ cip = k->wk_cipher; From nobody Mon Feb 10 14:52:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xp6FGmz5mHBK; Mon, 10 Feb 2025 14:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xp2Gkvz4LSd; Mon, 10 Feb 2025 14:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0cFa1tI7geMSu57dMRVLPiJza3ndRKsqYqpCSodDlw0=; b=pd7BeJEX1bVUZy2dKXR33Sxirqyvh/AFHz/AbXDxRP0cxkv7aJOe+kS/vBPmyszVM+wntD JY5fbaqmunXU10TxNtJd0/g0SgJx7Q3WChC2VnGLtcykE3s8xt6K+Xmdn+HEYIZi35rHvx 1fC5iBNFfRvulnJtdGfBNLW2PwSBvqGIIHamPPvDYn6dAizpY8j4waLWHM91kkR1z4402I F/wD5G3Rui7nnkf3d3+lfkyX65ca+2M6ib40XWVhDEH2qMZDL1iSY/3PSrWztUWja0yiKl b7KDfMDQnuy4YrhKXMMM56qDq2COkxFGDB9PysYgukbEUOu4yQmt6U9dRzGpIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0cFa1tI7geMSu57dMRVLPiJza3ndRKsqYqpCSodDlw0=; b=g/FBIl9J6CRh6MZK0hzeTC5t7dWSVyTT4ChVkWHRjvkeuegw0nzF6yiRq92F0LQTybsQZX 8Wq+oRH193jYew3tqJDRNqHkHNTJeyXIVIDrN/3ssXqzeQ/urXUkJl4oVLI5NyPdfSSN6t iS5h9xUcHHAyfTUXFCZzJYMczSmHt66DgixblyJwkNiN+WBNN1bZiYDZWyt+fztNfQVy/X r1TsSOiioeR3CTVGsQ9vkzcc5OAYdt+Dm6T14ap2FNodUae8zcIsv9uLxC7nk7BDC4kbhd I1ndpr89YIfJXUF4VmK7tpFOmkJpww1tSYwns3/bJ1Jt8vlbvOzxXCkaT5Pcmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199166; a=rsa-sha256; cv=none; b=NTBgF2aXwARLpW1qrxML38bxtScKsHf4KkxqDxeyH9/+KBLo9pIG/j1ZuTj/UxuzL05d+N VjWlQXLTIUY+AvKgYdoRwAgI0t7irasmYzFVkyH7Dh05HsNJ0mV3ktuRJ3jpDjH2uK3cch LC0JsQG6rOPDXDI7fUp0U4z4wj8l5oi5sPDdkmt1LpsouSlKRkEkQfaBdKjQiVkubm6kGK faeJmLWbSrwodTamdwjd0NPuNgf5WmuVbXv7Zb3Ya/Cd7APvlf1ACeclPYu3n6z2gZ7hQy voJVHhd10D4ZHqfCspgZsbYZGtbVgHfpU1138QGd+BoGGhNUAKiauzxPO2P31g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xp1nWrzXWr; Mon, 10 Feb 2025 14:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqkum028082; Mon, 10 Feb 2025 14:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqk33028079; Mon, 10 Feb 2025 14:52:46 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:46 GMT Message-Id: <202502101452.51AEqk33028079@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: 4eaf978df5e1 - stable/14 - net80211: add IEEE80211_IS_LOCKED() List-Id: Commits to the stable branches 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: 4eaf978df5e11c70c6319467fedadc7a2b27e76c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4eaf978df5e11c70c6319467fedadc7a2b27e76c commit 4eaf978df5e11c70c6319467fedadc7a2b27e76c Author: Bjoern A. Zeeb AuthorDate: 2025-01-15 22:50:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: add IEEE80211_IS_LOCKED() When trying to sort out a teardown locking problem (downcall in the driver can sleep) I found that the fan-out tree was getting too big to fix net80211 locking per-se for this while working on entirely different problems. Add IEEE80211_IS_LOCKED() so the driver can check and un-/re-lock as necessary (as we do in other cases already) to avoid panics on debug kernels left and right. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48475 (cherry picked from commit 054c5ddf587a7a0c430cf64dbf100b718eafdcc5) --- sys/net80211/ieee80211_freebsd.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index ec017bb21ec4..e21364884e15 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -73,6 +73,8 @@ typedef struct { mtx_assert(IEEE80211_LOCK_OBJ(_ic), MA_OWNED) #define IEEE80211_UNLOCK_ASSERT(_ic) \ mtx_assert(IEEE80211_LOCK_OBJ(_ic), MA_NOTOWNED) +#define IEEE80211_IS_LOCKED(_ic) \ + mtx_owned(IEEE80211_LOCK_OBJ(_ic)) /* * Transmit lock. From nobody Mon Feb 10 14:52:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xp2Nybz5mGkV; Mon, 10 Feb 2025 14:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xn4yjDz4Ldg; Mon, 10 Feb 2025 14:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaM78vMRJaR5H7ngMmbCvc4fglbXunOXMiuMmqu9U9U=; b=UvqpokCm3oiY5VePaBvJ/XGhK9yGmehSeKfSbKNxT0+czhd2bAZ975bucsEnj83Et9NLoN Hh9+Mj2tc5jSFwyHNXrUm79xBIYVEUgH0S5nfTQgVtu6710JpatD7JdVbNSGirqAezWMA+ FLHPgr6kQLN8yKdYVXZPD6yS8ScFaPgp7J+ycOY5IFV8ll30P3Y0gTCPHaHNIj7VqLmmYp ercroIJHB+WiVcSUpaSWfgXifRpK12InTRgsA0AfUAYg9/c9sqDEJvSZyp70HFolHnZSk/ tK7csD+pvhHpsLAI2uNd9gSRmq0WWc5d3S9h3OWEl2mDs/sDG95ur6BUYpzBcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaM78vMRJaR5H7ngMmbCvc4fglbXunOXMiuMmqu9U9U=; b=Kz+zcobNG6d47YBAOGcB5BsVNkZbxb5b4V53zJcUGYcvDOu9a/1XMs7prLlMkUDiOXaQ/m +XdjIjOScLXiiTZh5+DBHjbWT2OCCTjbsBUyrAdVZuC8G93SF/hnlcTOOoIYiM6NFmhzhk Pia5nZ87RvyeOFounDugeG9SNDisLll8q6sWCzsQLZhdqCw+XBbQU4CIhu+pvHy85Tuml+ DURXwamgjpt39Xaz2ganJqRixqD/sIhQh+3ozhNfkKCKOsrKq4ni+JqaDsuKWjZe443DvY IZrpqMk+VS4sR9ALMfUJ73B7Q9ZxrDc0JQbm/rKonG4+8RcNVofVkzz4mSs05g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199165; a=rsa-sha256; cv=none; b=cKHDat5IO/+KZmI1OIPvgnEZNh34TJtJEjEpzYTZzrCR1ey7hZHKee5gnER8IWAwZVgIzH A+MlhsyVA75dBtI1PSWNOEO6DmKZd9Oe12UoRpeRuiF1VYFetnnWB+dA4of+ynSPpUck+O sp2EEMmGCBxA5unUAntGXrK/q4KqMlTZLCOpIImvo7E6Gjne+phfNCfPtRfNtxfNa0twOx gnF9v9utId4vNVfDKT4nOfBBYmlHJLtpd5IAvU/8rrkg845JkLgO1tYqSVw9A44Kx1xBuI eL+VCoerQJ3IOMnGN8eLZtshPnylxkcc13KvAQsRGON2fY3GuTmTHBHJzoOj8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xn11fGzWgV; Mon, 10 Feb 2025 14:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqjZJ028045; Mon, 10 Feb 2025 14:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqj8c028042; Mon, 10 Feb 2025 14:52:45 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:45 GMT Message-Id: <202502101452.51AEqj8c028042@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: 4d027e53be06 - stable/14 - net80211: (v)ht: use macros at hand List-Id: Commits to the stable branches 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: 4d027e53be06ceae1a6923453fd59f596e31cf7d Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4d027e53be06ceae1a6923453fd59f596e31cf7d commit 4d027e53be06ceae1a6923453fd59f596e31cf7d Author: Bjoern A. Zeeb AuthorDate: 2025-01-04 08:06:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: (v)ht: use macros at hand Rather than duplicating the manual logic here and leaving a comment, use the self-explanatory macros we already have. No functional changes intended. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48359 (cherry picked from commit 5fdc4824a5e2646a07c0638eca9f5c81b0b85fd5) --- sys/net80211/ieee80211_ht.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index e7b3afe17fdc..821c45c9f4e7 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1938,9 +1938,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) vhtflags = 0; if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && - /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, - IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && + IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vht_cap.vht_cap_info) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; /* Mirror the HT40 flags */ @@ -1950,9 +1948,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) vhtflags |= IEEE80211_CHAN_HT40D; } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) && - /* XXX 2 means "160MHz and 80+80MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, - IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && + IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; /* Mirror the HT40 flags */ From nobody Mon Feb 10 14:52:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xn491Vz5mH3y; Mon, 10 Feb 2025 14:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xm0lrNz4Lb1; Mon, 10 Feb 2025 14:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2j/8QYpVCnW+KSkh5xvtbmbRBoT0HJXtkXZLO7YJN+I=; b=au6R734uz4oStqFB3q/569bj1joxR6nR6/vXAYApjZENaI4gSxwCVcePHj1yvjWYIfxa2z taIUJTFQu9wRb1AhcBgdnRyAaantp9QNTjhcRtSknk4zkgSLCB575BvmDxLahj30L8Te1I sfni5SU/VkWy9k1TXgnejYMuAUF0iXNJKLdnWSX7DPKQr6uu05m/5R+sCMb8LrADfLy02p qea2LW67oEDe7ux6J2sI0aFCQa4wjU4/oPhqZ03fJFwdR5Z2hBojetFxykWqUCmPPR4e/J 31YaFEiQmWt0QHG8xcyS6ZMo6ri/LGCAVyAZ7K4HiUg3kjD22EXW8nk6HyXaHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2j/8QYpVCnW+KSkh5xvtbmbRBoT0HJXtkXZLO7YJN+I=; b=GWDRtxvFevNYTOymjPsyZRVj2lnKPLNsBL6kkW26s69drspp45vjzPP2ZgthnEwG/U2s/4 Y2cd2hlJ4rAD+co80U1BF/k83dlNNK2C5CFtdkWFkE3ONpgZdWyX0a7hKY3W3CahjOfo/1 600fY6bwa5oPSBAQwNXyXFB+1jkGq5jKM1Lzy6XzDs/jnE9t8DTooxyX5JsZGaQ6NdPg7l alaIxwoavIWTE3MdOc36Cz1bccIvwQ6PgfYE1rPoFaeYH3mOCK8vsrYWx8lD8atIUOtvPI 5SeNi+0T8rOme0nU1d7bQCeZBic+0++JiUSZMR3cKa2YJl9Xrlp8hucsFyGcfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199164; a=rsa-sha256; cv=none; b=hywoFK9gmdNt+AQ3uiqvGGfNutKLSbY9NFF6wM6XZmVjdcMeKtSPs/Y1ZTnecj5v/8/Eie iKaVTWvqaI9qx1k2w0+v/4YTmg+s/3/7Gzz8EfVw6y72havlrW6cwKY6bxTH2o+qfE5yGP SeTQP8p/UfpajZD5Vb6vr2+iAxVWB9/PIIbUpvv2SlkHzADcoG7hA5pgY06zbO7SstWU7T bV1mJ88ybBMeoL7uv2SnVK8Nyc5EadpXENAy2iZntkFN73bNdY4Rtt8J7VqS7P1rVNeRzc Mw1orGW8sfMIQ03QKgQt5Osnep9868CR+2WLn7FfLKCsVQsEdmcy1j4KF81HAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xl6m4RzWgT; Mon, 10 Feb 2025 14:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqhWJ028009; Mon, 10 Feb 2025 14:52:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqhV1028006; Mon, 10 Feb 2025 14:52:43 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:43 GMT Message-Id: <202502101452.51AEqhV1028006@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: b7be66e4e86f - stable/14 - net80211: add missing 80Mhz and 160Mhz channel ranges List-Id: Commits to the stable branches 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: b7be66e4e86f49f5d55deeb7053bd2e86ac2ee8a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b7be66e4e86f49f5d55deeb7053bd2e86ac2ee8a commit b7be66e4e86f49f5d55deeb7053bd2e86ac2ee8a Author: Bjoern A. Zeeb AuthorDate: 2025-01-04 08:02:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: add missing 80Mhz and 160Mhz channel ranges We have two arrays, one for 80Mhz and one for 160Mhz. Both were lacking frequency ranges for more possibly available configurations (the other bits of what is valid are for regdomain to set right). Sponsored by: The FreeBSD Foundation Fixes: 67f4aa3878efa, 04e7bb08a5750 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48357 (cherry picked from commit 1832eb102e10c7f2891c032ecf7b265b75d3cd50) --- sys/net80211/ieee80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 9fb424887834..0aaded2bdbcd 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -1162,12 +1162,14 @@ struct vht_chan_range vht80_chan_ranges[] = { { 5570, 5650 }, { 5650, 5730 }, { 5735, 5815 }, + { 5815, 5895 }, { 0, 0 } }; struct vht_chan_range vht160_chan_ranges[] = { { 5170, 5330 }, { 5490, 5650 }, + { 5735, 5895 }, { 0, 0 } }; From nobody Mon Feb 10 14:52:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xs3p1dz5mGdc; Mon, 10 Feb 2025 14:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xq3HSrz4LYF; Mon, 10 Feb 2025 14:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RWOz1YTXr2Ij7w0lhcRBqTqgnz692/mRPgVe0pwz4wU=; b=IJBT+0xC100nMyvd6YvmoiEzJTSylMwtoCJQSOdWW/TSkNkE7SQhQDzjOjNsgOVaIRXu3Y OR943frr362/pU/6WmQ114tH7u+CZmU9pIO5Rhu155OcMjNzn5u6a76ReaKhBoOtnaPt/Z kawqWmSFJDSYmUWusg9SIKYhspRW36h3HAucGNd6E0/gLjLd+85ftNOl6vriTx5hW71Agt P7YkvWHjYilOyXjJTJZNPRiG2+SxHq3AO7d1ftTw9F9cnSvuvON6E3iQ0nT6pLEK3Cf1pi ApOv2FTDoQSdwNGjN9iSJQcO74sHAgTO5CuGGQVsjJ05GZ3Ttj7mfUjdrzWM0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RWOz1YTXr2Ij7w0lhcRBqTqgnz692/mRPgVe0pwz4wU=; b=PvonAjZSuyFup2+jcOT1jkKRq3roampyGx10YjLpk3Anq9YgkfxwMWgppDwn4H82S2BPa+ +KYhRR5XDflBsqDa+mh638a9Xx6kTLxsY0rGvPpGZ3Up1M8jYXsjroHC+7snfgMe59yl/d HkhU/AJ7DqamauIQANoOdYWlPjtqYsBGbwqjr0SKlFlzmxEF/ew0GxqOMSbKGi1BCJ7fa0 Bo4aGTu5+i4vLTkpPTPZ0PWYeOFV6SiFa/zx/ZQt7lXkniU2hmi162DW+DRtDKuqJb6gzf kKbpDqcqlLDJ0fAdo2jNN0WAHVVybQlmSD4I9MV6o/o+CYzNburo5RSVnxdbKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199167; a=rsa-sha256; cv=none; b=IvxRKGcJG0KKXzk4fVwNwJIg/FNLvSgFpegfPBL3lj1Oi6E591TN+UjK+HiVRdlVlCffgH 03/mDzXFHOHlsoH0i7RiazQJozcaHEe0qGQwBPhkj8QOwV1EhfuiCa3DsMkrG18xclRIn5 Mxr05C0nZQAzOlMZw1ax9TOXPYEy2+OYAykIGzHiUgqh8mbS64pe9M7cV00jU9s9bXiOfl pYNmUmDVQPxCav6yhr0n0n1AuDdbxKzhGzEOaL8DwzMnjMsYQq8WxznRdNkcLdhlfufWiO Oqt/K/IgGyZRMd3JLzIpMkguUkXKTEsXFSbvk+gzcCvFZ7Tl25QZIWwuYsv2Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xq2mywzXWH; Mon, 10 Feb 2025 14:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqlVi028120; Mon, 10 Feb 2025 14:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqlZ2028117; Mon, 10 Feb 2025 14:52:47 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:47 GMT Message-Id: <202502101452.51AEqlZ2028117@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: 950dc789cc63 - stable/14 - LinuxKPI: 802.11: make HT compile again List-Id: Commits to the stable branches 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: 950dc789cc63e65882f65f5601911085e7f07e6c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=950dc789cc63e65882f65f5601911085e7f07e6c commit 950dc789cc63e65882f65f5601911085e7f07e6c Author: Bjoern A. Zeeb AuthorDate: 2024-12-01 19:53:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 LinuxKPI: 802.11: make HT compile again Bring in changes missed during the last driver updates to make HT compile when enabled. Sponsored by: The FreeBSD Foundation Fixes: 7b43f4d064195 (cherry picked from commit 943a19c666d67424cdde6cbcd096f28359b2d314) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 5aa86ab7ebec..3c9b9dc42fcc 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1275,12 +1275,12 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif->bss_conf.chanreq.oper.center_freq1 = chanctx_conf->def.center_freq1; #ifdef LKPI_80211_HT - if (vif->bss_conf.chandef.width == NL80211_CHAN_WIDTH_40) { + if (vif->bss_conf.chanreq.oper.width == NL80211_CHAN_WIDTH_40) { /* Note: it is 10 not 20. */ if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan)) - vif->bss_conf.chandef.center_freq1 += 10; + vif->bss_conf.chanreq.oper.center_freq1 += 10; else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan)) - vif->bss_conf.chandef.center_freq1 -= 10; + vif->bss_conf.chanreq.oper.center_freq1 -= 10; } #endif vif->bss_conf.chanreq.oper.center_freq2 = From nobody Mon Feb 10 14:52:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xw3hGkz5mHHH; Mon, 10 Feb 2025 14:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xw0mx4z4LWD; Mon, 10 Feb 2025 14:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=73j5em+ClFFFAxJtAkYGYm0/3aHY5/6g9KJVPzKpvDQ=; b=reMhmQLQvjQnNXMAgyp3HwX5gY/80u4ESLiGtrYdfiJEr8trwQ++kluIrMZK27e+t3SEmx mJmEVqzKqPsgAoLhpb1HncLO1WB2BNyItGTVmSyWcxcVnADkZwobUCviREL2QnoS3XUH3f pCwOXfbgG/XeSBRBgaE1WKSjdJW46d6Wg9oV1FEpoxNSbx0A9Q+6I6LbSqV1M1G/6QjX0g KlxTCPjUxsITGKnayqwFP9zLKGDybPG8QkSZVLX7bWeCwJen4KAaFe3A9cp7neE+6VJoMM EsWDeo2BXxfpXJ93YRJU/LpYPF0i9Al+PoTFu622CFuHEgC17B4rUD+9JAjdsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=73j5em+ClFFFAxJtAkYGYm0/3aHY5/6g9KJVPzKpvDQ=; b=oCZw5N0IdvFiCB0z1mGv95b9cm/jcmppaaOjdrdzaIOA1D1wSiZ2QQfh6AvkGwDx7s1iqF FRTGKmCSRGLaonW+cillTz1s98GoTFNfwhX77l5q9QPX5NRKptW9tnBQfosPf5jHYv5M1q m6X3SgY9npCKvlFcfRSKjPu1LAbJGzOVfpVgDa5/qFm53hpcPDELIRh9vmIk1NpZ+8eyUB a9GqzuLpROs4o0hsbFlEQ0mPn9XWDYacZNGI95K3UJDBgXyZNM3BpJp5j826VmyMofX1up 3f1lwUxjmmY35YxPNvVeErsaHBVWx1cJs4w/hFezX+gsY5xQmcdIXlIFB/sliQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199172; a=rsa-sha256; cv=none; b=kJAODr9t9QjWWMhaBxaIf/TPKI5LdK1iBMJUtCn0NHJpUw/mskOeSBjQDPvm18DmKjsW+g kJkK4itobiNQj/URJBOPenqBFUHU5KBhI89rLpRTY9B6dWiBQOVpURSaFDuzqg7TvZe7S2 Dlu2+L2Tv4Z1bBWEyxQxvey4Wlr2goa6qaaIkVAhk7ypn4yToyWAVefJQhdarjLAwpQ9kY /uL+ZQKKZv0Uq6mPV9bP4aqSZdj32pT/uq+Y1XyIGq4ZBhj/JZXIuQgTyWq3ghfrxnK0kU qFOprhnecgTQ6kd2mvRLEYVVKM2A6JgNpwxN5oQ4FRSzhXFGfNL8L5jIAq1x/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xw0BhFzX7B; Mon, 10 Feb 2025 14:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqpJJ028275; Mon, 10 Feb 2025 14:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqpn0028272; Mon, 10 Feb 2025 14:52:51 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:51 GMT Message-Id: <202502101452.51AEqpn0028272@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: 1a7956f64b5c - stable/14 - LinuxKPI: 802.11: implement ieee80211_get_{he,eht}_iftype_cap{,_vif} List-Id: Commits to the stable branches 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: 1a7956f64b5cbe912acd49729e18f1f6c1e05607 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1a7956f64b5cbe912acd49729e18f1f6c1e05607 commit 1a7956f64b5cbe912acd49729e18f1f6c1e05607 Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 11:46:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:10 +0000 LinuxKPI: 802.11: implement ieee80211_get_{he,eht}_iftype_cap{,_vif} Implement the combination of all four functions, the *_vif versions from mac80211.h as a wrapper to the non-*_vif ones in cfg80211.h. Put the function pairs next to each other and in the right files and harmonize argument naming, etc. Both of them have shown up too often in the todo-tracing to bother enough to implement them now for a time in the future when we will support HE/EHT. Sponsored by: The FreeBSD Foundation (cherry picked from commit c75a558d0729da87ee3c016b57cc8f5ac4fc65d0) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 34 +++++++++++++++++++++-- sys/compat/linuxkpi/common/include/net/mac80211.h | 26 ++++++++--------- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 7780b265cf6b..0b6a66033536 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -2073,12 +2073,40 @@ ieee80211_get_sband_iftype_data(const struct ieee80211_supported_band *band, return (NULL); } -static __inline const struct ieee80211_sta_eht_cap * +static inline const struct ieee80211_sta_he_cap * +ieee80211_get_he_iftype_cap(const struct ieee80211_supported_band *band, + enum nl80211_iftype iftype) +{ + const struct ieee80211_sband_iftype_data *iftype_data; + const struct ieee80211_sta_he_cap *he_cap; + + iftype_data = ieee80211_get_sband_iftype_data(band, iftype); + if (iftype_data == NULL) + return (NULL); + + he_cap = NULL; + if (iftype_data->he_cap.has_he) + he_cap = &iftype_data->he_cap; + + return (he_cap); +} + +static inline const struct ieee80211_sta_eht_cap * ieee80211_get_eht_iftype_cap(const struct ieee80211_supported_band *band, enum nl80211_iftype iftype) { - TODO(); - return (NULL); + const struct ieee80211_sband_iftype_data *iftype_data; + const struct ieee80211_sta_eht_cap *eht_cap; + + iftype_data = ieee80211_get_sband_iftype_data(band, iftype); + if (iftype_data == NULL) + return (NULL); + + eht_cap = NULL; + if (iftype_data->eht_cap.has_eht) + eht_cap = &iftype_data->eht_cap; + + return (eht_cap); } static inline bool diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 3aa383554e93..891277e42541 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1605,7 +1605,7 @@ ieee80211_csa_finish(struct ieee80211_vif *vif, uint32_t link_id) TODO(); } -static __inline enum nl80211_iftype +static inline enum nl80211_iftype ieee80211_vif_type_p2p(struct ieee80211_vif *vif) { @@ -2271,14 +2271,6 @@ ieee80211_channel_switch_disconnect(struct ieee80211_vif *vif, bool _x) TODO(); } -static __inline const struct ieee80211_sta_he_cap * -ieee80211_get_he_iftype_cap(const struct ieee80211_supported_band *band, - enum nl80211_iftype type) -{ - TODO(); - return (NULL); -} - static __inline void ieee80211_key_mic_failure(struct ieee80211_key_conf *key) { @@ -2427,20 +2419,24 @@ ieee80211_vif_is_mld(const struct ieee80211_vif *vif) return (vif->valid_links != 0); } -static __inline const struct ieee80211_sta_he_cap * +static inline const struct ieee80211_sta_he_cap * ieee80211_get_he_iftype_cap_vif(const struct ieee80211_supported_band *band, struct ieee80211_vif *vif) { - TODO(); - return (NULL); + enum nl80211_iftype iftype; + + iftype = ieee80211_vif_type_p2p(vif); + return (ieee80211_get_he_iftype_cap(band, iftype)); } -static __inline const struct ieee80211_sta_eht_cap * +static inline const struct ieee80211_sta_eht_cap * ieee80211_get_eht_iftype_cap_vif(const struct ieee80211_supported_band *band, struct ieee80211_vif *vif) { - TODO(); - return (NULL); + enum nl80211_iftype iftype; + + iftype = ieee80211_vif_type_p2p(vif); + return (ieee80211_get_eht_iftype_cap(band, iftype)); } static inline uint32_t From nobody Mon Feb 10 14:52:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xw37b6z5mH7P; Mon, 10 Feb 2025 14:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xt6RLZz4Lh8; Mon, 10 Feb 2025 14:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hTAs51CWYk1/zu797dS4QlwBHEuWrpCi7nr4ax0yLVo=; b=RILqOWDGH30/WlwD8dLUmFn5WxNX3w1iRMP2THKPFRmV62E/gRFfKdDq6s9oCgzB80Tk7z 0P9f/WRhTrgymKhvCRuhsASJfGfOMaMN9vk/Kh0pKBePAzS2FBEFWiPuzBwsJmtXGisDk4 ufRIBYwK1m+f2fu10MJHULVMNEhHMRhW0J5j1pA8zyuwg89dt8QKocrYwYnIYqjyuh7mBO mv4sDxKRDSGsxs8MD+l41iQZ5LUapALVThzsco6aU0wyZgxNRZ5TNZ1VY67XzTZVHcAYox kIMf6aZ/qs1/QkuAQhKR1EaAP8TW/I2Ayiy0jjE7HeIshifcpFFNWoQ04rJNVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hTAs51CWYk1/zu797dS4QlwBHEuWrpCi7nr4ax0yLVo=; b=h1aFX39fNh6bjHsOKYHhn4xR4O029ZTUGAm/evmBZw6P/lp/QBsNZ79q6P9Pps4HNxVsRs A/GAKOEI0Lg2Ed+V0APfDmTiXLg//WmW2LSjziRlYc/iKrqCTJgrZhg/oP25VZ9UKZwuRw ntlPlN/FZ044sqg+T+lgp0rKYaZdZEaPcanZmyB6lffqIU0vuFdDnzIG947kAhV/4D6VFF ME/7tLCiN+ntAsOaiovYN4XHo6cm99RSPb7emCuTKgXCpo9W7kjaZzhBCuc5fciAc5n509 lvkmAP1YSo8aRx4jUGr/9GJB9tTYCzWsDM4DfI/DhEhRWWz0kEdfbK7PqChXZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199170; a=rsa-sha256; cv=none; b=NpSpTfeINkYWwjS+yDhP4LuMkaQDbBV/6pXRlmfB3k94dN7qwqKS7F/ZtiOTYrbPaLaW1g 3tlOME+vts4At/17Su66Vn2EHhuPHTz6VNrB8//J4gbCw4tISgkDtPdMilfC6h6m8swR7p YIFF8XzNIltX53H55rjpuPiYxFVtsgfmLo9I5HRxucdabExgnChOzzFQvy9TbVSPMECWVW Z4HD25U2N1LsS222+KZCOVDCXvXC75HGQvTQT/XyAdFix8b5TWs7+8wMX47kdnBwuxjWMY 2mjSd5DjCHmm879AYjw1E0XEnrpC3HgRtFiMBLfBnUW/npG4q7b2qvuzB26f/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xt5hmDzXWT; Mon, 10 Feb 2025 14:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqo9u028233; Mon, 10 Feb 2025 14:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqoWC028230; Mon, 10 Feb 2025 14:52:50 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:50 GMT Message-Id: <202502101452.51AEqoWC028230@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: 706c18c8b666 - stable/14 - LinuxKPI: 802.11: improve the IMPROVE_HT() macro List-Id: Commits to the stable branches 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: 706c18c8b66611d25fba9c003df11b0ce0c04521 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=706c18c8b66611d25fba9c003df11b0ce0c04521 commit 706c18c8b66611d25fba9c003df11b0ce0c04521 Author: Bjoern A. Zeeb AuthorDate: 2024-12-28 10:13:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:10 +0000 LinuxKPI: 802.11: improve the IMPROVE_HT() macro Let the macro take a format string and arguments and add __func__, __LINE__ to the output. Sponsored by: The FreeBSD Foundation (cherry picked from commit a4cdb785bbd7e26cc3f2ed0bb4e5cf7ea83c400b) --- sys/compat/linuxkpi/common/src/linux_80211.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 8605ec86ad1b..0c4c615d82e5 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -78,9 +78,10 @@ if (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) \ printf("%s:%d: XXX LKPI80211 IMPROVE_TXQ\n", __func__, __LINE__) -#define IMPROVE_HT(...) \ +#define IMPROVE_HT(fmt, ...) \ if (linuxkpi_debug_80211 & D80211_TRACE_MODE_HT) \ - printf("%s:%d: XXX LKPI80211 IMPROVE_HT\n", __func__, __LINE__) + printf("%s:%d: XXX LKPI80211 IMPROVE_HT " fmt "\n", \ + __func__, __LINE__, ##__VA_ARGS__); #define MTAG_ABI_LKPI80211 1707696513 /* LinuxKPI 802.11 KBI */ From nobody Mon Feb 10 14:52:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xs5zDkz5mH2C; Mon, 10 Feb 2025 14:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xr5CcNz4Lk4; Mon, 10 Feb 2025 14:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ue5ozmHG5DSex07heUKF62yAzqMiveoy9lfJ+JtUzhs=; b=MR/+tbFDKvVTQfpNtasH8xem7BPjHYyCfp3JgoZ5NYkepQU/MgcitJUVkgqJ2qWzNYOoS3 aqrJgCQJcOhTddSzbhCkxwcCfTJXDnt+WVatHp0eeqpggnx56lpLu0yqM5rtJ4HioXMWHA Qe6MkfNaa7ccCO9Cibcd0RY99kqINc4++VLtySpNE75Rwuvrs+0tn4pgApzZ2JluvjWHpX rlLsu1/Z4sq3mocqWzSa8f6a2EjbJTo7v25zmEvycjOQeP56zLVBMZwh66L92wcMkVgpLC M0/SAjxDquqBOIBSLOKpeN77z0bJoM5GAFndXEwtsiGekcdzgIlJRKL4U+KoXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ue5ozmHG5DSex07heUKF62yAzqMiveoy9lfJ+JtUzhs=; b=C3B6qVTcfnSh5baIpbsyiOMa99uboMGyggkGRu93Ir/sNPDiLiDlfoS43rf8/PF5BFDStc mx/O73SQ6DgE999I8NTpcdx9+hLqeTrKUmYbVexFwE80lYoaySb9DQ0+y1OUZfCc+Nj0/V MBgcIPviqNnQ1WyMi2Z+3CLAolwnBrIHFdShahf2tvQrdRzDCKi01G/4o9c7w4n+bh6P3B RHCDDwNVejrc7iexA/Drt9FPYo8llFN8L2Sh7siq2hr8sjodkvagBHxhRnr/dJLZlKlyrr iPN5hnuMDn77Qw41kLqrVoIAJE663X2zQqeoNKdFxnLJ/3iaIRpinTSh6fLQQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199168; a=rsa-sha256; cv=none; b=OG4tc0LqNySTTKi66IG3zpEEUcNFg04GhW3TncfTYFz9rB8AT0ihorG4Xdok59oVsc1VnF DIyjj2VNlxz0aLMiZGQlKFQ8ShPaS4SkJqmUPjcm5Ayz+fGctTVDhWnv/gIquxKaItHmLT fIuPTrGY2xDxncs1aRLdmCgzoJXeKrcKWTe4aSKpUHSEgIlodJj4/2uIrTWH/Bt0A7YUtJ mZwjRfV5pLnofmnkMs7ufv8VE3V9obgdKdpf+0/Jvc5sg/1k+73TYSvj97oVF/QgYGgBNi PEyu2+pkV0a4uh0pMB7DYwAkKmtsnjcfx1iMsSYyBd/1fypdAdmTYTRmrpFNLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xr3sdKzXJx; Mon, 10 Feb 2025 14:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqm6B028160; Mon, 10 Feb 2025 14:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqmtO028157; Mon, 10 Feb 2025 14:52:48 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:48 GMT Message-Id: <202502101452.51AEqmtO028157@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: 69aeb770a925 - stable/14 - LinuxKPI: 802.11: implement wiphy_{,un}lock() List-Id: Commits to the stable branches 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: 69aeb770a925f23d073dcedaa14bb4565bbeaee0 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=69aeb770a925f23d073dcedaa14bb4565bbeaee0 commit 69aeb770a925f23d073dcedaa14bb4565bbeaee0 Author: Bjoern A. Zeeb AuthorDate: 2024-12-28 09:43:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:10 +0000 LinuxKPI: 802.11: implement wiphy_{,un}lock() This will help us to get minimally better lock coverage in iwlwifi though not yet against the LinuxKPI implementation which will likely switch to this in the future. At least the TODO() logging noise is out of the way. Sponsored by: The FreeBSD Foundation (cherry picked from commit 95a7aa8009877ca95d81967f9af568ef832bb565) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index f489e7a7da11..7780b265cf6b 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1358,13 +1359,13 @@ wiphy_dev(struct wiphy *wiphy) static __inline void wiphy_lock(struct wiphy *wiphy) { - TODO(); + mutex_lock(&wiphy->mtx); } static __inline void wiphy_unlock(struct wiphy *wiphy) { - TODO(); + mutex_unlock(&wiphy->mtx); } static __inline void From nobody Mon Feb 10 14:52:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6xw370pz5mGmh; Mon, 10 Feb 2025 14:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xs5jBfz4LfD; Mon, 10 Feb 2025 14:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTNTCam8oNzbebg9F3RNIcrCazMhOJ4+yDdM5CXTSEc=; b=Ty5f0f4xQCPNvgGjV1vc52vS3ompFeaf4xCPVUO9g0BDq8pKPmOCU0KV8xszHB03ZZVmQN staqK3lsT9PvJR3MCZ10INpFgV2Xp60Rz/j/41R6p1zNqgOpuWSPZa8W0VOGS0QWeYOph2 GkmXkWQj5TrRkrjZN3rTDG2tEEzMbAD4uiu/Ka0+1ZUW+Kwx8xC2GdcNq3dJKCW0JTgOnr kEPt+Miu0Y8vtXO0mxVcf065uMIJFFrIlciHtokXdwfTLXNd3Yg5QAWG0N6QG6nVT93Yzf CgWsLt2X1yJFJP4QhiDii+Qx61U71Sc6x7Gzta2RcOivtqm0MIvOuFHbyjXqMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTNTCam8oNzbebg9F3RNIcrCazMhOJ4+yDdM5CXTSEc=; b=AmEISKUf6jeUkKi/vVl7obWKW4+OCXx6fwis9O/8md8plSO5K31uCkwt1pwHdKX+0+hXXe hx/wPkBgCYnUKboWHl51nYVOlyaZSd6CKqBOU4zijGLCkVZI/oZJBua1rGdUx26CP/LbRA O0GYij7ExrbOnOZ/O1z5eoqn9dWYIOX4HNZnda4x0HkoyOWG1IIbKEORUbrteVZcTyIqfe F2WC6cCpEJ8acbGu4uy2jF3hMkl5nFUdL0AOOlzTnq6eZUa3Eim6wAM0mewENF9iuYOMki U3k27tUMjz32nC1ltwpMiJz3UAv2GqYELV0DW1jiXfmNLf1RJ4vsnO9pE1AvuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199169; a=rsa-sha256; cv=none; b=WG/ubTyoWvYhKehK6Ht1J9ee92YGWsyhX0KlPtIV/6NV9iH+urN7NDJ9GY6UKSOuWBbnhJ Ijdbp9VfzW4cqHGCY/YZmAtcd/X+qGG3+lOc2f97qgtuYdgDl8sW8JSTPUC3ICQ4MzWQbk XARsOWIoOp0HBW+LEWOJvcbJ32wPD0GxaB2UMum/E/IQmDJJ/NlYaN3IXABdaex1F8JG6h vJysUKZMWN1863krxER4DGrYWUq6JLG3r4tt+U+H8G4y+PVcuoiigd6MmJvEdA1oXc8aiv ndMvzcawo4k9uCtChP+fOWHPqI19aezMZhyamyyJnW42+T2evjTnuAXPodz3lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xs4q13zX79; Mon, 10 Feb 2025 14:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqn9Z028196; Mon, 10 Feb 2025 14:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqnX7028193; Mon, 10 Feb 2025 14:52:49 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:49 GMT Message-Id: <202502101452.51AEqnX7028193@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: 08e6f5e449e3 - stable/14 - LinuxKPI: 802.11: add a print mask for ieee80211_rx_status_flags bits List-Id: Commits to the stable branches 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: 08e6f5e449e36eb45530eed3556e1aa5e36970ac Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=08e6f5e449e36eb45530eed3556e1aa5e36970ac commit 08e6f5e449e36eb45530eed3556e1aa5e36970ac Author: Bjoern A. Zeeb AuthorDate: 2025-01-07 12:16:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:10 +0000 LinuxKPI: 802.11: add a print mask for ieee80211_rx_status_flags bits Add a print mask for use with %b to aid debugging. It is a lot easier to read names than numbers. Sponsored by: The FreeBSD Foundation (cherry picked from commit f1aeb5d850cf26418fb70a16d1304b92c45b5f1d) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 11 +++++++++++ sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index dff152caf140..3aa383554e93 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -625,6 +625,17 @@ enum ieee80211_rx_status_flags { RX_FLAG_FAILED_PLCP_CRC = BIT(31), }; +#define IEEE80211_RX_STATUS_FLAGS_BITS \ + "\20\1ALLOW_SAME_PN\2AMPDU_DETAILS\3AMPDU_EOF_BIT\4AMPDU_EOF_BIT_KNOWN" \ + "\5DECRYPTED\6DUP_VALIDATED\7FAILED_FCS_CRC\10ICV_STRIPPED" \ + "\11MACTIME_PLCP_START\12MACTIME_START\13MIC_STRIPPED" \ + "\14MMIC_ERROR\15MMIC_STRIPPED\16NO_PSDU\17PN_VALIDATED" \ + "\20RADIOTAP_HE\21RADIOTAP_HE_MU\22RADIOTAP_LSIG\23RADIOTAP_VENDOR_DATA" \ + "\24NO_SIGNAL_VAL\25IV_STRIPPED\26AMPDU_IS_LAST\27AMPDU_LAST_KNOWN" \ + "\30AMSDU_MORE\31MACTIME_END\32ONLY_MONITOR\33SKIP_MONITOR" \ + "\348023\35RADIOTAP_TLV_AT_END\36MACTIME\37MACTIME_IS_RTAP_TS64" \ + "\40FAILED_PLCP_CRC" + enum mac80211_rx_encoding { RX_ENC_LEGACY = 0, RX_ENC_HT, diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3c9b9dc42fcc..2741f52aca9c 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5334,13 +5334,13 @@ linuxkpi_ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, /* Implement a dump_rxcb() !!! */ if (linuxkpi_debug_80211 & D80211_TRACE_RX) - printf("TRACE-RX: %s: RXCB: %ju %ju %u, %#0x, %u, %#0x, %#0x, " + printf("TRACE-RX: %s: RXCB: %ju %ju %u, %b, %u, %#0x, %#0x, " "%u band %u, %u { %d %d %d %d }, %d, %#x %#x %#x %#x %u %u %u\n", __func__, (uintmax_t)rx_status->boottime_ns, (uintmax_t)rx_status->mactime, rx_status->device_timestamp, - rx_status->flag, + rx_status->flag, IEEE80211_RX_STATUS_FLAGS_BITS, rx_status->freq, rx_status->bw, rx_status->encoding, From nobody Mon Feb 10 14:52:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y032vyz5mH7Z; Mon, 10 Feb 2025 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xx1ML1z4Lkh; Mon, 10 Feb 2025 14:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sma8j3AAP0jL2lfiT7PEZj/O4tavN1d1nY2FC+g/0B4=; b=xmZQFjeiSxOAaXgj8G08wI64uN0AlYfDc2nLSyMRmw/UQEcCqr9+kyRQyhphGIBZcOk/UR 9LRhSsVaKy9JxseBH9GWJlAMKmYQOXCPDFAzsWFT2vZ4Q0UcjtB1jiayWRH9Bgzmk03cZw uqPXR4SGYXAbstOI/g2TkrDG7wHmIN3FIkKg8pBfXLU1dZrGck0khTkiWjO2tbGWgnAerQ lU5MKLWWs/qUlfY/o6W99xx6dENy4QqI3JEZnAbe7bIg7fOL85N6NxIlb9gHoBBiR/jPc0 2oa28fHzTQaUDTlrnocmzluYIrnPU+8DPnUY24dplFxeWueEdXwlnkQGWLDs6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sma8j3AAP0jL2lfiT7PEZj/O4tavN1d1nY2FC+g/0B4=; b=TmC6bUgvPTcQ/S8i3ia9H678E44baFSarzPVOvPIIfPaVsITcIGjLvJzrG9MwjJRn0RUYO pOKmIE3tsyWKgOHdf2v3tZrPsLvt/m+q4ry5JNNfeotjNYVDtQHNE1Mp8ROv1xI4ciBPl6 p/W/STPQK+N9Mz7aIsH/dDwMCVRlVu2pEdzYSXbiD5Z09X3ty3LkV74C/zSaxxv0smaAwW PHnFFzPwzYsGMcCS/I4KknrW0lJryvJY070F5hopK1Zc1mhuQu3urnLCCflLR3qKxwFsnX c/yMvQLPX/cGymvq8j+yEyjdu5gzKPZr5W6MkF91LbTC2uN9hZfxqR3SSoD99Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199173; a=rsa-sha256; cv=none; b=fI6KSGFbwWjHLr2TJrwZYk7Oz5yYZoARN0Uhw9Euo1eGYVpfKA/4ckUEs4N5eVFJsg2RYb hnw9OSTHdIleIpnHzW7NgE5BFVaKixA3TN8ry3kOU5C3k5aJz5RicxMgEPv6SaYQocoeGh gFKyPij1+ImxE28SkibXx/pB7ySuFYYPLJJDe4NuSgheZqV1QEb4ohNAseBywr1vTM5un5 eOz4bZdHk969wx+strVtyWxOsFmX05VjKz6cTpFNGnFFPp2mD7u2+qaUnDxAGXQserY9nJ iZqWb9UriDzLPXUn7rTUUgvCiv60gIQGNY2Bw1tPKOz9QRyTa3545ocbU0f4SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xx0WGVzXJn; Mon, 10 Feb 2025 14:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqqsn028315; Mon, 10 Feb 2025 14:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqqHM028312; Mon, 10 Feb 2025 14:52:52 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:52 GMT Message-Id: <202502101452.51AEqqHM028312@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: 6d2408973256 - stable/14 - LinuxKPI; 802.11 initalize ic_vht_cap.supp_mcs List-Id: Commits to the stable branches 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: 6d240897325657ca455b2b6e94107f9914f778a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6d240897325657ca455b2b6e94107f9914f778a7 commit 6d240897325657ca455b2b6e94107f9914f778a7 Author: Bjoern A. Zeeb AuthorDate: 2025-01-10 23:55:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:10 +0000 LinuxKPI; 802.11 initalize ic_vht_cap.supp_mcs Given the channel struct has an extra bool we cannot assign the information 1:1 to net80211. While the caps where assigned the suppoerted mcs sets were not. Fix that. Sponsored by: The FreeBSD Foundation (cherry picked from commit ecb2e5f9c30a8c0ae491d07b2300e37eb599c298) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 2741f52aca9c..d0dde529c7a8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4552,6 +4552,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, ic->ic_flags_ext |= IEEE80211_FEXT_VHT; ic->ic_vht_cap.vht_cap_info = hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.cap; + ic->ic_vht_cap.supp_mcs = + hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.vht_mcs; setbit(bands, IEEE80211_MODE_VHT_5GHZ); chan_flags |= NET80211_CBW_FLAG_VHT80; From nobody Mon Feb 10 14:52:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y034Twz5mH7b; Mon, 10 Feb 2025 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xz3RFKz4Lkq; Mon, 10 Feb 2025 14:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8rlWIaD7+Z5vOycX/VH8sphzr4F2q4XYX8ExB94onf0=; b=jb+IpzNqvjMVOsNoLNBTMXWhaNFLpLnfnVzYcF10n0PNVt7B4UQtDqVXe6bkjnubTOKzB/ MRo8CxYocdkkNnxeawz2edaJn0sQIo7cSONdLH1xH15KsEe4PiuTwu6ExbsQLEIC7+fEst FMG+NEG2XrDKVAK0E1UGKJ6IhjE52huQfrwGP+7CjNV+ABruC3KfYXQKbvxiGHxR7v4rJe F10SLD0+ydoN0qBrM0J1QWKcq0aSzWfbyChRWKpF77waEmxpprn30bFCpXgWVHFjKu4Cuc CPIrig47I+U7DBi4v+CiGXIPU5cAnHQV4gSvGUKOP4htcyyQvMcGGLMyaMJCsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8rlWIaD7+Z5vOycX/VH8sphzr4F2q4XYX8ExB94onf0=; b=jC0U3mhp86HHRW88MLiVjQm5QPxkBHCbReAM2Q2KTOpSs08dxsL9uSdOOQNqU1/LncBq8s wtJRFmoPHRhXyDA7WGKukVtSqHTZ8Mk3PwC8rN/O9/ZdRZyfaCyNwpRRClJgG6haYbj/ic 9B009LB5EOt+JexAxPbKPrXxzLrOsN2DmXl1ifj69K2+SBADL2vstdwpMOMl3VqAKqi2B1 eN6d24tzGN3TERMzxuCFva5Jgn/1IFg0P4O+MYL9tj2O4iPVOjT0y5U8rVy41cvdvwR1AL 56g7Ppa3yztUnFCy7HUMFXPbFvaWQPzj9Xnc34WxnBeZC8mfrVtq8pbUaKPCnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199175; a=rsa-sha256; cv=none; b=BOI5khUK2/nNHS7ddvcW/0UIpDs9G/ZgcGQ/prloCLsqkDcp82umG51mjIeiVGA5gGusz5 grTXYMr2MrK+skRazX4ezSKh4Svv//Y/QxzHDYhJAeYDN7jsUzakVTKyABsvoMThIrC2/a pP1NRWAurlMrtixdU+fmG1PmYId9NSsWXVEGef0iUOJVMxg1K5oQVIszLY2Qi+VwVvw5yW B2AdQrZiep5BIA3yCvrOmfufFVmSGq1NcftDrtGGrlhuiTSAEPOSrIzm9Oaq7n0NECvNwz 6tnkzfa8YBy1PVqE9BmEMpQo/FpuTaoKonD+TadGx4sI2qQZX63FWE+vSGaFow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xz2Zm2zXZB; Mon, 10 Feb 2025 14:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqtTp028394; Mon, 10 Feb 2025 14:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqtIE028391; Mon, 10 Feb 2025 14:52:55 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:55 GMT Message-Id: <202502101452.51AEqtIE028391@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: bd42a2567348 - stable/14 - LinuxKPI: 802.11: turn on debugfs for iwlwifi and rtw88 List-Id: Commits to the stable branches 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: bd42a2567348e88c2fafa6adeadac01b86b1a95c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd42a2567348e88c2fafa6adeadac01b86b1a95c commit bd42a2567348e88c2fafa6adeadac01b86b1a95c Author: Bjoern A. Zeeb AuthorDate: 2024-12-28 09:52:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 LinuxKPI: 802.11: turn on debugfs for iwlwifi and rtw88 Make iwlwifi compile with debugfs after the last updates and turn it on for both iwlwifi and rtw88 in order to be able to get at least some useful information on driver/firwmare state. Sponsored by: The FreeBSD Foundation (cherry picked from commit 07f6575585bf69ae48dffe87c4578057ae4782d8) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 4 ++++ sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 2 ++ sys/modules/iwlwifi/Makefile | 2 +- sys/modules/rtw88/Makefile | 5 ++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 67c291fc2b89..8872be569e44 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -737,6 +737,7 @@ struct ieee80211_sta_agg { }; struct ieee80211_link_sta { + struct ieee80211_sta *sta; uint8_t addr[ETH_ALEN]; uint8_t link_id; uint32_t supp_rates[NUM_NL80211_BANDS]; @@ -1121,6 +1122,9 @@ struct ieee80211_ops { /* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change depending on compile-time option. */ void (*sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct dentry *); + void (*vif_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *); + void (*link_sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_link_sta *, struct dentry *); + void (*link_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, struct dentry *); /* #endif */ }; diff --git a/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c b/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c index aa5058955323..0b3bc62f39a7 100644 --- a/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c +++ b/sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c @@ -888,10 +888,12 @@ void iwl_mvm_vif_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif) void iwl_mvm_vif_dbgfs_add_link(struct iwl_mvm *mvm, struct ieee80211_vif *vif) { struct dentry *dbgfs_dir = vif->debugfs_dir; +#if defined(__linux__) struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); char buf[3 * 3 + 11 + (NL80211_WIPHY_NAME_MAXLEN + 1) + (7 + IFNAMSIZ + 1) + 6 + 1]; char name[7 + IFNAMSIZ + 1]; +#endif /* this will happen in monitor mode */ if (!dbgfs_dir) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index e69cac51dae2..3508f29979a8 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -4,7 +4,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} WITH_CONFIG_PM= 0 -WITH_DEBUGFS= 0 +WITH_DEBUGFS= 1 KMOD= if_iwlwifi diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index d9613b38eadf..bc4c3eb848ea 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -4,6 +4,7 @@ DEVRTW88DIR= ${SRCTOP}/sys/contrib/dev/rtw88 .PATH: ${DEVRTW88DIR} WITH_CONFIG_PM= 0 +WITH_DEBUGFS= 1 KMOD= if_rtw88 @@ -40,6 +41,8 @@ CFLAGS+= -DLINUXKPI_VERSION=60800 CFLAGS+= -I${DEVRTW88DIR} CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_RTW88_DEBUG -#CFLAGS+= -DCONFIG_RTW88_DEBUGFS +.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +CFLAGS+= -DCONFIG_RTW88_DEBUGFS +.endif .include From nobody Mon Feb 10 14:52:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y033yGz5mH45; Mon, 10 Feb 2025 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xy3DhWz4Lkn; Mon, 10 Feb 2025 14:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fd+r540ENwpSDLY48vaYutBtYEE+GhEVsl4pk549yI=; b=vqeJS67fgPKbEg07OZT4O0Jr/Uefs0s4/1s16MZoRDSqCqttV1UxLwI/arb/TxCvcwlBYn oYTcfLTfwv2T+ljCdA94suSl2bRONqsBIkD+2Uwc7T2+n602I2oipK0NXDUGDvQu+F1d6k XlJqq4/3Jd/j23oqXnsbrmU30/juk956vUWbzcbSdy4pQTW74U8MQ5nkdIxl0lIvGRTw43 MLYuk+zm/CU457tT9zxop6z7Iv90OFa1+fmFRKGH3bQQ95bk46MRZgzxLulno9Wmh+8z5n KBNBVChF09Qr+3C4Pv8jdJ6wpDGbqRRz393/y2dE8Q97MWxhChOeZGh9d7OFFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fd+r540ENwpSDLY48vaYutBtYEE+GhEVsl4pk549yI=; b=TJR7lq/nx18CdNyY59FTO6pPjDUYVdnLqM/XrxW/rRrrOfiKRglJiz2NI2iD3S+/38U+8p 88X2bU2qlM+YEFOeS881ZtaFnsR+yVXatlPDteofO6rgIHwQ7TWz77yKwS3Qcr3f96z/j+ FTJ0giQoU+cJMI3Zd1Ju23Jwf9v13rtI3j/gDG9oc1PUX1CoUTCVORoPX50NWEPqrnY6vn 6NvibnvLcENvvo42AB7DtREbCjn6XlZzI2PasXiW4bu72dn/iEF802WQM3uAiFICz0yHst 7m235DL8IO22LkSW7tGZttbpUzRTpCdIEkbkR09JzooJTd5aF5xIY+iC/xmJDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199174; a=rsa-sha256; cv=none; b=IjRnQtIVXC7HXtozyM2eaTUdRapinuD5NJKFYHi+44I/MBPmaS4suvVnbTyq//0vnMxNES OWwOYOOyutX1fQWsJKLysdjhMdFVVcoHUmkqn2wNiY9qF+8wFbG869ywkRfNw5vcLRQS6V T61bMOs6yVQlD321e+CXj1PtVDS0dDNbWB5Q29ki5blOSX34yXtRE8DLGA1HtbsyqZuQ25 laKq9E9cX5bhYoHi/gP3dvokGAS48EiTnkJ/QREFOAHU+Fi0aZxar2mXSb7f4Ucvqzy+46 Nxf7mkD5jEFU2i+dRz980XYbqIaAySJoB2xJmqzLYGdMNhNZxJLpYGT19cF2Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6xy1k5kzXWs; Mon, 10 Feb 2025 14:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqs6P028357; Mon, 10 Feb 2025 14:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqsZo028354; Mon, 10 Feb 2025 14:52:54 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:54 GMT Message-Id: <202502101452.51AEqsZo028354@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: fde943a07e47 - stable/14 - LinuxKPI: 802.11: remove rate_lowest_index() List-Id: Commits to the stable branches 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: fde943a07e4718ffdcf5fb56a8645954c814b43c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fde943a07e4718ffdcf5fb56a8645954c814b43c commit fde943a07e4718ffdcf5fb56a8645954c814b43c Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 11:51:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 LinuxKPI: 802.11: remove rate_lowest_index() rate_lowest_index() is no longer used anywhere in our code. Garbage collect it. Sponsored by: The FreeBSD Foundation (cherry picked from commit 1b840f09b6b379c0aae5a558ba5a4ed6bb571a85) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 891277e42541..67c291fc2b89 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -2182,15 +2182,6 @@ ieee80211_txq_get_depth(struct ieee80211_txq *txq, unsigned long *frame_cnt, linuxkpi_ieee80211_txq_get_depth(txq, frame_cnt, byte_cnt); } -static __inline int -rate_lowest_index(struct ieee80211_supported_band *band, - struct ieee80211_sta *sta) -{ - IMPROVE(); - return (0); -} - - static __inline void SET_IEEE80211_PERM_ADDR (struct ieee80211_hw *hw, uint8_t *addr) { From nobody Mon Feb 10 14:52:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y34bbJz5mH8x; Mon, 10 Feb 2025 14:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y261K6z4LnK; Mon, 10 Feb 2025 14:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KFLHNngZ5ZyFxvOQ31RLaA2TVnqF+WnxDZ9kP8u9iog=; b=DzlTfaGO5g5IXmeV52XoqZWZM0Wq76zbmFDXnBDIadVj3dLiMhJNvzo/8CQiULnOrVIrbM vyVd+QIaA3FoEh9wYk95LdtltUC7KJAlm1z8OzdZoiZvYzjhI4h421Xb6BbIIfl3+AYH5d uIRxEteBxn6Gyu02/NcAoqw11sU60qqjfnk/S9FESu09B6YKj9xTA4Y3e7tJoE7iJElSGW SN40DNw5d/9xEbLR7I+VzUSjyWR/z4zymNvtzyAqldVg2uVgqDgqBF39js0T8eXmw1Agjg JU3Sj6Xdp2RSmnXCnew7y2X4EOD+Wwyve1P9e+ADiyII0jPg09FO11ioR4Ks+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KFLHNngZ5ZyFxvOQ31RLaA2TVnqF+WnxDZ9kP8u9iog=; b=AWPMIj/TLlDskhfayk5WR1ApDsjGBi+BlX+/1l4Hbrh+OJrJrZtHnglsPW89MqlIw1PzoZ y12VW3+ZAq38LP2xm4i6672URFkWrqmRYYiUnKDunpxSdMEqzc7cxVPh4HMUfDwcUDRwvx zAkp6FI5fBPOJe7JT8KaVLmYz51KPK9PIyOif8FzNyliuiBVv1hTYM5vcqxhbV7KJDqQe2 juBGsQUDTdG46sFXg/BUBdSIc3+03fQxuZEEWYdJNbEcDeSqBTZdf5M5lFfB/8+9nvwgCj cC+Ff1jyBwU69INkJgIKp3ixhMkBNBCvTFtuY+/WMLp16XBP32E5+qFPaHQ3ZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199178; a=rsa-sha256; cv=none; b=xjB3pA68FkJ9A55jY+6ySwuva/IMY/c52ORfU1CoQpKM44frrhF2B3UqXIgGdt7XXCbmCa gaEZubHILmtUyxn/o+dOCSQ74FEnOydzuYgsIahKax9BHHlfoC1XNDTJ95XnNTgOkkc0LR AyNMJSr3Na8dIfwOpAGaGU+i/WIk1ECfKNI3q7X0qR+26tJGsUE7EcBEBj40CjvG7iOQkl iT4lwK7+TFZpCdfQXQBsvIZGqj/5TLviXH9kYLUR7FRhSX5yyjKD702nUe8WvmT6Cr9wwB GHDYRqtDqG8fi98jB6vQreNRSvvAjLnT8eVMnoZ00JyrcAoHuqCORQup015dyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y25Kz5zX7C; Mon, 10 Feb 2025 14:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqwZD028511; Mon, 10 Feb 2025 14:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqwdG028508; Mon, 10 Feb 2025 14:52:58 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:58 GMT Message-Id: <202502101452.51AEqwdG028508@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: 9689622f9898 - stable/14 - rtw88/rtw89: add module_param to enable/disable HT/VHT and EHT List-Id: Commits to the stable branches 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: 9689622f98982d785c906051e7114e6f7d5d4095 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9689622f98982d785c906051e7114e6f7d5d4095 commit 9689622f98982d785c906051e7114e6f7d5d4095 Author: Bjoern A. Zeeb AuthorDate: 2025-01-26 00:26:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 rtw88/rtw89: add module_param to enable/disable HT/VHT and EHT In order to better test HT and VHT support with LinuxKPI add (tunable) options disabled by default to on-demand enable HT/VHT and for rtw89 also EHT. It is expected that we will remove this FreeBSD-specific code again in the future. Sponsored by: The FreeBSD Foundation (cherry picked from commit 7a5b55e3b448744b099c274763992cba2e3ebce5) --- sys/contrib/dev/rtw88/main.c | 22 ++++++++++++++++++++++ sys/contrib/dev/rtw89/core.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c index de94f750200e..5157f447b93c 100644 --- a/sys/contrib/dev/rtw88/main.c +++ b/sys/contrib/dev/rtw88/main.c @@ -46,6 +46,16 @@ MODULE_PARM_DESC(disable_lps_deep, "Set Y to disable Deep PS"); MODULE_PARM_DESC(support_bf, "Set Y to enable beamformee support"); MODULE_PARM_DESC(debug_mask, "Debugging mask"); +#if defined(__FreeBSD__) +static bool rtw_ht_support = false; +module_param_named(support_ht, rtw_ht_support, bool, 0644); +MODULE_PARM_DESC(support_ht, "Set to Y to enable HT support"); + +static bool rtw_vht_support = false; +module_param_named(support_vht, rtw_vht_support, bool, 0644); +MODULE_PARM_DESC(support_vht, "Set to Y to enable VHT support"); +#endif + static struct ieee80211_channel rtw_channeltable_2g[] = { {.center_freq = 2412, .hw_value = 1,}, {.center_freq = 2417, .hw_value = 2,}, @@ -1666,7 +1676,11 @@ static void rtw_set_supported_band(struct ieee80211_hw *hw, sband = kmemdup(&rtw_band_2ghz, sizeof(*sband), GFP_KERNEL); if (!sband) goto err_out; +#if defined(__linux__) if (chip->ht_supported) +#elif defined(__FreeBSD__) + if (rtw_ht_support && chip->ht_supported) +#endif rtw_init_ht_cap(rtwdev, &sband->ht_cap); hw->wiphy->bands[NL80211_BAND_2GHZ] = sband; } @@ -1675,9 +1689,17 @@ static void rtw_set_supported_band(struct ieee80211_hw *hw, sband = kmemdup(&rtw_band_5ghz, sizeof(*sband), GFP_KERNEL); if (!sband) goto err_out; +#if defined(__linux__) if (chip->ht_supported) +#elif defined(__FreeBSD__) + if (rtw_ht_support && chip->ht_supported) +#endif rtw_init_ht_cap(rtwdev, &sband->ht_cap); +#if defined(__linux__) if (chip->vht_supported) +#elif defined(__FreeBSD__) + if (rtw_vht_support && chip->vht_supported) +#endif rtw_init_vht_cap(rtwdev, &sband->vht_cap); hw->wiphy->bands[NL80211_BAND_5GHZ] = sband; } diff --git a/sys/contrib/dev/rtw89/core.c b/sys/contrib/dev/rtw89/core.c index d1f82bfad4a9..85d8dee4e85d 100644 --- a/sys/contrib/dev/rtw89/core.c +++ b/sys/contrib/dev/rtw89/core.c @@ -29,6 +29,21 @@ static bool rtw89_disable_ps_mode; module_param_named(disable_ps_mode, rtw89_disable_ps_mode, bool, 0644); MODULE_PARM_DESC(disable_ps_mode, "Set Y to disable low power mode"); +#if defined(__FreeBSD__) +static bool rtw_ht_support = false; +module_param_named(support_ht, rtw_ht_support, bool, 0644); +MODULE_PARM_DESC(support_ht, "Set to Y to enable HT support"); + +static bool rtw_vht_support = false; +module_param_named(support_vht, rtw_vht_support, bool, 0644); +MODULE_PARM_DESC(support_vht, "Set to Y to enable VHT support"); + +static bool rtw_eht_support = false; +module_param_named(support_eht, rtw_eht_support, bool, 0644); +MODULE_PARM_DESC(support_eht, "Set to Y to enable EHT support"); +#endif + + #define RTW89_DEF_CHAN(_freq, _hw_val, _flags, _band) \ { .center_freq = _freq, .hw_value = _hw_val, .flags = _flags, .band = _band, } #define RTW89_DEF_CHAN_2G(_freq, _hw_val) \ @@ -4006,7 +4021,13 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) sband_2ghz = kmemdup(&rtw89_sband_2ghz, size, GFP_KERNEL); if (!sband_2ghz) goto err; +#if defined(__FreeBSD__) + if (rtw_ht_support) +#endif rtw89_init_ht_cap(rtwdev, &sband_2ghz->ht_cap); +#if defined(__FreeBSD__) + if (rtw_eht_support) +#endif rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_2GHZ, sband_2ghz); hw->wiphy->bands[NL80211_BAND_2GHZ] = sband_2ghz; } @@ -4015,8 +4036,17 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) sband_5ghz = kmemdup(&rtw89_sband_5ghz, size, GFP_KERNEL); if (!sband_5ghz) goto err; +#if defined(__FreeBSD__) + if (rtw_ht_support) +#endif rtw89_init_ht_cap(rtwdev, &sband_5ghz->ht_cap); +#if defined(__FreeBSD__) + if (rtw_vht_support) +#endif rtw89_init_vht_cap(rtwdev, &sband_5ghz->vht_cap); +#if defined(__FreeBSD__) + if (rtw_eht_support) +#endif rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_5GHZ, sband_5ghz); hw->wiphy->bands[NL80211_BAND_5GHZ] = sband_5ghz; } From nobody Mon Feb 10 14:52:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y344yxz5mHDw; Mon, 10 Feb 2025 14:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y03wScz4Ly4; Mon, 10 Feb 2025 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=950e7v2xLxEqWYF/1/r4UbslKMKuUanyv5ajRT2XiEs=; b=NfU3TVM9KwtkeAyXhYBNaE6JVsPzpfzmWaWLjAEu+1LYwc80eu5PXEFVHWTRMdldu5notF jltWbQdlVdOAIPWs4qG/J8Q2eAZ2fKcpvtdX0J1+oL8v7kW6vtS+MFPnbZwY4UT5RAfNXg gXJCv3BtXlKtGZB0rePwDAlVQ7mMhqmp6bAQZKzubwLuEnc1wi7xmd4Te3edcFg3AAyBBq Kqq4tAVG4S6nglm8sIDnDCWkoJjyj57jYzKOcMs2m0OFXqPdDvCGyjchbTooFQ7q1xwGNN CNDPu6PA+vNV7w69bXIpJ4VebgSns/HOHeAGiWd8kVVe8Dna/6u2D7Mqbm3vNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=950e7v2xLxEqWYF/1/r4UbslKMKuUanyv5ajRT2XiEs=; b=Wg2tr/HkqpZhSTd+qBrVM4JlRfuYXro2Huqq4j5JVNMno4Aov0mbDILFXrTsvvsPKBUfvE T2x0THd6hAsB1IIoym+rcB6OaEl3CJ7Wg31oRzfz+XK/VigsRkG6OZT3SyD9mod9DBMrgY j7LcN4N+yAhJC6n8x4rsuD5sE+bbjc+QXbsNY/g9hey1SvdRQeQx/TGsA8hYWf7BgKgWMZ gXOgp4q7LS6eoDZC5mtatlXkhkfZWV0XF6YnCAMXaQXPBSfLbTrnGhcbm2gh4CszrqyHJx OEBCTsacVl5CHYg2YbwKDDp9iFqaBuE4nizgls8wtuOcE40PGxi2hKpq7pchdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199176; a=rsa-sha256; cv=none; b=qxqcG7xtGyJIOKsUoeQqUU52TPUxGbRgx5CpyD8QeVkO4hS95YperqfdrWWadOuF3Z7eKY OxKDUnUBSWml89CwnxLtkQGp9C6uWowt85bokrwkRzszDAFwKpS8d8TdNjSb5d7yf9DqUq 5ncHg+SZgaHzzZ5KYgjW/QyjKDE5AjuJw5howhN47WIVt43qz5Y7cJYuwd0qnOVtpDjO3f PD6W0dZCHBk6DlK5xYcNPTYdLLDU/3W9XOLBv8Wvb7wLDYB66vvJ7OrgAebVq1ffwakGZ8 xLRjpxoUplf4uYLxepxvLuFYZDRZShHk7TRrax12EFY2QQGcAuv5WIDweF8SZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y033mDzXWt; Mon, 10 Feb 2025 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEquZZ028437; Mon, 10 Feb 2025 14:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEquc2028433; Mon, 10 Feb 2025 14:52:56 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:56 GMT Message-Id: <202502101452.51AEquc2028433@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: 787787fa8938 - stable/14 - iwlwifi: module correct -DCONFIG_* List-Id: Commits to the stable branches 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: 787787fa89381015693acb5ae2a34a7c6e892261 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=787787fa89381015693acb5ae2a34a7c6e892261 commit 787787fa89381015693acb5ae2a34a7c6e892261 Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 12:47:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 iwlwifi: module correct -DCONFIG_* Remove the =1 from -DCONFIG_* in the conditional cases. They are not needed. Sponsored by: The FreeBSD Foundation (cherry picked from commit 411c857b4ccedd6491dff9a35e952bc49d053053) --- sys/modules/iwlwifi/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 3508f29979a8..fd11e670b540 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -32,13 +32,13 @@ SRCS+= pcie/tx-gen2.c pcie/tx.c .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 SRCS+= fw/debugfs.c mvm/debugfs.c mvm/debugfs-vif.c -CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS=${WITH_DEBUGFS} -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} +CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 SRCS+= mvm/d3.c -CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} -CFLAGS+= -DCONFIG_PM_SLEEP=${WITH_CONFIG_PM} +CFLAGS+= -DCONFIG_PM +CFLAGS+= -DCONFIG_PM_SLEEP .endif SRCS+= iwl-devtrace.c From nobody Mon Feb 10 14:52:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y34ZZ9z5mH8w; Mon, 10 Feb 2025 14:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y15jc5z4Ln9; Mon, 10 Feb 2025 14:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gp2Wr6LqV3O6pO0EiLQPyMg//pAG/Nakcdl3D1nf8uo=; b=QEbq7xRptuM3nIY8MivWtxwJuQ42J6H/1P0x8mnlSgTCmyWSiIdbXXV3Ij+WO8QDNSXB4V xReyFNMbgRIdoGc3soLCnfY6BRnrpi17FWh/fhwKsBx1z0l9I2iz6gzbwBWanEnpn0WiE7 n8cZ11NpkbZrvf/Xor/J5CpMFXiXjT+byeXdO3eMtq79BRFN/sFVFTvWrVDdZMBGaKwdtm qzwuCNN0sP2iDFihWmgkBjrLsTcg1ia3kV5nXY6Lq5R6TUalf3+EQd/QKLwBN1zndLnpBx 6OHFVO/W42uV9S9tbDGtNnpSabQexDLj55sii6mVIfAEIorUt9JOwETvCdROcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gp2Wr6LqV3O6pO0EiLQPyMg//pAG/Nakcdl3D1nf8uo=; b=ZauHAjmm/OkeaQ8Eqxyw+hMwKxFDm1LgzGB050k7QEEmKXvbbFffLqpGhObukH/pnHKU4F yLjlKUnnVFX9G8V8PcHkwEGPQok4kxyNhoqx77WfNMW28kPVoKHN75DOcqrR0FoIbTauUU Iio7s5ZK0uKsg/Gg81wCHHDB/+35b7YxYQq9E+6XDK6MZ52u/LMxosPVtO1B0k9LdJUnMh AoIHrhkuFK8hzd1lvCOveVmXDtMNUQXwdnBvWAkXeVmEWyLSSM8h2Rb+XEdeHdPmR4aNKa LaeUA1Xicgzc/EVNhRxiN7+2LambK/0chnnFKGRfGA+9ajpuzXqp/tN1z45uiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199177; a=rsa-sha256; cv=none; b=axtCKQZ+CNQGP9dOaaHRarAObvUJjjANskhNUYRHS/cznORmiuN87rgS/aSErAaZak8CtH kzE8S52afsKUY+x0npqmgR1k0L/7Gp9LT9ORdAvyDIW48ZLoNlv6Da8RqgcsQJvcjTRfsi GdA8DTOKqiR16lrLoZPIghZTZXyA2HWCh5L/oyglbXkeBZozcnRhZxY6Qzs35KS7jQ078i REtH0Njsf1e3ju+yOk1eWW00rFFHzDg9dVGIzj2ncWr1qETpfv//ICJWQQMcXOsecV77PD H6SLWfZnknis8TDmHg/Z3sOPoWIUOoKEzgG72wl1ZWF7m4W9XcIbQ7SLSW3WwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y13yWlzXJy; Mon, 10 Feb 2025 14:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqvEE028474; Mon, 10 Feb 2025 14:52:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqvtK028471; Mon, 10 Feb 2025 14:52:57 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:57 GMT Message-Id: <202502101452.51AEqvtK028471@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: be330cd9f9ac - stable/14 - rtw89: turn on debugfs support List-Id: Commits to the stable branches 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: be330cd9f9ac784b9f5ca9a50402ef0e333d67a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=be330cd9f9ac784b9f5ca9a50402ef0e333d67a1 commit be330cd9f9ac784b9f5ca9a50402ef0e333d67a1 Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 22:17:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 rtw89: turn on debugfs support Following 07f6575585bf also turn on debugfs support for rtw89. Sponnsored by: The FreeBSD Foundation (cherry picked from commit 446eab491e523e3d7586e11cb16448e524297da4) --- sys/modules/rtw89/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index 9aede7b528fe..8c2905404f4f 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -4,6 +4,7 @@ DEVRTW89DIR= ${SRCTOP}/sys/contrib/dev/rtw89 .PATH: ${DEVRTW89DIR} WITH_CONFIG_PM= 0 +WITH_DEBUGFS= 1 KMOD= if_rtw89 @@ -43,7 +44,9 @@ CFLAGS+= -DLINUXKPI_VERSION=60800 CFLAGS+= -I${DEVRTW89DIR} CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_RTW89_DEBUGMSG -#CFLAGS+= -DCONFIG_RTW89_DEBUGFS +.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +CFLAGS+= -DCONFIG_RTW89_DEBUGFS +.endif #CFLAGS+= -ferror-limit=0 From nobody Mon Feb 10 14:52:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y45bh8z5mH96; Mon, 10 Feb 2025 14:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y36QcXz4LnV; Mon, 10 Feb 2025 14:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukJ3zX4srHlPxs+Eh2qI9LcG7agWOvKnD6EYeR+LRU8=; b=Pjz6cAuhPrYKl46zfLaDAcFuGdeO14rNFdABnfcXWDAiCIdcsITqsVBHU8oqJNxenWZoIR Ry8DxeGROt0jd+u/dCA4cwA5e6t8rPyftIu58CfRuNQP9j8W/7oldg+Q7BzMsQNyqplAY4 +VeG2/xzUDANu+h1K2G3QTG8l/2zq1WhY5zSlDgYxD5/CLTh0H2V5PJLSjxi7oAxvFfxIw QsoI7Du8PSLpGSNOhS4Yg9Nuoov9WTvMgVmEw/5kU372KYWfEaF2yG/UELw7MQyEqmp5sQ gEoQCKCZZ3Zn8c/oHMXOQYGiUgZytQqChZyA2UBvwEtS1WHARtaswIC+syCPqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukJ3zX4srHlPxs+Eh2qI9LcG7agWOvKnD6EYeR+LRU8=; b=gWOBxI4TvBHu4tBfkQVr2fHRJUU6TcTjOCv37WrGGFj/CTA6i8Ip7+H2WUH2LvXI09OXoG X/TrwIPmxJAabfQaQi9ZcrSvjs2sfG2TS6W3KaqffALX2dJ2XyQ8ecwEOCwQEuS8L6usxd KD7G2ZomCG0lAjKLDDio2S1nh0R6gB+wVYRsT/uDtmJnjzKJJVKf3pJX/EsFzDcyLTSs9M /s9+gXuLJI0GbsLus+V5+cwSCnDDmXbi5/gLutyXtvCTFCLdqLhY2d0K64F8Vhcygi+HuO NpVlHVtfQvVjCKYPhT1ZE9rVsDNMH2sKyKbwOlhrSRQszN6QOQaQH0LvtpLWJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199179; a=rsa-sha256; cv=none; b=kvFwK4wtT/6YiN/2NULCKbZQowW9jgPkj52NcQm9gMYPcZqOAjx1JZKfZFRWEmc2g0S28b /oYbdPVu45n3l90lkazdcKQ9T2NKj9hAbxUz5rsfctmlbZKM3eSH95zeKXQjZTUXBh+lqV sp079+T3tjIn3DC2pe/aEXdi0IkYwra6A+B/NXcaiSI8vDcUD0eZWdpYneB1w0yPe67Ssw 4qyjks8b5cmqHsFdZVVu2fyvLLZzIA1rldIkynRSBKU3zxDRpKYavDdCDvP/D55Yhdh2h+ Tv6OaordU7Bu8gHHm3dMS8Hd69+q9t/ih7/p/kbwqBAtI7DvNfAOxHD9C+8Byw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y35pfnzXK0; Mon, 10 Feb 2025 14:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqx7I028555; Mon, 10 Feb 2025 14:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqxGu028552; Mon, 10 Feb 2025 14:52:59 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:59 GMT Message-Id: <202502101452.51AEqxGu028552@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: 0735e8ddc328 - stable/14 - rtw88/rtw89: avoid duplicate top-level directory with debugfs List-Id: Commits to the stable branches 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: 0735e8ddc3284765a7e35a2d2f83a6ce1faff2c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0735e8ddc3284765a7e35a2d2f83a6ce1faff2c7 commit 0735e8ddc3284765a7e35a2d2f83a6ce1faff2c7 Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 23:55:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 rtw88/rtw89: avoid duplicate top-level directory with debugfs If people like me having multiple cards in the same system creating the debugfs dirctory leads to a panic upon attaching the 2nd card due to the duplicate name. Rather than using the hard coded driver name, use the device name (e.g., rtw880, rtw881, rtw882). This solves two issues: it avoids the duplicate name and we get individual debugging/statistic information for each card. Sponsored by: The FreeBSD Foundation X-Note: ath1[01]k and mt76 likely will need a similar change (cherry picked from commit b4886c4ece3e692c294aa853da7aec849f8d00a2) --- sys/contrib/dev/rtw88/debug.c | 4 ++++ sys/contrib/dev/rtw89/debug.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c index e84f25b34c46..1373633d73ee 100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@ -1223,7 +1223,11 @@ void rtw_debugfs_init(struct rtw_dev *rtwdev) { struct dentry *debugfs_topdir; +#if defined(__linux__) debugfs_topdir = debugfs_create_dir("rtw88", +#elif defined(__FreeBSD__) + debugfs_topdir = debugfs_create_dir(dev_name(rtwdev->dev), +#endif rtwdev->hw->wiphy->debugfsdir); rtw_debugfs_add_w(write_reg); rtw_debugfs_add_rw(read_reg); diff --git a/sys/contrib/dev/rtw89/debug.c b/sys/contrib/dev/rtw89/debug.c index 750ef1578e18..a87f4b49829d 100644 --- a/sys/contrib/dev/rtw89/debug.c +++ b/sys/contrib/dev/rtw89/debug.c @@ -3974,7 +3974,11 @@ void rtw89_debugfs_init(struct rtw89_dev *rtwdev) { struct dentry *debugfs_topdir; +#if defined(__linux__) debugfs_topdir = debugfs_create_dir("rtw89", +#elif defined(__FreeBSD__) + debugfs_topdir = debugfs_create_dir(dev_name(rtwdev->dev), +#endif rtwdev->hw->wiphy->debugfsdir); rtw89_debugfs_add_rw(read_reg); From nobody Mon Feb 10 14:53:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y54JN0z5mHNL; Mon, 10 Feb 2025 14:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y5277gz4LyS; Mon, 10 Feb 2025 14:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhmckj7mckfkDBXxojOCPqxIJ1RzMZRQdYG2V5DqA5U=; b=smXIZbKDhT19GVggT/kgy2sxTFmH4kr3ShAT+Qpgd+hKOA7qO+hImR8G0xxfI/MRFPYwkn Oau1aX8/VEgxS+EMjIs4aV0Km+90CNE1IKcKNhgjeQ4tttKCwYeAcByYd4Uii0puZ1PnWs d5dFP1s2jmGnj0Ddb5fm0r0rGmdnQvfrzzyq7PFbWVHQIoP/AvfbkzVI3V7v+QUyvd7rAI yHny1sxMFXTCxnVKJeNYZtqJMXrw32njD5O6M92pA6QhY8JZ7zwXWQUwdcQeiRnOj5vgZd zheWAQ9wtYIbLBBDUhaA3ht9buevaAabWjSxIg2z6vLCSdozd1stb9I0nxKCag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhmckj7mckfkDBXxojOCPqxIJ1RzMZRQdYG2V5DqA5U=; b=wqg1kjEXileYcoR0B0wa6zWoQQkpLQwMhOl37sS52sAheT7523n3BfctOS3gdH7pdOAaW3 3xDLiKc+YIMTE5ilXWAlSroAFIiMldIjMzLN8vrgxR6AriNUzDSJkx3KljpLAEAg5B0z2l GE6DwmuGSlbIpwrsETP82IxaazUE6nM5mY0XLMG2Iedc2QGmYVRTQJUowZcuiQ3MznGeCH m3fixB4WZafNAuKH4BIGQ3SciOfvj/6V8F92Npb4z5WJvnCXeeTZf5z/DPEnReSp4wZVd5 XQYTa45jh2EsO1NfTvLFseOFRhDHwkiYqAPpz2g9S7oBXLh07NmJuxyeqDxfmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199181; a=rsa-sha256; cv=none; b=nic7Aft7/yMQoILr7oDoBCh9Y+vDR4eqyNM/oEXli079/RAq9MdhZ0RUtcdSkfMjZbqDn1 lkWBHSP3jDxNEH71GS+cm8ZDU5JPtcpBsZbqyVE7GQHJDYO6cdSiB0lR7AHBftLP2gmNGP l0k3l/Xy0EbSdfZNFMLVWSigMFqR5hoSMO/PybelS6xqv1GpZjKZrmgRlLQDpZzOV7nM+K pkivOCIfrJG7rDHYV9Uap4LNcvAH+vNJ7g8amoOamcmGBhSylGL8djYhxKXfqr5mMeGWzC p0Fq00segwLomAJQR4KUATu9dF32Vb70D8wCjJiHiXQWvFVLN97TdrkzeB+o9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y46xL6zX74; Mon, 10 Feb 2025 14:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEr0JR028598; Mon, 10 Feb 2025 14:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEr05D028595; Mon, 10 Feb 2025 14:53:00 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:53:00 GMT Message-Id: <202502101453.51AEr05D028595@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: 9bb63440a21d - stable/14 - lib80211: regdomain: add the two other 160MHz bands List-Id: Commits to the stable branches 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: 9bb63440a21dfc383598c277fbc6f43df4eb45c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9bb63440a21dfc383598c277fbc6f43df4eb45c0 commit 9bb63440a21dfc383598c277fbc6f43df4eb45c0 Author: Bjoern A. Zeeb AuthorDate: 2025-01-04 07:58:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:12 +0000 lib80211: regdomain: add the two other 160MHz bands ETSI had one 160Mhz band in regdomain but the other two were missing. Add them. I am always confused that the bands use the center frequency of the 20Mhz edge channels rather than the actual edges so it seems we are only configuring 140Mhz instead of 160Mhz. We will have to go through the entire regdomain file one day and make sure to verify all the power levels. Sponsored by: The FreeSBD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48356 (cherry picked from commit a3a308f0f29b14d522c56dd88231e27fdf206104) --- lib/lib80211/regdomain.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/lib80211/regdomain.xml b/lib/lib80211/regdomain.xml index 5a432f39ccf6..557af0349cb0 100644 --- a/lib/lib80211/regdomain.xml +++ b/lib/lib80211/regdomain.xml @@ -572,6 +572,13 @@ IEEE80211_CHAN_VHT80 INDOOR + + + 22 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT160 + IEEE80211_CHAN_DFS + @@ -651,6 +658,13 @@ IEEE80211_CHAN_VHT80 IEEE80211_CHAN_DFS + + + 13 + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT160 + IEEE80211_CHAN_DFS + @@ -1905,6 +1919,11 @@ 80 20 IEEE80211_CHAN_A + + 5180 5320 + 160 20 + IEEE80211_CHAN_A + 5260 5340 @@ -1958,6 +1977,11 @@ 80 20 IEEE80211_CHAN_A + + 5745 5885 + 160 20 + IEEE80211_CHAN_A + 5180 5240 40 20 From nobody Mon Feb 10 14:53:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y85Kj7z5mHHb; Mon, 10 Feb 2025 14:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y74q4Gz4M43; Mon, 10 Feb 2025 14:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpKfe572BzbGjHsMnnZqtYiPG8ri2kU6wKxuOVmVG7A=; b=t3fDUKPqg1E3bPhV7hUCs3jjA2thfQP2IMyB0kwVG6ChAqvOpJdkF8hNyvgOVj7jGZ/eIC yGCo6bJYm4l77jxefxz1Y6BlG6QzLrhkPAlGazFaR8WOQUhpp5sWnxzMb2J3hKqK7YvK4c zUv+aCnPLFO08R6/Px6eR9cEqFS4vFIS6BooetZY1IVYsZlFn49f60XMMSj3XfWwGXEG7G I+jqfS7I7ku8/55yJziY0zrgXI4DJzWNMmSAj/JxF7sFGN/qn3yXcG6ijQ1AnsRyxNY3ls E6eIIuXdU9hcvsauaI8t23VWdIx/uivioSN2bihrz+zoUHhvGgOJotSyFJLt2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpKfe572BzbGjHsMnnZqtYiPG8ri2kU6wKxuOVmVG7A=; b=RaUg2hdZyRFjererP/jRh61ziz38y5iHX9wji1gI7jBIp2slx2PY7r6H0qYiLzgwMbpstV r3gYOzMy2zxJmRklZuIVZszO0nlUTO6K4sQwiw7zqWJ/B6NMR1c/M48GaLxCg7G+Ov55jY UiacXWyhHfE/e5eQfL+6rZuzTMCs3by3z3j4VJClwIaz81cNb7Rgjezd+ga7NJ/RHT4G4t cmctbXkBAv5FSxR+Xd/2DPQZbleRtRwfA0c1w/aPAylzHPO2IqeyPjfy9Yc2WilNu6Bncn XAFeiMbNKhrbgzDxEtjrbV94J1a8aJ9C/K/vsuubV//FL9IQW2Ick58iHMF//A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199183; a=rsa-sha256; cv=none; b=kDkuW/jUBdSzp3GTuA37yWwDXdMNZ/DjSpYfcIjt8Qj77w3pN1nUfFc6Rfz/oIgMPUrctL UbKu+jZus5ovYz3T7QQ9v5T8BeqRPMnvMs1EP/eufFjPGXg+FZqnglsTUcmMm5SrwSi+yz cCR03yM2uxpJ06n1u9H5flc2tJHeFpi7921LmKY9Ip0i+XLmb3/d7wrixamrqLhJDIhFPy 3dHb7xawuEIngFXApbza1+ZFpxKhjDNsI+JJlVxmK4cCD6HnU9T+TSF5s2FFjUCXyHXkX4 Ed5zq4cDaOOAxtUHE7dSmWSiZvzBarP8jnO0BHtMEIX/YnGM1VfVtMMNNARdaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y71r1XzXWv; Mon, 10 Feb 2025 14:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEr3Mg028675; Mon, 10 Feb 2025 14:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEr3qB028672; Mon, 10 Feb 2025 14:53:03 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:53:03 GMT Message-Id: <202502101453.51AEr3qB028672@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: 054c043b0abf - stable/14 - ifconfig: 802.11: fix indentation of a line List-Id: Commits to the stable branches 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: 054c043b0abf7615124e2a9a8e00742a8afcdffd Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=054c043b0abf7615124e2a9a8e00742a8afcdffd commit 054c043b0abf7615124e2a9a8e00742a8afcdffd Author: Bjoern A. Zeeb AuthorDate: 2025-01-04 08:01:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:12 +0000 ifconfig: 802.11: fix indentation of a line No functional changes. Sponsored by: The FreeBSD Foundation (cherry picked from commit cf71349a23f02b55bd3bb4973decac87f7a7d2b8) --- sbin/ifconfig/ifieee80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 396368798da3..77f7bdabb0b2 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2296,7 +2296,7 @@ regdomain_addchans(if_ctx *ctx, struct ieee80211req_chaninfo *ci, memset(c, 0, sizeof(*c)); c->ic_freq = freq; c->ic_flags = flags; - if (c->ic_flags & IEEE80211_CHAN_DFS) + if (c->ic_flags & IEEE80211_CHAN_DFS) c->ic_maxregpower = nb->maxPowerDFS; else c->ic_maxregpower = nb->maxPower; From nobody Mon Feb 10 14:53:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6y65ycdz5mHHZ; Mon, 10 Feb 2025 14:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y62rTDz4Lln; Mon, 10 Feb 2025 14:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9l9vlN9tYsdghdqHJXjLUMV9+4bFFhYROtN8toRVP0=; b=tj3k3s0D4olhYAx3JgE7Y+yb9C0Spy3XDKkcODRE6BYr7/5gO0sqVLQ9xHLTgKptinVr9A n123S5PMpxeAhI6JBJmhLQHCMteVJk/WbuuI+1bVd/17U+uI60YfS/OAtC4khGVYU6cJ3w KgEi2CrP3nqnnIxIaxLMfZojPOM2q6h9udpRz5sI/8ehxjvlS/zgscby9QPyxTq38LYrCx QddfItBH1hhtQKX8WZ1hJgAqTrsvCxLq+QZjR0uy2GFjNE8j7jEbEEhqEd5e9oJ0COXwLU t3sXXXtcdHAyu8j/uZJkVNJHpNGJk9gJKZMDRe+RxZ0YTeNhwGWuYc4s7S96DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9l9vlN9tYsdghdqHJXjLUMV9+4bFFhYROtN8toRVP0=; b=aMtx1DhKc5FFQLkD1DlBJDZDnKtI5lVZnvLE4w7JbeKP/S3JFZzi4RdEskT6nvwvtgfeZN rl+WY8RlSw+jRoayKZwUwHzPww3IXGV5/acubUvlyeEeX+eP6bAebxJAvl7kOVsCnvoA7m ziZUOz58AIdIXNnxg4jCm5dYYXhRoZBmKbKOJTLv574nl9nyDhiDsVzfMRWarTplHYNzBE /TM8vNPoca66+lfV7/BE4yHdRgsM34OxBN6/YcshoTnWnQqu5t4FKPjh6N5DHWX/RRabuS PNDY1G6SnYcIUcDdYiV4V4D4NhVyOmitnqsnLy1+NtFP7l6495VIMarG0YO+LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199182; a=rsa-sha256; cv=none; b=jb5knebRrxwuiX1o3zZQR5DOsCs606uibOAD3KXC4MvZjG4G1SitOH7/wu1viJeDXd3OXQ 8XLzxW+e8ddl2NOwFHuE9kpyU6u4Imdh2GTla7Z2meewWTK4b/wm/iEEVcHjVoosgWZnO5 5zL7vz8p/eypAOWpMgZQzMmUCXhGDIJPgd8G8Pmx5kxZSQUAtJ1JHQNoncfS0GkFdGRlpm mypHWFuuKfId/2U85pCByfbnlVxjflKFTCFN/G0WZNQfKL6QaZnTda5u9Sk8WKBxgObOH2 2Ax+9JTJsi+60bQh3Jp/82zlTuDlj3iIPWVuqz/yjyeWwp6G/sm2T4eXt3Iagw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y60sM9zWgW; Mon, 10 Feb 2025 14:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEr2sT028635; Mon, 10 Feb 2025 14:53:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEr2Wh028632; Mon, 10 Feb 2025 14:53:02 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:53:02 GMT Message-Id: <202502101453.51AEr2Wh028632@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: 1b5e1d919fc3 - stable/14 - ifconfig: remove debug printfs from set80211vhtconf() List-Id: Commits to the stable branches 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: 1b5e1d919fc347d68ff149f6ac1d5c64a38897b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1b5e1d919fc347d68ff149f6ac1d5c64a38897b6 commit 1b5e1d919fc347d68ff149f6ac1d5c64a38897b6 Author: Bjoern A. Zeeb AuthorDate: 2024-12-28 10:00:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:12 +0000 ifconfig: remove debug printfs from set80211vhtconf() Anyone testing VHT options would wonder about these extra two printfs by now. Remove them from the tree before I have to do so locally again in another branch. Sponsored by: The FreeBSD Foundation Fixes: e9bb7f9aa1b4f Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D48319 (cherry picked from commit 91a4107d6d3028acd96df96de33b8a7665d3eb03) --- sbin/ifconfig/ifieee80211.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 25de7fb13632..396368798da3 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -1978,13 +1978,11 @@ set80211vhtconf(if_ctx *ctx, const char *val __unused, int d) { if (get80211val(ctx, IEEE80211_IOC_VHTCONF, &vhtconf) < 0) errx(-1, "cannot set VHT setting"); - printf("%s: vhtconf=0x%08x, d=%d\n", __func__, vhtconf, d); if (d < 0) { d = -d; vhtconf &= ~d; } else vhtconf |= d; - printf("%s: vhtconf is now 0x%08x\n", __func__, vhtconf); set80211(ctx, IEEE80211_IOC_VHTCONF, vhtconf, 0, NULL); } From nobody Mon Feb 10 14:53:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6yC34F9z5mHFC; Mon, 10 Feb 2025 14:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6yB5LDBz4LpL; Mon, 10 Feb 2025 14:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOKF7B+aQH4lM4E/flQqhJmUQ0JB6a/qa0ZudKxPOa4=; b=UP/bSYyts7H7oNpRk9oNwoigIt1CXrveaqMJ+sj+petHDKik6BJb4ewe47b2C9RJFC9ZzW LBrXc8UTjcIk2PxCjw0tlYzACK/TYDJLZL2t040F05uJYqz8tPoXnd2vzDbzAFIwTArSgR MOtS4fiNxeUFEOPG6sPgMMnoG0kGO/sTdwLBShyg72aTATO7JWcWV8rqB4QQOtCQw6oSuB WNj9Co8uBXGoVVzb4C0qDL08Vvi8Xe1CM+zwPbKA8fqtcrbqpOuJGDu+6NtQa8Yrle8MAw K22mPsBeZ9oZpQt/0VPBk9sfB3uIyQ8n7DDtvHk15wcz0cie8aZgL+o0LJvEow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOKF7B+aQH4lM4E/flQqhJmUQ0JB6a/qa0ZudKxPOa4=; b=JSUM0UR6xFdiEoGq08qb7vH7ttyY7aD9ntzdU483wl3qpE5RF4n9/pxRqlXs1KuzBlBtpq bH5B2+jussbQvtYKykDYLXJo6W2ScSEcAbNWKufLo4dOGYbusdxeV9Oxq2FLQR6sPSEQsz PjzBpyfLhL03PNJy2/1V7iSI7asLKqo7Fxy/3sKvoSaz9mbs2+MgjWr34OKugwX056r8PQ C2M0K+LkOZVvRi42w6ckOmCYr7wJF0IV3cLCB0ky2B7tOOpmnzG1aggDrEi8R0OQsDIUEA czUcDszWSxeuHv0OoJINY8EprhtBEyX57E8opvzUNEle85GzKfNAHOKUTI0Aow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199186; a=rsa-sha256; cv=none; b=ox2t2mRZzD86Ty3uyCITCwOPoVhGhaCsNKXs0Xmi6vsrRFGVGLkd2T11ahmn5UxXAT5Xv9 7d9JIcsGEPMThW3ys+TlnyzXbMo/Xo5B9hip7JBaiKubIHZ760pnffdjVSd4q1wiOl/WGf 76bO6VwGp0l1WEM0LnKejQHvsI2v5pAzsqKy/qtWi12y70QSBLJ2YDvsIQl2QYCM1PaWUT to3w2IT4xUvYV+zfxVCaYQBjWqTbRQ39vUm9zFaqjfXELlRBmf/xVUFLRwkaBQ4cNv5q+z muiXaMxu3m6MqEfBEv6xXfZTFtMiYGiuBFA1OgkDg6cMSswo/lfaWNsXs47f4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6yB4Hs2zWgZ; Mon, 10 Feb 2025 14:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEr6pB028794; Mon, 10 Feb 2025 14:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEr6Jt028791; Mon, 10 Feb 2025 14:53:06 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:53:06 GMT Message-Id: <202502101453.51AEr6Jt028791@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: 51b3a9dacfee - stable/14 - lindebugfs: use __func__ not __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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 51b3a9dacfeec79759fa497d9fe8e87dde2c45be Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=51b3a9dacfeec79759fa497d9fe8e87dde2c45be commit 51b3a9dacfeec79759fa497d9fe8e87dde2c45be Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 12:07:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:12 +0000 lindebugfs: use __func__ not __FUNCTION__ Change to the C99 version and not the old gcc name. No functional changes. Sponsored by: The FreeBSD Foundation Reviewed by: dumbbell, emaste Differential Revision: https://reviews.freebsd.org/D48736 (cherry picked from commit 94e6c8d7d19de68b29233e59c85b16c645c1a872) --- sys/compat/lindebugfs/lindebugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/lindebugfs/lindebugfs.c b/sys/compat/lindebugfs/lindebugfs.c index 6ff9cea6c4e8..ab1dc2a0e5e0 100644 --- a/sys/compat/lindebugfs/lindebugfs.c +++ b/sys/compat/lindebugfs/lindebugfs.c @@ -131,7 +131,7 @@ debugfs_fill(PFS_FILL_ARGS) rc = d->dm_fops->open(&vn, &lf); if (rc < 0) { #ifdef INVARIANTS - printf("%s:%d open failed with %d\n", __FUNCTION__, __LINE__, rc); + printf("%s:%d open failed with %d\n", __func__, __LINE__, rc); #endif return (-rc); } @@ -166,7 +166,7 @@ debugfs_fill(PFS_FILL_ARGS) if (rc < 0) { #ifdef INVARIANTS - printf("%s:%d read/write failed with %d\n", __FUNCTION__, __LINE__, rc); + printf("%s:%d read/write failed with %d\n", __func__, __LINE__, rc); #endif return (-rc); } From nobody Mon Feb 10 14:53:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6yC34nxz5mHFD; Mon, 10 Feb 2025 14:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y940kBz4M91; Mon, 10 Feb 2025 14:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Dt2y1AiVKxpJhhnG6blQReWOYijHbngZTK9RiNzRdo=; b=GljZ4EoMjU10JSS1C7QlBI7oB8IEfUXOou8NIEeuwo+e6yywRz0nsQIEUOTRPXFPi1wlbX bBlBcZSEDqZ1YsXLFaYZvix2tBWIXh2WlpAt9IRY0y2SRqCn8ZNiunXqqFf1qHtU1O+l9q wLBUIQJNcWesKtH2v3GQY5sQWk/K3JwYG0AK+XbBHqOBnhlIJG3sbVyBwFgAzuzZ4XK7t9 vPYPf8V+Caslxg8tl5peFklzejHtS0RPZ3jNArXtr97101rR3445LrK6iuE3UDPEH3S3ru PVla0DvUKB0E2u9mOxMiYTYCFmhifSWpPVjytnLCHGGES88yTMaWTg1F7GYFBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Dt2y1AiVKxpJhhnG6blQReWOYijHbngZTK9RiNzRdo=; b=yeQwID6D3qiKL5ME3LQk7Fac8jXqVMyhflhiw18kTwvJPM4PrUimmjG5AVYGKT7R4Zb1Pt O3fFyJ4dGzDmKzg78Tn1jdMbLggMJEzMBXBxOTuXcgEXBGzVzrUUfWGQP7gsQfFuAnOORF 1rw9NMxpzvJJxueG30YT38ji2kjC+0XLlT7dJqtfldfH3E+jMP1m+pmds8qdqTNe2ZY1T7 c3cjrZhWBsaRJDu/XhaIb5SXf1J61BP3BeW3amp366nHw5QUE9MCEoJ+d7XZIVjMhsolzT V3lU+ktOMkICTVFYwqBnBy+VeSSSllZitmxwMzN6cgLRp3Q0n3mUPb95mjSgfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199185; a=rsa-sha256; cv=none; b=EKvq6xUJDkek8cskLsCAhFQnU4gQp79FUKiClGpE9o9qQpYBruZeM0KneUbj/TkL0SGDKz FB9hz69XAJcTdkeb8N3/tt8V+FlUEzW5o6Tm4WLXeRUZbmPKl74Loc3npPkgZNVmCVKkxD rfAd34Ag1uHpY9BtfqhU5n0le8MkFGiuBGiBOo1DRCT2Xjm1P5xNtQ0yJp7nMLGmjfBf8j 6CM04V8EYgBJicFzIwgNfR6xpLFWkWMd/4npPLx15/ygcQ2Yhr9j7+hUbIcqP6hcpn1A29 1uWrT7t1OyKwpQGjgADsfj1uCpGVd2TrOpSOnHDC1lxP55K2Rq3Ppa5p2lkgFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y93BnVzWgY; Mon, 10 Feb 2025 14:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEr5Lv028755; Mon, 10 Feb 2025 14:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEr5xG028752; Mon, 10 Feb 2025 14:53:05 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:53:05 GMT Message-Id: <202502101453.51AEr5xG028752@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: 8552e8de6d7e - stable/14 - contrib/wpa: pass IFM_IEEE80211_VHT5G if vht_enabled on the channel List-Id: Commits to the stable branches 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: 8552e8de6d7e980403c2247f9c2b802211b4b894 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8552e8de6d7e980403c2247f9c2b802211b4b894 commit 8552e8de6d7e980403c2247f9c2b802211b4b894 Author: Bjoern A. Zeeb AuthorDate: 2022-11-09 16:41:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:12 +0000 contrib/wpa: pass IFM_IEEE80211_VHT5G if vht_enabled on the channel Set media mode correctly to IFM_IEEE80211_VHT5G if vht_enabled is set on the channel. Otherwise we'll end up setting 11NA. Not a problem on first sight given net80211 does the upgrade to VHT for us. But we would not set iv_des_mode ("desired mode") on the vap. Setting this will put a contraint on/help scanning for our desired (VHT) channels to my understanding of the code. Sponsored by: The FreeBSD Foundation Reviewed by: cy, adrian Differential Revision: https://reviews.freebsd.org/D35978 (cherry picked from commit a0e45db6f6eb6660e78921bbd5307fa7fc13d0a9) --- contrib/wpa/src/drivers/driver_bsd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index 5f734b737184..75a1a061e0a7 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -615,6 +615,7 @@ bsd_set_freq(void *priv, struct hostapd_freq_params *freq) mode = IFM_IEEE80211_11B; } else { mode = + freq->vht_enabled ? IFM_IEEE80211_VHT5G : freq->ht_enabled ? IFM_IEEE80211_11NA : IFM_IEEE80211_11A; } From nobody Mon Feb 10 14:53:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ys6yC27MLz5mHKv; Mon, 10 Feb 2025 14:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y84PPsz4Lwj; Mon, 10 Feb 2025 14:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8UzjCisAd8MGIX+tFDvcyhsnERfp6zVOT6OgcONw9g=; b=S5q2w/1+EGT/jelYvAkkGd8cTdIoXvTsdaZUEXjwBxBM5/byzUk0haE7UoGMabClZ+7KL8 SrKOz8U/4jmcF+ahe0bzlpUe31RpA70/nVURaAH9pWFMpCJXfPA7x4ea9S9/QNVHii7mzU M2jcCyhaDqcJsLx4Knkg65aLw7l0sYI0u5J1VtnQjX5ODXMnj+tClyQ7RZxCyvNF05iAAk MHXb+WMfkp8s5J2kpt9Zu5CkrXMRA2mEGFZTKHLUgbnOQJhDgB3ov3dtxIHCyoAIW5C0yq boDcb9th0zjdYGaQeSX5voJhZbssuDfh9qxpmQO9LgKFsN+VzonKrrxWmv6xvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8UzjCisAd8MGIX+tFDvcyhsnERfp6zVOT6OgcONw9g=; b=YxyaDZMAYmoerPS0udf+qK+1w6TcImyLN+I4gpxl3GABJwH1L3+5FI2YLVqOzePQuWXdhV bN4PM/NZ5ihaQtodNEmGeBE8Wqo+gRC0LDAF6DQFDi9CQ329ZH7WlZhuh/Nrm+2xiI9NK+ QdylQmXQjZhO4tBXV4mZvMVfUiCWzHp3TlJZwmIvWqHvG+RuOoPh9NCHChndWXZyEYlNGd PYZEf2P7+Xk+jHLPGhPhrsyo+bl8FrSgWWElzywXxWvA7e+qH+SB/QRmxrHdfPuJR70zWW HOIicn3oHSOFu0p7ElK/O4s2TRDoShELiFycvAULstwSuU9ewxWodwumhPcJUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199184; a=rsa-sha256; cv=none; b=DeIKz6ykJJEgG2LnSKWy8NCtR3mIBgon8ynNCESBXTal8J4u5qMVLmZYNy9q5Do/iQE7o0 vHKwT8xunEs8D3D/JM+fS4t04JzZ5QMInHSOwm4203BnNqPF1lLx4GPR4DNuaJaTJtjCb/ S8KVNsMswl88DRoWZ29ALtslHerzzGRyO8twWY6Jrow9+yXP9BKysOoFsa2spl6tekMEiY j2g23LYQu9LcaMPtIbAudHgRjJKS11XQwr3Rs8Smz9pKOdN7BEcDUY0S9UpreHtH+hLRup 9uR/bTpgcbGicP656dS/sDfam7QBnKMFPDszbYhFhjC3+wdnTO2PKEm6mf8Tmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ys6y82f34zWgX; Mon, 10 Feb 2025 14:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEr41r028713; Mon, 10 Feb 2025 14:53:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEr4fV028710; Mon, 10 Feb 2025 14:53:04 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:53:04 GMT Message-Id: <202502101453.51AEr4fV028710@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: 4f9bec61d85a - stable/14 - ifconfig: make -vht work List-Id: Commits to the stable branches 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: 4f9bec61d85a8092f2256808557f3df62072876e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4f9bec61d85a8092f2256808557f3df62072876e commit 4f9bec61d85a8092f2256808557f3df62072876e Author: Bjoern A. Zeeb AuthorDate: 2025-01-04 16:58:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:12 +0000 ifconfig: make -vht work Also hide the other vht options on -vht and only show vht40/80/160/80p80 when vht is enabled. While here fix some whitespace and comments. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D48326 (cherry picked from commit 42410c6d682c4e00ce6147f99b51a55f6f3fe075) --- sbin/ifconfig/ifieee80211.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 77f7bdabb0b2..d4dcfdf63254 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -198,8 +198,10 @@ static int gottxparams = 0; static struct ieee80211_channel curchan; static int gotcurchan = 0; static struct ifmediareq *global_ifmr; + +/* HT */ static int htconf = 0; -static int gothtconf = 0; +static int gothtconf = 0; static void gethtconf(if_ctx *ctx) @@ -213,7 +215,7 @@ gethtconf(if_ctx *ctx) /* VHT */ static int vhtconf = 0; -static int gotvhtconf = 0; +static int gotvhtconf = 0; static void getvhtconf(if_ctx *ctx) @@ -5416,26 +5418,27 @@ end: if (IEEE80211_IS_CHAN_VHT(c) || verbose) { getvhtconf(ctx); - if (vhtconf & IEEE80211_FVHT_VHT) + if (vhtconf & IEEE80211_FVHT_VHT) { LINE_CHECK("vht"); - else + + if (vhtconf & IEEE80211_FVHT_USEVHT40) + LINE_CHECK("vht40"); + else + LINE_CHECK("-vht40"); + if (vhtconf & IEEE80211_FVHT_USEVHT80) + LINE_CHECK("vht80"); + else + LINE_CHECK("-vht80"); + if (vhtconf & IEEE80211_FVHT_USEVHT160) + LINE_CHECK("vht160"); + else + LINE_CHECK("-vht160"); + if (vhtconf & IEEE80211_FVHT_USEVHT80P80) + LINE_CHECK("vht80p80"); + else + LINE_CHECK("-vht80p80"); + } else if (verbose) LINE_CHECK("-vht"); - if (vhtconf & IEEE80211_FVHT_USEVHT40) - LINE_CHECK("vht40"); - else - LINE_CHECK("-vht40"); - if (vhtconf & IEEE80211_FVHT_USEVHT80) - LINE_CHECK("vht80"); - else - LINE_CHECK("-vht80"); - if (vhtconf & IEEE80211_FVHT_USEVHT160) - LINE_CHECK("vht160"); - else - LINE_CHECK("-vht160"); - if (vhtconf & IEEE80211_FVHT_USEVHT80P80) - LINE_CHECK("vht80p80"); - else - LINE_CHECK("-vht80p80"); } if (get80211val(ctx, IEEE80211_IOC_WME, &wme) != -1) { @@ -6029,7 +6032,7 @@ static struct cmd ieee80211_cmds[] = { DEF_CMD("ht", 3, set80211htconf), /* NB: 20+40 */ DEF_CMD("-ht", 0, set80211htconf), DEF_CMD("vht", IEEE80211_FVHT_VHT, set80211vhtconf), - DEF_CMD("-vht", 0, set80211vhtconf), + DEF_CMD("-vht", -IEEE80211_FVHT_VHT, set80211vhtconf), DEF_CMD("vht40", IEEE80211_FVHT_USEVHT40, set80211vhtconf), DEF_CMD("-vht40", -IEEE80211_FVHT_USEVHT40, set80211vhtconf), DEF_CMD("vht80", IEEE80211_FVHT_USEVHT80, set80211vhtconf), From nobody Tue Feb 11 00:50:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsNCL0FCtz5n6Fh; Tue, 11 Feb 2025 00:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsNCK6gVYz3kBf; Tue, 11 Feb 2025 00:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6ezo4CFW8QymuLG0PhQzxnWG6ejS8IN8AM8z/3wDn4=; b=TBl84I7wEjr36A2G8GROT2c0rS3a582+9tUNgH/5cd8Hw1wasTwZzSeWleRBSMouhqbMLN k6mUtf01/eCwQ1tSEzf1bIhB7BOIB1ihnqegHHzN5O4gwt/+wqLt2GhuX3OZtDAmLxFHyl IHSvrdcGswUVK+CbOZJ4QkYBnu6ZubN8AOjyJvp4U17xdXFcho7ASJRELOCvEkWx72c+h1 Ikqbe+pcG9tAj9Ir2jqtwJhvz5NL+G6iTLhvUpj5baGBOdXtMK0gFTQhbWCUSXCRoADsYx QgU7uUyj5nMROQy+cLKB0i/laCle1scg+14bRSsciqaVRVS5dP25oPT0Yx58Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6ezo4CFW8QymuLG0PhQzxnWG6ejS8IN8AM8z/3wDn4=; b=qGSeKSaasamwnFB4Zaz5wE7WMQ1MbwKyJrLeH/zRB70KPv9OlaT2amrMEdr+b1CC8fbPv5 fkov+1/C2DbF3cNQQEYS17ZLbomtlxXk4zCeJ7VduC7e5lImQDI9hGgw1oChlNHBbhT0qo sgr0UB2SFVsR/KEYOhsq6rHh7096mja1dHV00d3gce6YBEUQkfcXlDVuxICWJSZfcaMuTA /JSl/cKum7mRsUkr/W3mGB2SKYH12T813UckJtWeOUxYNctHoRssneJaX9vZvabA/5Vy5h imKr4SrBVp/o1k0kUs3wCs3lcOobE6KDhBKxQxsdQUkZbpEPyF5Biw9y+3zLWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739235022; a=rsa-sha256; cv=none; b=pdC/bbbFJKXAfxfv8aoWjFXotoU6OjzY/EjYZsmpARCi5pktYJd4iwC2rZ1ZANY0VA6zHn NHA3PDv+wG+VaUVG6eGCzFOBgANWlu7VNBQD2YjW7QVn/XD/FupYCNYMzFNQ99lreIwMoF FNpMbwoyV8XU4RH4Uew5hwOWTd4MX0uK1ymGHFbKGjAOhqMVGTtHzfoLwlEmEoOrUm12bU b/Ac77Dsohdyuqz8sBTPV9n+22OHEMv/WSK5YQrdE9kiSVNDs8pC7YaFpSh5fR3wkSGgv0 R7n8La7Rkc60fiyWeUT2hA+ZJRNSfmLdz5Bn+jAXgnNcVMSsfR5AUOq8s8kE5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YsNCK67jnzqq3; Tue, 11 Feb 2025 00:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51B0oLYV046866; Tue, 11 Feb 2025 00:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51B0oLGn046863; Tue, 11 Feb 2025 00:50:21 GMT (envelope-from git) Date: Tue, 11 Feb 2025 00:50:21 GMT Message-Id: <202502110050.51B0oLGn046863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 50202e05a356 - stable/14 - net: if_media for 100BASE-BX List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 50202e05a356881e125ec5da7871b67d6580aeb5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=50202e05a356881e125ec5da7871b67d6580aeb5 commit 50202e05a356881e125ec5da7871b67d6580aeb5 Author: Kevin Bowling AuthorDate: 2025-02-08 23:49:46 +0000 Commit: Kevin Bowling CommitDate: 2025-02-11 00:48:35 +0000 net: if_media for 100BASE-BX d82c3e81: net: if_media for 100BASE-BX Renumber 1000BASE-BX and add 100BASE-BX sequentially I added this 1000BASE-BX in 78c63ed260fa20b3500aedfe41dc0dcae9593f51 but did not connect it to any code yet, appologize for the churn. 7835a4ad: net: if_media fix syntax/build Fixes: d82c3e815a5f ("net: if_media for 100BASE-BX") (cherry picked from commit d82c3e815a5fc0069562b69145ad695f9aa183f9) (cherry picked from commit 7835a4ad6948290c92ea55c7be34ae72f4e2b0bd) --- sys/net/ieee8023ad_lacp.c | 1 + sys/net/if_media.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index c1e91f7fcb3e..f6a1be8004e0 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1137,6 +1137,7 @@ lacp_compose_key(struct lacp_port *lp) case IFM_100_T2: case IFM_100_T: case IFM_100_SGMII: + case IFM_100_BX: key = IFM_100_TX; break; case IFM_1000_SX: diff --git a/sys/net/if_media.h b/sys/net/if_media.h index c03a4c87b355..534ad36da517 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -258,6 +258,8 @@ uint64_t ifmedia_baudrate(int); #define IFM_400G_AUI8 IFM_X(117) /* 400G-AUI8 */ #define IFM_50G_KR4 IFM_X(118) /* 50GBase-KR4 */ #define IFM_40G_LM4 IFM_X(119) /* 40GBase-LM4 */ +#define IFM_100_BX IFM_X(120) /* 100Base-BX */ +#define IFM_1000_BX IFM_X(121) /* 1000Base-BX */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -437,6 +439,7 @@ struct ifmedia_description { { IFM_100_T4, "100baseT4" }, \ { IFM_100_VG, "100baseVG" }, \ { IFM_100_T2, "100baseT2" }, \ + { IFM_100_BX, "100baseBX" }, \ { IFM_10_STP, "10baseSTP" }, \ { IFM_10_FL, "10baseFL" }, \ { IFM_1000_SX, "1000baseSX" }, \ @@ -784,6 +787,7 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_100_T4, IF_Mbps(100) }, \ { IFM_ETHER | IFM_100_VG, IF_Mbps(100) }, \ { IFM_ETHER | IFM_100_T2, IF_Mbps(100) }, \ + { IFM_ETHER | IFM_100_BX, IF_Mbps(100) }, \ { IFM_ETHER | IFM_1000_SX, IF_Mbps(1000) }, \ { IFM_ETHER | IFM_10_STP, IF_Mbps(10) }, \ { IFM_ETHER | IFM_10_FL, IF_Mbps(10) }, \ From nobody Tue Feb 11 00:52:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsNG96Hn5z5n6hp; Tue, 11 Feb 2025 00:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsNG93bVfz3kdD; Tue, 11 Feb 2025 00:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+lRWwGvm768X7ZZah897K4zwhxvVeizv5/fTM669tw=; b=nqIvCagUjPcqKgEbV0yXbyrjY8bEgGwxgqKKxTfzbuqgtwCUbvzMcLZ97XJNneorTSxBP6 Jdv8xMkiZfhZoHPKdJQQt60sAdxoCYMqkHXcSciMWySCIRWP3K/cXPV4p6ZHeUlcMjV6i+ lWsQp9gBzzQEDgjB2mNUNKXUXp+B68+tnCNSX5F8IphUvxFokyeAXfHkShrHJqXOKRvzDR iGtKpVKVRPsysAhJQR6T2WjkU/3QVKOY+pgL+zLRMOE6e8/F0fsZMUuC9CFFDrslt+TwpO Xx3kkyLZpdRHicIWJDyfAICt7H/wCULDpAb5ZmROgio8FMNHhtv9dVtP9xPyaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739235169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+lRWwGvm768X7ZZah897K4zwhxvVeizv5/fTM669tw=; b=ZNnpQsr5K8H0FO707XUkjsVLgtfyldRWsoNL/QHPcJPv9RRr/IQVOfJXagr2NVO/mesc0t nTufN+448K5AZwXgudPlvSm1kpDYThStrzzzWO1SYRJOC888SF6oyZFfdU7nEH8kccARKe 44dYOCxKIx+JZDfhXw5nH9DAcx996JkgxN5zYm3sLBWEHcnctRzfsT+w+bsh8c1PcwlEpg xBjiBLYyZLzxW+t9wj1/f9mAnjqBNaMyDCRLIgzyNAmYnsnN6TkyucaY3hk7lbZwrO4+8Y xR1+OQmYQlDPhxnkjYfwjavVQSCV8RwycZq3zMFzSqslVI6QrSTKUfXnwKIy7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739235169; a=rsa-sha256; cv=none; b=KL92u0jzeXYFghHCjwKl79Ls983okb50+e2oEGEhFl2Vi1+vdMygGKeo+X0nofDy4x89ld p0VEwJ+GaqaU1negJgDG7eF2NIpLRn0zzSzWf37BZJcuYHjcHFe7gfO/J6qTno6agnHXRn qNiocJVKEyYv/vu0wxRO00IkOkNJV4XCiXsM/poqAvIYbGJHya+iFbF3sK0Hc7O1wCFg5d vq3IzhYjyxSxpIvteQVU3VHUsRiNUjxr+klV46ZLceQ9HXHgK2CpDf1aZUHR9LSSYNTKBh VF5smLbIb1i5LWkXOJd2BAmWTc/EFxhvKH9BEd9+ggVLPMOdxEnELp/VpH0VlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YsNG935NTzqv3; Tue, 11 Feb 2025 00:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51B0qn4q055316; Tue, 11 Feb 2025 00:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51B0qnXM055313; Tue, 11 Feb 2025 00:52:49 GMT (envelope-from git) Date: Tue, 11 Feb 2025 00:52:49 GMT Message-Id: <202502110052.51B0qnXM055313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a32cc87cc0a0 - stable/13 - net: if_media for 100BASE-BX List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 commit a32cc87cc0a0dae1984665bd9e0727c1eeac6c96 Author: Kevin Bowling AuthorDate: 2025-02-08 23:49:46 +0000 Commit: Kevin Bowling CommitDate: 2025-02-11 00:52:16 +0000 net: if_media for 100BASE-BX d82c3e81: net: if_media for 100BASE-BX Renumber 1000BASE-BX and add 100BASE-BX sequentially I added this 1000BASE-BX in 78c63ed260fa20b3500aedfe41dc0dcae9593f51 but did not connect it to any code yet, appologize for the churn. 7835a4ad: net: if_media fix syntax/build Fixes: d82c3e815a5f ("net: if_media for 100BASE-BX") (cherry picked from commit d82c3e815a5fc0069562b69145ad695f9aa183f9) (cherry picked from commit 7835a4ad6948290c92ea55c7be34ae72f4e2b0bd) --- sys/net/ieee8023ad_lacp.c | 1 + sys/net/if_media.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 049e8bf6e1ee..746f8dc08746 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1139,6 +1139,7 @@ lacp_compose_key(struct lacp_port *lp) case IFM_100_T2: case IFM_100_T: case IFM_100_SGMII: + case IFM_100_BX: key = IFM_100_TX; break; case IFM_1000_SX: diff --git a/sys/net/if_media.h b/sys/net/if_media.h index c03a4c87b355..534ad36da517 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -258,6 +258,8 @@ uint64_t ifmedia_baudrate(int); #define IFM_400G_AUI8 IFM_X(117) /* 400G-AUI8 */ #define IFM_50G_KR4 IFM_X(118) /* 50GBase-KR4 */ #define IFM_40G_LM4 IFM_X(119) /* 40GBase-LM4 */ +#define IFM_100_BX IFM_X(120) /* 100Base-BX */ +#define IFM_1000_BX IFM_X(121) /* 1000Base-BX */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -437,6 +439,7 @@ struct ifmedia_description { { IFM_100_T4, "100baseT4" }, \ { IFM_100_VG, "100baseVG" }, \ { IFM_100_T2, "100baseT2" }, \ + { IFM_100_BX, "100baseBX" }, \ { IFM_10_STP, "10baseSTP" }, \ { IFM_10_FL, "10baseFL" }, \ { IFM_1000_SX, "1000baseSX" }, \ @@ -784,6 +787,7 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_100_T4, IF_Mbps(100) }, \ { IFM_ETHER | IFM_100_VG, IF_Mbps(100) }, \ { IFM_ETHER | IFM_100_T2, IF_Mbps(100) }, \ + { IFM_ETHER | IFM_100_BX, IF_Mbps(100) }, \ { IFM_ETHER | IFM_1000_SX, IF_Mbps(1000) }, \ { IFM_ETHER | IFM_10_STP, IF_Mbps(10) }, \ { IFM_ETHER | IFM_10_FL, IF_Mbps(10) }, \ From nobody Tue Feb 11 01:11:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsNhC2yPFz5n7ft; Tue, 11 Feb 2025 01:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsNhC2RJxz3mBD; Tue, 11 Feb 2025 01:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739236315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CyK7Xg0BhR+VFWHUzTEyxo3h0BA5swauEUAJh7PqRA=; b=dLuAwGgOjRiof5LyQElZJ5Nd2Cm2ENPlU1sRG7Tg4HCT+gdSFIqTzKSglt/TLCVomFcHCv 97y3ilFnELdoA6s4r1FewtO7qhZ0CtlT4oMk40ZY+aTtA9qAp3k9L3kXNJNew0i4W6l8Ew N749nD4NaJHLZngXv35wH9Aol5nnXRVGJCbYslHizbK9EUlRF2cqws8D3ZWGuFH+WgvRGP zfLXGaZCsUlKfF6QKzB+ohwYqZJlme1e7hZso6bjuMvJ4Kjlaye4ijZlJR1qTeme7pdFtI JIzGz49511jhiAV8kHkuHAXIKBI/GTXhzmNxHTKtufGiht0//Kw1xABCCaIvbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739236315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CyK7Xg0BhR+VFWHUzTEyxo3h0BA5swauEUAJh7PqRA=; b=Lfozlea4GitWAONSK86EDxM72ZhQsReUJ/jkG/olnJ6HKom+q6yjyX6cX/FGmapP0e77q/ lzyxy6aWqKpToaZGBmU38Ab6P46ccUPI2WnoHcPaZoiKxJc7v8ix8TGqUqEqr624R/8zk4 KOTCB/O5uwItUnMHKTHVHDKaTznKfP4MzOXmQJ5DwpU/7p77x6j0EX+kGazxrP17RMaC1X lhregathdh+2xtCgRd6r+XCv7LbLEE0y1oc64gP8VVvfTOx3LuihkOMGY4fr5xUUnl7z2Y 5PX36RsENKa9uX5jrHNTs2Pkgyq+QUrPwRv+doYpC/1N3W+5VB5TSapcATctuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739236315; a=rsa-sha256; cv=none; b=P0Px0Q8EDGHodg8a2ur40HeiyYeE7aLvcShxfgFZL1yzOxXmboVmejwD+4W5sYWUVmCYDy qG3i7qH39wQp1OLXcb66FhqpP7Pxvv0b7lFJmCFqjw29qUF5MKcdrCruob5DYY4Ya8IVBX WdFVouE743Jqa/qKdnSk/kRgTaY/sk9mHaYIK7EopHZamo1Yhe9T4CgKB1v40Y4GqNxyM5 Ozt5uFXL2boQZiepfxNGbsANvLIr74fSQEJ5bnMvDHdEM7TzKkCe1kRs3ZvW/g+lutMftN PT/hSeCWaYZwj0afpO5xvOUlJQPnIF9nYR3jwJ6xjy744TAgFEdm7zGhhkWR0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YsNhC1slrzrs7; Tue, 11 Feb 2025 01:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51B1BtJm088070; Tue, 11 Feb 2025 01:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51B1Bt3E088067; Tue, 11 Feb 2025 01:11:55 GMT (envelope-from git) Date: Tue, 11 Feb 2025 01:11:55 GMT Message-Id: <202502110111.51B1Bt3E088067@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: cba91bf59c79 - stable/14 - unlink, rmdir: call notify_upper from VOP pre method instead of syscall List-Id: Commits to the stable branches 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: cba91bf59c79eadc3b60b83fe2185116496f08fb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cba91bf59c79eadc3b60b83fe2185116496f08fb commit cba91bf59c79eadc3b60b83fe2185116496f08fb Author: Konstantin Belousov AuthorDate: 2025-02-04 00:23:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-11 01:11:49 +0000 unlink, rmdir: call notify_upper from VOP pre method instead of syscall PR: 254210 (cherry picked from commit 1a0cb938f7b461edc40316cb44a80438df674174) --- sys/kern/vfs_subr.c | 2 ++ sys/kern/vfs_syscalls.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 729741ea901f..5a0a7f9161ed 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6157,6 +6157,7 @@ vop_remove_pre(void *ap) a = ap; dvp = a->a_dvp; vp = a->a_vp; + vfs_notify_upper(vp, VFS_NOTIFY_UPPER_UNLINK); vn_seqc_write_begin(dvp); vn_seqc_write_begin(vp); } @@ -6225,6 +6226,7 @@ vop_rmdir_pre(void *ap) a = ap; dvp = a->a_dvp; vp = a->a_vp; + vfs_notify_upper(vp, VFS_NOTIFY_UPPER_UNLINK); vn_seqc_write_begin(dvp); vn_seqc_write_begin(vp); } diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 45a9a0c2bd48..17ab419fb0ae 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1996,7 +1996,6 @@ restart: if (error != 0) goto out; #endif - vfs_notify_upper(vp, VFS_NOTIFY_UPPER_UNLINK); error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); #ifdef MAC out: @@ -3964,7 +3963,6 @@ restart: goto fdout; goto restart; } - vfs_notify_upper(vp, VFS_NOTIFY_UPPER_UNLINK); error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd); vn_finished_write(mp); out: From nobody Tue Feb 11 03:30:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsRmQ1sfxz5nJlC; Tue, 11 Feb 2025 03:30:46 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsRmQ0sQHz41cZ; Tue, 11 Feb 2025 03:30:46 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739244646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5DNFRxS7CrxZi7KqkpfNHrF4lqQtsHMOy5FSCjEBcjo=; b=j7bGj1rvhB8aMTXSxoSVNk71CmgCOBXj8PssyXAGRi07xOZR4E6U9cQd/OPAq3G9Zh8HUZ cAUwGrdcso0Z4gnfDwU0Jd/bwI0mTd5Z36oEvB/dYMwkq2bcT4iosrURfM0kUxcqk7nnFE hIOL5dX8V/rCJn3GZ4Mte3DtaNIyc/F+dcXPCdvjsGZ80HNZEswB3fFJvqNk6AKtNPQeg/ hk1IjukPb53hUVuI18+Hqq5wnSWRIEySbiNKsbkgUzfk+kZigSc6RoW3LO9ZC2LFpLAFiD v3msbd8YCZXgfXaKx4o/eAlZqxWEe4M7Ihl3EtLJpK5m+Dhja8fPSv1xxkKz9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739244646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5DNFRxS7CrxZi7KqkpfNHrF4lqQtsHMOy5FSCjEBcjo=; b=HmCRhZfo5UMOa+K8m4C93tKh2Sj4B3MDMVekcnYVF1rrN+eE6TPpZhSrncerUnhcmCCHpc EDVQUmRD3OpmRhitDKxy4djfTPw6wf7dtE/mxKVlACAoD8LiWTCJ44OkZQK9oVYi1RM904 B/7tRJkZ2y3YBAEFN+xYoy94oblOdO2sFIZLipHb1UhtItaNNe8gpjQeMllnxbDbZwn+Xg VBhFdwV7M6mmIWGO2wisP8cUd/7cmkSwoqNd5FI9VYk2gYT/gruEu/AXyScXvQMtdlipoX pnjOClHmwxLK/mFtiejkRSqOAZNsDaMLeuqEUs9QUD2MvaFn0USLIlrUINgjyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739244646; a=rsa-sha256; cv=none; b=kBpp0yu1h3IP9jg3rl42yH7f4ywTJ8Y+C+vQGCgY2+PSDq8F8P+mdGhmHGxqO+Af2cTyZf 7IPf+boQzHYelB6nB/1ac89EyDAxG4+wmAtP3x3Y6jo54HT5gzXAZhGZEQNKcavp1v2VMw 2CVDgM/8R8WzKSdh+IR54i27aJnPFfl8Hz8CJ8e0EqyNPAQGSMBaNssPzZCJvN3kNBEOpi OWIILVXo5DSSD+o/b650je7maDb+VQFkDVV4SIBln2d/B2TF66ARzZwj7BlADB8ykCaWWK MqTowWvclj/r9fMj1XZOv3Fg76gbKVgavMCRjNpGKC5AsumJ0Hs4PUzfHoymfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YsRmN4lTgz13ym; Tue, 11 Feb 2025 03:30:44 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commits to the stable branches 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 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 7bcc7a0b88cc - stable/14 - libkern: avoid local var in order_base_2() From: Zhenlei Huang In-Reply-To: <202502101115.51ABFISj016298@gitrepo.freebsd.org> Date: Tue, 11 Feb 2025 11:30:38 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <858BD10B-A2C9-4D3A-9FF5-C5573597DF8B@FreeBSD.org> References: <202502101115.51ABFISj016298@gitrepo.freebsd.org> To: Doug Moore X-Mailer: Apple Mail (2.3696.120.41.1.10) > On Feb 10, 2025, at 7:15 PM, Doug Moore wrote: >=20 > The branch stable/14 has been updated by dougm: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7bcc7a0b88ccb5e1fe31de88ab9a17e4= 6859318b >=20 > commit 7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b > Author: Doug Moore > AuthorDate: 2024-09-27 23:43:07 +0000 > Commit: Doug Moore > CommitDate: 2025-02-10 10:30:05 +0000 >=20 > libkern: avoid local var in order_base_2() >=20 > order_base_2(n) is implemented with a variable, which keeps it from > being used at file scope. Implement it instead as ilog2(2*n-1), = which > produces a different result when 2*n overflows, which appears = unlikely > in practice. >=20 > Reviewed by: bz > Differential Revision: https://reviews.freebsd.org/D46826 >=20 > (cherry picked from commit = b7cbf741d55468ba34305a14ac3acc1c286af034) > --- > sys/sys/libkern.h | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) >=20 > diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h > index a10289d72dc7..835e5ffaf0b7 100644 > --- a/sys/sys/libkern.h > +++ b/sys/sys/libkern.h > @@ -229,10 +229,7 @@ ilog2_long_long(long long n) >=20 > #define ilog2(n) (__builtin_constant_p(n) ? ilog2_const(n) : = ilog2_var(n)) > #define rounddown_pow_of_two(n) ((__typeof(n))1 << ilog2(n)) > -#define order_base_2(n) ({ \ > - __typeof(n) _n =3D (n); \ This local var `_n` is within the scope of the macro `order_base_2`, it = is surrounded with {} and is harmless, so it will not pollute the file scoped variables. Am I reading the commit message wrong ? Best regards, Zhenlei > - _n =3D=3D 1 ? 0 : 1 + ilog2(_n - 1); \ > -}) > +#define order_base_2(n) ilog2(2*(n)-1) > #define roundup_pow_of_two(n) ((__typeof(n))1 << = order_base_2(n)) >=20 > #define bitcount64(x) __bitcount64((uint64_t)(x)) From nobody Tue Feb 11 05:15:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsV5l2LxNz5mx02; Tue, 11 Feb 2025 05:15:55 +0000 (UTC) (envelope-from unkadoug@gmail.com) Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsV5l0Rvwz3FQF; Tue, 11 Feb 2025 05:15:54 +0000 (UTC) (envelope-from unkadoug@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3f314ff6ffdso2984991b6e.0; Mon, 10 Feb 2025 21:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739250954; x=1739855754; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=h3+nqeQfebaXApwoP9/me3OuLHzEteIkBYzhR5x9kJo=; b=ROVejfwsSEaTeD4xLTPmo0PsGnXUVTyH8K9mcr1ny5BjHLR+emBiNxiozQBxqaZbzC eVLlQ34zSMOs/3BKnVZkw8GuHJbEKcV3d6a+5u/8br9r5tLKavV7Cnt/oCWhCYVPZnLd +Kk8uQEQOBVRGFnNDlsiTDti+fuomIRfNpH0cA5IkxmAcibOWv4yejWEFmHkXVsKn8UX zzUGnAvxd9DzQt4D9TgO1Uaql6Qd24Ut6wad4jos581a1hnqT3HWJBFqS53eWexB8UPw 2ZLJD9S+RGWeSu8SfCC0qkMdyy/N//+v14nmXKiuDW2cmh5Xra0L3knJJNHhdaVTDfYA iJ9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739250954; x=1739855754; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=h3+nqeQfebaXApwoP9/me3OuLHzEteIkBYzhR5x9kJo=; b=strD7Q0vYST7oOB4JsxjFWlk86FL2fAJYH1zpVPlOQdDA945wZQYubyeQ6ZaXglKDm 7UlPV9wKIZTK76unYNB3RfvMH/jx6iJs9WHfFfVTICIx2F81Hmhlixp1jpL5ysScB9Pp jhJJnwnYSeziycCq7MT6AanBFti5c9oDf2SCsuyGQYus/nqlL+kV8eVCVCzCv8b6VAXv j+5y8uTO1knOWtzWXpCr51hH65ayElqhFkE3Z9tc6d+dBiIQs8uWZtLcs42vdOxgy/c7 TMeyXz807FHT2aq0UcQlb7DLcQMfU2DJIqthF/xXb0zCqGYXtjy1fxGQHtOTEYA5HJHh IkaA== X-Forwarded-Encrypted: i=1; AJvYcCW4L35NAz15XuLywxZYhRGPq/HBiqr8RX8THh3ZiOlLD7sO6ArYnH3w8esZIG0leYp27g==@freebsd.org, AJvYcCWt4Yq7DLLuGN6bDbMWPY1Z9V1mUO0hYxH92B3t+8TJ3/iULoaf4wZGWKTlm5KmFtqA+AJEIYIFDOJtatK+3e5ns6GDIA==@freebsd.org, AJvYcCWtYkTuxpExpr25grS955L6D1ybIA1Fzb0YV6+nfab9BrfDAELN+YyK/WPmNRWSjofJZj7L5Ze5s5hCW44mLwVoeB/8YEkDhnKK@freebsd.org X-Gm-Message-State: AOJu0YzRfi90G7Ofp1f6NHPwvDHonQNHYCrAq00CDv7804FdgzvL2a08 WTDNVQtNcFlbTRi81dSLbbj8I0BCmq0nsqJbtUzLsFPVA1Pl6ZhTyxlcxdDD X-Gm-Gg: ASbGncuRpOx/fDA/coXEfVFyhk6tNIAExy74D3wNr+GyZejwbmKgDXvtZvvaGGKNeJ0 kaG8f5FNv7TsrQd2GgdMtM2G5+Scfcxqte15Dp/psfijjvTvyDaVKiFuzqV7BRucOI9uQIRn5JW zfidN5ylrTK2OII2mEhqCHjW5R38Gz8pqjdZG+G10Ml7biL55jt9YjZzJA9fxwga1myk5uBEX3j fpOVPKY9T/aNjJLgqmnzTvD8HEpxsOG2i6bYYvjTcO4pW6+6XM0FcLCOZdNulLvaiYEpWpRIXXp PbilfYZNwRIr3UrYIdmpD+/ECuAA+pxiHfvkT7bS/jzaz4gHlDb3BqC49BKf3QNNW1Kd6mof4Q= = X-Google-Smtp-Source: AGHT+IHo0TpzJ4GDZbqTqHF/n98C4H/JPZ9GMjhNOYrY2uzyRjGDSD8Tu+VsYZGrySjwIf58r4fKXQ== X-Received: by 2002:a05:6808:3505:b0:3ea:64cc:4954 with SMTP id 5614622812f47-3f392363e82mr12249275b6e.35.1739250953639; Mon, 10 Feb 2025 21:15:53 -0800 (PST) Received: from [108.254.203.202] (108-254-203-202.lightspeed.hstntx.sbcglobal.net. [108.254.203.202]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3f3a5a74dc5sm1604478b6e.29.2025.02.10.21.15.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 21:15:53 -0800 (PST) From: Doug Moore X-Google-Original-From: Doug Moore Message-ID: Date: Mon, 10 Feb 2025 23:15:52 -0600 List-Id: Commits to the stable branches 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 7bcc7a0b88cc - stable/14 - libkern: avoid local var in order_base_2() Content-Language: en-US To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" , "Bjoern A. Zeeb" References: <202502101115.51ABFISj016298@gitrepo.freebsd.org> <858BD10B-A2C9-4D3A-9FF5-C5573597DF8B@FreeBSD.org> In-Reply-To: <858BD10B-A2C9-4D3A-9FF5-C5573597DF8B@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4YsV5l0Rvwz3FQF X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] bz@freebsd.org presented the problem that this change fixed.  I think it was in a driver.  It may have been a case in which the macro argument had side effects, and having it appear twice in the macro made those side effects happen twice.  But I have not preserved the original report from bz.  I regret that I did not adequately describe the problem being fixed in the commit message.  Perhaps bz can shed some light on the matter. Doug On 2/10/25 21:30, Zhenlei Huang wrote: > >> On Feb 10, 2025, at 7:15 PM, Doug Moore wrote: >> >> The branch stable/14 has been updated by dougm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b >> >> commit 7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b >> Author: Doug Moore >> AuthorDate: 2024-09-27 23:43:07 +0000 >> Commit: Doug Moore >> CommitDate: 2025-02-10 10:30:05 +0000 >> >> libkern: avoid local var in order_base_2() >> >> order_base_2(n) is implemented with a variable, which keeps it from >> being used at file scope. Implement it instead as ilog2(2*n-1), which >> produces a different result when 2*n overflows, which appears unlikely >> in practice. >> >> Reviewed by: bz >> Differential Revision: https://reviews.freebsd.org/D46826 >> >> (cherry picked from commit b7cbf741d55468ba34305a14ac3acc1c286af034) >> --- >> sys/sys/libkern.h | 5 +---- >> 1 file changed, 1 insertion(+), 4 deletions(-) >> >> diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h >> index a10289d72dc7..835e5ffaf0b7 100644 >> --- a/sys/sys/libkern.h >> +++ b/sys/sys/libkern.h >> @@ -229,10 +229,7 @@ ilog2_long_long(long long n) >> >> #define ilog2(n) (__builtin_constant_p(n) ? ilog2_const(n) : ilog2_var(n)) >> #define rounddown_pow_of_two(n) ((__typeof(n))1 << ilog2(n)) >> -#define order_base_2(n) ({ \ >> - __typeof(n) _n = (n); \ > This local var `_n` is within the scope of the macro `order_base_2`, it is surrounded with > {} and is harmless, so it will not pollute the file scoped variables. > > Am I reading the commit message wrong ? > > Best regards, > Zhenlei > >> - _n == 1 ? 0 : 1 + ilog2(_n - 1); \ >> -}) >> +#define order_base_2(n) ilog2(2*(n)-1) >> #define roundup_pow_of_two(n) ((__typeof(n))1 << order_base_2(n)) >> >> #define bitcount64(x) __bitcount64((uint64_t)(x)) > > From nobody Tue Feb 11 05:23:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsVGb0rfWz5mxhD for ; Tue, 11 Feb 2025 05:23:35 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsVGZ3lCKz3FtN for ; Tue, 11 Feb 2025 05:23:34 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-38de17a5fc9so843725f8f.3 for ; Mon, 10 Feb 2025 21:23:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739251413; x=1739856213; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r9+m78g6ry9R8pWkl5xRIMhQ4H4UUPHj9BcEuCrTRF4=; b=n5G42tIa9dlnFF0NZZyN7qyVNUOJNNGZbichfSLR2ai7eyCZlu1rmcWxovr4VJzGkK nLcdF8c/SagGKTddeLQQ4nEDBZFXNf2BYYllxVn/S3r0iLwj9GJs/qh4OodfSfTT2xw+ T6CZ9MC5kfgTIoY+OI43k4c8xi06WLj1XN9GbYXHpt6knh3UrMrfrioiGlppVYUcsKEI U90AQo4XTAfFJocoPSsjfXV6mgXGZveF9JKz2ZIpcPA8htcyZjIrJXGHja3VKomCK9Cf 0DLxCrcDMoIAC7DQQU7gC+Ut7DY3Wn7+Yup01BY4wFgRtNnTnBQ6Xw+7b/9W0ICx5rfn sCpg== X-Forwarded-Encrypted: i=1; AJvYcCXVQwlDgitZAxPiYICCUjbdvvTclhK63QjKJPAR9hHoioYz1rUb5qAy4Wzm0cAHksXHWbrDV1HZaqBFLKFSsGl4/Algk48JVmg=@freebsd.org X-Gm-Message-State: AOJu0YyX+/yYiWzFEpwc96E7MabXZ+pu2RPpZ5IiNVWepBRdV9FwDel/ q6rK4jNcqFQhGVuG0DWwFfnWh+FwGBJy4qVZHBZITIKuVeOHqqtW9h2LZpTVXA4= X-Gm-Gg: ASbGncvuf61pFn7PCYKaH+OsAgj85+VxocxDis3pKQGrkQXy4N4DHwV0uP+gIBCw/8T IM7Ortj1iUm3N8WC6rmy7AtHg0k/z5/hh6AsZnij9l0i2xNg2gmlAt1fXTAl0HZDp89aA+F9Noq pWgyo5ZDn7KoYDu07Y0/HY7UTZuEqpweZS657mZBq1OLee/7SXkEbOUUN3Lnajj6SYRWtdO8ieX ZD0P39dFs0SsmHpexRz1BuF27bGf23dvYPHAhoTFZapktWzTQcfh1SzWZVm91zJutd9XE7P/HAQ bk8xDfD0Qp1VFb39xKTBMYlKekG4mg== X-Google-Smtp-Source: AGHT+IH3Awqpnj2auuTk7eQPBWp2+zhPuhE/Vmfz+dIvFOqF4l3iiWMyxY5q/LJkZ7x9382eCTs8Fw== X-Received: by 2002:a5d:5f4a:0:b0:38d:cfff:c0d9 with SMTP id ffacd0b85a97d-38dcfffc217mr11001814f8f.39.1739251412859; Mon, 10 Feb 2025 21:23:32 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4393963c84esm86489895e9.27.2025.02.10.21.23.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Feb 2025 21:23:32 -0800 (PST) Content-Type: text/plain; charset=utf-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 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: 7bcc7a0b88cc - stable/14 - libkern: avoid local var in order_base_2() From: Jessica Clarke In-Reply-To: <858BD10B-A2C9-4D3A-9FF5-C5573597DF8B@FreeBSD.org> Date: Tue, 11 Feb 2025 05:23:21 +0000 Cc: Doug Moore , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <803D3DBC-A4F5-47FB-8034-5241461D4A71@freebsd.org> References: <202502101115.51ABFISj016298@gitrepo.freebsd.org> <858BD10B-A2C9-4D3A-9FF5-C5573597DF8B@FreeBSD.org> To: Zhenlei Huang X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Rspamd-Queue-Id: 4YsVGZ3lCKz3FtN X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 11 Feb 2025, at 03:30, Zhenlei Huang wrote: >> On Feb 10, 2025, at 7:15 PM, Doug Moore wrote: >>=20 >> The branch stable/14 has been updated by dougm: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7bcc7a0b88ccb5e1fe31de88ab9a17e4= 6859318b >>=20 >> commit 7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b >> Author: Doug Moore >> AuthorDate: 2024-09-27 23:43:07 +0000 >> Commit: Doug Moore >> CommitDate: 2025-02-10 10:30:05 +0000 >>=20 >> libkern: avoid local var in order_base_2() >>=20 >> order_base_2(n) is implemented with a variable, which keeps it from >> being used at file scope. Implement it instead as ilog2(2*n-1), = which >> produces a different result when 2*n overflows, which appears = unlikely >> in practice. >>=20 >> Reviewed by: bz >> Differential Revision: https://reviews.freebsd.org/D46826 >>=20 >> (cherry picked from commit = b7cbf741d55468ba34305a14ac3acc1c286af034) >> --- >> sys/sys/libkern.h | 5 +---- >> 1 file changed, 1 insertion(+), 4 deletions(-) >>=20 >> diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h >> index a10289d72dc7..835e5ffaf0b7 100644 >> --- a/sys/sys/libkern.h >> +++ b/sys/sys/libkern.h >> @@ -229,10 +229,7 @@ ilog2_long_long(long long n) >>=20 >> #define ilog2(n) (__builtin_constant_p(n) ? ilog2_const(n) : = ilog2_var(n)) >> #define rounddown_pow_of_two(n) ((__typeof(n))1 << ilog2(n)) >> -#define order_base_2(n) ({ \ >> - __typeof(n) _n =3D (n); \ >=20 > This local var `_n` is within the scope of the macro `order_base_2`, = it is surrounded with > {} and is harmless, so it will not pollute the file scoped variables. >=20 > Am I reading the commit message wrong ? It=E2=80=99s not about pollution. GNU statement expressions are just not = valid at file scope, they must be used within a function (since otherwise the implementation would have to have a full blown interpreter to constant evaluate the whole thing, just like C++ and now C to some extent have ended up with these days with constexpr). That is, you cannot write: int x =3D ({ ... }); at file scope. Jess From nobody Tue Feb 11 10:10:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yscdl0g26z5nLCj; Tue, 11 Feb 2025 10:10:35 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yscdl0W61z3lN2; Tue, 11 Feb 2025 10:10:35 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739268635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nn8ebaI2XVu6t6Hq+gE7nOo3AJFfdl5GPBX+/DyR4Z8=; b=BO/KW17zOrnrfJdeqAerkCqwJ82YdtaAv7Xh4sug15/hP8B0rHehBlp2DQsbE+5XuQCfIh yBiwCvm1MkgxAniiXcZqDot7qp+KeZUCgpAof9SW5x9+eCK1SKN7YnEbbsEkueKYuP5Gy4 9HxCbLpDNxjOMyIJaxVl/MwppyOYe6qC2q2Nx+/IsT0p3/0hXs0eSu0LlvIm83Ejq9vf7g sgXTI2I07bffkRvVqb7/XzNR0XZuyIZqLRoH5iixl/ju1jhQKWhvwLdsFutlXM6BW5S6Sf 0F+XuWpW5BkuYd4t6PWD7aGK+lfErX7UvI+KS2C75d7S7uaU/IBZJn34LKJYUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739268635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nn8ebaI2XVu6t6Hq+gE7nOo3AJFfdl5GPBX+/DyR4Z8=; b=X7/lwROXx8/g62G1UOaeFs089Zrhqgqnit296Cx03B5IS2tHUPTIk/3kb0EVIIYJyAEpY2 fXYso7ju99/ODc+zDVmzAGdSqpLrGsyivnKemc6TNLb/cQpLprYO/aigMug636ZxHNQmeP otwlnhOBKfL6EOFI9TzYvsg3G3SH2I5pt0ZFKxiUnjobcnAdeWDI0gu7Me7n3ywC4Zm/HS Id/m/YeKML5Oez0bc2PT1qxYEbjnEDdw3faE8BKynubkE7m4vkVaJPB+kfkzI/ci2GlGGe pzZQJAs0XdVLkqkColiMMpB5/9qoieXSHEq1p+9VZbANM6piPrEHsJ8heGvEkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739268635; a=rsa-sha256; cv=none; b=Ekrkvo7Oun/iXWCs1OioKc76ZgXF8Whyb24jf4FhhbPBGZaZWFT81wiqS2xBFvFwzXcyVV xQvk/e2ohnVohxPCqsBbBrSymfsNcYYew2TO9Bts7WqNz/W7cRWeBXsjIC8f2Nn8mXKcYD EaTccvL+3w0IIKX34vsncFYx4Vv3EJ6KUOW3ePM7Hz5M9ESAkGsUY4CRur4F0CNleUzXvI pdok6lL1y3/lVb0R5T1fVP6Hl2Cup0KFI5Et0Seg7+Grc5LHCfqo83qZOKJ/imIpEbVqhP K/BnZxGUs+iQhYDucomqWnxQbmt2g/Asrn8TCuOe7w24nzP4y87QOCOm7wbFrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Yscdj24sqz1C7R; Tue, 11 Feb 2025 10:10:33 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <5BF2F37C-16B4-4B39-B14B-131CE430BB4A@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_578F92E7-3BA6-4432-8E6C-74615E94D42A" List-Id: Commits to the stable branches 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 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 7bcc7a0b88cc - stable/14 - libkern: avoid local var in order_base_2() Date: Tue, 11 Feb 2025 18:10:23 +0800 In-Reply-To: <803D3DBC-A4F5-47FB-8034-5241461D4A71@freebsd.org> Cc: Doug Moore , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" To: Jessica Clarke References: <202502101115.51ABFISj016298@gitrepo.freebsd.org> <858BD10B-A2C9-4D3A-9FF5-C5573597DF8B@FreeBSD.org> <803D3DBC-A4F5-47FB-8034-5241461D4A71@freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.10) --Apple-Mail=_578F92E7-3BA6-4432-8E6C-74615E94D42A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 11, 2025, at 1:23 PM, Jessica Clarke = wrote: >=20 > On 11 Feb 2025, at 03:30, Zhenlei Huang > wrote: >>> On Feb 10, 2025, at 7:15 PM, Doug Moore wrote: >>>=20 >>> The branch stable/14 has been updated by dougm: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7bcc7a0b88ccb5e1fe31de88ab9a17e4= 6859318b >>>=20 >>> commit 7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b >>> Author: Doug Moore >>> AuthorDate: 2024-09-27 23:43:07 +0000 >>> Commit: Doug Moore >>> CommitDate: 2025-02-10 10:30:05 +0000 >>>=20 >>> libkern: avoid local var in order_base_2() >>>=20 >>> order_base_2(n) is implemented with a variable, which keeps it from >>> being used at file scope. Implement it instead as ilog2(2*n-1), = which >>> produces a different result when 2*n overflows, which appears = unlikely >>> in practice. >>>=20 >>> Reviewed by: bz >>> Differential Revision: https://reviews.freebsd.org/D46826 >>>=20 >>> (cherry picked from commit = b7cbf741d55468ba34305a14ac3acc1c286af034) >>> --- >>> sys/sys/libkern.h | 5 +---- >>> 1 file changed, 1 insertion(+), 4 deletions(-) >>>=20 >>> diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h >>> index a10289d72dc7..835e5ffaf0b7 100644 >>> --- a/sys/sys/libkern.h >>> +++ b/sys/sys/libkern.h >>> @@ -229,10 +229,7 @@ ilog2_long_long(long long n) >>>=20 >>> #define ilog2(n) (__builtin_constant_p(n) ? ilog2_const(n) : = ilog2_var(n)) >>> #define rounddown_pow_of_two(n) ((__typeof(n))1 << ilog2(n)) >>> -#define order_base_2(n) ({ \ >>> - __typeof(n) _n =3D (n); \ >>=20 >> This local var `_n` is within the scope of the macro `order_base_2`, = it is surrounded with >> {} and is harmless, so it will not pollute the file scoped variables. >>=20 >> Am I reading the commit message wrong ? >=20 > It=E2=80=99s not about pollution. GNU statement expressions are just = not valid > at file scope, they must be used within a function (since otherwise = the > implementation would have to have a full blown interpreter to constant > evaluate the whole thing, just like C++ and now C to some extent have > ended up with these days with constexpr). >=20 > That is, you cannot write: >=20 > int x =3D ({ ... }); >=20 > at file scope. Ahh, I see. Thanks for the explaining! >=20 > Jess --Apple-Mail=_578F92E7-3BA6-4432-8E6C-74615E94D42A Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On Feb 11, 2025, at 1:23 PM, Jessica Clarke <jrtc27@freebsd.org> = wrote:

On 11 Feb 2025, at 03:30, Zhenlei Huang <zlei@FreeBSD.org> = wrote:
On Feb 10, 2025, at 7:15 = PM, Doug Moore <dougm@FreeBSD.org> wrote:

The branch stable/14 has been updated by dougm:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D7bcc7a0b88ccb5e1fe31d= e88ab9a17e46859318b

commit = 7bcc7a0b88ccb5e1fe31de88ab9a17e46859318b
Author: =     Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2024-09-27 23:43:07 +0000
Commit: =     Doug Moore <dougm@FreeBSD.org>
CommitDate: 2025-02-10 10:30:05 +0000

 libkern: avoid local var in order_base_2()

 order_base_2(n) is implemented with a = variable, which keeps it from
 being used at file = scope. Implement it instead as ilog2(2*n-1), which
 produces a different result when 2*n overflows, which = appears unlikely
 in practice.

 Reviewed by:    bz
 Differential Revision:  https://reviews.freebsd.org/D46826

 (cherry picked from commit = b7cbf741d55468ba34305a14ac3acc1c286af034)
---
sys/sys/libkern.h | 5 +----
1 file changed, 1 = insertion(+), 4 deletions(-)

diff --git = a/sys/sys/libkern.h b/sys/sys/libkern.h
index = a10289d72dc7..835e5ffaf0b7 100644
--- = a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@= -229,10 +229,7 @@ ilog2_long_long(long long n)

#define ilog2(n) (__builtin_constant_p(n) ? ilog2_const(n) : = ilog2_var(n))
#define rounddown_pow_of_two(n) = ((__typeof(n))1 << ilog2(n))
-#define = order_base_2(n) ({ \
- __typeof(n) _n =3D (n); \

This local var `_n` is within the = scope of the macro `order_base_2`, it is surrounded with
{} = and is harmless, so it will not pollute the file scoped variables.

Am I reading the commit message wrong ?

It=E2=80=99s not about pollution. GNU statement expressions = are just not valid
at file scope, they must be used within a function (since = otherwise the
implementation = would have to have a full blown interpreter to constant
evaluate the = whole thing, just like C++ and now C to some extent have
ended up with = these days with constexpr).

That is, you cannot write:

 int x =3D ({ ... });

at file scope.

Ahh, I see. Thanks for the explaining!


Jess



= --Apple-Mail=_578F92E7-3BA6-4432-8E6C-74615E94D42A-- From nobody Tue Feb 11 13:48:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsjTd5dR2z5nby7; Tue, 11 Feb 2025 13:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsjTd4KL5z45yS; Tue, 11 Feb 2025 13:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739281733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRDjIIKKFJ6QBt/lNk/xIXwS8eVouFDUi7L1AXtbLfo=; b=YYIuyBMMjfTtnBVIyvarHXjmS+IFbZk4cG+RhvXzqrEeVj5MWcfTys8IcKal0CmjNs4U8F A14vWB9RgXxOoyYXyFLJq7WypwIMydRCkcf5mbhVze/cGMCuBjNj6Jt3x7MXZoatwt8EO3 NC9uYuev5FaBeRzWn7vEBWm1iVGWLZWjE0Fe4i5lH93Czarmim7ijLrkq6mE+D2ddVFiJ1 bNY+YwnBepAjI6kEuB1O3/zhpGZKtc6LqHwnZP3qhII+LuddjmPPLq2yrmP+6MKyPxnSVJ CMG7TrypOvWmKe1h7Al/ktLC+WmiktGC8xjuMJihVX50UIg7dhqDCYfPoGuXTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739281733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRDjIIKKFJ6QBt/lNk/xIXwS8eVouFDUi7L1AXtbLfo=; b=THezhBNvyBq3YroatgTqkgAaTaJgZrkrPIVP+kTMkgHCKS7pggSuFWZF1lmeS6XOpiU/tk YGG4fjdKGn6k43e5/ros7svp+INOomBMWDcdF9NjXTrwEWAlWd7bTk+i5ymYetlBdKIEjx sNb1xiGMmwqbce0uyzUWYD8zsD8eYJfD5v/z29sfEYZ+9DqKiYi0qv/yXw81c0c1MeTRx5 R4Q7cyDizk4UOUCUefwA8GX/HTDvByqUsSQFRQFKGF8EOJ48qoqxOuFaYWT8gnJWhRUi24 pE+ooj7l7N8Qe1qxLK2/54ruGTXFxd5ajfSVtqFKJgis+QP3oXkoyZFMsf2epQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739281733; a=rsa-sha256; cv=none; b=uN8A8B0b4IWRuJIq66+FjrP+ixQ9/iedbwQaZ6+W1FLa165yVM7KuhyoJtLrhTHj2r+YGb 9CXUUgXW+2hyQyScoLCi91TzubOQc1tDvINMBCFjYcy1EjmfXOhTxBY9tiz7DdRtkniY4a EaQmNwwUYHlS9OzyV1UmPTwXaB0PmDTvfwRyQjAtA7g56zfW2erHQhrqbi3uX+Birb1tci zg9Qf7b4fPOeLuUNb0QzIpn6/EPqTtmo/60egMFSGVN0Q7mHRPbX8xnYhNMPW0TvBzs8or cY12oP5TosPlzC6ScVDgr94jyqWp6JtxN8DnoXTm81z1TN4ZcOQMeezAR1hTXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YsjTd3YPWzhm; Tue, 11 Feb 2025 13:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BDmr8q003220; Tue, 11 Feb 2025 13:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BDmrqn003217; Tue, 11 Feb 2025 13:48:53 GMT (envelope-from git) Date: Tue, 11 Feb 2025 13:48:53 GMT Message-Id: <202502111348.51BDmrqn003217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Juraj Lutter Subject: git: c204fdb1c859 - stable/13 - periodic: set _localbase for periodic scripts from within periodic.conf List-Id: Commits to the stable branches 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: otis X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c204fdb1c859847ff972acdcadf6002759038e11 Auto-Submitted: auto-generated The branch stable/13 has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=c204fdb1c859847ff972acdcadf6002759038e11 commit c204fdb1c859847ff972acdcadf6002759038e11 Author: Juraj Lutter AuthorDate: 2024-11-08 13:38:19 +0000 Commit: Juraj Lutter CommitDate: 2025-02-11 13:48:14 +0000 periodic: set _localbase for periodic scripts from within periodic.conf Set _localbase variable from within /etc/defaults/periodic.conf for use by periodic scripts. This fixes e5d7100c09, no other functional changes intended. Reported by: gahr, otis Reviewed by: markj, gahr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47486 (cherry picked from commit c8b89c11a1181e900acb638cfde7a55e92553175) --- usr.sbin/periodic/periodic.conf | 9 +++++++++ usr.sbin/periodic/periodic.sh | 12 ++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 088e3c612e70..36b3ff5b0070 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -15,6 +15,15 @@ # # +_set_localbase() { + _localbase=`/sbin/sysctl -n user.localbase 2> /dev/null` + # Set default value of _localbase if not previously set + : ${_localbase:="/usr/local"} +} + +# Set _localbase with fallback to /usr/local +_set_localbase + # What files override these defaults ? periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local ${_localbase}/etc/periodic.conf" diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index a45d6af73691..0a78a930b4b6 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -29,14 +29,6 @@ if [ $# -lt 1 ] ; then usage fi -_localbase=`/sbin/sysctl -n user.localbase 2> /dev/null` -# Set default value of _localbase if not previously set -: ${_localbase:="/usr/local"} - -# Use a deterministic path to match the preset from /etc/crontab in case -# periodic is run interactively. -export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${_localbase}/sbin:${_localbase}/bin - # If possible, check the global system configuration file, # to see if there are additional dirs to check if [ -r /etc/defaults/periodic.conf ]; then @@ -44,6 +36,10 @@ if [ -r /etc/defaults/periodic.conf ]; then source_periodic_confs fi +# Use a deterministic path to match the preset from /etc/crontab in case +# periodic is run interactively. +export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${_localbase}/sbin:${_localbase}/bin + host=`hostname` export host From nobody Tue Feb 11 13:49:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsjV21M22z5nc6T; Tue, 11 Feb 2025 13:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsjV155h2z46Gx; Tue, 11 Feb 2025 13:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739281753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1OyvQjE6XnGAEZ0HneKc77iTBibrw+QbeD1GDiFRkQ=; b=IlMtxAS5/zjfiCU0QDlsDDixhktJTruWPs3ouYdKTNGJcWjBobiZ4sWfyViqmfD/uUCXtR b1sByvryPSxiBa00578g4jcp78qik/G8WbazZsqZw6MZmVp++8sxeOM/vC2DDq6acVf7ag vL/Eda2i8H6Hjv4YZhjAp1Rem4vs4bNvC3EeDKFMU4no5HBIIsKQQOmql9ftGRPi7TR00q JlwVkG2QmKO/3i+mlFPlYKPpzOjkueedIyipwu0Vri04PT9LdDD+5Vl2PxNrHS9cU0CXG6 dHwTZpOIMqirkYI15BcezDjQfRQ+Gg1HJZx+FhjWBiGCYQFrg/ZTN0O3eb5bhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739281753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1OyvQjE6XnGAEZ0HneKc77iTBibrw+QbeD1GDiFRkQ=; b=kAUpZAmKuVKKff3CTHUJF/2QlFWKiNIrZ329lzfMuCLwyhneSMhJFv1bocjW7C4UBwNb5t 4ROvQgj+JDeydTXOIzbb+JdfHZ1THofp23Nsh6qokigMCZXaLaRLA9RFP1ZMUT3HFZOdvp K2m3HAmrPMrY0czSn5/H+ne+wMuYkbVrBVaQGTgUR+oeYwhweXtA3OzOF0bZ5ViehdMUhM kn+KbP38jr0EubkJTUYR3KY23A/8rQFxqGDZzfy34f+3QHdQfxNCv8ITTQnumWROFdHBQV dGN/KHflwdE5fHVlN0zlv0cNMLWqdoCRNoD0r6Yci3Acg2r7XGx9L9nHbtL8EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739281753; a=rsa-sha256; cv=none; b=O9rSoe962xSNttMM0FaZz6Bt2yVWb2C5z9AMFVZUh7RsNs9auFpHX+hQ5mTJaBWCIKpJ/V aEkEKZ9iSYNnYj9eAHQfr+5G0tbEHl5waT8sf3HOjNZRu7/DM7CAoIEepuqyg6PYyAaaYQ q1+J7W3sfHkR9ac+htnvLJRDdL8SbEFjXB1CO9WeayDMPdnxu26Qp634+9G/9c+WbVimfQ JSc7AYZGIoeFasRc0yxpllkZyuj5dCMHbUkJe3pZurApaXtcT+UtQjfpdsEG1UtnmIrb9n LgQ+LhFEu/q0daJaMzaLKf9Y4qt+ks7ERaxvVK6LbVt/ezIV4agtFVzgfTUJ+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YsjV147J8zhn; Tue, 11 Feb 2025 13:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BDnDFV003447; Tue, 11 Feb 2025 13:49:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BDnDPt003444; Tue, 11 Feb 2025 13:49:13 GMT (envelope-from git) Date: Tue, 11 Feb 2025 13:49:13 GMT Message-Id: <202502111349.51BDnDPt003444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Juraj Lutter Subject: git: 860d98fc6d12 - stable/14 - periodic: set _localbase for periodic scripts from within periodic.conf List-Id: Commits to the stable branches 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: otis X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 860d98fc6d1237ceea25469a26f7c7cc9c7e4e66 Auto-Submitted: auto-generated The branch stable/14 has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=860d98fc6d1237ceea25469a26f7c7cc9c7e4e66 commit 860d98fc6d1237ceea25469a26f7c7cc9c7e4e66 Author: Juraj Lutter AuthorDate: 2024-11-08 13:38:19 +0000 Commit: Juraj Lutter CommitDate: 2025-02-11 13:47:28 +0000 periodic: set _localbase for periodic scripts from within periodic.conf Set _localbase variable from within /etc/defaults/periodic.conf for use by periodic scripts. This fixes e5d7100c09, no other functional changes intended. Reported by: gahr, otis Reviewed by: markj, gahr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47486 (cherry picked from commit c8b89c11a1181e900acb638cfde7a55e92553175) --- usr.sbin/periodic/periodic.conf | 9 +++++++++ usr.sbin/periodic/periodic.sh | 12 ++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 3bb34d827564..7066c7b49fd1 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -15,6 +15,15 @@ # # +_set_localbase() { + _localbase=`/sbin/sysctl -n user.localbase 2> /dev/null` + # Set default value of _localbase if not previously set + : ${_localbase:="/usr/local"} +} + +# Set _localbase with fallback to /usr/local +_set_localbase + # What files override these defaults ? periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local ${_localbase}/etc/periodic.conf" diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index bb7ecaa01894..61e3022e63aa 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -29,14 +29,6 @@ if [ $# -lt 1 ] ; then usage fi -_localbase=`/sbin/sysctl -n user.localbase 2> /dev/null` -# Set default value of _localbase if not previously set -: ${_localbase:="/usr/local"} - -# Use a deterministic path to match the preset from /etc/crontab in case -# periodic is run interactively. -export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${_localbase}/sbin:${_localbase}/bin - # If possible, check the global system configuration file, # to see if there are additional dirs to check if [ -r /etc/defaults/periodic.conf ]; then @@ -44,6 +36,10 @@ if [ -r /etc/defaults/periodic.conf ]; then source_periodic_confs fi +# Use a deterministic path to match the preset from /etc/crontab in case +# periodic is run interactively. +export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${_localbase}/sbin:${_localbase}/bin + host=`hostname` export host From nobody Tue Feb 11 16:53:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YsnZJ5D45z5nqt4; Tue, 11 Feb 2025 16:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsnZJ4hv0z48Km; Tue, 11 Feb 2025 16:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739292792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rm5o6mL+PDTgMbtpjo6n1k8hhMK/IqiTTMvEKZjadUk=; b=XEcmAxIYoVoyIdbZuMWZ/snIWC3rjJqXCsBodYbhwt4UimV7M+Olpo+O52a50Nhzq8W7PE mnnyias2NPAkmQuJNRy4FbyQ2X7NZJvJkJBUU2K1U1+0ds1oUtax2EocBOUyXSGY+IAOiY b0MeGXWsvTQUuzaJ9fM4z77oO5gNVFJESeytKML5LT/bk8tluO0hFFEYWCDmbGSga04nRE FlDYpuSdVMSvUXkM7FOQrMiHxPPz2/MGNa7so9YIbqaLXbnJxUh4tm7bw0FaOFCrmIBzeJ UDQWTPickmGGwIRkFBCbLvDgYKYLJHXRxwyBti2N2ZvxJyx2VsQxpzzuCCp5vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739292792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rm5o6mL+PDTgMbtpjo6n1k8hhMK/IqiTTMvEKZjadUk=; b=LqqxHMgLK3u5A5yRSFkIOVe4WuJFa/ZAFQLJaHxXRW6xQRna8p5B/Vmt4nU1C2jYvc1uaC /NBb+D7A0F+9p1eAnxU5OIAmfMoAGh8DYYqKCE+FCzfbZXaYd7UwhN+He/5Fokk4NB06Vt ncdHlS+mtVaiKjUDYN1sQMUbKAXoeoDOFq/JG+HUBgU/q78VEMq5sJmoPeHoOYeIvbMgmv fhHgQ+gaDmhd1ziAhdLAnrTpPsIw6DPueCVbrYiC/w2Ogq6oh40JZNP58Xguo+oPHeCiwO XxNlkYqmVFMtDBW4sXYU+Uq98bgboRTT5Ts+Tl9l/UEYVnK2KCyiHzevInOUvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739292792; a=rsa-sha256; cv=none; b=aUGrWmRdfNV63sT7g+BaXW7w/IaJ06svTRMMtYQhfstm53c/tReb6NitmHjpPol4qM71Hs x/l+Ao1bBdfJ2vrNc+05Ai4RjECHvm+1wGF1C3bB+WHM8KXD4bFxs2Upj0348wuW0zsoDk L/4bhLtYh1J63p04Us/JY6dUGFbS9F3FqGueHWBpt4b7biE7AMayU/Tyf30RxgY7Qnrmp5 4BOBKLpT63htcMYUjngc/NlaDhtrGLqpXvCI9aI1CO2xXwUn449z8V1sBHMO3x65WeBmml IwBA2W7AbmN1wGPcDLKnJIS60KgAaMQmBkPWwSNi4aYAMefv34QVxF4za/pTWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YsnZJ3zkGz5Zt; Tue, 11 Feb 2025 16:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BGrCk5057489; Tue, 11 Feb 2025 16:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BGrCPO057486; Tue, 11 Feb 2025 16:53:12 GMT (envelope-from git) Date: Tue, 11 Feb 2025 16:53:12 GMT Message-Id: <202502111653.51BGrCPO057486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8921c82b76e3 - stable/14 - carp: don't unintentionally revert to multicast mode List-Id: Commits to the stable branches 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8921c82b76e355deadf6a7810dfe20d65de49daa Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8921c82b76e355deadf6a7810dfe20d65de49daa commit 8921c82b76e355deadf6a7810dfe20d65de49daa Author: Kristof Provost AuthorDate: 2025-01-21 09:49:55 +0000 Commit: Kristof Provost CommitDate: 2025-02-11 16:52:42 +0000 carp: don't unintentionally revert to multicast mode PR: 284140 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit af33f86e6aef6b15c8aa3da615167272aa7a3ee3) --- sbin/ifconfig/carp.c | 4 ---- tests/sys/netinet/carp.sh | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c index dd09838b5d8b..a23c245f7fe6 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -246,10 +246,6 @@ static struct afswtch af_carp = { static __constructor void carp_ctor(void) { - /* Default to multicast. */ - setcarp_mcast(NULL, NULL, 0); - setcarp_mcast6(NULL, NULL, 0); - for (size_t i = 0; i < nitems(carp_cmds); i++) cmd_register(&carp_cmds[i]); af_register(&af_carp); diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index d0e10bc2c085..8cea2f4cbf1b 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -155,8 +155,11 @@ unicast_v4_body() atf_check -s exit:0 -o ignore jexec carp_uni_v4_one \ ping -c 3 192.0.2.1 - jexec carp_uni_v4_two ifconfig - jexec carp_uni_v4_three ifconfig + # Check that we remain in unicast when tweaking settings + atf_check -s exit:0 -o ignore \ + jexec carp_uni_v4_two ifconfig ${epair_one}b vhid 1 advskew 2 + atf_check -s exit:0 -o match:"peer 198.51.100.130" \ + jexec carp_uni_v4_two ifconfig ${epair_one}b } unicast_v4_cleanup() From nobody Tue Feb 11 21:28:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ysvgn33Bsz5mlmw; Tue, 11 Feb 2025 21:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ysvgn0y9nz3LPv; Tue, 11 Feb 2025 21:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739309301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrOtySJKgIkw4JVH5Ho7IxCfIBtGOoovxPCD1c+ccBQ=; b=Mf5eavt2C/+w2VP6MHkHGetHQkFCWzlldMvTzDkvWbMcS+YLabGt+U1l5ZGj37kRPbp8tl g2Ot//dzg7CYZliscBOJcdoRh/aXEWxGP6SaM2CwCePNLO9ckmI1xWAaGT0jsDgJBoXBeQ qzShFlc9NwNa51saboV+hapLS2vurdHD3yCmHOuM0Op09rRLo0jO3YZyj5rLuLv1WuqG38 5wp5AtXhBV7JUxSZfmQTDpEhBviCyux+kcINNX455qeGnRtXzmf4c1luq+6rvNDYUT+kcQ F6WBXdlLlu+vY1Ux1XE7o0x0kSwkCcyr4tuOLII9bZ/eZcxErmRrtoZrz/QycA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739309301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrOtySJKgIkw4JVH5Ho7IxCfIBtGOoovxPCD1c+ccBQ=; b=wJPtDGMwtb7EHfkKbP1ZdG5ZSVK+482AKtjSOFmxxN9IilalvfTp0t9DIF3cp47I+fMiKD UfSctl5DlFmMWmdEtnrZ0NpiHzSQSnUJJtxlu0Gq/oa6SnEOpSPoCZnhr5pgp8dRIl9nWc 43kJuQT9hO7EaAiWQu9vdH/EV4ZA0W/KPuY7OzovCmxGCRYg9g31PMgeVv9hw+IShhQ78T SHYWJ+qUH871Vc+HUeJ3WCDTQKdxZc5QjZbEcjXqaNwElC3O5lH14oDqTFa8zCXH9/dKqq xAiqvuH1du7vlXN0J1R1fyNJmsXMow9HnhXKTzvpy1F57HFMamGQfX9z5F5uKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739309301; a=rsa-sha256; cv=none; b=x5R2peMrdqaE3HvwEVY54ImDapPXmfKv1e2VWBxSUojjeFmhz93E0YCLca6JBkbzqt6aD8 L/wYTopfrD1X3GvEVYDW/osewNjv/IqBZPLfh4gF2WJr1tu56QwnBWpdqEkuBcoxBhFBMX RUgSbC6xLemja1dUYTRV0ig/qT5yQVRhker++zQICOCoQH8C3FY1+nVVxe5NNFG8cfUH8M pyfaBzo5RfNccotkkBeuYImAgMzojB1Tw/VHVzEHiny4lPRwT6X4DKBBkdOz7x9j6hxfY5 kqB9/Fu+A7DdPTLMlwsGp/FgpgWn4rgytylRLGfQUVCeJV8MT6y9Da73dlSwMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ysvgn0YdtzTx2; Tue, 11 Feb 2025 21:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BLSKnp067022; Tue, 11 Feb 2025 21:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BLSKxH067019; Tue, 11 Feb 2025 21:28:20 GMT (envelope-from git) Date: Tue, 11 Feb 2025 21:28:20 GMT Message-Id: <202502112128.51BLSKxH067019@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: 90702fb5de14 - stable/14 - install: Fix METALOG ouptut for numeric -o and -g args List-Id: Commits to the stable branches 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: 90702fb5de14c34e2404bd1f58706a067ac459bc Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=90702fb5de14c34e2404bd1f58706a067ac459bc commit 90702fb5de14c34e2404bd1f58706a067ac459bc Author: Ed Maste AuthorDate: 2025-01-17 19:14:22 +0000 Commit: Ed Maste CommitDate: 2025-02-11 21:27:17 +0000 install: Fix METALOG ouptut for numeric -o and -g args install's -o and -g flags both accept a name or a numeric argument. In -U -M (non-root METALOG) mode it always emitted uname= and gname= in the METALOG, but these are not appropriate for numeric IDs. If the -o and/or -u arguments parse as an ID, emit uid= and/or gid= respectively. Note that if an argument is valid as both a name and numeric ID we will prefer the name in normal (non -U -M) mode and the ID in -U -M mode. We don't want to require a passwd db in non-root mode, and entirely-numeric user or group names are a terrible idea so just accept this discrepancy. PR: 284119 Reviewed by: jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48504 (cherry picked from commit 4b04f5d7e8a2bb0488ad5804ecaf45cef5b1d46f) --- usr.bin/xinstall/xinstall.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 1667c54e3649..4d771186781b 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1444,10 +1444,22 @@ metadata_log(const char *path, const char *type, struct timespec *ts, p = buf; /* Print details. */ fprintf(metafp, ".%s%s type=%s", *p ? "/" : "", p, type); - if (owner) - fprintf(metafp, " uname=%s", owner); - if (group) - fprintf(metafp, " gname=%s", group); + if (owner) { + id_t id; + + if (parseid(owner, &id)) + fprintf(metafp, " uid=%jd", (intmax_t)id); + else + fprintf(metafp, " uname=%s", owner); + } + if (group) { + id_t id; + + if (parseid(group, &id)) + fprintf(metafp, " gid=%jd", (intmax_t)id); + else + fprintf(metafp, " gname=%s", group); + } fprintf(metafp, " mode=%#o", mode); if (slink) { strsnvis(buf, buflen, slink, VIS_CSTYLE, extra); From nobody Tue Feb 11 21:32:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ysvn315zdz5mmJY; Tue, 11 Feb 2025 21:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ysvn30K5Sz3PTR; Tue, 11 Feb 2025 21:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739309575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YkzLelMYwEF5T7VH5/C/f4tIF73QmseoPf53604c6uc=; b=YuapM5vO+IlaFH93QwwU352X5mKfIBvOquJmeYiyltK9p/W06zqeAjXjKAP1/hLIp8v4F6 BCte2fyECUDEAixxM43Gy6rTaSmTqUkZRu/4XyBJLXu9nDVphtEE9RY4iK1JzeJ0SUkzdl 9GQzYaJF1XnWeDjtrfZBodF8HO4ReF5YBBejfxLkzp12DzPr2qoz4znwOrFz4jkWjICRii DEDyeaV7NuxgNyXz0EwmhkPSjcGZZE5VJmVPOp0gQr8c4k7UPtkLXcAoXT0Jf2CsHTRqYn YsSmtzVALyqWFezVzPAXBI+Kzo6n87wxWLmonIiYcuw/A//KmD8rCjzBBga7Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739309575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YkzLelMYwEF5T7VH5/C/f4tIF73QmseoPf53604c6uc=; b=vT7AV/VhnahQ/VoubjGo/U0Hi2dsbrZtm6v7AB9cEbJdME3owdRdKVy5yvFS5VM+deAQVz y3gUBc+OMPA+Vq1EhFiDa0sblgngi+GCVk/bIrr25MIsuu7e+6l5iNcFkFZSlbtTXyucBI NMXMnNZD2NmERoU1MyXRRJAm4dZOP5wR26oQcLvWRH00AMcrXSmxCfh+vAh348g8FeuBob 8GJfWiUC+8hdXgN/yWtvTyP8W4pl/CoFGUFV/JTORbPLNXSMkyOz/Aatnr2ehT4wyf1kBs LhJO/41185SxroKEpcuZcvfXvrSmVz+vpFwoKMiB/poPYJ4SdcIaHETcMQGA1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739309575; a=rsa-sha256; cv=none; b=eTR/8TbX6fTRUacTJ9rBxO8bRazHoi2YPLIPU8fn0X/Bp1jeg2CL7eBOccValpMzsuzDFJ d18brMfXFbXF8X8XE1iM7PL6wx7xE+E20xHjUQdFB1CSXME3UdKtRz3fxbuEUXc/ZXLVuC i+W5XjogjUAKHsmdsUw+Y7scUDBJr3h7x8HrnwnN3Y48HbREAN4qmQHPnp/zprQYYWDWkO tQe9ddL5bAUzap8A7p9TG5NySkDF4o4mjagUKXHRni5+LXkAWUJ+TdnuV5wYgW+kAxsv9x 5NkhwBsbKRi1aD4mKWChbAj2MZQilkE0lmsh2l8pEdL+fvfeordRbmBBr2PG0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ysvn26QfQzVFn; Tue, 11 Feb 2025 21:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BLWsI4083681; Tue, 11 Feb 2025 21:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BLWs80083678; Tue, 11 Feb 2025 21:32:54 GMT (envelope-from git) Date: Tue, 11 Feb 2025 21:32:54 GMT Message-Id: <202502112132.51BLWs80083678@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: 916ee8225f53 - stable/14 - contrib: Remove now-unused cortex-strings List-Id: Commits to the stable branches 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: 916ee8225f53af703548c7e787e104a59a91a164 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=916ee8225f53af703548c7e787e104a59a91a164 commit 916ee8225f53af703548c7e787e104a59a91a164 Author: Ed Maste AuthorDate: 2025-01-17 14:51:00 +0000 Commit: Ed Maste CommitDate: 2025-02-11 21:30:59 +0000 contrib: Remove now-unused cortex-strings Replaced by arm-optimized-routines in commit 2e8ff4d1d5b9 ("Switch to Arm Optimized Routines for mem* & str*"). Reviewed by: andrew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48500 (cherry picked from commit 4a7d6666c5ddd135b2023b4b3b4962770ff2e73b) --- contrib/cortex-strings/.gitignore | 11 - contrib/cortex-strings/Makefile.am | 327 --------- contrib/cortex-strings/README | 111 --- contrib/cortex-strings/autogen.sh | 69 -- contrib/cortex-strings/benchmarks/dhry/dhry.h | 311 --------- contrib/cortex-strings/benchmarks/dhry/dhry_1.c | 778 ---------------------- contrib/cortex-strings/benchmarks/dhry/dhry_2.c | 186 ------ contrib/cortex-strings/benchmarks/multi/harness.c | 407 ----------- contrib/cortex-strings/configure.ac | 88 --- contrib/cortex-strings/scripts/add-license.sh | 79 --- contrib/cortex-strings/scripts/bench.py | 175 ----- contrib/cortex-strings/scripts/fixup.py | 27 - contrib/cortex-strings/scripts/libplot.py | 78 --- contrib/cortex-strings/scripts/plot-align.py | 67 -- contrib/cortex-strings/scripts/plot-sizes.py | 120 ---- contrib/cortex-strings/scripts/plot-top.py | 61 -- contrib/cortex-strings/scripts/plot.py | 123 ---- contrib/cortex-strings/scripts/trim.sh | 9 - contrib/cortex-strings/src/aarch64/memchr.S | 172 ----- contrib/cortex-strings/src/aarch64/memcmp.S | 162 ----- contrib/cortex-strings/src/aarch64/memcpy.S | 225 ------- contrib/cortex-strings/src/aarch64/memmove.S | 150 ----- contrib/cortex-strings/src/aarch64/memset.S | 235 ------- contrib/cortex-strings/src/aarch64/strchr.S | 165 ----- contrib/cortex-strings/src/aarch64/strchrnul.S | 144 ---- contrib/cortex-strings/src/aarch64/strcmp.S | 166 ----- contrib/cortex-strings/src/aarch64/strcpy.S | 336 ---------- contrib/cortex-strings/src/aarch64/strlen.S | 233 ------- contrib/cortex-strings/src/aarch64/strncmp.S | 222 ------ contrib/cortex-strings/src/aarch64/strnlen.S | 181 ----- contrib/cortex-strings/src/arm/memchr.S | 155 ----- contrib/cortex-strings/src/arm/memcpy.S | 617 ----------------- contrib/cortex-strings/src/arm/memset.S | 122 ---- contrib/cortex-strings/src/arm/strchr.S | 80 --- contrib/cortex-strings/src/arm/strcmp.S | 500 -------------- contrib/cortex-strings/src/thumb-2/strcpy.c | 173 ----- contrib/cortex-strings/src/thumb-2/strlen.S | 150 ----- contrib/cortex-strings/src/thumb/aeabi_idiv.S | 318 --------- contrib/cortex-strings/src/thumb/strcmp-armv6m.S | 143 ---- 39 files changed, 7676 deletions(-) diff --git a/contrib/cortex-strings/.gitignore b/contrib/cortex-strings/.gitignore deleted file mode 100644 index 558ca155c736..000000000000 --- a/contrib/cortex-strings/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -*.a -*.o -*.la -*.lo -*.png -*.pyc -.deps -.dirstamp -.libs -try-* -cache.txt diff --git a/contrib/cortex-strings/Makefile.am b/contrib/cortex-strings/Makefile.am deleted file mode 100644 index db6bb93254a4..000000000000 --- a/contrib/cortex-strings/Makefile.am +++ /dev/null @@ -1,327 +0,0 @@ -# Copyright (c) 2011, Linaro Limited -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * 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. -# * Neither the name of the Linaro nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. -# - -# Top level Makefile for cortex-strings - -# Used to record the compiler version in the executables -COMPILER = $(shell $(CC) --version 2>&1 | head -n1) - -# The main library -lib_LTLIBRARIES = \ - libcortex-strings.la - -## Test suite -check_PROGRAMS = \ - tests/test-memchr \ - tests/test-memcmp \ - tests/test-memcpy \ - tests/test-memmove \ - tests/test-memset \ - tests/test-strchr \ - tests/test-strcmp \ - tests/test-strcpy \ - tests/test-strlen \ - tests/test-strncmp \ - tests/test-strnlen - -# Options for the tests -tests_cflags = -I$(srcdir)/tests $(AM_CFLAGS) -tests_ldadd = libcortex-strings.la -tests_test_memchr_LDADD = $(tests_ldadd) -tests_test_memchr_CFLAGS = $(tests_cflags) -tests_test_memcmp_LDADD = $(tests_ldadd) -tests_test_memcmp_CFLAGS = $(tests_cflags) -tests_test_memcpy_LDADD = $(tests_ldadd) -tests_test_memcpy_CFLAGS = $(tests_cflags) -tests_test_memmove_LDADD = $(tests_ldadd) -tests_test_memmove_CFLAGS = $(tests_cflags) -tests_test_memset_LDADD = $(tests_ldadd) -tests_test_memset_CFLAGS = $(tests_cflags) -tests_test_strchr_LDADD = $(tests_ldadd) -tests_test_strchr_CFLAGS = $(tests_cflags) -tests_test_strcmp_LDADD = $(tests_ldadd) -tests_test_strcmp_CFLAGS = $(tests_cflags) -tests_test_strcpy_LDADD = $(tests_ldadd) -tests_test_strcpy_CFLAGS = $(tests_cflags) -tests_test_strlen_LDADD = $(tests_ldadd) -tests_test_strlen_CFLAGS = $(tests_cflags) -tests_test_strncmp_LDADD = $(tests_ldadd) -tests_test_strncmp_CFLAGS = $(tests_cflags) - -TESTS = $(check_PROGRAMS) - -## Benchmarks -noinst_PROGRAMS = \ - dhry \ - dhry-native \ - try-none \ - try-this \ - try-plain \ - try-newlib-c \ - try-bionic-c \ - try-glibc-c - -# Good 'ol Dhrystone -dhry_SOURCES = \ - benchmarks/dhry/dhry_1.c \ - benchmarks/dhry/dhry_2.c \ - benchmarks/dhry/dhry.h - -dhry_CFLAGS = -Dcompiler="\"$(COMPILER)\"" -Doptions="\"$(CFLAGS)\"" -dhry_LDADD = libcortex-strings.la - -dhry_native_SOURCES = $(dhry_SOURCES) -dhry_native_CFLAGS = $(dhry_CFLAGS) - -# Benchmark harness -noinst_LIBRARIES = \ - libmulti.a \ - libbionic-c.a \ - libglibc-c.a \ - libnewlib-c.a \ - libplain.a - -libmulti_a_SOURCES = \ - benchmarks/multi/harness.c - -libmulti_a_CFLAGS = -DVERSION=\"$(VERSION)\" $(AM_CFLAGS) - -## Other architecture independant implementaions -libbionic_c_a_SOURCES = \ - reference/bionic-c/bcopy.c \ - reference/bionic-c/memchr.c \ - reference/bionic-c/memcmp.c \ - reference/bionic-c/memcpy.c \ - reference/bionic-c/memset.c \ - reference/bionic-c/strchr.c \ - reference/bionic-c/strcmp.c \ - reference/bionic-c/strcpy.c \ - reference/bionic-c/strlen.c - -libglibc_c_a_SOURCES = \ - reference/glibc-c/memchr.c \ - reference/glibc-c/memcmp.c \ - reference/glibc-c/memcpy.c \ - reference/glibc-c/memset.c \ - reference/glibc-c/strchr.c \ - reference/glibc-c/strcmp.c \ - reference/glibc-c/strcpy.c \ - reference/glibc-c/strlen.c \ - reference/glibc-c/wordcopy.c \ - reference/glibc-c/memcopy.h \ - reference/glibc-c/pagecopy.h - -libnewlib_c_a_SOURCES = \ - reference/newlib-c/memchr.c \ - reference/newlib-c/memcmp.c \ - reference/newlib-c/memcpy.c \ - reference/newlib-c/memset.c \ - reference/newlib-c/strchr.c \ - reference/newlib-c/strcmp.c \ - reference/newlib-c/strcpy.c \ - reference/newlib-c/strlen.c \ - reference/newlib-c/shim.h - -libplain_a_SOURCES = \ - reference/plain/memset.c \ - reference/plain/memcpy.c \ - reference/plain/strcmp.c \ - reference/plain/strcpy.c - -try_none_SOURCES = -try_none_LDADD = libmulti.a -lrt -try_this_SOURCES = -try_this_LDADD = libmulti.a libcortex-strings.la -lrt -try_bionic_c_SOURCES = -try_bionic_c_LDADD = libmulti.a libbionic-c.a -lrt -try_glibc_c_SOURCES = -try_glibc_c_LDADD = libmulti.a libglibc-c.a -lrt -try_newlib_c_SOURCES = -try_newlib_c_LDADD = libmulti.a libnewlib-c.a -lrt -try_plain_SOURCES = -try_plain_LDADD = libmulti.a libplain.a -lrt - -# Architecture specific - -if HOST_AARCH32 - -if WITH_NEON -# Pull in the NEON specific files -neon_bionic_a9_sources = \ - reference/bionic-a9/memcpy.S \ - reference/bionic-a9/memset.S -neon_bionic_a15_sources = \ - reference/bionic-a15/memcpy.S \ - reference/bionic-a15/memset.S -fpu_flags = -mfpu=neon -else -if WITH_VFP -fpu_flags = -mfpu=vfp -else -fpu_flags = -msoft-float -endif -endif - -# Benchmarks and example programs -noinst_PROGRAMS += \ - try-bionic-a9 \ - try-bionic-a15 \ - try-csl \ - try-glibc \ - try-newlib \ - try-newlib-xscale - -# Libraries used in the benchmarks and examples -noinst_LIBRARIES += \ - libbionic-a9.a \ - libbionic-a15.a \ - libcsl.a \ - libglibc.a \ - libnewlib.a \ - libnewlib-xscale.a - -# Main library -libcortex_strings_la_SOURCES = \ - src/thumb-2/strcpy.c \ - src/arm/memchr.S \ - src/arm/strchr.S \ - src/thumb-2/strlen.S \ - src/arm/memset.S \ - src/arm/memcpy.S \ - src/arm/strcmp.S - -# Libraries containing the difference reference versions -libbionic_a9_a_SOURCES = \ - $(neon_bionic_a9_sources) \ - reference/bionic-a9/memcmp.S \ - reference/bionic-a9/strcmp.S \ - reference/bionic-a9/strcpy.S \ - reference/bionic-a9/strlen.c - -libbionic_a9_a_CFLAGS = -Wa,-mimplicit-it=thumb - -libbionic_a15_a_SOURCES = \ - $(neon_bionic_a15_sources) \ - reference/bionic-a15/memcmp.S \ - reference/bionic-a15/strcmp.S \ - reference/bionic-a15/strcpy.S \ - reference/bionic-a15/strlen.c - -libbionic_a15_a_CFLAGS = -Wa,-mimplicit-it=thumb - -libcsl_a_SOURCES = \ - reference/csl/memcpy.c \ - reference/csl/memset.c \ - reference/csl/arm_asm.h - -libglibc_a_SOURCES = \ - reference/glibc/memcpy.S \ - reference/glibc/memset.S \ - reference/glibc/strchr.S \ - reference/glibc/strlen.S - -libnewlib_a_SOURCES = \ - reference/newlib/memcpy.S \ - reference/newlib/strcmp.S \ - reference/newlib/strcpy.c \ - reference/newlib/strlen.c \ - reference/newlib/arm_asm.h \ - reference/newlib/shim.h - -libnewlib_xscale_a_SOURCES = \ - reference/newlib-xscale/memchr.c \ - reference/newlib-xscale/memcpy.c \ - reference/newlib-xscale/memset.c \ - reference/newlib-xscale/strchr.c \ - reference/newlib-xscale/strcmp.c \ - reference/newlib-xscale/strcpy.c \ - reference/newlib-xscale/strlen.c \ - reference/newlib-xscale/xscale.h - -# Flags for the benchmark helpers -try_bionic_a9_SOURCES = -try_bionic_a9_LDADD = libmulti.a libbionic-a9.a -lrt -try_bionic_a15_SOURCES = -try_bionic_a15_LDADD = libmulti.a libbionic-a15.a -lrt -try_csl_SOURCES = -try_csl_LDADD = libmulti.a libcsl.a -lrt -try_glibc_SOURCES = -try_glibc_LDADD = libmulti.a libglibc.a -lrt -try_newlib_SOURCES = -try_newlib_LDADD = libmulti.a libnewlib.a -lrt -try_newlib_xscale_SOURCES = -try_newlib_xscale_LDADD = libmulti.a libnewlib-xscale.a -lrt - -AM_CPPFLAGS = $(fpu_flags) -AM_LDFLAGS = $(fpu_flags) - -endif - -# aarch64 specific -if HOST_AARCH64 - -libcortex_strings_la_SOURCES = \ - src/aarch64/memchr.S \ - src/aarch64/memcmp.S \ - src/aarch64/memcpy.S \ - src/aarch64/memmove.S \ - src/aarch64/memset.S \ - src/aarch64/strchr.S \ - src/aarch64/strchrnul.S \ - src/aarch64/strcmp.S \ - src/aarch64/strcpy.S \ - src/aarch64/strlen.S \ - src/aarch64/strncmp.S \ - src/aarch64/strnlen.S - -endif - -libcortex_strings_la_LDFLAGS = -version-info 1:0:0 - -AM_CFLAGS = \ - -std=gnu99 -Wall \ - -fno-builtin -fno-stack-protector -U_FORTIFY_SOURCE \ - $(AM_CPPFLAGS) - -if WITH_SUBMACHINE -AM_CFLAGS += \ - -mtune=$(submachine) -endif - -EXTRA_DIST = \ - tests/hp-timing.h \ - tests/test-string.h \ - tests/test-skeleton.c \ - scripts/add-license.sh \ - scripts/bench.py \ - scripts/fixup.py \ - scripts/libplot.py \ - scripts/plot-align.py \ - scripts/plot.py \ - scripts/plot-sizes.py \ - scripts/plot-top.py \ - scripts/trim.sh \ - autogen.sh diff --git a/contrib/cortex-strings/README b/contrib/cortex-strings/README deleted file mode 100644 index 5e9e9d3f1d6f..000000000000 --- a/contrib/cortex-strings/README +++ /dev/null @@ -1,111 +0,0 @@ -= Cortex-A String Routines = - -This package contains optimised string routines including memcpy(), memset(), -strcpy(), strlen() for the ARM Cortex-A series of cores. - -Various implementations of these routines are provided, including generic -implementations for ARMv7-A cores with/without Neon, Thumb2 implementations -and generic implementations for cores supporting AArch64. - -== Getting started == -First configure and then install libcortex-strings.so. To make other -applications use this library, either add -lcortex-strings to the link -command or use LD_PRELOAD to load the library into existing applications. - -Our intent is to get these routines into the common C libraries such -as GLIBC, Bionic, and Newlib. Your system may already include them! - -== Contents == - * src/ contains the routines themselves - * tests/ contains the unit tests - * reference/ contains reference copies of other ARM-focused - implementations gathered from around the Internet - * benchmarks/ contains various benchmarks, tools, and scripts used to - check and report on the different implementations. - -The src directory contains different variants organised by the -implementation they run on and optional features used. For example: - * src/thumb-2 contains generic non-NEON routines for AArch32 (with Thumb-2). - * src/arm contains tuned routines for Cortex-A class processors. - * src/aarch64 contains generic routines for AArch64. - * src/thumb contains generic routines for armv6-M (with Thumb). - -== Reference versions == -reference/ contains versions collected from various popular Open -Source libraries. These have been modified for use in benchmarking. -Please refer to the individual files for any licensing terms. - -The routines were collected from the following releases: - * EGLIBC 2.13 - * Newlib 1.19.0 - * Bionic android-2.3.5_r1 - -== Licensing == -All Linaro-authored routines are under the modified BSD license: - -Copyright (c) 2011, Linaro Limited -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * 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. - * Neither the name of the Linaro nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. - -All ARM-authored routines are under the modified BSD license: - -Copyright (c) 2014 ARM Ltd -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * 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. - * Neither the name of the Linaro nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. - -All third party routines are under a GPL compatible license. - -== Notes and Limitations == -Some of the implementations have been collected from other -projects and have a variety of licenses and copyright holders. - -== Style == -Assembly code attempts to follow the GLIBC coding convetions. They -are: - * Copyright headers in C style comment blocks - * Instructions indented with one tab - * Operands indented with one tab - * Text is wrapped at 70 characters - * End of line comments are fine diff --git a/contrib/cortex-strings/autogen.sh b/contrib/cortex-strings/autogen.sh deleted file mode 100755 index 8e0591cc315a..000000000000 --- a/contrib/cortex-strings/autogen.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# autogen.sh glue for hplip -# -# HPLIP used to have five or so different autotools trees. Upstream -# has reduced it to two. Still, this script is capable of cleaning -# just about any possible mess of autoconf files. -# -# BE CAREFUL with trees that are not completely automake-generated, -# this script deletes all Makefile.in files it can find. -# -# Requires: automake 1.9, autoconf 2.57+ -# Conflicts: autoconf 2.13 -set -e - -# Refresh GNU autotools toolchain. -echo Cleaning autotools files... -find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \; -find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \ - -o -name depcomp -o -name ltmain.sh -o -name configure \ - -o -name config.sub -o -name config.guess \ - -o -name Makefile.in \) -print0 | xargs -0 rm -f - -echo Running autoreconf... -autoreconf --force --install - -# For the Debian package build -test -d debian && { - # link these in Debian builds - rm -f config.sub config.guess - ln -s /usr/share/misc/config.sub . - ln -s /usr/share/misc/config.guess . - - # refresh list of executable scripts, to avoid possible breakage if - # upstream tarball does not include the file or if it is mispackaged - # for whatever reason. - [ "$1" = "updateexec" ] && { - echo Generating list of executable files... - rm -f debian/executable.files - find -type f -perm +111 ! -name '.*' -fprint debian/executable.files - } - - # Remove any files in upstream tarball that we don't have in the Debian - # package (because diff cannot remove files) - version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'` - source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '` - if test -r ../${source}_${version}.orig.tar.gz ; then - echo Generating list of files that should be removed... - rm -f debian/deletable.files - touch debian/deletable.files - [ -e debian/tmp ] && rm -rf debian/tmp - mkdir debian/tmp - ( cd debian/tmp ; tar -zxf ../../../${source}_${version}.orig.tar.gz ) - find debian/tmp/ -type f ! -name '.*' -print0 | xargs -0 -ri echo '{}' | \ - while read -r i ; do - if test -e "${i}" ; then - filename=$(echo "${i}" | sed -e 's#.*debian/tmp/[^/]\+/##') - test -e "${filename}" || echo "${filename}" >>debian/deletable.files - fi - done - rm -fr debian/tmp - else - echo Emptying list of files that should be deleted... - rm -f debian/deletable.files - touch debian/deletable.files - fi -} - -exit 0 diff --git a/contrib/cortex-strings/benchmarks/dhry/dhry.h b/contrib/cortex-strings/benchmarks/dhry/dhry.h deleted file mode 100644 index 3010aecdd31f..000000000000 --- a/contrib/cortex-strings/benchmarks/dhry/dhry.h +++ /dev/null @@ -1,311 +0,0 @@ -/* - ************************************************************************** - * DHRYSTONE 2.1 BENCHMARK PC VERSION - ************************************************************************** - * - * "DHRYSTONE" Benchmark Program - * ----------------------------- - * - * Version: C, Version 2.1 - * - * File: dhry.h (part 1 of 3) - * - * Date: May 25, 1988 - * - * Author: Reinhold P. Weicker - * Siemens AG, AUT E 51 - * Postfach 3220 - * 8520 Erlangen - * Germany (West) - * Phone: [+49]-9131-7-20330 - * (8-17 Central European Time) - * Usenet: ..!mcsun!unido!estevax!weicker - * - * Original Version (in Ada) published in - * "Communications of the ACM" vol. 27., no. 10 (Oct. 1984), - * pp. 1013 - 1030, together with the statistics - * on which the distribution of statements etc. is based. - * - * In this C version, the following C library functions are used: - * - strcpy, strcmp (inside the measurement loop) - * - printf, scanf (outside the measurement loop) - * In addition, Berkeley UNIX system calls "times ()" or "time ()" - * are used for execution time measurement. For measurements - * on other systems, these calls have to be changed. - * - * Collection of Results: - * Reinhold Weicker (address see above) and - * - * Rick Richardson - * PC Research. Inc. - * 94 Apple Orchard Drive - * Tinton Falls, NJ 07724 - * Phone: (201) 389-8963 (9-17 EST) - * Usenet: ...!uunet!pcrat!rick - * - * Please send results to Rick Richardson and/or Reinhold Weicker. - * Complete information should be given on hardware and software used. - * Hardware information includes: Machine type, CPU, type and size - * of caches; for microprocessors: clock frequency, memory speed - * (number of wait states). - * Software information includes: Compiler (and runtime library) - * manufacturer and version, compilation switches, OS version. - * The Operating System version may give an indication about the - * compiler; Dhrystone itself performs no OS calls in the measurement - * loop. - * - * The complete output generated by the program should be mailed - * such that at least some checks for correctness can be made. - * - ************************************************************************** - * - * This version has changes made by Roy Longbottom to conform to a common - * format for a series of standard benchmarks for PCs: - * - * Running time greater than 5 seconds due to inaccuracy of the PC clock. - * - * Automatic adjustment of run time, no manually inserted parameters. - * - * Initial display of calibration times to confirm linearity. - * - * Display of results within one screen (or at a slow speed as the test - * progresses) so that it can be seen to have run successfully. - * - * Facilities to type in details of system used etc. - * - * All results and details appended to a results file. - * - * - * Roy Longbottom - * 101323.2241@compuserve.com - * - ************************************************************************** - * - * For details of history, changes, other defines, benchmark construction - * statistics see official versions from ftp.nosc.mil/pub/aburto where - * the latest table of results (dhry.tbl) are available. See also - * netlib@ornl.gov - * - ************************************************************************** - * - * Defines: The following "Defines" are possible: - * -DREG=register (default: Not defined) - * As an approximation to what an average C programmer - * might do, the "register" storage class is applied - * (if enabled by -DREG=register) - * - for local variables, if they are used (dynamically) - * five or more times - * - for parameters if they are used (dynamically) - * six or more times - * Note that an optimal "register" strategy is - * compiler-dependent, and that "register" declarations - * do not necessarily lead to faster execution. - * -DNOSTRUCTASSIGN (default: Not defined) - * Define if the C compiler does not support - * assignment of structures. - * -DNOENUMS (default: Not defined) - * Define if the C compiler does not support - * enumeration types. - *************************************************************************** - * - * Compilation model and measurement (IMPORTANT): - * - * This C version of Dhrystone consists of three files: - * - dhry.h (this file, containing global definitions and comments) - * - dhry_1.c (containing the code corresponding to Ada package Pack_1) - * - dhry_2.c (containing the code corresponding to Ada package Pack_2) - * - * The following "ground rules" apply for measurements: - * - Separate compilation - * - No procedure merging - * - Otherwise, compiler optimizations are allowed but should be indicated - * - Default results are those without register declarations - * See the companion paper "Rationale for Dhrystone Version 2" for a more - * detailed discussion of these ground rules. - * - * For 16-Bit processors (e.g. 80186, 80286), times for all compilation - * models ("small", "medium", "large" etc.) should be given if possible, - * together with a definition of these models for the compiler system used. - * - ************************************************************************** - * Examples of Pentium Results - * - * Dhrystone Benchmark Version 2.1 (Language: C) - * - * Month run 4/1996 - * PC model Escom - * CPU Pentium - * Clock MHz 100 - * Cache 256K - * Options Neptune chipset - * OS/DOS Windows 95 - * Compiler Watcom C/ C++ 10.5 Win386 - * OptLevel -otexan -zp8 -fp5 -5r - * Run by Roy Longbottom - * From UK - * Mail 101323.2241@compuserve.com - * - * Final values (* implementation-dependent): - * - * Int_Glob: O.K. 5 - * Bool_Glob: O.K. 1 - * Ch_1_Glob: O.K. A - * Ch_2_Glob: O.K. B - * Arr_1_Glob[8]: O.K. 7 - * Arr_2_Glob8/7: O.K. 1600010 - * Ptr_Glob-> - * Ptr_Comp: * 98008 - * Discr: O.K. 0 - * Enum_Comp: O.K. 2 - * Int_Comp: O.K. 17 - * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING - * Next_Ptr_Glob-> - * Ptr_Comp: * 98008 same as above - * Discr: O.K. 0 - * Enum_Comp: O.K. 1 - * Int_Comp: O.K. 18 - * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING - * Int_1_Loc: O.K. 5 - * Int_2_Loc: O.K. 13 - * Int_3_Loc: O.K. 7 - * Enum_Loc: O.K. 1 - * Str_1_Loc: O.K. DHRYSTONE PROGRAM, 1'ST STRING - * Str_2_Loc: O.K. DHRYSTONE PROGRAM, 2'ND STRING - * - * Register option Selected. - * - * Microseconds 1 loop: 4.53 - * Dhrystones / second: 220690 - * VAX MIPS rating: 125.61 - * - * - * Dhrystone Benchmark Version 2.1 (Language: C) - * - * Month run 4/1996 - * PC model Escom - * CPU Pentium - * Clock MHz 100 - * Cache 256K - * Options Neptune chipset - * OS/DOS Windows 95 - * Compiler Watcom C/ C++ 10.5 Win386 - * OptLevel No optimisation - * Run by Roy Longbottom - * From UK - * Mail 101323.2241@compuserve.com - * - * Final values (* implementation-dependent): - * - * Int_Glob: O.K. 5 - * Bool_Glob: O.K. 1 - * Ch_1_Glob: O.K. A - * Ch_2_Glob: O.K. B - * Arr_1_Glob[8]: O.K. 7 - * Arr_2_Glob8/7: O.K. 320010 - * Ptr_Glob-> - * Ptr_Comp: * 98004 - * Discr: O.K. 0 - * Enum_Comp: O.K. 2 - * Int_Comp: O.K. 17 - * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING - * Next_Ptr_Glob-> - * Ptr_Comp: * 98004 same as above - * Discr: O.K. 0 - * Enum_Comp: O.K. 1 - * Int_Comp: O.K. 18 - * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING - * Int_1_Loc: O.K. 5 - * Int_2_Loc: O.K. 13 - * Int_3_Loc: O.K. 7 - * Enum_Loc: O.K. 1 - * Str_1_Loc: O.K. DHRYSTONE PROGRAM, 1'ST STRING - * Str_2_Loc: O.K. DHRYSTONE PROGRAM, 2'ND STRING - * - * Register option Not selected. - * - * Microseconds 1 loop: 20.06 - * Dhrystones / second: 49844 - * VAX MIPS rating: 28.37 - * - ************************************************************************** - */ - -/* Compiler and system dependent definitions: */ - -#ifndef TIME -#define TIMES -#endif - /* Use times(2) time function unless */ - /* explicitly defined otherwise */ - -#ifdef TIMES -/* #include - #include */ - /* for "times" */ -#endif - -#define Mic_secs_Per_Second 1000000.0 - /* Berkeley UNIX C returns process times in seconds/HZ */ - -#ifdef NOSTRUCTASSIGN -#define structassign(d, s) memcpy(&(d), &(s), sizeof(d)) -#else -#define structassign(d, s) d = s -#endif - -#ifdef NOENUM -#define Ident_1 0 -#define Ident_2 1 -#define Ident_3 2 -#define Ident_4 3 -#define Ident_5 4 - typedef int Enumeration; -#else - typedef enum {Ident_1, Ident_2, Ident_3, Ident_4, Ident_5} - Enumeration; -#endif - /* for boolean and enumeration types in Ada, Pascal */ - -/* General definitions: */ - -#include -#include - - /* for strcpy, strcmp */ - -#define Null 0 - /* Value of a Null pointer */ -#define true 1 -#define false 0 - -typedef int One_Thirty; -typedef int One_Fifty; -typedef char Capital_Letter; -typedef int Boolean; -typedef char Str_30 [31]; -typedef int Arr_1_Dim [50]; -typedef int Arr_2_Dim [50] [50]; - -typedef struct record - { - struct record *Ptr_Comp; - Enumeration Discr; - union { - struct { - Enumeration Enum_Comp; - int Int_Comp; - char Str_Comp [31]; - } var_1; - struct { - Enumeration E_Comp_2; - char Str_2_Comp [31]; - } var_2; - struct { - char Ch_1_Comp; - char Ch_2_Comp; - } var_3; - } variant; - } Rec_Type, *Rec_Pointer; - - - diff --git a/contrib/cortex-strings/benchmarks/dhry/dhry_1.c b/contrib/cortex-strings/benchmarks/dhry/dhry_1.c deleted file mode 100644 index da272e4c4234..000000000000 --- a/contrib/cortex-strings/benchmarks/dhry/dhry_1.c +++ /dev/null @@ -1,778 +0,0 @@ -/* - ************************************************************************* - * - * "DHRYSTONE" Benchmark Program - * ----------------------------- - * - * Version: C, Version 2.1 - * - * File: dhry_1.c (part 2 of 3) - * - * Date: May 25, 1988 - * - * Author: Reinhold P. Weicker - * - ************************************************************************* - */ - - #include - #include - #include - #include "dhry.h" - /*COMPILER COMPILER COMPILER COMPILER COMPILER COMPILER COMPILER*/ - - #ifdef COW - #define compiler "Watcom C/C++ 10.5 Win386" - #define options " -otexan -zp8 -5r -ms" - #endif - #ifdef CNW - #define compiler "Watcom C/C++ 10.5 Win386" - #define options " No optimisation" - #endif - #ifdef COD - #define compiler "Watcom C/C++ 10.5 Dos4GW" - #define options " -otexan -zp8 -5r -ms" - #endif - #ifdef CND - #define compiler "Watcom C/C++ 10.5 Dos4GW" - #define options " No optimisation" - #endif - #ifdef CONT - #define compiler "Watcom C/C++ 10.5 Win32NT" - #define options " -otexan -zp8 -5r -ms" - #endif - #ifdef CNNT - #define compiler "Watcom C/C++ 10.5 Win32NT" - #define options " No optimisation" - #endif - #ifdef COO2 - #define compiler "Watcom C/C++ 10.5 OS/2-32" - #define options " -otexan -zp8 -5r -ms" - #endif - #ifdef CNO2 - #define compiler "Watcom C/C++ 10.5 OS/2-32" - #define options " No optimisation" - #endif - - -/* Global Variables: */ - *** 6986 LINES SKIPPED *** From nobody Wed Feb 12 01:43:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1LS6N2fz5n80L; Wed, 12 Feb 2025 01:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LS5qvpz3gq7; Wed, 12 Feb 2025 01:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b32eAcL+0HYMwoXr3vqXHp8D/mX+BMxS6Pv0I4FK7Jg=; b=JeLvCmOIohSZyA9oTn8EFcoBmexkIuzIVvAqj545ynpPr5p7zvdba7PIndQ3x7IwtS9+pz itZ4y0I7UPUs4XkvOq9v6J8rNXRg4FNjkXOpFQUThuxVpfQMw6GAIomavWDEtYW9RlT9Gi tVlX6mDmTWZq+InetFrrtLEyQgsiHEttlbV+pgtoXzogr4JChBuqvKJFQ0NArsF1OHrAyi 3Ig/yKHyC0UFfmV5VVZL2yOMowXlIlJ1jh2yk1Rf8fKCaaY2OrWfAk6fVWU7Ryhs/8Wp7e 6tpXfJyJ+2YWgiPuppfQ2fVWyLXLBUhAyhM7+dCTuHAzC2yq0H/GQasyTMxn8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b32eAcL+0HYMwoXr3vqXHp8D/mX+BMxS6Pv0I4FK7Jg=; b=G+m/s4E63XQb1lFNAJnCwvenboYKbPjIJy2goKFWSDcaXQfWeseaF+osyM1tT9cdRYtRs9 xyUdetwUpcRn8f8oT70ntW+8W7emaSVWTgr4M5TVWg5nbCMgF0UiX/fz3sk+LME7GIxoj8 nqimd0RRMuXH8DjhMLMnHczkIq+xBJ3Zy7vm0o64gfn6eSO3w7YbgP+o/M5uKZCJ2LWVb9 HgAbBG67i7EwPZAHRee1VJ1KHfEZvZFzDFRu4TZ4Ur98OIo7CNvSPg2J0xcp8umhiz/jZt uB0iU8/rxe3cCX56X8exoXLnHlSw6pMvCU7AdhvfQFp0Rx5yQu1B95ryvZr5Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324624; a=rsa-sha256; cv=none; b=oip3Ow0sbY79CV7X9iPZJRx3/jamjF1DGp97c/hNf2wkGD27eb3m9UECpz33oe6DMM19ve If4AicBoKn23RGXcJCipBzSPGN9GKV7gT2TR8mv2+7gsFkiaCZLQMR59R0vWMLoTSfLwOa 3826QenAfuWpJx3SNo1Qbxs9D9anBZ+nDIWtZkiwxAnxUOzHTfgj9442GKGjQ3Qm4xzDQq 1Or+HLMwEf3SsL+Jp/foaT331ykRRVQZA/YuaYsHOETJcml5IigE5Pg4Q6DofIU9K2Z/d9 +ufNOziMJmR4iwGojaTaCcxzV8B7iNnzYAu65lssJfdP7geKsnTf5vGcVtl7kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1LS5MQgzfXW; Wed, 12 Feb 2025 01:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hiJd051613; Wed, 12 Feb 2025 01:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1hiJS051610; Wed, 12 Feb 2025 01:43:44 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:44 GMT Message-Id: <202502120143.51C1hiJS051610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: e58d9b71f37d - stable/14 - nanobsd: Always define the partition index List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e58d9b71f37dde1cd19bb0af3a4bf94938f4406d Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e58d9b71f37dde1cd19bb0af3a4bf94938f4406d commit e58d9b71f37dde1cd19bb0af3a4bf94938f4406d Author: Jose Luis Duran AuthorDate: 2025-02-04 14:07:00 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:32:12 +0000 nanobsd: Always define the partition index Print the desired partition index together with the starting LBA and the size. Otherwise, when only one code partition is desired, the configuration partition (/cfg) may not end up in the third slice, thus breaking the scripts that expect it there. This was the previous approach, changed in 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image"). Fix it by printing the index as the last column to reduce the chances of breaking current overrides, and using it as the gpart index. PR: 262098 Reviewed by: imp Approved by: emaste (mentor) Fixes: 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47835 (cherry picked from commit dc4b36b96333f2ab05f3c454f0df2e0a0d4d451d) --- tools/tools/nanobsd/legacy.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index a45b447337b2..2f689212263e 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -64,31 +64,30 @@ calculate_partitioning ( ) ( } # First image partition start at second track - print $3, isl * cs - $3 + print $3, isl * cs - $3, 1 c = isl * cs; # Second image partition (if any) also starts offset one # track to keep them identical. if ($2 > 1) { - print $3 + c, isl * cs - $3 + print $3 + c, isl * cs - $3, 2 c += isl * cs; } # Config partition starts at cylinder boundary. - print c, csl * cs + print c, csl * cs, 3 c += csl * cs # Data partition (if any) starts at cylinder boundary. if ($7 > 0) { - print c, dsl * cs + print c, dsl * cs, 4 } else if ($7 < 0 && $1 > c) { - print c, $1 - c + print c, $1 - c, 4 } else if ($1 < c) { print "Disk space overcommitted by", \ c - $1, "sectors" > "/dev/stderr" exit 2 } - } ' > ${NANO_LOG}/_.partitioning ) @@ -174,7 +173,7 @@ create_diskimage ( ) ( } { # Make partition - print "gpart add -t freebsd -b ", $1, " -s ", $2, " $1" + print "gpart add -t freebsd -b ", $1, " -s ", $2, " -i ", $3, " $1" } END { # Force slice 1 to be marked active. This is necessary From nobody Wed Feb 12 01:43:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1LV24sYz5n7RM; Wed, 12 Feb 2025 01:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LT6dqPz3h44; Wed, 12 Feb 2025 01:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaNcOprAGdR/G0mm4rMwSf2JwPuRvIyEK69NSf6hAZk=; b=hLIYssAveroOmsUwr0b8mt2D5K52bHGJzAP7OL7JNI5akCAHPQ6gKkIMvPQpiOYb6KHSWD vH29rnsX1jlkoUd5MI83olMjLdUA4TVjx4KyQUFbm8/gwvbZwpP/nt/UN8JEfrNe1rC2kY r84WeY3iJTqFxG45/lUPzQFNbwcSaYQYyTQdKevlLjdet7iYFZ1nxHa8B6agn51iQzEdsE v15E0h/7o6mLdypAnRV7lcVwI0DaehOS4XKmNwUFfW7e05dzG2CzbAN6btyIFnA1pULT0x widpLHf5BfWZ3v7/aVwNP/CJNVG/qZs0jEPFyixiPWVC+d8wpsAKv74GSIljlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaNcOprAGdR/G0mm4rMwSf2JwPuRvIyEK69NSf6hAZk=; b=TPCrUE/54FbLK9n5VzJdxnI9YoPTWeapi23L9jwZ6I4xOpPwkIf63lGTBplHGf4C4ZRJ7p KSyxxo/vxc85GPJcHcQeoAfUFVQ9zLp5/uZ2oLdm4i4n4gZmR/H3YptZILkkm4PUlTxGTJ l5vViyARz4pVtIHLQ+ncNHKcpGykqmnvNolJ5hDuDhlHdQBNzh7gDFIHw++MFVGFRFD0CW WGSvVvrkcIiph6SxUcR8mJm9cauWeihdEf8XKaUcH74biOiL3GF6M5nk4D+EPabUw47lL5 WsKubJcwn5GvSdRzhjCu/cbxq3EyRkwlP89BmZXEHcJRWj1avwRnwelLvLBI9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324626; a=rsa-sha256; cv=none; b=msZBvsSH/2Fc68Kk1PdjV0D6hf/MoYUTboJPLpNae2QMkSQldAmV/U6I84N86j8Lc1Biut 0H7WH0SwfVWMzSdIaKDwOoO3S1roGctnoAh3OSnxZvyjC58E5Nwi3W+mLR6+3kr7K2M03S 1SXhOtnhD/x5+Wq1T85Moh80wcI3Z6dU5reZmez3RSW9WchTRztizgiX2TFzcYoO/djTXn pqLOvY6g8eHEFl7R/OkWBsRuVQq0R+Bb1ETcE2agdDYnGE6F0j3IeM8yX/cgqyQUYK1tub +m29/Wh36K7J6FN4JhF3wR2nbnclydx0o59JJyVHCWUYD3YlyI1eDlhHHq6RZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1LT63k2zfb4; Wed, 12 Feb 2025 01:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hjnO051653; Wed, 12 Feb 2025 01:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1hjTk051649; Wed, 12 Feb 2025 01:43:45 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:45 GMT Message-Id: <202502120143.51C1hjTk051649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: ac74f9a6547c - stable/14 - csu tests: Remove extra slash List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac74f9a6547c353f13d18bc2ede5283bde00f7f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=ac74f9a6547c353f13d18bc2ede5283bde00f7f2 commit ac74f9a6547c353f13d18bc2ede5283bde00f7f2 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:15:12 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:33:15 +0000 csu tests: Remove extra slash Remove an extra slash that ends up in the metalog. This double slash can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48778 (cherry picked from commit 841856570e7b623c4f1283939936ffa005d2fcf4) --- lib/csu/tests/dso/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/csu/tests/dso/Makefile b/lib/csu/tests/dso/Makefile index 6975e64c5dfe..cbe7f74310ab 100644 --- a/lib/csu/tests/dso/Makefile +++ b/lib/csu/tests/dso/Makefile @@ -19,6 +19,6 @@ SRCS+= ${src}.c SRCS+= ${src}.cc .endfor -LIBDIR= ${TESTSBASE}/lib/csu/dynamiclib/ +LIBDIR= ${TESTSBASE}/lib/csu/dynamiclib .include From nobody Wed Feb 12 01:43:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1LW2Ppzz5n7rn; Wed, 12 Feb 2025 01:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LW0GDdz3gqB; Wed, 12 Feb 2025 01:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LC+hCdn+KAJwKE00AscfJaPRD8NmWbPPEmM+k91wjPQ=; b=qjUI5mKPoS4Fyzkg42WNWfIfQJbsqj2bWMCrUsc64GC+6PxrQgdr03i8O0PZlOkndo/Zem C6f7NxIkdzarcSsWMarKQ6m3IhJ5ApVhLt6uXuIshlbozvYzfwj7Y3f4ila2Q5BLLyRRxV uKa1lQbbDUMLeUbvgUpb7y6wSf+bhg3Acwqf6XdhoNdh40cNxi+V5zf9qD00OpaDEvfLWd z70eMY18qiOt+UdxBk67xvyXnkC9qkR+XipyWVZF13uDGpvORy/dk1rrGuQO5oohH1u1Bk 5Zfb9jih9TWInhVIvcMf3LX2hOdng0J0THt9RYooPfRamOaoliw8Q+1dnhcJHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LC+hCdn+KAJwKE00AscfJaPRD8NmWbPPEmM+k91wjPQ=; b=KWViUhLU4Zau9RPYkreEQTBOctpJNSj3w0sdn3Rf1VnnL12HcP1njSJvyzImWfRernk0VD KQkuWBvthnrFqFHpXa4YHu0Tes1bJSLiudiE9OoiHXNcqMQoapzoMv84olfjTtJYx/41mv 5FwwDCkBxwsloISnblgebOAXn382uCm+XB+nHxGhEYn6lT6f5dwCcfu743zR1MgvCgpvJl uKnPvsgAFAKmfdPoXMnuFRB0h2V5EtpbVAzjDCjv5ANF41qgnTGazW44XbYoVGuSZaJauH 1U58Hh+QrCR3dCJ0AnT8iII4cZ+9SFbOTyunBiLGqrqgp5gAa4o+QeEfjGpj+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324627; a=rsa-sha256; cv=none; b=GKY0XhaaCp9KcZVlojCl1dgAR08u9giB0W58XKr1dABYOR1XW+nbpGJ4vv2y3Eu9ay7e3M wTIqPm38yP7AVj2dbqz9neUZINymoXHypssdnEGby8OS87ohRzjtHauTg8xsEJ+dNgIaiC Bs1iSFWhNYxNYKhGpVzLm8LPQt2f5RZHwqcle3ygnHwQPpvpLDC/yyKXXXEmuTUGw/0Z4B Ulk0nxvcaixX9SesmyeNeK3S500fa4+qZIy4Eh+MZbSqv3eCLTt7ELXK9x6cUCRdGejVAb RSAbZFqfQfsUHJiP5VIK3yjYW/YlnQj3Y+OpUAi9uylHIIE6e3cTpRv8dUavFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1LV6qWSzfPY; Wed, 12 Feb 2025 01:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hkAl051696; Wed, 12 Feb 2025 01:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1hkTP051693; Wed, 12 Feb 2025 01:43:46 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:46 GMT Message-Id: <202502120143.51C1hkTP051693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f9e98800af5d - stable/14 - libopencsd: Remove extra slashes List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9e98800af5d2ea158f49b792de60bbf10233a39 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f9e98800af5d2ea158f49b792de60bbf10233a39 commit f9e98800af5d2ea158f49b792de60bbf10233a39 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:15:37 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:33:35 +0000 libopencsd: Remove extra slashes Remove extra slashes that end up in the metalog. These double slashes can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48779 (cherry picked from commit bccaf0262dcab84be49c42cc6b7a81c279c44b62) --- lib/libopencsd/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index d6d648ef1e32..6f0edc649c64 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -122,7 +122,7 @@ APIINCS= \ ocsd_c_api_types.h \ opencsd_c_api.h -APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/ +APIINCSDIR=${INCLUDEDIR}/opencsd/c_api ETEINCS= \ ete_decoder.h \ @@ -130,7 +130,7 @@ ETEINCS= \ trc_dcd_mngr_ete.h \ trc_pkt_types_ete.h -ETEINCSDIR=${INCLUDEDIR}/opencsd/ete/ +ETEINCSDIR=${INCLUDEDIR}/opencsd/ete ETMV4INCS= \ etmv4_decoder.h \ @@ -143,7 +143,7 @@ ETMV4INCS= \ trc_pkt_proc_etmv4i.h \ trc_pkt_types_etmv4.h -ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4/ +ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4 ETMV3INCS= \ etmv3_decoder.h \ @@ -154,7 +154,7 @@ ETMV3INCS= \ trc_pkt_proc_etmv3.h \ trc_pkt_types_etmv3.h -ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3/ +ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3 PTMINCS= \ ptm_decoder.h \ @@ -165,7 +165,7 @@ PTMINCS= \ trc_pkt_proc_ptm.h \ trc_pkt_types_ptm.h -PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm/ +PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm STMINCS= \ stm_decoder.h \ @@ -176,7 +176,7 @@ STMINCS= \ trc_pkt_proc_stm.h \ trc_pkt_types_stm.h -STMINCSDIR=${INCLUDEDIR}/opencsd/stm/ +STMINCSDIR=${INCLUDEDIR}/opencsd/stm INCSGROUPS=INCS APIINCS ETEINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS From nobody Wed Feb 12 01:43:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1LX4jDFz5n87b; Wed, 12 Feb 2025 01:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LX0sdsz3h69; Wed, 12 Feb 2025 01:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QAbjUuCD0jO8vEOkNreWnWz8L4hLTonqWEVQr3kFII=; b=GtGoDepjYJRHdp252tjtNKrUBjTQiBdS2kH9qiGRFQMh8SlNfTDNZvbSJTRg39QKSjopzo nYiqmwKLJxv3JoO3XRP3pm/Ddt9slt0TpdTvnymJdE8GBaQ7gcvb9YMS720WgNTuOie8UV TjkQ6byoshW38RnwQhl9pNwGbRePaZDHYvWjEFSUEY3M3LLmb5rWo0U+2wfIE1ARDkv2se UXlBZud2LBsdh5rDUDw47NE6A/BSOXVrPNE/CGT3LHgBn/4PVZlznnZcq8HSG6Rq7dwbtW J8uGG1zlgWJlycfVaUObUgv8f4pwZ829w/FHNcFp8XUGw17of2Xpzf0TvL4j9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QAbjUuCD0jO8vEOkNreWnWz8L4hLTonqWEVQr3kFII=; b=RpIClXfFVlQ8gOcBALYMY0uO2RQ9D7TTkfVfFGcRA8BUfA/ZxCtYvq8nMfGLT8O4d5mcAE hNy2T697SU8/le/LIlxVn59GyVoujMK0ijx0kDTA+AP5bX0SZadg4OX3edLzXCfI21JOv8 AAm1PQQLKbygbB48L/e6UMgjBrjRa4lXzXytzD5z9j2J8Ef/LDAPhqw98IGyEOiqbxje2l y/55xP4LmfIZOnbAI7BVZMX6x+L550KyOAS7G8EcP7Lkotk+XTHAL+HZQEpp7daeIKczu7 kye8MDyn+vtnyogBE6fe7P6Itbibxl+3r1H3ih9rlI6zI4UpVTFVu1Giv5i/8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324628; a=rsa-sha256; cv=none; b=gd1YjxTSa8xWbL0dYQuK7w83kbDoxQJuWj+xhosXcn1HmGjY8kDjhq+IxbQZiGNm87355f jEr/YgUhBItHaMqqIF58+Yx8dangG99bm3IW3LXb63Q+H0ooQRibWLeCBrXsU2hopZQlwk x/NTL7I8FsvEvZdsF22rBaxVGc3EdTqioKicMHX36GbANAartud+LnL+8JTVDgeDNwBIe1 GkdvhYxvEUajepdDq9V8g6PNgTB8l8cEnU65EWg9PVcfOIoQ5n7GWqCZ1JTIbo1nLGjJ1/ yxYjw3P6WPlXOglfj0DWkrD1G45y7GXVCt7X+GEQ4oLEsvb9ZF3Iwx7m8KkpTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1LX0MVRzfV9; Wed, 12 Feb 2025 01:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hlvZ051732; Wed, 12 Feb 2025 01:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1hlQs051729; Wed, 12 Feb 2025 01:43:47 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:47 GMT Message-Id: <202502120143.51C1hlQs051729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 911d0089d0ff - stable/14 - mk: Move vm stack test debug symbols List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 911d0089d0ffa27ee11965b5c42b79a803958654 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=911d0089d0ffa27ee11965b5c42b79a803958654 commit 911d0089d0ffa27ee11965b5c42b79a803958654 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:47:24 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:36:34 +0000 mk: Move vm stack test debug symbols Avoid the creation of a /usr/tests/sys/vm/stack/.debug directory by placing sys/vm/stack test debug symbols under /usr/lib/debug. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48796 (cherry picked from commit 88d448ec815c1fda27be94846f88ccd96251febd) (cherry picked from commit 955f974a1a37cf3ae8b241327b1fef74c8932855) --- ObsoleteFiles.inc | 3 +++ share/mk/bsd.lib.mk | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 81f6f1110d3e..0d639bd572a9 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250204: sys/vm/stack test symbols moved to /usr/lib/debug +OLD_DIRS+=usr/tests/sys/vm/stack/.debug + # 20241201: new clang import which bumps version from 18 to 19 OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_builtin_vars.h OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_cmath.h diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 29807b6bec82..63563acacc3d 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -248,7 +248,8 @@ SHLIB_NAME_FULL=${SHLIB_NAME}.full # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory .if ${_SHLIBDIR} == "/boot" ||\ ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\ - ${SHLIBDIR:C%/usr/(tests/)?lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" + ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" ||\ + ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} == "/usr/tests" DEBUGFILEDIR=${DEBUGDIR}${_SHLIBDIR} .else DEBUGFILEDIR=${_SHLIBDIR}/.debug From nobody Wed Feb 12 01:43:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1LY5k8Fz5n80P; Wed, 12 Feb 2025 01:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LY1TTgz3gvn; Wed, 12 Feb 2025 01:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nk2bxSjowROoCYZoLNgf6C6Hd7+EDqREeKd3oRKKxHs=; b=gSLkAeWUOPZJNA6kV3HJl4MHUxpUaxscs0O7XMhGfpJ/dljbw1129Hnrs9YjmLVIjRCk24 JiCo9xZ67TLoTQG7uXQ7+qsEm/56JFgc1YvDxRRDd/lpSuES/kEj+Nl7oy8MyGzoqvtYpR 3icXUnpo8Zn+mlsGf1+dkiSbrDjegsLaz/2Wjsqj8PUZRvXzmkeoWKKUNScnQa7AqPvQ/m pwjZY2Mhss1EopMdy5E8XVemh5L/DrGDDAEoNPNZXFAtLDGH9OqqcpQGTNaurHf0m6dCso RU4R2VMma4oK0uNgfBpQIYco/QwHr2W/0MzuYZE7bJ3sDz8GVu7+utkCEsw4Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nk2bxSjowROoCYZoLNgf6C6Hd7+EDqREeKd3oRKKxHs=; b=DbVEiidE617KrDfodYScEaru9xVH9zE5ddJ7VCED4QAn+ji5xfj60VnwjkpcyWdil+8kp9 lzWYwuMbq95NeoMnKg36o4gHb60DtE6ajD/8D8EtwR+kAAZBMMdY48gR4WHrfEGJDVPALA uD8VCenklhK+uIgMDze3PI4lbf3G01UXbfbdC27LZOU0f8M+Rq0Z8llUsIWN8Ew1RavfMK eI3iRTmUKYIsK8sdS24jfN9Qy/pRr+6mnH4Ul0ONh/FDHaylBOLTXQuVboURr9KHcFywKJ aulRyVIBUdNQM2wx+u0S7rmZDNKgjc4Oj/w0RbgBmP6glYhLa2qSQHUDcuIzTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324629; a=rsa-sha256; cv=none; b=S07foyFNmKWJPC0BHyHccv+g9Sh63gyzyQmxcT4+NPvDkHxuVBQ+WTMT9D0krRVU0SLrje Yhwt4SXE+p42Hn9ThMbIdSO7CDyrpGKRvdtCMVfVQGBli1VNh+P1R1tIf12SE2msU/IHXX cqmk0kp+GV4ov3mzVnCIcIMhtrxBDwXii4hDu9Oc/uINUgdz41EIfFzQjzwnGwlCnZtIm5 VPQEEtA+Ls5KeUT8hZnsnic+b/jtkB+mbxy8yfBFUFiDtr/nnj1em1921iVhwv5PBf5zA2 Xo3a418CBjFhKNgEkMH22QkAadi7jJo9ak5iKpel9+OuLlPp2K/y5XH4rCCnrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1LY0m4WzfPZ; Wed, 12 Feb 2025 01:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hnrl051768; Wed, 12 Feb 2025 01:43:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1hnZU051765; Wed, 12 Feb 2025 01:43:49 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:49 GMT Message-Id: <202502120143.51C1hnZU051765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: abada75ea8c8 - stable/14 - mtree: Add missing libxo/encoder path List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: abada75ea8c8fca18b769241d38d97e31df44c74 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=abada75ea8c8fca18b769241d38d97e31df44c74 commit abada75ea8c8fca18b769241d38d97e31df44c74 Author: Jose Luis Duran AuthorDate: 2025-02-05 19:50:21 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:37:09 +0000 mtree: Add missing libxo/encoder path Reviewed by: imp Approved by: emaste (mentor) Fixes: d1a0d267b78b ("Upgrade libxo to 0.4.5.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48836 (cherry picked from commit d10deaea12adb73a698d907a148f081c402d5dd6) --- etc/mtree/BSD.debug.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index d601bd0883aa..5c855f1aaaf8 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -39,6 +39,10 @@ .. i18n .. + libxo + encoder + .. + .. .. libexec bsdinstall From nobody Wed Feb 12 01:43:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1Lb1fS8z5n82w; Wed, 12 Feb 2025 01:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1LZ28Jpz3gw4; Wed, 12 Feb 2025 01:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42x97zBSCh44ovbXaSsDM8oyLZkY3GANJLUW8D8qsuc=; b=YTc/SI6sA3t1u97HOfv0sCV2q0lTqWQn1oXNdzvtiBUSzHvylGcQvg9g7AVNVsQFkU/W/N FGOWUTh9BGPyqhpnE1mEVNTHS2DN07DDz5WuMiMVEGn7LcdSZWK1jGnK0ejDIeGyrfTNj8 ouSFYnwtH3G4q2aPiQ6dyo1kCmhdCJjgk6OdwTZXV5Odz1I46SdDG1g/jlAW5G4+0VjbQR +ZaEeYz0Ys0JmqZ/RBxH/iKQfhCNhMsOYae9+BJ5BqfciSxQbpheV4L+zHOvsy0gNoT3lz ssQ2QE48+Tae0nwYVDIQ1dyac60Q+Bat6oe1qDwy8wKcVqwvb3ygh07lidCJpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42x97zBSCh44ovbXaSsDM8oyLZkY3GANJLUW8D8qsuc=; b=LM0JakI/WtHUqPuTe/RYq9ckIuYJU1HPWkrI8C4grmovd5Zruc7spXr+Sz3uPuM3wLoBmt NzT2KvpA8jS0HWlCq38UUbEfTf5gE4Sllal8JGskTGogGHMX0LVtbqlYY4MqCgzOmlVlbo D5UF7bUqtpFb3zIN1GxZafLtGItFi/SPYFufyA9cFejFFxo38/W4Bf7Mgann80w37W3jWe 59B/uez4g/lY+cO8y2VckUgZ4W+AVDVVgFoqUchCKatg3USFFK5Su4iZ6Q3IFNSUzApmos sq1ohCkJJqMb1PJ9d3ciBztBHLVPhoq4belI3Oye1WlKxjciP7M7IAiPbMCyUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324630; a=rsa-sha256; cv=none; b=ufelBrF6LTz50ZtOlWDxf6td8p3FUHG+fpQ3+V2pAXP2Uy4PkWsQJvnzvdY0FzO6EhV9H3 T+Rk4ls2SvokCbBHGuUYozZJ4+SRLbdc3AJNH2vovj9JM7CjIrjvcga6PM+nyg1xBGGOBT 5CMj72b/9D6sQGWjILCUwqXAxhXxZLCqPpKOT8wp7MjYg/23IVrcj2g8382b380OYDEHW8 qTHWtO6XeveqoPPq2xX0ut7Ff9Yxn8NI9amltg1cCdb+0V/ub6tCyDAq8CGXAp3o7r1YWp drHIyClgt6/HIv/oELkA+tS/CB9IDr6YnsjVXgYHNN2ORDb4RDlSjCfxRdIWDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1LZ1Tr6zfRP; Wed, 12 Feb 2025 01:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1hoc9051809; Wed, 12 Feb 2025 01:43:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1ho5K051803; Wed, 12 Feb 2025 01:43:50 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:43:50 GMT Message-Id: <202502120143.51C1ho5K051803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f7393d289275 - stable/14 - mtree: Add missing ossl-modules entry List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7393d28927521b175818bc0d1650abcf1804eab Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f7393d28927521b175818bc0d1650abcf1804eab commit f7393d28927521b175818bc0d1650abcf1804eab Author: Jose Luis Duran AuthorDate: 2025-02-05 19:51:09 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:37:27 +0000 mtree: Add missing ossl-modules entry Reviewed by: imp Approved by: emaste (mentor) Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48837 (cherry picked from commit 16197cf147e98c2ffc0250f8b71f0fa485c03ecc) --- etc/mtree/BSD.debug.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 5c855f1aaaf8..f64dc79a297f 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -43,6 +43,8 @@ encoder .. .. + ossl-modules + .. .. libexec bsdinstall From nobody Wed Feb 12 01:44:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1MK73Scz5n87p; Wed, 12 Feb 2025 01:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1MK4xHQz3jRD; Wed, 12 Feb 2025 01:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QlNOe7YIgjikbCOCQgyM6fSlllq2mDqEYWk/dcob+zo=; b=uF7guuchj8axq5qWw+gwkxNJcc4D8+TD0QIv6Lt9mMl9yY3NalZgprHxgRKoZ7STbliQr8 pFloBuLBXN9yPQmfJnVJZvgI8BNuOpafW34d43zJBw5ku/moK9013Mq4YDlfkfSrdk0u+v QLES8BWLa2pt0rf5IoNrWqdGqZYV3DVJKaLukJTpcQJlTMEorZkNnFwTZFsugXwpIrpXmH hKsKuuBJZNAYJAO+Sfp2CSZml5bbdmbID3vQVC+BhG2B5BhHgT4MFMPDNkU/tm4kUpl9bQ dZUbmj5ZyHTZvoFRmxJdrk5IgVmUFvAdX9Sqwn2RpD9hHd7D59z+ESFCUg1YKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QlNOe7YIgjikbCOCQgyM6fSlllq2mDqEYWk/dcob+zo=; b=V72yCLnm8oGuCEjHYKyLrvBzs5W+BeMndN4XW2tiThiYHsekxrrCFERTuczcEG9XHR+51z Ky27bJ4RUh89k99flGX48UNYi+hLsqKW4B3agYtmzEvLD0D5Jm8AoXrx28Snm8UMT7qGdt GYBQLuVUWOCeVWBSLx1eT9oPJb0ZKvPzCXfCSWNKYulzMA2d5qxOmxDQLV/2F1wMFEqOs/ BExW4k7aG/HBbikcDNrnFICXeRq5Z4w0hsDtszA+hC2xLlZGvPlXflamvIYARPNfu2dNDV qfO1fLlaKFg/prwt7Ebke5BsYhJWlwAXX9IrvkYeBQTkNvPuAKaMH5Qfy8TjpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324669; a=rsa-sha256; cv=none; b=nZvkU4FD23MCkWm55hqqZn4Z7MD12tmuJ1CdxHN5xaTe7kEPFEnn+zi86lgUeTLYflnB02 f1xYW6PGTmLIu3hOKvYQAiZJTKfST3rOMWUrl6bkGVm4A5J9IZZB24ew6Sl/hY4I2z7fDk HyKnl/PFEA+DW0JeNITHDy5vNrdlW+yf/HiXyNHEc5LMMmIalrzhhontZhaFPBp5R7bmxP 4JI/c9+YQV0pBErpYnQh5uCEu4KX1Ou9GSLiiz/EmMpSQQ7eKWbWw3jTzYkb/+/GPhDlMg gnMe18UXZTJGcwBQINAaA+mvv65kgxrlZXFM9AqaKQ2T7eZQNqVwTMkhgaDHIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1MK4WH4zflj; Wed, 12 Feb 2025 01:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1iTAZ052223; Wed, 12 Feb 2025 01:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1iTJl052220; Wed, 12 Feb 2025 01:44:29 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:44:29 GMT Message-Id: <202502120144.51C1iTJl052220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 11391f2fa39d - stable/13 - csu tests: Remove extra slash List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 11391f2fa39d6bb3f61ebaf0a2470d7fd0f421e0 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=11391f2fa39d6bb3f61ebaf0a2470d7fd0f421e0 commit 11391f2fa39d6bb3f61ebaf0a2470d7fd0f421e0 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:15:12 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:38:56 +0000 csu tests: Remove extra slash Remove an extra slash that ends up in the metalog. This double slash can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48778 (cherry picked from commit 841856570e7b623c4f1283939936ffa005d2fcf4) --- lib/csu/tests/dso/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/csu/tests/dso/Makefile b/lib/csu/tests/dso/Makefile index 6975e64c5dfe..cbe7f74310ab 100644 --- a/lib/csu/tests/dso/Makefile +++ b/lib/csu/tests/dso/Makefile @@ -19,6 +19,6 @@ SRCS+= ${src}.c SRCS+= ${src}.cc .endfor -LIBDIR= ${TESTSBASE}/lib/csu/dynamiclib/ +LIBDIR= ${TESTSBASE}/lib/csu/dynamiclib .include From nobody Wed Feb 12 01:44:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1MJ5Wf1z5n7xQ; Wed, 12 Feb 2025 01:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1MJ4jwLz3jRC; Wed, 12 Feb 2025 01:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=butVo0LG4wn5wnMFNhvfDiGuUNayxsKodGxpuUTtt9k=; b=cM70BayD+/my9zvNJwNpr/HfwOYo4+mxM0CxUumxHwGL0ilaLjNDbP365wJycwQJBMYfc0 igO51LJlIUJ71l+WYDV2cXIyCoPQZEl6TO0VhnxJ2yO2Gx982ZZw04F36/qL3PKBu6oaok sIXadVyNsBPQJ1rBIUBkrGRP/a1txV83A6uGazla1/iiI12djD21OkbWLkrUGRRgtk7ljB w/fOMDBmhL9MhmyBmURCdwn+poovjKJx3oSMgYnwvcZ91l/B+InhhpVJ37S3ZK5GNfx280 b5MyRBT6vMYJHDEIp6HHRa3tvVCWK8QCj4dDCZqv/TawztulO7a4ni0WKC4Yiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=butVo0LG4wn5wnMFNhvfDiGuUNayxsKodGxpuUTtt9k=; b=sJ7G6ObUYb9Rqoy1X6CXo3cuHwLKJY4p3GoyLQj+GDD3Td3E20aGDMKaXj0xL8KHyKNAxQ yqaDAyybe+BPreQZnKoh/aakg7tutJOkujCFUJHA4sR72aGM8+WHnWEXG2DOJ7VuXDNlrL vTzKEK+sbqelOctIzc18qsawAax7vvWsLlE9eoKf+2k8kk86cjBmLFSFM9JtAp1lOVwakU 8zwyoemEYvgi7eZNmXgD1nJUPvjpq32dpatFhZXSts8hvWE8CuQjBA/O2XuI5gll0Oq1Df A+ovMasKfK3FMarSBEBv4dgdRUT3ZzKTdlsXX8T56lew9ZUywQPDI4QSTa3Tig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324668; a=rsa-sha256; cv=none; b=GqdcGSaDPeaWlLSnEKT84MEVEI1KcoKf4hwQK1pIj6eTKeHl43SloeO5XrEATagfJ6m6vE As6gOtJWX9etmuIW/YExkDdGWF7bBWIlJw1V6LuNpt8jaIgk2d3Xjgb1FmLqaV0xpR5cg9 7/6kWjOK4gG/2J4mfzAtRYJJ+nmO+3kkUdkeNLAtkobfA7WBN0Z9PiWtAoRRmDvAhhrGr2 Iqle805qDAGC0BqnTJk2DF1hUabmexuv8p3V6/8gCS7MZ4SpYJ0BKoNH1sK3hEygtJnvAu lpVveiRLOa2182QJsQlG0Tt6KBQXtDw/OEKbTV8j0ptRQO3JnZOrBidqkGA9UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1MJ3W0Pzf1h; Wed, 12 Feb 2025 01:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1iSvE052187; Wed, 12 Feb 2025 01:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1iSu0052184; Wed, 12 Feb 2025 01:44:28 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:44:28 GMT Message-Id: <202502120144.51C1iSu0052184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 6fc8d02b59dd - stable/13 - nanobsd: Always define the partition index List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6fc8d02b59dd7c343a2ab681e57c13c27c6425f7 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=6fc8d02b59dd7c343a2ab681e57c13c27c6425f7 commit 6fc8d02b59dd7c343a2ab681e57c13c27c6425f7 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:07:00 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:38:47 +0000 nanobsd: Always define the partition index Print the desired partition index together with the starting LBA and the size. Otherwise, when only one code partition is desired, the configuration partition (/cfg) may not end up in the third slice, thus breaking the scripts that expect it there. This was the previous approach, changed in 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image"). Fix it by printing the index as the last column to reduce the chances of breaking current overrides, and using it as the gpart index. PR: 262098 Reviewed by: imp Approved by: emaste (mentor) Fixes: 587c054bea0f ("nanobsd: Use gpart and create code image before full disk image") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47835 (cherry picked from commit dc4b36b96333f2ab05f3c454f0df2e0a0d4d451d) --- tools/tools/nanobsd/legacy.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index a45b447337b2..2f689212263e 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -64,31 +64,30 @@ calculate_partitioning ( ) ( } # First image partition start at second track - print $3, isl * cs - $3 + print $3, isl * cs - $3, 1 c = isl * cs; # Second image partition (if any) also starts offset one # track to keep them identical. if ($2 > 1) { - print $3 + c, isl * cs - $3 + print $3 + c, isl * cs - $3, 2 c += isl * cs; } # Config partition starts at cylinder boundary. - print c, csl * cs + print c, csl * cs, 3 c += csl * cs # Data partition (if any) starts at cylinder boundary. if ($7 > 0) { - print c, dsl * cs + print c, dsl * cs, 4 } else if ($7 < 0 && $1 > c) { - print c, $1 - c + print c, $1 - c, 4 } else if ($1 < c) { print "Disk space overcommitted by", \ c - $1, "sectors" > "/dev/stderr" exit 2 } - } ' > ${NANO_LOG}/_.partitioning ) @@ -174,7 +173,7 @@ create_diskimage ( ) ( } { # Make partition - print "gpart add -t freebsd -b ", $1, " -s ", $2, " $1" + print "gpart add -t freebsd -b ", $1, " -s ", $2, " -i ", $3, " $1" } END { # Force slice 1 to be marked active. This is necessary From nobody Wed Feb 12 01:44:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1MN43Pfz5n7v6; Wed, 12 Feb 2025 01:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1MM72wtz3j9W; Wed, 12 Feb 2025 01:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q+kt7mVWngy46PP1Tu6RL/tpVU7oht6KrHdGkNJEUuQ=; b=lyyw1E//LAKDTSR7z/+4LeWYW1w7KFRMLMOjxR9zVtY7vCNch2qfNaNaohs0o6Rqy6t6x7 o8C9f8aE3PP1lPQ1PY/4fsI71HEPYevvepphG0WNxwwwL5RIxeBsWqbrObRauiFEdwqUr+ KlhioJ7PLtWHxhUbNp6pEw9IuLRBbxyg8TJRt0ovnGRExSZ88oTwiztWnAkOo0jp+zHLFM yuo1kghW/NHrdSYOsPpYtRLw2PkQCoR3cbiRCr4B3RY964z1hqoyw51DHIrDEY8WSLRFXS YuKEhk0HbjGwF5CRC/Qn52uGin4ELoLtiSl5T+lwdHVcgx0scN1CKzWBot9lsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q+kt7mVWngy46PP1Tu6RL/tpVU7oht6KrHdGkNJEUuQ=; b=GVHUXbpN98yOsvbO9E5UJH/jT1Lk2K3I8raeguaTP86KVyeZuAhVg3/hjA4NocN/HEijg2 wJ17ElNSL/k2wHWf5lpTxMrYD7Md/M1Kv1Dd68rfgXTpK6DgFwDd8WTcD3wTP660zmaEa3 88V1Q9xAuLOFbqR9N+56dRecMa3uxq6PMCk25NvpuLbxIpU2vuCiS/kqxOMFy5JE1n2vz8 MChqiQfmJlaKBB/e3qeAdCyPlIACZgu3IV52oMK+/4AoZ8uN2PNUw5K2+VZL7ck1OjudcF GU4D5z0VrwFslMS0F6ILI0+U+vO4cp/CZtsT+ZSSsHnQH59VOFH5ZQNzb4UwAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324672; a=rsa-sha256; cv=none; b=nl/G6vhGur+khhkhT/11lQaG2rWX85M/3GhV/uJmHPSpb1erOp7yVEQA90X6JmB1NKUld4 obZW9DIjO2jqAi0w9eTepgKwXBSmrtXFunL/5DhzIHbSI1W844+wP+ty6JSTEo5Ln/hdFA TVvpcB8M/uHfRkQACUDXHllZX0gwli0uazTmE6SEm+gPjuJGLOYf55bVBnRzodtGNwcrte YXS4UFTRyFIRO1qQhRrekh6qcvgYugYAR1oWthjOPdj52pHpG9Y0hDiLhugLakN2gIfDLC iR4NLp4iUzg+CeELBhWCp/30A1q4lDoVIuQNPGhpBNTJXPDo/CUomidPyV1gfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1MM6dFXzfVB; Wed, 12 Feb 2025 01:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1iVdJ052296; Wed, 12 Feb 2025 01:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1iV7k052293; Wed, 12 Feb 2025 01:44:31 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:44:31 GMT Message-Id: <202502120144.51C1iV7k052293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: ceab30bfe243 - stable/13 - mk: Move vm stack test debug symbols List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ceab30bfe243793bc34420ab885b066dd45b23a1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=ceab30bfe243793bc34420ab885b066dd45b23a1 commit ceab30bfe243793bc34420ab885b066dd45b23a1 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:47:24 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:41:18 +0000 mk: Move vm stack test debug symbols Avoid the creation of a /usr/tests/sys/vm/stack/.debug directory by placing sys/vm/stack test debug symbols under /usr/lib/debug. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48796 (cherry picked from commit 88d448ec815c1fda27be94846f88ccd96251febd) (cherry picked from commit 955f974a1a37cf3ae8b241327b1fef74c8932855) --- ObsoleteFiles.inc | 3 +++ share/mk/bsd.lib.mk | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 0e7060eedd52..b9e5f30f1f35 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250204: sys/vm/stack test symbols moved to /usr/lib/debug +OLD_DIRS+=usr/tests/sys/vm/stack/.debug + # 20241201: new clang import which bumps version from 18 to 19 OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_builtin_vars.h OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_cmath.h diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 9c0ee12ba110..4a580e0ed32a 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -239,7 +239,8 @@ SHLIB_NAME_FULL=${SHLIB_NAME}.full # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory .if ${_SHLIBDIR} == "/boot" ||\ ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\ - ${SHLIBDIR:C%/usr/(tests/)?lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" + ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" ||\ + ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} == "/usr/tests" DEBUGFILEDIR=${DEBUGDIR}${_SHLIBDIR} .else DEBUGFILEDIR=${_SHLIBDIR}/.debug From nobody Wed Feb 12 01:44:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1MM1DyFz5n7sS; Wed, 12 Feb 2025 01:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1ML6M99z3jRF; Wed, 12 Feb 2025 01:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Cg/bsxm7MGYPlUyyderW22faCKQz7EArKTHru09Vio=; b=mCoBmRXkx8YI+SQuQn6u3ZtpmnLOUasvjLEuqmtr/pvQvG4YdBUiWqm91HPLVpiHypiHhX FAT18SHTdKhO89+JRioRCMb6wHiherD/MQIusfYmxd1omT/i6kFmpjw1gaK07bIULyO0Kf pC+IP9UOZImfK6QcKdKoH+NQOtEfa7hTEdfCWmczkow/LfSoGLWFcgiBLS6tb7VMVFE1z2 EsbaBhrghIXQqtKwpQ7ou6vnTRhnJ6c8sUzqHbtj4UIo9ZDxRKOK1NzAysspSE239yjTYe ZpJez+aCWYZrddnbPLrcSdNbb5xNLc9jOOFixDF6kX5rnYz/f3nPND1y2boTjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Cg/bsxm7MGYPlUyyderW22faCKQz7EArKTHru09Vio=; b=hcniZhGiPis4Nd3jTfboaynxSKwYHeWDRpQM838e0wZ3cS+qBlrPYa1MnjHR4Jb5ybffi3 xpuQZ2EJfvqouITNyqrwT4Qf400o8wxuonsFyPQ+u0tbWjBFsGwsmMygafNxwCnCXir4uS WW5TX2IdseuhmpAHXvV+snzEZNF3xCIQbOK8l3uq79xnwdYJFTzx/JBaK1/f7kdfF5r9Vq f3NSsP+DNNobgAuY3BQfuvHd3Xk2H+spoHmI6vI0avv7/wAYFQoN92Fqwco4gpeOtfJEen U0jNG35+ZVYh9CqgMsk1YUOM2JjhKKYiG4uSdFARMqTCVc4K1zPDv3zQ+WaA2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324670; a=rsa-sha256; cv=none; b=mzB6OY1FDC67/xHHvJh0MNpKPua/1u0X9gvKy78s9lufGL11ejnROyIE55AkGhA3CW8ZSi Q7L0uFU0j6abGwb2H1r2SHTdpz+BLv22WAKMqwJSXL7Ri74UgS72U9jKo4eqsY0OalgD7k yOS97XfmWXcdBu3LFgGlIMgNRLhh51YEdutp84PtsQ/NP14zI9rQv4tN09kMVAxMkn8piP wq2kK6LV57ww7O/VYuNnYS1dtmkTOgFBEkdbAPLSukGHkajWFdvTYbW6OKIU0tpYtsGRwp g6GfFQswjn+vBpv+uManIiI55pE3MkzU+MtCMAhsSHR3yv1P54ErLhHQwPbaHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1ML5Tbszf1j; Wed, 12 Feb 2025 01:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1iUmi052259; Wed, 12 Feb 2025 01:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1iUv8052256; Wed, 12 Feb 2025 01:44:30 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:44:30 GMT Message-Id: <202502120144.51C1iUv8052256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 65b71a21fc78 - stable/13 - libopencsd: Remove extra slashes List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 65b71a21fc78eb7012b9a83bc84458288f9c197e Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=65b71a21fc78eb7012b9a83bc84458288f9c197e commit 65b71a21fc78eb7012b9a83bc84458288f9c197e Author: Jose Luis Duran AuthorDate: 2025-02-04 14:15:37 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:39:41 +0000 libopencsd: Remove extra slashes Remove extra slashes that end up in the metalog. These double slashes can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48779 (cherry picked from commit bccaf0262dcab84be49c42cc6b7a81c279c44b62) --- lib/libopencsd/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index b1a9f6f5a98b..bae8dea6e444 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -116,7 +116,7 @@ APIINCS= \ ocsd_c_api_types.h \ opencsd_c_api.h -APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/ +APIINCSDIR=${INCLUDEDIR}/opencsd/c_api ETMV4INCS= \ etmv4_decoder.h \ @@ -129,7 +129,7 @@ ETMV4INCS= \ trc_pkt_proc_etmv4i.h \ trc_pkt_types_etmv4.h -ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4/ +ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4 ETMV3INCS= \ etmv3_decoder.h \ @@ -140,7 +140,7 @@ ETMV3INCS= \ trc_pkt_proc_etmv3.h \ trc_pkt_types_etmv3.h -ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3/ +ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3 PTMINCS= \ ptm_decoder.h \ @@ -151,7 +151,7 @@ PTMINCS= \ trc_pkt_proc_ptm.h \ trc_pkt_types_ptm.h -PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm/ +PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm STMINCS= \ stm_decoder.h \ @@ -162,7 +162,7 @@ STMINCS= \ trc_pkt_proc_stm.h \ trc_pkt_types_stm.h -STMINCSDIR=${INCLUDEDIR}/opencsd/stm/ +STMINCSDIR=${INCLUDEDIR}/opencsd/stm INCSGROUPS=INCS APIINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS From nobody Wed Feb 12 01:44:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yt1MP4tnkz5n83L; Wed, 12 Feb 2025 01:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1MP14LJz3jMJ; Wed, 12 Feb 2025 01:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1zz85HRILpGwPJ6b7FrHFXiCtmYLZev69YIQE6pFPQ=; b=E+P0wKu84Xxnprp6PHbRRGrL+dNdUsFZWdnKQSd3m+qJUNwKiKq454v3fBmzDIgEwSlLTU avh6uA4TqtQ8s2nyOP3SDbVawywceNZ3c7AqsU1DdPpt9IjrEXWAeQtRjIzQNYCX23B/Sh LDCkVWsz19W9tKtNS4kG4WVSokQv//dB5LglAFG6DRwHE8aaMTvhCBGu+NWEURuijtgzTQ RkFVmJ79bzC6dPvJoKguQ5M7iuEoR+EJDaH938e5NL+YiCCzJKDYIg6Lmsm3L3WmJhKADF uKRpQso3NGv7D0S5+MGv/Xlp6cd2A7tl6G4taXQOG/JMiFgy9dB/jBUAC2UjcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1zz85HRILpGwPJ6b7FrHFXiCtmYLZev69YIQE6pFPQ=; b=cslHiBvoiGWvgZJy72QZ7ZLVTOtIG+LjvQMzXkRDM3KAYxaCfknhRZ3gGHboy2gljy7yt7 MuYSbRSoAFzDMaKx6eVBa8oQgKCDAxi6MDhD0XbQPxC6NQ+lcxR6JRfNolBRZ4962ztb2E 3s5/pLWaiWAGu42oEQJrm/ukqDWZ36LGekejI4zwsV9NyR6t+tRge3qGnhFMyq/K5ITFA8 QVsxOUf7g/KmP1sb7o1vPdqBY5L/3Tb4jGVxXUR3fnIah/YOEQSIYDAzmIDHWFB5m/gS8K a5aCJH/nae8QevgMiUDtjhtj6S004Uya5Qmyy1p5n0e61YTAdkjxQ0NNSJZ8OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324673; a=rsa-sha256; cv=none; b=gLrUqG/FHZOMBM1+8cmqzx1o/Mqt0xKhjbJkqb6O4zKoZ8nUh75vjYvlUsOeCThI3mM8Sd Kns9nGF5sHpc9mBkGU5+lmNA6MvTbTtslWdMRbm3w2WpYhGSkMSSSAbmuEW/mlb2wDLndV hGGH7NlVy3W17+VVSde0nqVebbUkh5fE3ftIqlmwf1o7TCcnMokRCQL5MD5MMD/zQ2S9Ow u/1UG7KzXdkCjitnx6t1N8QjW552xiHBUggKGpMd4cvAKWA1wBU4lOVxrgC8g/4yC/63RW u3FteztCWcAEfco+JCarx8nr475sGEz/rGnY6bIETs0KK8U7YhmOJBK89JqCGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yt1MP0M50zfb6; Wed, 12 Feb 2025 01:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1iW2S052340; Wed, 12 Feb 2025 01:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1iWNo052337; Wed, 12 Feb 2025 01:44:32 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:44:32 GMT Message-Id: <202502120144.51C1iWNo052337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 28ac62860b59 - stable/13 - mtree: Add missing libxo/encoder path List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 28ac62860b5925214015bef77481b3f6696a4a88 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=28ac62860b5925214015bef77481b3f6696a4a88 commit 28ac62860b5925214015bef77481b3f6696a4a88 Author: Jose Luis Duran AuthorDate: 2025-02-05 19:50:21 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:41:52 +0000 mtree: Add missing libxo/encoder path Reviewed by: imp Approved by: emaste (mentor) Fixes: d1a0d267b78b ("Upgrade libxo to 0.4.5.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48836 (cherry picked from commit d10deaea12adb73a698d907a148f081c402d5dd6) --- etc/mtree/BSD.debug.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 0d5a58f010a1..53eb1910304a 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -41,6 +41,10 @@ .. i18n .. + libxo + encoder + .. + .. .. libexec bsdinstall From nobody Wed Feb 12 10:04:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtDSr0DMbz5mVj0; Wed, 12 Feb 2025 10:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtDSq6mkcz3XWV; Wed, 12 Feb 2025 10:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739354699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zAzlDierRjUdjYdq+X082LSuIbOTwLNB01PSiDV2MB8=; b=iFGzd15QSHbU39unVwEKIBkvgR899jKTEKy//cF/Q/myOVXkKeSGmstmt7T0IBGnux39+j KxjJ5mIkkC/S4yFuN5dw3BEBuQVK19gWDrRLE/wmm6z/VjoUpzlPh8T6JF/1CLfxK7e3if /JcUzWoegSvV71HPM1KDy3rlvyO6BvT/Pw2EcssRwq1+7gyZzhtoGwrIny+8QX2V33i2kQ +Mv3lyQ/iEUtnEnY8V/OvbeZxWbZe8Ej6FcwelDQtdC2oLjZEtlftWIAtRJBuncYEEDetq s0aTXoVme4fJgVXtnYdz2vNrZzbO3gS4/XOyW8tAzaP9Dt8OCD/TY6C+grMmoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739354699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zAzlDierRjUdjYdq+X082LSuIbOTwLNB01PSiDV2MB8=; b=I9NTe7igA4cxJi7nIob5UNJpk4BS8K+MX6owy/bjWRvMyswY28v46KErMQM8zjBDV0N53a G/P1AX/6j2Tx2d4Xk0ny1mXqTnJqDo9A5jXXGTla/TJuK+et+xCbz6WWvkl1ThfrP1csw6 tD9wb+Q9NXlZa9OueVo91jZwvD7oY43p/Oq5aNBQbG6bSvqvdrsBPkYximLA62sHIeuGB6 nyi8A3b6tEitx+vGO/nljFCS9w8/R4HdrRon16xo8gcoiVWN2EuhKx/jb/CuGkzuQtkrCP vXHj0w9O1ByX1UjLUbcf2VE9FH/WlU3Zx/GLcQwQ2EYI1CmkPNxOpZAUeWVvkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739354700; a=rsa-sha256; cv=none; b=wy8l9YbC3HdktsjOuatWKA9pcJjf19rShSEi015vJCgWo9//ULWWlk6BTckYmftaBW/PIv ZEuViec2lQIXbZLNppBUvKUDgLG4pJxDpfFMzml6gaTpr+86q/ig0RPjtr0prvdLbOA583 ePLM1KJrGII2judgjDQpHFvMxWRwl4Bs5y9Gf9DWHJ9RhrlkBUQfJSjgPF5z8Dd+i0fMlA j5KEBv2ROVbMNsqK1H5HjpmB1lUHQ67yqP4WNQ3H1KM+GARKFTnEhdwC4nCm0NVkuIxvn4 ypsQtkkpxiEVE6NHLduu+lveRSImfWPqge9cOGYatfAvlDX0QvLJujEr5ifiOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtDSq6MGZztZ9; Wed, 12 Feb 2025 10:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CA4xfx093102; Wed, 12 Feb 2025 10:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CA4xgB093099; Wed, 12 Feb 2025 10:04:59 GMT (envelope-from git) Date: Wed, 12 Feb 2025 10:04:59 GMT Message-Id: <202502121004.51CA4xgB093099@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: ccd9c1ef4e90 - stable/14 - icmp: use per rate limit randomized jitter List-Id: Commits to the stable branches 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: ccd9c1ef4e9008a3ba264756a2e6fff7dfd3dc86 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd9c1ef4e9008a3ba264756a2e6fff7dfd3dc86 commit ccd9c1ef4e9008a3ba264756a2e6fff7dfd3dc86 Author: Michael Tuexen AuthorDate: 2025-02-10 21:16:20 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 10:04:10 +0000 icmp: use per rate limit randomized jitter Using the same random jitter for multiple rate limits allows an attacker to use one rate limiter to figure out the current jitter and then use this knowledge to de-randomize the other rate limiters. This can be mitigated by using a separate randomized jitter for each rate limiter. This issue was reported as issue number 10 in Keyu Man et al.: SCAD: Towards a Universal and Automated Network Side-Channel Vulnerability Detection Reviewed by: rrs, Peter Lei, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48804 (cherry picked from commit 923c223f27e792e51ca13c476428adbbf6887551) --- sys/netinet/ip_icmp.c | 20 ++++++++++++-------- sys/netinet6/icmp6.c | 50 +++++++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 24a14c4d4879..26ee6e5c1245 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -90,7 +90,7 @@ SYSCTL_PROC(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLTYPE_UINT | &sysctl_icmplim_and_jitter, "IU", "Maximum number of ICMP responses per second"); -VNET_DEFINE_STATIC(int, icmplim_curr_jitter) = 0; +VNET_DEFINE_STATIC(int, icmplim_curr_jitter[BANDLIM_MAX]) = {0}; #define V_icmplim_curr_jitter VNET(icmplim_curr_jitter) VNET_DEFINE_STATIC(u_int, icmplim_jitter) = 16; #define V_icmplim_jitter VNET(icmplim_jitter) @@ -1110,14 +1110,16 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { }; static void -icmplim_new_jitter(void) +icmplim_new_jitter(int which) { /* * Adjust limit +/- to jitter the measurement to deny a side-channel * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 */ + KASSERT(which >= 0 && which < BANDLIM_MAX, + ("%s: which %d", __func__, which)); if (V_icmplim_jitter > 0) - V_icmplim_curr_jitter = + V_icmplim_curr_jitter[which] = arc4random_uniform(V_icmplim_jitter * 2 + 1) - V_icmplim_jitter; } @@ -1146,7 +1148,9 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) error = EINVAL; else { V_icmplim_jitter = new; - icmplim_new_jitter(); + for (int i = 0; i < BANDLIM_MAX; i++) { + icmplim_new_jitter(i); + } } } } @@ -1162,8 +1166,8 @@ icmp_bandlimit_init(void) for (int i = 0; i < BANDLIM_MAX; i++) { V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp_rates[i].cr_ticks = ticks; + icmplim_new_jitter(i); } - icmplim_new_jitter(); } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); @@ -1192,14 +1196,14 @@ badport_bandlim(int which) ("%s: which %d", __func__, which)); pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + - V_icmplim_curr_jitter); + V_icmplim_curr_jitter[which]); if (pps > 0) { if (V_icmplim_output) log(LOG_NOTICE, "Limiting %s response from %jd to %d packets/sec\n", icmp_rate_descrs[which], (intmax_t )pps, - V_icmplim + V_icmplim_curr_jitter); - icmplim_new_jitter(); + V_icmplim + V_icmplim_curr_jitter[which]); + icmplim_new_jitter(which); } if (pps == -1) return (-1); diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 138a7ce71bbc..39c252e16b75 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2741,22 +2741,6 @@ SYSCTL_PROC(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, &sysctl_icmp6lim_and_jitter, "IU", "Maximum number of ICMPv6 error/reply messages per second"); -VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter) = 0; -#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) - -VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; -#define V_icmp6lim_jitter VNET(icmp6lim_jitter) -SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, - &sysctl_icmp6lim_and_jitter, "IU", - "Random errppslimit jitter adjustment limit"); - -VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; -#define V_icmp6lim_output VNET(icmp6lim_output) -SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, - "Enable logging of ICMPv6 response rate limiting"); - typedef enum { RATELIM_PARAM_PROB = 0, RATELIM_TOO_BIG, @@ -2778,15 +2762,33 @@ static const char *icmp6_rate_descrs[RATELIM_MAX] = { [RATELIM_OTHER] = "(other)", }; +VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter[RATELIM_MAX]) = {0}; +#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) + +VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; +#define V_icmp6lim_jitter VNET(icmp6lim_jitter) +SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Random errppslimit jitter adjustment limit"); + +VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; +#define V_icmp6lim_output VNET(icmp6lim_output) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, + "Enable logging of ICMPv6 response rate limiting"); + static void -icmp6lim_new_jitter(void) +icmp6lim_new_jitter(int which) { /* * Adjust limit +/- to jitter the measurement to deny a side-channel * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 */ + KASSERT(which >= 0 && which < RATELIM_MAX, + ("%s: which %d", __func__, which)); if (V_icmp6lim_jitter > 0) - V_icmp6lim_curr_jitter = + V_icmp6lim_curr_jitter[which] = arc4random_uniform(V_icmp6lim_jitter * 2 + 1) - V_icmp6lim_jitter; } @@ -2815,7 +2817,9 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) error = EINVAL; else { V_icmp6lim_jitter = new; - icmp6lim_new_jitter(); + for (int i = 0; i < RATELIM_MAX; i++) { + icmp6lim_new_jitter(i); + } } } } @@ -2835,8 +2839,8 @@ icmp6_ratelimit_init(void) for (int i = 0; i < RATELIM_MAX; i++) { V_icmp6_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp6_rates[i].cr_ticks = ticks; + icmp6lim_new_jitter(i); } - icmp6lim_new_jitter(); } VNET_SYSINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp6_ratelimit_init, NULL); @@ -2898,14 +2902,14 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code) }; pps = counter_ratecheck(&V_icmp6_rates[which], V_icmp6errppslim + - V_icmp6lim_curr_jitter); + V_icmp6lim_curr_jitter[which]); if (pps > 0) { if (V_icmp6lim_output) log(LOG_NOTICE, "Limiting ICMPv6 %s output from %jd " "to %d packets/sec\n", icmp6_rate_descrs[which], (intmax_t )pps, V_icmp6errppslim + - V_icmp6lim_curr_jitter); - icmp6lim_new_jitter(); + V_icmp6lim_curr_jitter[which]); + icmp6lim_new_jitter(which); } if (pps == -1) { ICMP6STAT_INC(icp6s_toofreq); From nobody Wed Feb 12 10:19:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtDnb14Scz5mXB9; Wed, 12 Feb 2025 10:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtDnY70lLz3YHy; Wed, 12 Feb 2025 10:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7p7kHodJb8ErqnRlr4V44+XmXYwhYY7Hlnzg1yqUOXI=; b=h7z7KXqyVhBoHRAiNVo833GSmWabSBccfFfgT3BCTzm1GfSwWtZtMdQUrADRgkFEI7HNAe xhXUjR58uuUEIzQCEC97ogJT17Skzj12RQ9TSADAaaQ0NJnbi/TM927sb1xygzgTtii1ft 4c+zdcjiPzKUeODcPfhsFIRkyYz2OXOc6qE0+PHirWZg7rdqmX4HpXHSVQYzAKk4dgF8/N upLU+rc1UO0trBjueU/VkoWC1RVqvvmxV0r27zbh678+A4cxMnZQTXLjCKS+dfIudeNZ1V 2qXOlLK0ZAeWjO52b5DmukIL6UmsnMdQwWIlV70H1navIXDk0DdEeYYRjGNQKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7p7kHodJb8ErqnRlr4V44+XmXYwhYY7Hlnzg1yqUOXI=; b=A44IETZNz5p/3fszoNuZopAaethKpSZsGno/HkmsvPESz0v+0P24HDEog3mLLDNdFr3t7T YV6ZC5SikcCrjyBXShlcSnZEaqG+fuk5v9acdqVi94O1bGASs527JNU/uf0UPCZipYXJ14 wXhRtJJ4ypyCjjNmdlCYHfSPgFvY5ooKJk0dMVWYcjPk17YifVIZU+mfGl5H6Id5z5XU/X lNmbGdDqh+lK8LfUyxwnw4nqqv7XNr01lUWWa54ORmG5m+N2xhlGXsVC+PEeqQclK913fp kZfYnfqvXEbP/GBLL8f+D2E9M9SJx5hbboPEqAgtIYyt1KrJarK+gUZnxxPUvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739355570; a=rsa-sha256; cv=none; b=RABJdjZMjU70MMvf48yfuaXD3bLR/AfyugyauSw9IijThTKVlD77pBMspHXnZb1k/xxr1U OmibaPd34kV9gpgZnMUsnfMAdTTph+wdtdHpuPdv71VHeerqMzBhXDDk1/tmI4myHAhDse CNANdpsln4t3pLEgahGlvsjW2/yVv32JVFQzn67ltWYndFEyzIKIq2Q+UHBYrCRPNT1OuX JzNZr+kTTUvuMgCfWxyLUAMbBH6wwJJSR8efBn/eEpAYkbEZB3IcedIUNDFMTI03NLrJDZ d5iDn/R7fddDndQ/bs64m/HOrXNNTfVfh97+1fOjyPZgIYH2MeFEe95FY4woIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtDnY64dmzvhG; Wed, 12 Feb 2025 10:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CAJTBK012765; Wed, 12 Feb 2025 10:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CAJTP6012762; Wed, 12 Feb 2025 10:19:29 GMT (envelope-from git) Date: Wed, 12 Feb 2025 10:19:29 GMT Message-Id: <202502121019.51CAJTP6012762@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: 0939f3a04653 - stable/13 - icmp: do not store per-VNET identical array of strings List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: 0939f3a046533a2df1d2b10fd914c98755dacb0b Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0939f3a046533a2df1d2b10fd914c98755dacb0b commit 0939f3a046533a2df1d2b10fd914c98755dacb0b Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 10:15:53 +0000 icmp: do not store per-VNET identical array of strings We need per-VNET struct counter_rate, but we don't need per-VNET set of const char *. Also, identical word "response" can go into the format string instead of being stored 7 times. Reviewed by: kp, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D44475 (cherry picked from commit 7142ab4790666022a2a3d85910e9cd8e241d9b87) --- sys/netinet/ip_icmp.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index f0e63d6c8b1a..54411d55f49c 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1085,28 +1085,26 @@ ip_next_mtu(int mtu, int dir) * the 'final' error, but it doesn't make sense to solve the printing * delay with more complex code. */ -struct icmp_rate { - const char *descr; - struct counter_rate cr; -}; -VNET_DEFINE_STATIC(struct icmp_rate, icmp_rates[BANDLIM_MAX]) = { - { "icmp unreach response" }, - { "icmp ping response" }, - { "icmp tstamp response" }, - { "closed port RST response" }, - { "open port RST response" }, - { "icmp6 unreach response" }, - { "sctp ootb response" } -}; +VNET_DEFINE_STATIC(struct counter_rate, icmp_rates[BANDLIM_MAX]); #define V_icmp_rates VNET(icmp_rates) +static const char *icmp_rate_descrs[BANDLIM_MAX] = { + [BANDLIM_ICMP_UNREACH] = "icmp unreach", + [BANDLIM_ICMP_ECHO] = "icmp ping", + [BANDLIM_ICMP_TSTAMP] = "icmp tstamp", + [BANDLIM_RST_CLOSEDPORT] = "closed port RST", + [BANDLIM_RST_OPENPORT] = "open port RST", + [BANDLIM_ICMP6_UNREACH] = "icmp6 unreach", + [BANDLIM_SCTP_OOTB] = "sctp ootb", +}; + static void icmp_bandlimit_init(void) { for (int i = 0; i < BANDLIM_MAX; i++) { - V_icmp_rates[i].cr.cr_rate = counter_u64_alloc(M_WAITOK); - V_icmp_rates[i].cr.cr_ticks = ticks; + V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp_rates[i].cr_ticks = ticks; } } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, @@ -1117,7 +1115,7 @@ icmp_bandlimit_uninit(void) { for (int i = 0; i < BANDLIM_MAX; i++) - counter_u64_free(V_icmp_rates[i].cr.cr_rate); + counter_u64_free(V_icmp_rates[i].cr_rate); } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); @@ -1136,7 +1134,7 @@ badport_bandlim(int which) if ((V_icmplim + V_icmplim_curr_jitter) <= 0) V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which].cr, V_icmplim + + pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { /* @@ -1154,8 +1152,9 @@ badport_bandlim(int which) if (pps == -1) return (-1); if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, "Limiting %s from %jd to %d packets/sec\n", - V_icmp_rates[which].descr, (intmax_t )pps, V_icmplim + + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); return (0); } From nobody Wed Feb 12 10:21:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtDr34Fhxz5mXMw; Wed, 12 Feb 2025 10:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtDr33n9cz3YnD; Wed, 12 Feb 2025 10:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dbZMBTVpr0Z9pBV930oWYPzlsliGrncuWXC4HNWlNSw=; b=hM0Jk8oNwXIK0mLI/yAKRzPSkGKPrlzdnUabffauI2b10ASrJpXL42Yy8dlpqL631QlJcN XeUc07GjUz7lgku4mRpSWG3s+zTy4yfNuoyZri26D7AV7x2qnUZbByqKce630mLxCXidMu T9qZoeZhGMIDOji94O+ywkE0e5PvCcb0TM5AyPc+wt3x3864he3CV6+itkDkSUpZJZW9Zz h88sjcc54MDmCnLz/dY6kiLY5mtC0Njx3iq/uiUlZETcQtPx63tCGKy+oAXStweJbCDpHa SKRPaua9yG1C8D6nfoPu8zmiOICDOEqkoc+qQK9CmSeS/W+mopPLf8lkH4cjwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dbZMBTVpr0Z9pBV930oWYPzlsliGrncuWXC4HNWlNSw=; b=HZRl/aR0tGSv9oaOkMpTTjKAfis1/gOe6rGdKVjOIMH+4uXrXBoLKx2LHV+Wc2gOgF3B7W fzRtZV1ZoBdP0XzR544T55Tnwl9JVZxxO9x7yT1ECtOz3WVg11tdbtS0JCiQs5XLPoFWAq ACcvJZHX9v4PUDwQ9lu4SUTouYfXLmo2M04hceHG6AE7XfKvfN3dYWbtzoOBfair84x1wj SWtuCBB9K3uZmz/314sYynapp/IjUzW9JejC0g1GGQiBv8dA+M+rA/MYAmqGiM1V7o4w8z PMFFMAW7STeo9jyWqy2ZSdDKk48qnF+xC6uf+FPB94H5tgz9hZmmvLGJy+f7zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739355699; a=rsa-sha256; cv=none; b=OzFRlNCbViRkAEV/J67wWuvKohf0qeeVy0oaQgNTBt40CvIeKwlxjEt6ZalSRWFZH2xNFr ogedYKSNfDh8zXSQj4feWCg+29Mh+pe2bRmKADHu2qphA5vDkDhtQWtRVqb5aRwyuIJy+L dS+9AbPXff+iIjLIv7wNdLpKrrrIpx0N2JwjO25fVLQyPe7N48vXJTw1gQ8700y00W/b+f dujtC+bCeHsfJiklqqSFmC+tR6WuBxnBKYO78Raq9GPb2OGlCoxCNJ4oPIZUupMLM/pmMx 6Izj/SdKF5ve76NzyjmkhAT6yD57+htUh25Qwn80s9B0DhHKm0AtJYXgvyaEVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtDr33NGdzvV8; Wed, 12 Feb 2025 10:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CALdN8025407; Wed, 12 Feb 2025 10:21:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CALd5O025404; Wed, 12 Feb 2025 10:21:39 GMT (envelope-from git) Date: Wed, 12 Feb 2025 10:21:39 GMT Message-Id: <202502121021.51CALd5O025404@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: a6d5c6a04fe9 - stable/13 - icmp: hide icmp_bandlimit_uninit() under VIMAGE List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: a6d5c6a04fe9408cdfd1f56f8dc3142661214eb8 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a6d5c6a04fe9408cdfd1f56f8dc3142661214eb8 commit a6d5c6a04fe9408cdfd1f56f8dc3142661214eb8 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 10:20:53 +0000 icmp: hide icmp_bandlimit_uninit() under VIMAGE The uninitialization may be executed only on a kernel with VIMAGE. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44476 (cherry picked from commit 9d7f17d7467ed8c9740730a8db7a82e4768e5177) --- sys/netinet/ip_icmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 54411d55f49c..5c8c17cba049 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1110,6 +1110,7 @@ icmp_bandlimit_init(void) VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); +#ifdef VIMAGE static void icmp_bandlimit_uninit(void) { @@ -1119,6 +1120,7 @@ icmp_bandlimit_uninit(void) } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); +#endif int badport_bandlim(int which) From nobody Wed Feb 12 10:22:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtDsK3Dsmz5mXN3; Wed, 12 Feb 2025 10:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtDsK2kQrz3ZHW; Wed, 12 Feb 2025 10:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUzwJ6ZivrmhABU6Z3PMi8/JmpqBBcv7dUUWtsx8j/Q=; b=PDwlFdAJf5W998qIs5bmG/0YHoyr+xqntnWa5dOqm+6s/IID+12sUqNRFZB1SUbsCkeGC8 vKb49rtGepaxC+N/Iuv5hZU0iIXF385QwWxdySwlJOnirB1v24nWF2ZnueQYDyv6W8GVjt mn8vUg0QdyH6OoAoRSc9Y5xs2SgtNqgJF2bkIrq7LNxgtid9Ya3NLWxwHRxZHUB0tPLwO2 YrEEGqJabe+aV18pgn/OIkV2IIMmrvzm+gxXTwayTkUgi+yD/bmxP+FyHF2MDaJLBX1L90 wDyl1FR6NhEvGhaQJlc0MXWl0ut2Il3k5E7CtQtl/X+8vihUxOAuXHyfmHPd6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUzwJ6ZivrmhABU6Z3PMi8/JmpqBBcv7dUUWtsx8j/Q=; b=glxpTng3HmiqNl5gGrH5peFLuKDWbvMA2mTIHE2ui7SvN6j8FWfs3dRwgUHjWUfm/kV9cz bElZ1zLPq93cO0QR7R4GoFkTtMX87lMAZiogt+bFC0LC0LDSnhN4+b+0IUKvGIvVD/S24G //eCb44SHTk0ljF1Xs5DqZ4WtHiT0EHFEQVVZ5cLW9bWNO7Rz2DH/PRyvqf6W0F0tGGJD5 Q0UzlTexV4ELT3tEOBA+LUXt0VGGgljDXYvs4Z5atqMem6dbg6aHb9RzkHsQH2ZK62lU73 Hhw9n2HI2EBTt+BIH93m605644WiP6+8/b587nZY65v3iP3DdN/B7OIejL3A2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739355765; a=rsa-sha256; cv=none; b=XfSP9mq7Rg3eipB+wbswyu1wh2UOFovgeA+wr5bYC5cerPwOoHFmNSWvYRK0fNDBqMnNpW Iu3QcNAC+84IbKtp1M5I7WtkvoVGwfT/tTexb6VI++Hb3VjTDrcoxszBukxkQZvG0qRc8S FBxeT+cNuuaZK6kwb7/hup4afCPbX7gmABnS9XMoyf3zO1zLmLxuoj2i34DMVG+vpHPiEU LGVqvhyGxql+CyC/F1Q6Bbww1PtwsJpUUkH0rgmapFjpzqVnrK4RrR9asAF2m5FZbDamuY zIig8EnVMi3woaAc0XaDEfW6mmkEOaFShQfzU7yf8LT9yaAZbKpyt0pXU+bhUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtDsK2KnxzvVV; Wed, 12 Feb 2025 10:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CAMjG2029343; Wed, 12 Feb 2025 10:22:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CAMjDh029340; Wed, 12 Feb 2025 10:22:45 GMT (envelope-from git) Date: Wed, 12 Feb 2025 10:22:45 GMT Message-Id: <202502121022.51CAMjDh029340@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: a71eee300ba7 - stable/13 - icmp: when logging ICMP ratelimiting message use correct jitter value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/13 X-Git-Reftype: branch X-Git-Commit: a71eee300ba7d94a1621c7b31eaaa79243db84ec Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a71eee300ba7d94a1621c7b31eaaa79243db84ec commit a71eee300ba7d94a1621c7b31eaaa79243db84ec Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 10:22:14 +0000 icmp: when logging ICMP ratelimiting message use correct jitter value The limiting of the very last second has been done using certain jitter value. We update the jitter for the next second. But the logging should report the jitter before the change. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44477 (cherry picked from commit b508545ce044dbfdd83da772e73f969a3713d59d) --- sys/netinet/ip_icmp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 5c8c17cba049..199b76aa9ad6 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1139,6 +1139,11 @@ badport_bandlim(int which) pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { + if (V_icmplim_output) + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, + V_icmplim + V_icmplim_curr_jitter); /* * Adjust limit +/- to jitter the measurement to deny a * side-channel port scan as in CVE-2020-25705 @@ -1153,10 +1158,5 @@ badport_bandlim(int which) } if (pps == -1) return (-1); - if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, - "Limiting %s response from %jd to %d packets/sec\n", - icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + - V_icmplim_curr_jitter); return (0); } From nobody Wed Feb 12 10:24:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtDtt08pFz5mXCn; Wed, 12 Feb 2025 10:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtDts6WL1z3Zs4; Wed, 12 Feb 2025 10:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N+QST/g8t9caDO8ZIsNh3Z3oIi7p0KJxh9ogDfBPSK8=; b=PZBZ7KpT92ZgWme2jAwt6RhNiZUXi+jW3MyN2t7sE+5RpMe9uIDsID64RC5uKNmYEadZGd wat7bHHlcg2zrt7AhufKyYh3Ak0fnAjj1oyMhnNcJAHZZ9/nYskLUWI9uz7e+e1DTyGCWW OaXh5SJI95Pzoc5fFOXFetv5hcUOn4qnLNzL1aSnskpighbfCTS+WRbK8qPtcST3aagEKA 2M1HaK+UA8cpHepZuUUzxQ7byzLyGWAwfe7OTS8V16ziUSAy0jJKRp2YLgn7P9dTAK/gRv mCwZT9l3F5G474gMU9oGhOzmbMCb2YuYzxOuPGCx3i+vzxO2CWRAVLVSWBQ67Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739355845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N+QST/g8t9caDO8ZIsNh3Z3oIi7p0KJxh9ogDfBPSK8=; b=Fk85EQHccXcZ1xBPO4m+wtzuuo4I0AeKQKFtso8e2eBc9toDx5G8DI25uOGzJ5kPkiwVBD RlUbAu9rzeH4yWiuGUO61V3S0clg8pXuLStlzQYIJ+5bAd5yLUz/DAmxEb9u4CBsvKNhMv DrOPVJIuJPyiDQYNYOMeGtW/8GfZ0yUAdZmGHTYedLxOI+mMgr4vmZ7mTrNiCUhJ0B52wb PGydT3l0FnzIuXdQGYXsCvCZKMS3UOa6ztRaKkcwREmJ8t1R3DhIKAhQE7gLaCKFglUrWF xnPFNNVEqFn2QmzOy/btiqvCduJDw9E1aPjkeJHzbOnna5Lzku5BDHwKdJJknQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739355845; a=rsa-sha256; cv=none; b=JzfEhpPFdsgdmpzKNEFqirQh6rLuDaZWIQUoBWZHsGJxblG0CHzvtfCVJJscZgE/GjYhhv EvnrxS8PU+2nzmkq51tSdF5vg8eaWBvyYwuqYB+yZ+T+MPDU1ENfUoU7hVMrf7+HquZJrX Do37RLmzjTEol32lBXUItmEmMwIZGgG8dWQ5R+Wxv+Ek0yPBOUSPQlNSvf3irOChfZ2WAM 6nrWdaZTIsYby0pDVCefX8EeRHS9C1A7WZVYVnGvhiI2O+CrCisWtzZWMQfY+VWOtzemep rE8cLWwhSif6fwfHn9NDoOSlm889aFMRlGTee5P5KA+f/9G34UZXKnte41XdAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtDts65nVzvXK; Wed, 12 Feb 2025 10:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CAO5dA029852; Wed, 12 Feb 2025 10:24:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CAO56d029849; Wed, 12 Feb 2025 10:24:05 GMT (envelope-from git) Date: Wed, 12 Feb 2025 10:24:05 GMT Message-Id: <202502121024.51CAO56d029849@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: 18058544c65b - stable/13 - icmp: improve ICMP limit jitter List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: 18058544c65b83fffca9556d6d082e823585ef3d Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=18058544c65b83fffca9556d6d082e823585ef3d commit 18058544c65b83fffca9556d6d082e823585ef3d Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 10:23:36 +0000 icmp: improve ICMP limit jitter Instead of fixing up invalid values set by a user in badport_bandlim() which is a fast path function, provide a sysctl handler sysctl_icmplim_and_jitter(), that will check that jitter is less than the limit. Provide jitter initilization function icmplim_new_jitter() used at boot, in the sysctl handler and when we actually hit the limit. This also fixes no jitter on a fresh booted system until first limit hit. Instead of CVE number provide link the the actual paper that explains what and why we are doing here. The CVE number isn't very informative, it will just tell you what RedHat version you need to upgrade to. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44478 (cherry picked from commit ac44739fd834f51cacb26485a4140fd482e20150) --- sys/netinet/ip_icmp.c | 81 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 22 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 199b76aa9ad6..0d671033b67c 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -81,19 +81,22 @@ * routines to turnaround packets back to the originator, and * host table maintenance routines. */ -VNET_DEFINE_STATIC(int, icmplim) = 200; +static int sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmplim) = 200; #define V_icmplim VNET(icmplim) -SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim), 0, - "Maximum number of ICMP responses per second"); +SYSCTL_PROC(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim), 0, + &sysctl_icmplim_and_jitter, "IU", + "Maximum number of ICMP responses per second"); VNET_DEFINE_STATIC(int, icmplim_curr_jitter) = 0; #define V_icmplim_curr_jitter VNET(icmplim_curr_jitter) -VNET_DEFINE_STATIC(int, icmplim_jitter) = 16; +VNET_DEFINE_STATIC(u_int, icmplim_jitter) = 16; #define V_icmplim_jitter VNET(icmplim_jitter) -SYSCTL_INT(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim_jitter), 0, - "Random icmplim jitter adjustment limit"); +SYSCTL_PROC(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim_jitter), 0, + &sysctl_icmplim_and_jitter, "IU", + "Random icmplim jitter adjustment limit"); VNET_DEFINE_STATIC(int, icmplim_output) = 1; #define V_icmplim_output VNET(icmplim_output) @@ -1098,6 +1101,52 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { [BANDLIM_SCTP_OOTB] = "sctp ootb", }; +static void +icmplim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmplim_jitter > 0) + V_icmplim_curr_jitter = + arc4random_uniform(V_icmplim_jitter * 2 + 1) - + V_icmplim_jitter; +} + +static int +sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmplim) || + oidp->oid_arg1 == &VNET_NAME(icmplim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmplim)); + new = lim ? V_icmplim : V_icmplim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmplim_jitter) + error = EINVAL; + else + V_icmplim = new; + } else { + if (new >= V_icmplim) + error = EINVAL; + else { + V_icmplim_jitter = new; + icmplim_new_jitter(); + } + } + } + MPASS(V_icmplim + V_icmplim_curr_jitter > 0); + + return (error); +} + static void icmp_bandlimit_init(void) { @@ -1106,6 +1155,7 @@ icmp_bandlimit_init(void) V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp_rates[i].cr_ticks = ticks; } + icmplim_new_jitter(); } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); @@ -1133,9 +1183,6 @@ badport_bandlim(int which) KASSERT(which >= 0 && which < BANDLIM_MAX, ("%s: which %d", __func__, which)); - if ((V_icmplim + V_icmplim_curr_jitter) <= 0) - V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { @@ -1144,17 +1191,7 @@ badport_bandlim(int which) "Limiting %s response from %jd to %d packets/sec\n", icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); - /* - * Adjust limit +/- to jitter the measurement to deny a - * side-channel port scan as in CVE-2020-25705 - */ - if (V_icmplim_jitter > 0) { - int32_t inc = - arc4random_uniform(V_icmplim_jitter * 2 +1) - - V_icmplim_jitter; - - V_icmplim_curr_jitter = inc; - } + icmplim_new_jitter(); } if (pps == -1) return (-1); From nobody Wed Feb 12 10:28:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtDzh4P46z5mXsG; Wed, 12 Feb 2025 10:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtDzh3mZ9z3Zrj; Wed, 12 Feb 2025 10:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739356096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xieCK7mZ3ET/edwoCW0j4rmte8cqsRXae4VHPNDdOTM=; b=t3NJGFUZAHjADFmj9XQ5/X2tzisGUZcOyHxNpa7tsQaiSFoN1ZT6HF22kbTa3EBPtHbRzQ UQk41ZeZIUCSeMY0c1MQ597HURWkGwUGY+gpumQ+pxVREkOtgGcaLzlXAm6Jxccr/eNf7d ImhRRG+p9CYGicgcP68uovIjw3NfFFm3KZLszyJNCguOpEijG+ckEAvN2BBjGShHbasyMO h7d1jvMakbDFnnF4Xv0/EybnSgtljpPUT+c9eNE4lD+UMEXjxAuoijahLUUpqwgRSWgYYy Uu1DnHbevqQoV14u2vg2Oq+2GgemmIqHWnD5VTFHLAP71ShZdTO3z9Tkv63ebQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739356096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xieCK7mZ3ET/edwoCW0j4rmte8cqsRXae4VHPNDdOTM=; b=PfRUQHQT8AtNuIg6j5JUwHfoPXK9cwhiO+3F8IUA1tmKXAnEl0DXkudXXOrfwzX8hRsc15 PD8faNAdZAzPxTf+cMs/DSRKHpR7HVYC0y+eLs2g7J1/Iq0KEEgiuVua9a+013+PB9GTZJ nyGCjtktMUHC02yZvJYMOC6TXTgz9h6NfSSv9N0MWnI+gvdbpo6CBM6hhbZDo3hBueAUNi ShG3hvIDZfAUZwh0z4+FDRv99Hk22jWtWI9O0Z/6G83DXZyGzKmw439PLm9wh4ec8fOloB n8n5qXdzv8xHEavr66Y4LW29r8qvSCplkuZ6TPqpNXoX1dFF39hWpmcx9rNrTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739356096; a=rsa-sha256; cv=none; b=SwZ9upzymNj58MZTP/szDLZftuAbWPPS84riGFaOiGehbP7Mt8idaCrBmPcjyRZy392Meo dnVibpLVB5WjLAQD01/hQf+hqEoswa3eibMX1J5F/5ygZwEJH4zj43pjOuwn23LYUhXBvM Y8IDCJ2J3Gp9nTWdoZD3R/HCJAW0yvUNebGGJ6Tx+1IlEDq7bSkNp7lJ9+KDBUtbu7fUEj a8Ms9OtEZaeOB7rRuXfsQ/HmqQkW3omVE8+jZx4SsOvyL50HxZFuU7MiDtrneM+eQHyXPP FQj7/EAWlh78ise+Wmna2Fzf6xb+PMwhWIptrZ1IJTsqdmH/mRa6YD6fdAFUcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtDzh3Ht8zvxg; Wed, 12 Feb 2025 10:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CASG8V031149; Wed, 12 Feb 2025 10:28:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CASGPT031146; Wed, 12 Feb 2025 10:28:16 GMT (envelope-from git) Date: Wed, 12 Feb 2025 10:28:16 GMT Message-Id: <202502121028.51CASGPT031146@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: dc167e64dce3 - stable/13 - icmp6: make icmp6_ratelimit() responsible to update the stats counter List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: dc167e64dce3ffc212e4f7a2268587abcc22c036 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dc167e64dce3ffc212e4f7a2268587abcc22c036 commit dc167e64dce3ffc212e4f7a2268587abcc22c036 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 10:27:12 +0000 icmp6: make icmp6_ratelimit() responsible to update the stats counter Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44479 (cherry picked from commit c6c96aaba8dd74eb39469ed156ff19cc31d599b7) --- sys/netinet6/icmp6.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index d49c3856be1a..258f4bed794e 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -346,10 +346,8 @@ icmp6_error(struct mbuf *m, int type, int code, int param) } /* Finally, do rate limitation check. */ - if (icmp6_ratelimit(&oip6->ip6_src, type, code)) { - ICMP6STAT_INC(icp6s_toofreq); + if (icmp6_ratelimit(&oip6->ip6_src, type, code)) goto freeit; - } /* * OK, ICMP6 can be generated. @@ -2799,6 +2797,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, V_icmp6errppslim)) { /* The packet is subject to rate limit */ ret++; + ICMP6STAT_INC(icp6s_toofreq); } return ret; From nobody Wed Feb 12 10:29:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtF0r3VVTz5mXdw; Wed, 12 Feb 2025 10:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtF0r2T3hz3bDb; Wed, 12 Feb 2025 10:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739356156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChI5iIiL6afG7+xjsJuTqXOVNnC5mxkrDXMDVeC2uFk=; b=LEf9YsN6aIUXaZVWGC8+pfl3vZ3kt69Rvl2bxu23ELQ7da1f8YEHIYOlIcxXh6zJLGKqX+ PI2d2D7e0hDliBuNg6r0L98Q1yt3VvpopelvTSPe/zeAFMf1dt+ElEDVGJYJGK32mNYh7L jq/4Y+3fgHR+DaQCy1e8SAS0PJH23dtWCWhlGrcbf8hbsBKOg5gR0do1H/mZ0ULVRYhaxR Y3L4m9rGY7IFn+AxZZZED74iAW0DchujaA8JJo4d0/+Bc0bnQ3QwOVMTpLRJh9h7s2C8d3 jv8Lc/8oqeTS3by+04FQHVBEs+uGRdGUrxR0ql9hytOZLqaUeB1LBaTHu36bCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739356156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChI5iIiL6afG7+xjsJuTqXOVNnC5mxkrDXMDVeC2uFk=; b=p0YjU7BUQs0Wj5zfwqrvKf6U1tQju12op+70zzQg5PPo7GQgfwnCCFZN70/IphWhR3GyCE 1TzZajlgAGooiTYwpnyrCqIjHwyvy0nOFm+rzoHGiqFZ6qpnoHYXL6XzSdn5Dw5BMw8yWK XaGTDKofQZ1QrojBHPk1L3LqIsd3qbpbImbOdEUIy9///sUEQ1FGkKNcY1kdv/bUz1hSma 28ysqh00Ufq9jXxa3k1zVALWSuzfZYrxb+MSAxeDNQgJQV5ZTRoNxTBwnmrx7QkxoiY46B scHexGbdNsRjzFdxUexobxlm53n/OPBs0pmQQl0Bjtk5aonBKgtcke+69Aqw5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739356156; a=rsa-sha256; cv=none; b=H3mLiMFUWiv6haMPJTE822lw5wB3qhbiwfAQETsspTFEhA2iZQJki7un8GhELZ8yAfsZd6 K9gCsOCvvD+PW4fMNJWTiZwEmDdkqk6t+2RJowLe3+94GMhWLSRBOP5u5BWY1XUX+v8dvG bs3GporvhOWAzNCsPiUnYQ9f6gfR/FsxFaPCeKEWe5PkJ0VBA/qUvtLrOeKwjP0uvDc/O2 qwa4iqqrY43QAV7G//CL+N5O6+fU0rAo+R3Cu/rUw9UKUomzWCE5cqlOBSM3cZgaSFL9Dd AXkzfHqUJCV5Kooh/CdpRMBvTgJ8/Q6DGZGjwLuhz9zDsiEFIYbYvOYIC2QC9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtF0r219KzvyB; Wed, 12 Feb 2025 10:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CATG6t031554; Wed, 12 Feb 2025 10:29:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CATGhq031551; Wed, 12 Feb 2025 10:29:16 GMT (envelope-from git) Date: Wed, 12 Feb 2025 10:29:16 GMT Message-Id: <202502121029.51CATGhq031551@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: 90ecc3fc679d - stable/13 - icmp6: rate limit our echo replies List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: 90ecc3fc679d1df50772327d80e0d28f59e584af Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=90ecc3fc679d1df50772327d80e0d28f59e584af commit 90ecc3fc679d1df50772327d80e0d28f59e584af Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 10:28:44 +0000 icmp6: rate limit our echo replies The generation of ICMP6_ECHO_REPLY bypasses icmp6_error(), thus rate limit was not applied. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44480 (cherry picked from commit 32aeee8ce7e72738fff236ccd5629d55035458f8) --- sys/netinet6/icmp6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 258f4bed794e..09cb893b57fe 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -536,6 +536,8 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) icmp6_ifstat_inc(ifp, ifs6_in_echo); if (code != 0) goto badcode; + if (icmp6_ratelimit(&ip6->ip6_src, ICMP6_ECHO_REPLY, 0)) + break; if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) { /* Give up remote */ break; From nobody Wed Feb 12 14:02:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtKlC41lkz5mqVX; Wed, 12 Feb 2025 14:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtKlC3NhFz3v2y; Wed, 12 Feb 2025 14:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739368967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d1pr2SwlRz1nUQ68dXLYIjw8D0HyJDS7YG7YlmZVyx8=; b=wEkreFYMujh6GPAmnteN9XJPqLNDrlhYyC2sQW+zw3atCFuOTAoE0Q7w66MD0EfmMgfp4/ JFEUPIsxRL9diF8wxuPuE0FqZfY3w9INpCPjABLW8+5KQzX23qFDRtpiaDKI4ZWxYlov/B ohZs5TQ6xAh5pBYWolkwAovfGAyhT6/CvXCM8QJ8MhvcmHJzNcb0o/Wit/sjzXM4i5rhvJ tae6Uy+zN4lCWNlD5caM1zbqO4vBe2SNjjZyOr8U9/FpdRaBZW+fWejUtOsgs1vmzTEUTC SOpeFM835/RFvpHSTMd/BpxlC3MxO0P3x8reoNaRZxdEFUBIuKFU44oR8C41vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739368967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d1pr2SwlRz1nUQ68dXLYIjw8D0HyJDS7YG7YlmZVyx8=; b=x4eUAsV5uvs8XEKdmRxxftgH5ZBOTu+GYCmEWJc12n3hFzaBwsXtlxDugfKv8Aw+SRwSXI QZ2yEnWHESWeA/KRXFSs12W9AzViFvYmQXCUhJsuTg0IMi9Eh3xzyyECSelJpHQDV3pK+D Trd4BljZPQvh2gGrfD8sAwOvZQjZGHmtB1hPRsIb1eSZ3REFO+3YJfeT3zk3Tqb2ySaVSY qkJROKF9T1+GADKyyA2ztyng6RCwpY+bKl7jiXthZGEb76VFf6WTqLIxBfoRihJNWNlKsa yyxUulDSefI5A/cZEV1EkGjHrR6SvmuDu3eU+vJvxOZF0VtuJ1/8R3tb8/7y4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739368967; a=rsa-sha256; cv=none; b=ipcG7eHwBMbB14JQ/6TQHRKYDC1urzF6vCXNKQnDmLWwPyp+awsNY3YX9qDCIdRuyekmwA /Q5S9B2RD9xaWCOaGX06tV79ujyD9zGdIb4z5eLej+6qmcaOuqPcMHPdSxXg/odVBbEm4A 0rU2hN+5/+gA1CN2IWmQHoPWzSVb5E5JaRjRLFKwe4AtyFz95xunohLlD/kFZRDXHnnsIf G606rHbyGFHnk3GHER4wwzx35kmtfGDUcBgC9cbV8pzxD3G67fGqVbnmP43CGcHW3ieJaE MRzJRda2BRA74p2UclKO6Y/f02tN38+93jm2ykmwWJc8GVn33qNK9WpUTmijLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtKlC2w2Hz11s5; Wed, 12 Feb 2025 14:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CE2lZI041493; Wed, 12 Feb 2025 14:02:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE2l6P041488; Wed, 12 Feb 2025 14:02:47 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:02:47 GMT Message-Id: <202502121402.51CE2l6P041488@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: 1cc0ac5ef37e - stable/13 - icmp6: bring rate limiting on a par with IPv4 List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: 1cc0ac5ef37e134c26d93d4544633b458e46aa78 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc0ac5ef37e134c26d93d4544633b458e46aa78 commit 1cc0ac5ef37e134c26d93d4544633b458e46aa78 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:02:01 +0000 icmp6: bring rate limiting on a par with IPv4 Use counter_ratecheck() instead of racy and slow ppsratecheck. Use a separate counter for every currently known type of ICMPv6. Provide logging of ratelimit events. Provide jitter to counter open UDP port detection. With minor tweaks from tuexen@ to fix merge problems. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44482 (cherry picked from commit a03aff88a14448c3084a0384082ec996d7213897) --- sys/netinet6/icmp6.c | 181 ++++++++++++++++++++++++++++++++++++++++++----- sys/netinet6/in6_proto.c | 4 -- 2 files changed, 164 insertions(+), 21 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 09cb893b57fe..e1b0196fc62b 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -123,16 +123,10 @@ VNET_PCPUSTAT_SYSUNINIT(icmp6stat); VNET_DECLARE(struct inpcbinfo, ripcbinfo); VNET_DECLARE(struct inpcbhead, ripcb); -VNET_DECLARE(int, icmp6errppslim); -VNET_DEFINE_STATIC(int, icmp6errpps_count) = 0; -VNET_DEFINE_STATIC(struct timeval, icmp6errppslim_last); VNET_DECLARE(int, icmp6_nodeinfo); #define V_ripcbinfo VNET(ripcbinfo) #define V_ripcb VNET(ripcb) -#define V_icmp6errppslim VNET(icmp6errppslim) -#define V_icmp6errpps_count VNET(icmp6errpps_count) -#define V_icmp6errppslim_last VNET(icmp6errppslim_last) #define V_icmp6_nodeinfo VNET(icmp6_nodeinfo) static void icmp6_errcount(int, int); @@ -2774,6 +2768,128 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +SYSCTL_DECL(_net_inet6_icmp6); + +static int sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmp6errppslim) = 100; +#define V_icmp6errppslim VNET(icmp6errppslim) +SYSCTL_PROC(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, + CTLTYPE_UINT | CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Maximum number of ICMPv6 error/reply messages per second"); + +VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter) = 0; +#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) + +VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; +#define V_icmp6lim_jitter VNET(icmp6lim_jitter) +SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Random errppslimit jitter adjustment limit"); + +VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; +#define V_icmp6lim_output VNET(icmp6lim_output) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, + "Enable logging of ICMPv6 response rate limiting"); + +typedef enum { + RATELIM_PARAM_PROB = 0, + RATELIM_TOO_BIG, + RATELIM_UNREACH, + RATELIM_TEXCEED, + RATELIM_REDIR, + RATELIM_REPLY, + RATELIM_OTHER, + RATELIM_MAX +} ratelim_which; + +static const char *icmp6_rate_descrs[RATELIM_MAX] = { + [RATELIM_PARAM_PROB] = "bad IPv6 header", + [RATELIM_TOO_BIG] = "packet too big", + [RATELIM_UNREACH] = "destination unreachable", + [RATELIM_TEXCEED] = "time exceeded", + [RATELIM_REPLY] = "echo reply", + [RATELIM_REDIR] = "neighbor discovery redirect", + [RATELIM_OTHER] = "(other)", +}; + +static void +icmp6lim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmp6lim_jitter > 0) + V_icmp6lim_curr_jitter = + arc4random_uniform(V_icmp6lim_jitter * 2 + 1) - + V_icmp6lim_jitter; +} + +static int +sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmp6errppslim) || + oidp->oid_arg1 == &VNET_NAME(icmp6lim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmp6errppslim)); + new = lim ? V_icmp6errppslim : V_icmp6lim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmp6lim_jitter) + error = EINVAL; + else + V_icmp6errppslim = new; + } else { + if (new >= V_icmp6errppslim) + error = EINVAL; + else { + V_icmp6lim_jitter = new; + icmp6lim_new_jitter(); + } + } + } + MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter > 0); + + return (error); +} + + +VNET_DEFINE_STATIC(struct counter_rate, icmp6_rates[RATELIM_MAX]); +#define V_icmp6_rates VNET(icmp6_rates) + +static void +icmp6_ratelimit_init(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) { + V_icmp6_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp6_rates[i].cr_ticks = ticks; + } + icmp6lim_new_jitter(); +} +VNET_SYSINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, + icmp6_ratelimit_init, NULL); + +#ifdef VIMAGE +static void +icmp6_ratelimit_uninit(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) + counter_u64_free(V_icmp6_rates[i].cr_rate); +} +VNET_SYSUNINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, + icmp6_ratelimit_uninit, NULL); +#endif + /* * Perform rate limit check. * Returns 0 if it is okay to send the icmp6 packet. @@ -2783,24 +2899,55 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) * XXX per-destination/type check necessary? * * dst - not used at this moment - * type - not used at this moment * code - not used at this moment */ static int -icmp6_ratelimit(const struct in6_addr *dst, const int type, - const int code) +icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code) { - int ret; + ratelim_which which; + int64_t pps; - ret = 0; /* okay to send */ + if (V_icmp6errppslim == 0) + return (0); - /* PPS limit */ - if (!ppsratecheck(&V_icmp6errppslim_last, &V_icmp6errpps_count, - V_icmp6errppslim)) { - /* The packet is subject to rate limit */ - ret++; + switch (type) { + case ICMP6_PARAM_PROB: + which = RATELIM_PARAM_PROB; + break; + case ICMP6_PACKET_TOO_BIG: + which = RATELIM_TOO_BIG; + break; + case ICMP6_DST_UNREACH: + which = RATELIM_UNREACH; + break; + case ICMP6_TIME_EXCEEDED: + which = RATELIM_TEXCEED; + break; + case ND_REDIRECT: + which = RATELIM_REDIR; + break; + case ICMP6_ECHO_REPLY: + which = RATELIM_REPLY; + break; + default: + which = RATELIM_OTHER; + break; + }; + + pps = counter_ratecheck(&V_icmp6_rates[which], V_icmp6errppslim + + V_icmp6lim_curr_jitter); + if (pps > 0) { + if (V_icmp6lim_output) + log(LOG_NOTICE, "Limiting ICMPv6 %s output from %jd " + "to %d packets/sec\n", icmp6_rate_descrs[which], + (intmax_t )pps, V_icmp6errppslim + + V_icmp6lim_curr_jitter); + icmp6lim_new_jitter(); + } + if (pps == -1) { ICMP6STAT_INC(icp6s_toofreq); + return (-1); } - return ret; + return (0); } diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index cfa368e7f7b0..0416d938995f 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -409,7 +409,6 @@ VNET_DEFINE(int, pmtu_probe) = 60*2; /* ICMPV6 parameters */ VNET_DEFINE(int, icmp6_rediraccept) = 1;/* accept and process redirects */ VNET_DEFINE(int, icmp6_redirtimeout) = 10 * 60; /* 10 minutes */ -VNET_DEFINE(int, icmp6errppslim) = 100; /* 100pps */ /* control how to respond to NI queries */ VNET_DEFINE(int, icmp6_nodeinfo) = 0; VNET_DEFINE(int, icmp6_nodeinfo_oldmcprefix) = 1; @@ -592,9 +591,6 @@ SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO_OLDMCPREFIX, &VNET_NAME(icmp6_nodeinfo_oldmcprefix), 0, "Join old IPv6 NI group address in draft-ietf-ipngwg-icmp-name-lookup " "for compatibility with KAME implementation"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, - "Maximum number of ICMPv6 error messages per second"); SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MAXNUDHINT, nd6_maxnudhint, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_maxnudhint), 0, ""); /* XXX unused */ From nobody Wed Feb 12 14:04:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtKnL71Qdz5mr05; Wed, 12 Feb 2025 14:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtKnL6JGsz3wMC; Wed, 12 Feb 2025 14:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoBZMP4N/2zX8l/q0YS7FDe3vTor5sE6xkARFrhssOw=; b=VPerrOkcybfEVP8/m9cM/xZM7qXJ6ynoECc+LBCap6rUrJ564H1l4iw4qp5TQg5oA/C7Qq V3LwkFt0KE1HLMXQ4uSmHq8Y0F/ceCwhDzxeb5mFqRtmnx2neTU44zt1K2tAkETOEUzDDn AemZbJzH7836leSFluWNU8LpLDJw/Hfv3A8zenk00wW7oVlI7WYF2U9nY+uVOji27RvYBG 5v1JXv2TCo0Fp2ezdQ8X9Xf/kBRnR6tBAhs4bFooplQgDXucBQsU7FP2TyaIkStduMfouX rQqf/6E5fTmlk7a0JzSZOghm3K9/zAp3kKgqBBoTAeddJrLMwa4fuSwEA7YiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoBZMP4N/2zX8l/q0YS7FDe3vTor5sE6xkARFrhssOw=; b=Rtosax2hiKc3KWBaMPqcUlJpf/QzhDYoZ4ubdcTKg6WKx1a9Miu/FtbEEOMNr1gz0HTIgO 7gEkqa18VFxtuzXZkQvpr5/KrF4OrrGQCOrfjPOXJOuFG7dnx8CZxg3LXM5jZKhKDiWuhE KC9sSGlwPiVs/XxLWtK7ABKPFM9vVssfqBqiwAq2PQQBcbycNYkdocnJPtEWoPfG52NtnQ Hhalg8OsUgftMK+YgS2EEWTVW9cFV2IkKz5wpHeSfnpzS0FVO1+E8O4mBWzgTxLASxVere Z88HGmCsuRoTfBUavZ8Mpf3yppLNvcoGkz4xuScYmp6yNnGK1RmRc+sbzhFI9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739369078; a=rsa-sha256; cv=none; b=VdqN50NPT2IfkfHdnosEdyYHi59qImJJvIuOYtyMy2HsTozvnCpya/mR/Nz3XvWFXBgKlV yNRAZollGfRO3VmZY8OG8Kj+UHTwJEMVevuROKRtLhyB9jyJQcpqPsR8VngsaSdlBZCMU4 OMXRHvanmvzerwD0XxNa7n4pCDc3nwPgyTVCmDiBOrgRyOGDJYFrI2qXsl2mUeFeQ63yXb SX5PWP4XCqZhP3IiZ+N/ygjVAvVtgNwaHyNQMe2HjcR4NFxEOTgz1iNRUCHbEGPXtyKRU9 /eBZBwqKSZBhoB0JiJBp4zZXiH93+Xq9Eqfwartc5/GG22v9VPSPn9er4SPyXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtKnL5dq9z11s7; Wed, 12 Feb 2025 14:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CE4cLU042157; Wed, 12 Feb 2025 14:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE4cf7042154; Wed, 12 Feb 2025 14:04:38 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:04:38 GMT Message-Id: <202502121404.51CE4cf7042154@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: 0b29ef1e3fd5 - stable/13 - icmp: allow zero value for ICMP limits List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: 0b29ef1e3fd57940704dd40a834f98649adbe46e Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0b29ef1e3fd57940704dd40a834f98649adbe46e commit 0b29ef1e3fd57940704dd40a834f98649adbe46e Author: Gleb Smirnoff AuthorDate: 2024-03-25 02:52:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:03:22 +0000 icmp: allow zero value for ICMP limits Zero means limit is disabled, so the value doesn't need to be checked against jitter value. Fixes: ac44739fd834f51cacb26485a4140fd482e20150 Fixes: a03aff88a14448c3084a0384082ec996d7213897 (cherry picked from commit 4399e055ea610cdefa1470ad1ee614dd81ba5e56) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 0d671033b67c..8ad6191f3097 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1129,7 +1129,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmplim_jitter) + if (new != 0 && new <= V_icmplim_jitter) error = EINVAL; else V_icmplim = new; diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index e1b0196fc62b..646c73e8abf0 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2843,7 +2843,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmp6lim_jitter) + if (new != 0 && new <= V_icmp6lim_jitter) error = EINVAL; else V_icmp6errppslim = new; From nobody Wed Feb 12 14:05:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtKpS4pD2z5mqr1; Wed, 12 Feb 2025 14:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtKpS40hgz3wJ7; Wed, 12 Feb 2025 14:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZhLmNPOaRUV98hy4pIDAxi5uV3jptQdnTfNbRybPWU=; b=a+aQUZATGedPrEETGSPZbYIFF37lA30lMgWfqvMFFIzbY8XG+gKDasOWPsWXW+/OmrK8Sn 1XN1zTfcso0astBFFDzwb6K+UZ5d5haoEg1nTeSiJvrbobrtWoN0RK6HFmCDypH64kTqiC bo6UYp0jbGNfpeIr88nLIG3AaaWxcdigM2/31ADtgUBljTreCZNLnADLUT2TCt3Zg8QRoG IjpXUekCVRWNLce/sx2qENXPJVzzDRpeivPEFbkJ4qtluApjYFx5Nmb+DjNsXagS4S+0+A o+ik1yO1Gg+oYUIGGh5fdzX3Dedkf2FxobbayHS+g5M9fKzvtXruAL74ppvSjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZhLmNPOaRUV98hy4pIDAxi5uV3jptQdnTfNbRybPWU=; b=p58GWKx7iMlZlXfooTprFEjFEZhWTY5eOAHQI8BJCPDZWhXBhiYnEmU7JVnQMgGDB/TLfC RrohP32ktkPrtTnkTwKmIHiClQR/dvI02TdI9WgCZuyieDXJCmEUyw0uLgJwbDNtDaue0z UngX5dLNKQUOVlIyGbhDFZQrseFXE1Sq1u9506oPzFpCQAsh/HloXox9TO4AhwXQOSsiBC XDdjs0qYypObTBg2N/X6lXU6ORK3ljk+baTx4A+rsNosvN4K0uezSArjKxfaIYD3WJtp2n uJ/EERSXtFrzDZtv/dC+MH6XCxENgRwAt9JUb+YwWf2S7Iv3Y2AkEeRyfQRSgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739369136; a=rsa-sha256; cv=none; b=cz3iCU9oVhXPveQbuyfDVoM6cpDv9pJF2C+EZkvW0WQ6hRdmydBu8HLA1rGG0pDgmiZ9wM aGMINbid7VCqUKIVC23zLvh9bY7e/iVdu/3RnR3qqiMpJ0FZY7tG29fvfbLDP60TPFrK8n XC46BeV0VS3NqYllg1l43foCIhi7qoO4mRK4kqC0v0wHfmdjIsjhJcZdekj+deq+nBSB/y AWA/Hc6hfWSFLH+MgtG6TnDg1/ZKzghhR2Hzv37/v5FjrO3Z5eCqFYfD+erZbRHMXTEyfI /l5Lxm8VqNWBJUeQSMfTBWuqeLgfZUQ6wO78bNCs0Y/fcEv6SyfSOcLDtOwLAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtKpS3Kz4z129g; Wed, 12 Feb 2025 14:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CE5aD2042566; Wed, 12 Feb 2025 14:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE5ag2042563; Wed, 12 Feb 2025 14:05:36 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:05:36 GMT Message-Id: <202502121405.51CE5ag2042563@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: 1b4561cf4b46 - stable/13 - icmp: correct the assertion that checks limit + jitter List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: 1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 commit 1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 Author: Gleb Smirnoff AuthorDate: 2024-04-08 23:54:19 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:05:14 +0000 icmp: correct the assertion that checks limit + jitter Fixes: 4399e055ea610cdefa1470ad1ee614dd81ba5e56 (cherry picked from commit f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 8ad6191f3097..67adc1245b60 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1142,7 +1142,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter > 0); + MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 646c73e8abf0..a26348640cbc 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2856,7 +2856,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter > 0); + MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); return (error); } From nobody Wed Feb 12 14:06:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtKqy4xmCz5mqny; Wed, 12 Feb 2025 14:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtKqy48dyz3wjV; Wed, 12 Feb 2025 14:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYPlGQSE4rRQ5yuliroi6CDhD1wDJcKwEIizx66aEc8=; b=SqKBG6scexxn31vtAGvzzpST18hOsHKgXRgSu4Zj8dYQm3GjFa81GxB0PmH7b7Bi9KW3Be 6voWh0qnbmCYiOqfmV6GZSmMYyZgF0eDoHP7ojMoRvK1gvOL162yf2BYlkfOMUgTZJRUYq Re54mWPA/3NjQFVcxCwtblk+RO4gwqzsm2ZX+hclDbx17gIW4aqNxWLj9NlsO8jzZEaOrP 1OB+xlePrD9jHa5zy1bFZLeQoE/VySkUQEuKbfbkpFeahA0+pAYxsV8kdeg9AfVWIxRg1V b1CaEXnvJ3cVf32JHagOLatoaixV83MUNLmg2ZICAYYlIL/HexGc74H/vdAX1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYPlGQSE4rRQ5yuliroi6CDhD1wDJcKwEIizx66aEc8=; b=tBXvXkSy5K7Ynybrr87qiU98NRVfvbenxsXe0I1/xUcrxN8WS2zuLzjl5n0+2PSpCoEcg3 e4OomQ+PlRYewMGABAyTvh/WI5td9HARZC+VJLJx0r6hK5MsmJRaG2ZcqSsT6Xa4zJpNsT Wku8oUxb+xhNq0nTJacHxb3UXc87Q7rsZ4fVkDKU5wGnCjkpczbud771QBTFCHLTjFSLOK aPkQAZ9NmsyKms2G+1d1csFSIc/6me9VP6JSg3+rQVgWnrPTDbHhae6Gcvb3m30tXJF3LO oKhcCP2YW6NYielR0vZvgRp5tVqPj2VFawnNQpVSXF0PPezLG/wVmMeXpmEnCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739369214; a=rsa-sha256; cv=none; b=O61i4UX/j04rb/397lnQDAnwjh8rFlWNfER4ARw7Y42LnEfUfsVx/gShbq2XW/755uIrGq YpJni3XmVqzEz6z64XOX3V/P8dBWiU+U2WE7iBaMvD/Yz3Q/Mskpk0uMi/diW7Pcc0Nba9 9rmzk4z+pV0jW/IekfPEjJkG3l0xV8TeSEiQNZi+M4hHfl3OmvAd63rHt5nz57/kWrkAai XJ7Q9tN2rdZ5FIIaGE3cFQNCgJdCIC9fXa9D+DnAVMUzhc83ZcXmAwobnUhhbZADMgpwfv 6WXE1/y39asy2sdKzKe93ZflT/V2EkcrPj0jGJhvWvMpbOJq3459q21GWw/rug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtKqy3bxKz129h; Wed, 12 Feb 2025 14:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CE6s58043053; Wed, 12 Feb 2025 14:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE6ssA043050; Wed, 12 Feb 2025 14:06:54 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:06:54 GMT Message-Id: <202502121406.51CE6ssA043050@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: bd6a89a6c32a - stable/13 - icmp: improve INVARIANTS check List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 commit bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 Author: Michael Tuexen AuthorDate: 2024-12-12 14:40:49 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:06:14 +0000 icmp: improve INVARIANTS check Actually check the conditions that are enforced by the error checking code instead of a condition which is * checking a number to be non-negative instead of positive * depending on a random number Perform the checks consistently for ICMPv4 and ICMPv6. Reviewed by: glebius, rrs, cc MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48001 (cherry picked from commit c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 67adc1245b60..f4b697f30eee 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1142,7 +1142,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); + MPASS(V_icmplim == 0 || V_icmplim > V_icmplim_jitter); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index a26348640cbc..52430f9146ae 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2856,7 +2856,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); + MPASS(V_icmp6errppslim == 0 || V_icmp6errppslim > V_icmp6lim_jitter); return (error); } From nobody Wed Feb 12 14:07:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtKrv2NPkz5mr7T; Wed, 12 Feb 2025 14:07:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtKrv1d2zz3wf2; Wed, 12 Feb 2025 14:07:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJINoFWBaMPkb2vm8aymBUYPAEDUKNzrhI9+1mXW6Nc=; b=KsTT8+IfmLboQMNciEX5EsEQ1K2fzgEQI1g1EJsq3PSNq+H989h79kW59gptaDytlvG2KF Eae92mXzgZzZRkKMGIdgc7jGz9/lk2fHXJzzVT4XQGPU6nnuPwieQL+v1V8wIzA8GUrOyD OUFofgrQ2unFoV1mAX3VzZvppMTxHy2KJng4pGvdxelXwO6Wo4XeqcK4S5UoiUM7SK+HdJ apvu86crNO4PGgTY0Ilpa42Y8xmeeve7loaMsP0aaImDjA9edAU9XkO5vTTtoaiRjwz2Ev EW4JQbNMZZzdmJxmKp8YvCnYOqH3B66prqklLKcNCMtxpyzXtyVbOuDD1C++Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJINoFWBaMPkb2vm8aymBUYPAEDUKNzrhI9+1mXW6Nc=; b=dRRbNs4rnGnu1AgeIeeroQYrv1IowD8x6Ef08eirj/cyU3+8I7AcAZFbdYmex8AtGaUeER YpSIBKrZ8wp99KvwtUts2wvHyX2GCXqJWTyP9Sy1jOvEM05mROOKIkjSU0W5npLgFyiX/o +8O6YPxzDQNjXUFtTuToeBKsON4U63m1iMgkjpR+PHKiFibJQjekeM1kMTIE4l+F48CROp LMOJA4t+2l2LPlraGeA9FzGkXnl+hPb7mqemuuGQd2ERAGnylcPpRHtmgZ8dxiZoXkKjJQ W8it55GgULfJAqEo3y3X5VFtQRFqWMDgo2vaATSk/qmg/zai5d/zyTT7UAEbdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739369263; a=rsa-sha256; cv=none; b=RMhntkSxVcacCNSM8UpSDPwaHTXRVVdf9BNSylg2TOTFaEkgBObmX7krUb81prKc7lg0TE YypTUQyv517ENSeff0XoOadgAv/TdKCRCeEVFOWVk4XXrwEPLWiMq9apnaJhOYU3jJ5QEH Qk4l3r1EFnPpIlBSU6T7LtlW1mjpN5zTABAmAoU8Wza+OV2fN8V1yKNe0HPz/MSAXd8bl5 09ghbBN/GQF3/0pHQN4GbBYmQHrU1USex3dB9LiN0sD2BZkQqt5H3wPgfBrEWPCEOJ7xnD T/P0FPXFEPuDwndJWssi/VhAO1vK3Nuy0ucQT9kMCop7DAy5pomITb38xptBzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtKrv1669z12Wp; Wed, 12 Feb 2025 14:07:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CE7hE2043397; Wed, 12 Feb 2025 14:07:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE7hv0043394; Wed, 12 Feb 2025 14:07:43 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:07:43 GMT Message-Id: <202502121407.51CE7hv0043394@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: e1dd07ede923 - stable/13 - icmp: use per rate limit randomized jitter List-Id: Commits to the stable branches 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/13 X-Git-Reftype: branch X-Git-Commit: e1dd07ede92382bdcc52b3093e8f2ec5d9c88467 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e1dd07ede92382bdcc52b3093e8f2ec5d9c88467 commit e1dd07ede92382bdcc52b3093e8f2ec5d9c88467 Author: Michael Tuexen AuthorDate: 2025-02-10 21:16:20 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:07:19 +0000 icmp: use per rate limit randomized jitter Using the same random jitter for multiple rate limits allows an attacker to use one rate limiter to figure out the current jitter and then use this knowledge to de-randomize the other rate limiters. This can be mitigated by using a separate randomized jitter for each rate limiter. This issue was reported as issue number 10 in Keyu Man et al.: SCAD: Towards a Universal and Automated Network Side-Channel Vulnerability Detection Reviewed by: rrs, Peter Lei, glebius MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48804 (cherry picked from commit 923c223f27e792e51ca13c476428adbbf6887551) --- sys/netinet/ip_icmp.c | 20 ++++++++++++-------- sys/netinet6/icmp6.c | 50 +++++++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index f4b697f30eee..417a86672d6f 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -89,7 +89,7 @@ SYSCTL_PROC(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLTYPE_UINT | &sysctl_icmplim_and_jitter, "IU", "Maximum number of ICMP responses per second"); -VNET_DEFINE_STATIC(int, icmplim_curr_jitter) = 0; +VNET_DEFINE_STATIC(int, icmplim_curr_jitter[BANDLIM_MAX]) = {0}; #define V_icmplim_curr_jitter VNET(icmplim_curr_jitter) VNET_DEFINE_STATIC(u_int, icmplim_jitter) = 16; #define V_icmplim_jitter VNET(icmplim_jitter) @@ -1102,14 +1102,16 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { }; static void -icmplim_new_jitter(void) +icmplim_new_jitter(int which) { /* * Adjust limit +/- to jitter the measurement to deny a side-channel * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 */ + KASSERT(which >= 0 && which < BANDLIM_MAX, + ("%s: which %d", __func__, which)); if (V_icmplim_jitter > 0) - V_icmplim_curr_jitter = + V_icmplim_curr_jitter[which] = arc4random_uniform(V_icmplim_jitter * 2 + 1) - V_icmplim_jitter; } @@ -1138,7 +1140,9 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) error = EINVAL; else { V_icmplim_jitter = new; - icmplim_new_jitter(); + for (int i = 0; i < BANDLIM_MAX; i++) { + icmplim_new_jitter(i); + } } } } @@ -1154,8 +1158,8 @@ icmp_bandlimit_init(void) for (int i = 0; i < BANDLIM_MAX; i++) { V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp_rates[i].cr_ticks = ticks; + icmplim_new_jitter(i); } - icmplim_new_jitter(); } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); @@ -1184,14 +1188,14 @@ badport_bandlim(int which) ("%s: which %d", __func__, which)); pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + - V_icmplim_curr_jitter); + V_icmplim_curr_jitter[which]); if (pps > 0) { if (V_icmplim_output) log(LOG_NOTICE, "Limiting %s response from %jd to %d packets/sec\n", icmp_rate_descrs[which], (intmax_t )pps, - V_icmplim + V_icmplim_curr_jitter); - icmplim_new_jitter(); + V_icmplim + V_icmplim_curr_jitter[which]); + icmplim_new_jitter(which); } if (pps == -1) return (-1); diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 52430f9146ae..dd0044734c4b 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2778,22 +2778,6 @@ SYSCTL_PROC(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, &sysctl_icmp6lim_and_jitter, "IU", "Maximum number of ICMPv6 error/reply messages per second"); -VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter) = 0; -#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) - -VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; -#define V_icmp6lim_jitter VNET(icmp6lim_jitter) -SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, - &sysctl_icmp6lim_and_jitter, "IU", - "Random errppslimit jitter adjustment limit"); - -VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; -#define V_icmp6lim_output VNET(icmp6lim_output) -SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, - "Enable logging of ICMPv6 response rate limiting"); - typedef enum { RATELIM_PARAM_PROB = 0, RATELIM_TOO_BIG, @@ -2815,15 +2799,33 @@ static const char *icmp6_rate_descrs[RATELIM_MAX] = { [RATELIM_OTHER] = "(other)", }; +VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter[RATELIM_MAX]) = {0}; +#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) + +VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; +#define V_icmp6lim_jitter VNET(icmp6lim_jitter) +SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Random errppslimit jitter adjustment limit"); + +VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; +#define V_icmp6lim_output VNET(icmp6lim_output) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, + "Enable logging of ICMPv6 response rate limiting"); + static void -icmp6lim_new_jitter(void) +icmp6lim_new_jitter(int which) { /* * Adjust limit +/- to jitter the measurement to deny a side-channel * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 */ + KASSERT(which >= 0 && which < RATELIM_MAX, + ("%s: which %d", __func__, which)); if (V_icmp6lim_jitter > 0) - V_icmp6lim_curr_jitter = + V_icmp6lim_curr_jitter[which] = arc4random_uniform(V_icmp6lim_jitter * 2 + 1) - V_icmp6lim_jitter; } @@ -2852,7 +2854,9 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) error = EINVAL; else { V_icmp6lim_jitter = new; - icmp6lim_new_jitter(); + for (int i = 0; i < RATELIM_MAX; i++) { + icmp6lim_new_jitter(i); + } } } } @@ -2872,8 +2876,8 @@ icmp6_ratelimit_init(void) for (int i = 0; i < RATELIM_MAX; i++) { V_icmp6_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp6_rates[i].cr_ticks = ticks; + icmp6lim_new_jitter(i); } - icmp6lim_new_jitter(); } VNET_SYSINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp6_ratelimit_init, NULL); @@ -2935,14 +2939,14 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code) }; pps = counter_ratecheck(&V_icmp6_rates[which], V_icmp6errppslim + - V_icmp6lim_curr_jitter); + V_icmp6lim_curr_jitter[which]); if (pps > 0) { if (V_icmp6lim_output) log(LOG_NOTICE, "Limiting ICMPv6 %s output from %jd " "to %d packets/sec\n", icmp6_rate_descrs[which], (intmax_t )pps, V_icmp6errppslim + - V_icmp6lim_curr_jitter); - icmp6lim_new_jitter(); + V_icmp6lim_curr_jitter[which]); + icmp6lim_new_jitter(which); } if (pps == -1) { ICMP6STAT_INC(icp6s_toofreq); From nobody Thu Feb 13 00:38:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ytbrn6TLwz5nZh8; Thu, 13 Feb 2025 00:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytbrn5dyjz40MY; Thu, 13 Feb 2025 00:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739407113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIWttyEgooBE2C1EwhZjPza+qhiL/FVhT7oo1h5kwfo=; b=aUiWqqoVgAc/zdgL68/rIah0DL0TiuFCxUKxUjQ6H/FyJsXeb5hJIAVKMBJrtlveEkNbrn xBFqfx2gGDj22q773+EVFPA9iw8xadoBZvXsRfES/GJwLJNGELHKahugwVfSjQVovqbzEo eYNPwMhWcics8VqYvp72LwOo1Tpxb+gVSHw/TMskHKh2dApd1/cDpi10aAz7Hs4kgoeRbx dKXRJIbFwLrFXmyMJs5NJvyPyNpK/PtBqgOWpCJtvnit0AfFUNN05jMyc6jWnidvuqsE6S +iaX9TGR5vICd2pC0+zJFWrxXgWV/FtL0iMnxAa3fldALMSwz6grTwtXvjM3JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739407113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIWttyEgooBE2C1EwhZjPza+qhiL/FVhT7oo1h5kwfo=; b=lmIu+U39ydQlTi9ur3NZMU7ayt5WQkRNi5uPCJkmjNVLaYzPevBwZhldadVR+uytVB9sNd KmcTqQ30IYUBeYlelT+6WGWbtxVlGmfsXvm4OZPtKGMo8byvFcXwDNfezI9jGrwLlWv7oW ak2M8DBJqgqauJHzp3pGkmpNuXrLj7HjhMqXrnVtRwOd/v0ScEfqjOCNeZ6jpP5AYgrcJL OUETq+Na5Q7lVWRREM39iasS8xrMpCe4iYUji5lfGIyIKCuKL3Pmjh8PyO+q1OorIbZHpm WUffWqXCuYVh+WzWRkFy1KrB0aIGh7wPGrHndT0EtFQ+Lro/A+BcvQpx4xo+qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739407113; a=rsa-sha256; cv=none; b=Jnd08uH20j9bVIkWINaBWoIAuFGZS3kblP5NRKyM5o4vsBaUBJO/3mCEKsqCYMOsHbNf2I +BEEyA9ud7w2sKNZzgX2Ph2v/Jpl+rwiLpMNKluf4bilRQBi/nVIn7YHkiTFS7LJbRFBP7 HJZ8JG5+yi24gW6VtDhz66rm+1OKj1baumjSDjBxBqeVslTBPKVxy1x49EQZbwZk2ldYaB 8azQWixzzUxzGdfzWrZctv/nPWp6pZBq3oNGVuMecJq6OdIfUmCLMwJxlR0/3pHeM8AuHM QulyrxjPwS16ZzHgZYlX4yPM8rxWXDws8lIuRkFhujbNE32BE6pVxLgU3+KqGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ytbrn4vdBz67S; Thu, 13 Feb 2025 00:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51D0cXtP022731; Thu, 13 Feb 2025 00:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51D0cX6D022728; Thu, 13 Feb 2025 00:38:33 GMT (envelope-from git) Date: Thu, 13 Feb 2025 00:38:33 GMT Message-Id: <202502130038.51D0cX6D022728@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: 250c3c549e2c - stable/14 - boottrace: Don't say we've unmounted if we haven't. List-Id: Commits to the stable branches 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: 250c3c549e2ce1dad83570deb22e81d966ad902f Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=250c3c549e2ce1dad83570deb22e81d966ad902f commit 250c3c549e2ce1dad83570deb22e81d966ad902f Author: Dag-Erling Smørgrav AuthorDate: 2025-01-20 16:44:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-02-13 00:37:34 +0000 boottrace: Don't say we've unmounted if we haven't. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D48515 (cherry picked from commit 4f4b2b7a4b6c5642320479a765f850c394766276) --- sys/kern/vfs_bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index c7c890dd83bd..4ae80e7e078d 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1512,8 +1512,8 @@ bufshutdown(int show_busybufs) if (!KERNEL_PANICKED()) { swapoff_all(); vfs_unmountall(); + BOOTTRACE("shutdown unmounted all filesystems"); } - BOOTTRACE("shutdown unmounted all filesystems"); } DELAY(100000); /* wait for console output to finish */ } From nobody Thu Feb 13 00:38:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ytbrp74LCz5nZG9; Thu, 13 Feb 2025 00:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytbrp5F01z40WF; Thu, 13 Feb 2025 00:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739407114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YypEKDkeZGuXMlVZy+ztdZ4lXwKJ0WvHwtYji/kQXsE=; b=VjuXPynXJMiVUZ/p9QK4oe2sszCMFCwpEy3UjHuhAkkoQNNLVlXixeiHRk58tGmyXzk1+G ehwaKxiQS19UNBnnIruGDoBm+JdLob3XAsqjfcVUkgoDRn5Nfn3SdOH6UzQ4mMbuXd4aNs G3e3RKgccgfdc1wLpNcPnqJVdXlhgnm+RDFw6up0zQbMLqm+B+Qprz/ak52UcMuJmLjEpW xruWV0lsob9rqMGdgIS3NwsFCKqr8pjoR+JCcf3qWyHujXcQRO19exHUrOHDgoxwq3BSLb Ns2qzrv8XTqJ5Gtk9veYFJXShbSO71s3Y2CGaVk8tdJgsupSeKXRBDVh9LcnzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739407114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YypEKDkeZGuXMlVZy+ztdZ4lXwKJ0WvHwtYji/kQXsE=; b=Mu5IbRinuaWh8q0jchDq91cz7lfB0ncwcZc05F/41tF7fz6EdlfkRE6Z1NGJ3WwnDcz2dk NIQqb6ED84V7/oGlRboe/wejvGAMba/0GOxH/R2V5UxUOlI/RFl5/8i37ABnETeYlALkL3 eOmyZaZolc4+AnI274W1cSuMqX9KjKBBkKg7xyc4MrE+B2oQ16k9Xl3Uo+LJAQnHDBaQww HTgVoms7NDE4OzxEdVkJaUxAProKTHKxfRwB8lmioGMSP6FYk4oa8Ww2WN9W7hoFWhEBK6 ug5LMrHbcsNehNMkDTZEiPyKZJhS31juUEvfTTNL5fimnNHTQQASy9ldJpDK6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739407114; a=rsa-sha256; cv=none; b=Zd4mtYJucReYZsE5staGw7jiOv/yS7mRVE/zoq/83DmoDWUz7kEiEGjRRLsOg7ocEn8aWo /AyLhYQTpfzqAW/Tw+ga8gLdUIBROLviLoapmGET58ck4WcISuYqi742fyFZIMHrmjy9V4 msmyrKRGXBTBYffpEpL3DCirPdbK9wSyuRGEgbYPb2K5wFHLLT7IFJPQBmbA5Yvq+Kb/kJ cx9cEl8I0/Gb+Zk+hD8XA12nSWBKsYCDNuVSGhKvkc9OZTD7PVWpW+tXyiYlb/Kjo+eapP FlLQ79sO4h/uOilKw7XAWG7jiz6KE3Xxm8AdtfGaKwMh7na9a9FG1bZxuGMn+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ytbrp4nd6z6T3; Thu, 13 Feb 2025 00:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51D0cY3x022770; Thu, 13 Feb 2025 00:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51D0cY9J022767; Thu, 13 Feb 2025 00:38:34 GMT (envelope-from git) Date: Thu, 13 Feb 2025 00:38:34 GMT Message-Id: <202502130038.51D0cY9J022767@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: 67cead936d0a - stable/14 - unifdef: Fix collision check when adding symbols. List-Id: Commits to the stable branches 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: 67cead936d0a38f76d1130fefbca3e119c8cffb8 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=67cead936d0a38f76d1130fefbca3e119c8cffb8 commit 67cead936d0a38f76d1130fefbca3e119c8cffb8 Author: Dag-Erling Smørgrav AuthorDate: 2025-01-30 21:10:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-02-13 00:37:42 +0000 unifdef: Fix collision check when adding symbols. findsym() is intended for use while parsing input, so it should not be called from addsym2() or indirectsym(), which are called before any input is processed. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D48733 (cherry picked from commit c63af363c2458aebc30c01cd0b93b4b902580019) --- contrib/unifdef/unifdef.c | 11 +++++------ usr.bin/unifdef/tests/unifdef_test.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index 3dd4ace7b81e..ce8a1367adc2 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -1488,7 +1488,7 @@ findsym(const char **strp) static void indirectsym(void) { - const char *cp; + struct macro key = { 0 }; int changed; struct macro *sym, *ind; @@ -1497,10 +1497,9 @@ indirectsym(void) RB_FOREACH(sym, MACROMAP, ¯o_tree) { if (sym->value == NULL) continue; - cp = sym->value; - ind = findsym(&cp); + key.name = sym->value; + ind = RB_FIND(MACROMAP, ¯o_tree, &key); if (ind == NULL || ind == sym || - *cp != '\0' || ind->value == NULL || ind->value == sym->value) continue; @@ -1539,10 +1538,10 @@ addsym1(bool ignorethis, bool definethis, char *symval) static void addsym2(bool ignorethis, const char *symname, const char *val) { - const char *cp = symname; + struct macro key = { .name = symname }; struct macro *sym, *r; - sym = findsym(&cp); + sym = RB_FIND(MACROMAP, ¯o_tree, &key); if (sym == NULL) { sym = calloc(1, sizeof(*sym)); sym->ignore = ignorethis; diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index dfb08c187724..97a1b1aa6310 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -37,7 +37,17 @@ EOF atf_check -s exit:1 -o inline:"b\n" unifdef -DFOO -DFOO=0 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: 931b0990297e - stable/13 - unifdef: Fix collision check when adding symbols. List-Id: Commits to the stable branches 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: 931b0990297e2c6307b41bda95c5225cdf48403c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=931b0990297e2c6307b41bda95c5225cdf48403c commit 931b0990297e2c6307b41bda95c5225cdf48403c Author: Dag-Erling Smørgrav AuthorDate: 2025-01-30 21:10:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-02-13 00:39:04 +0000 unifdef: Fix collision check when adding symbols. findsym() is intended for use while parsing input, so it should not be called from addsym2() or indirectsym(), which are called before any input is processed. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D48733 (cherry picked from commit c63af363c2458aebc30c01cd0b93b4b902580019) --- contrib/unifdef/unifdef.c | 11 +++++------ usr.bin/unifdef/tests/unifdef_test.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index 3dd4ace7b81e..ce8a1367adc2 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -1488,7 +1488,7 @@ findsym(const char **strp) static void indirectsym(void) { - const char *cp; + struct macro key = { 0 }; int changed; struct macro *sym, *ind; @@ -1497,10 +1497,9 @@ indirectsym(void) RB_FOREACH(sym, MACROMAP, ¯o_tree) { if (sym->value == NULL) continue; - cp = sym->value; - ind = findsym(&cp); + key.name = sym->value; + ind = RB_FIND(MACROMAP, ¯o_tree, &key); if (ind == NULL || ind == sym || - *cp != '\0' || ind->value == NULL || ind->value == sym->value) continue; @@ -1539,10 +1538,10 @@ addsym1(bool ignorethis, bool definethis, char *symval) static void addsym2(bool ignorethis, const char *symname, const char *val) { - const char *cp = symname; + struct macro key = { .name = symname }; struct macro *sym, *r; - sym = findsym(&cp); + sym = RB_FIND(MACROMAP, ¯o_tree, &key); if (sym == NULL) { sym = calloc(1, sizeof(*sym)); sym->ignore = ignorethis; diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index dfb08c187724..97a1b1aa6310 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -37,7 +37,17 @@ EOF atf_check -s exit:1 -o inline:"b\n" unifdef -DFOO -DFOO=0 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f564bcc766d5 - stable/14 - Remove obsolete clang18 files for aarch64 List-Id: Commits to the stable branches 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: f564bcc766d5c1ba71d781872883bc967a004ecf Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f564bcc766d5c1ba71d781872883bc967a004ecf commit f564bcc766d5c1ba71d781872883bc967a004ecf Author: Ronald Klop AuthorDate: 2025-02-10 18:41:26 +0000 Commit: Dimitry Andric CommitDate: 2025-02-13 08:23:49 +0000 Remove obsolete clang18 files for aarch64 This fixes a warning from "make delete-old" about a non-empty directory on aarch64. Reviewed by: dim Fixes: 0fca6ea1d4ee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48904 (cherry picked from commit 09b435d3dc2a591fba08be04d5659d03cce08285) --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 0d639bd572a9..e736235f80da 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -350,6 +350,7 @@ OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -368,6 +369,7 @@ OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Thu Feb 13 08:25:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtpCQ5PYxz5n9TC; Thu, 13 Feb 2025 08:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtpCQ4jZgz3gnk; Thu, 13 Feb 2025 08:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739435122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iE8d+tHZa1W7vbB0pyMICWQVgyDdF4Lb49R56bVvxgw=; b=FeljRZq/8YAdn9cGVZYn5cBb4equPAYJ4mH1jlAcoZf7pxz9lfLHCheM4fRlHqatOEhoj6 TohJwUQPgRkTo7SUm2nxpJMvai69gEv0W2klJiTYgPSdUOIUKO5ciVJhoLnhFdtUYWFywH Neu6mCHICVyBSbmFH1TRZ7bxbI9pnBGUUKxsy2fwhRpj4sRXXZRTX8rhhaEaWtbnYkwHgj mKF7DEIyYfSpgPgMRfAnpTr3cDm1oYFS83HVr4aMeZROLKSUm4merpya4c51CyJtyfTNUw v1BcQXa2SASf5KMTmLQ478MD5G3JD2wF9sJ206mWCE7vcs8eHyoMhQ0imsGJvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739435122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iE8d+tHZa1W7vbB0pyMICWQVgyDdF4Lb49R56bVvxgw=; b=PX3tfDubg32xf9/zn0ZLt9iM2MDtb5s5vdjgJgJUiWQHva2lPmft/hVPZK46JAPNv1vm9x 0Yfoaew1gDhtqlaRYmL12L+j8/DVgUhOP28xGmKgOyBTn4g0XB/ZkoB3hkeB7tzVnDvv4W txDaxAL+LE8ccn5yEnCKRD3K9JONe+hb+8xx3eTafA/0fSi/n9P64rrKgIa70qzGF7fxvW 5/Q+yiru85+9OAA5N9VzJPCgfLx9KK3/JZrUemkpZMWVv0BQuEEGaC+NqFLLlXPLjmnOH7 9dp3GK1RUCiX9FkmJO1GLQfhP9/GdUfM4ThugFbJ1ODPW6cY1r+qNaZ0aEPlGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739435122; a=rsa-sha256; cv=none; b=wDcTT1FWnIw3SCxviAVL/1PxxApxYzSK9d9oUw4wOEq0g9EOcUfp+qRoP8o735wd8SnkDb lhFl7jcVFY/c87m/1Y7LSaNWlS6zKP40QlMlj1TKqhUqcIB6fVvps7ZZHGdrygRAEhuj+s TaIuLSuIpLjkbMWy5J8kcgwTEHqd+XV0Q9E8rJ2DUUbXrmGiiw+L/F91LbbyfRGMNnI6gM kyB3ILG6fipmbFhzs715hlBzkXKqXt8tHG5DKKn+RwqaqmMms4wjgBgXAobpaIZHaFwgTD k3gYubT8TpEIgnwkf97Hkn3LOOlT2RuI0WGMFcOCaSuhVFhn/ocG/bYLPhWGMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtpCQ4JsxzdDs; Thu, 13 Feb 2025 08:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51D8PMNI005091; Thu, 13 Feb 2025 08:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51D8PMSR005088; Thu, 13 Feb 2025 08:25:22 GMT (envelope-from git) Date: Thu, 13 Feb 2025 08:25:22 GMT Message-Id: <202502130825.51D8PMSR005088@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: 9370c2c33125 - stable/13 - Remove obsolete clang18 files for aarch64 List-Id: Commits to the stable branches 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: 9370c2c331255beac5e451c7841e68b2302ebf91 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9370c2c331255beac5e451c7841e68b2302ebf91 commit 9370c2c331255beac5e451c7841e68b2302ebf91 Author: Ronald Klop AuthorDate: 2025-02-10 18:41:26 +0000 Commit: Dimitry Andric CommitDate: 2025-02-13 08:23:59 +0000 Remove obsolete clang18 files for aarch64 This fixes a warning from "make delete-old" about a non-empty directory on aarch64. Reviewed by: dim Fixes: 0fca6ea1d4ee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48904 (cherry picked from commit 09b435d3dc2a591fba08be04d5659d03cce08285) --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b9e5f30f1f35..d929086e47c7 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -350,6 +350,7 @@ OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -368,6 +369,7 @@ OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Thu Feb 13 08:45:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtpfD4GZdz5nBlM; Thu, 13 Feb 2025 08:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtpfD3hnXz3rWK; Thu, 13 Feb 2025 08:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739436308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=is6BRLu41f7H5gKgIbRMp3mFkGvRqp6xf3jGIPYjMxA=; b=WQYOb55oXTpSobI3YIKKymcYbfPQVjYbiuQJG+cda/b1A4cTeGoLUK/utvW1hi5scp3E9n JBbj1xO+62UgfJxWdZRrQLRxvDHbyHiSSPuH1n2AMGYnNaKmD18WyWk8oUUR62210A4vzG PxRrjH3VWtV8nkb/KV1BGw1khKPEbNNgSOdm5StlhRRydKfiUdBGwefe7YjbIz44A4RnhD juG0R+zfeKGBdIsL/0OququmOOju5IW8d+GXjKDp5h1a+fkhLmZtHt296wUx0jgcmp1ObD FoRCTWJwXBCBxahnWuWBDGmd2toqDAXu33o9AC+R9nJjHhkEFitu9wKWNw812Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739436308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=is6BRLu41f7H5gKgIbRMp3mFkGvRqp6xf3jGIPYjMxA=; b=tvuac8daT9YoaDRygm3CNSIMBrkTStMo9+BpK6YzSG/AEd51urHcQOzUhpy5labgRr6nIN tvEQ4H8TYHL2Eftc/yk0NrIWeBW+2whUNDbPP+HiTrS/c5X2lIJdQeXryaeBhNK00pXEkc DaoknJBhyWH6Jw1jHsXSZhEWX6ibgFXYgWue//T4FYkRXZAWFqz0hbYSSNaFG1d/wRr+Ue /GW6IThS8OpgzzMf5Owy1ly9Ujrwotfu6gZQcH08Z8rJLfvMjw0EzTCmg9ppifDMDnNBOX vreB9KfkLluTLVO53U8F6iuF8H2MqEBr44uCgupoe5Z9YXaH58G4lbBx6eVs8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739436308; a=rsa-sha256; cv=none; b=sCIjOIoqaCcXpgQVkrHF3N1sJ/LqN9NcUCNI5DC1LVQlwcmVGLQFdPhdhFNZz/xk4OvgRj YayIKQ389fpNr3oMsk6aXOCKsFosnu9eyINW5xFLJH9kJ1G2wAboqKDVSBISOpEJoAZvx5 /gIqoms/r9IREw3awKgJCiO52lJM8JxjWvy5wIBpM+1HiMlMKxC3huY8bE0OuAGDjhrEAK +KN77OI131Wad4WmoOv83yKaNVuaFbO3WcHK04ngWNOngEAQ060xU1m7LBbvFxCtAxWXrt UPj97bJ3zNKskR2d3GX2plYU3HQzYhH1SKNnZJva5d1Eu6FTVYVUJUQ1xKmXYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtpfD33hCzdcC; Thu, 13 Feb 2025 08:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51D8j8ZZ042533; Thu, 13 Feb 2025 08:45:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51D8j8mW042530; Thu, 13 Feb 2025 08:45:08 GMT (envelope-from git) Date: Thu, 13 Feb 2025 08:45:08 GMT Message-Id: <202502130845.51D8j8mW042530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 523548736f46 - stable/14 - if_ovpn: fix module load in NOINET6 kernels List-Id: Commits to the stable branches 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 523548736f46bfcb307846e12dc9a890fa02f327 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=523548736f46bfcb307846e12dc9a890fa02f327 commit 523548736f46bfcb307846e12dc9a890fa02f327 Author: Kristof Provost AuthorDate: 2025-01-30 11:06:19 +0000 Commit: Kristof Provost CommitDate: 2025-02-13 08:44:58 +0000 if_ovpn: fix module load in NOINET6 kernels PR: 284459 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index de7920981027..6309d1f365cf 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -593,6 +593,7 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) free(name, M_SONAME); name = NULL; +#ifdef INET6 if (peer->local.ss_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&TO_IN6(&peer->remote)->sin6_addr)) { /* V4 mapped address, so treat this as v4, not v6. */ @@ -600,7 +601,6 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) in6_sin6_2_sin_in_sock((struct sockaddr *)&peer->remote); } -#ifdef INET6 if (peer->local.ss_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&TO_IN6(&peer->local)->sin6_addr)) { NET_EPOCH_ENTER(et); From nobody Thu Feb 13 10:20:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ytrmh2Pb7z5nHtS; Thu, 13 Feb 2025 10:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytrmh1pYfz3YLK; Thu, 13 Feb 2025 10:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTa/Pn27m5dOoMYoFCHxdJIm+0pVFzOxi7XBjOuBQ1c=; b=FF7Duyl3S+3UXgvdkx/I1YTn/ooowdvpCY1p+NBPDSPw6aWfPQa5alnsVu5i+ptxRc2x5y nzrg9YpEDGo/IGlWePHibV0O1v64FzmVN+PyMewoPKTbjqsG9C1OUg0SRL10hWr3QJF1Eh rCxIowuP5QH+NCWp/JqincfgnCeLu9OLTWYFYqW2IYJVfWA0XzPs9ImBsV6yHY5unXaaDm wPtNbPyGF4YdmOWUBrxDbcZO17vGieqehOpMYNKDWaSo3noWiWQIhsZsN2W/U2PZtSE5sw SfkVKLV3nKDvMWNqeJs/Vn8EJSlWOIYO6IDIpf/bVsRox/HaOVyDuuBYRhrgAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTa/Pn27m5dOoMYoFCHxdJIm+0pVFzOxi7XBjOuBQ1c=; b=wbmIxC8nLU288nQZDfNSECMCk3fCmcAFwGmD1Hr0r/IWZAKM4v/YWrZIL5oUcsLNuYthb4 bS66BpX3Y5GLNcLzAgMuf81EK2ELq/OPeInhxB5Hbt7WSlMlLXQDR6qjUnPq+y1WJTqvxe h5Y6wu4GqbtuLEuFAl8QVXcHel6FgwrbYreeHxBtBg+4IqrmkLL1d2Z/x2qGJAkLS9rA0L krhlvo9e2VGSekZ+xUGfsXsc0pI9RmdIcgCU9QYuu+1p+CD4ANgydOLemXS54zGR4GBE5l tVj9e72Gbkbsn6Z/KhxBhzi3CYd6JoYQI+YXgQZo7Uf7cDLidQnJquqX8XJqbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739442052; a=rsa-sha256; cv=none; b=IK4LIaP9ICAujiNzCgwdtCxsJWoZvcKrkE3QaQ05iL5XK7yud6sHIa3nu0Of0xJlJGp2or +9XQKNoRf19KQBOvASGYM9FDbg8O+i9rwlI9bzAHasFsrf70vQevzyxgmjOK+FAxL35Njt m+ubb9OyydPBmxamlduCRFIU96T4Afjw3yYxyaVXCAAMEKqFZxsMdgQ7m7vVxEaw0FxTNo sAa63i14FuXzbqEcqtxMIJA2ZmGe4DkGourl3VTLvIVvT9+G3rCUdEewF4KDyWhhqQt6fz 8LwS2cEoZfP4t8XhaYLt4Qzg+04jm+PhXSVIOvBA8erjc9iK5zp1vzYzYc6h6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ytrmh1JXPzgxV; Thu, 13 Feb 2025 10:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DAKqOK025633; Thu, 13 Feb 2025 10:20:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DAKq9D025630; Thu, 13 Feb 2025 10:20:52 GMT (envelope-from git) Date: Thu, 13 Feb 2025 10:20:52 GMT Message-Id: <202502131020.51DAKq9D025630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 04f360b78220 - stable/14 - MAC: mac_biba, mac_lomac: Fix setting loader tunables List-Id: Commits to the stable branches 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 04f360b782205c799b9302ba8bd810f7a303017f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=04f360b782205c799b9302ba8bd810f7a303017f commit 04f360b782205c799b9302ba8bd810f7a303017f Author: Zhenlei Huang AuthorDate: 2025-02-09 15:53:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-13 10:19:56 +0000 MAC: mac_biba, mac_lomac: Fix setting loader tunables A string loader tunable requires setting the len parameter to a nonzero value, typically the size of the string, to have the flag CTLFLAG_TUN work correctly [1] [2]. Without this fix security.mac.{biba,lomac}.trusted_interfaces would have no effect at all. [1] 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag to automatically ... [2] 6a3287f889b0 Fix regression issue after r267961. Handle special string case ... Reviewed by: olce, kib Fixes: af3b2549c4ba Pull in r267961 and r267973 again ... MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48898 (cherry picked from commit 7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4) --- sys/security/mac_biba/mac_biba.c | 3 ++- sys/security/mac_lomac/mac_lomac.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index e991e05311df..aac7a0545ab8 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -110,7 +110,8 @@ SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/Biba"); static int max_compartments = MAC_BIBA_MAX_COMPARTMENTS; SYSCTL_INT(_security_mac_biba, OID_AUTO, max_compartments, CTLFLAG_RD, diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 23acc7b7a592..23a996469bc0 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -111,7 +111,8 @@ SYSCTL_INT(_security_mac_lomac, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_lomac, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/LOMAC"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/LOMAC"); static int ptys_equal = 0; SYSCTL_INT(_security_mac_lomac, OID_AUTO, ptys_equal, CTLFLAG_RWTUN, From nobody Thu Feb 13 10:20:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ytrmj50gmz5nHyh; Thu, 13 Feb 2025 10:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytrmj2dS4z3YST; Thu, 13 Feb 2025 10:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KWRbUKTe4lB7OgoMPVj4f7kbmE5i3RmqJT84B6kgd8=; b=Z5VpWUbs9oEPV0YYhI+FBy7Mi721SKjsN0A3jvVeTnQoiE7S5kIiaT9G3raR7RYr91wL5k KjI4Vs1wZSf+A1fBHR7yfUNbHCVVp+hi2o9eW7DQDFmCVIxUBqfD1HsgO4MlSXKCgz/a0y Uh7ObWrzCgn6agy+pnC1xHfbCIiMfV2D83Bj9wkRhc+PkRaIIy0NLvkjdKmOXJmPsQb/ao Rk+H76jnNN23W/eET3zaZ7pG7KfAtGHLbwgxpb80zr70FX0WKoDoIHJKtbi5Sgvbeo2kZh CzN844u6NLuRUlm51lpJvCqBYLP4wsCGGT0bMHDzH5FF2gwGlxoWjSPJpWuCcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KWRbUKTe4lB7OgoMPVj4f7kbmE5i3RmqJT84B6kgd8=; b=P7lw1H6aMRgdjOJAoBuxA13U2kZ2ZH/3jA8E1cjKwH4ssuoDoQ0Hm09DEG8J+PPicsdsap azfMEeENSZ6ihHFCR0uPFPNgPly6zL4aogVidELq8kSdVaVetrR78Uj82Hd80uUSgo+1ve gsx+OOHzQIfmk03U/Jvs8dRcZPbk0RbLcxHTXlimD+EwM4j27xX9UrqiTlbPNsmHEguUHS E6GpZZ1UFbnqHdzt1aC2ae8Qncje4QXG73eDvVxNyyob+vFvqyVD0cYqWYteu5wjpUsd2O km/uo2AqdDdz6aCEkdHzo4MDe/XMXuUckFXHRe48YrDLOE9BSYE4gPYC7VdcOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739442053; a=rsa-sha256; cv=none; b=plOm9E2jTaxCjcL2WoEIUEtw2WKQSt2nk1qhTbLZTYHJEVXCpSliLpH8YBx0YzyhWlQU9O Y6VPoTs2cZRcU7KZzvO+vYkYM/rcd3Y1a30rlgHCUy8zBsBI8cnRFIsTYlglEKAY9qUqAO R4ZYAg6Vy93fIi1oUdf+hzHbNNr8+8P6pAZ3Mil7dDzNu2GAF78CQcRENWH5bDMcGIaBQG TWd0rOHGhFugdO/um6wBGBdvclXQ3ok1m5x37eivdBD7hxeaZq/r3TOreSAAGjW2PXKbQr wCFQtQhuxy9TxUBGj2lxItkF82LJWWNS3UWMq4ZNJBI4S33Rpzvd6aD1P4T7NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ytrmj2DqJzgxW; Thu, 13 Feb 2025 10:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DAKrnD025668; Thu, 13 Feb 2025 10:20:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DAKrro025665; Thu, 13 Feb 2025 10:20:53 GMT (envelope-from git) Date: Thu, 13 Feb 2025 10:20:53 GMT Message-Id: <202502131020.51DAKrro025665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8ca77f9f9ece - stable/14 - sysctl: Harden sysctl_handle_string() against unterminated string List-Id: Commits to the stable branches 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ca77f9f9ece9d89161d080eee6a1aa706001878 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8ca77f9f9ece9d89161d080eee6a1aa706001878 commit 8ca77f9f9ece9d89161d080eee6a1aa706001878 Author: Zhenlei Huang AuthorDate: 2025-02-09 17:17:11 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-13 10:19:57 +0000 sysctl: Harden sysctl_handle_string() against unterminated string In case a variable string which is not null-terminated is passed in, strlen() may report a length exceeding the max length, hence it is possible to leak a portion of kernel memory to the userland. Harden that by using strnlen() to limit the length to the max length. While here, refactor the code a little to improve readability. Note that, when calculating the out length, the null terminator '\0' of the string is taken into account if available. This is not really necessary but userland applications may have already relied on this behavior. Reviewed by: avg, kib, olce Fixes: 210176ad76ee sysctl(9): add CTLFLAG_NEEDGIANT flag MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D48881 (cherry picked from commit 1951235537fb62150f1bb15dd7e170ac30853d35) --- sys/kern/kern_sysctl.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 3d66de0b18bb..b9ca0e7e5041 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1785,8 +1785,7 @@ int sysctl_handle_string(SYSCTL_HANDLER_ARGS) { char *tmparg; - size_t outlen; - int error = 0, ro_string = 0; + int error = 0; /* * If the sysctl isn't writable and isn't a preallocated tunable that @@ -1798,33 +1797,32 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS) */ if ((oidp->oid_kind & (CTLFLAG_WR | CTLFLAG_TUN)) == 0 || arg2 == 0 || kdb_active) { - arg2 = strlen((char *)arg1) + 1; - ro_string = 1; - } + size_t outlen; - if (req->oldptr != NULL) { - if (ro_string) { - tmparg = arg1; - outlen = strlen(tmparg) + 1; - } else { + if (arg2 == 0) + outlen = arg2 = strlen(arg1) + 1; + else + outlen = strnlen(arg1, arg2 - 1) + 1; + + tmparg = req->oldptr != NULL ? arg1 : NULL; + error = SYSCTL_OUT(req, tmparg, outlen); + } else { + size_t outlen; + + if (req->oldptr != NULL) { tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK); sx_slock(&sysctlstringlock); memcpy(tmparg, arg1, arg2); sx_sunlock(&sysctlstringlock); - outlen = strlen(tmparg) + 1; - } - - error = SYSCTL_OUT(req, tmparg, outlen); - - if (!ro_string) - free(tmparg, M_SYSCTLTMP); - } else { - if (!ro_string) + outlen = strnlen(tmparg, arg2 - 1) + 1; + } else { + tmparg = NULL; sx_slock(&sysctlstringlock); - outlen = strlen((char *)arg1) + 1; - if (!ro_string) + outlen = strnlen(arg1, arg2 - 1) + 1; sx_sunlock(&sysctlstringlock); - error = SYSCTL_OUT(req, NULL, outlen); + } + error = SYSCTL_OUT(req, tmparg, outlen); + free(tmparg, M_SYSCTLTMP); } if (error || !req->newptr) return (error); From nobody Thu Feb 13 10:23:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ytrr94qckz5nJ7X; Thu, 13 Feb 2025 10:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytrr85gY6z3b10; Thu, 13 Feb 2025 10:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asRd7s9wZi7YqcYnnjOzbPpyjJTuNJaiBeLqCPt3+Kc=; b=EON9qgb0fcRUddPGyMjkaLyyPZ6xFwGFb5VLACFL2txEOjarYu+OwDZ2TWUbgQF/XIvefa CrKZ095PAeM3xT6qa6HO4dvFlc7DPrdUd1IbXYP/RlRcqiis3k3miNGDjL+LUGozYKFUHw DabKypF75elGvxub65/NRbkp5tJh7wgm65HoJDjEheAFyYYMYaV4u5rI8vMhkUVuDiVktD o+u5ZZ4T3xKnk3z9lXJrn/d1oNyGf2uOGE/lrNoIQOOSVVc/rEwN0CXJfsI/rQbNsm0VZk USUQOVswOlF8RsgLdcvWnmb6FTbei8oDGXaVHmVwQHsXxl1l6RrYKbut/qUkAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asRd7s9wZi7YqcYnnjOzbPpyjJTuNJaiBeLqCPt3+Kc=; b=fGV6C8NOpwQOf6Eg7ukuZdnFceOoaZ+uOv2JuYqVoiytxyoN0uum3Ofe8SK6HWL7aMw7mf vXO27Uk07/Be33z/4aPKkfw4qskBJ6oVgiI5ming9gEgH8P4+Fxg9npa1DpNkQPr0Xj4zF 1FEj175EXVatahe99/omEKj0pd/FJdxVP2Yy77LMQ2jpwYc2aphf+IdVL061X/pYJxWfUX /hyFJ1P0H7IDEAxq2iyMqqJhVs0L0QtdoQlBjsuh49Vv/qA3pdp9S/C4nihSRBp+ZYD7vn 9AT4yLzU516ZtX3B2Ncmzd98mEV8yVx/4IXZ7srvEUMAMjHCjKdlCGqb6yPZhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739442232; a=rsa-sha256; cv=none; b=xAmWyYN3VwxCSF90l0ucO5psFyNpyq/qYwZqvrUURQnfx/S9/Wf70DqBW/SscL2eMXuxm9 PRydQQvUUX1MiRwUka9RKmKC9vBek0ONKiuMg0Ku5FmeLaoxkLUMBefxj2GPMYJFUnuYly kqUa468BWmmDBPQw/gmg+OQhmtG5Gbq8ORX6jQaboWSjTXowqhybs5JxxWk0SiB/EccoCz M2MGg9fxCL9UuSnmP0MEPvnR+meCiSfZw/mhE3FDSmdkrPQS2Zzs/7jPARJLuSSbFJ8wh4 eJM4r8BvgGz0kiFGqnCj+FTnykBDPCkxatFpD55/8xgqirJBhDh/GX7434cCnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ytrr84gSFzhVh; Thu, 13 Feb 2025 10:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DANqvT030209; Thu, 13 Feb 2025 10:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DANqKP030206; Thu, 13 Feb 2025 10:23:52 GMT (envelope-from git) Date: Thu, 13 Feb 2025 10:23:52 GMT Message-Id: <202502131023.51DANqKP030206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 87836ab994c2 - stable/13 - MAC: mac_biba, mac_lomac: Fix setting loader tunables List-Id: Commits to the stable branches 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 87836ab994c2ff9d442f84c174bd1fdead3cfa27 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=87836ab994c2ff9d442f84c174bd1fdead3cfa27 commit 87836ab994c2ff9d442f84c174bd1fdead3cfa27 Author: Zhenlei Huang AuthorDate: 2025-02-09 15:53:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-13 10:23:03 +0000 MAC: mac_biba, mac_lomac: Fix setting loader tunables A string loader tunable requires setting the len parameter to a nonzero value, typically the size of the string, to have the flag CTLFLAG_TUN work correctly [1] [2]. Without this fix security.mac.{biba,lomac}.trusted_interfaces would have no effect at all. [1] 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag to automatically ... [2] 6a3287f889b0 Fix regression issue after r267961. Handle special string case ... Reviewed by: olce, kib Fixes: af3b2549c4ba Pull in r267961 and r267973 again ... MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48898 (cherry picked from commit 7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4) (cherry picked from commit 04f360b782205c799b9302ba8bd810f7a303017f) --- sys/security/mac_biba/mac_biba.c | 3 ++- sys/security/mac_lomac/mac_lomac.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 8b683dc380eb..04dd331835be 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -110,7 +110,8 @@ SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/Biba"); static int max_compartments = MAC_BIBA_MAX_COMPARTMENTS; SYSCTL_INT(_security_mac_biba, OID_AUTO, max_compartments, CTLFLAG_RD, diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index d878f9a7b965..7a2f340d85bc 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -111,7 +111,8 @@ SYSCTL_INT(_security_mac_lomac, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_lomac, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/LOMAC"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/LOMAC"); static int ptys_equal = 0; SYSCTL_INT(_security_mac_lomac, OID_AUTO, ptys_equal, CTLFLAG_RWTUN, From nobody Thu Feb 13 10:23:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtrrB0JTjz5nJVQ; Thu, 13 Feb 2025 10:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytrr95k9Hz3b11; Thu, 13 Feb 2025 10:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e8Ryq/0fovGWdCGYLvUn94QNKf1ifGJ9GKcqqcKZEFA=; b=CTwbKKqRnAqfhJHd6udor7ZgJAewqqUWQpYCgPGJMV37oHSHliwl8QaIDMqDPWi6VrdBHd OTUh0bPfJyc2vexTz7xXnEn7V8aL8RlnMxGiAjiICTIZCu3OyW71TI2HRLp7glVpe3RoUG sIaqnbeYvSrVBiBzxAj5MJiv2IxXErnGUL8C1sJsrxrHDlnS6wvdlQb8BSt/Wkn30e/LG0 7C4atzst5dcBdLWUxCNqUiCiiiAElUmC2bTYDtPkSmwjdntBdJRKj5J7uYmZX9FKZg4oYy RWGiLzM1EewpyLCpXqChQVsLi7/u/Av2OQt4G6W6tYXBiNiLIQKMhgg+BgnDfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739442233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e8Ryq/0fovGWdCGYLvUn94QNKf1ifGJ9GKcqqcKZEFA=; b=o6t0g/xOuHhCuonDTClDgK/E2b+InTlDkROsCAhVG5uyATys8KyS1PTZITEeSyMxZsmjMI SJORgd4aWmC1ma0U9d8nsbTWSEQP0N6PO1KT652T8tyBiDB8UEx8xFPjlsGUq989RdtPu+ P+z6aZVA//kQxI12B77jKxmmw1h1CD1A+o2odiKZ/oYZeH+7YHK+3Kuc0dzxpxSOtWhuNZ rcPRpA4w5O2IBPyl9/ju71uhprHzXIrWNNDk0LxAjpEYwAxA2wFcBCbm7kX/2+SRFZFr/Y GDrKbxvuce9yOumr6KSiefVQJYFyHzY6gunbfiknpZq9JRVg5nSgyeKbADCh/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739442233; a=rsa-sha256; cv=none; b=OOM6SoL0bnK+LCFhqMxXd4fF9h6TLLF2SjUmZAfM3hLmKSda/TMOYtm8A779q1RA8UncH9 /Itg0qpSOwvZ5ZVk52VUkYfCpH126nURGVo1nour4hr2wf17SplWD+So+zSL9BLZOE7mC/ K54B1OM03x56BVIXceleNnd9ioFZtr57HXJI3fyV4vh7NbGTIzdDEkTr1UpoEdSG0OH3gm 0G2j0pC90SIZjSghAy04ktg9eRCHF9m/HWN2Fhc3Q2mITOJtRZR67H2Q+c5E+D0vqYNOXT WKrTqjr3oZeUWW0192uDljE0EQq5gqxg3eFybY9jqLFi4oGXAUmBOeGUjiY2aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ytrr95K4jzhDS; Thu, 13 Feb 2025 10:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DANrN7030244; Thu, 13 Feb 2025 10:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DANrQg030241; Thu, 13 Feb 2025 10:23:53 GMT (envelope-from git) Date: Thu, 13 Feb 2025 10:23:53 GMT Message-Id: <202502131023.51DANrQg030241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: dcd7286d9027 - stable/13 - sysctl: Harden sysctl_handle_string() against unterminated string List-Id: Commits to the stable branches 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dcd7286d902774428c08b179a72bfdcd4556ec06 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=dcd7286d902774428c08b179a72bfdcd4556ec06 commit dcd7286d902774428c08b179a72bfdcd4556ec06 Author: Zhenlei Huang AuthorDate: 2025-02-09 17:17:11 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-13 10:23:04 +0000 sysctl: Harden sysctl_handle_string() against unterminated string In case a variable string which is not null-terminated is passed in, strlen() may report a length exceeding the max length, hence it is possible to leak a portion of kernel memory to the userland. Harden that by using strnlen() to limit the length to the max length. While here, refactor the code a little to improve readability. Note that, when calculating the out length, the null terminator '\0' of the string is taken into account if available. This is not really necessary but userland applications may have already relied on this behavior. Reviewed by: avg, kib, olce Fixes: 210176ad76ee sysctl(9): add CTLFLAG_NEEDGIANT flag MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D48881 (cherry picked from commit 1951235537fb62150f1bb15dd7e170ac30853d35) (cherry picked from commit 8ca77f9f9ece9d89161d080eee6a1aa706001878) --- sys/kern/kern_sysctl.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 371d521d8850..7a4feada157e 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1787,8 +1787,7 @@ int sysctl_handle_string(SYSCTL_HANDLER_ARGS) { char *tmparg; - size_t outlen; - int error = 0, ro_string = 0; + int error = 0; /* * If the sysctl isn't writable and isn't a preallocated tunable that @@ -1800,33 +1799,32 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS) */ if ((oidp->oid_kind & (CTLFLAG_WR | CTLFLAG_TUN)) == 0 || arg2 == 0 || kdb_active) { - arg2 = strlen((char *)arg1) + 1; - ro_string = 1; - } + size_t outlen; - if (req->oldptr != NULL) { - if (ro_string) { - tmparg = arg1; - outlen = strlen(tmparg) + 1; - } else { + if (arg2 == 0) + outlen = arg2 = strlen(arg1) + 1; + else + outlen = strnlen(arg1, arg2 - 1) + 1; + + tmparg = req->oldptr != NULL ? arg1 : NULL; + error = SYSCTL_OUT(req, tmparg, outlen); + } else { + size_t outlen; + + if (req->oldptr != NULL) { tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK); sx_slock(&sysctlstringlock); memcpy(tmparg, arg1, arg2); sx_sunlock(&sysctlstringlock); - outlen = strlen(tmparg) + 1; - } - - error = SYSCTL_OUT(req, tmparg, outlen); - - if (!ro_string) - free(tmparg, M_SYSCTLTMP); - } else { - if (!ro_string) + outlen = strnlen(tmparg, arg2 - 1) + 1; + } else { + tmparg = NULL; sx_slock(&sysctlstringlock); - outlen = strlen((char *)arg1) + 1; - if (!ro_string) + outlen = strnlen(arg1, arg2 - 1) + 1; sx_sunlock(&sysctlstringlock); - error = SYSCTL_OUT(req, NULL, outlen); + } + error = SYSCTL_OUT(req, tmparg, outlen); + free(tmparg, M_SYSCTLTMP); } if (error || !req->newptr) return (error); From nobody Thu Feb 13 15:12:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YtzDz2MBCz5nbXF; Thu, 13 Feb 2025 15:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtzDz1QYQz3bDL; Thu, 13 Feb 2025 15:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739459539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h58GjN3njUDQB9muTNEc8ekToNRUINBZpf1I+dQayCw=; b=e8VxUTrj2Ez1mcGA63fKqQCbdWXZB8rh2jw7MwddCjOHpt3odZDKbyVgNMB28hAERCAWr6 hX2uHP+JoM6J49NTEsxQx4dn+lfETzlYEwfhL0PyktgeItfHpkHXCkwxcszwQkVx0i4Gjo YOYreBbeh6JAsVbrzQnKybOK+66t1d6iHIDRHrRT2PNb3V1Q/J7NutH6SoFKbqAN4OZEAR iUkoWw6lqZht6h39LK+imRzyMWKxv8lMDnjesFlqzj4/3Igs6nl2g7FC2NwSBBLCmo66MG Osqx9wyHs3qxjv0xl8g3GpFDyjkJs9v+lBUqzcqw/2K7L/6UR3RehltpkW09Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739459539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h58GjN3njUDQB9muTNEc8ekToNRUINBZpf1I+dQayCw=; b=UDIGCswd0ripWXGZj4X5XbtCza3gCY7a5q0GtU7qrzI0q5qzaoPlzRKbfIX+wgtyckFGFO AHcUxjsaAaGE4kleax33SauxsHQLIpoxq/gsvTrbU6KaV8PP+1JKqJHTIcaqLJ1P+8K/KF c7DkvukCBxlXMPxq4CPBnwgVq+AaIyZQ9b3UJEvZlYehUy0DH0jh77K8vL8CS7lOVhhBMt xnSxBwhTaX1KndzU3PpIEwBg00khTKnXBtyAP0jXOWvc+HYaDROtGm4Ly5ZU8OXM4tn2bd Ax1cU/qOCOZx3c9q69nvz3N0OuEDLoDhsbovzAe/LNESkBhiUT8hw5VQ9Shwbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739459539; a=rsa-sha256; cv=none; b=FLBjNx825DE3/I7TxEaFMoAbgGCst4uk2sBZE2pGOD2hNStqdN+lIiBoXTVGSBwC0uNlTi EOEDAFDyb7pPHh0+ENULuukNMsMIk+9EUpLhEFX4qJRf+NoyQQal1V29Gdah+m5CaQFt8p g/bIuh6LF3qlhu6/HeSjIwN5jmm15Z3lhSFem3n3yc+9awVQt1Hea33ECX7f0bdfW2XA8Y 3I8RtrIKJf+zZFpWoO6J9s7QfpbuGsk7QjgBLFWH0HTfBYMd60TXcwkxNe+QI/psklA517 hMlYCfa3Muhz4FuJzeZ30srEdrmhLEsenE3tNY4NgXmg3ZJe3llhNkWODXPZsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtzDz0ywBzqwf; Thu, 13 Feb 2025 15:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DFCJsf071065; Thu, 13 Feb 2025 15:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DFCJXw071062; Thu, 13 Feb 2025 15:12:19 GMT (envelope-from git) Date: Thu, 13 Feb 2025 15:12:19 GMT Message-Id: <202502131512.51DFCJXw071062@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: 1aaec1978a29 - releng/13.5 - unifdef: Fix collision check when adding symbols. List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 1aaec1978a29410ec50124454ad80317b44ab2d6 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1aaec1978a29410ec50124454ad80317b44ab2d6 commit 1aaec1978a29410ec50124454ad80317b44ab2d6 Author: Dag-Erling Smørgrav AuthorDate: 2025-01-30 21:10:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-02-13 15:12:02 +0000 unifdef: Fix collision check when adding symbols. findsym() is intended for use while parsing input, so it should not be called from addsym2() or indirectsym(), which are called before any input is processed. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D48733 Approved by: re (cperciva) (cherry picked from commit c63af363c2458aebc30c01cd0b93b4b902580019) (cherry picked from commit 931b0990297e2c6307b41bda95c5225cdf48403c) --- contrib/unifdef/unifdef.c | 11 +++++------ usr.bin/unifdef/tests/unifdef_test.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index 3dd4ace7b81e..ce8a1367adc2 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -1488,7 +1488,7 @@ findsym(const char **strp) static void indirectsym(void) { - const char *cp; + struct macro key = { 0 }; int changed; struct macro *sym, *ind; @@ -1497,10 +1497,9 @@ indirectsym(void) RB_FOREACH(sym, MACROMAP, ¯o_tree) { if (sym->value == NULL) continue; - cp = sym->value; - ind = findsym(&cp); + key.name = sym->value; + ind = RB_FIND(MACROMAP, ¯o_tree, &key); if (ind == NULL || ind == sym || - *cp != '\0' || ind->value == NULL || ind->value == sym->value) continue; @@ -1539,10 +1538,10 @@ addsym1(bool ignorethis, bool definethis, char *symval) static void addsym2(bool ignorethis, const char *symname, const char *val) { - const char *cp = symname; + struct macro key = { .name = symname }; struct macro *sym, *r; - sym = findsym(&cp); + sym = RB_FIND(MACROMAP, ¯o_tree, &key); if (sym == NULL) { sym = calloc(1, sizeof(*sym)); sym->ignore = ignorethis; diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index dfb08c187724..97a1b1aa6310 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -37,7 +37,17 @@ EOF atf_check -s exit:1 -o inline:"b\n" unifdef -DFOO -DFOO=0 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e375421e243a - releng/13.5 - Remove obsolete clang18 files for aarch64 List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: e375421e243a53d0378827467261b065c6bbb2ea Auto-Submitted: auto-generated The branch releng/13.5 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e375421e243a53d0378827467261b065c6bbb2ea commit e375421e243a53d0378827467261b065c6bbb2ea Author: Ronald Klop AuthorDate: 2025-02-10 18:41:26 +0000 Commit: Dimitry Andric CommitDate: 2025-02-13 15:59:36 +0000 Remove obsolete clang18 files for aarch64 This fixes a warning from "make delete-old" about a non-empty directory on aarch64. Reviewed by: dim Approved by: re (cperciva) Fixes: 0fca6ea1d4ee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48904 (cherry picked from commit 09b435d3dc2a591fba08be04d5659d03cce08285) (cherry picked from commit 9370c2c331255beac5e451c7841e68b2302ebf91) --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 0e7060eedd52..d57745d70a79 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -347,6 +347,7 @@ OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -365,6 +366,7 @@ OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Thu Feb 13 16:46:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KG5BW3z5my9F; Thu, 13 Feb 2025 16: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KG4Y2Cz3NDh; Thu, 13 Feb 2025 16: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=1739465170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPwfTWzrymvhcr7JEOpQLodgntNqH8qys5r6WZWzKTM=; b=h0CXz7WPsKSW2VCP98ZncO4llPTzO2zitD1x5LCLy56HIUxLjqfLjbkUsxm8OQ0lqolNSI iAsOFc8MrSCI17l2PZiSFvOS0kyDJOcqkkbsm0kU7POlKFzY5Ik8EYS/iwdg30jPGEs8Pt iIHB1Ba9v7Ygx7QP/7AfU8+gkWMNT0xxgEqTGwKpl0FYsfUVrkg9iq6X2RPdqYzIt1jexJ HvkjLxSlkEoT0nu76nv8/4rPJkMv0I2r3OIfnH1mD1RYV33mMnu2HckPYSZBv2QgSRKP0d trNxGKlwOnYo9OhQEu8AM8oyxvSqLgh5LzHU9moU2UOtFMQrpq3C05TGg3wDxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPwfTWzrymvhcr7JEOpQLodgntNqH8qys5r6WZWzKTM=; b=JfwVAm3d9BhytxWyWbrYBGFdnIZc/hcMNT0W3jsSheXXZ+sbgU/44uY/QXa1k7X7mlrc0w d75fuqEFLcLASmaNJUHZkAPaLi8KfbD1IOW7hkaLnDhAqNbB5StUgkQncGydRBUrEf60ro hkQCXsCXZRwPA+zqygkddSscmiWGNkotYhom1Gmu4H7JZKAapP2MdW/zS5QI8ZcUISIUEM VL/ERhkSxiB9Pak1CeyI3g4rt/eIcK+tA8b78MZ8bBw8hCw00sNEVSzxteoZrGbvIdis1a EA6gOBokrKJbAntglKrlkhdsrVP3SzrNg6PMjLL7rwSDui1+pAW0Gw3stlEZRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465170; a=rsa-sha256; cv=none; b=rmYrbsDQ3Vw8s9nadi/6zz0L+Su+z+ufESDEDHDCxA09FfX19d8R0eFKbWCkuj1fIumbog WvmxfY8gDaBFkmHojuSvpNQB1YchlAlHY88k46/sp6RhxvOL3HzPlAgDbew4BPUJ8f3ewI H8fJHoYQMlX8N2L5zzvVCTIFXgl/m0BLI7i1ok5/L3XRIcpQdlI62fWZZUB4VSSYn199AV ZKvkDNqmjVBQgeuAWMzTjQQcJrAkxRxWmyz+DcMjhgK21X1v3N+O2KTtS8PeCOUKTOROVJ U3O993EtFrEBaj1kz2byvDQOtU9xZhCZ/U49xQ6Wmj6vBNPEb8Ob18TC1LCX2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KG3gbWztCg; Thu, 13 Feb 2025 16:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkAAn041477; Thu, 13 Feb 2025 16:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkADQ041474; Thu, 13 Feb 2025 16:46:10 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:10 GMT Message-Id: <202502131646.51DGkADQ041474@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: ebc96321e706 - releng/13.5 - icmp: do not store per-VNET identical array of strings List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: ebc96321e706ee61f7eafcb77a44695d6faeeb52 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ebc96321e706ee61f7eafcb77a44695d6faeeb52 commit ebc96321e706ee61f7eafcb77a44695d6faeeb52 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 13:56:10 +0000 icmp: do not store per-VNET identical array of strings We need per-VNET struct counter_rate, but we don't need per-VNET set of const char *. Also, identical word "response" can go into the format string instead of being stored 7 times. Reviewed by: kp, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D44475 Approved by: re (cperciva) (cherry picked from commit 7142ab4790666022a2a3d85910e9cd8e241d9b87) (cherry picked from commit 0939f3a046533a2df1d2b10fd914c98755dacb0b) --- sys/netinet/ip_icmp.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index f0e63d6c8b1a..54411d55f49c 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1085,28 +1085,26 @@ ip_next_mtu(int mtu, int dir) * the 'final' error, but it doesn't make sense to solve the printing * delay with more complex code. */ -struct icmp_rate { - const char *descr; - struct counter_rate cr; -}; -VNET_DEFINE_STATIC(struct icmp_rate, icmp_rates[BANDLIM_MAX]) = { - { "icmp unreach response" }, - { "icmp ping response" }, - { "icmp tstamp response" }, - { "closed port RST response" }, - { "open port RST response" }, - { "icmp6 unreach response" }, - { "sctp ootb response" } -}; +VNET_DEFINE_STATIC(struct counter_rate, icmp_rates[BANDLIM_MAX]); #define V_icmp_rates VNET(icmp_rates) +static const char *icmp_rate_descrs[BANDLIM_MAX] = { + [BANDLIM_ICMP_UNREACH] = "icmp unreach", + [BANDLIM_ICMP_ECHO] = "icmp ping", + [BANDLIM_ICMP_TSTAMP] = "icmp tstamp", + [BANDLIM_RST_CLOSEDPORT] = "closed port RST", + [BANDLIM_RST_OPENPORT] = "open port RST", + [BANDLIM_ICMP6_UNREACH] = "icmp6 unreach", + [BANDLIM_SCTP_OOTB] = "sctp ootb", +}; + static void icmp_bandlimit_init(void) { for (int i = 0; i < BANDLIM_MAX; i++) { - V_icmp_rates[i].cr.cr_rate = counter_u64_alloc(M_WAITOK); - V_icmp_rates[i].cr.cr_ticks = ticks; + V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp_rates[i].cr_ticks = ticks; } } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, @@ -1117,7 +1115,7 @@ icmp_bandlimit_uninit(void) { for (int i = 0; i < BANDLIM_MAX; i++) - counter_u64_free(V_icmp_rates[i].cr.cr_rate); + counter_u64_free(V_icmp_rates[i].cr_rate); } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); @@ -1136,7 +1134,7 @@ badport_bandlim(int which) if ((V_icmplim + V_icmplim_curr_jitter) <= 0) V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which].cr, V_icmplim + + pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { /* @@ -1154,8 +1152,9 @@ badport_bandlim(int which) if (pps == -1) return (-1); if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, "Limiting %s from %jd to %d packets/sec\n", - V_icmp_rates[which].descr, (intmax_t )pps, V_icmplim + + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); return (0); } From nobody Thu Feb 13 16:46:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KH6Sp3z5mycq; Thu, 13 Feb 2025 16:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KH4Gt8z3NDm; Thu, 13 Feb 2025 16:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J92bZ3Oo6oEYpXns8SkZFgtYjs2VFdsGtvivGFWto/E=; b=Uj5xu17NMO7WryWTb1EE7B6M7qkn+o6oaAqh+VmfUICG62a4Si5fO49ppXa69OWwBcT5Vp oJaJje5W/m5vLXtMPmvmuiPzy5tQhbHZwkSSzZSpSp/XLzsdohycaV4xB+icaW+B4k2iSr DM/4eFngG5/kdVpwMEnV70e0uBaS2niyCRMvCaalWJ0Sn/wPEn8qVhwfKU0ygmqweN2r4K N2NTIkXd5/ah7g3CGrsV5LmXWCt0YKyukkbZ7eJVhWu12b0cjrVzuufBn5MMHFNfH2jDuY hZr579gXY6xSBYFu2CJnlC36Bpm4rED+neCUeioUeicatMHFg/DT0OIa02mkMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J92bZ3Oo6oEYpXns8SkZFgtYjs2VFdsGtvivGFWto/E=; b=USkfUCEzQR5L4VG3b7XW//48Y59u6hq6E/vkf5DgseSYxyNNnSEFtEHgUSSCsrv8DdfHst rIEZKsCxuEM3Qgi9mlOQCGHetBRrmcyfVOsp+PN+tUhyMhRdQKuj133Y3tRHv8Q0nxvwVW Iu+HcoKsn7vBUCN9srjBw2eUDn7lGnP01+GoU/aP2iWl5WPMOAUIEscIPhN1mREw+k9j16 sJgaJfXd13QrN1BcS3sgDJJ/h2+f7fORSGfrVyQJO8KFu7IyYXC1LrsB3QkvtqG3E0oiIE yO3ofYCUI+/BTwXETw+95g3hpHztldF4EDUOnu+BeXwjSR/G8dHPIooSHl6Ysg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465171; a=rsa-sha256; cv=none; b=wsTZnemDWzIRrygjxqmZtHAnUAijksgZ1AjxER6nVozx8YzjnIeiGKzQ+iwX/k2hRvKlB1 HuEjVt2g/8ZYidGD75gu4LcCAX/L78q6n2360TUh6idck8L0/41F5dB1sHq0e38XUXnNAT DJPaxgjDipmpqhRGdog/CdRRqbVSfF2dfuKjCrzwWQCdG4jKLWplQuWEDu02iNw+/mj1bx oqxfDTqSXGwR/DnSLVsftwlPLV9uStyjQS+gX+a/nfv2kF7di0QEwPFTwXzb+XFbGUM1ll TP0uaQ4EIY2cjlz6SFmS7R4bQVGl1RH7tjDaQjZKh9LoI+cXmP91fhTAo+jp0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KH3mylzt9r; Thu, 13 Feb 2025 16:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkBRK041515; Thu, 13 Feb 2025 16:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkBW2041512; Thu, 13 Feb 2025 16:46:11 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:11 GMT Message-Id: <202502131646.51DGkBW2041512@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: a0146592cda2 - releng/13.5 - icmp: hide icmp_bandlimit_uninit() under VIMAGE List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: a0146592cda258708c6fb7f0a2086c310c304598 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a0146592cda258708c6fb7f0a2086c310c304598 commit a0146592cda258708c6fb7f0a2086c310c304598 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 13:57:18 +0000 icmp: hide icmp_bandlimit_uninit() under VIMAGE The uninitialization may be executed only on a kernel with VIMAGE. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44476 Approved by: re (cperciva) (cherry picked from commit 9d7f17d7467ed8c9740730a8db7a82e4768e5177) (cherry picked from commit a6d5c6a04fe9408cdfd1f56f8dc3142661214eb8) --- sys/netinet/ip_icmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 54411d55f49c..5c8c17cba049 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1110,6 +1110,7 @@ icmp_bandlimit_init(void) VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); +#ifdef VIMAGE static void icmp_bandlimit_uninit(void) { @@ -1119,6 +1120,7 @@ icmp_bandlimit_uninit(void) } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); +#endif int badport_bandlim(int which) From nobody Thu Feb 13 16:46:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KJ6JLvz5my9L; Thu, 13 Feb 2025 16:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KJ51pWz3Mx6; Thu, 13 Feb 2025 16:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3dhU8hx4pNb6E4g6k2PhBOAKNTKLL9KbIa34UE9XgM=; b=dWfCSktE1kRBw/sJhEK3H30wVtxmexaHlYrzo/CEFpyTfS2uLhK//htehWL1cAgXEI7oFE SWHjvMbTT7ULXE6ta+fyOTLlYDfbPP6nylPLoQwzGN29OE3GmWjLHA4u/qzZJ4N5npwKYb LXNJV7rcJP4eKCKR4ORMNSl7chKs/Hn7xOcu0x4r5/wpw83jIvu9MKqcQbsqo9Fu/6Ti/I gqDO4vaCCmrpzphhQoVNveaAmPzp+KBxixnCJwIGkprV8Zc9AYOeTyvgSAygpU2gaJzwG6 KJa4hE/hVwfYUPX7naKttoNKOyQHSoWumMR6RSXZFsB/Hrx1KvU2hn0zA3O0XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3dhU8hx4pNb6E4g6k2PhBOAKNTKLL9KbIa34UE9XgM=; b=Eo0KzqUErU3X4p+VQWs5UK/RjHZwVELRlXRWXPzmFQv/tG/rSdRxqdj1DWmH7mZjcqpWE+ s+6pYTVwPwv+9NxX0eHmgGaKjn8o8YRlbv6QiP7LsND9HKa9asEWiIVEC8l3/z320h26Tp cm/FkSbGfK2kNyYoDwp39cc4rY9Sn6A+InocOBzjo1zWlxPT2KhId0/luZHFT0oUn9Ny7h nF08bojq6v5Omiel/4m+Mh8+v7UdJ7+db6J9RY3btGPk/8TwpWHhJ10CXIN/3PQZjnIx+q Cz+lwb5f48VEY12orf+a0cvEhlPgyj4NxBiMOfFJjAtOyj4kgOihN81Q7ykXHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465172; a=rsa-sha256; cv=none; b=Ly+TT//0gXyTpRpV7v2Di6CSh84vGfo/vcfqDg2eCG+AHLaF4McYdbaQ4lBWp9NKy90HB6 oOEKAmIigxbYw4OCtf4Ih5vKsVs/2gfYiDNT1AtyS+jKk+xBDB+JfcRxqM0afxvYYHWMyK g9ekHTz5p2ZmPqA1GVyFunbSzuTTxoslLQuwdQr3Y97qTbBgfRL23dR5x2iWvMhZLqpzDp +BLBfUfc4hcPBPWGLch4noxCMV32hTKtFniPoj9k2lmRODryJ7LkvqRXdMO9fRqFljruIW RRjFjziK6jDFz7mFK3J3PZiYG4XGqyXFIItNdu4ifekHieBrn/OdIscKM8dKHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KJ4bXvzt9s; Thu, 13 Feb 2025 16:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkCuY041547; Thu, 13 Feb 2025 16:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkC9R041544; Thu, 13 Feb 2025 16:46:12 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:12 GMT Message-Id: <202502131646.51DGkC9R041544@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: b6dc6601559b - releng/13.5 - icmp: when logging ICMP ratelimiting message use correct jitter value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: b6dc6601559b44348507df9dd8cce7e438bec4c9 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b6dc6601559b44348507df9dd8cce7e438bec4c9 commit b6dc6601559b44348507df9dd8cce7e438bec4c9 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 13:59:09 +0000 icmp: when logging ICMP ratelimiting message use correct jitter value The limiting of the very last second has been done using certain jitter value. We update the jitter for the next second. But the logging should report the jitter before the change. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44477 Approved by: re (cperciva) (cherry picked from commit b508545ce044dbfdd83da772e73f969a3713d59d) (cherry picked from commit a71eee300ba7d94a1621c7b31eaaa79243db84ec) --- sys/netinet/ip_icmp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 5c8c17cba049..199b76aa9ad6 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1139,6 +1139,11 @@ badport_bandlim(int which) pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { + if (V_icmplim_output) + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, + V_icmplim + V_icmplim_curr_jitter); /* * Adjust limit +/- to jitter the measurement to deny a * side-channel port scan as in CVE-2020-25705 @@ -1153,10 +1158,5 @@ badport_bandlim(int which) } if (pps == -1) return (-1); - if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, - "Limiting %s response from %jd to %d packets/sec\n", - icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + - V_icmplim_curr_jitter); return (0); } From nobody Thu Feb 13 16:46:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KL10VZz5myXL; Thu, 13 Feb 2025 16:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KK5wxyz3N8p; Thu, 13 Feb 2025 16:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=waQWO4d1DASHj+yesRgLyXi5c7ekakTEGYxux4aN2PQ=; b=p8MaAoV4YOZnBQLc2hxLZchHkUk8EFmk48oDU5cZAyWbUZXPEu4Ayth+V2/nU7HQ7+EB9j v2WJn61lFwcN1Fla8u0kspv+6D6h/UDWMXLvwKX+510EK17pBlpTIblbWBBJqB2mIkpOIS l1U/YqQDtwBn7fWLbmJcdEwXsfSjB1pEDYrJjbbSVqkjHZ/tyPoQCZK72ifilEV54V0KuK CwGFmJHBqZ1ITzk8TAHje7B7B/cc3YmRiqu+MqI315TOrPDdrb8rg1icZUhtsKmxnJrjMR zGCYVLVlo4u2hhzbcForv+OK6eoqBSTSIz3vJntof2fPIdaUXtPgo6GOqoe5Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=waQWO4d1DASHj+yesRgLyXi5c7ekakTEGYxux4aN2PQ=; b=p/5Fvr32k+UGxCk0owxY5bD5ps9bDOHDR85pPDPMIC1Pp4GptLtLiDHHjJQ2UC90zFK4Q4 y5slt93HvHabL2tN/RiS9AYwZye+tqn21Hz7j50tXY7bq6xn7FCZ+6H0tZvSxwAe+viXvS ND+gcGsZfHDqgeTh8EYcAXzgdIQossRh9hCjIryqPuquwzzEqVTMCQuB1AbNAiMGfrQy7b StvSiEJOMKK+6YVTJGZj/piJB1+Zu0yhsNRQGQ9Al+n+mEcbdesDWPrv8E43G5uuOBIiGd MPTwsYe6qh7++7i9sqfyiAGXB6CM+0kF/BMevn+eVgHzSPtyGAwd3FHgKEOCOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465173; a=rsa-sha256; cv=none; b=jAfb3EkrELhiCAT/6CVW/eKTHHsw5FWDNug0TQXKcRke6tq267UU2RLpHq9d91XviSJJls hFHzBzZYeSJiT8Mzj1FBh6pz4pma3KxDGYof+rndWBsIKuFBXfFZGl7tpkkut+r775wEXZ ViBaABc/eTlSzEYeYDhTnQHIRWtyld7OyaB5nrd/VBpiWuML51twP7MXrGOAwIFTFlolKL t7bnJma30rl1teCAlNymgMn1ufS7rV/OKBM0p8jkyxqZ1VQomGvn/uuXi8q5hn1o/dX3bJ s6/IKhxdbo/zVJRO5Pcrr9rTxY3Yyfu2OrZCA+pGsKoM8R3sBCQEk670Sl/n8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KK5XKrzsyY; Thu, 13 Feb 2025 16:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkDt1041579; Thu, 13 Feb 2025 16:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkDoM041576; Thu, 13 Feb 2025 16:46:13 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:13 GMT Message-Id: <202502131646.51DGkDoM041576@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: 1ed60133f6d6 - releng/13.5 - icmp: improve ICMP limit jitter List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 1ed60133f6d6d38b69f09a2524410df5b80e3775 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed60133f6d6d38b69f09a2524410df5b80e3775 commit 1ed60133f6d6d38b69f09a2524410df5b80e3775 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 13:59:46 +0000 icmp: improve ICMP limit jitter Instead of fixing up invalid values set by a user in badport_bandlim() which is a fast path function, provide a sysctl handler sysctl_icmplim_and_jitter(), that will check that jitter is less than the limit. Provide jitter initilization function icmplim_new_jitter() used at boot, in the sysctl handler and when we actually hit the limit. This also fixes no jitter on a fresh booted system until first limit hit. Instead of CVE number provide link the the actual paper that explains what and why we are doing here. The CVE number isn't very informative, it will just tell you what RedHat version you need to upgrade to. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44478 Approved by: re (cperciva) (cherry picked from commit ac44739fd834f51cacb26485a4140fd482e20150) (cherry picked from commit 18058544c65b83fffca9556d6d082e823585ef3d) --- sys/netinet/ip_icmp.c | 81 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 22 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 199b76aa9ad6..0d671033b67c 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -81,19 +81,22 @@ * routines to turnaround packets back to the originator, and * host table maintenance routines. */ -VNET_DEFINE_STATIC(int, icmplim) = 200; +static int sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmplim) = 200; #define V_icmplim VNET(icmplim) -SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim), 0, - "Maximum number of ICMP responses per second"); +SYSCTL_PROC(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim), 0, + &sysctl_icmplim_and_jitter, "IU", + "Maximum number of ICMP responses per second"); VNET_DEFINE_STATIC(int, icmplim_curr_jitter) = 0; #define V_icmplim_curr_jitter VNET(icmplim_curr_jitter) -VNET_DEFINE_STATIC(int, icmplim_jitter) = 16; +VNET_DEFINE_STATIC(u_int, icmplim_jitter) = 16; #define V_icmplim_jitter VNET(icmplim_jitter) -SYSCTL_INT(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim_jitter), 0, - "Random icmplim jitter adjustment limit"); +SYSCTL_PROC(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim_jitter), 0, + &sysctl_icmplim_and_jitter, "IU", + "Random icmplim jitter adjustment limit"); VNET_DEFINE_STATIC(int, icmplim_output) = 1; #define V_icmplim_output VNET(icmplim_output) @@ -1098,6 +1101,52 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { [BANDLIM_SCTP_OOTB] = "sctp ootb", }; +static void +icmplim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmplim_jitter > 0) + V_icmplim_curr_jitter = + arc4random_uniform(V_icmplim_jitter * 2 + 1) - + V_icmplim_jitter; +} + +static int +sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmplim) || + oidp->oid_arg1 == &VNET_NAME(icmplim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmplim)); + new = lim ? V_icmplim : V_icmplim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmplim_jitter) + error = EINVAL; + else + V_icmplim = new; + } else { + if (new >= V_icmplim) + error = EINVAL; + else { + V_icmplim_jitter = new; + icmplim_new_jitter(); + } + } + } + MPASS(V_icmplim + V_icmplim_curr_jitter > 0); + + return (error); +} + static void icmp_bandlimit_init(void) { @@ -1106,6 +1155,7 @@ icmp_bandlimit_init(void) V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp_rates[i].cr_ticks = ticks; } + icmplim_new_jitter(); } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); @@ -1133,9 +1183,6 @@ badport_bandlim(int which) KASSERT(which >= 0 && which < BANDLIM_MAX, ("%s: which %d", __func__, which)); - if ((V_icmplim + V_icmplim_curr_jitter) <= 0) - V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { @@ -1144,17 +1191,7 @@ badport_bandlim(int which) "Limiting %s response from %jd to %d packets/sec\n", icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); - /* - * Adjust limit +/- to jitter the measurement to deny a - * side-channel port scan as in CVE-2020-25705 - */ - if (V_icmplim_jitter > 0) { - int32_t inc = - arc4random_uniform(V_icmplim_jitter * 2 +1) - - V_icmplim_jitter; - - V_icmplim_curr_jitter = inc; - } + icmplim_new_jitter(); } if (pps == -1) return (-1); From nobody Thu Feb 13 16:46:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KM2KcNz5myct; Thu, 13 Feb 2025 16:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KL73P7z3Mlh; Thu, 13 Feb 2025 16:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TjNM0nDZxQfShUs96qL+U4Tji9Ma4Sd4C4LfjupBBo=; b=rpW3aW7NzDWtsn0kUlGOgbeeZ7v+fHYhdQs/1gzvBLGmBJ3zohdYqeGBkJWqUsZqPH/CPC Ylohh1rwbhoxbr5k3jEjfE9FFLDA0g0NU81woe9hgwje5cO0XqXkmH+WNEEkNwRt/JZUgO tG9CL8NicHxGNxnAUTO8Mg5x/6VkeYMIgOmF7dOkMPLdSeMg6mEjc1MpsQlhE9A5IFIhoz K6h74LXV8XXaqdcCwjEGpn1yzzC5zJqhwG35CoHChfpF/GB/Mkyj5Lqpc62KLnvtVvB4Rr cPTteMmdQIKZGnlX9YsO8BsOZkcl4GnKyQf7+vWPwp2ZDIGnadKosic8cd0FZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TjNM0nDZxQfShUs96qL+U4Tji9Ma4Sd4C4LfjupBBo=; b=cXRyHMqYKJxbjEw0wgJSbTmUzieB5wivaynaeBJeZr87b3wkNxG7L7yYu+tFY7XKz8c653 JY1rh6ne5HYZuDjTrVUI2xcnJ7u1R/TuhPaq3+LO4e6ZDfWTLjambDQI8K3ga0vMZhdCp3 QhneI4jBFING+7in6p6mSKR3OWd93x9Df/kd+i5/lizK9JUR56pOZOtk8Ufd/j2AbdOleG JZIZKCArPjkbwGxx+vvnIdmh56P40hCNJW2A/DOMwxHdZhEiIgQ5LIsq5H3q/CVtpd3EyI cneuRwXHXXb52CcMCv86NrB1P3GWGAY7GA/egYCIuAKXFuZRM/oR6PdjY/usxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465175; a=rsa-sha256; cv=none; b=etNTQrt2H+K/2n6EJVCy3jPEUkVhfNShpIKgEbB0FkkhhbW+zrXkVXJBUbYCgEppAqlTXq Z71XSyeFr/jEZkjlzSUIfMdQzqhbc3HQPVUkQcD9tUjnUjTays387fVzPaRosSBEPBA6l8 pME0kZWOdbmKAR67JlZeg8y8TyAyXMN+xVMCYaGLU8Tzta8ZzWtdcfxbKpFkBHn5toyehx YHcOWMYGpt66hwHZr5HqvPqk+642gQRGZ+TXibxoqLHc2PDAUL1wBzyjYdo2d2/F9/7SNE JmS54eOw0KT6NZ2OdMeOMfmEkUarKUT4GedbEKKsDcndBibF9dcoxvsJtoXyiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KL6W0NztTn; Thu, 13 Feb 2025 16:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkE4a041612; Thu, 13 Feb 2025 16:46:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkELN041609; Thu, 13 Feb 2025 16:46:14 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:14 GMT Message-Id: <202502131646.51DGkELN041609@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: 9880ce076584 - releng/13.5 - icmp6: make icmp6_ratelimit() responsible to update the stats counter List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 9880ce076584d4ca3a14fb87222cbb387be0d108 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9880ce076584d4ca3a14fb87222cbb387be0d108 commit 9880ce076584d4ca3a14fb87222cbb387be0d108 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:00:23 +0000 icmp6: make icmp6_ratelimit() responsible to update the stats counter Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44479 Approved by: re (cperciva) (cherry picked from commit c6c96aaba8dd74eb39469ed156ff19cc31d599b7) (cherry picked from commit dc167e64dce3ffc212e4f7a2268587abcc22c036) --- sys/netinet6/icmp6.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index d49c3856be1a..258f4bed794e 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -346,10 +346,8 @@ icmp6_error(struct mbuf *m, int type, int code, int param) } /* Finally, do rate limitation check. */ - if (icmp6_ratelimit(&oip6->ip6_src, type, code)) { - ICMP6STAT_INC(icp6s_toofreq); + if (icmp6_ratelimit(&oip6->ip6_src, type, code)) goto freeit; - } /* * OK, ICMP6 can be generated. @@ -2799,6 +2797,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, V_icmp6errppslim)) { /* The packet is subject to rate limit */ ret++; + ICMP6STAT_INC(icp6s_toofreq); } return ret; From nobody Thu Feb 13 16:46:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KQ6mJjz5myVM; Thu, 13 Feb 2025 16:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KQ2rnQz3N39; Thu, 13 Feb 2025 16:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465178; h=from:from:reply-to:subject:subject: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/pqebPmElG6UolQNnEaq1M4XZz5+VRDJ2VTZvHdNKk=; b=IiaEeT1f5tmUPl5+iTQ8JeYfADpFee9GofvwisBrIhK99+NAyHP8oebaSVF8GWfa8zIdRh WhYe10n9c3YFvEXj2TeMWLwMdOHc1M8KfiEBs8sxuzFzyICQEs9gRhA+UYFDj8BvYFs2XU ziIUZgBvS1ggthzV89N+NhwuYBxwHEFe25XCrJujJ+yTjE9mEpn1LWFofthVFRXZZumepZ xwqeuEQYemuehd/0NSLRmBXzxjS49cXcoUzPyAsZ9+i9xlSorld9ZqoGSHDxHG0vXJ7ucV WQ9ExfDJzn0M0sQSzEgEhw1jd+HN1kQkfoD6ix0KOh4cZJcrac2CPqjWaGWKSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465178; h=from:from:reply-to:subject:subject: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/pqebPmElG6UolQNnEaq1M4XZz5+VRDJ2VTZvHdNKk=; b=oNZQq8aTbCEybuIj1sBtnAIor81gkpaTbJP8CV6XmlpeCOhno/uUjcpVrSoX1TKd85LgYN 6/aG8U3nKK9e9zyJvLgodURMJ38odZfNlGVvo8lZiMPKh50BqjnhJRvD+R2XQI//VEuO5e QdEoz89n8C6AGLdnNr6MT4jR1OPJATBSv8N42pRC8U13epubf01chHHugTEZnqpX1puaor 5w2sQDRUo6klFOjKh4ePqmQGSbyW6Z1Uo/lkm9a7jK8bYIDfUGq7qHCqf2jvOvq6gxbG8F PW8NmJhHPftzSv0TTh+koEgxvGf/CjXBeQjIn8D+xExOsawyJlNMcJLOIydHNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465178; a=rsa-sha256; cv=none; b=VAwIBnWg4GsCNdSWgEfuUeYQnxyDwV6aB0l0AEOTp3gGdqiCvYNO0V+zghFN+hV+Oun1Tx AJrxWoyDvVpa8o/Dg5xpOhGwooJvpTv3GDzn4ffTNh9modg+i/nIXZQuAdM1kF63pptMxB rsv9oX8Ttp8SEC/dKTcoWmkiGtHhdc0f2H/HOX3vU13F15iS37J+i5iP9i5JrGViKlLOOP VxCn7m8zQMBF/0Cod+JR1M3OWSJh9RJQ5swPmmdIqMJy3yXog7OAAz7ynLEecST7ehsggB otL5bdFSztCgnEqwtBfB4vEAfqJj0ENtpUoVVuH4V+nmcU+HGhiXKhc3Ll3LVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KQ2NTQztFP; Thu, 13 Feb 2025 16:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkIAx041708; Thu, 13 Feb 2025 16:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkIPk041705; Thu, 13 Feb 2025 16:46:18 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:18 GMT Message-Id: <202502131646.51DGkIPk041705@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: 881ba70c1a3c - releng/13.5 - icmp: allow zero value for ICMP limits List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 881ba70c1a3c0c13fcc95291a22530b096803397 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=881ba70c1a3c0c13fcc95291a22530b096803397 commit 881ba70c1a3c0c13fcc95291a22530b096803397 Author: Gleb Smirnoff AuthorDate: 2024-03-25 02:52:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:02:12 +0000 icmp: allow zero value for ICMP limits Zero means limit is disabled, so the value doesn't need to be checked against jitter value. Fixes: ac44739fd834f51cacb26485a4140fd482e20150 Fixes: a03aff88a14448c3084a0384082ec996d7213897 Approved by: re (cperciva) (cherry picked from commit 4399e055ea610cdefa1470ad1ee614dd81ba5e56) (cherry picked from commit 0b29ef1e3fd57940704dd40a834f98649adbe46e) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 0d671033b67c..8ad6191f3097 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1129,7 +1129,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmplim_jitter) + if (new != 0 && new <= V_icmplim_jitter) error = EINVAL; else V_icmplim = new; diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index e1b0196fc62b..646c73e8abf0 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2843,7 +2843,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmp6lim_jitter) + if (new != 0 && new <= V_icmp6lim_jitter) error = EINVAL; else V_icmp6errppslim = new; From nobody Thu Feb 13 16:46:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KP0Rkyz5mycv; Thu, 13 Feb 2025 16:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KN2Pxqz3NFH; Thu, 13 Feb 2025 16:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhzlA0k1mDzCD9jiAp0+QXNAuc8F+CWIeN37fRXSvwA=; b=sas8fABGhb8VSC9AcZjUWM5T2J9IenWBkoMBf520MYXUgeVJKv6OzfCgVOjOW3vYqjAh5K K8dq4+jW/kLw0TM/+fCWg2asHofN0W12MJUwP7dxcw6qBgVxUWmacjle2pFW8v/SA0dyl7 agJVdvEELkJoislZUCG15ba0jH2HWoAnfmTO4y9rjY/Y68w7GKgTwxq8UIPU0zH+BdLmG7 sB/lRiruD9IFneoDoPUgGRVeyB2znFtV4YtxXdbCFXRQyRGUIkFp7Fq5zkKZVgXxa69E+3 KVEDneeP0sS2ba7F/gJqS20M5BfLunG2Ssymq4X8XMOxtXBuAknSCjcKqO296Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhzlA0k1mDzCD9jiAp0+QXNAuc8F+CWIeN37fRXSvwA=; b=nkgcwXEA0f5TR+VNNkZnvqaFDx3yF5s/814lgHbvVkqpFWHjgxOcsIRFeKGHxY2TDNeKCl c6qX3hqsDc1DOKLkSoWFdSov6toHEoanxVVFjd/h5nbOzvY51QBaCQWlwBWM/kCQBWOjqh ZKOeviwb+4BLtO96FB/jnQLVQiccWFcSgTxnvqj22St7dLRRkQZNConxN9Plo0m20WuqUH x+H9qJ3NQr/Wl48cyjvi0vu0NuExl48vqg2IYJRkdPpetLmcqvjOMsQUuZOomqT/qpOmqx LXhacWqFJUvquwYx22CbRuOiHd1uHwqv0xfFy2j/qV7PwgSytD67gtsZao+Lkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465176; a=rsa-sha256; cv=none; b=nKASL+7y6OcFJvJ6uOFBOvv6nuE6P60APxZHaOp4eC1rrsZCCKZ/TZaEvmyjxIwArasfD7 5JxkD93K2xih27nszPdRRwWmHXOVKkBx4dZFIDrn0WdxFhareA3bXrXhHXi1p/dKONkigV Kl31e1dMkTFUwwYPtnpXkW025zWwDHfqtzlBEvwCAqszh5GObH7vd2bqM3XaUIhUsH4aG/ Oh4RfRbLTgACLOLQ0MO5HhcTVl+vzLh8JTN3t26WE25i/a931ZOozcjvs7/MoeaWFUFFmu v80B43wjD9dRD4XAWEOqJtAfXaK/9bZSb50t1PeAv9MqXAL/2z6wMhWR8w/n1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KN0N8xztFN; Thu, 13 Feb 2025 16:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkFwk041644; Thu, 13 Feb 2025 16:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkFlV041641; Thu, 13 Feb 2025 16:46:15 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:15 GMT Message-Id: <202502131646.51DGkFlV041641@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: a7ad6437193a - releng/13.5 - icmp6: rate limit our echo replies List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: a7ad6437193a563c60a52af3845649671f59a16b Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ad6437193a563c60a52af3845649671f59a16b commit a7ad6437193a563c60a52af3845649671f59a16b Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:00:57 +0000 icmp6: rate limit our echo replies The generation of ICMP6_ECHO_REPLY bypasses icmp6_error(), thus rate limit was not applied. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44480 Approved by: re (cperciva) (cherry picked from commit 32aeee8ce7e72738fff236ccd5629d55035458f8) (cherry picked from commit 90ecc3fc679d1df50772327d80e0d28f59e584af) --- sys/netinet6/icmp6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 258f4bed794e..09cb893b57fe 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -536,6 +536,8 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) icmp6_ifstat_inc(ifp, ifs6_in_echo); if (code != 0) goto badcode; + if (icmp6_ratelimit(&ip6->ip6_src, ICMP6_ECHO_REPLY, 0)) + break; if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) { /* Give up remote */ break; From nobody Thu Feb 13 16:46:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KQ0v8hz5mycw; Thu, 13 Feb 2025 16:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KP20r7z3NFs; Thu, 13 Feb 2025 16:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n34Q1Q79RDO9OJq4c2HIRHmUMji9Du9ALjoYZweDyYA=; b=D6m4WzlGdhng822JwdDe7NYQG+wYU6Q7GUAkqdn5GAQYsnPUbgxvTJLEGmiwbKvtRqjgQT yj5vHIdhmUaodqo2K5sVucfY6Yk3Gd0fgu9gLhqWkYKiIlbalnQVSStjfPjhwWtLuNXCNI 5r1wXE8yJtrDz6OLiq481qHK3jLoOvm+n2AOF5EvuU6wmn5ztvqqxROIVCpoAMirhW8GyJ vrdihPWPUjJmoZ69sXhzO5wp4JbYevvKNmEPc2EK5a0gRFzh347PpkT3ASStIMJX47WaMN KZpgNPXbnww+jI3yK7Wg5KiZo7DRFUj5vs6v+d43Dbd02DGU9KVReO6ewMRcYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n34Q1Q79RDO9OJq4c2HIRHmUMji9Du9ALjoYZweDyYA=; b=C2Je/lDsbsUjArgvkGsMpEQdkB5yeSQGsNRZlXl8d85FdO0AXdhn4tG7cUPHDUugSTfHzL kQ5F8KlUYisnigZScMpSCtQBa7ZVBf9ITl/yGAzs6ABCq8AvJOPtGOGGoYrZ5yIyaW8qO9 1hZ1JB4/lzuvchIp9L67xyewLrkN57I/fLyvjj3GZOmo4/o1qcREnnwmQqJYVOyZ11Vy91 3NgABzOxqoGvJSJSF0EIEwo2UpzIDQbm0ME+7h+O9RF00FguvDLkp26jNvuZmuNSdcT35D gKBEGNs21HI5SK5Vh7z3RcBu3UVis0ewo8Q37Gv0R/jEMobAtrZwqXEg/CUOBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465177; a=rsa-sha256; cv=none; b=kKE2ChIUn9qIf82j1ZpAvF/eHV8Kv+OpK1N3xLu+z42hw3vd/9klSQVNvkpOAiuwhf+n5x daQUZNBFBQgeoTThjcVskpJ0QMdaYgbVxTu7teZr9DBmFbAPjB1Aaib89okBeTcokp9pr6 a+Bxy1Vjw2JWQTZd+ODBSFjdJRmhz0aUDey2Pox9rsBR8P10UPDQiEKYvyzL0dA4iajYuS BXR2bDazem9GU2sdm055lCz9VV6RxtAwXamtmko6LnMmlIccCW4UAOJrgnty6vG/xKZIJw FflLFTqjw+VVzSzhu92ia0Tbg97195S0wwagW3sZMjoCdO+qp9vZ1AcPVaYeUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KP1SfyztCh; Thu, 13 Feb 2025 16:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkH5t041676; Thu, 13 Feb 2025 16:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkHjT041673; Thu, 13 Feb 2025 16:46:17 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:17 GMT Message-Id: <202502131646.51DGkHjT041673@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: ebda0be762bf - releng/13.5 - icmp6: bring rate limiting on a par with IPv4 List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: ebda0be762bfeba92717ed642bb4f51e02b5793a Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ebda0be762bfeba92717ed642bb4f51e02b5793a commit ebda0be762bfeba92717ed642bb4f51e02b5793a Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:01:36 +0000 icmp6: bring rate limiting on a par with IPv4 Use counter_ratecheck() instead of racy and slow ppsratecheck. Use a separate counter for every currently known type of ICMPv6. Provide logging of ratelimit events. Provide jitter to counter open UDP port detection. With minor tweaks from tuexen@ to fix merge problems. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44482 Approved by: re (cperciva) (cherry picked from commit a03aff88a14448c3084a0384082ec996d7213897) (cherry picked from commit 1cc0ac5ef37e134c26d93d4544633b458e46aa78) --- sys/netinet6/icmp6.c | 181 ++++++++++++++++++++++++++++++++++++++++++----- sys/netinet6/in6_proto.c | 4 -- 2 files changed, 164 insertions(+), 21 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 09cb893b57fe..e1b0196fc62b 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -123,16 +123,10 @@ VNET_PCPUSTAT_SYSUNINIT(icmp6stat); VNET_DECLARE(struct inpcbinfo, ripcbinfo); VNET_DECLARE(struct inpcbhead, ripcb); -VNET_DECLARE(int, icmp6errppslim); -VNET_DEFINE_STATIC(int, icmp6errpps_count) = 0; -VNET_DEFINE_STATIC(struct timeval, icmp6errppslim_last); VNET_DECLARE(int, icmp6_nodeinfo); #define V_ripcbinfo VNET(ripcbinfo) #define V_ripcb VNET(ripcb) -#define V_icmp6errppslim VNET(icmp6errppslim) -#define V_icmp6errpps_count VNET(icmp6errpps_count) -#define V_icmp6errppslim_last VNET(icmp6errppslim_last) #define V_icmp6_nodeinfo VNET(icmp6_nodeinfo) static void icmp6_errcount(int, int); @@ -2774,6 +2768,128 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +SYSCTL_DECL(_net_inet6_icmp6); + +static int sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmp6errppslim) = 100; +#define V_icmp6errppslim VNET(icmp6errppslim) +SYSCTL_PROC(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, + CTLTYPE_UINT | CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Maximum number of ICMPv6 error/reply messages per second"); + +VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter) = 0; +#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) + +VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; +#define V_icmp6lim_jitter VNET(icmp6lim_jitter) +SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Random errppslimit jitter adjustment limit"); + +VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; +#define V_icmp6lim_output VNET(icmp6lim_output) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, + "Enable logging of ICMPv6 response rate limiting"); + +typedef enum { + RATELIM_PARAM_PROB = 0, + RATELIM_TOO_BIG, + RATELIM_UNREACH, + RATELIM_TEXCEED, + RATELIM_REDIR, + RATELIM_REPLY, + RATELIM_OTHER, + RATELIM_MAX +} ratelim_which; + +static const char *icmp6_rate_descrs[RATELIM_MAX] = { + [RATELIM_PARAM_PROB] = "bad IPv6 header", + [RATELIM_TOO_BIG] = "packet too big", + [RATELIM_UNREACH] = "destination unreachable", + [RATELIM_TEXCEED] = "time exceeded", + [RATELIM_REPLY] = "echo reply", + [RATELIM_REDIR] = "neighbor discovery redirect", + [RATELIM_OTHER] = "(other)", +}; + +static void +icmp6lim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmp6lim_jitter > 0) + V_icmp6lim_curr_jitter = + arc4random_uniform(V_icmp6lim_jitter * 2 + 1) - + V_icmp6lim_jitter; +} + +static int +sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmp6errppslim) || + oidp->oid_arg1 == &VNET_NAME(icmp6lim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmp6errppslim)); + new = lim ? V_icmp6errppslim : V_icmp6lim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmp6lim_jitter) + error = EINVAL; + else + V_icmp6errppslim = new; + } else { + if (new >= V_icmp6errppslim) + error = EINVAL; + else { + V_icmp6lim_jitter = new; + icmp6lim_new_jitter(); + } + } + } + MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter > 0); + + return (error); +} + + +VNET_DEFINE_STATIC(struct counter_rate, icmp6_rates[RATELIM_MAX]); +#define V_icmp6_rates VNET(icmp6_rates) + +static void +icmp6_ratelimit_init(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) { + V_icmp6_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp6_rates[i].cr_ticks = ticks; + } + icmp6lim_new_jitter(); +} +VNET_SYSINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, + icmp6_ratelimit_init, NULL); + +#ifdef VIMAGE +static void +icmp6_ratelimit_uninit(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) + counter_u64_free(V_icmp6_rates[i].cr_rate); +} +VNET_SYSUNINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, + icmp6_ratelimit_uninit, NULL); +#endif + /* * Perform rate limit check. * Returns 0 if it is okay to send the icmp6 packet. @@ -2783,24 +2899,55 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) * XXX per-destination/type check necessary? * * dst - not used at this moment - * type - not used at this moment * code - not used at this moment */ static int -icmp6_ratelimit(const struct in6_addr *dst, const int type, - const int code) +icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code) { - int ret; + ratelim_which which; + int64_t pps; - ret = 0; /* okay to send */ + if (V_icmp6errppslim == 0) + return (0); - /* PPS limit */ - if (!ppsratecheck(&V_icmp6errppslim_last, &V_icmp6errpps_count, - V_icmp6errppslim)) { - /* The packet is subject to rate limit */ - ret++; + switch (type) { + case ICMP6_PARAM_PROB: + which = RATELIM_PARAM_PROB; + break; + case ICMP6_PACKET_TOO_BIG: + which = RATELIM_TOO_BIG; + break; + case ICMP6_DST_UNREACH: + which = RATELIM_UNREACH; + break; + case ICMP6_TIME_EXCEEDED: + which = RATELIM_TEXCEED; + break; + case ND_REDIRECT: + which = RATELIM_REDIR; + break; + case ICMP6_ECHO_REPLY: + which = RATELIM_REPLY; + break; + default: + which = RATELIM_OTHER; + break; + }; + + pps = counter_ratecheck(&V_icmp6_rates[which], V_icmp6errppslim + + V_icmp6lim_curr_jitter); + if (pps > 0) { + if (V_icmp6lim_output) + log(LOG_NOTICE, "Limiting ICMPv6 %s output from %jd " + "to %d packets/sec\n", icmp6_rate_descrs[which], + (intmax_t )pps, V_icmp6errppslim + + V_icmp6lim_curr_jitter); + icmp6lim_new_jitter(); + } + if (pps == -1) { ICMP6STAT_INC(icp6s_toofreq); + return (-1); } - return ret; + return (0); } diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index cfa368e7f7b0..0416d938995f 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -409,7 +409,6 @@ VNET_DEFINE(int, pmtu_probe) = 60*2; /* ICMPV6 parameters */ VNET_DEFINE(int, icmp6_rediraccept) = 1;/* accept and process redirects */ VNET_DEFINE(int, icmp6_redirtimeout) = 10 * 60; /* 10 minutes */ -VNET_DEFINE(int, icmp6errppslim) = 100; /* 100pps */ /* control how to respond to NI queries */ VNET_DEFINE(int, icmp6_nodeinfo) = 0; VNET_DEFINE(int, icmp6_nodeinfo_oldmcprefix) = 1; @@ -592,9 +591,6 @@ SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO_OLDMCPREFIX, &VNET_NAME(icmp6_nodeinfo_oldmcprefix), 0, "Join old IPv6 NI group address in draft-ietf-ipngwg-icmp-name-lookup " "for compatibility with KAME implementation"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, - "Maximum number of ICMPv6 error messages per second"); SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MAXNUDHINT, nd6_maxnudhint, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_maxnudhint), 0, ""); /* XXX unused */ From nobody Thu Feb 13 16:46:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KS5qXpz5myVN; Thu, 13 Feb 2025 16:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KR5h2Sz3NVq; Thu, 13 Feb 2025 16:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGXjiGNcblNuSj5JtLaZdYw0AeOHLCzU+b07YqCfmJA=; b=TeL5GOwJmCKiu/AGKNscpvNoqAhmC3VfeLJJP/ImHJEWHZkWz0bWu3BQNWf+UfWAxikQ1g Gi5kOc1JMqbPPcHbFz3JPBjDU0kTZXTqETPiVJCalXzAaqQm/NQmiSeCXpQP+6B+BtGjJQ 0afdjfW1SzUcWDbpj5Do+Hj89utm6t67uGeiAniYOSoA9CrphZX/ZgWpoq2HG+i1+TJVik r/pKucNqN9vuNIPM0lm8yP1PpxoBIxlmctQrI/TUsjYohgHjQl9D9/icvqVCOfUX22glSJ bCRsrD+0hLkAgzmYpV2SGeNYda80+e4HUpA9OlqwP/KOZPlOBgmtcB2Glba73w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGXjiGNcblNuSj5JtLaZdYw0AeOHLCzU+b07YqCfmJA=; b=ai6YPdM1REtBHH20rUrJ4zYxU7MyG9Krh5lial7p7GeH3/yDsO4LgooufZKXhmnZqHLIpk nHyh4IGTQ+/dkWTTtq4qrQPbMGVg4vOQrXU9F2+yeCG+rbh1p8deoXUHlkkKsaXtVdIQkh vKBVlbqA3xCX/gxkYR9lBDr5lu4X8QPAvkv9C/jrhpxVbB2NN92bgS4dwWlEGy5b7sxYhZ w2ckIAyfmgpVRg6v03zS6uHF8byR3RJ9ZzMf/vNFEgqOqU2cffqO8qsvMfSoPMvy0kOoZ1 iHLPEEu+4aDJ3lukyDk2y+sOX7WPFg19jaa4l3JTMivrPDOfEmjUAq+J3eWGkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465179; a=rsa-sha256; cv=none; b=ZYQKKDdQd9kEdWA4xJdcr0J9syJ1cKSlcChLbgOG7QUMaFI3FW076mUArpk2h1U5wT+fpe oma0dkF3YyHsBCGN17H3JkDY2UUpPsjOJvQLhKdDpiQ4khqZgcSQ6/wNEhsnAuAat7sy4x yTNQvawSDjup4fRECLX9T8SGYJ69o/zH4rs+gnP+TevQByjWHGrnFQgVYTPXRmfz3ozMMZ JO3gzwUi8ILAbAOzMrdOiMwX2theroP+WH2hA/6TB+Ym+QoES7MdSxBLTxgU1sJmB659v1 M9rikHa8kzRf6JIQuUDlW3QhPzF5wzwOWgZO9jqR/36bKMZaTJfhBspQh8jjcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KR37pCztJ5; Thu, 13 Feb 2025 16:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkJWn041740; Thu, 13 Feb 2025 16:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkJ62041737; Thu, 13 Feb 2025 16:46:19 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:19 GMT Message-Id: <202502131646.51DGkJ62041737@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: a3b66c4bf0e2 - releng/13.5 - icmp: correct the assertion that checks limit + jitter List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: a3b66c4bf0e2eec0f86cd4d291158575aef05dfc Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b66c4bf0e2eec0f86cd4d291158575aef05dfc commit a3b66c4bf0e2eec0f86cd4d291158575aef05dfc Author: Gleb Smirnoff AuthorDate: 2024-04-08 23:54:19 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:03:13 +0000 icmp: correct the assertion that checks limit + jitter Fixes: 4399e055ea610cdefa1470ad1ee614dd81ba5e56 Approved by: re (cperciva) (cherry picked from commit f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f) (cherry picked from commit 1b4561cf4b46ffbbd8851aa40bd0402a6bba8906) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 8ad6191f3097..67adc1245b60 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1142,7 +1142,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter > 0); + MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 646c73e8abf0..a26348640cbc 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2856,7 +2856,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter > 0); + MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); return (error); } From nobody Thu Feb 13 16:46:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KT62Thz5myVT; Thu, 13 Feb 2025 16:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KS4b89z3NGb; Thu, 13 Feb 2025 16:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lLEsuaG/2Ogjh90PjYPmaOm2qPYLlgxcNeZU9iQfIgg=; b=fOtVPaEwxuT1yeTysmQG4x9TgTSKkeN+degTnZq3Mr9ipZU63D12cizdmfc1EtCbJwjoI8 FMn3zdZVTgnIcaQkqvh38jFm+kukF6bXY+TCbhGw51UGTY8FQaYTq40pZmvXtqRx/h/kqO BoJjcugzOxPFWtXjWnYjo0Cv0dAtFfrxvFH5sZ07O+qQ48vhCAR0flPz7Dj1ou7Sfr70DN mbCOrp9Oq+r2QpzMd11imnIyGTzg3KZiDSYDs0cyUGilcgZyUQvZMQjxNyoP7lE6z7pY31 Uiva91YKAT2SgSUOp7kM9r0ZawiiBs+Ot2/gxBO9xHy2GQzqfPwIwgGIH5qU5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lLEsuaG/2Ogjh90PjYPmaOm2qPYLlgxcNeZU9iQfIgg=; b=q4iwGbBLrJt6E1DcCqxhx124u1nnDpuLzEbN/6L1St3v2DmujcPSncX6mLmhJTiPZA8RVD hcVHVHsAt2C+g5sByLn5rl0B/LXxTs3IhkvJ9LpyjHvhopgur8IoE7WlMKsgbzn0omLJHd zone8zv9+Q6KdczuNpF9sdrNB7cympGlpYkxfU5O5VWpvmoC7oEoZuRLJw00mtFaXNmk41 lRT+pRHUg9FFIYmxuW0iBve8Nstfvoc5TR45YTCvvH6saMsbRsS17eAbAmHKnNZx56Y4/m eYp9FlIATDiCm5yuNgi3DM+Fx8RMEMy8BILS1plZR1AFEtKFlgLFbRG5yw2ovg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465180; a=rsa-sha256; cv=none; b=c4eSSVvF6Ry6nCQXSx5ljQkDz3MEt06dyAQ4jJpdNdPE26DShtSg7g26wo7Q0amZTuZXvn sBxybHzsFM0pJkmVV8jEGA6x/m8HzbAe+mwLshfwYyw3u/pOgkaHpbztqkyPwF2+enkmz6 1S/Whh8ACM5vtz8WpH/5cS1KmY9S5wDlAZxjDJo4oULEMq/DCwaUrHJZKyywek5aoJeKTt vC9+nYfwTgSCvg4VgU4H2ptS2edFLDhax1Q7XJI7xflQf8kcKVTxuBirdNiD4ld4ZDMOQo AxDsqfXvM1MFgPDIaHepm2++iwyXHowGVU0JgNCoZ9Wc7313mMZgEhasqOFZGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KS46HvztTp; Thu, 13 Feb 2025 16:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkK0a041773; Thu, 13 Feb 2025 16:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkK4x041770; Thu, 13 Feb 2025 16:46:20 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:20 GMT Message-Id: <202502131646.51DGkK4x041770@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: 5f2744d520e9 - releng/13.5 - icmp: improve INVARIANTS check List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 5f2744d520e914a38770681ef75bee501dd7b49a Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2744d520e914a38770681ef75bee501dd7b49a commit 5f2744d520e914a38770681ef75bee501dd7b49a Author: Michael Tuexen AuthorDate: 2024-12-12 14:40:49 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:03:55 +0000 icmp: improve INVARIANTS check Actually check the conditions that are enforced by the error checking code instead of a condition which is * checking a number to be non-negative instead of positive * depending on a random number Perform the checks consistently for ICMPv4 and ICMPv6. Reviewed by: glebius, rrs, cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48001 Approved by: re (cperciva) (cherry picked from commit c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2) (cherry picked from commit bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 67adc1245b60..f4b697f30eee 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1142,7 +1142,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); + MPASS(V_icmplim == 0 || V_icmplim > V_icmplim_jitter); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index a26348640cbc..52430f9146ae 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2856,7 +2856,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); + MPASS(V_icmp6errppslim == 0 || V_icmp6errppslim > V_icmp6lim_jitter); return (error); } From nobody Thu Feb 13 16:46:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1KV5Mpwz5mygK; Thu, 13 Feb 2025 16:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KT64Hzz3NPx; Thu, 13 Feb 2025 16:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taGkLT0tGkGiXvT7jt6JInV8OfpWMCpjQrYiKrRuNx0=; b=udDwtSGQDV8X7J+Ey/lRbOyydXuppJYYcNIJAyTSoKzSbgFgwvvToH83l4IGi7/yQoxHbr O68O4cwb0u9jBwoNXn0nnyoYA7ZcoepRBWfzxEIBrMQJhMUnI0kOER4szmV8wsl1QJSYvE Ob21vR9Xyc0NZtMZUIa6u+2cpIcdGlPhmK72U/glKxjDuULoTxzgg08cyBCymqOyGbxLY5 4+VfeG3UlrocI9BMMqxNLQRnhJpp69sjlLbidL/OaBIX5VnWsowgEgMyD86x1Zife+yq0p 9InRgmCO4GamvB6hF5TkYwnR3zxi4S43utP4qMDPhKsw2ZnsnXCfXGWKbHF21w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taGkLT0tGkGiXvT7jt6JInV8OfpWMCpjQrYiKrRuNx0=; b=G7NYTn2RJTzcJO1PXw2g39ry66r9WHQiNAZl2dbhnmR5GP9bWbVdPCSUP2utOxSxtWBt30 rQCJL4ZRg/TWGbN9YC5Y34ORFDG6OuZkxOAOWKxuscgBdirtC3kNFiMiv3MCHbQ9VfNSyp cragc8LMc27UEbsIIhEI8+PLTAv5fJK2Nn/+Pp5l2/+gQ6JGwqNAxhyy7fW5Z5ac4hznXk RYoDs/kCFWuoyN4P/5yr7uU4ENg1bOxHim1NzRb1L03qQdFdBmasQrJhG0zTKcxjotV4IC i31P1FDVOqI60SUe8Sv83GrT4rmcG7cuaKkNagq/k8jj7hAkHBKJTyHlDLNU2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465181; a=rsa-sha256; cv=none; b=oy1ujrdhawKOuJC8ofSytdl9lRs9i+j2n0VH1ro1Z1Vn7Smlgd/UVkyFg9enEZeV7FbGGM 9TriOxc4EsiSLOHxiFksPy+8Yku5pQJaXUWlx0r+H2kWTK9rQvr5XnaHetf0SJ+oSMnhf+ LrB+/bHjrTYmLe6nio9Lms2R7ga194Xh9NFjJ51JbIZ8x3Gpmg7KrVp+yWw1pLpzSVc2UK Zng1OZVHGDhux5NKsPSQc1Ixqq2lCjbzRxZLhOB7NsfbGhN5RR97dUGQhbn/sw8nBnICHc wIY+Q7QSbdnpGnAhZ/fVZUZLuQ3JFKzDv8R6283KMbYYrIfmvJ0xHQBtBFYKnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1KT5XdvztJ6; Thu, 13 Feb 2025 16:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGkL3B041806; Thu, 13 Feb 2025 16:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkLvl041803; Thu, 13 Feb 2025 16:46:21 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:21 GMT Message-Id: <202502131646.51DGkLvl041803@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: cd91df3292bf - releng/13.5 - icmp: use per rate limit randomized jitter List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: cd91df3292bf9f7a46ff9b8a49c87468844d90e3 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cd91df3292bf9f7a46ff9b8a49c87468844d90e3 commit cd91df3292bf9f7a46ff9b8a49c87468844d90e3 Author: Michael Tuexen AuthorDate: 2025-02-10 21:16:20 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:04:39 +0000 icmp: use per rate limit randomized jitter Using the same random jitter for multiple rate limits allows an attacker to use one rate limiter to figure out the current jitter and then use this knowledge to de-randomize the other rate limiters. This can be mitigated by using a separate randomized jitter for each rate limiter. This issue was reported as issue number 10 in Keyu Man et al.: SCAD: Towards a Universal and Automated Network Side-Channel Vulnerability Detection Reviewed by: rrs, Peter Lei, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48804 Approved by: re (cperciva) (cherry picked from commit 923c223f27e792e51ca13c476428adbbf6887551) (cherry picked from commit e1dd07ede92382bdcc52b3093e8f2ec5d9c88467) --- sys/netinet/ip_icmp.c | 20 ++++++++++++-------- sys/netinet6/icmp6.c | 50 +++++++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index f4b697f30eee..417a86672d6f 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -89,7 +89,7 @@ SYSCTL_PROC(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLTYPE_UINT | &sysctl_icmplim_and_jitter, "IU", "Maximum number of ICMP responses per second"); -VNET_DEFINE_STATIC(int, icmplim_curr_jitter) = 0; +VNET_DEFINE_STATIC(int, icmplim_curr_jitter[BANDLIM_MAX]) = {0}; #define V_icmplim_curr_jitter VNET(icmplim_curr_jitter) VNET_DEFINE_STATIC(u_int, icmplim_jitter) = 16; #define V_icmplim_jitter VNET(icmplim_jitter) @@ -1102,14 +1102,16 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { }; static void -icmplim_new_jitter(void) +icmplim_new_jitter(int which) { /* * Adjust limit +/- to jitter the measurement to deny a side-channel * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 */ + KASSERT(which >= 0 && which < BANDLIM_MAX, + ("%s: which %d", __func__, which)); if (V_icmplim_jitter > 0) - V_icmplim_curr_jitter = + V_icmplim_curr_jitter[which] = arc4random_uniform(V_icmplim_jitter * 2 + 1) - V_icmplim_jitter; } @@ -1138,7 +1140,9 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) error = EINVAL; else { V_icmplim_jitter = new; - icmplim_new_jitter(); + for (int i = 0; i < BANDLIM_MAX; i++) { + icmplim_new_jitter(i); + } } } } @@ -1154,8 +1158,8 @@ icmp_bandlimit_init(void) for (int i = 0; i < BANDLIM_MAX; i++) { V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp_rates[i].cr_ticks = ticks; + icmplim_new_jitter(i); } - icmplim_new_jitter(); } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); @@ -1184,14 +1188,14 @@ badport_bandlim(int which) ("%s: which %d", __func__, which)); pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + - V_icmplim_curr_jitter); + V_icmplim_curr_jitter[which]); if (pps > 0) { if (V_icmplim_output) log(LOG_NOTICE, "Limiting %s response from %jd to %d packets/sec\n", icmp_rate_descrs[which], (intmax_t )pps, - V_icmplim + V_icmplim_curr_jitter); - icmplim_new_jitter(); + V_icmplim + V_icmplim_curr_jitter[which]); + icmplim_new_jitter(which); } if (pps == -1) return (-1); diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 52430f9146ae..dd0044734c4b 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2778,22 +2778,6 @@ SYSCTL_PROC(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, &sysctl_icmp6lim_and_jitter, "IU", "Maximum number of ICMPv6 error/reply messages per second"); -VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter) = 0; -#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) - -VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; -#define V_icmp6lim_jitter VNET(icmp6lim_jitter) -SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, - &sysctl_icmp6lim_and_jitter, "IU", - "Random errppslimit jitter adjustment limit"); - -VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; -#define V_icmp6lim_output VNET(icmp6lim_output) -SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, - "Enable logging of ICMPv6 response rate limiting"); - typedef enum { RATELIM_PARAM_PROB = 0, RATELIM_TOO_BIG, @@ -2815,15 +2799,33 @@ static const char *icmp6_rate_descrs[RATELIM_MAX] = { [RATELIM_OTHER] = "(other)", }; +VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter[RATELIM_MAX]) = {0}; +#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) + +VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; +#define V_icmp6lim_jitter VNET(icmp6lim_jitter) +SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Random errppslimit jitter adjustment limit"); + +VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; +#define V_icmp6lim_output VNET(icmp6lim_output) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, + "Enable logging of ICMPv6 response rate limiting"); + static void -icmp6lim_new_jitter(void) +icmp6lim_new_jitter(int which) { /* * Adjust limit +/- to jitter the measurement to deny a side-channel * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 */ + KASSERT(which >= 0 && which < RATELIM_MAX, + ("%s: which %d", __func__, which)); if (V_icmp6lim_jitter > 0) - V_icmp6lim_curr_jitter = + V_icmp6lim_curr_jitter[which] = arc4random_uniform(V_icmp6lim_jitter * 2 + 1) - V_icmp6lim_jitter; } @@ -2852,7 +2854,9 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) error = EINVAL; else { V_icmp6lim_jitter = new; - icmp6lim_new_jitter(); + for (int i = 0; i < RATELIM_MAX; i++) { + icmp6lim_new_jitter(i); + } } } } @@ -2872,8 +2876,8 @@ icmp6_ratelimit_init(void) for (int i = 0; i < RATELIM_MAX; i++) { V_icmp6_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp6_rates[i].cr_ticks = ticks; + icmp6lim_new_jitter(i); } - icmp6lim_new_jitter(); } VNET_SYSINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp6_ratelimit_init, NULL); @@ -2935,14 +2939,14 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code) }; pps = counter_ratecheck(&V_icmp6_rates[which], V_icmp6errppslim + - V_icmp6lim_curr_jitter); + V_icmp6lim_curr_jitter[which]); if (pps > 0) { if (V_icmp6lim_output) log(LOG_NOTICE, "Limiting ICMPv6 %s output from %jd " "to %d packets/sec\n", icmp6_rate_descrs[which], (intmax_t )pps, V_icmp6errppslim + - V_icmp6lim_curr_jitter); - icmp6lim_new_jitter(); + V_icmp6lim_curr_jitter[which]); + icmp6lim_new_jitter(which); } if (pps == -1) { ICMP6STAT_INC(icp6s_toofreq); From nobody Thu Feb 13 16:53:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1TV3CLPz5mysm; Thu, 13 Feb 2025 16:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1TT4jvxz3TGc; Thu, 13 Feb 2025 16:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWQ2TQU9Evc356muN4yMIndJ4vkXIbxa1QGYgHImb0U=; b=qhqzkSjKvRNItbsJznIhBXcmJJkUDMPFtoWHFELJwrGTlOTIG3YN9iJrO9UrfxCTbwLuAi 9fMV5zdcm+iazeu/DJUcrv2XTVvy9KOu/aueMaI3T1DqOGaTB/hNqsRdzaoBZioWW6qDkF lFePwsgekg0Bxatwb1Wh5IBkuR0ttnFjL5njDsJEpEv9ZhT1UTaqn+Wbr3K9C44zJZVMuC 1DeFfoERkGeLBSWfsnNqJdWhOXX1qQhQednK2IeM6wl08mUCv/2mkq9UvChhFVZ0AF3dNk i7Z0rqi2ayaECPSGdJ7YfOapdiqvmgaePpohskoLoY67qnwPfMTXso8SYzar6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWQ2TQU9Evc356muN4yMIndJ4vkXIbxa1QGYgHImb0U=; b=CrZlLyZDKpXY3gSCvnjT7sF9A6IaZTiae6rB0S1t+Gg7S613k91wo4vl1hpUpY09/KzHko K42mPZvPz2uhnrnuUmKD3ioppSLLughOK5zIqUp3kOOO3SbZ53+TwOgfzWlrQlrsBxGZvh C6dz3FiINKtTXiIae6BZkPecVQinYTaTx5fy5r6gWwMywuecDAK5RIsky0ssspruM+/BtT syLIbxB0TpQK+hgsMu54w7RdkHQPda3HweanEcKVZn5SKQ7MzYEjBfzKwxlmscfJyeF7DU 5tDq5lyVoOL4T1m3jq9lClnBQe6ETovhTXzjNflw1a+UsZvcfKwDHYGInpfNFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465597; a=rsa-sha256; cv=none; b=q0kcBT4doVi3tReZ4DJpvAMqWDfBcg9cNp8WxjIBE+gznq3m9XIyBd002CPyBs0HB57/VF gVBP3RdEXhQB05qbO0bjIUOohuwGRmVyXeMC/JbIZ1OQq5H1WRGTSczsaB6aaIntn1Uk4W ddQukQFHbWBsh+Dv2fFJza94PO4DrFynVQqs6PhzPHgjh32uNsMAsFTgUfADcGVmWwd1JM 5BTaGebfJPfP99/PTXZA0Z+jJJcN5dqBACO/+9u9i6DF4dz7ZVD71WDdivu2FDNRne0tLB QT47f3L2EEZZWVwBh19GBpCFL8c9oAy5CQLazZRQaxSOShsXY/3N68eKolkoqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1TT41ScztVZ; Thu, 13 Feb 2025 16:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGrHpg059024; Thu, 13 Feb 2025 16:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGrHlv059021; Thu, 13 Feb 2025 16:53:17 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:53:17 GMT Message-Id: <202502131653.51DGrHlv059021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3afa8f08bcd5 - releng/13.5 - MAC: mac_biba, mac_lomac: Fix setting loader tunables List-Id: Commits to the stable branches 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 3afa8f08bcd58628aa276cec79827be625b23284 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3afa8f08bcd58628aa276cec79827be625b23284 commit 3afa8f08bcd58628aa276cec79827be625b23284 Author: Zhenlei Huang AuthorDate: 2025-02-09 15:53:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-13 16:52:50 +0000 MAC: mac_biba, mac_lomac: Fix setting loader tunables A string loader tunable requires setting the len parameter to a nonzero value, typically the size of the string, to have the flag CTLFLAG_TUN work correctly [1] [2]. Without this fix security.mac.{biba,lomac}.trusted_interfaces would have no effect at all. [1] 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag to automatically ... [2] 6a3287f889b0 Fix regression issue after r267961. Handle special string case ... Reviewed by: olce, kib Approved by: re (cperciva) Fixes: af3b2549c4ba Pull in r267961 and r267973 again ... MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48898 (cherry picked from commit 7d4c0fac8c7db9c5741ba98a8b3ce3c43feb1cf4) (cherry picked from commit 04f360b782205c799b9302ba8bd810f7a303017f) (cherry picked from commit 87836ab994c2ff9d442f84c174bd1fdead3cfa27) --- sys/security/mac_biba/mac_biba.c | 3 ++- sys/security/mac_lomac/mac_lomac.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 8b683dc380eb..04dd331835be 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -110,7 +110,8 @@ SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/Biba"); static int max_compartments = MAC_BIBA_MAX_COMPARTMENTS; SYSCTL_INT(_security_mac_biba, OID_AUTO, max_compartments, CTLFLAG_RD, diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index d878f9a7b965..7a2f340d85bc 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -111,7 +111,8 @@ SYSCTL_INT(_security_mac_lomac, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN, static char trusted_interfaces[128]; SYSCTL_STRING(_security_mac_lomac, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/LOMAC"); + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/LOMAC"); static int ptys_equal = 0; SYSCTL_INT(_security_mac_lomac, OID_AUTO, ptys_equal, CTLFLAG_RWTUN, From nobody Thu Feb 13 16:53:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv1TW1kLkz5myY0; Thu, 13 Feb 2025 16:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1TV5BvFz3TJV; Thu, 13 Feb 2025 16:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RElZc2OO8Mv1IrbcB1qhxlRvyIxkqzDPJ0CNaXOeH3c=; b=NRypvJ9UCyTQkVK3ltKOArEeMkZCmIKFMNjpDdJu3W7CQia8p6KnJQIsAZMcXrqAWpROZQ LarDrorxXwqeBB9BfS2iBBUZJzcn3y1Z97Xn24+4+GZtijNxJNTOJDIf+aRStWX5HLXxtS 8ZbkDsy75rAzqO/mamNjsFleGptFVSVJTJrFtP4T5M+9HAGhkxjow0H0HnTaJvKLSNeIf5 xq9A8vpmQAbuzWh1+Gq0nSdgC3JPAGVJ/faBS4nJRnze0t/xUtyvPvTH6fG0Y4nSmfnJ6P JAQ1r818HVzTOB2Q8gtgQunP12++cKPkAmejVKE8SO/JIXNZ24v2qus0ZrS20g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RElZc2OO8Mv1IrbcB1qhxlRvyIxkqzDPJ0CNaXOeH3c=; b=pP89KhAp76H0GdHovvHEcR7pOSkvoUTAScfezelNHDwENnR7m2qXSnJ9tGny0Rfe4IFuGx j2KNiZuvYdGkT8zUPyLagl+iWfwBGfw6uoLI9f5nWWfklb9VCkt50Q7w5YzqyhvLkEdc8W JQoLo5M5hzC+ixizlAMEwO0F/odhEfwKO2ilBO7RvZrFT3kKDZOrPGwYOLdoqOs+/uxtR0 JcCDKwU6ybjl8tTWaei3t7txyb4yiVytXL6MlS4qOT/mSVaCJUNidkN4BTXBKPHcmfGoO+ GEyEfivzwJJoVIlcwWQjlSu4QwSTslYn56zsO1T1geJTqP5z0yBE/M/Dtlie+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465598; a=rsa-sha256; cv=none; b=Lzfa6/mfnVqCpzfk6Fxq6JQG0vxZiPSKdUeXFDD7IbKJvQYngFAEaWvVI7gZRcKGJJ1GRr cDXtKM1df59kybxZmt4irlMSNmlBgjHoIeo9lprJOPZNjHPsK5jeMa3J2MNIXRSCcdFyAS xO/Jtm7Ku/RQLk6xQSzVPTYJb1df03rK/6h7InQ3T5/w90o+CBDwnU4iqm+UMsKVS7Rzut OCZjYBqmIwpc8T09ZCd/Kw7klk/IMCDjEbWPygTHAEiHCsWpuEvX6+sgu34qBQ3ejwAi0d j9E0GYboLSOaCFqJK9iHZvSvTH4YxjxGuy3zgNrwDup6gRNT2qmFa280/oVG9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv1TV4kfyztFt; Thu, 13 Feb 2025 16:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DGrIwl059061; Thu, 13 Feb 2025 16:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGrILH059058; Thu, 13 Feb 2025 16:53:18 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:53:18 GMT Message-Id: <202502131653.51DGrILH059058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6b0086795db0 - releng/13.5 - sysctl: Harden sysctl_handle_string() against unterminated string List-Id: Commits to the stable branches 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 6b0086795db023796af570dccaa942a3071899b6 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6b0086795db023796af570dccaa942a3071899b6 commit 6b0086795db023796af570dccaa942a3071899b6 Author: Zhenlei Huang AuthorDate: 2025-02-09 17:17:11 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-13 16:52:50 +0000 sysctl: Harden sysctl_handle_string() against unterminated string In case a variable string which is not null-terminated is passed in, strlen() may report a length exceeding the max length, hence it is possible to leak a portion of kernel memory to the userland. Harden that by using strnlen() to limit the length to the max length. While here, refactor the code a little to improve readability. Note that, when calculating the out length, the null terminator '\0' of the string is taken into account if available. This is not really necessary but userland applications may have already relied on this behavior. Reviewed by: avg, kib, olce Approved by: re (cperciva) Fixes: 210176ad76ee sysctl(9): add CTLFLAG_NEEDGIANT flag MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D48881 (cherry picked from commit 1951235537fb62150f1bb15dd7e170ac30853d35) (cherry picked from commit 8ca77f9f9ece9d89161d080eee6a1aa706001878) (cherry picked from commit dcd7286d902774428c08b179a72bfdcd4556ec06) --- sys/kern/kern_sysctl.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 371d521d8850..7a4feada157e 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1787,8 +1787,7 @@ int sysctl_handle_string(SYSCTL_HANDLER_ARGS) { char *tmparg; - size_t outlen; - int error = 0, ro_string = 0; + int error = 0; /* * If the sysctl isn't writable and isn't a preallocated tunable that @@ -1800,33 +1799,32 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS) */ if ((oidp->oid_kind & (CTLFLAG_WR | CTLFLAG_TUN)) == 0 || arg2 == 0 || kdb_active) { - arg2 = strlen((char *)arg1) + 1; - ro_string = 1; - } + size_t outlen; - if (req->oldptr != NULL) { - if (ro_string) { - tmparg = arg1; - outlen = strlen(tmparg) + 1; - } else { + if (arg2 == 0) + outlen = arg2 = strlen(arg1) + 1; + else + outlen = strnlen(arg1, arg2 - 1) + 1; + + tmparg = req->oldptr != NULL ? arg1 : NULL; + error = SYSCTL_OUT(req, tmparg, outlen); + } else { + size_t outlen; + + if (req->oldptr != NULL) { tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK); sx_slock(&sysctlstringlock); memcpy(tmparg, arg1, arg2); sx_sunlock(&sysctlstringlock); - outlen = strlen(tmparg) + 1; - } - - error = SYSCTL_OUT(req, tmparg, outlen); - - if (!ro_string) - free(tmparg, M_SYSCTLTMP); - } else { - if (!ro_string) + outlen = strnlen(tmparg, arg2 - 1) + 1; + } else { + tmparg = NULL; sx_slock(&sysctlstringlock); - outlen = strlen((char *)arg1) + 1; - if (!ro_string) + outlen = strnlen(arg1, arg2 - 1) + 1; sx_sunlock(&sysctlstringlock); - error = SYSCTL_OUT(req, NULL, outlen); + } + error = SYSCTL_OUT(req, tmparg, outlen); + free(tmparg, M_SYSCTLTMP); } if (error || !req->newptr) return (error); From nobody Thu Feb 13 17:51:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv2mf6LJBz5n3p0; Thu, 13 Feb 2025 17:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv2mf3tl6z3vlj; Thu, 13 Feb 2025 17:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p8+SalvNjkFEoYKonkAfZeviGQy88mN46U87ka2WuRQ=; b=EirkjXVD+Ia84R60XBBDn7WftlRFOLIDeZ0vDCCuz9CvGyw3cCXZcVJ6g28EPm/Tg7jadQ YimFySoOTOWWX70kmKKQBxCLIDASdzGGSV2OckQ10+eXaOSsWm8QLlQ2GI4MKOpuECcKFk ZQ8VHSl09hvo3xgudg3tpq1HEE8KybSM+NT+ZWP0pIaVQcEEp/7GT5aJHbnj9+gtOryYY0 DPQ6buy6Kv54lDXNUhAxss4iek3vm7LSwcEi7PhRL70hqO3t15UKGwDYPcMmbS8q8iTRWc 4xqQDz1aFgoax+2w7e2q8MZ3LPH/1lze3tpbknSNmwES2Y7NFbO6hZ8TWl9Afw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p8+SalvNjkFEoYKonkAfZeviGQy88mN46U87ka2WuRQ=; b=G5SKnncwgDzl/yuiUzzTywT2+IaQQQwZPiQcf3hJ4EjdeSfSI+NkacgOBy1o9jNLNERgfU +GA7tfYWL+pUfECCpNMpc74UKbd6u4qByq/c+3QwgRj+DL4Z3cybALa3x4M98RvvOBA9PZ JrutjNoon1h3DZkD2Bip7lHvA0eBb//2P6hfnmrQdI53iS7csQNJgBHjgCbsZysAhx81uI oo1hOKSnahAyP+4BLcHsZexoF8hZVRHdz/vjodh5e8CWDb5tIOsKbStcuY7Yy9sCB4Utt/ UAYtAwJi8SlnvXBf9zvXujBr0TJB26eWPOSh5gY8S1b/usoilnwKluVEKCoJtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739469090; a=rsa-sha256; cv=none; b=felH0nyWZ1aCcGnHF1gpn5FG6GWcYoA+Q5EkICB5B+tQZF5H7cfCZj8D4yKTEh1G0P1K6w PHnzld5F702Lvin3JaidAsIO4db+If04ERkD3frcMKnuidH7MwgyGhvdzAnqD2ov3jwHi4 3Ru/TXJBYrIyG1uehF4FYcFftQKnT1SHoz24+kOzw5EwsuEJFCdsyPnj4uQMCPNJZBSJns KGhqZ1FnVIb1aLuQdTvwVfoLpDPH1rabjzzWzjw3HI5fgYF7Hui3bJPXIGMroZde9Odvw4 5BbuDRyVATe8yAhas7F7dCS7WYBuFTPgE0qLBA3/lnvNn4Endzq/+1v2hLcthw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv2mf3NqLzw6h; Thu, 13 Feb 2025 17:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DHpUIM069220; Thu, 13 Feb 2025 17:51:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DHpUEa069217; Thu, 13 Feb 2025 17:51:30 GMT (envelope-from git) Date: Thu, 13 Feb 2025 17:51:30 GMT Message-Id: <202502131751.51DHpUEa069217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 720d25547745 - stable/14 - pac: Consistently use item count as the first argument to calloc List-Id: Commits to the stable branches 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 720d255477453f77b1200880db4b9e776327150e Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=720d255477453f77b1200880db4b9e776327150e commit 720d255477453f77b1200880db4b9e776327150e Author: John Baldwin AuthorDate: 2025-01-03 15:41:36 +0000 Commit: John Baldwin CommitDate: 2025-02-13 16:01:23 +0000 pac: Consistently use item count as the first argument to calloc Reported by: GCC 14 -Wcalloc-transposed-args (cherry picked from commit 22956bc9dc907296196a37525a6726f6ba2c06ed) --- usr.sbin/lpr/pac/pac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 5eb5cab02353..d79b84c4ab9b 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -260,7 +260,7 @@ dumpit(void) hp = hashtab[0]; hno = 1; - base = (struct hent **) calloc(sizeof hp, hcount); + base = (struct hent **) calloc(hcount, sizeof(hp)); for (ap = base, c = hcount; c--; ap++) { while (hp == NULL) hp = hashtab[hno++]; @@ -338,7 +338,7 @@ enter(const char name[]) return(hp); h = hash(name); hcount++; - hp = (struct hent *) calloc(sizeof *hp, (size_t)1); + hp = (struct hent *) calloc(1, sizeof(*hp)); hp->h_name = strdup(name); hp->h_feetpages = 0.0; hp->h_count = 0; From nobody Thu Feb 13 17:51:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv2md3P7Xz5n3ZL; Thu, 13 Feb 2025 17:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv2md2y43z3vrC; Thu, 13 Feb 2025 17:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Vei3qUMMLtTGkXAFVabP9kbczUi1vQF1vCoChb8eBc=; b=lkf4u9E8iL9W7UQDyrQgg2p1/4zJypm7uifKapkcsGfI3137sYiEruzXOJ5xnC5ex+HHzp kFzMqwt+ZLbn2Q9Unslvjn8SiE6PBX5PUW6hYN8+sDBTdR2yrU+iltaWIPszpP4iXZ6Fxa xqVM7fStG3RK4g5U7gCEZkWIipgzEVaDzL1q4o+V/1EdOADKSA6k3lW7F6QtyVMpAGMGa7 UDbc7kchvKVGGOce9VB8kVr36DdBbGn17YvRy76aN8eJXTDUT1pvywJFjflRRxZokPgSEU OslFnFldkzjq/ORWjO3wbylaxI2ZbwfX9X/BEo/lwrgGiUI9SZ2DnUT6nJXRTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Vei3qUMMLtTGkXAFVabP9kbczUi1vQF1vCoChb8eBc=; b=e8kCe3Hq7MwgsSlWdBOpiZAtnI7M5KeVia7EIHtJufJ5uaDF3v06CgTgYDCwm6rTInW4Jd S15ATEMHY9wdPR5uEfjRh4oJUTcSRHvkVfuMbL8hMKAujLcUcfk277RQ9Rd+ROBJHyMqVf CTPkjmouPBMCpIMZGXDgji2siaXyiH6ABR8beN83VWwqc5ga5HaVl0y96IHBuy66Zrp6iQ 0iKYBJlGWo+khtsM3AB/dwzkKcMcr8nuyrOvuvhj5KTj1uCU3FwP6gB0+hY3/05PAk8l3h 9q9XPydY+WiwKBo9bNcySpUW1lmU/HNO/VPT9NnvH9Q0cO1QoIB13sXTRspb0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739469089; a=rsa-sha256; cv=none; b=GTKgFfMJ2P7VpKCvfLufLtb7JKgdyNzbFL4vFRrfO/W6nN3Y4C6u+7s5evfENGg6bVwmDn E1uSt6SCfPD5NAuaVNDmtnNa/okikaCTZ9D8/+oIH805mwESn+N0hWDSOx6ClziiORuCW7 yQEFPH+76XMemILV1CS+neCOFgQXhIPv3xvrMH0vAj7S3UlQamwMwWZM6J20/Cqz96+Ngk tgHtu7b+EdDy9eh8dtjlfEe2R1bMFks90B9zCwh0MNFvle8gaM4ZpIO4a0SuUl4tw7mfzO V8HlvQ4XHpsGX2u8TTIk6hv5t3dxAxHWO+HAoJGhdNfnf/jYl3aaRzwjaj+pcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv2md2TDtzvq8; Thu, 13 Feb 2025 17:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DHpTXJ069187; Thu, 13 Feb 2025 17:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DHpTDp069185; Thu, 13 Feb 2025 17:51:29 GMT (envelope-from git) Date: Thu, 13 Feb 2025 17:51:29 GMT Message-Id: <202502131751.51DHpTDp069185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ac2170b99551 - stable/14 - pac: Use strdup and asprintf in place of dubious string building List-Id: Commits to the stable branches 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac2170b9955134c66f0e820b9dc1daa8f4d0e6a3 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ac2170b9955134c66f0e820b9dc1daa8f4d0e6a3 commit ac2170b9955134c66f0e820b9dc1daa8f4d0e6a3 Author: John Baldwin AuthorDate: 2025-01-03 15:39:44 +0000 Commit: John Baldwin CommitDate: 2025-02-13 16:01:19 +0000 pac: Use strdup and asprintf in place of dubious string building GCC 14 warned about transposed arguments to calloc, but these cases are better served by more abstract string functions. (cherry picked from commit f94513a3a36b50823c3918c93ee5c6bf5f525e91) --- usr.sbin/lpr/pac/pac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 85c9327f433f..5eb5cab02353 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -339,8 +339,7 @@ enter(const char name[]) h = hash(name); hcount++; hp = (struct hent *) calloc(sizeof *hp, (size_t)1); - hp->h_name = (char *) calloc(sizeof(char), strlen(name)+1); - strcpy(hp->h_name, name); + hp->h_name = strdup(name); hp->h_feetpages = 0.0; hp->h_count = 0; hp->h_link = hashtab[h]; @@ -441,10 +440,8 @@ chkprinter(const char *ptrname) errx(3, "accounting not enabled for printer %s", ptrname); if (!pflag && pp->price100) price = pp->price100/10000.0; - sumfile = (char *) calloc(sizeof(char), strlen(acctfile)+5); + asprintf(&sumfile, "%s_sum", acctfile); if (sumfile == NULL) - errx(1, "calloc failed"); - strcpy(sumfile, acctfile); - strcat(sumfile, "_sum"); + errx(1, "asprintf failed"); return(1); } From nobody Thu Feb 13 17:51:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv2mm1FNkz5n3ZX; Thu, 13 Feb 2025 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv2mm03zXz3w15; Thu, 13 Feb 2025 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PH8qgt8tuQH2NcFC+u/eAKsir22r0E24qJK4TECu/xU=; b=ecTGG3ktMcg6ZDPH12yMFuWBFUS11LbsKhUIFahIOpK8nxumRg1jbL9G4QPfm/rPEFDo95 eF4wP2lBd81VEePDHTOIPMddQP4jLc9HvWHUEAE7uuzdFK9ety8ZXNaFvwxPnI38kCC8p+ Hf27gUYb4u40cO33W1aRsLOMjC69ipQMGWrGkOAbnCrBC78ey7ZHIw4C+G0rEvTkiNvq+q eJHhNqBXELboEneCq85FFJiWBUP5X0PzhYgjGWDJHh8100XMW7v3lWiobTuCmAy4WeyWlg UvL35usYOX531v1ZaI1PIYzeDNWZgzkf6cqBMu407/DJim6MEpZoZzilK1rZdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PH8qgt8tuQH2NcFC+u/eAKsir22r0E24qJK4TECu/xU=; b=ZhP3qg8vfLKUueIUNC70ENdj405GW+G52Srg0SOuULx/GE2Qa/xE01FRkRH+KlcRZHfKB2 4o9rCAcxrWBxhbJv61PfwMdkMrAqzFv5V3TDi5XJt5CXuJin0WYw+KvIkhvtwhwvmxXW1/ ZRaIa/ybkiK+rWTdwNummsOrwumnGgLZedymp6HZDRRedGcGYdAp/JaQc+MvOOGfOX7R9Q UOE2IJ4fRulwlvwqKBy22vlw3J2ofVFDDOg787HOE6ixfb7L4e9g2oX23R+s2buX3Ejy4B krbjuZ3cfqlgp8NTBuJxN9ggRebKk1TdvHmAbHCM2KZW804zirGtpDushMkMQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739469096; a=rsa-sha256; cv=none; b=vxJOZRXK9+3iSIHUVsVk4RVWLQLql4NRzA1Xa5iD1446cfBRspYB6zodiIuB141hphR0xD mdWThVtXAiqZLaSg0LSvnTmyQeVucL7HRTazcnaDkm7p02LEqGuDLZJQjRZs6S/24HgEX3 n8bdRbYBjAPktbn3RHhv+/X8soFxj+yVfXgl/ytS7KGOn6Flkzfs/06EYT/AFPcpsJJVGz SNt65+trOsQn07hhtTbcNlNT5efDvzEsRzhSYDcVlsF/MJRQKFmloPOFSHknqh3Ho78/r1 tQSUec9rzwM7xOJai4EWsPk510vN9Ys0l9RCs6uwz+wmbe9Wmv+hgv4ffXSOeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv2ml6g3KzvkV; Thu, 13 Feb 2025 17:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DHpZUZ069377; Thu, 13 Feb 2025 17:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DHpZeF069374; Thu, 13 Feb 2025 17:51:35 GMT (envelope-from git) Date: Thu, 13 Feb 2025 17:51:35 GMT Message-Id: <202502131751.51DHpZeF069374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 74a5a7d84236 - stable/13 - pac: Use strdup and asprintf in place of dubious string building List-Id: Commits to the stable branches 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74a5a7d842367f239c7d6f628c3a97f9a467ed84 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=74a5a7d842367f239c7d6f628c3a97f9a467ed84 commit 74a5a7d842367f239c7d6f628c3a97f9a467ed84 Author: John Baldwin AuthorDate: 2025-01-03 15:39:44 +0000 Commit: John Baldwin CommitDate: 2025-02-13 17:49:02 +0000 pac: Use strdup and asprintf in place of dubious string building GCC 14 warned about transposed arguments to calloc, but these cases are better served by more abstract string functions. (cherry picked from commit f94513a3a36b50823c3918c93ee5c6bf5f525e91) --- usr.sbin/lpr/pac/pac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 85c9327f433f..5eb5cab02353 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -339,8 +339,7 @@ enter(const char name[]) h = hash(name); hcount++; hp = (struct hent *) calloc(sizeof *hp, (size_t)1); - hp->h_name = (char *) calloc(sizeof(char), strlen(name)+1); - strcpy(hp->h_name, name); + hp->h_name = strdup(name); hp->h_feetpages = 0.0; hp->h_count = 0; hp->h_link = hashtab[h]; @@ -441,10 +440,8 @@ chkprinter(const char *ptrname) errx(3, "accounting not enabled for printer %s", ptrname); if (!pflag && pp->price100) price = pp->price100/10000.0; - sumfile = (char *) calloc(sizeof(char), strlen(acctfile)+5); + asprintf(&sumfile, "%s_sum", acctfile); if (sumfile == NULL) - errx(1, "calloc failed"); - strcpy(sumfile, acctfile); - strcat(sumfile, "_sum"); + errx(1, "asprintf failed"); return(1); } From nobody Thu Feb 13 17:51:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv2mp0qxKz5n3m1; Thu, 13 Feb 2025 17:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv2mn1F6Gz3w3P; Thu, 13 Feb 2025 17:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p/b1nXmd6YlXnPRmmS6ydGzrKLOnI4oT+cNv0XM6ww=; b=lY6tzaXKp03UmknG10SQMsnRSEd3YsgZgYbBTNTdH+z9pG3AibMv6ZxrnSGCTOQzRBmkq7 Z5bE5N0xzzeLmzcfCVLukP5TSunvd/iZda0c7Up52iRNChlpiu8ibpGiJoXS0NeVzHpFgH 5KTi1u25xjj1SFBtxxuJe7V1pYRvgZP9UgVmleGlNbPW2fUOx88xXnCrtLN2nEFdcrBhKx tMpkmYhsA+qehhe768rmPps9VLMejpGEtLWnugvmY4xQimsaLk7SV02CNNAaL00Lrt/3rU EALijpHAzVIVzcZO3FiFmLd7XUmtMKa9eXy8xzBlgCxWW4FIpF3pQ70Pf40VDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p/b1nXmd6YlXnPRmmS6ydGzrKLOnI4oT+cNv0XM6ww=; b=q4BCZpLWBbrik2m8HsZLtQYWhMMNVOlHPlBnAcI7yGKPD0xlXN7my8+BSxqKDzsOVJ3gFu NmE1824gR5hgAHbeXRwaZtzjyC8ewo3D2lcK/pFKC/Djf3KQo22/NfJ68XKz2vd7UFovlL g60cgijn44ac9/wxpguaiBf5NdOwLtuyunOI4/2PXhwPR2I28Zuch1Euma7xr2Xl/ItRBE E4Z1PUa3brYHr2pxH1woF78lsuzyXfvADzBvv1sim+RVQP5ngQIZR81RLBsOToS5ZjpNcl IIhKYsp/whu5P09pJMFHvs92MGlLXhsPL0gbemrPK2GnT4STrlKNoIKU3Evu3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739469097; a=rsa-sha256; cv=none; b=OoP/G/TOhADAecQ/UpsP+5Ls9p6zneiKN+qkwgcYfAhR/VpgIcu1Lb4DR3T3EzU3DbXgkl k2jzr2phX/a/q6xZ7YcuitxCPlXJr2wqYzrqBsDwgd1tlSDopKpgWXuNTq9zwJWvxSymFX cj9s+imn1JKfZPuiYhNsDDzwQlNQKy7TdgoYGpdsS5o9jHYI2/bTusCiJjE8GWh7g9N4ma cSkV5XNWWZYzJRIJ/el59sYnFJdlPqnL5jvx7Nuiu4+wNDUm5jblfN+fsAgMCjVldxRc0U 0g8XNRSkEmb0VKsgXYVDvf40OFMA1SbrSPlb4HcopJA1mRVyh3VZABg/XroCDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv2mn0f3ZzvqC; Thu, 13 Feb 2025 17:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DHpaae069414; Thu, 13 Feb 2025 17:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DHpaGE069411; Thu, 13 Feb 2025 17:51:36 GMT (envelope-from git) Date: Thu, 13 Feb 2025 17:51:36 GMT Message-Id: <202502131751.51DHpaGE069411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 749ec2967ed3 - stable/13 - pac: Consistently use item count as the first argument to calloc List-Id: Commits to the stable branches 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 commit 749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 Author: John Baldwin AuthorDate: 2025-01-03 15:41:36 +0000 Commit: John Baldwin CommitDate: 2025-02-13 17:49:06 +0000 pac: Consistently use item count as the first argument to calloc Reported by: GCC 14 -Wcalloc-transposed-args (cherry picked from commit 22956bc9dc907296196a37525a6726f6ba2c06ed) --- usr.sbin/lpr/pac/pac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 5eb5cab02353..d79b84c4ab9b 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -260,7 +260,7 @@ dumpit(void) hp = hashtab[0]; hno = 1; - base = (struct hent **) calloc(sizeof hp, hcount); + base = (struct hent **) calloc(hcount, sizeof(hp)); for (ap = base, c = hcount; c--; ap++) { while (hp == NULL) hp = hashtab[hno++]; @@ -338,7 +338,7 @@ enter(const char name[]) return(hp); h = hash(name); hcount++; - hp = (struct hent *) calloc(sizeof *hp, (size_t)1); + hp = (struct hent *) calloc(1, sizeof(*hp)); hp->h_name = strdup(name); hp->h_feetpages = 0.0; hp->h_count = 0; From nobody Fri Feb 14 00:01:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YvBz267zXz5nT0w; Fri, 14 Feb 2025 00:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvBz20KpWz3H3k; Fri, 14 Feb 2025 00:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739491262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTHGm1ce/uQDKLK9/sQkc1Ox+WPl9Sxa/jswG80BmUw=; b=kIffAjA225sHqvRDR2tlwkB8xXc32zoooT/cyXmVFsJz0SqPBvcqj7xSuXTvlnbcqFEwlc ekO71HZTMloXlBX0/rFOGHUU10TtIKNO7Jg8YZntypbQWipU9UHGdcrvF9XFZhNdu9Icnm 6tn3sdtauzeBOqr3TRegbL6FsBaEYgAqntkAuftSQy7ZW/jBI498TvX8gNJCA0ggWtbGAB igO9AoqbUKUQ9rVWKKkSo9l1VHDzG24d21DH9h6G0C16Y+IxOc2r3geVmg2y0tND9vHvDV o5yPvtK7USWh3GzdkSqn5b7Uv75xmremGGVgm008mwj4CXxBMRR5KRAxXNv95Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739491262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTHGm1ce/uQDKLK9/sQkc1Ox+WPl9Sxa/jswG80BmUw=; b=CBM2Jcz/PzL5+IipyrA9gFdsE0aUdXSixCwsGzNO8+cDXzXJH1B3Iv/nzzO1XxQeTg6Mtk IxlrZdM3gDGYg8vVwPaTI5pUNikrNf6D6/6NX4KYRgQZCmf5zHNQeZA6FfnStJQc0qTVZX uFjvR1qgaOCfx2dKnaFxYkPI16xJpQKRjX3A7UuJOpfYsELUcAvVZZu406sZBucOTPsbcZ Ph+dwpzYPTmx6i/wb7y1gs3oLxA7fctBAJn1EIQfXoYlQiPcIDsCEZiJ+QWhFMsyt1VK2x pv25YeM3vS1C9h3Hv9H0Yd6FBx562+J38iTMstHjkdmNPYcnA3Q3a5Wtww/vYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739491262; a=rsa-sha256; cv=none; b=J+6nB6+haDl5bTAib17cv/sJ0btVYvJYdd2HpzyWrfa6pq+dTUCxRV9fGZvggxrRGMa16V CnyfhsdQ8mpxClqSszgm25gOZUuzYyEEbw7tVrX6nuBhrpG6MWmuVEkTUure7cjfKugdK4 hgnynDWs/Yrv8MF12IqcjQHgGGacErK/T2GTBX9riUACOeZ/T1Fr4V9KJnQaB960ea/bEQ dkL2O3g/uRM3tWoruQFhWY5btk9kfhCPlcOcgMKi5n/ZoOgxkY/r/Mgh8EjBAEg2KvJCX1 ey/AifFJn/vtPhIJNg8L+ULQ7EfvwyyKw+n8+frGTUKsBQ16Ihl3Xfwch8aIbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YvBz172XDz1699; Fri, 14 Feb 2025 00:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51E011qw060044; Fri, 14 Feb 2025 00:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E011u7060041; Fri, 14 Feb 2025 00:01:01 GMT (envelope-from git) Date: Fri, 14 Feb 2025 00:01:01 GMT Message-Id: <202502140001.51E011u7060041@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: 6e06a07978cd - releng/13.5 - 13.5: Update to BETA2 List-Id: Commits to the stable branches 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 6e06a07978cd3d7672336147a2fe78b2adf3456a Auto-Submitted: auto-generated The branch releng/13.5 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6e06a07978cd3d7672336147a2fe78b2adf3456a commit 6e06a07978cd3d7672336147a2fe78b2adf3456a Author: Colin Percival AuthorDate: 2025-02-14 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-02-14 00:00:00 +0000 13.5: Update to BETA2 Approved by: re (implicit) Sponsored by: Amazon --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 62f49bcc6584..db4cef33816e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.5" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Feb 14 01:24:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YvDqm722pz5nZ0l; Fri, 14 Feb 2025 01:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvDqm6bkrz43GS; Fri, 14 Feb 2025 01:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hKexVI+Ji0XZBcuTNhU0hxOvY5bvRRjMQNBnts7Lcbg=; b=C0esaWKJVm+Q8ssKd+0lAB5MfxTiXSeTubDya98S01035oGy6CesYNT/9OSEkDACONCD78 BK2ugNkFVpOtQ9YDSmouwiy+ZvbEIOxMKkU3mbOxo2ne/LcpkprNyX9eRcBLs6clsW9bEs iCaCSGI4YnsXkiVnaApP+DXBRx0KWvRyShzczJF3lIvh7Nye577nnvQkNcpTVsXj6AzJ2D drXuTWQQyta9hPSvtqzD6vI6L0A8VTNIO11tFfr5nY5WoaS7E5X6gns9V0TDkcxcBi0Ow7 1f+F28gmbxmgFgHE5+K1OsokhKlLSnjohAAhDQY+PCZiJMyvr6AaDxAe5EB9lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hKexVI+Ji0XZBcuTNhU0hxOvY5bvRRjMQNBnts7Lcbg=; b=LmGBHpfCNwJkWmUg0cYA0Zd/wMm++EGyZel3lKj/wGbrQf98aIM2LgsdOq+aHXV4y/C8Ep uXMz2TUA+5TqeOEs7Dz5aWqwvIMfxC8L3K4zEi3H3AZ9qP6ukRGI3V3cUDpII8KpXZPps7 NdXOOJNhpX/cR99Fe0gJktx8QLEb8fQZCar4vmB7zF4zmyq8qjMMQ2GoVEchCg2hbR0kdG eqF/VEc2kFSeDc+0FuNM6cHY4ey/hBGZC/YV5MPdvvYNbretjEY6+c10+L015MgMbwImqG THshgAvoY566xXrewN19aYL795IJsMEoJSC9JEspPSqoVEcxTGAJsnSLt0GXKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739496292; a=rsa-sha256; cv=none; b=J6KjlGB2xpDWfyoITte2P0NHQsWdf7Q5ZgA3Oyb5dXPDqkz1kIXKb6vIgho0j5oS8yIvqP xoLzZS5/pZ3OJg4HQ78M6j2fQM9csTn3QNrO5krzHbNk0s0Lj9F5tbzoN/Tn5aTJoz6P45 qx1f9AAeFVFCoSHBsov3csFqN5E7gRFV+dSECFVb4DAy7TSht0p8sPMJiPv35bg0mDi/LF FgyxW6wqORI/+v4EUMqvfbP5f8fFh6RZZemcUjUghQgGBXO4j2e8CShm+Y4HwffXkH4zE6 4pxZLbP7oitUwgnFZ2/5fGZmlzAkx1HnZZB3HqqzpkbMFZv6sEkjmtybXY5b5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YvDqm65Jpz18X3; Fri, 14 Feb 2025 01:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51E1Oqg7013948; Fri, 14 Feb 2025 01:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E1OqEj013945; Fri, 14 Feb 2025 01:24:52 GMT (envelope-from git) Date: Fri, 14 Feb 2025 01:24:52 GMT Message-Id: <202502140124.51E1OqEj013945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 0d1eed3701a8 - stable/14 - ixgbe: Add ixgbe_dev_from_hw() back List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0d1eed3701a836d0a8d0152619b1dccc96c810ba Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1eed3701a836d0a8d0152619b1dccc96c810ba commit 0d1eed3701a836d0a8d0152619b1dccc96c810ba Author: Kevin Bowling AuthorDate: 2025-02-11 03:40:51 +0000 Commit: Kevin Bowling CommitDate: 2025-02-14 01:24:31 +0000 ixgbe: Add ixgbe_dev_from_hw() back This got lost many years ago in 8eb6488ebb0dcd92517625e4833ddf7d26e3b3a3 It is used by the driver's DBG printfs. (cherry picked from commit bf6f0db8a762966b08430692c92ae34e667948db) --- sys/dev/ixgbe/ixgbe_osdep.c | 6 ++++++ sys/dev/ixgbe/ixgbe_osdep.h | 1 + 2 files changed, 7 insertions(+) diff --git a/sys/dev/ixgbe/ixgbe_osdep.c b/sys/dev/ixgbe/ixgbe_osdep.c index 2fa651df8936..892924712c38 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.c +++ b/sys/dev/ixgbe/ixgbe_osdep.c @@ -33,6 +33,12 @@ #include "ixgbe.h" +inline device_t +ixgbe_dev_from_hw(struct ixgbe_hw *hw) +{ + return ((struct ixgbe_softc *)hw->back)->dev; +} + inline u16 ixgbe_read_pci_cfg(struct ixgbe_hw *hw, u32 reg) { diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h index eca15f0f3816..cf7c578fd684 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.h +++ b/sys/dev/ixgbe/ixgbe_osdep.h @@ -197,6 +197,7 @@ struct ixgbe_osdep /* These routines need struct ixgbe_hw declared */ struct ixgbe_hw; +device_t ixgbe_dev_from_hw(struct ixgbe_hw *hw); /* These routines are needed by the shared code */ extern u16 ixgbe_read_pci_cfg(struct ixgbe_hw *, u32); From nobody Fri Feb 14 01:25:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YvDrN0yCQz5nYx7; Fri, 14 Feb 2025 01:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvDrN0Hgjz43cg; Fri, 14 Feb 2025 01:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nA/fAWgBRG2Oo/UgkpBdavuvu5dX/Zn855D/2tolQp0=; b=Jhvxj+yF1J2Zw5hoSkcgTqhnpdwnuLd9mgvfZsI5dqd5ZYktw8UA/MGN+ZJvRUYrXlURsW lPWp4jXl7+Qp8pvaxtWE3WdRC0tcjCkT2Gfd4uEC9OQPBZ5AiyfkTny+KxdSMWvjByJQ0J zVeIXIKnnqOvG6di2c+iqc13x4DeYSzSf5HFY0/GCoZOObgItvcq86dlpqAOij/JlTu+8i CmWOEeu4SEvR0amX8rfPVSSCOkZyl/hB40MECO2ucB1SMijqc6XyEpao8liD6r8PpDdMiL HHwaT0BzWV4vKkNZb3QFbV2wE6bN9A90Bug7wgX54IYvsnTmAMTMUmjVTV2Q4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nA/fAWgBRG2Oo/UgkpBdavuvu5dX/Zn855D/2tolQp0=; b=e98g9KXI1frkkJeDo/diRYLBwKtU3R6C8GjTdnPYrpbWwgagSQcJ7d1I8fl99o3CINioF4 4Q1os9XU9GXqpsYJVWU03v/eYzrwrkRXT1wjFd9KS8sfOBATgsUzTg3bPj919uymacRBEh 1KJ3KCtLrGnOS9h4tDnP6KDx8gFO+3+JocjFLJ+P4MLXFGW6GrSO0VBW4trdO7rHg98n5A QCfuuUQDm+x2n3ueLOQDMGPN9FTAIIwMxurNbKpMmVXR7GkYZd8wKizJg6p4zXXx49eJyL PUmwkKMV/w0h6KFPIL7NFLTn2UW8Vc2TOUs3LJ2aZzz0bptVcCoD7Y43tSFnOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739496324; a=rsa-sha256; cv=none; b=Kju6WU2BbLvqjU4nJd25mLbnZqsukA1sJpgdwXpUeWryFQQy6G0DygY05ntvvwKCbK3foa rAQVsNUVvQCl4efAURSZ3zE3IbpD6VhjAf8BXX9QU4uqiU7BHTdeyHTSCNWimsNYlAJ7xk /CPveylEO2tnHxnT+nh1cQ6QfxZmKk1D77Jk/8xywu4wwZhwpEi891fHvq7dreqqApy57A sAa8wE7T82dC10CFSL42K3isp7st032jjfueI9iRM0UETMRdh/OjL8fAZ947fRAgpM6ePY F0XGhvd/BJg9JwFHgBon28b0jidVcXFZ2nCC05L0I+bRX0YP30l4g+i6UOTXNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YvDrM6zC0z188W; Fri, 14 Feb 2025 01:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51E1PN8n014191; Fri, 14 Feb 2025 01:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E1PN9b014188; Fri, 14 Feb 2025 01:25:23 GMT (envelope-from git) Date: Fri, 14 Feb 2025 01:25:23 GMT Message-Id: <202502140125.51E1PN9b014188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4759b165d598 - stable/13 - ixgbe: Add ixgbe_dev_from_hw() back List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4759b165d5985d6c3b0beb928a1f99efe79b294e Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4759b165d5985d6c3b0beb928a1f99efe79b294e commit 4759b165d5985d6c3b0beb928a1f99efe79b294e Author: Kevin Bowling AuthorDate: 2025-02-11 03:40:51 +0000 Commit: Kevin Bowling CommitDate: 2025-02-14 01:25:09 +0000 ixgbe: Add ixgbe_dev_from_hw() back This got lost many years ago in 8eb6488ebb0dcd92517625e4833ddf7d26e3b3a3 It is used by the driver's DBG printfs. (cherry picked from commit bf6f0db8a762966b08430692c92ae34e667948db) --- sys/dev/ixgbe/ixgbe_osdep.c | 6 ++++++ sys/dev/ixgbe/ixgbe_osdep.h | 1 + 2 files changed, 7 insertions(+) diff --git a/sys/dev/ixgbe/ixgbe_osdep.c b/sys/dev/ixgbe/ixgbe_osdep.c index 2fa651df8936..892924712c38 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.c +++ b/sys/dev/ixgbe/ixgbe_osdep.c @@ -33,6 +33,12 @@ #include "ixgbe.h" +inline device_t +ixgbe_dev_from_hw(struct ixgbe_hw *hw) +{ + return ((struct ixgbe_softc *)hw->back)->dev; +} + inline u16 ixgbe_read_pci_cfg(struct ixgbe_hw *hw, u32 reg) { diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h index 7aabfea66484..6dad776eb056 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.h +++ b/sys/dev/ixgbe/ixgbe_osdep.h @@ -209,6 +209,7 @@ struct ixgbe_osdep /* These routines need struct ixgbe_hw declared */ struct ixgbe_hw; +device_t ixgbe_dev_from_hw(struct ixgbe_hw *hw); /* These routines are needed by the shared code */ extern u16 ixgbe_read_pci_cfg(struct ixgbe_hw *, u32); From nobody Fri Feb 14 04:59:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YvKZy0SL4z5nnH3; Fri, 14 Feb 2025 04:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvKZx6NrBz44ss; Fri, 14 Feb 2025 04:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739509145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vDVHKzCx9Ipu4U9HTi3GOfISC6cBPwsQXZWwHG+vsSg=; b=OpdL6cYo8H1l2soe84ZYC8fSOZLAACLaK+WyFQec60eB+E91PkR+OpssMXyF2d9lPh9zwP 7XG764rch4dgnh92Ow0lsWEqRI3EXOtSCxYS2Myl9CviV7tJdAiSx15EymNyRtjkIUB6B0 XGhOBakVsEaZANetiZ/3gFzB0X+5nEC6dc9jbp7AnxSvokutt00qFIOFi8CoHG15BY3np1 IkvXOxkRI1SnztqxgLWSs3PNDhx6LlPCeLXjfijDX6MVf9zgFGZroaRpqRhnUA3Q6yJmtX 4hw1oDwq2grKfXLwX2CMzpZVOiJzNA1Gvl6H5gZFriZeO377B73OmNqTBSLwxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739509145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vDVHKzCx9Ipu4U9HTi3GOfISC6cBPwsQXZWwHG+vsSg=; b=u+yZ22UgPAcJkQ5KdmTSYltQsFA+tFG4LOgg/azi+JaqVlH01fdOgMIEY1zsAALCnqHSuY gIbHwe3KR+N5zzMWHqkPsvENwYcEXc4xzGxl5IwZdFuY03QCu5mBjUWG0O5ZLOBJBltWBH mOxvsZNvwTZy9UDZwTfUt2jfGPSIkCsVKL3XQjY1D3wCklJTStbvdz8CAEx0VdrasKdo4Y hJNtShTsVtjpSVTQ/WqwDdcj91Y05SMQv9uDKN+18z2tyLUdLj7N4Z+339TuWVxCp9Y5v8 EdeTqlttA8MrKCu5mzn1zTMjPQc5ZwcBZJefQaqmUhk4hPwh/v/PI4UdPVbPUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739509145; a=rsa-sha256; cv=none; b=Mc0HWcNcG2OPFCzBB060axeWWYpjlsS5TS/GHFPdW84GCBwb6XbEVrc7V8E8JWHLjCvmJ5 xp4/n/lJVlNeE0kL+IkngshVxNWxYZ4XW8OKD4gehNl9FOm47XH7wbRuDhemKNSz2DSwi0 WO5gLXtiDPY/X7Ml01sSEtFW3h8AYdNuj0oBGx1HWKohqX5JEvGG00g8KHLL4w4O9I/QUx DiluFNLU9zom3yXOntL+7WBTWf37nTwpyzD8kNwTELcsWIXDQeiYU1tG+OR/sHSbDM75tO kPiEETvp+k+NW2kkWVxGRK9koEQ3DIJ6FU2DwmfF8965NlIYzLyvZYqarBuPTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YvKZx5gysz1dL; Fri, 14 Feb 2025 04:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51E4x5Qu009689; Fri, 14 Feb 2025 04:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E4x5M4009686; Fri, 14 Feb 2025 04:59:05 GMT (envelope-from git) Date: Fri, 14 Feb 2025 04:59:05 GMT Message-Id: <202502140459.51E4x5M4009686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 54b0d4845a89 - stable/14 - cxgbe/t4_tom: Plug an stid leak. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 54b0d4845a89c7fa8c6f916ff872a1171000b9ad Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=54b0d4845a89c7fa8c6f916ff872a1171000b9ad commit 54b0d4845a89c7fa8c6f916ff872a1171000b9ad Author: Navdeep Parhar AuthorDate: 2024-12-08 03:34:30 +0000 Commit: Navdeep Parhar CommitDate: 2025-02-14 04:57:54 +0000 cxgbe/t4_tom: Plug an stid leak. Normally the reply to destroy_server() releases the listen context but it is not called when the adapter is suspended. Release the context right away in that case. Sponsored by: Chelsio Communications (cherry picked from commit 45d5b9f0324a13df06712b7a9df5f2fbe8475764) --- sys/dev/cxgbe/tom/t4_listen.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c index 8226c44669ab..0292144502c3 100644 --- a/sys/dev/cxgbe/tom/t4_listen.c +++ b/sys/dev/cxgbe/tom/t4_listen.c @@ -769,6 +769,8 @@ t4_listen_stop(struct toedev *tod, struct tcpcb *tp) if (lctx->flags & LCTX_SETUP_IN_HW) destroy_server(sc, lctx); + else + inp = release_lctx(sc, lctx); return (0); } From nobody Fri Feb 14 04:59:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YvKZz0h0vz5nn2q; Fri, 14 Feb 2025 04:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvKZy6Nlfz44sv; Fri, 14 Feb 2025 04:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739509146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TY3lHY8onlQiapDczZTyJ2U4/+15sM9B9xO89HIK3So=; b=toGMgBrTacCPZQ4QqgJXmwYajVp7MYnzzUzdaFIT4mPHdoHvjPh0V1gCypoiTmoQTlF4iC w5rSazZ42WajUsq3RbEvgdTXd+jZtscpZHShfLClHVYVCazNbe56c1hSYX4HOBoDQvQM3i hvf6wz5SMUqDH+E35Aze8Wat2y9oL7nA6XALhBB9VzyZQRb5j1qM9PE9Cj/80XE82Woe0v V6QMY0Hwnz4fgHkuiS6imGacCOX7SQm00grMojiByno3MxHQ+RkuJ64+/sJ1CeSwkD/umV z/WDDCOJNNWXKn8hCLCkuOTTbwVnbyp3aT4LeVDwpq0IalLlVHI4jWNg13pvUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739509146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TY3lHY8onlQiapDczZTyJ2U4/+15sM9B9xO89HIK3So=; b=daBKNiJrpoBI1JTQkWSavNeYoXXCk3v5nciGEsmnHiGRuYZy8rQi3REjfsu9udbjkzoQ+H X7l6Zz+POOXbRfPv5lFD0ZjYereiabPRZQFG/9N/8+RIM024wkEAxhexnAoVCCvFs1jtIc Fru1wcjekFPEmyOhmttrjJm1lANuF/2A3XbR2Nh41Sz/xgH0pFWOT6Iaw+PTy9BiYZMCUk yKLTS/byOZGQ2jhiVT6wI2Q7Cbz1MszFU2saCAKo4AgDwC/Z7Ed7KBLTnqpS6bXhJ2PJpv 7oMGDVeTdmWEQTwcQn3XOeSfLwaly6rrNKbjJxy07N4IHqv98uEi93JiIF4ZzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739509146; a=rsa-sha256; cv=none; b=qy///XUL3lNlfveqTYlY2/xeCTkP5xZYLfb4jG56QgdzMRSQgVuQNN+xWz/WKHbVDKOg92 6MicBuCvfOVDTuP+xEGPj9vmKfNnI3SUM0Xjih7UYjFVjivUnU2k/cLBu+teftSrJkVyGP 4BulRTQf7J07S2DUCMhjCSr1hXVYhTouMjhUknF4O56AK+MU2RpO8odkMtdga/lHsK1f5i uX4DJ3GnVejslqq7OB7YTWR6KwwrdRoREVYV4OIqF7Q/PY4MTMFhGx931p0+Lh9XSfIF+E x0kSIR+KBAvShDUtc9Q5VRWzKZsGB6f6nSwGz5oqHTtTyH3BzVC1UXSIDQE1kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YvKZy5yfJz1tf; Fri, 14 Feb 2025 04:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51E4x6OK009728; Fri, 14 Feb 2025 04:59:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E4x67U009726; Fri, 14 Feb 2025 04:59:06 GMT (envelope-from git) Date: Fri, 14 Feb 2025 04:59:06 GMT Message-Id: <202502140459.51E4x67U009726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 03bbfb01cc31 - stable/14 - rc.d/iovctl: Start the iovctl service after kld. List-Id: Commits to the stable branches 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03bbfb01cc3110a7452b6e70f97cc760a41e6b24 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=03bbfb01cc3110a7452b6e70f97cc760a41e6b24 commit 03bbfb01cc3110a7452b6e70f97cc760a41e6b24 Author: Navdeep Parhar AuthorDate: 2025-02-07 20:08:31 +0000 Commit: Navdeep Parhar CommitDate: 2025-02-14 04:57:54 +0000 rc.d/iovctl: Start the iovctl service after kld. Drivers, including those that support SR-IOV, can be loaded via kld_list and it makes sense to process iovctl configuration files afer all drivers have been loaded. Sponsored by: Chelsio Communications Reviewed by: 0mp, jhb Differential Revision: https://reviews.freebsd.org/D47937 (cherry picked from commit 41594021fa8bf02468407e8fc48c2e7a13de1a2f) --- libexec/rc/rc.d/iovctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/iovctl b/libexec/rc/rc.d/iovctl index 01e16221cc4a..8e9490f37c0b 100755 --- a/libexec/rc/rc.d/iovctl +++ b/libexec/rc/rc.d/iovctl @@ -3,7 +3,7 @@ # # PROVIDE: iovctl -# REQUIRE: FILESYSTEMS sysctl +# REQUIRE: FILESYSTEMS sysctl kld . /etc/rc.subr From nobody Fri Feb 14 19:25:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YvhpY6MXVz5nXYJ; Fri, 14 Feb 2025 19:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvhpY5jpdz48jL; Fri, 14 Feb 2025 19:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UxUhhPbSnoN9n/ehMRjxW9pIsBQ0Zq9VLDeU8mm2as4=; b=r+d+AUfg+h7GxFXTYgszF3nga9NcQeGPOdQ0fiOrOZyaWKiaQFUD/v/Xo91OwuncPAheI3 HubK3kPNFdirjyDsIC6nxvIYjws+PPOz/J3o/br35DCBvyrZWep2FXPQHwvsfo5j9gLnmR TwwW4F6DiSUihHpr5A1Ldqmp0ykgOov8bcILgFbBNeBNY2SuRzDOc60oEXgyFX0celxGMq eaBMdL1dxUOwAqS/AoRXYjsbTGrJ/pbu+JsTISMe+Cpn9BlTZlkC8V3Pnh23yvK3aRdb0m e6RMcHaS6QUe5KmejRfMgaen4XiRkx5gdcza9cRZz1KQfHUAEvDDlgwVnAWYYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UxUhhPbSnoN9n/ehMRjxW9pIsBQ0Zq9VLDeU8mm2as4=; b=IIynlqLC+ogT/8EoG5GT3tTyBfBh1wl2LdnA/T3zgShdTxxQWBd6RDVdDN/R+kBGT4MkjJ /H27i2mtfNtHYDB11chPwViuSzKBuLmGhpjTcphcMOBbuN1A6pLHquMnf9br3sjHNGpZul 24Yi35nRuWBCnUSzcCUn1MUrNy/xzgM/RYNPfPcfo2w3q1M+uW8LG8kiqD6F/7eiadJOB4 xVb7xvJU0qrYgddUgbZ1PTqXtp5vDQZXex0cEaaT6gg8KRGSaMz2sd5Z0Y1DutRS0MKhlk xD7R16BOO5ecXNuvF7ofQh5a9oNBdecSj2PAGoIXPKo6tJ5jTh0qovjwxu5VQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561125; a=rsa-sha256; cv=none; b=puKkuemE2/S6cxbAM+Qh+ApNkdv0TYMM1zjB+Q24tb+ZDVFogCig7brPyyABdo7k0grjsJ ukWpbLLu7dfiDnXgxeLva8bjzC4wfEn8G2PHWhjTXYEWavrfg4NHjdGDD/G61nRgLQ5YS0 iGk2FbVS4CEB5oy4p5mUtF1qqzNQHlfKCGNEqe6SqzAv03DEa+J2TXSiWg6UdkvJLuQTLA h+R/dCMFYRxQfhoJB/ZLrnslTGvdbnoDq1g/miM2zDH8GSn6ePme8JLtpNA/3pKuOlVxIr 6gd1sgA1Om+zyij6ZoPfsqi5yA2JYLaqhjFbXa4P4OZx73gmFHlcMWIX0iBVhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YvhpY5KG0zkkr; Fri, 14 Feb 2025 19:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPPGU038713; Fri, 14 Feb 2025 19:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPPSh038710; Fri, 14 Feb 2025 19:25:25 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:25 GMT Message-Id: <202502141925.51EJPPSh038710@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: bfe8eb702e1e - stable/14 - dtrace: Remove the noinline qualifier from dtrace_getarg() List-Id: Commits to the stable branches 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: bfe8eb702e1e3db696e021da65ca5d883d62e1c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bfe8eb702e1e3db696e021da65ca5d883d62e1c5 commit bfe8eb702e1e3db696e021da65ca5d883d62e1c5 Author: Mark Johnston AuthorDate: 2025-01-25 17:22:02 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 dtrace: Remove the noinline qualifier from dtrace_getarg() It serves no purpose after commit 82283cad12a4. No functional change intended. Fixes: 82283cad12a4 ("dtrace: Avoid including dtrace_isa.c directly into dtrace.c") MFC after: 2 weeks (cherry picked from commit 494a2b14722e8955af54e306305f462e5765c1e4) --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h index 222f8e206da1..10ba0d37ac1b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h @@ -1272,11 +1272,7 @@ typedef struct dtrace_toxrange { uintptr_t dtt_limit; /* limit of toxic range */ } dtrace_toxrange_t; -#ifdef illumos extern uint64_t dtrace_getarg(int, int); -#else -extern uint64_t __noinline dtrace_getarg(int, int); -#endif extern greg_t dtrace_getfp(void); extern int dtrace_getipl(void); extern uintptr_t dtrace_caller(int); From nobody Fri Feb 14 19:25:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpc1r33z5nXNJ; Fri, 14 Feb 2025 19:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpc0QZwz48jp; Fri, 14 Feb 2025 19:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AftY76POuyE8iWEKB2TRwbkomGqezUQldYWcqBbq2tc=; b=kVZcKeKqQ8grF9YOBJzVtYdDwxSc0s/qcQB+1N+RptnbVGE3oXI761rPvEPxp6tBtVrY3n J086oj8K01z0C1AOyqMicQoqkH19Kud/AopqglRYA48YHWQiyo7N/YxU3SrJAuaaencJQr RptVSdrt0wQRF3SWOuv8JcY+0Eid/J/CZl3FsxpgoiromY/YyIPHB1K2rgMbJWi2d9IB1f bubU2/jIihzfHG9N4lyae/sa+ccOqw+E9pHNzQpFhrW0r0AMy1Vx0/QcPaN22PeV/A4DUn 9KTDa0ENqg6tC4nQbefaNV0lNc3LcAs9fxAbE8KtmS3qu9oPxzDVSC4FodS9Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AftY76POuyE8iWEKB2TRwbkomGqezUQldYWcqBbq2tc=; b=GT8XoLzzEMRQZp2t1YuXW0gt0aRXldgquF+44ah1RLHVf8t+1ptphSRoMMASRN7eqOQk1c yTEWIuNzuyXYpCSTlgg0XzgF5PNyJf/KHVEeIGVTGxIxaWLWvhqBs24hqtsnEvEkpZZgwB AvA7dsiqq6efegyqr6yD2wUpE1s1a4mk0YWSmxyl548Bxic+nuEoCMx5KmiV1nekos5S2A JVK5rIATOr8AxMcWbCrqAIVbHcNO80reo+eCLT3/rifWtSi4Z9y7+UBiDYGe9dlj6/ulIN wPsy2ldJxXVLuSmRzoGTeS0pKSq05sN/k+uWsVkOzricHagAcOqjn6h51RGR8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561128; a=rsa-sha256; cv=none; b=gC2OwxhCFApAV8AcD4s/PrBls/Olc9c5xknBVG+LiDKggj6Dk2A7+Qt2BmVpqJiyBmagR6 PeoE3+Q1o2qBfBS1LkPCPBqT8SQLQOTDOsFgxvne+6mK/25aYQ3HRij8SQepdFiMqU8GIR 7AuDCN6if6oFvyyWW4xKPdgZBFRC38I/87XeS7mCznxm4VqD/sBLLxdL6g6r+W3AuEefF2 izbvZkgkeVTcVXYKSToCiqOS8GphpkAhGJMxyS9L59pRxCYD7RkVqI/09A6+7w+ZviucMK DNOkvHU32STgeI3L+OokTZNn08Oc6yVYR94n+G6G50Jn9eQT+johm9ezjPokTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpb6x5kzkfc; Fri, 14 Feb 2025 19:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPR55038786; Fri, 14 Feb 2025 19:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPRpZ038783; Fri, 14 Feb 2025 19:25:27 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:27 GMT Message-Id: <202502141925.51EJPRpZ038783@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: f44f65ff03f7 - stable/14 - arm64: Clean up usage of the dtrace invop handler List-Id: Commits to the stable branches 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: f44f65ff03f7dd2ad508480dc5d8fcf4ce6f33a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f44f65ff03f7dd2ad508480dc5d8fcf4ce6f33a4 commit f44f65ff03f7dd2ad508480dc5d8fcf4ce6f33a4 Author: Mark Johnston AuthorDate: 2025-01-25 16:17:03 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 arm64: Clean up usage of the dtrace invop handler - Don't consume the breakpoint if all invop handlers returned a non-zero value. - Fix style nits. MFC after: 2 weeks Sponsored by: Innovate UK (cherry picked from commit 853cd8723494ccc2e972aaa09e7d04ede1508c95) --- sys/arm64/arm64/trap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 64a27b138a9a..fdcb7e708daf 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -538,11 +538,10 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) break; case EXCP_BRK: #ifdef KDTRACE_HOOKS - if ((esr & ESR_ELx_ISS_MASK) == 0x40d && \ - dtrace_invop_jump_addr != 0) { - dtrace_invop_jump_addr(frame); + if ((esr & ESR_ELx_ISS_MASK) == 0x40d /* BRK_IMM16_VAL */ && + dtrace_invop_jump_addr != NULL && + dtrace_invop_jump_addr(frame) == 0) break; - } #endif #ifdef KDB kdb_trap(exception, 0, frame); From nobody Fri Feb 14 19:25:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpb5wLjz5nXbj; Fri, 14 Feb 2025 19:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpb0CjRz48l3; Fri, 14 Feb 2025 19:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yIxxwJ/4/mSHKkj16/cpRNukWUmirdpALnNjhDFbwwg=; b=i0hJwVwtqnGcU20VI951cUDUwFXX/y6iNotFFh944TaeyzY2TI9HJJph0+lZLndn1JOuyR oPJjKdq2kIG13h2EqxTcsPUE/0q/kR1ZmQM8GmjSccHJyh/yJD6SSXrZMzek1FNPpzv3Jx LlsDZwxgGaVzaExfjCH8k5AKxg/U51bHNbfhd9Nw2IKP90OeDkR6m3+PWQAJgZR3AM0UMn ZpIZIvXc5gNmBYNTzNF0cTzuaHA2gxUXFFm7d3sBoFmCTwCi7FPPGgHKzKVO9qDNlW9Q4y 4CPNFAyc7FYhuNKc38sH/lBsYCsRNCjsodoQb62FfFGgag3aXTHbgtmiteJ/7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yIxxwJ/4/mSHKkj16/cpRNukWUmirdpALnNjhDFbwwg=; b=NNZKr0crXk0HycQ8biIsu/drMbiGNTjFH0NEEZOVlrPzjT7UkRj41+N6lk2TgzDz8Dd/VA PpBAZIao+KO8tlsvKYyuRy4xXTY4utfMu8kVuL22SkbQdGijKGQtBL9PQ89GUCKazWwwGn BFN3Y7MuefTsh1TQG1wrJhRD88l/lRc5+arB4RAgOzGXVAhTsP2GFI50DsehUTPJWFsgIc X1HycOTJBMK927qY00LADkBL+B9G/MogvpKAYaOZKOhJyiF/zy0CNRkINfd2Ds8Sx2PMrv +Gbu56OkUqxh7WWuhQYW8s6Jw5MwJZ64W1oqZfymqqyhwec5FlzLvRnkejDx+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561127; a=rsa-sha256; cv=none; b=blV84HQJ6VyCTer2rPNZ8mc/oxrKsPPuPY0lDz9t9QsORwgR6DFmfwUxCCEB8KLofpuqRK g5TANw1c++sm7onKxfsJKdQj2Jc38/03GHInirQGdfCJCL6ggFQoAbF3f94u5F3ZwLRPSp Bf8MkUhrWSRiN9iB8V8BaH6Cm3igIuEi1C8iJbF+PYiLVzqThRsL8qsqty7lIok1Vr6jSM QL+NASqTtBi/KBFzvwhmryJcevjqRe5Wov8rgtLGY2TzurCqxQRp1iuEbGSZPm+JiFZSVG Jq+xKAxyeCmUXjaGokvqb1B7a1JHNafiMICCk7wPuw4FDIfeHSPfRpd1PykkxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YvhpZ64s2zlCJ; Fri, 14 Feb 2025 19:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPQq7038750; Fri, 14 Feb 2025 19:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPQ6O038747; Fri, 14 Feb 2025 19:25:26 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:26 GMT Message-Id: <202502141925.51EJPQ6O038747@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: 4a6d4cd76307 - stable/14 - libdtrace: Generalize handling of data models a bit List-Id: Commits to the stable branches 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: 4a6d4cd76307701b07a7915a36f7b8280fb4d207 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4a6d4cd76307701b07a7915a36f7b8280fb4d207 commit 4a6d4cd76307701b07a7915a36f7b8280fb4d207 Author: Mark Johnston AuthorDate: 2025-01-25 15:57:37 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 libdtrace: Generalize handling of data models a bit Make it easier to support data models other than ILP32 and LP64 by avoiding constructs which assume that it must be one or the other. No functional change intended. MFC after: 2 weeks Sponsored by: Innovate UK (cherry picked from commit 096a5c6cd28c417456d5ce3598be15e6b656af5c) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.c | 7 +++---- cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c | 8 +++++++- cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c index dc68c6ef5f72..162224478ec0 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c @@ -1378,7 +1378,7 @@ main(int argc, char *argv[]) argv[0], optarg); return (usage(stderr)); } - g_oflags &= ~DTRACE_O_LP64; + g_oflags &= ~DTRACE_O_MODEL_MASK; g_oflags |= DTRACE_O_ILP32; break; @@ -1389,7 +1389,7 @@ main(int argc, char *argv[]) argv[0], optarg); return (usage(stderr)); } - g_oflags &= ~DTRACE_O_ILP32; + g_oflags &= ~DTRACE_O_MODEL_MASK; g_oflags |= DTRACE_O_LP64; break; @@ -1460,8 +1460,7 @@ main(int argc, char *argv[]) * files. We ignore certain errors since we'll catch them later when * we actually process the object files. */ - if (g_mode == DMODE_LINK && - (g_oflags & (DTRACE_O_ILP32 | DTRACE_O_LP64)) == 0 && + if (g_mode == DMODE_LINK && (g_oflags & DTRACE_O_MODEL_MASK) == 0 && elf_version(EV_CURRENT) != EV_NONE) { int fd; Elf *elf; diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c index 8f8d20298e4c..40200771fd4d 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c @@ -1073,8 +1073,14 @@ dt_vopen(int version, int flags, int *errp, if (flags & ~DTRACE_O_MASK) return (set_open_errno(dtp, errp, EINVAL)); - if ((flags & DTRACE_O_LP64) && (flags & DTRACE_O_ILP32)) + switch (flags & DTRACE_O_MODEL_MASK) { + case 0: /* native model */ + case DTRACE_O_ILP32: + case DTRACE_O_LP64: + break; + default: return (set_open_errno(dtp, errp, EINVAL)); + } if (vector == NULL && arg != NULL) return (set_open_errno(dtp, errp, EINVAL)); diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h index b380f5eb3313..1f4c5a2efd6b 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h @@ -70,6 +70,7 @@ typedef struct dtrace_aggdata dtrace_aggdata_t; #define DTRACE_O_NOSYS 0x02 /* do not load /system/object modules */ #define DTRACE_O_LP64 0x04 /* force D compiler to be LP64 */ #define DTRACE_O_ILP32 0x08 /* force D compiler to be ILP32 */ +#define DTRACE_O_MODEL_MASK (DTRACE_O_LP64 | DTRACE_O_ILP32) #define DTRACE_O_MASK 0x0f /* mask of valid flags to dtrace_open */ extern dtrace_hdl_t *dtrace_open(int, int, int *); From nobody Fri Feb 14 19:25:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpd2Mjfz5nXYM; Fri, 14 Feb 2025 19:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpd1Kxdz48km; Fri, 14 Feb 2025 19:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZr7KgNWEq1utHBm7tJ6qb0SKy7FPM61xjvX8u65QNc=; b=yLoHCHOqGqnCtGztyckQjNjXh3MexqDPvUxEwEn7awRNEg3hhA+TYhRtm+XVX9hZlCBPpf 9wlwpv8OsZ6P6KUvnHFq5kCE680rNXR4EdcnqtA1g/kX920mTMPX4w33Htlm4os9I0bQ4p 1gbmdiKxesaxneVLsMlDzjKTrIfDHyQynS2y4/lFHGarAQRWnaeVUCF+wcL4di6fFCdBFm ijkKQJyhCJycMyfGd/6xKqPNqeRBr7RyuU9dX5d+D74k/M8JqdQMv0M5ilbi6VXELUu2mV LvwP9uvde543M1B4q4yjGch73Plum2/XMFLK9v2Vw3W/EO3mRdWbWgfoQEpmYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZr7KgNWEq1utHBm7tJ6qb0SKy7FPM61xjvX8u65QNc=; b=bPtMhdIJbD3zJ46L2DaRm2gX+c6EacHB3PwCkXIAqK9QGq1W+BELdGb15U7uvZ9E5ejB3j /wccmB9omNZPjNj9RPwFaNHy52U9kchW82xQwwV6AyuD7HSrcm5otYaHPHoL78gWE39VDa tm9totSPqZujSmjRtHrpUwpjCo2e6HuP6xyitCgUB+q3jpx5hBrhKrhejl2ZrfQPQ2MdGJ x1kA8fMrVyBezj4UMZWl3Z6UFFZd8yhbw9VhZ4Aj/R0nWF+qcBFGcPUq6lUsavtBk4zR8d ozvav5uTRpj1+4FJU7HF0VaytNmRX5FesIy/lmcOZm+lby/zSSOuXG8mJC2W5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561129; a=rsa-sha256; cv=none; b=wOXBkIGi7Ow7ekWzefRcP69WPOoremoR91xGsqmE4hbdrn+04OhFiJKoZJucUljHMjFAEP gnIvoy4tK94u/KQN2iUGExmFX8SZx/vplDs2wfhkZS5TOy6vjr3LlEaM2XQAOlj14HFAqw uW4lFCLRnHQpLxqzWxLL3KtZ7slOoeXoejx7TSaDjq8jVWhG5NVZv4oiicNPDUUVJd4iFn mw0HDzMBuHMCTK7mUoyJ95uf4m9k6WQFyiGmmwI4tYVN8gSD2zRSZJpq3/Casr1B1KfBHZ wqTRMeVhq8M0R1n4TzbN6f2WodkipspSKwLB+5KoLW+3pC/2dKGVv9Y3crSB0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpd0W3yzkks; Fri, 14 Feb 2025 19:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPTra038819; Fri, 14 Feb 2025 19:25:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPTsv038816; Fri, 14 Feb 2025 19:25:29 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:29 GMT Message-Id: <202502141925.51EJPTsv038816@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: 467fa302c3ae - stable/14 - clock: Add a long ticks variable, ticksl List-Id: Commits to the stable branches 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: 467fa302c3aeefd7ccd9fa6bd0ad0381d86cd75b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=467fa302c3aeefd7ccd9fa6bd0ad0381d86cd75b commit 467fa302c3aeefd7ccd9fa6bd0ad0381d86cd75b Author: Mark Johnston AuthorDate: 2025-01-10 15:37:07 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 clock: Add a long ticks variable, ticksl For compatibility with Linux, it's useful to have a tick counter of width sizeof(long), but our tick counter is an int. Currently the linuxkpi tries paper over this difference, but this cannot really be done reliably, so it's desirable to have a wider tick counter. This change introduces ticksl, keeping the existing ticks variable. Follow a suggestion from kib to avoid having to maintain two separate counters and to avoid converting existing code to use ticksl: change hardclock() to update ticksl instead of ticks, and then use assembler directives to make ticks and ticksl overlap such that loading ticks gives the bottom 32 bits. This makes it possible to use ticksl in the linuxkpi without having to convert any native code, and without making hardclock() more complicated or expensive. Then, the linuxkpi can be modified to use ticksl instead of ticks. Reviewed by: olce, kib, emaste MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D48383 (cherry picked from commit 6b82130e6c9add4a8892ca897df5a0ec04663ea2) --- sys/conf/files | 1 + sys/kern/kern_clock.c | 26 ++++++++++++++------------ sys/kern/kern_tc.c | 4 ++-- sys/kern/subr_param.c | 2 +- sys/kern/subr_ticks.s | 44 ++++++++++++++++++++++++++++++++++++++++++++ sys/sys/kernel.h | 9 +++++++++ sys/sys/timetc.h | 2 +- 7 files changed, 72 insertions(+), 16 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index b571db1e27e8..a1a919bbb3b3 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3905,6 +3905,7 @@ kern/subr_stack.c optional ddb | stack | ktr kern/subr_stats.c optional stats kern/subr_taskqueue.c standard kern/subr_terminal.c optional vt +kern/subr_ticks.s standard kern/subr_trap.c standard kern/subr_turnstile.c standard kern/subr_uio.c standard diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 08ba6c1cc838..f29dd5708230 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -325,7 +325,7 @@ read_cpu_time(long *cp_time) #include -static int watchdog_ticks; +static long watchdog_ticks; static int watchdog_enabled; static void watchdog_fire(void); static void watchdog_config(void *, u_int, int *); @@ -371,10 +371,9 @@ watchdog_attach(void) int stathz; int profhz; int profprocs; -volatile int ticks; int psratio; -DPCPU_DEFINE_STATIC(int, pcputicks); /* Per-CPU version of ticks. */ +DPCPU_DEFINE_STATIC(long, pcputicks); /* Per-CPU version of ticks. */ #ifdef DEVICE_POLLING static int devpoll_run = 0; #endif @@ -482,14 +481,14 @@ hardclock(int cnt, int usermode) struct pstats *pstats; struct thread *td = curthread; struct proc *p = td->td_proc; - int *t = DPCPU_PTR(pcputicks); - int global, i, newticks; + long global, newticks, *t; /* * Update per-CPU and possibly global ticks values. */ + t = DPCPU_PTR(pcputicks); *t += cnt; - global = ticks; + global = atomic_load_long(&ticksl); do { newticks = *t - global; if (newticks <= 0) { @@ -498,7 +497,7 @@ hardclock(int cnt, int usermode) newticks = 0; break; } - } while (!atomic_fcmpset_int(&ticks, &global, *t)); + } while (!atomic_fcmpset_long(&ticksl, &global, *t)); /* * Run current process's virtual and profile time, as needed. @@ -527,8 +526,10 @@ hardclock(int cnt, int usermode) } #endif /* DEVICE_POLLING */ if (watchdog_enabled > 0) { - i = atomic_fetchadd_int(&watchdog_ticks, -newticks); - if (i > 0 && i <= newticks) + long left; + + left = atomic_fetchadd_long(&watchdog_ticks, -newticks); + if (left > 0 && left <= newticks) watchdog_fire(); } intr_event_handle(clk_intr_event, NULL); @@ -542,11 +543,12 @@ hardclock(int cnt, int usermode) void hardclock_sync(int cpu) { - int *t; + long *t; + KASSERT(!CPU_ABSENT(cpu), ("Absent CPU %d", cpu)); - t = DPCPU_ID_PTR(cpu, pcputicks); - *t = ticks; + t = DPCPU_ID_PTR(cpu, pcputicks); + *t = ticksl; } /* diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 26f09cb60260..a797a101bf6f 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1916,9 +1916,9 @@ SYSCTL_INT(_kern_timecounter, OID_AUTO, tick, CTLFLAG_RD, &tc_tick, 0, "Approximate number of hardclock ticks in a millisecond"); void -tc_ticktock(int cnt) +tc_ticktock(long cnt) { - static int count; + static long count; if (mtx_trylock_spin(&tc_setclock_mtx)) { count += cnt; diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index cee70a842735..67dc10213a70 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -198,7 +198,7 @@ init_param1(void) * Arrange for ticks to wrap 10 minutes after boot to help catch * sign problems sooner. */ - ticks = INT_MAX - (hz * 10 * 60); + ticksl = INT_MAX - (hz * 10 * 60); vn_lock_pair_pause_max = hz / 100; if (vn_lock_pair_pause_max == 0) diff --git a/sys/kern/subr_ticks.s b/sys/kern/subr_ticks.s new file mode 100644 index 000000000000..6565ba424137 --- /dev/null +++ b/sys/kern/subr_ticks.s @@ -0,0 +1,44 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Mark Johnston + */ + +/* + * Define the "ticks" and "ticksl" variables. The former is overlaid onto the + * low bits of the latter. + */ + +#if defined(__aarch64__) +#include +#include + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) +#endif + +#ifdef _ILP32 +#define SIZEOF_TICKSL 4 +#define TICKSL_INIT .long 0 +#else +#define SIZEOF_TICKSL 8 +#define TICKSL_INIT .quad 0 +#endif + +#if defined(_ILP32) || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define TICKS_OFFSET 0 +#else +#define TICKS_OFFSET 4 +#endif + + .data + + .global ticksl + .type ticksl, %object + .align SIZEOF_TICKSL +ticksl: TICKSL_INIT + .size ticksl, SIZEOF_TICKSL + + .global ticks + .type ticks, %object +ticks =ticksl + TICKS_OFFSET + .size ticks, 4 diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index e07dc7031bb8..d6b5f8ec10dc 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -67,7 +67,16 @@ extern int psratio; /* ratio: prof / stat */ extern int stathz; /* statistics clock's frequency */ extern int profhz; /* profiling clock's frequency */ extern int profprocs; /* number of process's profiling */ + +/* + * The ticks and ticksl symbols overlap, giving a 64-bit tick counter on 64-bit + * platforms while still maintaining compatibility with the legacy 32-bit + * counter. Either value can be used, but rollover must be handled; at 1000Hz, + * ticks (and ticksl on 32-bit platforms) roll over roughly every 25 days. On + * 64-bit platforms, ticksl will not roll over in the foreseeable future. + */ extern volatile int ticks; +extern volatile long ticksl; #endif /* _KERNEL */ diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h index fed3284e21b5..2f72f8b2527a 100644 --- a/sys/sys/timetc.h +++ b/sys/sys/timetc.h @@ -87,7 +87,7 @@ extern int tc_min_ticktock_freq; /* u_int64_t tc_getfrequency(void); void tc_init(struct timecounter *tc); void tc_setclock(struct timespec *ts); -void tc_ticktock(int cnt); +void tc_ticktock(long cnt); void cpu_tick_calibration(void); #ifdef SYSCTL_DECL From nobody Fri Feb 14 19:25:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpf3kpDz5nXYR; Fri, 14 Feb 2025 19:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpf2Gbjz48l0; Fri, 14 Feb 2025 19:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1bC0tsWBNoasUTms+lEUzQhaWPWGgfaiLoiwz3Mvuk=; b=sqLxlryzUANzuvrTMFQlOcGV8bNC3BguS87Su4NPNfAHsW593sVnYukJu0moLYuWawMdI4 9skzH4XwDV5zg42k/GSTTORcrkxQdVf/ax6sLf1rgM4Ze9kbq1QLsdUBYLMERY9tb3AZmX T8s2fdhHyUPbx98vG34QG+FKYdyBA3Dhol/yFrPYVSA98c+mZafre8kquKNaI9RIpJPL6Z P7K2H/IAARbrb7TMI21cm3D9LjXBR+vCrU1o1nMpEZF4JneBpabGAI3jU8m1U8qrto212U kmYrAMp5RSKvnEco1VlDg8FjST906cSbVV/hQKVVhJKR6XLomTkUPTIqxlmRyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1bC0tsWBNoasUTms+lEUzQhaWPWGgfaiLoiwz3Mvuk=; b=OU45Pqi7CaAQz9+qWYpzLYGFW0G6Z/JMyxVM35l0TJmuxphzYig7mHY9rsvSy6hQI7C6jD 4wJsCvPZsiafcuywQZ4YhiXqOfgKOtG03TqJR4ZRiJ0D2hAwKVnsW8CiTwj228QvkqhVMC HWYdK6I8oX9nEuvpQJHzdRkNoxOISwDRtVzrrOUImilCQ6PXoLAY5nETq1prFzIfASshVE Wvrg+UgSLIy8VZOmFeg1Rtqd6XkDOl5ExtTT7TAVbx8W9W5KmSGEM/cvYtJCfFhTKZzhx0 G64cTkcic1FC36TmJy8Q9EenJBodi9RVjoKFFiU4VrZN/c1YourpyBEB6HSIZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561130; a=rsa-sha256; cv=none; b=WBfKbIi4h70RfCO4w1M86V0P+5kT44iqSpG3Vpo3m1wtHGI4TKh4Q+ng7fo6/QU3d7bXlk Mbm38mQkATIxaseqMrYqA0IMQv+TNhC7uJsCNqP5cSi8nwGXOAi4QlAHIsGcflagtTtrcj HniGlQtrUXetJYfREa9KtaKebaj1aN7QJ2wYL3vOtha8vjjQU0mdZ3XIC4hCXSWZD8gpuB Wmp5Do9qIi4PsIhXXYn4bFuQEOfqH9FtCUNx5zY6A3AadZVa+YCtAQvgZFKcYu1lP+4JzS +/roW7KvkD5+xfTyrX1xHwxLr5WczZWXXkOA21DbCLL3Ogfm2hNCsmP9bDLrZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpf1TdPzkGK; Fri, 14 Feb 2025 19:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPU5D038852; Fri, 14 Feb 2025 19:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPUvB038849; Fri, 14 Feb 2025 19:25:30 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:30 GMT Message-Id: <202502141925.51EJPUvB038849@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: a267ceaf39a6 - stable/14 - clock: Simplify subr_ticks and rename List-Id: Commits to the stable branches 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: a267ceaf39a6c756e72787c96e61714081bff339 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a267ceaf39a6c756e72787c96e61714081bff339 commit a267ceaf39a6c756e72787c96e61714081bff339 Author: Mark Johnston AuthorDate: 2025-01-10 23:59:47 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 clock: Simplify subr_ticks and rename - We can use builtin constants for the size of int and long to simplify definitions. - The file should have a .S prefix since we want to run it through the preprocessor, though apparently this happens anyway with .s... - Move ticks and ticksl from .data to .bss. Reported by: jrtc27 Reviewed by: jrtc27, kib, emaste Fixes: 6b82130e6c9a ("clock: Add a long ticks variable, ticksl") Differential Revision: https://reviews.freebsd.org/D48420 (cherry picked from commit b2b974f7ef4cddff251d0de69d8da13232b25e4d) --- sys/conf/files | 2 +- sys/kern/{subr_ticks.s => subr_ticks.S} | 22 +++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index a1a919bbb3b3..34f57c32361a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3905,7 +3905,7 @@ kern/subr_stack.c optional ddb | stack | ktr kern/subr_stats.c optional stats kern/subr_taskqueue.c standard kern/subr_terminal.c optional vt -kern/subr_ticks.s standard +kern/subr_ticks.S standard kern/subr_trap.c standard kern/subr_turnstile.c standard kern/subr_uio.c standard diff --git a/sys/kern/subr_ticks.s b/sys/kern/subr_ticks.S similarity index 62% rename from sys/kern/subr_ticks.s rename to sys/kern/subr_ticks.S index 6565ba424137..52435b194c4f 100644 --- a/sys/kern/subr_ticks.s +++ b/sys/kern/subr_ticks.S @@ -16,29 +16,21 @@ GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) #endif -#ifdef _ILP32 -#define SIZEOF_TICKSL 4 -#define TICKSL_INIT .long 0 -#else -#define SIZEOF_TICKSL 8 -#define TICKSL_INIT .quad 0 -#endif - -#if defined(_ILP32) || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #define TICKS_OFFSET 0 #else -#define TICKS_OFFSET 4 +#define TICKS_OFFSET (__SIZEOF_LONG__ - __SIZEOF_INT__) #endif - .data + .bss .global ticksl .type ticksl, %object - .align SIZEOF_TICKSL -ticksl: TICKSL_INIT - .size ticksl, SIZEOF_TICKSL + .align __SIZEOF_LONG__ +ticksl: .zero __SIZEOF_LONG__ + .size ticksl, __SIZEOF_LONG__ .global ticks .type ticks, %object ticks =ticksl + TICKS_OFFSET - .size ticks, 4 + .size ticks, __SIZEOF_INT__ From nobody Fri Feb 14 19:25:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpk5Jdfz5nXBk; Fri, 14 Feb 2025 19:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpj4h1Zz48nD; Fri, 14 Feb 2025 19:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0BdGFdFmDPvvZuc+9Qe4IpsSixqtLC8DZhc04sLJN4=; b=u4ohf1AVzha6Jo+o09gXv4oslAJ1gN5aoSckURf5bYamRw54hrSZbuVmikmXJZWRZYwLdH u0xuDv539wD9QlIs5swg3CCrHDcWTcnmJ9XqOPPOhBPlsIcSiweD2+8feIJCpv6XVIoh96 7ttWMbJC+QjaOlp/aKXQJRoKAUZEjo9NV/J/X6c0WCzfvG7WYOjbq/+Vt6o18/KJtyH9TK LHpfBCQXmakMkSXgFFYZ9ei0R9xWSXZjvWv+L2yR1m02M64K/aa2TlDW7Z48CphQuBa4So gWxxDXaOi0jW2aFY/XMbl6UuadUCIBixFcDENoJz2U69xlOCuUXBVhyZKUuidw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0BdGFdFmDPvvZuc+9Qe4IpsSixqtLC8DZhc04sLJN4=; b=ADqCn2m1W2l9boagESxmlOP7aOTPkF8ARU8dtWDS8lb3BNk4KrXwV4u6hxvqLdCQ3PzZnZ p+sfjQVRvLlUC50HgXIMLT8lG8OmVQNAS+Xjrsr1goxIz5WV8hxGMfzGOb3qi4Hngqq6OO nRx1qrJzoi+rok095W3HimYsC44ygksgntrMmufKvPYwvgir0Ew5Y1Z77uONLbmbKO/H9L hUVsqlIbNW9ppXHvBBFdN+RZSSO9TGcIjV5Y26i7Y0lDu1ZXPn3CDlM0UsDO5ZxjtKk0kV 7u8lmM0QChoMvaY5CGROLluFUDpLLvANqhX4DSBL3zOsFWYMky3dI1DrhzykzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561133; a=rsa-sha256; cv=none; b=h3qU6i4qBwTSufNPZzub/AsYnLfRFUCVIi/fvqYlyyeOvWVvrXE6jVvjOnTNr9EKcKOSUW OncNeQq+nuG41rTc+KW0EMgxaCX4JKd/POEpKiDmwTVO/3ZaTGa7QP+MgtbDj0pCc4qyeV +8eHxmvNAMFL9KkR6xCZlG76S/5DF4p1oNdToc5ZbgkwdfLZ5Jy9QgltBhm5//vnoZv017 UMFP3Y5Iss3i1OpHDGJLkvtOhVu9s+RYoJdraI41kvRJ/SDyhjFPX5SlIcaq3r9WhBY9Qz ssYyJgbRA/L7JbUk0dNpA9b75OjkNgYfsyJBQcO1fClaMkRWo5wvaFUUWWOLkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpj45QZzkGL; Fri, 14 Feb 2025 19:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPXHk038963; Fri, 14 Feb 2025 19:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPXqb038959; Fri, 14 Feb 2025 19:25:33 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:33 GMT Message-Id: <202502141925.51EJPXqb038959@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: 9ab9e138f30e - stable/14 - dtrace/arm64: Fix enumeration of FBT return probes List-Id: Commits to the stable branches 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: 9ab9e138f30e9590f40cfce40f7a4075d5bbdac0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ab9e138f30e9590f40cfce40f7a4075d5bbdac0 commit 9ab9e138f30e9590f40cfce40f7a4075d5bbdac0 Author: Mark Johnston AuthorDate: 2025-01-29 02:03:02 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:19 +0000 dtrace/arm64: Fix enumeration of FBT return probes On arm64, the FBT provider treats tail calls as return probes. Ignoring the question of whether this is really correct, the implementation is wrong: instr is a pointer to uint32_t, so the removed multiplication by the instruction size is wrong. As a result, FBT would create return probes for intra-function branches. MFC after: 2 weeks Sponsored by: Innovate UK (cherry picked from commit 4da070ce6c015a994ec4ecf3d31ee94810ea19f1) --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index 44690b97f77a..fd666770d3a2 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -178,8 +178,7 @@ again: break; else if ((*instr & B_MASK) == B_INSTR) { offs = (*instr & B_DATA_MASK); - offs *= 4; - target = (instr + offs); + target = instr + offs; start = (uint32_t *)symval->value; if (target >= limit || target < start) break; From nobody Fri Feb 14 19:25:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhph64y7z5nXHn; Fri, 14 Feb 2025 19:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpg36s3z48x9; Fri, 14 Feb 2025 19:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qoJncCO5FJdAbyNnHk3BVgIlAD6PeBrFzYsBMNijDI=; b=B2ZBmqwgxm9aExbVirUQR3KFo2+05YWkZKGlUT4yyKeOPRIyuTkHpMG4lqK2fc4aoZPtTJ WFsxfh48db8wB5FwjoiHvlC3QN9vb/6Uv8AtnWVSjJbIYudGg0uL2LicsV8tmYafWRenL9 0gEOtPYV+GBMIfNmYlCOivH+0VY2AQPofW2o1gogrKSvhC6geQDjVspqKkZRv5D70EaI+Z Jtv+alPskSj56EaivtETfc3zYUBoqQuX2swfg2CWHDFO+fnC6ocu3qjZw8fzxXIfZdmnxd uu+Nw/z9MJx7D0wTE64a3XOkGQkh4uuLZ3uUAO6vM0pJdE8WAbbMH3e0cE/NJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qoJncCO5FJdAbyNnHk3BVgIlAD6PeBrFzYsBMNijDI=; b=ICuPxHdifkTR9z+tJwyoOQ9TrU0Hnfxzh16QdNW2d4LTm6DB2+AtKLO7mBeaQu+20saTyM 6ivz/b2GACXNbwEERBcVykUHG1MfNBaIG0h/rlVC3tHtEOYNL6R3YuiHAEbtXoE8aKEceA kP0NNDef8kY5o5qJWg273ANvxW8dKGt8TFsRKiKB+SX87Qz2mWhl29rlWBuge3CLskHDSb ls4A14L+70JBOgkim2KWwjieEIxBGej5epRzkgNvOSXLOez4/ILHyRbCTkJMdIYtkUgvUT AnAaI2Yb3RqcwAE/RzXkp/zf47Tz5Zn4P3GBNM2cRmAfIre7nT1rkL8UhNH+fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561131; a=rsa-sha256; cv=none; b=xmZYzJiFvfMj+FJ/owzCr5q92qs90ZRl/e7JyAr0C386IrDP6L4LwAi3IGvo8Jq6JcISDs d19b1RApEhjqTl+drJA+aGA+v2Y/tvJxRfFZ7RcB65hvY3QvobjKbqBHpNUFNdgWq/ub+8 UQGas+9e/+bDoJNjxkZZDTSAftG/WLBmCpabHRSHBD6VVCZ9qFOMyNbZAiBTQyuyu9l8Jh WvwwdhD3JhEchwJpVLW9eLvZJwzTM6PxsdfBwOF59bHO0tC9AQQhlns+sJfPFuaRDREBKr nQJ2evJaHjSdnOBmZDyOCWjsvfwyKzySxO4ra2M9MzDkj5Q3HOPH7sacCH0XKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpg2khHzkfd; Fri, 14 Feb 2025 19:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPVgd038885; Fri, 14 Feb 2025 19:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPVov038882; Fri, 14 Feb 2025 19:25:31 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:31 GMT Message-Id: <202502141925.51EJPVov038882@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: 3e6fddaf80b9 - stable/14 - clock: Use .balign to align ticksl List-Id: Commits to the stable branches 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: 3e6fddaf80b9162bad2b7987c325c917b2b6e7d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e6fddaf80b9162bad2b7987c325c917b2b6e7d2 commit 3e6fddaf80b9162bad2b7987c325c917b2b6e7d2 Author: Mark Johnston AuthorDate: 2025-01-11 17:45:57 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 clock: Use .balign to align ticksl The .align directive has a different behaviour on 32-bit arm than on other platforms. Use .balign instead, which has consistent behaviour on all architectures. Reported by: kib Reviewed by: jrtc27, kib Fixes: 6b82130e6c9a ("clock: Add a long ticks variable, ticksl") Differential Revision: https://reviews.freebsd.org/D48430 (cherry picked from commit 159d29d3948294cdc9ee4cc3951d004de6797a32) --- sys/kern/subr_ticks.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_ticks.S b/sys/kern/subr_ticks.S index 52435b194c4f..ad01d5d67165 100644 --- a/sys/kern/subr_ticks.S +++ b/sys/kern/subr_ticks.S @@ -26,7 +26,7 @@ GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) .global ticksl .type ticksl, %object - .align __SIZEOF_LONG__ + .balign __SIZEOF_LONG__ ticksl: .zero __SIZEOF_LONG__ .size ticksl, __SIZEOF_LONG__ From nobody Fri Feb 14 19:25:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpk1Hfvz5nXR5; Fri, 14 Feb 2025 19:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhph6DKJz48vp; Fri, 14 Feb 2025 19:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQFWUCUmuucnRxHBbYurb4C2TWWxdzujbCM3XTNXXds=; b=fJEPHrwiCoURgBxqDOE+Rg5N+4jXdMvu2aZ83EFqpWT/gRLlWOG6fCUGxOmoRenqlI8BQp 8Nr9wseDj0E8JVSHqLUueDq/1B0EzKU3+WvYf+m2plu8udBsodoFOM2CeqiuLpFN/2YH8J 5AWsplGyy2nB+zG0cWwcBKoqGWAAkCUGb1fF2R0H11VwfVQudk+ESLfC4EeK+/eOcfkTEV OOja0/LkLvFWP6G4Pl5VhylhFG93lX2UaMRFZp3ZxKUakrJMOAPMGY5B5yXCeeRDzZPbDh SJNdM8C7X8ivggD5NZ9NpWwmGPZH+9xmLyH4LtN2DCXNuk8tGIbGjp+R0c/BXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQFWUCUmuucnRxHBbYurb4C2TWWxdzujbCM3XTNXXds=; b=VFUurVOjdu2Jv/v8U6bDWLtXFQTpN4U/Hf7FWCcsxQEsVdKDEPxJCk9muDq76nmz4fviR2 67bjguBEWUscSgRscitsfw0dh4ql8u0rPjUJfIhWWBd+jHhZT1CFOqmoG+YOhAXtX2fiOx MXjPrkWoTHTZfwFRQALGH+o4a04zXLCFg806xt9SFwIwHhzKubMbUxdqSBgdW0g12P2Qg1 sjTvzteZ4mGjBXtdmshZKf/8qLo8LzUFI7/9E1teU4r49rrHIivwz6m3KtJnNdJoyf8QyK AfjWTW/zG39ovlcXDEsoNIKEVcBd/Wtug3IBFEPlC1lNNMMf14+htq0jhmT3YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561132; a=rsa-sha256; cv=none; b=eRYboJHH3cJW0IJjxCB2TPkNFi9oICM9VZX4ieuMALcGn88kTVayUgoeG7cmcGZm85pAA1 sVKxrkhqhjxaIOpaypzA3GzUTbGZ9BkALVwZSY+0iB33TtcWU7DVE1eljfDv7lY7ouQU45 wcm5q10IZEIG9QY2c1CgkyMSp0XUGOctMiQQ9S4ZS5zcRYNHPJNb26q/NtYQyepx+QEyb3 mPv2Q56xWeLmD+SJdNBMd0U2/3Onl/tEElgqLiZeYLh2ufl+TYhHqgiLPiKypz0Cj8EdcF EUKmtAY8wcKPeRM8cVdK1DyJ961QEHPd67kO4eFY/TL4XD6sM9D6+ZfO6HmAjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhph3mCBzl1j; Fri, 14 Feb 2025 19:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPWfm038919; Fri, 14 Feb 2025 19:25:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPWx7038916; Fri, 14 Feb 2025 19:25:32 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:32 GMT Message-Id: <202502141925.51EJPWx7038916@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: 40c56cc51eaf - stable/14 - libdtrace: Use designators to initialize the opcode array List-Id: Commits to the stable branches 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: 40c56cc51eaf760277074308afa44e9d85a9bd66 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=40c56cc51eaf760277074308afa44e9d85a9bd66 commit 40c56cc51eaf760277074308afa44e9d85a9bd66 Author: Mark Johnston AuthorDate: 2025-01-29 00:59:21 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +0000 libdtrace: Use designators to initialize the opcode array No functional change intended. MFC after: 2 weeks Sponsored by: Innovate UK (cherry picked from commit 51688136b161089b317edc34c3a3e9b40d54a18a) --- .../opensolaris/lib/libdtrace/common/dt_dis.c | 160 ++++++++++----------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c index d1335180ec97..41765efb7717 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c @@ -348,86 +348,86 @@ dt_dis(const dtrace_difo_t *dp, FILE *fp) void (*op_func)(const dtrace_difo_t *, const char *, dif_instr_t, FILE *); } optab[] = { - { "(illegal opcode)", dt_dis_str }, - { "or", dt_dis_log }, /* DIF_OP_OR */ - { "xor", dt_dis_log }, /* DIF_OP_XOR */ - { "and", dt_dis_log }, /* DIF_OP_AND */ - { "sll", dt_dis_log }, /* DIF_OP_SLL */ - { "srl", dt_dis_log }, /* DIF_OP_SRL */ - { "sub", dt_dis_log }, /* DIF_OP_SUB */ - { "add", dt_dis_log }, /* DIF_OP_ADD */ - { "mul", dt_dis_log }, /* DIF_OP_MUL */ - { "sdiv", dt_dis_log }, /* DIF_OP_SDIV */ - { "udiv", dt_dis_log }, /* DIF_OP_UDIV */ - { "srem", dt_dis_log }, /* DIF_OP_SREM */ - { "urem", dt_dis_log }, /* DIF_OP_UREM */ - { "not", dt_dis_r1rd }, /* DIF_OP_NOT */ - { "mov", dt_dis_r1rd }, /* DIF_OP_MOV */ - { "cmp", dt_dis_cmp }, /* DIF_OP_CMP */ - { "tst", dt_dis_tst }, /* DIF_OP_TST */ - { "ba", dt_dis_branch }, /* DIF_OP_BA */ - { "be", dt_dis_branch }, /* DIF_OP_BE */ - { "bne", dt_dis_branch }, /* DIF_OP_BNE */ - { "bg", dt_dis_branch }, /* DIF_OP_BG */ - { "bgu", dt_dis_branch }, /* DIF_OP_BGU */ - { "bge", dt_dis_branch }, /* DIF_OP_BGE */ - { "bgeu", dt_dis_branch }, /* DIF_OP_BGEU */ - { "bl", dt_dis_branch }, /* DIF_OP_BL */ - { "blu", dt_dis_branch }, /* DIF_OP_BLU */ - { "ble", dt_dis_branch }, /* DIF_OP_BLE */ - { "bleu", dt_dis_branch }, /* DIF_OP_BLEU */ - { "ldsb", dt_dis_load }, /* DIF_OP_LDSB */ - { "ldsh", dt_dis_load }, /* DIF_OP_LDSH */ - { "ldsw", dt_dis_load }, /* DIF_OP_LDSW */ - { "ldub", dt_dis_load }, /* DIF_OP_LDUB */ - { "lduh", dt_dis_load }, /* DIF_OP_LDUH */ - { "lduw", dt_dis_load }, /* DIF_OP_LDUW */ - { "ldx", dt_dis_load }, /* DIF_OP_LDX */ - { "ret", dt_dis_ret }, /* DIF_OP_RET */ - { "nop", dt_dis_str }, /* DIF_OP_NOP */ - { "setx", dt_dis_setx }, /* DIF_OP_SETX */ - { "sets", dt_dis_sets }, /* DIF_OP_SETS */ - { "scmp", dt_dis_cmp }, /* DIF_OP_SCMP */ - { "ldga", dt_dis_lda }, /* DIF_OP_LDGA */ - { "ldgs", dt_dis_ldv }, /* DIF_OP_LDGS */ - { "stgs", dt_dis_stv }, /* DIF_OP_STGS */ - { "ldta", dt_dis_lda }, /* DIF_OP_LDTA */ - { "ldts", dt_dis_ldv }, /* DIF_OP_LDTS */ - { "stts", dt_dis_stv }, /* DIF_OP_STTS */ - { "sra", dt_dis_log }, /* DIF_OP_SRA */ - { "call", dt_dis_call }, /* DIF_OP_CALL */ - { "pushtr", dt_dis_pushts }, /* DIF_OP_PUSHTR */ - { "pushtv", dt_dis_pushts }, /* DIF_OP_PUSHTV */ - { "popts", dt_dis_str }, /* DIF_OP_POPTS */ - { "flushts", dt_dis_str }, /* DIF_OP_FLUSHTS */ - { "ldgaa", dt_dis_ldv }, /* DIF_OP_LDGAA */ - { "ldtaa", dt_dis_ldv }, /* DIF_OP_LDTAA */ - { "stgaa", dt_dis_stv }, /* DIF_OP_STGAA */ - { "sttaa", dt_dis_stv }, /* DIF_OP_STTAA */ - { "ldls", dt_dis_ldv }, /* DIF_OP_LDLS */ - { "stls", dt_dis_stv }, /* DIF_OP_STLS */ - { "allocs", dt_dis_r1rd }, /* DIF_OP_ALLOCS */ - { "copys", dt_dis_log }, /* DIF_OP_COPYS */ - { "stb", dt_dis_store }, /* DIF_OP_STB */ - { "sth", dt_dis_store }, /* DIF_OP_STH */ - { "stw", dt_dis_store }, /* DIF_OP_STW */ - { "stx", dt_dis_store }, /* DIF_OP_STX */ - { "uldsb", dt_dis_load }, /* DIF_OP_ULDSB */ - { "uldsh", dt_dis_load }, /* DIF_OP_ULDSH */ - { "uldsw", dt_dis_load }, /* DIF_OP_ULDSW */ - { "uldub", dt_dis_load }, /* DIF_OP_ULDUB */ - { "ulduh", dt_dis_load }, /* DIF_OP_ULDUH */ - { "ulduw", dt_dis_load }, /* DIF_OP_ULDUW */ - { "uldx", dt_dis_load }, /* DIF_OP_ULDX */ - { "rldsb", dt_dis_load }, /* DIF_OP_RLDSB */ - { "rldsh", dt_dis_load }, /* DIF_OP_RLDSH */ - { "rldsw", dt_dis_load }, /* DIF_OP_RLDSW */ - { "rldub", dt_dis_load }, /* DIF_OP_RLDUB */ - { "rlduh", dt_dis_load }, /* DIF_OP_RLDUH */ - { "rlduw", dt_dis_load }, /* DIF_OP_RLDUW */ - { "rldx", dt_dis_load }, /* DIF_OP_RLDX */ - { "xlate", dt_dis_xlate }, /* DIF_OP_XLATE */ - { "xlarg", dt_dis_xlate }, /* DIF_OP_XLARG */ + [0] = { "(illegal opcode)", dt_dis_str }, + [DIF_OP_OR] = { "or", dt_dis_log }, + [DIF_OP_XOR] = { "xor", dt_dis_log }, + [DIF_OP_AND] = { "and", dt_dis_log }, + [DIF_OP_SLL] = { "sll", dt_dis_log }, + [DIF_OP_SRL] = { "srl", dt_dis_log }, + [DIF_OP_SUB] = { "sub", dt_dis_log }, + [DIF_OP_ADD] = { "add", dt_dis_log }, + [DIF_OP_MUL] = { "mul", dt_dis_log }, + [DIF_OP_SDIV] = { "sdiv", dt_dis_log }, + [DIF_OP_UDIV] = { "udiv", dt_dis_log }, + [DIF_OP_SREM] = { "srem", dt_dis_log }, + [DIF_OP_UREM] = { "urem", dt_dis_log }, + [DIF_OP_NOT] = { "not", dt_dis_r1rd }, + [DIF_OP_MOV] = { "mov", dt_dis_r1rd }, + [DIF_OP_CMP] = { "cmp", dt_dis_cmp }, + [DIF_OP_TST] = { "tst", dt_dis_tst }, + [DIF_OP_BA] = { "ba", dt_dis_branch }, + [DIF_OP_BE] = { "be", dt_dis_branch }, + [DIF_OP_BNE] = { "bne", dt_dis_branch }, + [DIF_OP_BG] = { "bg", dt_dis_branch }, + [DIF_OP_BGU] = { "bgu", dt_dis_branch }, + [DIF_OP_BGE] = { "bge", dt_dis_branch }, + [DIF_OP_BGEU] = { "bgeu", dt_dis_branch }, + [DIF_OP_BL] = { "bl", dt_dis_branch }, + [DIF_OP_BLU] = { "blu", dt_dis_branch }, + [DIF_OP_BLE] = { "ble", dt_dis_branch }, + [DIF_OP_BLEU] = { "bleu", dt_dis_branch }, + [DIF_OP_LDSB] = { "ldsb", dt_dis_load }, + [DIF_OP_LDSH] = { "ldsh", dt_dis_load }, + [DIF_OP_LDSW] = { "ldsw", dt_dis_load }, + [DIF_OP_LDUB] = { "ldub", dt_dis_load }, + [DIF_OP_LDUH] = { "lduh", dt_dis_load }, + [DIF_OP_LDUW] = { "lduw", dt_dis_load }, + [DIF_OP_LDX] = { "ldx", dt_dis_load }, + [DIF_OP_RET] = { "ret", dt_dis_ret }, + [DIF_OP_NOP] = { "nop", dt_dis_str }, + [DIF_OP_SETX] = { "setx", dt_dis_setx }, + [DIF_OP_SETS] = { "sets", dt_dis_sets }, + [DIF_OP_SCMP] = { "scmp", dt_dis_cmp }, + [DIF_OP_LDGA] = { "ldga", dt_dis_lda }, + [DIF_OP_LDGS] = { "ldgs", dt_dis_ldv }, + [DIF_OP_STGS] = { "stgs", dt_dis_stv }, + [DIF_OP_LDTA] = { "ldta", dt_dis_lda }, + [DIF_OP_LDTS] = { "ldts", dt_dis_ldv }, + [DIF_OP_STTS] = { "stts", dt_dis_stv }, + [DIF_OP_SRA] = { "sra", dt_dis_log }, + [DIF_OP_CALL] = { "call", dt_dis_call }, + [DIF_OP_PUSHTR] = { "pushtr", dt_dis_pushts }, + [DIF_OP_PUSHTV] = { "pushtv", dt_dis_pushts }, + [DIF_OP_POPTS] = { "popts", dt_dis_str }, + [DIF_OP_FLUSHTS] = { "flushts", dt_dis_str }, + [DIF_OP_LDGAA] = { "ldgaa", dt_dis_ldv }, + [DIF_OP_LDTAA] = { "ldtaa", dt_dis_ldv }, + [DIF_OP_STGAA] = { "stgaa", dt_dis_stv }, + [DIF_OP_STTAA] = { "sttaa", dt_dis_stv }, + [DIF_OP_LDLS] = { "ldls", dt_dis_ldv }, + [DIF_OP_STLS] = { "stls", dt_dis_stv }, + [DIF_OP_ALLOCS] = { "allocs", dt_dis_r1rd }, + [DIF_OP_COPYS] = { "copys", dt_dis_log }, + [DIF_OP_STB] = { "stb", dt_dis_store }, + [DIF_OP_STH] = { "sth", dt_dis_store }, + [DIF_OP_STW] = { "stw", dt_dis_store }, + [DIF_OP_STX] = { "stx", dt_dis_store }, + [DIF_OP_ULDSB] = { "uldsb", dt_dis_load }, + [DIF_OP_ULDSH] = { "uldsh", dt_dis_load }, + [DIF_OP_ULDSW] = { "uldsw", dt_dis_load }, + [DIF_OP_ULDUB] = { "uldub", dt_dis_load }, + [DIF_OP_ULDUH] = { "ulduh", dt_dis_load }, + [DIF_OP_ULDUW] = { "ulduw", dt_dis_load }, + [DIF_OP_ULDX] = { "uldx", dt_dis_load }, + [DIF_OP_RLDSB] = { "rldsb", dt_dis_load }, + [DIF_OP_RLDSH] = { "rldsh", dt_dis_load }, + [DIF_OP_RLDSW] = { "rldsw", dt_dis_load }, + [DIF_OP_RLDUB] = { "rldub", dt_dis_load }, + [DIF_OP_RLDUH] = { "rlduh", dt_dis_load }, + [DIF_OP_RLDUW] = { "rlduw", dt_dis_load }, + [DIF_OP_RLDX] = { "rldx", dt_dis_load }, + [DIF_OP_XLATE] = { "xlate", dt_dis_xlate }, + [DIF_OP_XLARG] = { "xlarg", dt_dis_xlate }, }; const struct opent *op; From nobody Fri Feb 14 19:25:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpl45Pnz5nXRd; Fri, 14 Feb 2025 19:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpk6swFz48st; Fri, 14 Feb 2025 19:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/1NZjj7uf0UXJVUorKs3/tfWdyDrLS4AEwjJ8KYE86w=; b=W+mgMx+6UFZnvgBfxj6rjMXzzTUNpNqN7E8JxE2Q5A/S7DhDmz+XzHTGP4h0a66GUTA6AQ CvaqZ2sT7BowuRGnnOuki6pTBn8AZUk4w606qCww4ocaCOPUd0kAkbgMG+4Pdyn5C3+m09 Gm4HNeAxvlTHpaDDvjguGuqCY9kIlDRYw+DL/DTSTDsWYUUtD5Y91bQUsvhh+mswvPE6bO B5XpfYxvoS0Lskwl/qoDpn4dwUple/laf2xCs4smozx/Ass209LeeVHDeMKktdPmI3Owsb m7eT/2S2cILW2DGF9yZBKkZCehiMuFvIVvxDlIpXfH40b3zUIPk7EAR7NDPDFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/1NZjj7uf0UXJVUorKs3/tfWdyDrLS4AEwjJ8KYE86w=; b=psutf5tspg6o4S+KxJ7ghHhJ+owj2aB5+B//zvcxP8hDFv3B/ZkjAVhwpxUEFsfqbSer8K cFrb4kYGbucwK9mui3IAVM7Ql/0cZg6VfXzIiEax1ffU34Kv7a7ACwWmAIbllzO50gaVGO B+OMBfyRqoVi5PgtWmCRYi66Vqe3N5BEjJLSCSiJvXfRMSbDKIQ2wRIgkcRHfbtmE7o3+4 9Gy/rBPszyV98Ij+vzMqG3JrowE06DBAUcVHhCN2rdUL3bHeCRbQ4OkrjPDnumW8EKK8yM GUJkj0yIxHIehR3p1oOHeEFboj7sBZcn3eUqMxy/FSAztXupiKEyz42jz1GgEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561135; a=rsa-sha256; cv=none; b=cu1nCtVuFCVH7Z9rd5B39ar69Fjv6DaLOdvUc3yr4Js3RHCbwSmc1qAcOFFjcLz2tZDFYG lYEtUzC8i1qrbHhZQ0uu1e46I61yjyBp2jo7/Sp10y+lukSqRgSNUJaJQAQ5W7YvQagr+e wYjw6lUahEEJ/0uCmVoEiSzJPFSSPBvx3FesonUvelfqdq4SqrBxDjt56zWHdDS4D0lbGN cSC2pPmnjy9ppRwoucYG/IwJC1a+rYClVIl6DjplFjmYcxxEBX19pzM826VZps1rmWSvJZ MP2GuyNrGbop10nJ8elacE9q0Ch1hcJBoIYnKTHEU1xLU3lCAWlwOyzisnKxNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpk5Lm3zkhJ; Fri, 14 Feb 2025 19:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPYuh038997; Fri, 14 Feb 2025 19:25:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPYH6038994; Fri, 14 Feb 2025 19:25:34 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:34 GMT Message-Id: <202502141925.51EJPYH6038994@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: a50d5a7c1fd8 - stable/14 - ti/am335x: Fix the device_set_descf() call in am335x_dmtimer_probe() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: a50d5a7c1fd88c440af50e651478ead62f9beb51 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a50d5a7c1fd88c440af50e651478ead62f9beb51 commit a50d5a7c1fd88c440af50e651478ead62f9beb51 Author: Oskar Holmlund AuthorDate: 2024-06-24 11:57:25 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:19 +0000 ti/am335x: Fix the device_set_descf() call in am335x_dmtimer_probe() Fixes: 459dc61c8b05 ("arm: Convert drivers to use device_set_desc(f)()") Reviewed by: markj, imp, manu Approved by: markj, imp, manu (mentor) Differential Revision: https://reviews.freebsd.org/D45699 (cherry picked from commit 332f00cdbafa944472a5c2d9d1701466ab762f90) --- sys/arm/ti/am335x/am335x_dmtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c index 341ec07466fc..18f1cd97e13c 100644 --- a/sys/arm/ti/am335x/am335x_dmtimer.c +++ b/sys/arm/ti/am335x/am335x_dmtimer.c @@ -276,7 +276,7 @@ am335x_dmtimer_probe(device_t dev) return (ENXIO); } - device_set_descf("AM335x DMTimer%d", tmr_num); + device_set_descf(dev, "AM335x DMTimer%d", tmr_num); return(BUS_PROBE_DEFAULT); } From nobody Fri Feb 14 19:25:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpn51xXz5nXP0; Fri, 14 Feb 2025 19:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpn0gtlz48wd; Fri, 14 Feb 2025 19:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GGZaRuAqqsTU8P2Mqt5BBK69ixPn6VfbAAQ7fRfWDw=; b=S59tEVDijEjqkT7y+4xqd8FlvfFXa4oeQOaBBzIYeARxk8Vebr+QWy6k+SY4KVsTA/uk7o /E8w6QOKdQ9E/OjKx0qcAip7XNS4Pqkszxp2+XTxW8wV4J4088cKUqbqw5YUv28YjONOX5 PVLBL0r2b4B7+nZC26Hi+TNFs8V74QYyvv11M9WS08HZ9addP9Agp0jYxNmBzxcsbS2bQd gLob6F+/qlusR4y0nonZVTAFOdGQFwbUBXSwS/kH0Uv3smT2UXOyobwTo0VhdFRVl6DTFR zlWv1spLMjlCvi/A916rrhfTIFCzl6zjzXuOeoLMN5VDd4g26fU6btB1JqfqUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GGZaRuAqqsTU8P2Mqt5BBK69ixPn6VfbAAQ7fRfWDw=; b=sRPFLKXr+L2A+leC7ASozd4kQi1etcKqqPMOciS7I62/7sMW3lZa4vy0xmTIc2QtAS8X3M 0H3w2yRpDWxcRUqsv9gqG+HOGd4kz4MYAuKBCQD9EZFFBZ9skMzs5epJ56h7wCXIznpFDg JJXDYLijdObSNbrkRH6Typf2l+blsVQbKjarK0tqhSbfxqxdXKVV/zJ7Mfjz4iFJ0DmWDG QHus6eiweGZmqLtWf8FlSYKYnJbh6gtlTyt81qRNff+P9cZB47Z/0k2kakaNqq/V0SXRIB JU18cexnorQiDOk7SujHq9fDr4sCFQdi8/ieydb3Fvwc+B5DRaP2qLYzc1nUew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561137; a=rsa-sha256; cv=none; b=xy+v4x0mzZLW7Fe80RBnPiLBEPEKAWQORUQFLz6HlXTCafay6rbiw8KC3+LmeGi5HlNjcl FtGepvNO5pKRvMGU0UQXEXVTbRLhl1f00YbEcqW7NRfoquTP+39C4IN7li356tfjWq6A36 9pB8JnVniTMSQ68v39gvGYYo5mhOn8vRS4wrwetweHDueosmSU/sQtFbEZ14nqaD7MJOWo fDZ8ubyG3V7o20vsjCa6TNJcB8xE+hDd3aM5D2vkMUhrya4EaCE8UI8D9OqSw9RFUSDGnQ BcRkewOLtlcUWcVvTGhuDSlgrYQDmPrjNzavo4NMxtYA0jMalAg2DO4PDJcfqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpm6wCMzkGM; Fri, 14 Feb 2025 19:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPaZl039068; Fri, 14 Feb 2025 19:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPa0w039065; Fri, 14 Feb 2025 19:25:36 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:36 GMT Message-Id: <202502141925.51EJPa0w039065@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: 31af1ba0a87c - stable/14 - Reinstate returning EOVERFLOW from stats_v1_blob_clone() List-Id: Commits to the stable branches 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: 31af1ba0a87cbf2fcc9850e012e5a62f750211b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=31af1ba0a87cbf2fcc9850e012e5a62f750211b1 commit 31af1ba0a87cbf2fcc9850e012e5a62f750211b1 Author: Lawrence Stewart AuthorDate: 2024-04-02 06:34:25 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:19 +0000 Reinstate returning EOVERFLOW from stats_v1_blob_clone() a0993376ec5f (from D43179) subtly changed stats_v1_blob_clone() to stop returning EOVERFLOW in the case where the user buffer is not large enough to receive the entire statsblob. This results in any consumers which are implemented to retry on receiving EOVERFLOW to instead give up after receiving an empty statsblob header. Fix by latching any errors recorded prior to copyout. Reviewed by: markj Obtained from: Netflix, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44585 Fixes: a0993376ec5f ("stats: Check for errors from copyout()") (cherry picked from commit 7eb92c502eb503d808a51296e426de625239a0d9) --- sys/kern/subr_stats.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_stats.c b/sys/kern/subr_stats.c index 6d04b9ae1588..23908c59c996 100644 --- a/sys/kern/subr_stats.c +++ b/sys/kern/subr_stats.c @@ -1079,9 +1079,9 @@ int stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, struct statsblobv1 *src, uint32_t flags) { - int error; + int error, tmperror; - error = 0; + error = tmperror = 0; if (src == NULL || dst == NULL || src->cursz < sizeof(struct statsblob) || @@ -1132,14 +1132,16 @@ stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, } #ifdef _KERNEL if (flags & SB_CLONE_USRDSTNOFAULT) - error = copyout_nofault(&(src->cursz), &((*dst)->cursz), + tmperror = copyout_nofault(&(src->cursz), &((*dst)->cursz), postcurszlen); else if (flags & SB_CLONE_USRDST) - error = copyout(&(src->cursz), &((*dst)->cursz), + tmperror = copyout(&(src->cursz), &((*dst)->cursz), postcurszlen); else #endif memcpy(&((*dst)->cursz), &(src->cursz), postcurszlen); + + error = error ? error : tmperror; } #ifdef _KERNEL out: From nobody Fri Feb 14 19:25:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yvhpm62mcz5nXYy; Fri, 14 Feb 2025 19:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yvhpl6n1dz48tp; Fri, 14 Feb 2025 19:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qC0AdHjvBCcwTuatNtyqqFuuQUwiFHAGZP4qefGlcFQ=; b=M7reGQq7VOWt0pYR+IBbweZUrh3xg2f5sS8dGeT9ybPgvG8kypLuglxk3iDJxC/IoTPheO Hzr6GeeeURBCi1un6SPBE7wc2HSENz1JvFhVrR+Ipq3u3yvaqtYmgOBIAcRKkqFYvPPFep joy/mAKaorsCXdwrgxt71iOKxXEIwe131kHljVAazkifGVuyWhokWvmbjEj+41+wYiaLyp a+XT7fcPyYTxgtqb+KTwZJuU1U3x4ohZeh1e0p0RYMMIZZJMENkLrXhfX/LzQR9Eyk35XD MdMHyj2sM50Q5Yvt/+ZM20BhMU28oK8Q4zeomHptrzsbfBfFo5Xst4zNM6aaHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qC0AdHjvBCcwTuatNtyqqFuuQUwiFHAGZP4qefGlcFQ=; b=E/XCVMw2FzEtNThZdoOBxhiS+mEvumj7u15G4vfr68qYnkxy9ZNWlWlWR+0n25rjf5MH+g bQjPB+0pzmDP7myGXOk3CP9zD1f0pQlKX+C2x8cEN4l572vf6cIL+346RrVdRsC0iE8L3h g9L/xmwviwadPWP8VOiYewPNxK4i3Ol3anMU4bavOSBrqik2LHQOppmw/n4S2jzGi2SonM ohyuEGMHGm+qVUSrUnV0ridcULJGoiKzP0Wxq8WItuaF4FLYuRkSxsVxzzHyoa9xFiJbyD /UIBV9lsMdy3+h5vMAxdfXBR2moxZ0hqqwAkn3roMw9+HSvV2GAkxkQ0He/h/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561136; a=rsa-sha256; cv=none; b=ChAHovjeOuWs8I4Of6KFakuDswgdPDZnpB15l7gHOTWvb3grTao3dirl1Izg8P6oOtjN5D WoRedHP/9fz2fnOf3wzkk83tPt4czNtdjc2540HYC86nc6UMUBgIjOTIMfbyqOIkA8imDq gHxECnS3G38Eb1t7PLFTaBlPhSc3WtRdNGNjnlKnfH0Jr4/N1/h/zQP4NcY6OLaWmjoYeL 1Ta2MWznLminue5THqwQskAfrcxxfhZsWb0IHAGa5IQwBFEy7dWALE/JpvVZ+G6qAWvbD/ oUDjqX/Q51mE1JAf6ceTlNh0WEIBAeWDNE3Xp6CfHNorN1F4ocdynor6TGoxKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yvhpl6HgBzkwc; Fri, 14 Feb 2025 19:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EJPZCn039031; Fri, 14 Feb 2025 19:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPZoB039028; Fri, 14 Feb 2025 19:25:35 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:35 GMT Message-Id: <202502141925.51EJPZoB039028@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: d1b263065a83 - stable/14 - geli tests: Use shorter passphrases in setkey_passphrase List-Id: Commits to the stable branches 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: d1b263065a83ede4e30be7b2dedb6e2cc8c32ad7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d1b263065a83ede4e30be7b2dedb6e2cc8c32ad7 commit d1b263065a83ede4e30be7b2dedb6e2cc8c32ad7 Author: Mark Johnston AuthorDate: 2023-10-02 20:55:26 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:19 +0000 geli tests: Use shorter passphrases in setkey_passphrase There is an undocumented limit on the length of a GELI passphrase, and the test exceeded that. Most of the time it worked because a nul terminator would appear early enough in the string. Reported by: Jenkins Fixes: 2b7b09ac9675 ("geli tests: Add a regression test for geli setkey -J") (cherry picked from commit c4b927c341e23eea17f75d139aafcf58545c5b0e) --- tests/sys/geom/class/eli/setkey_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/geom/class/eli/setkey_test.sh b/tests/sys/geom/class/eli/setkey_test.sh index ce3833f5fe0c..34fb8221ab04 100644 --- a/tests/sys/geom/class/eli/setkey_test.sh +++ b/tests/sys/geom/class/eli/setkey_test.sh @@ -108,9 +108,9 @@ setkey_passphrase_body() atf_check dd if=/dev/random of=rnd bs=512 count=${sectors} status=none hash1=`dd if=rnd bs=512 count=${sectors} status=none | md5` atf_check_equal 0 $? - atf_check dd if=/dev/random of=pass1 bs=512 count=32 status=none - atf_check dd if=/dev/random of=pass2 bs=512 count=32 status=none - atf_check dd if=/dev/random of=pass3 bs=512 count=32 status=none + atf_check dd if=/dev/random of=pass1 bs=512 count=1 status=none + atf_check dd if=/dev/random of=pass2 bs=512 count=1 status=none + atf_check dd if=/dev/random of=pass3 bs=512 count=1 status=none atf_check geli init -B none -J pass1 ${md} atf_check geli attach -j pass1 ${md} From nobody Sun Feb 16 00:25:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwRQv2mPHz5nb0p; Sun, 16 Feb 2025 00:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwRQv2696z3b8N; Sun, 16 Feb 2025 00:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FDVxabVzw7b7TMNm7u+5yFx0vjlfOKbB6UkALCKyQKw=; b=Kb4PX5TuXcMIkjPU1TuAQ9dV9YWyo0eh9eI+NoZsJV1LFp/Upir0jGiLrEc/chgHiJ882I SqjurggLahN5eHNDWgWVKK4YdQVnBiSX+w51w8OD/dpP9diIy9mlm6HeSudHHe16+DZ7Ae 0phxwbjtTkITK8Yc21LuBY4XhkB03JakKREn+2tWYoC7aP8hqJtWYWQXCIvJMyBKRPl4fG 8gBZ9XKenU4pSVqMO8VTMZSKdEnALV76OilnZC14HwyituaCKVY+26qylnC76m+IzUnPJ5 r3wEtEWxgM7fqLHDrludaLGb8TeXF44hJw3nymSRgRUZf1Zn4D4mQWYHtQKEwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739665559; a=rsa-sha256; cv=none; b=NSAqvtV6tgfSQP71/8vhIZtxzVlzdmVIGk5K6Dd39chsHQNM2zkof23nBUmcmwtKFF+qdd waMEpQjplA7/LFJT3KI4sIV9oBqF77KNsTVRONpVFOQtuhsa17Vdrs8sJskwefUKcQzKsa 313Afa8/3nicJRCxg9tSIeItsZjMTE+RbNvCCV5UQRXVr4UwpBkl9PShJAp5/xdNIMQht9 0nAAhrWOitvY3N6NofMmZiBWA6PY7r+bAx+SsYdw73aOARblHD404TvmK0CGsdbxl2N+bZ RXn1VEMkGk3p6V26kRermdI6rRWAu6F/jTVAqKxoII/n3XQYqessRSDOlERikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FDVxabVzw7b7TMNm7u+5yFx0vjlfOKbB6UkALCKyQKw=; b=IokoCcevn9az86ifr74oUqiCqDYSvZ6Etz33VDwyAuUZl0I1n1meQu7wGwXLKWuX2ixUYQ VCZiCIGnL3ss9BUMm5xbgJseYzPvg8Q6fpPsYhFtCot+OMca5EMt9J39dneEgb5LXIYEWz Et6rcsjf8DxlPkbtqyFhTw3deQTVBV+HdFqxT83Ly7Rd3ZdbsS/WoWrU/OcB8OS+OmVNjX DRHH3tazF2nnuzjzxHV9cHToynb4q3PHWAjXTpJWV4HQbQsjDAsQRk83I4YJd1GBgqIZw/ RacgBQd0WvTN6dRVo+c0n1mX/UCydLwW1i7rjyCUIzV+5m/eBYTMJx1U7SeqwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwRQv1h0wz89b; Sun, 16 Feb 2025 00:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G0PxdI016247; Sun, 16 Feb 2025 00:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G0PxBd016244; Sun, 16 Feb 2025 00:25:59 GMT (envelope-from git) Date: Sun, 16 Feb 2025 00:25:59 GMT Message-Id: <202502160025.51G0PxBd016244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: c34817d9aef7 - stable/14 - ixgbe: Add support for 1000BASE-BX SFP modules List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c34817d9aef7e97578f5ccb0b24381f5b4b9013f Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=c34817d9aef7e97578f5ccb0b24381f5b4b9013f commit c34817d9aef7e97578f5ccb0b24381f5b4b9013f Author: Tore Amundsen AuthorDate: 2024-11-06 21:31:01 +0000 Commit: Kevin Bowling CommitDate: 2025-02-16 00:25:04 +0000 ixgbe: Add support for 1000BASE-BX SFP modules Add support for 1Gbit BiDi modules Signed-off-by: Tore Amundsen Relnotes: yes Pull Request: https://github.com/freebsd/freebsd-src/pull/1518 (cherry picked from commit 89d4096950c4db748e39758c941cfb708c2ff808) --- sys/dev/ixgbe/if_ix.c | 5 ++++- sys/dev/ixgbe/ixgbe_82599.c | 4 +++- sys/dev/ixgbe/ixgbe_phy.c | 23 +++++++++++++++++++---- sys/dev/ixgbe/ixgbe_phy.h | 2 ++ sys/dev/ixgbe/ixgbe_type.h | 2 ++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index e94e120e27f9..959afa79e7da 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1424,8 +1424,10 @@ ixgbe_add_media_types(if_ctx_t ctx) ifmedia_add(sc->media, IFM_ETHER | IFM_2500_SX, 0, NULL); } #endif - if (layer & IXGBE_PHYSICAL_LAYER_1000BASE_BX) + if (layer & IXGBE_PHYSICAL_LAYER_1000BASE_BX) { device_printf(dev, "Media supported: 1000baseBX\n"); + ifmedia_add(sc->media, IFM_ETHER | IFM_1000_BX, 0, NULL); + } if (hw->device_id == IXGBE_DEV_ID_82598AT) { ifmedia_add(sc->media, IFM_ETHER | IFM_1000_T | IFM_FDX, @@ -2567,6 +2569,7 @@ ixgbe_if_media_change(if_ctx_t ctx) #endif case IFM_1000_LX: case IFM_1000_SX: + case IFM_1000_BX: speed |= IXGBE_LINK_SPEED_1GB_FULL; break; case IFM_1000_T: diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c index b2b40371648b..50902c6c356d 100644 --- a/sys/dev/ixgbe/ixgbe_82599.c +++ b/sys/dev/ixgbe/ixgbe_82599.c @@ -435,7 +435,9 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 || hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 || hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 || - hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) { + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core1) { *speed = IXGBE_LINK_SPEED_1GB_FULL; *autoneg = true; goto out; diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index ea815c6c88e5..2a735ead9a12 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -1423,6 +1423,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) else hw->phy.sfp_type = ixgbe_sfp_type_1g_lx_core1; + } else if (comp_codes_1g & IXGBE_SFF_BASEBX10_CAPABLE) { + if (hw->bus.lan_id == 0) + hw->phy.sfp_type = + ixgbe_sfp_type_1g_bx_core0; + else + hw->phy.sfp_type = + ixgbe_sfp_type_1g_bx_core1; } else { hw->phy.sfp_type = ixgbe_sfp_type_unknown; } @@ -1513,7 +1520,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 || hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 || hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 || - hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) { + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core1)) { hw->phy.type = ixgbe_phy_sfp_unsupported; status = IXGBE_ERR_SFP_NOT_SUPPORTED; goto out; @@ -1532,7 +1541,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 || hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 || hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 || - hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) { + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core1)) { /* Make sure we're a supported PHY type */ if (hw->phy.type == ixgbe_phy_sfp_intel) { status = IXGBE_SUCCESS; @@ -1615,6 +1626,8 @@ u64 ixgbe_get_supported_phy_sfp_layer_generic(struct ixgbe_hw *hw) physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T; else if (comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_SX; + else if (comp_codes_1g & IXGBE_SFF_BASEBX10_CAPABLE) + physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_BX; break; case ixgbe_phy_qsfp_intel: case ixgbe_phy_qsfp_unknown: @@ -1863,12 +1876,14 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw, if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 || sfp_type == ixgbe_sfp_type_1g_lx_core0 || sfp_type == ixgbe_sfp_type_1g_cu_core0 || - sfp_type == ixgbe_sfp_type_1g_sx_core0) + sfp_type == ixgbe_sfp_type_1g_sx_core0 || + sfp_type == ixgbe_sfp_type_1g_bx_core0) sfp_type = ixgbe_sfp_type_srlr_core0; else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 || sfp_type == ixgbe_sfp_type_1g_lx_core1 || sfp_type == ixgbe_sfp_type_1g_cu_core1 || - sfp_type == ixgbe_sfp_type_1g_sx_core1) + sfp_type == ixgbe_sfp_type_1g_sx_core1 || + sfp_type == ixgbe_sfp_type_1g_bx_core1) sfp_type = ixgbe_sfp_type_srlr_core1; /* Read offset to PHY init contents */ diff --git a/sys/dev/ixgbe/ixgbe_phy.h b/sys/dev/ixgbe/ixgbe_phy.h index 1fa2acb77354..c1ba73851397 100644 --- a/sys/dev/ixgbe/ixgbe_phy.h +++ b/sys/dev/ixgbe/ixgbe_phy.h @@ -49,6 +49,7 @@ #define IXGBE_SFF_1GBE_COMP_CODES 0x6 #define IXGBE_SFF_10GBE_COMP_CODES 0x3 #define IXGBE_SFF_CABLE_TECHNOLOGY 0x8 +#define IXGBE_SFF_BITRATE_NOMINAL 0xC #define IXGBE_SFF_CABLE_SPEC_COMP 0x3C #define IXGBE_SFF_SFF_8472_SWAP 0x5C #define IXGBE_SFF_SFF_8472_COMP 0x5E @@ -73,6 +74,7 @@ #define IXGBE_SFF_1GBASET_CAPABLE 0x8 #define IXGBE_SFF_10GBASESR_CAPABLE 0x10 #define IXGBE_SFF_10GBASELR_CAPABLE 0x20 +#define IXGBE_SFF_BASEBX10_CAPABLE 0x40 #define IXGBE_SFF_SOFT_RS_SELECT_MASK 0x8 #define IXGBE_SFF_SOFT_RS_SELECT_10G 0x8 #define IXGBE_SFF_SOFT_RS_SELECT_1G 0x0 diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h index a414e27142ec..91b46da72c75 100644 --- a/sys/dev/ixgbe/ixgbe_type.h +++ b/sys/dev/ixgbe/ixgbe_type.h @@ -3807,6 +3807,8 @@ enum ixgbe_sfp_type { ixgbe_sfp_type_1g_sx_core1 = 12, ixgbe_sfp_type_1g_lx_core0 = 13, ixgbe_sfp_type_1g_lx_core1 = 14, + ixgbe_sfp_type_1g_bx_core0 = 15, + ixgbe_sfp_type_1g_bx_core1 = 16, ixgbe_sfp_type_not_present = 0xFFFE, ixgbe_sfp_type_unknown = 0xFFFF }; From nobody Sun Feb 16 00:26:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwRQw6vq4z5nb5b; Sun, 16 Feb 2025 00:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwRQw4XM1z3bBg; Sun, 16 Feb 2025 00:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrjXeYsb48Gu8y0yP7HhkJPDQNdxSikJsGt+jXdyA7E=; b=gQ9RLldJZdp0CsfzCONq+NExI1tw8wS6RBeMGWzBtU8bUUmyYJz0Q6SBP1UQYBRano4cgE XReIVPNimZ5CRBObgFrlcs20qI3Hhzfe9+UsmXRx/zI8IVRvm6dGheq0wnFPHNeeLM7qId W2qxg5531CZndiEeQdsN7sx14Ok0WW2q4xgjJSqVaS2nr5lwYLkcH+9OD2K9S6k36R6dz6 MxYMiRcmPur7vo68kTFkRjBTcQT/e1RIwdT/+ADaQFJ/CreAN5fx8LrjEQxGWf7CqH14HH +Rh3OJdYeCvzzOsZx6BaGkaQj+mVie3bkXNubM5LCPUt5et5I28ZwyIcCvO8sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739665560; a=rsa-sha256; cv=none; b=EHGansYCW8ixM9BEyvWOVuMIxZse6aC2dLI/DHQlniq9SWLnP/6SRCIjn8Y+RhQNr3hwHl BlH+5XkQWNFYSJSOqIWCYQDVN/hR2IIPqKt+c+qsinAK5PDJ6eYbpi4xq2nW5Vud+Z52bW SZJHD8jizX5i026VVSd+ODeyCdIDU4Zv4sKyRlLNLHVI7nGV08bE3syzfslzzGVad8k9Y3 w4pA6DlsA81djP2kmkmSVnYp40ZNRQXlsLcno5D7PnZfdm3tqXTU4s966ArCBHUzjbY0Xu tHtXfoj26g4YzohJWm+Wb1alFFEyE6h/o9mJy4ONkXWAUkCKURKBWf3D3e+AUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrjXeYsb48Gu8y0yP7HhkJPDQNdxSikJsGt+jXdyA7E=; b=GYh9OhYH6Pr0c3Ugcs45b2La/jaM443xA4EgPMthFRM5BtAYD0jmxqhUJH/M7gkzUWxhsu OVo0E/YWbVdUYVPMTU6jzX3B1y13kE5sPf4TZOInrMqKlYSa8LdnL53wt/woDpcXHljeWJ PPMiDy2HrMH4FY2ddCIJKQV6MiPIIM1XLQ9SroA6oMYrIKJZ9lnDHHOTaiXOPVoXF6ECCN ea9wn39yVexnqrImPM/opw1Yw2SvYL/Y8y+f5GUwMbUsvLV8w7tLiiZwQwZCNQX15r87p8 HM87xpPaYF2zbddNuIuXR1zSRGmNHLdGBZXfIvFOwVJj1JXSp65g+mqcjlDjaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwRQw3K9xz85C; Sun, 16 Feb 2025 00:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G0Q0xC016288; Sun, 16 Feb 2025 00:26:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G0Q0an016285; Sun, 16 Feb 2025 00:26:00 GMT (envelope-from git) Date: Sun, 16 Feb 2025 00:26:00 GMT Message-Id: <202502160026.51G0Q0an016285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: ecbef369b33a - stable/14 - e1000: Fix vlan PCP/DEI on lem(4) List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ecbef369b33af759995d9f3f49e38ddda823c7c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ecbef369b33af759995d9f3f49e38ddda823c7c6 commit ecbef369b33af759995d9f3f49e38ddda823c7c6 Author: Aurelien Cazuc AuthorDate: 2025-02-13 18:08:42 +0000 Commit: Kevin Bowling CommitDate: 2025-02-16 00:25:26 +0000 e1000: Fix vlan PCP/DEI on lem(4) The vlan PCP and CFI/DEI were discarded when receiving vlan tagged packets on lem(4) interfaces with vlanhwtag. According to the 82540 SDM[1] (pg. 24), vlan tag is in the standard format, so there's no reason to discard PCP/DEI. [1]: http://iommu.com/datasheets/ethernet/controllers-nics/intel/e1000/pci-pci-x-family-gbe-controllers-software-dev-manual.pdf Sponsored by: Stormshield (author) Differential Revision: https://reviews.freebsd.org/D48987 (cherry picked from commit 4b29599fbbe33b75b7b58cfc5deea7a881e9a10e) --- sys/dev/e1000/e1000_defines.h | 1 - sys/dev/e1000/em_txrx.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h index 92f676932636..f1b1008764a1 100644 --- a/sys/dev/e1000/e1000_defines.h +++ b/sys/dev/e1000/e1000_defines.h @@ -130,7 +130,6 @@ #define E1000_RXD_ERR_TCPE 0x20 /* TCP/UDP Checksum Error */ #define E1000_RXD_ERR_IPE 0x40 /* IP Checksum Error */ #define E1000_RXD_ERR_RXE 0x80 /* Rx Data Error */ -#define E1000_RXD_SPC_VLAN_MASK 0x0FFF /* VLAN ID is in lower 12 bits */ #define E1000_RXDEXT_STATERR_TST 0x00000100 /* Time Stamp taken */ #define E1000_RXDEXT_STATERR_LB 0x00040000 diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index edbe0f8ab546..ced8d0f41d14 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -710,8 +710,7 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && status & E1000_RXD_STAT_VP) { - ri->iri_vtag = - le16toh(rxd->special & E1000_RXD_SPC_VLAN_MASK); + ri->iri_vtag = le16toh(rxd->special); ri->iri_flags |= M_VLANTAG; } From nobody Sun Feb 16 00:26:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwRQy1Y6Vz5nZXV; Sun, 16 Feb 2025 00:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwRQx3gyZz3Zs5; Sun, 16 Feb 2025 00:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zvdcWWYMogM8tKagMxRhouF4XDvL5nzxbw8j5fqlBY0=; b=Ol0OFPshy34R35Oq982zuHspC6SEN8gfPp/l+VQAKY+rVH2G5OVtUgwezt2S3vJVemfvfe L+7XU5YSLRIAxru+JaNxEPuf/FdviRIM7XKyVrNW9wwkTe7nQVNifSM7x2vTnokXCm9onR ksrVF4o7GKHsh/+GekF5YFUBf/oiVrkyhvosHVaqRuslEVlEF572/9X4yoWP57eE7Uz5zJ fWGkZj7ZtgiyvRiT+JrmyxD1Cgep6+3uKSst06//OwkLoUwNizpmIw55WbejUpGjs5VV2I 0vT+v6YII00QGh2spTsgvGF39l05WTKT80UdUfvOtYWHAqYyGMl1s1jiZcKnqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739665561; a=rsa-sha256; cv=none; b=aHH1YgL49MzMsFHtEDcp5/Aq4ZglPCiSewvTAlWlYB6eSzz+JlBnWeteC71sX3VfKS6J4Q DIE59RUXmlXSlu683vHY78pnc5jY/2A0oXiUgUBFgmY5PXWfkzaCt9UIlwgzCP73ejIVjP BXP5sfK1cHhFzanIxoQLzShIb1wDiwMx+pNfKgIQxbmM+6yuMgmSHw4UNFyWzr+DkRfcKg HWJ+3sOjZR20/FvW/CywW5IaH+1BA7fYmf5eh7Kny6SzSVa3CcgZfiQROGu4gClG03Lg7e 7vzdt+oeaLDazaaGXDbsZu4rtO99QH+St/JjWQvgaj8Rp0iEXk9Xjr+lyMye3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zvdcWWYMogM8tKagMxRhouF4XDvL5nzxbw8j5fqlBY0=; b=ba/YHpkq8SpPAVNdWhktxLYq8YMoHWKBkmBLizicXNi8CEaajqJKUF4xY9nBOZ+CuJewQm Db89gVaI64u0HahKx0a1RnjuIusUB0CL1w+x0k3ca7flF6cUe+6zwO7NAEN2uVq0oZ6S7X uO84PKc8uYrXFoZSlzyH7ITPA+bYXNFTaQO/oeVmYycqot9nz9Ss/skxwKB3IfI343eyXN /llE+qp8VmJV7zP36JzLJ53xjHeNgSLM3gILGB4rXwV49oUHnrEoScUft1RTyqfsVhepH/ H0n6/3u29RfqdD/CIdrCcLPmjwvw85ECrekahTntV1NoH+5/tUWUZgZ14L2RKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwRQx38ndz85D; Sun, 16 Feb 2025 00:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G0Q1g0016332; Sun, 16 Feb 2025 00:26:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G0Q1N7016329; Sun, 16 Feb 2025 00:26:01 GMT (envelope-from git) Date: Sun, 16 Feb 2025 00:26:01 GMT Message-Id: <202502160026.51G0Q1N7016329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 07e712e4d1f0 - stable/14 - igc: Remove unused register IGC_RXD_SPC_VLAN_MASK List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07e712e4d1f0e0227c774a9621035b949deb5aae Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=07e712e4d1f0e0227c774a9621035b949deb5aae commit 07e712e4d1f0e0227c774a9621035b949deb5aae Author: Kevin Bowling AuthorDate: 2025-02-13 18:22:50 +0000 Commit: Kevin Bowling CommitDate: 2025-02-16 00:25:41 +0000 igc: Remove unused register IGC_RXD_SPC_VLAN_MASK We don't use legacy receive descriptors and masking out the vlan ID isn't necessary since the tag is in the standard format, so remove it. (cherry picked from commit 124b7722aad7d4cf12d96c030659aef78175aa9c) --- sys/dev/igc/igc_defines.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/igc/igc_defines.h b/sys/dev/igc/igc_defines.h index e9ebd23c41c3..09f75fe2787e 100644 --- a/sys/dev/igc/igc_defines.h +++ b/sys/dev/igc/igc_defines.h @@ -96,7 +96,6 @@ #define IGC_RXD_ERR_TCPE 0x20 /* TCP/UDP Checksum Error */ #define IGC_RXD_ERR_IPE 0x40 /* IP Checksum Error */ #define IGC_RXD_ERR_RXE 0x80 /* Rx Data Error */ -#define IGC_RXD_SPC_VLAN_MASK 0x0FFF /* VLAN ID is in lower 12 bits */ #define IGC_RXDEXT_STATERR_TST 0x00000100 /* Time Stamp taken */ #define IGC_RXDEXT_STATERR_LB 0x00040000 From nobody Sun Feb 16 00:27:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwRS54V6Lz5nb3J; Sun, 16 Feb 2025 00:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwRS53H93z3cSq; Sun, 16 Feb 2025 00:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqgkJRufyvG1Y10W3mTWiu3Sc+y2g2UsfyBxoEjew4w=; b=Gss0heidl3cpbxrEVf2I5SLxgaWuz1tjB8AkpGrERAesi0XzlsKikIdrvJ65gnqVXtbA/a NgDa0Zx0JN2la3Fwoy+ItSwCJVtoYjlvWNllafki9CHLkgvEHHUce40yT4zR75xKVo+OOy XL1ffatY4JryaaUD5wJztfIJ5cWuFA7IkVhWLwSctkrRx9m2LuyB9F4Wu1CCoLaSsH8hBy JYb5WiQ/2FexCHo7tGju8O5Gd96VGuSZ7+uDlA0OxmhO2TBgSS4kmmKLXyPMdXipoMn0Sl r8+aNf3EQJV6jqp+AcSjgdUHTgqZkaiDZpSL36XPLVR04hWj49q4CbsPRPotlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739665621; a=rsa-sha256; cv=none; b=ZM3nZ1t2D6iA+0Q44sCeEea/8RkZHNU1tuYkp8VU8zkhlyrAD1gmzvRhGeqmuae/0qNk90 gwoy6fAYJTHAUIY2EYptsX6Y683o9e1ddeZxdSxOOfj5zR7nrIV7rWmVOBIwNis+zoqIwK ZhOZz724ktRkJXxo4EUxmfxgk5hTQSJASC+SQc/p944gu1rDChq33/6w57OhYfpDsoIblY NRzedgt3ym1BwT7HCVofN+r4Elm6WucOGFmT/KqCsd8U5pe2oZ3tJh5PPq+MPm3+uT0CLl IB/41z3Vv9Y2loW29Qf7DHKM43ZvuLGGMrQ9NsmFEfVJNQEg2fnPCiETFq5gWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqgkJRufyvG1Y10W3mTWiu3Sc+y2g2UsfyBxoEjew4w=; b=rfGTHA0bb8Cm2Tt8xu7D8ez5VzxXq/E/VQAMYL4FwKPMb4J8jlgonVZDzYHOzgrctDPmmA LG2ILM1GaPOwBsNWUcH/f6NRiMNceFwKgQ8NmxrKejjEyN8xP1sGHEsSrgNSsnPHbaUHxq h/w8ksg3eLTrtun/rcuTxRVILSEHo7aLf/geOTnmF2ycVaNQgypGECKHp1Le+aUNrTcvYd RkXPDrI0Yl4iMH87uo6YGO0EDHyekT4bsKgmjXVYMJ1hWR/JEG/7akS1W7TeyVsAk+qSv8 jF8e4LaQ+vc8AYQlXhtP8tuKnTTneDnpRDmVtyyXvKHR2fP4kivy/1KrJH7QtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwRS52mfqz7wX; Sun, 16 Feb 2025 00:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G0R1xo016761; Sun, 16 Feb 2025 00:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G0R1UM016756; Sun, 16 Feb 2025 00:27:01 GMT (envelope-from git) Date: Sun, 16 Feb 2025 00:27:01 GMT Message-Id: <202502160027.51G0R1UM016756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: b26592d87dbe - stable/13 - ixgbe: Add support for 1000BASE-BX SFP modules List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b26592d87dbedb202b4b75f8515165deb7e234d0 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b26592d87dbedb202b4b75f8515165deb7e234d0 commit b26592d87dbedb202b4b75f8515165deb7e234d0 Author: Tore Amundsen AuthorDate: 2024-11-06 21:31:01 +0000 Commit: Kevin Bowling CommitDate: 2025-02-16 00:26:26 +0000 ixgbe: Add support for 1000BASE-BX SFP modules Add support for 1Gbit BiDi modules Signed-off-by: Tore Amundsen Relnotes: yes Pull Request: https://github.com/freebsd/freebsd-src/pull/1518 (cherry picked from commit 89d4096950c4db748e39758c941cfb708c2ff808) --- sys/dev/ixgbe/if_ix.c | 5 ++++- sys/dev/ixgbe/ixgbe_82599.c | 4 +++- sys/dev/ixgbe/ixgbe_phy.c | 23 +++++++++++++++++++---- sys/dev/ixgbe/ixgbe_phy.h | 2 ++ sys/dev/ixgbe/ixgbe_type.h | 2 ++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 313f95c82713..641689d3e065 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1425,8 +1425,10 @@ ixgbe_add_media_types(if_ctx_t ctx) ifmedia_add(sc->media, IFM_ETHER | IFM_2500_SX, 0, NULL); } #endif - if (layer & IXGBE_PHYSICAL_LAYER_1000BASE_BX) + if (layer & IXGBE_PHYSICAL_LAYER_1000BASE_BX) { device_printf(dev, "Media supported: 1000baseBX\n"); + ifmedia_add(sc->media, IFM_ETHER | IFM_1000_BX, 0, NULL); + } if (hw->device_id == IXGBE_DEV_ID_82598AT) { ifmedia_add(sc->media, IFM_ETHER | IFM_1000_T | IFM_FDX, @@ -2568,6 +2570,7 @@ ixgbe_if_media_change(if_ctx_t ctx) #endif case IFM_1000_LX: case IFM_1000_SX: + case IFM_1000_BX: speed |= IXGBE_LINK_SPEED_1GB_FULL; break; case IFM_1000_T: diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c index b2b40371648b..50902c6c356d 100644 --- a/sys/dev/ixgbe/ixgbe_82599.c +++ b/sys/dev/ixgbe/ixgbe_82599.c @@ -435,7 +435,9 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 || hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 || hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 || - hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) { + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core1) { *speed = IXGBE_LINK_SPEED_1GB_FULL; *autoneg = true; goto out; diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index ea815c6c88e5..2a735ead9a12 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -1423,6 +1423,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) else hw->phy.sfp_type = ixgbe_sfp_type_1g_lx_core1; + } else if (comp_codes_1g & IXGBE_SFF_BASEBX10_CAPABLE) { + if (hw->bus.lan_id == 0) + hw->phy.sfp_type = + ixgbe_sfp_type_1g_bx_core0; + else + hw->phy.sfp_type = + ixgbe_sfp_type_1g_bx_core1; } else { hw->phy.sfp_type = ixgbe_sfp_type_unknown; } @@ -1513,7 +1520,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 || hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 || hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 || - hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) { + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core1)) { hw->phy.type = ixgbe_phy_sfp_unsupported; status = IXGBE_ERR_SFP_NOT_SUPPORTED; goto out; @@ -1532,7 +1541,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 || hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 || hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 || - hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) { + hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core0 || + hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core1)) { /* Make sure we're a supported PHY type */ if (hw->phy.type == ixgbe_phy_sfp_intel) { status = IXGBE_SUCCESS; @@ -1615,6 +1626,8 @@ u64 ixgbe_get_supported_phy_sfp_layer_generic(struct ixgbe_hw *hw) physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T; else if (comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_SX; + else if (comp_codes_1g & IXGBE_SFF_BASEBX10_CAPABLE) + physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_BX; break; case ixgbe_phy_qsfp_intel: case ixgbe_phy_qsfp_unknown: @@ -1863,12 +1876,14 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw, if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 || sfp_type == ixgbe_sfp_type_1g_lx_core0 || sfp_type == ixgbe_sfp_type_1g_cu_core0 || - sfp_type == ixgbe_sfp_type_1g_sx_core0) + sfp_type == ixgbe_sfp_type_1g_sx_core0 || + sfp_type == ixgbe_sfp_type_1g_bx_core0) sfp_type = ixgbe_sfp_type_srlr_core0; else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 || sfp_type == ixgbe_sfp_type_1g_lx_core1 || sfp_type == ixgbe_sfp_type_1g_cu_core1 || - sfp_type == ixgbe_sfp_type_1g_sx_core1) + sfp_type == ixgbe_sfp_type_1g_sx_core1 || + sfp_type == ixgbe_sfp_type_1g_bx_core1) sfp_type = ixgbe_sfp_type_srlr_core1; /* Read offset to PHY init contents */ diff --git a/sys/dev/ixgbe/ixgbe_phy.h b/sys/dev/ixgbe/ixgbe_phy.h index 1fa2acb77354..c1ba73851397 100644 --- a/sys/dev/ixgbe/ixgbe_phy.h +++ b/sys/dev/ixgbe/ixgbe_phy.h @@ -49,6 +49,7 @@ #define IXGBE_SFF_1GBE_COMP_CODES 0x6 #define IXGBE_SFF_10GBE_COMP_CODES 0x3 #define IXGBE_SFF_CABLE_TECHNOLOGY 0x8 +#define IXGBE_SFF_BITRATE_NOMINAL 0xC #define IXGBE_SFF_CABLE_SPEC_COMP 0x3C #define IXGBE_SFF_SFF_8472_SWAP 0x5C #define IXGBE_SFF_SFF_8472_COMP 0x5E @@ -73,6 +74,7 @@ #define IXGBE_SFF_1GBASET_CAPABLE 0x8 #define IXGBE_SFF_10GBASESR_CAPABLE 0x10 #define IXGBE_SFF_10GBASELR_CAPABLE 0x20 +#define IXGBE_SFF_BASEBX10_CAPABLE 0x40 #define IXGBE_SFF_SOFT_RS_SELECT_MASK 0x8 #define IXGBE_SFF_SOFT_RS_SELECT_10G 0x8 #define IXGBE_SFF_SOFT_RS_SELECT_1G 0x0 diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h index a414e27142ec..91b46da72c75 100644 --- a/sys/dev/ixgbe/ixgbe_type.h +++ b/sys/dev/ixgbe/ixgbe_type.h @@ -3807,6 +3807,8 @@ enum ixgbe_sfp_type { ixgbe_sfp_type_1g_sx_core1 = 12, ixgbe_sfp_type_1g_lx_core0 = 13, ixgbe_sfp_type_1g_lx_core1 = 14, + ixgbe_sfp_type_1g_bx_core0 = 15, + ixgbe_sfp_type_1g_bx_core1 = 16, ixgbe_sfp_type_not_present = 0xFFFE, ixgbe_sfp_type_unknown = 0xFFFF }; From nobody Sun Feb 16 00:27:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwRS72JClz5nb6n; Sun, 16 Feb 2025 00:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwRS64f7hz3cSt; Sun, 16 Feb 2025 00:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTXfTqvOcywHSwltP/J8TCRjy6sGlJQd7foVTwnJ8Wk=; b=Gm8Fgs/+vQy11VEu0443PR7nHblksHj5ACvL1NpbzP/Js+zyOTji51B+pQm0NGeChySa9q rjCEtc8QkRWc0OhTSM2wRv4sNbpFNyOOnB/flcPPrUGpsvvrYhsAF0CwoiUMuriofiZNsp z7PNoLeWi1tkoJkyRVRzBxEW3JD3ay9XxRiWl/aQbjLZQrNelMqp2q5brrHShMh4XQcKAY 01aUhnTbitrpPwEyLVyG3Rk5N61sNHBlxCQLrqViS+vwEvSWHYWDVQB8NiX6I7GlvynJo/ yZH7pOvTmCp1AHcXzrEuQdu58jgi9dAvCqJxCAt1FLkXfiNvwdw2XGX/HWA6aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739665622; a=rsa-sha256; cv=none; b=En5jbZ3ONm6YG1nS8Tpt//PVfo9KwvM0xeIN9ImWau2WEUK4vwG94sPK3IviqreFB2QuP5 IHqeU+O73RJme1kQ6vbFjAawM+1dG/d7mDQ6DYnPXdxKrVR2S8HuKdrN0jOulpterurs/5 VR7UC69Z/tv2p5dwrYHoJ772s6qKfUy0v/7fXWQ2ESPJLjRS1H6f65/v9tW04hhcCjybAE yFRJRbthyJ9FCCse2m1Pqc1JWc6Grs0Ie6yXIqPrdKteQ4g/o7YjvLDVfHfUSB2gzoEWb+ 6jmHey3CJ0AFo8fHVyrrK8dkawhCpMi005dd1s7oY1xcfN/zxk+9EZ7c/IGMyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTXfTqvOcywHSwltP/J8TCRjy6sGlJQd7foVTwnJ8Wk=; b=g6WgLNdgjRH6HzXyBabGVhcbfxdf2EQ7VT2iLEIbxJgJUSTOZLnbGWc0GzJ3p0QAcRx65V g/AFsQe9Pmz/8SPNpN5inVNq/bleq2RCpe10moxTy7XOiX6UdODriBsBkpegC2eAGaDnyb 20yXUzoY3ox22/Nu0OqXc+N0PnO3EGUmn7znRNvrbJ7vo24miGtitkcBPx754fzMy4uB6q 2YPeVeuVapWgPpha4La0ftjBGPuxPkDW7wt/FtVKQ78EPeFVjRs0tj5adWt1wK4MwaJu4N uhJDg14eiFJHzmIGrBai/F/9k3s06zk6SjTao+1dK6YolrseTP0gOM8gHWpCew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwRS63tJjz85F; Sun, 16 Feb 2025 00:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G0R2MK016795; Sun, 16 Feb 2025 00:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G0R2tl016792; Sun, 16 Feb 2025 00:27:02 GMT (envelope-from git) Date: Sun, 16 Feb 2025 00:27:02 GMT Message-Id: <202502160027.51G0R2tl016792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e812e4d86d28 - stable/13 - e1000: Fix vlan PCP/DEI on lem(4) List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e812e4d86d283ea65c6275e20b23bbddb9bd97d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e812e4d86d283ea65c6275e20b23bbddb9bd97d8 commit e812e4d86d283ea65c6275e20b23bbddb9bd97d8 Author: Aurelien Cazuc AuthorDate: 2025-02-13 18:08:42 +0000 Commit: Kevin Bowling CommitDate: 2025-02-16 00:26:40 +0000 e1000: Fix vlan PCP/DEI on lem(4) The vlan PCP and CFI/DEI were discarded when receiving vlan tagged packets on lem(4) interfaces with vlanhwtag. According to the 82540 SDM[1] (pg. 24), vlan tag is in the standard format, so there's no reason to discard PCP/DEI. [1]: http://iommu.com/datasheets/ethernet/controllers-nics/intel/e1000/pci-pci-x-family-gbe-controllers-software-dev-manual.pdf Sponsored by: Stormshield (author) Differential Revision: https://reviews.freebsd.org/D48987 (cherry picked from commit 4b29599fbbe33b75b7b58cfc5deea7a881e9a10e) --- sys/dev/e1000/e1000_defines.h | 1 - sys/dev/e1000/em_txrx.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h index 92f676932636..f1b1008764a1 100644 --- a/sys/dev/e1000/e1000_defines.h +++ b/sys/dev/e1000/e1000_defines.h @@ -130,7 +130,6 @@ #define E1000_RXD_ERR_TCPE 0x20 /* TCP/UDP Checksum Error */ #define E1000_RXD_ERR_IPE 0x40 /* IP Checksum Error */ #define E1000_RXD_ERR_RXE 0x80 /* Rx Data Error */ -#define E1000_RXD_SPC_VLAN_MASK 0x0FFF /* VLAN ID is in lower 12 bits */ #define E1000_RXDEXT_STATERR_TST 0x00000100 /* Time Stamp taken */ #define E1000_RXDEXT_STATERR_LB 0x00040000 diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index edbe0f8ab546..ced8d0f41d14 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -710,8 +710,7 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) if (scctx->isc_capenable & IFCAP_VLAN_HWTAGGING && status & E1000_RXD_STAT_VP) { - ri->iri_vtag = - le16toh(rxd->special & E1000_RXD_SPC_VLAN_MASK); + ri->iri_vtag = le16toh(rxd->special); ri->iri_flags |= M_VLANTAG; } From nobody Sun Feb 16 00:27:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwRS80pnwz5nb3N; Sun, 16 Feb 2025 00:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwRS75FnJz3cQK; Sun, 16 Feb 2025 00:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B0QcGk/WMr8TFAiZbQnRnnZeyRBEcCe0uDBbkNug84s=; b=qkTpmv/OPrm06gzXGpfB+HMAg6Vwu/jmkslNtW6FJbdU23Rv/Nq7XD+yYYrShf8DG1wpJT Dfr/wp+CNHiUcH+mOHBpYII53LOqq7xBFwLx31F0E9rnLiwH57D2eodOjtIVXIlGJJ+1/D eWm6KUg+kEIZXWzO/NU/jREnr5PetPjMnsRxaSqvBE2H/P+rkyMrgXvRSaaPOlwe1KuT3C RzDEbS+GxAlEoIrDfFu590cGtR8wt9gpcRHI0ePUBExnCNLpB1P0KkErn1KZaXFAw6QEOu aCnSDn7nioR2UVg0u+gQC8/9Mau3ZQ042xeT+vhOik//Wj5AFWH6nah6GcUdbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739665623; a=rsa-sha256; cv=none; b=de42M/VLqNjZrzsP8gYCzcT84af1OnNeQm0BcXoknWG6NwIwdqIa2E3VIWo5bmoI9Q76BR S0NT5yLpTqtzpv5NtKIxhBBJNKNi2vsAqNeUoZTIpcn7wOzx7CdRydYD3jmV63Rm9rCybG 3RCV26isT8likoUjnREu+r744UDPpAXEuixILydOJkfwd5M+yJDMOXzR9CwHXhz+/iW8W3 tXua8OacsHqsXQSL3Ef7UNEv9bMjqMe5bYTmdEFdQ1jSvY2tCr5S3JKwZo5v9v8OeFK1z6 B5IiLAzJcxgFbKPYOYoUa1vrkB9sSS0bOgBLlbwML3lc0/JwKdDnv0cexsl1RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739665623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B0QcGk/WMr8TFAiZbQnRnnZeyRBEcCe0uDBbkNug84s=; b=Si/1as/jzQe8FXsZ9jMw6S4s9H+YpRrYKGzvxdfbe/13dD1InBFBMPSP+0pkfCfwJ0wTkh 4GmmNhaA5tmKzQS8SP0B7kS6hnyv23b8wJpfWRQxKos4udn4sVcMfyiqDnPQupgfXC5AFa /9LfOv0ee9t2fOwIIXTZhuyU1f/vL2z2CDQfhfz28966I9eqPR9P1NQ6l2yZNyCsXl5imo h1oWTAL95kLzSLjiA3+GKdh4Qhdv/M1WxrIEF/uwc3zZNPmcKGUUm8ho7Le/CWtWKh915A jS+DW/8oxHhLcyaYVelk4bA9G2pyOZzXKS8FXgTNyXbIm6UdHX8d1bDwGqyOag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwRS74qX5z7Xb; Sun, 16 Feb 2025 00:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G0R3RZ016830; Sun, 16 Feb 2025 00:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G0R3Bm016827; Sun, 16 Feb 2025 00:27:03 GMT (envelope-from git) Date: Sun, 16 Feb 2025 00:27:03 GMT Message-Id: <202502160027.51G0R3Bm016827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a06369238d7d - stable/13 - igc: Remove unused register IGC_RXD_SPC_VLAN_MASK List-Id: Commits to the stable branches 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a06369238d7df8c0b691b3a1617d5e2f337b63b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a06369238d7df8c0b691b3a1617d5e2f337b63b2 commit a06369238d7df8c0b691b3a1617d5e2f337b63b2 Author: Kevin Bowling AuthorDate: 2025-02-13 18:22:50 +0000 Commit: Kevin Bowling CommitDate: 2025-02-16 00:26:50 +0000 igc: Remove unused register IGC_RXD_SPC_VLAN_MASK We don't use legacy receive descriptors and masking out the vlan ID isn't necessary since the tag is in the standard format, so remove it. (cherry picked from commit 124b7722aad7d4cf12d96c030659aef78175aa9c) --- sys/dev/igc/igc_defines.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/igc/igc_defines.h b/sys/dev/igc/igc_defines.h index e9ebd23c41c3..09f75fe2787e 100644 --- a/sys/dev/igc/igc_defines.h +++ b/sys/dev/igc/igc_defines.h @@ -96,7 +96,6 @@ #define IGC_RXD_ERR_TCPE 0x20 /* TCP/UDP Checksum Error */ #define IGC_RXD_ERR_IPE 0x40 /* IP Checksum Error */ #define IGC_RXD_ERR_RXE 0x80 /* Rx Data Error */ -#define IGC_RXD_SPC_VLAN_MASK 0x0FFF /* VLAN ID is in lower 12 bits */ #define IGC_RXDEXT_STATERR_TST 0x00000100 /* Time Stamp taken */ #define IGC_RXDEXT_STATERR_LB 0x00040000 From nobody Sun Feb 16 04:16:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwXXf0pZfz5nrwy; Sun, 16 Feb 2025 04:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwXXf0D6Hz3p7h; Sun, 16 Feb 2025 04:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739679378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eCW1kFcokNvUEuMzl/pnwlMTCjwssMN5UwtMyoTQmcM=; b=RoBq06/riEnzyepxQMOHMsCl7lFq0iHjLJlx7e1xBsq0PJqTq/TM3VMrq60eYpG2jCkRU4 GTzVn9hvwrQWrp5yjYYgM8e4AzDppSblMUAX22WzP28Uy6BWYinIaroM0lRUcJw5X4eDgP TM7Xn9IJVtt0tZm0sWmNTdGjrY55/5h7C7rS6O2x/JSHf57+YusYQvCvfqAuLtNXBooeVq lLlsoELoUBr4PxUxOxrolRo8D/bPoKq5qGtW+P7/N/vKBxKCZ82vGnvT+ukie6U7/ZKThE J5+3x38dH1VyU2f6nnb65Vy8ZJNrp6g72F7xKuHgdoQyBl7UGABQ5a8RK8vrrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739679378; a=rsa-sha256; cv=none; b=Tu7zGfyIDM4dg/u651nmcJfZ4rxjOwABj3KyRtS/feDJAlLzegf5sCLVPX01/fS2zpVkVI hGBs8MfdSPSCQXa5Kpem7jWP7mb/hYiL0dZJLgWtIM+CPdHKXhyNJJrlyZ+XgZdaqcFEvb geuABsau32LSoMh53rjPu1pOoLwLVhTCXVqJuq8VWRvioNYVhgrFKpq2mN06inVh0CquKH IAE8KDXQrqyZSr8ZqRR4lONNm1WMds4qpRtb6FQPT66NXohlty1cwrfViBAHdiFZlu673t QA9UvwEjFDVo38aQs+RyOXVb8pzNSVDr31X4tN82BrjC8Ya8T+P0rlm42qSf3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739679378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eCW1kFcokNvUEuMzl/pnwlMTCjwssMN5UwtMyoTQmcM=; b=o5B6Kaq/g8lWDChFhiAMgyVy8RBGleFx67ETbQ5hqym+tTqAFOjUUVjn1whIlMSf75N7sO xwRnho75RWUFcp4VaMOH+eCpjz0hZbrsiKu2deIFH73FUdH5nV7Vvf3uuXkDZJY4YmSROG hodjU20WPvauYJJXdHBPv0d+OHxqe2hX3+8VsgS9Co6MHhwu8kXNWN3JwYlsteKjv9ogtT oifJ9DvqSVvgXlp5qqhjZXbTQJOe5nohMjL/wsPN2Oe7aAI8VYE/KlK7fwM4ky/oXPLjFF /xT8olYWxHbfp8CpVear1llmRS1+M3FXbB4RLrfOCxjQhN1vvbg0M4faj+IaqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwXXd6lxtzXGJ; Sun, 16 Feb 2025 04:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G4GHU2050046; Sun, 16 Feb 2025 04:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G4GHvj050043; Sun, 16 Feb 2025 04:16:17 GMT (envelope-from git) Date: Sun, 16 Feb 2025 04:16:17 GMT Message-Id: <202502160416.51G4GHvj050043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 24d3fd31f805 - stable/14 - ObsoleteFiles.inc: Remove test debug file from wrong dir List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24d3fd31f805445e5e81ba46bb28bfc8b9df13ab Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=24d3fd31f805445e5e81ba46bb28bfc8b9df13ab commit 24d3fd31f805445e5e81ba46bb28bfc8b9df13ab Author: Jose Luis Duran AuthorDate: 2025-02-13 17:05:33 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-16 04:13:51 +0000 ObsoleteFiles.inc: Remove test debug file from wrong dir Reported by: des Reviewed by: des, emaste Approved by: emaste (mentor) Fixes: 88d448ec815c ("mk: Move vm stack test debug symbols") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48991 (cherry picked from commit e159dcc37e6f538d3d61ea3b2d08b052cf0e0ced) --- ObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e736235f80da..8eec739cd89c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,7 @@ # done # 20250204: sys/vm/stack test symbols moved to /usr/lib/debug +OLD_FILES+=usr/tests/sys/vm/stack/.debug/libsoxstack.so.debug OLD_DIRS+=usr/tests/sys/vm/stack/.debug # 20241201: new clang import which bumps version from 18 to 19 From nobody Sun Feb 16 04:16:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwXYC4QC6z5nrtd; Sun, 16 Feb 2025 04:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwXYB64PWz3pfy; Sun, 16 Feb 2025 04:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739679406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=df7e/Hgh7NUyTLyWgv+KCyI5FPOLi+KvutxVWvNA8+A=; b=gsfHKyjp+zPQ7TCM3TucwMh1g6LAWp4H+IkvEESH+e6wVNHg70kbXZj0hx8931qaXga7T2 8D5w4Tlikt4zK7VDfDnyMP2SLOBepRV23cfodrIF94oTz7c7GRlmYLOIz2NtOprloCynk1 lhSgGRLbmgh3fmATrB9XutprcivbO/BBwX6IHVl12+XV6lo08nvTIYj2m2iWOhSoxu8M/o Wkl2jl8dXe3Vafdw9sSeF+74KVMrquUJyi+Fh4UtirKg0Iu9R7WrSZVba0LivxLijUpww7 OUAdxpMR6xooheaUfHq8IJMpzmi2cvZurcnhVxSAK0UXFHAb15az+qu4jt73Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739679406; a=rsa-sha256; cv=none; b=m3lr//hIHu6UvTXcfEdK3zHQ3br/RHzMHr1BU9A9vxYDGoqw9MGYaSmT0UiJc7qqtZ8s6b kT0vVgBINqvqS/Qd2i02/Mc2PEG3NiiVcChJ559Qf4Ufj2HYD9Zdh1L9yA6JUzn/Bryodp K2TH9lgCwV5I5RphzSW7WAg7XIEFmt5g2Fwro4GvTXcQhvc6FdBso8Qr54GBRL5AOFVMaQ MIHVO+tAQzoz1lM5T1kbWPjSTVaymmb0lOazYPDg92yKz92uLmcc8j3Ub6K0f6XaqU6bAD rXNP6biX6Fskg51u4sVcB+/jml+UBACSs7V11t1v8JwhXi2bcLcb8QcPfOHyUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739679406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=df7e/Hgh7NUyTLyWgv+KCyI5FPOLi+KvutxVWvNA8+A=; b=lrBwpx72n2M5/HKts7susC3yCyXFO5sWeFsTvrL9zT3TRg0znYMb6sObb1qgO9hIShzmlw fswHkkwU8apiV4KXUlj9Dy7ixKqroPOJdEc29t0IzDiZF7hMQul2VDdSLTChNfB/+ZmFgT VBTc8Tzi4RpDz+kL6Wkph/ILpKNUNEqqzhBQzxBp7W6cshZWASsZjUMG9pQE3LHxab15RE 0PFuBHvl2kyzzM1ntAUaSpT6WeHoJyUDQq6vXtj7YmMjU/GkrZeTj69m54yBV8tbnHNSmL 6oh/9wc8pVnf9H6smhqSDL8IHgyE1So3rFf6hDJ6muS0hnF3WHcy83D3MaIPFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwXYB5TdPzXZG; Sun, 16 Feb 2025 04:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51G4GkBO050312; Sun, 16 Feb 2025 04:16:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51G4GkAF050309; Sun, 16 Feb 2025 04:16:46 GMT (envelope-from git) Date: Sun, 16 Feb 2025 04:16:46 GMT Message-Id: <202502160416.51G4GkAF050309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: b6490ad408d0 - stable/13 - ObsoleteFiles.inc: Remove test debug file from wrong dir List-Id: Commits to the stable branches 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6490ad408d0049c5e6ab73aa94151ab33b4106e Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b6490ad408d0049c5e6ab73aa94151ab33b4106e commit b6490ad408d0049c5e6ab73aa94151ab33b4106e Author: Jose Luis Duran AuthorDate: 2025-02-13 17:05:33 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-16 04:15:31 +0000 ObsoleteFiles.inc: Remove test debug file from wrong dir Reported by: des Reviewed by: des, emaste Approved by: emaste (mentor) Fixes: 88d448ec815c ("mk: Move vm stack test debug symbols") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48991 (cherry picked from commit e159dcc37e6f538d3d61ea3b2d08b052cf0e0ced) --- ObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d929086e47c7..682a0848b6f6 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,7 @@ # done # 20250204: sys/vm/stack test symbols moved to /usr/lib/debug +OLD_FILES+=usr/tests/sys/vm/stack/.debug/libsoxstack.so.debug OLD_DIRS+=usr/tests/sys/vm/stack/.debug # 20241201: new clang import which bumps version from 18 to 19