diff mbox series

net/virtio: fix broken Tx checksum offloads

Message ID 1571939170-19998-1-git-send-email-arybchenko@solarflare.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series net/virtio: fix broken Tx checksum offloads |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance fail Performance Testing issues
ci/iol-compilation success Compile Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation fail Compilation issues

Commit Message

Andrew Rybchenko Oct. 24, 2019, 5:46 p.m. UTC 
  Missing parenthesis around expression before type cast to struct
virtio_net_hdr pointer makes the arithmetic to be in
sizeof(struct virtio_net_hdr) units.

Use rte_pktmbuf_mtod_offset() to fix the problem.

Type of head_size is changed to signed since some compilers bark
on unary minus applied to unsigned.

Fixes: 1ae55ad38e5e ("net/virtio: fix mbuf data and packet length mismatch")
Cc: stable@dpdk.org

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/virtio/virtio_rxtx.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Tiwei Bie Oct. 25, 2019, 6:37 a.m. UTC | #1 
On Thu, Oct 24, 2019 at 06:46:09PM +0100, Andrew Rybchenko wrote:
> Missing parenthesis around expression before type cast to struct
> virtio_net_hdr pointer makes the arithmetic to be in
> sizeof(struct virtio_net_hdr) units.
> 
> Use rte_pktmbuf_mtod_offset() to fix the problem.
> 
> Type of head_size is changed to signed since some compilers bark
> on unary minus applied to unsigned.
> 
> Fixes: 1ae55ad38e5e ("net/virtio: fix mbuf data and packet length mismatch")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> ---
>  drivers/net/virtio/virtio_rxtx.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)

Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>

Thanks,
Tiwei
Maxime Coquelin Oct. 25, 2019, 8:30 a.m. UTC | #2 
On 10/24/19 7:46 PM, Andrew Rybchenko wrote:
> Missing parenthesis around expression before type cast to struct
> virtio_net_hdr pointer makes the arithmetic to be in
> sizeof(struct virtio_net_hdr) units.
> 
> Use rte_pktmbuf_mtod_offset() to fix the problem.
> 
> Type of head_size is changed to signed since some compilers bark
> on unary minus applied to unsigned.
> 
> Fixes: 1ae55ad38e5e ("net/virtio: fix mbuf data and packet length mismatch")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> ---
>  drivers/net/virtio/virtio_rxtx.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)

Thanks Andrew!
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Ferruh, do you want to apply it directly for -rc1?

Maxime
Maxime Coquelin Oct. 25, 2019, 8:48 a.m. UTC | #3 
Missed to add Ferruh.

On 10/25/19 10:30 AM, Maxime Coquelin wrote:
> 
> 
> On 10/24/19 7:46 PM, Andrew Rybchenko wrote:
>> Missing parenthesis around expression before type cast to struct
>> virtio_net_hdr pointer makes the arithmetic to be in
>> sizeof(struct virtio_net_hdr) units.
>>
>> Use rte_pktmbuf_mtod_offset() to fix the problem.
>>
>> Type of head_size is changed to signed since some compilers bark
>> on unary minus applied to unsigned.
>>
>> Fixes: 1ae55ad38e5e ("net/virtio: fix mbuf data and packet length mismatch")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> ---
>>  drivers/net/virtio/virtio_rxtx.c | 24 ++++++++++++------------
>>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> Thanks Andrew!
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> 
> Ferruh, do you want to apply it directly for -rc1?
> 
> Maxime
>
Ferruh Yigit Oct. 25, 2019, 10:22 a.m. UTC | #4 
On 10/25/2019 9:30 AM, Maxime Coquelin wrote:
> 
> 
> On 10/24/19 7:46 PM, Andrew Rybchenko wrote:
>> Missing parenthesis around expression before type cast to struct
>> virtio_net_hdr pointer makes the arithmetic to be in
>> sizeof(struct virtio_net_hdr) units.
>>
>> Use rte_pktmbuf_mtod_offset() to fix the problem.
>>
>> Type of head_size is changed to signed since some compilers bark
>> on unary minus applied to unsigned.
>>
>> Fixes: 1ae55ad38e5e ("net/virtio: fix mbuf data and packet length mismatch")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> ---
>>  drivers/net/virtio/virtio_rxtx.c | 24 ++++++++++++------------
>>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> Thanks Andrew!
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> 
> Ferruh, do you want to apply it directly for -rc1?
> 

