From nobody Tue Feb 08 15:13:59 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 4E14719C391E; Tue, 8 Feb 2022 15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtRP51Yhqz4dbw; Tue, 8 Feb 2022 15:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333241; 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=sjPjnHzDi2hBp6MlxZXFBu5nue6hhTf+iONPB+P+z8s=; b=cQx0cBbN0TPtnazkftoq6NPO/IlLAvVvquu5chodMkaafis8vMweK47ZCnFjAuc9o3gU8e GKum/hzcFq1gQPySAh8Mw1F0AvzlvLoIaLxh5RupPlIc4+D/9+JHNZ/T4QtIMH+d50xjIx lzPqZN+sj66k5KLTLgS7oI88RWndztxvXMYKSOyNenvsc3y9Mn6GkbkiK7bfrXr9id7/Jj 1cuqxBalvMDzlzk4ylTqgWtRiZZSWWYt8zVJGfD6zOW/aaRKPo6R5Nuk922BlVEc3OVztC k1enf1eUGNu5vFTIoLr11DNpYZzr+5YY4ERCyC1LQTb5Sl3iqvF6q6y14nrIGA== 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 86B351BC13; Tue, 8 Feb 2022 15:13:59 +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 218FDxIf020684; Tue, 8 Feb 2022 15:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218FDxD1020683; Tue, 8 Feb 2022 15:13:59 GMT (envelope-from git) Date: Tue, 8 Feb 2022 15:13:59 GMT Message-Id: <202202081513.218FDxD1020683@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: 95854550de77 - stable/13 - mlx5en: Only delete installed VxLAN rules. 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: 95854550de77b1e0701742e6db08717e9df171e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333241; 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=sjPjnHzDi2hBp6MlxZXFBu5nue6hhTf+iONPB+P+z8s=; b=UgDzi1DRZPOSnDVxevcnKUX0j/n3CGKho2Sr9+x7DPh6Qjkflu/x4Isoln3qwLx44xJJHZ 0fRLZKSxUoXTWCTkrnsMYGgdAvJjLLG5xV7iOtZZdsbgdoM+fNHwq4HMm3Jauw36l8sagj mZodaVyVICu3QiK97wPP1tiqbAQufYGb2vxXtfZRwpdPu7KXRJzFh+7YT6KZLs6o+il2yJ KH5C08L1PFuuv81UxIE3W1LMSkhfHpEU5jC+kE9qckC4T3zTmVavfxgX3PCqUVqWopss90 6wjOSlK4KKVSL0Q85LjaWa4UDK2tySxa1PFmQ7yp2UxUXynlHlXFtACESwUoQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644333241; a=rsa-sha256; cv=none; b=oRvyV1Qqbl4BT4T92G+26nPvRlqImUjXnGWt30wUMxL2MuTBApOOssOcWaFVSgkAxuZ+MR awRs6GxJkej9Ixop/bVjU781fiTq4UshrR4j2f4xMqjSj0vf8CwbyxH9n4NGkqbUTzl6zs 6AftBdThJbHjDDOx2fj47HaSZMM+8EXH5GPJ1CgLtpGznh8JDm79HYRWH/R6wT2Qnz1LQr 9I7VaK8r4z4BOQPLSlhPptLn/9rWmY7aUztee6+I677n1g4xjqjG4lvSsJVYN/UIFVXgrO dVRuoFyfLFgqorA23LWu/7vI1YsceDAJ0YVs17eUskKjFhFFOJKuILTo6mZMiQ== 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=95854550de77b1e0701742e6db08717e9df171e5 commit 95854550de77b1e0701742e6db08717e9df171e5 Author: Hans Petter Selasky AuthorDate: 2022-02-08 15:08:52 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-08 15:08:52 +0000 mlx5en: Only delete installed VxLAN rules. Sponsored by: NVIDIA Networking (cherry picked from commit 9680b1ba71e4bd9a8d4c1b0e2aec4874635e561d) --- sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ad317c15d729..fc337cde04a1 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c @@ -1980,7 +1980,8 @@ mlx5e_del_vxlan_rule(struct mlx5e_priv *priv, sa_family_t family, u_int port) return (0); } - mlx5_del_flow_rule(el->vxlan_ft_rule); + if (el->installed) + mlx5_del_flow_rule(el->vxlan_ft_rule); TAILQ_REMOVE(&priv->vxlan.head, el, link); kvfree(el); return (0);