From nobody Thu Mar 20 03:14: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 4ZJ9f23QFVz5r9bM; Thu, 20 Mar 2025 03:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f16bW6z3wCn; Thu, 20 Mar 2025 03:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NYa67TAV4gKVhYpi0PEDpTzw2GIsm56H/gqUruSTWI=; b=naM6e8FDn88LeNbnkFlfq2p2CIuIGTGkfruxoYbWIU8+qCVThAOjF39GpHpcaBDydd8LYn O91jwKfFyaFeVjUCqJUeLZZYj9HRVtUb0WFSHSTGoCa/l8SFdjHLwxDs82NnwEndDezK/c wUtIQGTU49MfG4h2fgIUx1j4IBPYVaSn9LWc1RatW2ADPhCU9zQLHG198kbZykJOzb4uK2 fHX7RZEkiT5uNS0r7zl2tcJlKdPympk18FofRKd6icf27Ol95qKfmqeJmjjhyxmjlGc4cI JYQJ/XyHgWmzBTKKS068H6MPHYGsayxhHA/pfJhim7gtspvGxdx0LHY7rTcvvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440441; a=rsa-sha256; cv=none; b=Ocn1Y+BOMHu9owHh2SHB9jLVReeTr6ZlZikRYhUJRLtdgIntGW0VeZNRQbrw6P6bF2Rw6G e8Z8t6jjkCuMwiL/GuSsx+2AZvKCS8ho6iPBumnD5phpX0AXYvxGpBwALNtN/yqoTIdjj5 6So+3AUMolOllxoPuxW3Mxty68siIrApzRnPcVZteuwtcTBwms/SZaic+UxT/5aFRGeUXy dxjfo70KSe9QiCQr0ARMCAcvZcURuVavLdq0HEwH1F+XtLG4HiYTHYlFm3tWsSjQebHB1z quaHP7eVAGKR1VwEbU38CdSUydy9JRtublBptFK0D3YUuc1+BbxR/xNVA7mS7Q== 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=1742440441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NYa67TAV4gKVhYpi0PEDpTzw2GIsm56H/gqUruSTWI=; b=a+eD7iGhnvJRNRkYg5Fsib+KEbbSrem4/r1crZZ+dco3b5+VxEJMi1MvFBMSGfpTMLTAWO Wz5+HxA0E4z1/2Ydn8yyqpk3LYN2qwxsgf+uLaxJW48F5TcfPYRsQJrXkQGfrPbGuCGYll CiszSEC4onbpRHfpF9V4mrrMhAu/+raYLl7hB4vEnhjzA5+DzeNJxGtFE6Wfe/GgHep9u4 23GKDwuiBuPKLIsSGMI34YfyrymkUWxKba6IcfyzHFjG1Mxvs/iZrk4/C4hnWUfeLK2UFv J5IQUW4kkeo6WyHvZZUyvwxI8/3oJzEWt9FzmKhUXdUQ0Uab5rCh/Ogg5QIEAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f15XZ9znyB; Thu, 20 Mar 2025 03:14: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 52K3E1IM086149; Thu, 20 Mar 2025 03:14:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E1Ag086146; Thu, 20 Mar 2025 03:14:01 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:01 GMT Message-Id: <202503200314.52K3E1Ag086146@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: 114a805bef25 - stable/14 - mlx5en: make the hw lro control dynamic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: 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: 114a805bef251169b23816e910db2da5cb581d6c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=114a805bef251169b23816e910db2da5cb581d6c commit 114a805bef251169b23816e910db2da5cb581d6c Author: Konstantin Belousov AuthorDate: 2025-01-29 15:45:18 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5en: make the hw lro control dynamic (cherry picked from commit 02fe38b92175cb8f3a77f7a2bb72afb83836ebd2) --- sys/dev/mlx5/mlx5_en/en.h | 1 + sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 3 ++ sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 83 ++++++++++++++++++++++++++++------ 3 files changed, 73 insertions(+), 14 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index 502c1c19af6f..2de4ba6b5684 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -1295,6 +1295,7 @@ void mlx5e_refresh_sq_inline(struct mlx5e_priv *priv); int mlx5e_update_buf_lossy(struct mlx5e_priv *priv); int mlx5e_fec_update(struct mlx5e_priv *priv); int mlx5e_hw_temperature_update(struct mlx5e_priv *priv); +int mlx5e_hw_lro_update_tirs(struct mlx5e_priv *priv); /* Internal Queue, IQ, API functions */ void mlx5e_iq_send_nop(struct mlx5e_iq *, u32); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index 459801cdf27d..b0b7a175a1b6 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -1133,6 +1133,9 @@ mlx5e_ethtool_handler(SYSCTL_HANDLER_ARGS) priv->params.hw_lro_en = false; priv->params_ethtool.hw_lro = 0; } + + error = mlx5e_hw_lro_update_tirs(priv); + /* restart network interface, if any */ if (was_opened) mlx5e_open_locked(priv->ifp); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index fb25d2f8b40c..99554526bb28 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -2939,6 +2939,73 @@ mlx5e_get_rss_key(void *key_ptr) #endif } +static void +mlx5e_hw_lro_set_tir_ctx_lro_max_msg_sz(struct mlx5e_priv *priv, u32 *tirc) +{ +#define ROUGH_MAX_L2_L3_HDR_SZ 256 + + MLX5_SET(tirc, tirc, lro_max_msg_sz, (priv->params.lro_wqe_sz - + ROUGH_MAX_L2_L3_HDR_SZ) >> 8); +} + +static void +mlx5e_hw_lro_set_tir_ctx(struct mlx5e_priv *priv, u32 *tirc) +{ + MLX5_SET(tirc, tirc, lro_enable_mask, + MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO | + MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO); + /* TODO: add the option to choose timer value dynamically */ + MLX5_SET(tirc, tirc, lro_timeout_period_usecs, + MLX5_CAP_ETH(priv->mdev, lro_timer_supported_periods[2])); + mlx5e_hw_lro_set_tir_ctx_lro_max_msg_sz(priv, tirc); +} + +static int +mlx5e_hw_lro_update_tir(struct mlx5e_priv *priv, int tt, bool inner_vxlan) +{ + struct mlx5_core_dev *mdev = priv->mdev; + u32 *in; + void *tirc; + int inlen; + int err; + + inlen = MLX5_ST_SZ_BYTES(modify_tir_in); + in = mlx5_vzalloc(inlen); + if (in == NULL) + return (-ENOMEM); + tirc = MLX5_ADDR_OF(modify_tir_in, in, tir_context); + + /* fill the command part */ + MLX5_SET(modify_tir_in, in, tirn, inner_vxlan ? + priv->tirn_inner_vxlan[tt] : priv->tirn[tt]); + MLX5_SET64(modify_tir_in, in, modify_bitmask, + (1 << MLX5_MODIFY_TIR_BITMASK_LRO)); + + /* fill the context */ + if (priv->params.hw_lro_en) + mlx5e_hw_lro_set_tir_ctx(priv, tirc); + + err = mlx5_core_modify_tir(mdev, in, inlen); + + kvfree(in); + return (err); +} + +int +mlx5e_hw_lro_update_tirs(struct mlx5e_priv *priv) +{ + int err, err1, i; + + err = 0; + for (i = 0; i != 2 * MLX5E_NUM_TT; i++) { + err1 = mlx5e_hw_lro_update_tir(priv, i / 2, (i % 2) ? true : + false); + if (err1 != 0 && err == 0) + err = err1; + } + return (-err); +} + static void mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 * tirc, int tt, bool inner_vxlan) { @@ -2949,8 +3016,6 @@ mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 * tirc, int tt, bool inner_vxla MLX5_SET(tirc, tirc, transport_domain, priv->tdn); -#define ROUGH_MAX_L2_L3_HDR_SZ 256 - #define MLX5_HASH_IP (MLX5_HASH_FIELD_SEL_SRC_IP |\ MLX5_HASH_FIELD_SEL_DST_IP) @@ -2963,18 +3028,8 @@ mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 * tirc, int tt, bool inner_vxla MLX5_HASH_FIELD_SEL_DST_IP |\ MLX5_HASH_FIELD_SEL_IPSEC_SPI) - if (priv->params.hw_lro_en) { - MLX5_SET(tirc, tirc, lro_enable_mask, - MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO | - MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO); - MLX5_SET(tirc, tirc, lro_max_msg_sz, - (priv->params.lro_wqe_sz - - ROUGH_MAX_L2_L3_HDR_SZ) >> 8); - /* TODO: add the option to choose timer value dynamically */ - MLX5_SET(tirc, tirc, lro_timeout_period_usecs, - MLX5_CAP_ETH(priv->mdev, - lro_timer_supported_periods[2])); - } + if (priv->params.hw_lro_en) + mlx5e_hw_lro_set_tir_ctx(priv, tirc); if (inner_vxlan) MLX5_SET(tirc, tirc, tunneled_offload_en, 1);