From nobody Thu Mar 20 03:13: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 4ZJ9f02ww9z5r9rr; Thu, 20 Mar 2025 03:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9dz4FK9z3w9D; Thu, 20 Mar 2025 03:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sBaJ18mMIb43qqwx1NvyqKep9V83DKHZHYdsH98LtD4=; b=XnStsyxjj3YarbNzH4vkJfCmi8JOcNLgNIYhYfvPEFYzQphP90HcVYvXv3ofgpUnRxGfXs FJ/ASVMenen3KwhC5fOU7rCoDXfJ6AXeTbi7hyfLy1s91DIcuf0lqetrkY0BpJGHDFGdhv DqMq+bsefBSqqRT5iPgCVldx40CvHNayLzs8mDaGJRB1h6VfaDN3Ta1rECF8rlfk76p2iV x4+gCGXX0Gp17L1AGSMQMHdKn+Bbh2T6YUJikvy3RmOsXMTJNkdkv1Vg+f4aUnLN3L87vd R9yCUrLP6EAUJpgm6Gb6XZ4wQJ8oFgeLsf9UQWBh9MIKZeIA3Mgkelkpfl0O0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440439; a=rsa-sha256; cv=none; b=BFo9JMFLtPkZKaee4AUQKb3Y4pd5ANvix5AdK4Hi/WLx4GRHnV6EwTzPmQ57OMdqodwsWq 7+ttamEP9ARp7CZbddunZImmqus48ojZOofzM5ZEdMP93vQa5I9QPNRJCDWtnOvATIrlLQ 2duoWMmGfqch9ElF62VAFJ3oU2pmDmlxVjZQSYdiuqmLylomzFNkWqazzv0Ev27T7YozS3 C4CdsYMZLYijZbfIctPRp3anWtmEhIYkGrqJ2+/Cwvg1gEDRqIgQTGC8LJE8oAlvBsvnt8 1Ukpt4G+TDJHQwO4VnzCFJvk8YHpujsEfxLdhtwrZsMLj9HmyVKTnQRqDQFpcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sBaJ18mMIb43qqwx1NvyqKep9V83DKHZHYdsH98LtD4=; b=Kp4lp3dfk9fWgajf88NQFuf8yKI1G8IbwmLZYP1wx1mqJcFAlCmFCqAKHj0azEFz3helJW Z1M94KPGla3dp18tNPwufT8daUMpF7+r/jpCuNES2I+oa/sTUkAvcyBNoiqBK3SSyK0D3J S3L1qDwjVXl14FvMVEqpFHDp1LtYjLu8zjkQEFQ8xkBRQe1p3O8utL7jSDLDFReFYwqaFG SZNoT7gV0SptykIA4+0ty4rSFg2HLG1HL3Bcu76nJfyhQnvH5XJKgJe3xMGO1GNB7TqdFr CGmWRDXcTzvp8hqi0pOTEPI0IOxOe+K2PXcu9pivR/8R/T+gpa1TmgjraFf5mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9dz3q9FzpBc; Thu, 20 Mar 2025 03:13: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 52K3Dxlh086057; Thu, 20 Mar 2025 03:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3DxEV086054; Thu, 20 Mar 2025 03:13:59 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:13:59 GMT Message-Id: <202503200313.52K3DxEV086054@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: 9ac8af72a7c5 - stable/14 - mlx5en: control hw LRO with the driver conf sysctl, leaving IFCAP_LRO to sw List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: 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: 9ac8af72a7c5f756da6ad2468958f3bd0cc976b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ac8af72a7c5f756da6ad2468958f3bd0cc976b8 commit 9ac8af72a7c5f756da6ad2468958f3bd0cc976b8 Author: Konstantin Belousov AuthorDate: 2025-01-28 20:38:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5en: control hw LRO with the driver conf sysctl, leaving IFCAP_LRO to sw (cherry picked from commit 816f27e848e549e6ff895affc29298f68e0bb644) --- 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 051669e7f85a..fb25d2f8b40c 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3651,31 +3651,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) {