From nobody Sun Apr 30 06:58:14 2023 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 4Q8HHC0VG4z48sV6; Sun, 30 Apr 2023 06:58:15 +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 4Q8HHB5fKHz3Nkk; Sun, 30 Apr 2023 06:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837894; 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=662WUmzoeoGtEkpdv6avgWkNjlPctwHjqw/2JTyRZ5w=; b=yhAb3V4xCB8Ew7j5IeO6xHK5Z+AxceY/yXyeTUJe9412VdqxamRfSPE/kWzFn/ODwY8hfW +V78n6kVdn58TEZNCVyxFnjqyx8dHwYkqrotq4Gier0/MJrubGffiUabc7dYkAw6RxyTL8 nd0DjmJZS996SMKiTlQ2nK6GJ72/Bbv/UEfSSRo1iBJ0vUkShDiecnER6Du6z/C0MgLLqb ltq7Qx/4QUz4mhx27XQm5VNNhKDplfjwkF2TSQsIw6rPM7DuRG86wfMpxkeZ+U7vcJ/TjZ 8uJjz5aTjYuh3XGmYXaarfatnm/Vi8xbj0P5R7tpP1mpFaeGZ/HhKHVvAeTp9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837894; 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=662WUmzoeoGtEkpdv6avgWkNjlPctwHjqw/2JTyRZ5w=; b=V58AWLi5SbWoUTlDHR1mnYag48bwQXPBi2MEXewyjLm2wXr/9IS9EYEwv6D7vVigyNGLhd f8LlsoEShBamxPP8uYqSl9+FDQfdiEITVfyNjK9ntlPy1LemMB/jTcWbuu76hjo5xlDJsm nVOF4+fwPZBUbgh/mvGC+UnhyRjKepU7o3Dw0mXMKgpUP0KVz5gPij426PYaajTqJU9X6d k/ExR1jMb6B/aXyyp3+mulrfng9EHP36BgYlWrXaNUXQwmyqRDKuqkaZAmqNCTMVFQtr2X QEGyEOJEeOlPt3al0FieyIQDpolmjmLMESrK/TK9LO6KNp+WirFhxAFo+sw0TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682837894; a=rsa-sha256; cv=none; b=IIFMh5FWkiUpQTtY9N6omZd4+x3cLq3rT/3VXRoYeYpHZcUsS8Q9nddwSGxY0ek6ZRtVMT UdhoeeooELMRJvUtF26dqGMexBuqjveiWOdBtIoNgDa1P4V1413KIfyDGENyYtX/wJ02i0 s4UFNX+DXQSkj24J7noA9Yw0vJl2Ecm8hBa7J1QjMA4ASO1nuJys+/bV82LMgewPwajmF+ YpmhOw3zhoXqGyhpCpG9SfyfPKtc/AjgrMt6mlOcggECDz/GB4ViIzgi0akWFp/MB2Qf3B y2Z5CsGXP9OfD9CDMIII7B8ojki5vwnFcDNw+0tZNoAp5Qc0ROxX89qIInqeIA== 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 4Q8HHB4kzMz1CvK; Sun, 30 Apr 2023 06:58:14 +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 33U6wElT071940; Sun, 30 Apr 2023 06:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33U6wEc8071939; Sun, 30 Apr 2023 06:58:14 GMT (envelope-from git) Date: Sun, 30 Apr 2023 06:58:14 GMT Message-Id: <202304300658.33U6wEc8071939@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: e6f76b5b4d36 - stable/13 - mlx5: Fix duplicate free of default flow rule in error case. 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: e6f76b5b4d3675841b8ea4ffedfdd5a5469ae051 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=e6f76b5b4d3675841b8ea4ffedfdd5a5469ae051 commit e6f76b5b4d3675841b8ea4ffedfdd5a5469ae051 Author: Hans Petter Selasky AuthorDate: 2023-04-18 11:17:38 +0000 Commit: Hans Petter Selasky CommitDate: 2023-04-30 06:56:19 +0000 mlx5: Fix duplicate free of default flow rule in error case. Sponsored by: NVIDIA Networking (cherry picked from commit 2f7e9a8a21367393b613f0f150d49009fa74dd5c) --- 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 4dceaea7ea72..54693e01ae1a 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