From nobody Tue Feb 01 15:24:32 2022 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 562331916AFE; Tue, 1 Feb 2022 15:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jp7yS5ZNGz3G4H; Tue, 1 Feb 2022 15:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF/kLMzgv23NU5JhkskoAJ4R/buq+AYGRhJXB6U4uiU=; b=BTgU7+N7bG6txZ425ZBwK3F2ixj6sN0h4TU5XpOdBsVGl/xnmkadZcPOu9jKKAdbTT0V2D 2NQRfOq6YOtM6L3d4fu2FeTntNtoDi7m9fc2EoAmI5rob9ykpSaE2WTwBvq1az0z0CuJKW owjl9k7p89xVrScrKCuD+YSaAf+VVEVUCiOStOW/IaAWezMumklSdtgf86BcjkOJK8/g4z MRnIPsIu5F1LOrsEBYwiBqIzIudgeRXWE5/RTvSNG+ZXgus8/1vDgy+aJp3oIkDva94iSy 2dwrWFA7xphaMruOPHr8JsCFBNllb4kDRdJZrT1uufrQSnY2/8uyAXAZ27qVZA== 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 8562813270; Tue, 1 Feb 2022 15:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 211FOW9O051274; Tue, 1 Feb 2022 15:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211FOWLu051273; Tue, 1 Feb 2022 15:24:32 GMT (envelope-from git) Date: Tue, 1 Feb 2022 15:24:32 GMT Message-Id: <202202011524.211FOWLu051273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 001106f80770 - main - mlx5en: Create flowtables in correct order. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 001106f807702592647e2ab4c3dadf31f7ec9427 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF/kLMzgv23NU5JhkskoAJ4R/buq+AYGRhJXB6U4uiU=; b=ojQgJsiJOUniH+CHuJDghehNJO5Os4/fAXo+7diqVIPL42TP5Sg1Vv0SvQDLZuzuyH550q 2Zsad/IIgLMNnH6b6n/McXnEirlfxsSCgwbL/eMxwf6ywKEqQQ6FoJ9IZG3cg4GpgnVlID 2pzjhtsNNjalOwK1jFvcxn/hBASowOuwQ0bA69oXlp4QobXUAIWQnL2mgCcBsiuzj440gx fnwX92uA7pbCdi/bZNbXZcmM4rN4VV8nz7TgNs/hlxG/9p8M6SOzQKRNUZ0pM7MZpJ/fyU 86btxMjbN9TJUPcDpklVaHWeNpLv323q8VbMvSFhuqNeQzlV9mcxPN7X8uKyag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643729074; a=rsa-sha256; cv=none; b=wv5SxUsjJkRCJNUpEsogGbh5e9fp3FxwIz6NXwL9nRO1hLC4iHAQVnPhSjcAsZDYFlcmrK 8Rw8vqxbKzT0wHGqKQDQ/Y4rWgJb5D+PJGBfih+5RRFYjaUQlytSHYWV30jTAPPyHVPaBV TVAgeEuncsHFPaMUbTFmNSn4dQnZGSnaQPQ2BxS9ySxtjJhGbKqAvPC3O6v9tGX2TNhB0E CKl5wSbEYnbNT7EmR+qDjEsmyLxhHvtJ2dW7rM7UroYy1bV0odghlibuSeAPD/aqmWFCCR xS1HRDg9VyEV+qShjGm8GmXy2xH/mXccNwixG3Hrmz92/ql3+OPJ8PyfdFz4ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=001106f807702592647e2ab4c3dadf31f7ec9427 commit 001106f807702592647e2ab4c3dadf31f7ec9427 Author: Hans Petter Selasky AuthorDate: 2022-02-01 15:20:14 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-01 15:21:16 +0000 mlx5en: Create flowtables in correct order. Because it affects how the flow tables may re-direct traffic. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c index 5d52415381aa..dab2d4bfda38 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c @@ -2292,21 +2292,21 @@ mlx5e_open_flow_tables(struct mlx5e_priv *priv) if (err) goto err_destroy_vlan_flow_table; - err = mlx5e_create_main_flow_table(priv, false); + err = mlx5e_create_main_flow_table(priv, true); if (err) goto err_destroy_vxlan_flow_table; - err = mlx5e_create_main_flow_table(priv, true); + err = mlx5e_create_inner_rss_flow_table(priv); if (err) - goto err_destroy_main_flow_table; + goto err_destroy_main_flow_table_true; - err = mlx5e_create_inner_rss_flow_table(priv); + err = mlx5e_create_main_flow_table(priv, false); if (err) - goto err_destroy_main_vxlan_flow_table; + goto err_destroy_inner_rss_flow_table; err = mlx5e_add_vxlan_catchall_rule(priv); if (err) - goto err_destroy_inner_rss_flow_table; + goto err_destroy_main_flow_table_false; err = mlx5e_accel_fs_tcp_create(priv); if (err) @@ -2316,12 +2316,12 @@ mlx5e_open_flow_tables(struct mlx5e_priv *priv) err_del_vxlan_catchall_rule: mlx5e_del_vxlan_catchall_rule(priv); +err_destroy_main_flow_table_false: + mlx5e_destroy_main_flow_table(priv); err_destroy_inner_rss_flow_table: mlx5e_destroy_inner_rss_flow_table(priv); -err_destroy_main_vxlan_flow_table: +err_destroy_main_flow_table_true: mlx5e_destroy_main_vxlan_flow_table(priv); -err_destroy_main_flow_table: - mlx5e_destroy_main_flow_table(priv); err_destroy_vxlan_flow_table: mlx5e_destroy_vxlan_flow_table(priv); err_destroy_vlan_flow_table: @@ -2335,9 +2335,9 @@ mlx5e_close_flow_tables(struct mlx5e_priv *priv) { mlx5e_accel_fs_tcp_destroy(priv); mlx5e_del_vxlan_catchall_rule(priv); + mlx5e_destroy_main_flow_table(priv); mlx5e_destroy_inner_rss_flow_table(priv); mlx5e_destroy_main_vxlan_flow_table(priv); - mlx5e_destroy_main_flow_table(priv); mlx5e_destroy_vxlan_flow_table(priv); mlx5e_destroy_vlan_flow_table(priv); }