From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C2440A051C for ; Tue, 11 Feb 2020 12:24:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B26332B9C; Tue, 11 Feb 2020 12:24:36 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id C19372B9C for ; Tue, 11 Feb 2020 12:24:35 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id u6so11910866wrt.0 for ; Tue, 11 Feb 2020 03:24:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=19XmwWv95o/UFzJ3zAXAi/ZaighFETnRrIUeG8YShjw=; b=QU2miiXsaJJvH8iGp3ykSGBcjuJyKor7bBsNO5xG0nKjnuUo+OYT+OPUD0AwXC0h0F Awpph/iMFuyFYcZzQD1l1QnqfVfeMtQkvUjv1Ah2fxZVBAIz/ySuIkrAS8C1RumodWoK TU5NwQ5GkkmwW+xeQ1xuryQflnsfIjiuVek+dO4Jvu+Z+d1v9+AgvKysGZ9u3erygGjs kD63kuC1LiYCV9sANAiSOFYk5eRxA39lVUfqwk2x1lDUfci+g1/y7Fs4KO4yaTx01t+P 3lYvTKKTirxKJ3IeCn+2Wydgbu7CuT2M4/TdwhGsgHf8cubZJd8lQFeAraquWmO44Icq mUuQ== 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=19XmwWv95o/UFzJ3zAXAi/ZaighFETnRrIUeG8YShjw=; b=uSfGqO0XdM1TBqiMHnqD9wpqtoGxrj4ZwW9oKHV2LwZ3tKG4NkzwNrE09gtRnwz/6p XDhrhU06JRN9dzWLhqYZYBMbSBI8ujC8Pphif4TdE6elu92iqbJweN1LDsmC31AbEqki d7/LiFw1D1AS4wK61DG8tBqTPv4kFa96XaN8Vb0vKU+9fNc22CS8aY0jpDMdoMyq90zY bS/zxbLNAIFseWaJuIJMJklBtRmcmevhFnP5uPTgnkmdM5++9Ka/ozTBEm2A/s3S7mI/ SW00LU4hNeihFlBeoIDZW80Jc1hv+Ce/YtZ88ypzTrucFw5WRMjab6y9d3IDtc9Fe8k9 Desw== X-Gm-Message-State: APjAAAX6F4aCWunjg3b72BnZV7StHUWYtvcmS1eWxNrFxq6lpwZgJi+9 0M8k6ZOOYRWAef09H9ZffCs= X-Google-Smtp-Source: APXvYqzjF9XMUN8EHcVao2AGXT1sHiP+XKJtrbnlLNfwVFg0/k+ROZk/Nal0j0yAm68lkBIQ0AOatw== X-Received: by 2002:a5d:4e0a:: with SMTP id p10mr8543247wrt.229.1581420275505; Tue, 11 Feb 2020 03:24:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n13sm3371856wmd.21.2020.02.11.03.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:24:35 -0800 (PST) From: luca.boccassi@gmail.com To: Lu Qiuwen Cc: Xiao Wang , dpdk stable Date: Tue, 11 Feb 2020 11:19:32 +0000 Message-Id: <20200211112216.3929-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/fm10k: fix descriptor VLAN field filling in Tx' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. 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. Thanks. Luca Boccassi --- >From e3de8f72c002b5d74a1abaa321728cec1c94b33b Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Thu, 5 Dec 2019 21:30:08 +0800 Subject: [PATCH] net/fm10k: fix descriptor VLAN field filling in Tx [ upstream commit 6aab203435040461f585fe9423e3dbdc0729c9fc ] The VLAN field in the descriptor is not filled when ol_flags has no VLAN flag. When the caller sends some packets with VLAN tags, but other packets do not have VLAN tags, the behavior of the program cannot be determined. Fixes: 4b61d3bfa941 ("fm10k: add receive and tranmit") Signed-off-by: Lu Qiuwen Acked-by: Xiao Wang --- drivers/net/fm10k/fm10k_rxtx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c index 5c31121839..4accaa2cd6 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c @@ -611,6 +611,8 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *q, struct rte_mbuf *mb) /* set vlan if requested */ if (mb->ol_flags & PKT_TX_VLAN_PKT) q->hw_ring[q->next_free].vlan = mb->vlan_tci; + else + q->hw_ring[q->next_free].vlan = 0; q->sw_ring[q->next_free] = mb; q->hw_ring[q->next_free].buffer_addr = -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:40.094072389 +0000 +++ 0026-net-fm10k-fix-descriptor-VLAN-field-filling-in-Tx.patch 2020-02-11 11:17:38.336000150 +0000 @@ -1,15 +1,16 @@ -From 6aab203435040461f585fe9423e3dbdc0729c9fc Mon Sep 17 00:00:00 2001 +From e3de8f72c002b5d74a1abaa321728cec1c94b33b Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Thu, 5 Dec 2019 21:30:08 +0800 Subject: [PATCH] net/fm10k: fix descriptor VLAN field filling in Tx +[ upstream commit 6aab203435040461f585fe9423e3dbdc0729c9fc ] + The VLAN field in the descriptor is not filled when ol_flags has no VLAN flag. When the caller sends some packets with VLAN tags, but other packets do not have VLAN tags, the behavior of the program cannot be determined. Fixes: 4b61d3bfa941 ("fm10k: add receive and tranmit") -Cc: stable@dpdk.org Signed-off-by: Lu Qiuwen Acked-by: Xiao Wang