From nobody Tue Feb 01 15:24:22 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 B23FF1916245; Tue, 1 Feb 2022 15:24:25 +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 4Jp7yH6JG1z3Fyh; Tue, 1 Feb 2022 15:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729064; 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=rNk1jbh+tzxuzUkMAnrS7aX/bDgH/ArSpJzP13Ly5Yw=; b=QDNIrhmZKNR1aOh2M7JdQNTmUxD5aiA7+UxN89PDKaTPttA4JO6M3dlzn/u2u/dnKY9cr6 a/qTFN8bllwyFdglclkkKQIdJ/S4j1sZDuG+7mpDJ/5Ot/aeqGco4gbLI+IelNt+pg4VJK Qb/7YSpAMO/nQjUJZUJDTRgMLJXxS8f8pDAC6+5vJhmoOw9CWCZ+mXoYbBgDwpzzShcY5p kQOhpaMVRL3duN3Clu514Obxa1ySO+SMFAatWsFuJZvsmycXsUAstKF4wJOIwmYJY8SPP9 i1V2oYACNh4rkdwlHv55rvHdHnn3KwwUx721rXQgbEjO6Mgke1ORTwvX2y7/Iw== 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 5E64613595; Tue, 1 Feb 2022 15:24:22 +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 211FOMds051046; Tue, 1 Feb 2022 15:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211FOMLI051045; Tue, 1 Feb 2022 15:24:22 GMT (envelope-from git) Date: Tue, 1 Feb 2022 15:24:22 GMT Message-Id: <202202011524.211FOMLI051045@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: 9680b1ba71e4 - main - mlx5en: Only delete installed VxLAN rules. 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: 9680b1ba71e4bd9a8d4c1b0e2aec4874635e561d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729064; 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=rNk1jbh+tzxuzUkMAnrS7aX/bDgH/ArSpJzP13Ly5Yw=; b=hK7ISyz3OKwFpNeGP5fS1yA0Q7zCz5fEZXnHGZS7JZ0ymiKfVIRcM9lcoPkwN4rQUcZURM 4cLyg2nvl130o6eU+WzYJjvyMIMXpceCRRH2sjPfhE9MpUHsRVpqilUPidEEYQ0MwQYiYY I8fEsrLNr0IYbQD1mgHVpKg74F3xTkFScVMUW9Vcgo671yrHDAV4OmB92NgQ1J8B2Ji+Wr +DFAMHqwsrd0WPC89QTk5IYTa+JR1CeqETaveTJU0/C1+Im1NDaxvb30FiE+vPHVAzZFLW YJrP3EDKcs+0iOFJuGdAaAfy5sAiO5fWBt7CasXDhq5WOiGPUffCO1qb1gmZFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643729064; a=rsa-sha256; cv=none; b=UGVAnWfTEXul7F8FTDdKEiHddff7nil4T155JTdQIAGGMvyshffbwB9FHY8nPvpCkeWofB FyE2ec6ZHjFb95eZUhe4LxoE2MwBJFP1ycYPm0ya7r68UPyNFyxfEb7fI6csmFeNFz308+ sYTHRcaLYQaWjy9TmjQEO8Ie+PW7/G24hF2nownDZ7EbTjtD+4S7qxXz8V/qWidbYb83cm FTeQHJ8iYHIo838fsjd1OTbhPPoHc+z37TVX+Vjt3tITc8UW1N55/uknJ1wKiqvDmHmJGq /S3otRq4xHlRBZzXoZbdPDFYdVSNImkOIGkBSO7tkIfqorsPN2/BDWyVgDRkoQ== 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=9680b1ba71e4bd9a8d4c1b0e2aec4874635e561d commit 9680b1ba71e4bd9a8d4c1b0e2aec4874635e561d Author: Hans Petter Selasky AuthorDate: 2022-02-01 15:20:10 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-01 15:21:15 +0000 mlx5en: Only delete installed VxLAN rules. MFC after: 1 week Sponsored by: NVIDIA Networking --- 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);