From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5A47AA0C47 for ; Tue, 10 Aug 2021 17:44:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 547BE411C3; Tue, 10 Aug 2021 17:44:43 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 4296F4114F for ; Tue, 10 Aug 2021 17:44:42 +0200 (CEST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 2BDD83F338 for ; Tue, 10 Aug 2021 15:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610282; bh=iSSLuFHVom2nONSrWb/r5xRsMVVv9rdqzR0cpQohDAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OYAY6RvXsygXRqwIE7HzPkv89fO6nLyYp/aa4BSJDe/NTYVlLNqdRDJKGBKLekqtq SeTABJwDs4n8S183OkCoYS1IN4qkJUMSUW/Xj6GlH6zBr4/P3I7KJU9KfwdCGyU8R3 MDDLE06YrvPF/7l16iE4sXL8VBnQI0xBhwza+/u3LVMD0p4SOEbxsY4LXStWMNpHQS NW3GwdyDbWWn7oHIto67oGhBlBEu5QDJmphNWFvZzhXC2q79nTkQxjtbAi+lYfGHjg ZkjKbTOFiUuwBoRm0oP05Ol1tMwT9fb16aXpKvBK9XsU19SSmzjPjszBdRQXQDJoDc /KLrZKhA/+23w== Received: by mail-ej1-f69.google.com with SMTP id q19-20020a1709064cd3b02904c5f93c0124so5736476ejt.14 for ; Tue, 10 Aug 2021 08:44:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iSSLuFHVom2nONSrWb/r5xRsMVVv9rdqzR0cpQohDAE=; b=B+UgoGfy3X9TC0WpvDN5veIPobMCVeXL1NkXnf733f/y+SFOmhPDJemc3Rpsly8/R1 UqkUnG46r0QwilwCBt6AaRwzPDeZQnF3bxPcwRELzRZ5uzNV6elqjWxkV7TLolNZsGL4 I2rb3L+A+fn9yT2gCAMTJVqHWVqkZNiBCUgB2873Mab7pXUE+hiPSeXx/DfKGigT6utF ZlA351Bwhai7nPdyCUvf3/ZlCYocteL5IhvKDnpe5RbEbBJuUH6J96rF0NBP17Mx8a1O +7+Xe6azxiWrMmvvnEk4JkX5MkIKV5/vW02jQ5EH3YkI4zox7sA9Ny4f7rzl5i30knjg bR9g== X-Gm-Message-State: AOAM531gerAam3F8tVeo31DcB/XGiYPT48UHMRq8Ah8llW7DpnG61vaG EyweznNM8px7bL3DUTzlqXdjMyrnFRBY3AoqbWEawtIZii/LwAIXnz1jhNrwHWRIhxyKZHauLYx 1wxEm9+IRAq5tMrSPQC4IY25d X-Received: by 2002:a05:6402:95c:: with SMTP id h28mr5867522edz.199.1628610281915; Tue, 10 Aug 2021 08:44:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpXvLfcLGDxDFBiFVN74lL6VFJRn2Xx2/TCPF1ZDTZu54gvjSnBr9QCvtGIkHNVCx58IeFvQ== X-Received: by 2002:a05:6402:95c:: with SMTP id h28mr5867497edz.199.1628610281741; Tue, 10 Aug 2021 08:44:41 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id a2sm415889edm.72.2021.08.10.08.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:41 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Guoyang Zhou Cc: dpdk stable Date: Tue, 10 Aug 2021 17:40:02 +0200 Message-Id: <20210810154022.749358-82-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hinic: increase protection of the VLAN' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/b846727f7cd5aabdf76f9421bd1c19dfbb1fcbe8 Thanks. Christian Ehrhardt --- >From b846727f7cd5aabdf76f9421bd1c19dfbb1fcbe8 Mon Sep 17 00:00:00 2001 From: Guoyang Zhou Date: Fri, 16 Jul 2021 17:54:28 +0800 Subject: [PATCH] net/hinic: increase protection of the VLAN [ upstream commit 2cfd68ec407609becd75661787043e7cae35f15c ] If the VLAN id 0 is deleted for hinic, all packets without VLAN will be discarded when the VLAN filter is turned on. Fixes: 50ce3e7aec8f ("ethdev: fix VLAN offloads set if no relative capabilities") Signed-off-by: Guoyang Zhou --- drivers/net/hinic/hinic_pmd_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c index 791075e87b..a7c3d7bf75 100644 --- a/drivers/net/hinic/hinic_pmd_ethdev.c +++ b/drivers/net/hinic/hinic_pmd_ethdev.c @@ -1597,6 +1597,9 @@ static int hinic_vlan_filter_set(struct rte_eth_dev *dev, if (vlan_id > RTE_ETHER_MAX_VLAN_ID) return -EINVAL; + if (vlan_id == 0) + return 0; + func_id = hinic_global_func_id(nic_dev->hwdev); if (enable) { -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:16.179822762 +0200 +++ 0082-net-hinic-increase-protection-of-the-VLAN.patch 2021-08-10 15:11:13.094638647 +0200 @@ -1 +1 @@ -From 2cfd68ec407609becd75661787043e7cae35f15c Mon Sep 17 00:00:00 2001 +From b846727f7cd5aabdf76f9421bd1c19dfbb1fcbe8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2cfd68ec407609becd75661787043e7cae35f15c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 946465779f..75849f28be 100644 +index 791075e87b..a7c3d7bf75 100644 @@ -21 +22 @@ -@@ -1617,6 +1617,9 @@ static int hinic_vlan_filter_set(struct rte_eth_dev *dev, +@@ -1597,6 +1597,9 @@ static int hinic_vlan_filter_set(struct rte_eth_dev *dev,