Yep, I will get directly to next-net.
Ferruh Yigit Oct. 25, 2019, 2:41 p.m. UTC | #5 
On 10/25/2019 9:30 AM, Maxime Coquelin wrote:
> 
> 
> On 10/24/19 7:46 PM, Andrew Rybchenko wrote:
>> Missing parenthesis around expression before type cast to struct
>> virtio_net_hdr pointer makes the arithmetic to be in
>> sizeof(struct virtio_net_hdr) units.
>>
>> Use rte_pktmbuf_mtod_offset() to fix the problem.
>>
>> Type of head_size is changed to signed since some compilers bark
>> on unary minus applied to unsigned.
>>
>> Fixes: 1ae55ad38e5e ("net/virtio: fix mbuf data and packet length mismatch")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> ---
>>  drivers/net/virtio/virtio_rxtx.c | 24 ++++++++++++------------
>>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> Thanks Andrew!
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> 

Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
Applied to dpdk-next-net/master, thanks.
diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index b5fc4ecbe1..274b778d84 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -635,7 +635,7 @@  virtqueue_enqueue_xmit_inorder(struct virtnet_tx *txvq,
 	struct vring_desc *start_dp;
 	struct virtio_net_hdr *hdr;
 	uint16_t idx;
-	uint16_t head_size = vq->hw->vtnet_hdr_size;
+	int16_t head_size = vq->hw->vtnet_hdr_size;
 	uint16_t i = 0;
 
 	idx = vq->vq_desc_head_idx;
@@ -648,8 +648,8 @@  virtqueue_enqueue_xmit_inorder(struct virtnet_tx *txvq,
 		dxp->ndescs = 1;
 		virtio_update_packet_stats(&txvq->stats, cookies[i]);
 
-		hdr = (struct virtio_net_hdr *)(char *)cookies[i]->buf_addr +
-			cookies[i]->data_off - head_size;
+		hdr = rte_pktmbuf_mtod_offset(cookies[i],
+				struct virtio_net_hdr *, -head_size);
 
 		/* if offload disabled, hdr is not zeroed yet, do it now */
 		if (!vq->hw->has_tx_offload)
@@ -682,7 +682,7 @@  virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,
 	struct vring_packed_desc *dp;
 	struct vq_desc_extra *dxp;
 	uint16_t idx, id, flags;
-	uint16_t head_size = vq->hw->vtnet_hdr_size;
+	int16_t head_size = vq->hw->vtnet_hdr_size;
 	struct virtio_net_hdr *hdr;
 
 	id = in_order ? vq->vq_avail_idx : vq->vq_desc_head_idx;
@@ -696,8 +696,8 @@  virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,
 	flags = vq->vq_packed.cached_flags;
 
 	/* prepend cannot fail, checked by caller */
-	hdr = (struct virtio_net_hdr *)(char *)cookie->buf_addr +
-		cookie->data_off - head_size;
+	hdr = rte_pktmbuf_mtod_offset(cookie, struct virtio_net_hdr *,
+				      -head_size);
 
 	/* if offload disabled, hdr is not zeroed yet, do it now */
 	if (!vq->hw->has_tx_offload)
@@ -734,7 +734,7 @@  virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
 	struct virtqueue *vq = txvq->vq;
 	struct vring_packed_desc *start_dp, *head_dp;
 	uint16_t idx, id, head_idx, head_flags;
-	uint16_t head_size = vq->hw->vtnet_hdr_size;
+	int16_t head_size = vq->hw->vtnet_hdr_size;
 	struct virtio_net_hdr *hdr;
 	uint16_t prev;
 	bool prepend_header = false;
@@ -756,8 +756,8 @@  virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
 
 	if (can_push) {
 		/* prepend cannot fail, checked by caller */
-		hdr = (struct virtio_net_hdr *)(char *)cookie->buf_addr +
-			cookie->data_off - head_size;
+		hdr = rte_pktmbuf_mtod_offset(cookie, struct virtio_net_hdr *,
+					      -head_size);
 		prepend_header = true;
 
 		/* if offload disabled, it is not zeroed below, do it now */
@@ -832,7 +832,7 @@  virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
 	struct vring_desc *start_dp;
 	uint16_t seg_num = cookie->nb_segs;
 	uint16_t head_idx, idx;
-	uint16_t head_size = vq->hw->vtnet_hdr_size;
+	int16_t head_size = vq->hw->vtnet_hdr_size;
 	bool prepend_header = false;
 	struct virtio_net_hdr *hdr;
 
@@ -849,8 +849,8 @@  virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
 
 	if (can_push) {
 		/* prepend cannot fail, checked by caller */
-		hdr = (struct virtio_net_hdr *)(char *)cookie->buf_addr +
-			cookie->data_off - head_size;
+		hdr = rte_pktmbuf_mtod_offset(cookie, struct virtio_net_hdr *,
+					      -head_size);
 		prepend_header = true;
 
 		/* if offload disabled, it is not zeroed below, do it now */