* [dpdk-stable] [PATCH] net/fm10k: fix descriptor vlan field filling in Tx
@ 2019-12-05 13:30 Lu Qiuwen
2019-12-06 1:21 ` Wang, Xiao W
0 siblings, 1 reply; 3+ messages in thread
From: Lu Qiuwen @ 2019-12-05 13:30 UTC (permalink / raw)
To: Qi Zhang, Xiao Wang; +Cc: dev, jeffrey.b.shaw, stable
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: jeffrey.b.shaw@intel.com
Cc: stable@dpdk.org
Signed-off-by: Lu Qiuwen <luqiuwen@iie.ac.cn>
---
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 5c3112183..4accaa2cd 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.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH] net/fm10k: fix descriptor vlan field filling in Tx
2019-12-05 13:30 [dpdk-stable] [PATCH] net/fm10k: fix descriptor vlan field filling in Tx Lu Qiuwen
@ 2019-12-06 1:21 ` Wang, Xiao W
2019-12-09 12:59 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
0 siblings, 1 reply; 3+ messages in thread
From: Wang, Xiao W @ 2019-12-06 1:21 UTC (permalink / raw)
To: Lu Qiuwen, Zhang, Qi Z; +Cc: dev, Shaw, Jeffrey B, stable
Hi,
> -----Original Message-----
> From: Lu Qiuwen <luqiuwen@iie.ac.cn>
> Sent: Thursday, December 5, 2019 9:30 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wang, Xiao W
> <xiao.w.wang@intel.com>
> Cc: dev@dpdk.org; Shaw, Jeffrey B <jeffrey.b.shaw@intel.com>;
> stable@dpdk.org
> Subject: [PATCH] net/fm10k: fix descriptor vlan field filling in Tx
>
> 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: jeffrey.b.shaw@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Lu Qiuwen <luqiuwen@iie.ac.cn>
> ---
> 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 5c3112183..4accaa2cd 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.windows.1
Acked-by: Xiao Wang <xiao.w.wang@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH] net/fm10k: fix descriptor vlan field filling in Tx
2019-12-06 1:21 ` Wang, Xiao W
@ 2019-12-09 12:59 ` Ye Xiaolong
0 siblings, 0 replies; 3+ messages in thread
From: Ye Xiaolong @ 2019-12-09 12:59 UTC (permalink / raw)
To: Wang, Xiao W; +Cc: Lu Qiuwen, Zhang, Qi Z, dev, Shaw, Jeffrey B, stable
On 12/06, Wang, Xiao W wrote:
>Hi,
>
>> -----Original Message-----
>> From: Lu Qiuwen <luqiuwen@iie.ac.cn>
>> Sent: Thursday, December 5, 2019 9:30 PM
>> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wang, Xiao W
>> <xiao.w.wang@intel.com>
>> Cc: dev@dpdk.org; Shaw, Jeffrey B <jeffrey.b.shaw@intel.com>;
>> stable@dpdk.org
>> Subject: [PATCH] net/fm10k: fix descriptor vlan field filling in Tx
>>
>> 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: jeffrey.b.shaw@intel.com
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Lu Qiuwen <luqiuwen@iie.ac.cn>
>> ---
>> 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 5c3112183..4accaa2cd 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.windows.1
>
>Acked-by: Xiao Wang <xiao.w.wang@intel.com>
Applied to dpdk-next-net-intel, Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-09 13:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-05 13:30 [dpdk-stable] [PATCH] net/fm10k: fix descriptor vlan field filling in Tx Lu Qiuwen
2019-12-06 1:21 ` Wang, Xiao W
2019-12-09 12:59 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).