From nobody Thu Mar 13 16:03:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZDC2l6R4kz5qrmt; Thu, 13 Mar 2025 16:03: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDC2l4xPMz3QGH; Thu, 13 Mar 2025 16:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741881791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ckh8oU/6zI6ILs/aRYuTW6pl0f5rw3VKCcxlTk5KKAg=; b=wbIYekXXVgDN0ZNpyAqTNgWiNgRo9HV9O77PLkg72qrZ9HEzHW+5wVcJIqkDHUr8Ant81V ND6AgLwX6wcAYn7NcYJ+Y4xb19FOusBKodQrPzIUgvSqkTovgrwlN7fDgaFIHh6psJ/0PR 3YtcqysNd30y40KPnsQsc12f/KJaq4Y2jDqoZfKH2nLlgxWx4oNhILvQYohgcI7DV7Plla uJiF4zfj1cceqwEVIxvbezTgzgvLZnn5eeCZTEFBbcENYDVzm6iPJ8jlXrpKk9W0VDJgyV u2Ok3ydknVBV+g4mqFbmiumzfG6iks2KWS+ZPpxs9s75apXTOVXzqQAAH626DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741881791; a=rsa-sha256; cv=none; b=rB4KP1y+VlNGCSONPaOOJzf0PmaCUW00dGDhN7H1sJnXcafs0iTiSXVhO0bUy71IwxZtjm eM7OdgW3HgYwG5iJjYfgzfN+m3LCefy3AazhwAVxC29OrkxMzsI4ZZgYtiD0hf1mesAtvc YHQPQSEOii5VG02y34S/2s3VeID4GBDYrDETWssVXeQqT9IfnqlsV27nU1eo2V8d6Yu2Y9 o49Sb6yxdPFNItnU07ZhQD2c6CltWuMreciIOA6NoUlEwQQxFJVi3kdDjCoNsSYzXQ1+q9 302HkkB0orjIi/v9+L9eU6HSn19gmsjlsnGGNLBcimGiOa9j5hhescu96ypb0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741881791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ckh8oU/6zI6ILs/aRYuTW6pl0f5rw3VKCcxlTk5KKAg=; b=Xzm+Zpl9g1c4SRmmEF9l5i9GbCFz6HdChrTbOJc10U8C4/EhJqtLBD/0WMBme6ED35/mzy C292E+hIntuS9j4M9ROSJ+O34UDN6bzwrkz/0AZm0ITjCbuJdLMWglBx3zO4ECa3icAGcD O/yPVAoH+qcBoD86+9Bsl4jwaPt/c/sSMyS06wn1jPN3x3cu8jje5Oi78i6XUnJSNsVYku pVwift7/ztstRT1Lm2Bwjnn4mIOnWQnDirAhialZsSrVAVxQ3TJRsvF6S48DLwQPEkmou0 wfoL74a0tM7jKM9DMC/vz46Y6IjyeDmp+3BROCjA4/qTWeLNSoJ7BKFyEqFN3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDC2l450yz13tF; Thu, 13 Mar 2025 16:03: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 52DG3B59048439; Thu, 13 Mar 2025 16:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DG3BRx048436; Thu, 13 Mar 2025 16:03:11 GMT (envelope-from git) Date: Thu, 13 Mar 2025 16:03:11 GMT Message-Id: <202503131603.52DG3BRx048436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 816f27e848e5 - main - mlx5en: control hw LRO with the driver conf sysctl, leaving IFCAP_LRO to sw List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 816f27e848e549e6ff895affc29298f68e0bb644 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=816f27e848e549e6ff895affc29298f68e0bb644 commit 816f27e848e549e6ff895affc29298f68e0bb644 Author: Konstantin Belousov AuthorDate: 2025-01-28 20:38:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-13 15:58:12 +0000 mlx5en: control hw LRO with the driver conf sysctl, leaving IFCAP_LRO to sw Reviewed by: Ariel Ehrenberg , Slava Shwartsman Sponsored by: NVidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 10 +--------- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 24 ++---------------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index 6a2c07addc62..459801cdf27d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -1124,16 +1124,8 @@ mlx5e_ethtool_handler(SYSCTL_HANDLER_ARGS) /* import HW LRO mode */ if (priv->params_ethtool.hw_lro != 0 && MLX5_CAP_ETH(priv->mdev, lro_cap)) { + priv->params.hw_lro_en = true; priv->params_ethtool.hw_lro = 1; - /* check if feature should actually be enabled */ - if (if_getcapenable(priv->ifp) & IFCAP_LRO) { - priv->params.hw_lro_en = true; - } else { - priv->params.hw_lro_en = false; - - mlx5_en_warn(priv->ifp, "To enable HW LRO " - "please also enable LRO via ifconfig(8).\n"); - } } else { /* return an error if HW does not support this feature */ if (priv->params_ethtool.hw_lro != 0) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index c17da50c1a5e..67583afc21c7 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3670,31 +3670,11 @@ siocsifcap_driver: } VLAN_CAPABILITIES(ifp); - /* turn off LRO means also turn of HW LRO - if it's on */ - if (mask & IFCAP_LRO) { - int was_opened = test_bit(MLX5E_STATE_OPENED, &priv->state); - bool need_restart = false; + /* hw_lro and IFCAP_LRO are divorsed, only toggle sw LRO. */ + if (mask & IFCAP_LRO) if_togglecapenable(ifp, IFCAP_LRO); - /* figure out if updating HW LRO is needed */ - if (!(if_getcapenable(ifp) & IFCAP_LRO)) { - if (priv->params.hw_lro_en) { - priv->params.hw_lro_en = false; - need_restart = true; - } - } else { - if (priv->params.hw_lro_en == false && - priv->params_ethtool.hw_lro != 0) { - priv->params.hw_lro_en = true; - need_restart = true; - } - } - if (was_opened && need_restart) { - mlx5e_close_locked(ifp); - mlx5e_open_locked(ifp); - } - } if (mask & IFCAP_HWRXTSTMP) { if_togglecapenable(ifp, IFCAP_HWRXTSTMP); if (if_getcapenable(ifp) & IFCAP_HWRXTSTMP) {