From nobody Tue Feb 08 15:14:09 2022 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 5BF8B19C3BE2; Tue, 8 Feb 2022 15:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtRPG5gMCz4dWd; Tue, 8 Feb 2022 15:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333250; 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=yL0gLScQrd4K+ORnYCUF4zc2UhvhIv9+v9csCGATQek=; b=UsdPya8Pbx367TS0LdlX3h5/IKvLwVfFTSs2oD14nffOUAmHx/9+5GVE4VJzS6HUIDubA9 g4eHjcVATbsi9SyRhHd1ukDbL4Ho7m8TnfvCOWgCCFro9pueN2JeDzUXfL9KmHDCbBLAtk djOdbflmvv5bO+2DfM2l914kPgSb6UBfDF4J3QqcWz5sXJsWUxFexAJiDgSnlNo2KRrtAf U0VrS0SlAhoTUGJi2YB1VNllglwZEKGYLrf6Vbsm9Gafbjgq5QUL4QRUshEu8k9P3HpKdo Hz9a/qWRqP3dhcNdtG/A+sPlV52z/Y6O/k3lYgO5NPYksH/X9kV+3/n3lRSLWQ== 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 BD0C51BADB; Tue, 8 Feb 2022 15:14:09 +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 218FE9l6020914; Tue, 8 Feb 2022 15:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218FE9ls020913; Tue, 8 Feb 2022 15:14:09 GMT (envelope-from git) Date: Tue, 8 Feb 2022 15:14:09 GMT Message-Id: <202202081514.218FE9ls020913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 0c4de0f986a7 - stable/13 - mlx5en: Create flowtables in correct order. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0c4de0f986a7227c8880da0fe07324bae740c328 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333250; 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=yL0gLScQrd4K+ORnYCUF4zc2UhvhIv9+v9csCGATQek=; b=bnbwYD3ANsoFN1FoniGk3USTGR8ezSWZqAR1hPgMr+nhb2E7jQzxA71zSwC8hGOu0tXpzJ LHNJfaMHL6WsqswA5rVS/Q1z6PsxXf8dRwd0IYdy6RBspAw6/7SonSwIpoLTHSbwe8dnxd waddrD0Ty32GhkLgQwy1eN3CcQKeUWe8D4i8m+tGoJpoZPMGTmGQy4Svlf83wVDptdn6ii UFW3cA43yP9IwQ2uAGinXfuZ1ATq6VGRwKbdkh74vAv9KDOsGmkj4KZftbPdhOMGqsV8ah qdNmAYENoSR99He3Bhg59o+xw+Jtz8zU72jgtszCU4i1UX+sWjLDDK69W+O1hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644333250; a=rsa-sha256; cv=none; b=qgbqbqj9rTnQtx5NJkuj2ncR2dXFAP+e9+dBnOavp+ZbevThdT9qtdT2WqLbS+IGShW+LF 112r16NQEBswzatSSo+MKmi2pkKCH9EW/YGECgMDoUNZP+r3lhzN7BUP1eCxtPO/BoO4bb p0IWoJv6NCPAvy94G6TBtRBspaHgGlWK+AN88PHbsYmti4E5FGPCfFXayFOBEseVCpKB6F MZYZtf61MLnnoYMOtGgQ+AJz87joIjtTenIJFMhH96x4mDQ0zWaxoOD5K2zsOL8eKhZpEq pgz0UtEalLMszbI/Gd3xRPJUnLLYlc8PefabvQSnW16koq3APzbVVey7Fn7JPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=0c4de0f986a7227c8880da0fe07324bae740c328 commit 0c4de0f986a7227c8880da0fe07324bae740c328 Author: Hans Petter Selasky AuthorDate: 2022-02-08 15:08:53 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-08 15:08:53 +0000 mlx5en: Create flowtables in correct order. Because it affects how the flow tables may re-direct traffic. Sponsored by: NVIDIA Networking (cherry picked from commit 001106f807702592647e2ab4c3dadf31f7ec9427) --- 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); }