* [PATCH net-next] cxgb3: Correct comparisons and calculations using skb->tail and skb-transport_header
@ 2013-06-04 8:11 roy.qing.li
2013-06-04 13:23 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: roy.qing.li @ 2013-06-04 8:11 UTC (permalink / raw)
To: netdev; +Cc: horms
From: Li RongQing <roy.qing.li@gmail.com>
This corrects an regression introduced by "net: Use 16bits for *_headers
fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In
that case skb->tail will be a pointer whereas skb->transport_header
will be an offset from head. This is corrected by using wrappers that
ensure that comparisons and calculations are always made using pointers.
Cc: Simon Horman <horms@verge.net.au>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
index 46d1efc..687ec4a 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
@@ -1583,7 +1583,7 @@ static void deferred_unmap_destructor(struct sk_buff *skb)
dui = (struct deferred_unmap_info *)skb->head;
p = dui->addr;
- if (skb->tail - skb->transport_header)
+ if (skb_tail_pointer(skb) - skb_transport_header(skb))
pci_unmap_single(dui->pdev, *p++, skb_tail_pointer(skb) -
skb_transport_header(skb), PCI_DMA_TODEVICE);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index 2bfbb20..ac311f5 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -1294,7 +1294,7 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb)
flits = skb_transport_offset(skb) / 8U; /* headers */
cnt = skb_shinfo(skb)->nr_frags;
- if (skb->tail != skb->transport_header)
+ if (skb_tail_pointer(skb) != skb_transport_header(skb))
cnt++;
return flits + sgl_len(cnt);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] cxgb3: Correct comparisons and calculations using skb->tail and skb-transport_header
2013-06-04 8:11 [PATCH net-next] cxgb3: Correct comparisons and calculations using skb->tail and skb-transport_header roy.qing.li
@ 2013-06-04 13:23 ` Simon Horman
2013-06-05 0:38 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Simon Horman @ 2013-06-04 13:23 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev
On Tue, Jun 04, 2013 at 04:11:16PM +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> This corrects an regression introduced by "net: Use 16bits for *_headers
> fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In
> that case skb->tail will be a pointer whereas skb->transport_header
> will be an offset from head. This is corrected by using wrappers that
> ensure that comparisons and calculations are always made using pointers.
>
> Cc: Simon Horman <horms@verge.net.au>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
> ---
> drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +-
> drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
> index 46d1efc..687ec4a 100644
> --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
> +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
> @@ -1583,7 +1583,7 @@ static void deferred_unmap_destructor(struct sk_buff *skb)
> dui = (struct deferred_unmap_info *)skb->head;
> p = dui->addr;
>
> - if (skb->tail - skb->transport_header)
> + if (skb_tail_pointer(skb) - skb_transport_header(skb))
> pci_unmap_single(dui->pdev, *p++, skb_tail_pointer(skb) -
> skb_transport_header(skb), PCI_DMA_TODEVICE);
>
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
> index 2bfbb20..ac311f5 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
> +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
> @@ -1294,7 +1294,7 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb)
>
> flits = skb_transport_offset(skb) / 8U; /* headers */
> cnt = skb_shinfo(skb)->nr_frags;
> - if (skb->tail != skb->transport_header)
> + if (skb_tail_pointer(skb) != skb_transport_header(skb))
> cnt++;
> return flits + sgl_len(cnt);
> }
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] cxgb3: Correct comparisons and calculations using skb->tail and skb-transport_header
2013-06-04 13:23 ` Simon Horman
@ 2013-06-05 0:38 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-06-05 0:38 UTC (permalink / raw)
To: horms; +Cc: roy.qing.li, netdev
From: Simon Horman <horms@verge.net.au>
Date: Tue, 4 Jun 2013 22:23:53 +0900
> On Tue, Jun 04, 2013 at 04:11:16PM +0800, roy.qing.li@gmail.com wrote:
>> From: Li RongQing <roy.qing.li@gmail.com>
>>
>> This corrects an regression introduced by "net: Use 16bits for *_headers
>> fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In
>> that case skb->tail will be a pointer whereas skb->transport_header
>> will be an offset from head. This is corrected by using wrappers that
>> ensure that comparisons and calculations are always made using pointers.
>>
>> Cc: Simon Horman <horms@verge.net.au>
>> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
>
> Reviewed-by: Simon Horman <horms@verge.net.au>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-05 0:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-04 8:11 [PATCH net-next] cxgb3: Correct comparisons and calculations using skb->tail and skb-transport_header roy.qing.li
2013-06-04 13:23 ` Simon Horman
2013-06-05 0:38 ` David Miller
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).