From nobody Tue Apr 18 13:02:04 2023 X-Original-To: dev-commits-src-all@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 4Q13wX6RFRz454m7; Tue, 18 Apr 2023 13:02:04 +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 4Q13wX5g7yz4KKq; Tue, 18 Apr 2023 13:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681822924; 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=awcyl1wNAV31z9/qbK7b527CtMh+KHIMvH1mB4mB/fA=; b=Y+ey3xDr3/ZgrELiCe3dEMpY+dLbJCrg5HShWr+orTGxrh1RG4HVbNywVjdzRORLIxU9aB JljEOI5u5bGDp1K9MS93YkH5B7HwKczQ2tamg7pzJdQiHr8DgOf0EuI8yqmx/v6ZhVRVIy KyrXP87ya9jqRm16fmAXdLDImKFEvV06AUHVXxOMJWY8wfRztalyPHhGsXgjcJ5hpyyl8V vfDjA54Qt+Ck5HWEjDWRem9Jgxzy6XSFu2bAdaOADM9xpK4Q8HQfRacQYrZNI81U/7K6TB 92sllyVk+6/K7Fwvj1aHvbT9AfsVeuJ0Ns4Zaz9wLnPIV0ZY/EYqosLHOtAusw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681822924; 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=awcyl1wNAV31z9/qbK7b527CtMh+KHIMvH1mB4mB/fA=; b=GbXk2CjFqUNzXhm+KLsiP4p2r3Tc/88v4IoTPxrlkYFoDu5fKM70nWYb2uT7TYmVIX+Fd2 NPElTy0BShaNZWZye6CqhYtAyKF71iWQ3NLN1KVq+DKJrESIPKe7pz2CvmkTR7BrFH5J6M EXIeCqtTyFTCEZjSstEGNTOo1fJRgduYWyEaeYAXL5OW3at6E/TI2vjA5fFkx0/i/P1DSX FJbNKFrQZIBrR4Wzg9Vssh0saaO9Or1uLlVLNoA3PKcEPFcJC/40gB2BuyIRzE3KAojZbD lZeV0Y9i8IGsAFDA69I2w3q9wXwluYYnx6F6oOdKpqn6MmgOFkF7fjhvKSlsTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681822924; a=rsa-sha256; cv=none; b=R3TqtxmAEF/3rUaL67YYs87rF4vhJkExI4hKyqmUtdTHX/+WF49DiUYh/nPZ2cW3iwh38A JPOJFPFxTzsqDxCaShuABXnA9H6lt/ZtboralBDQBLqykzNRWNe/T+IV7Ak3z7rrjRatGC 9d1M/EFDg7fxhKHVK1PZ2oNs7D4AsUfuhckNoJBkOIW9pSDJyY3/k9JfTV34ZY+9d+lsPR 6/cVw43zdaHT4od4+gFZ5eAHfeM5uYTL70Ew16VLe+JyiBai/dsNJSa4claywbiE8ucq9H Y73JiRisGLdcxFEtp2SrWTnIy1uUH0OTg2XgctPPBePlxK0HdEhQjg/8uE75hQ== 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 4Q13wX4jJfz1CHS; Tue, 18 Apr 2023 13:02:04 +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 33ID2425079014; Tue, 18 Apr 2023 13:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ID24ac079013; Tue, 18 Apr 2023 13:02:04 GMT (envelope-from git) Date: Tue, 18 Apr 2023 13:02:04 GMT Message-Id: <202304181302.33ID24ac079013@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: 2f7e9a8a2136 - main - mlx5: Fix duplicate free of default flow rule in error case. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2f7e9a8a21367393b613f0f150d49009fa74dd5c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=2f7e9a8a21367393b613f0f150d49009fa74dd5c commit 2f7e9a8a21367393b613f0f150d49009fa74dd5c Author: Hans Petter Selasky AuthorDate: 2023-04-18 11:17:38 +0000 Commit: Hans Petter Selasky CommitDate: 2023-04-18 13:01:06 +0000 mlx5: Fix duplicate free of default flow rule in error case. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c index e009d403e96c..2bdf01081650 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c @@ -341,8 +341,6 @@ accel_fs_tcp_destroy_table(struct mlx5e_priv *priv, int i) fs_tcp = &priv->fts.accel_tcp; ft = fs_tcp->tables + i; - mlx5_del_flow_rule(&fs_tcp->default_rules[i]); - accel_fs_tcp_destroy_groups(ft); kfree(ft->g); ft->g = NULL; @@ -358,8 +356,10 @@ mlx5e_accel_fs_tcp_destroy(struct mlx5e_priv *priv) if (!MLX5_CAP_FLOWTABLE_NIC_RX(priv->mdev, ft_field_support.outer_ip_version)) return; - for (i = 0; i < MLX5E_ACCEL_FS_TCP_NUM_TYPES; i++) + for (i = 0; i < MLX5E_ACCEL_FS_TCP_NUM_TYPES; i++) { + mlx5_del_flow_rule(&priv->fts.accel_tcp.default_rules[i]); accel_fs_tcp_destroy_table(priv, i); + } } int