* [PATCH net] Xen-netback: Fix issue caused by using gso_type wrongly
@ 2014-03-10 7:44 Annie Li
2014-03-10 9:51 ` Paul Durrant
0 siblings, 1 reply; 5+ messages in thread
From: Annie Li @ 2014-03-10 7:44 UTC (permalink / raw)
To: xen-devel, netdev
Cc: konrad.wilk, Ian.Campbell, wei.liu2, paul.durrant, annie.li
From: Annie Li <annie.li@oracle.com>
Current netback uses gso_type to check whether the skb contains
gso offload, and this is wrong. Gso_size is the right one to
check gso existence, and gso_type is only used to check gso type.
Some skbs contains nonzero gso_type and zero gso_size, current
netback would treat these skbs as gso and create wrong response
for this. This also causes ssh failure to domu from other server.
Signed-off-by: Annie Li <annie.li@oracle.com>
---
drivers/net/xen-netback/netback.c | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index e5284bc..57a7d5d 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -240,7 +240,7 @@ static void xenvif_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
struct gnttab_copy *copy_gop;
struct xenvif_rx_meta *meta;
unsigned long bytes;
- int gso_type;
+ int gso_type = XEN_NETIF_GSO_TYPE_NONE;
/* Data must not cross a page boundary. */
BUG_ON(size + offset > PAGE_SIZE<<compound_order(page));
@@ -299,12 +299,12 @@ static void xenvif_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
}
/* Leave a gap for the GSO descriptor. */
- if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
- gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
- else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
- gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
- else
- gso_type = XEN_NETIF_GSO_TYPE_NONE;
+ if (skb_shinfo(skb)->gso_size) {
+ if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
+ gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
+ else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
+ gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
+ }
if (*head && ((1 << gso_type) & vif->gso_mask))
vif->rx.req_cons++;
@@ -342,15 +342,13 @@ static int xenvif_gop_skb(struct sk_buff *skb,
old_meta_prod = npo->meta_prod;
- if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) {
- gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
- gso_size = skb_shinfo(skb)->gso_size;
- } else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {
- gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
- gso_size = skb_shinfo(skb)->gso_size;
- } else {
- gso_type = XEN_NETIF_GSO_TYPE_NONE;
- gso_size = 0;
+ gso_type = XEN_NETIF_GSO_TYPE_NONE;
+ gso_size = skb_shinfo(skb)->gso_size;
+ if (gso_size) {
+ if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
+ gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
+ else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
+ gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
}
/* Set up a GSO prefix descriptor, if necessary */
@@ -500,8 +498,9 @@ static void xenvif_rx_action(struct xenvif *vif)
size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
max_slots_needed += DIV_ROUND_UP(size, PAGE_SIZE);
}
- if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 ||
- skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
+ if (skb_shinfo(skb)->gso_size &&
+ (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 ||
+ skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6))
max_slots_needed++;
/* If the skb may not fit then bail out now */
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* RE: [PATCH net] Xen-netback: Fix issue caused by using gso_type wrongly
2014-03-10 7:44 [PATCH net] Xen-netback: Fix issue caused by using gso_type wrongly Annie Li
@ 2014-03-10 9:51 ` Paul Durrant
2014-03-10 13:23 ` [Xen-devel] " annie li
0 siblings, 1 reply; 5+ messages in thread
From: Paul Durrant @ 2014-03-10 9:51 UTC (permalink / raw)
To: Annie Li, xen-devel@lists.xen.org, netdev@vger.kernel.org
Cc: konrad.wilk@oracle.com, Ian Campbell, Wei Liu
> -----Original Message-----
> From: Annie Li [mailto:Annie.li@oracle.com]
> Sent: 10 March 2014 07:44
> To: xen-devel@lists.xen.org; netdev@vger.kernel.org
> Cc: konrad.wilk@oracle.com; Ian Campbell; Wei Liu; Paul Durrant;
> annie.li@oracle.com
> Subject: [PATCH net] Xen-netback: Fix issue caused by using gso_type
> wrongly
>
> From: Annie Li <annie.li@oracle.com>
>
> Current netback uses gso_type to check whether the skb contains
> gso offload, and this is wrong. Gso_size is the right one to
> check gso existence, and gso_type is only used to check gso type.
>
> Some skbs contains nonzero gso_type and zero gso_size, current
> netback would treat these skbs as gso and create wrong response
> for this. This also causes ssh failure to domu from other server.
>
That's a shame. It would be nice if these things were consistent...
> Signed-off-by: Annie Li <annie.li@oracle.com>
> ---
> drivers/net/xen-netback/netback.c | 35 +++++++++++++++++---------------
> ---
> 1 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-
> netback/netback.c
> index e5284bc..57a7d5d 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -240,7 +240,7 @@ static void xenvif_gop_frag_copy(struct xenvif *vif,
> struct sk_buff *skb,
> struct gnttab_copy *copy_gop;
> struct xenvif_rx_meta *meta;
> unsigned long bytes;
> - int gso_type;
> + int gso_type = XEN_NETIF_GSO_TYPE_NONE;
>
> /* Data must not cross a page boundary. */
> BUG_ON(size + offset > PAGE_SIZE<<compound_order(page));
> @@ -299,12 +299,12 @@ static void xenvif_gop_frag_copy(struct xenvif *vif,
> struct sk_buff *skb,
> }
>
> /* Leave a gap for the GSO descriptor. */
> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
> - gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
> - else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
> - gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
> - else
> - gso_type = XEN_NETIF_GSO_TYPE_NONE;
> + if (skb_shinfo(skb)->gso_size) {
You should probably use skb_is_gso(skb) for your test.
Paul
> + if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
> + gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
> + else if (skb_shinfo(skb)->gso_type &
> SKB_GSO_TCPV6)
> + gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
> + }
>
> if (*head && ((1 << gso_type) & vif->gso_mask))
> vif->rx.req_cons++;
> @@ -342,15 +342,13 @@ static int xenvif_gop_skb(struct sk_buff *skb,
>
> old_meta_prod = npo->meta_prod;
>
> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) {
> - gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
> - gso_size = skb_shinfo(skb)->gso_size;
> - } else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {
> - gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
> - gso_size = skb_shinfo(skb)->gso_size;
> - } else {
> - gso_type = XEN_NETIF_GSO_TYPE_NONE;
> - gso_size = 0;
> + gso_type = XEN_NETIF_GSO_TYPE_NONE;
> + gso_size = skb_shinfo(skb)->gso_size;
> + if (gso_size) {
> + if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
> + gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
> + else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
> + gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
> }
>
> /* Set up a GSO prefix descriptor, if necessary */
> @@ -500,8 +498,9 @@ static void xenvif_rx_action(struct xenvif *vif)
> size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
> max_slots_needed += DIV_ROUND_UP(size,
> PAGE_SIZE);
> }
> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 ||
> - skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
> + if (skb_shinfo(skb)->gso_size &&
> + (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 ||
> + skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6))
> max_slots_needed++;
>
> /* If the skb may not fit then bail out now */
> --
> 1.7.3.4
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Xen-devel] [PATCH net] Xen-netback: Fix issue caused by using gso_type wrongly
2014-03-10 9:51 ` Paul Durrant
@ 2014-03-10 13:23 ` annie li
2014-03-10 13:29 ` Zoltan Kiss
0 siblings, 1 reply; 5+ messages in thread
From: annie li @ 2014-03-10 13:23 UTC (permalink / raw)
To: Paul Durrant
Cc: xen-devel@lists.xen.org, netdev@vger.kernel.org, Wei Liu,
Ian Campbell
On 2014/3/10 17:51, Paul Durrant wrote:
>> -----Original Message-----
>> From: Annie Li [mailto:Annie.li@oracle.com]
>> Sent: 10 March 2014 07:44
>> To:xen-devel@lists.xen.org;netdev@vger.kernel.org
>> Cc:konrad.wilk@oracle.com; Ian Campbell; Wei Liu; Paul Durrant;
>> annie.li@oracle.com
>> Subject: [PATCH net] Xen-netback: Fix issue caused by using gso_type
>> wrongly
>>
>> From: Annie Li<annie.li@oracle.com>
>>
>> Current netback uses gso_type to check whether the skb contains
>> gso offload, and this is wrong. Gso_size is the right one to
>> check gso existence, and gso_type is only used to check gso type.
>>
>> Some skbs contains nonzero gso_type and zero gso_size, current
>> netback would treat these skbs as gso and create wrong response
>> for this. This also causes ssh failure to domu from other server.
>>
> That's a shame. It would be nice if these things were consistent...
>
>> Signed-off-by: Annie Li<annie.li@oracle.com>
>> ---
>> drivers/net/xen-netback/netback.c | 35 +++++++++++++++++---------------
>> ---
>> 1 files changed, 17 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-
>> netback/netback.c
>> index e5284bc..57a7d5d 100644
>> --- a/drivers/net/xen-netback/netback.c
>> +++ b/drivers/net/xen-netback/netback.c
>> @@ -240,7 +240,7 @@ static void xenvif_gop_frag_copy(struct xenvif *vif,
>> struct sk_buff *skb,
>> struct gnttab_copy *copy_gop;
>> struct xenvif_rx_meta *meta;
>> unsigned long bytes;
>> - int gso_type;
>> + int gso_type = XEN_NETIF_GSO_TYPE_NONE;
>>
>> /* Data must not cross a page boundary. */
>> BUG_ON(size + offset > PAGE_SIZE<<compound_order(page));
>> @@ -299,12 +299,12 @@ static void xenvif_gop_frag_copy(struct xenvif *vif,
>> struct sk_buff *skb,
>> }
>>
>> /* Leave a gap for the GSO descriptor. */
>> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
>> - else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
>> - else
>> - gso_type = XEN_NETIF_GSO_TYPE_NONE;
>> + if (skb_shinfo(skb)->gso_size) {
> You should probably use skb_is_gso(skb) for your test.
skb_is_gso does the same thing, skb_iso_gso and
skb_shinfo(skb)->gso_size coexist. But I can change the code as you
suggested if you like, will post a v2 patch for this.
Thanks
Annie
> Paul
>
>> + if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
>> + gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
>> + else if (skb_shinfo(skb)->gso_type &
>> SKB_GSO_TCPV6)
>> + gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
>> + }
>>
>> if (*head && ((1 << gso_type) & vif->gso_mask))
>> vif->rx.req_cons++;
>> @@ -342,15 +342,13 @@ static int xenvif_gop_skb(struct sk_buff *skb,
>>
>> old_meta_prod = npo->meta_prod;
>>
>> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) {
>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
>> - gso_size = skb_shinfo(skb)->gso_size;
>> - } else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {
>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
>> - gso_size = skb_shinfo(skb)->gso_size;
>> - } else {
>> - gso_type = XEN_NETIF_GSO_TYPE_NONE;
>> - gso_size = 0;
>> + gso_type = XEN_NETIF_GSO_TYPE_NONE;
>> + gso_size = skb_shinfo(skb)->gso_size;
>> + if (gso_size) {
>> + if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
>> + gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
>> + else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
>> + gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
>> }
>>
>> /* Set up a GSO prefix descriptor, if necessary */
>> @@ -500,8 +498,9 @@ static void xenvif_rx_action(struct xenvif *vif)
>> size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
>> max_slots_needed += DIV_ROUND_UP(size,
>> PAGE_SIZE);
>> }
>> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 ||
>> - skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
>> + if (skb_shinfo(skb)->gso_size &&
>> + (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4 ||
>> + skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6))
>> max_slots_needed++;
>>
>> /* If the skb may not fit then bail out now */
>> --
>> 1.7.3.4
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Xen-devel] [PATCH net] Xen-netback: Fix issue caused by using gso_type wrongly
2014-03-10 13:23 ` [Xen-devel] " annie li
@ 2014-03-10 13:29 ` Zoltan Kiss
2014-03-11 12:48 ` Ian Campbell
0 siblings, 1 reply; 5+ messages in thread
From: Zoltan Kiss @ 2014-03-10 13:29 UTC (permalink / raw)
To: annie li, Paul Durrant
Cc: xen-devel@lists.xen.org, netdev@vger.kernel.org, Wei Liu,
Ian Campbell
On 10/03/14 13:23, annie li wrote:
> On 2014/3/10 17:51, Paul Durrant wrote:
>>> @@ -299,12 +299,12 @@ static void xenvif_gop_frag_copy(struct xenvif
>>> *vif,
>>> struct sk_buff *skb,
>>> }
>>>
>>> /* Leave a gap for the GSO descriptor. */
>>> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
>>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
>>> - else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
>>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
>>> - else
>>> - gso_type = XEN_NETIF_GSO_TYPE_NONE;
>>> + if (skb_shinfo(skb)->gso_size) {
>> You should probably use skb_is_gso(skb) for your test.
>
> skb_is_gso does the same thing, skb_iso_gso and
> skb_shinfo(skb)->gso_size coexist. But I can change the code as you
> suggested if you like, will post a v2 patch for this.
It's always better to use core functions which codify these rules. Also,
from the reader's point of view, it's more obvious to see skb_is_gso,
than checking gso_size.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Xen-devel] [PATCH net] Xen-netback: Fix issue caused by using gso_type wrongly
2014-03-10 13:29 ` Zoltan Kiss
@ 2014-03-11 12:48 ` Ian Campbell
0 siblings, 0 replies; 5+ messages in thread
From: Ian Campbell @ 2014-03-11 12:48 UTC (permalink / raw)
To: Zoltan Kiss
Cc: annie li, Paul Durrant, xen-devel@lists.xen.org,
netdev@vger.kernel.org, Wei Liu
On Mon, 2014-03-10 at 13:29 +0000, Zoltan Kiss wrote:
> On 10/03/14 13:23, annie li wrote:
> > On 2014/3/10 17:51, Paul Durrant wrote:
> >>> @@ -299,12 +299,12 @@ static void xenvif_gop_frag_copy(struct xenvif
> >>> *vif,
> >>> struct sk_buff *skb,
> >>> }
> >>>
> >>> /* Leave a gap for the GSO descriptor. */
> >>> - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
> >>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV4;
> >>> - else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
> >>> - gso_type = XEN_NETIF_GSO_TYPE_TCPV6;
> >>> - else
> >>> - gso_type = XEN_NETIF_GSO_TYPE_NONE;
> >>> + if (skb_shinfo(skb)->gso_size) {
> >> You should probably use skb_is_gso(skb) for your test.
> >
> > skb_is_gso does the same thing, skb_iso_gso and
> > skb_shinfo(skb)->gso_size coexist. But I can change the code as you
> > suggested if you like, will post a v2 patch for this.
>
> It's always better to use core functions which codify these rules. Also,
> from the reader's point of view, it's more obvious to see skb_is_gso,
> than checking gso_size.
Agreed on both counts.
Ian.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-11 12:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-10 7:44 [PATCH net] Xen-netback: Fix issue caused by using gso_type wrongly Annie Li
2014-03-10 9:51 ` Paul Durrant
2014-03-10 13:23 ` [Xen-devel] " annie li
2014-03-10 13:29 ` Zoltan Kiss
2014-03-11 12:48 ` Ian Campbell
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).