| Message ID | 1449785996-24835-1-git-send-email-pshelar@nicira.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Dec 10, 2015 at 2:19 PM, Pravin B Shelar <pshelar@nicira.com> wrote: > STT reassembly can generate list of packets. But it was > handled as a single skb. Following patch fixes it. > > Fixes: e23775f20 ("datapath: Add support for lwtunnel"). > Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Acked-by: Jesse Gross <jesse@kernel.org>
On 10 December 2015 at 14:19, Pravin B Shelar <pshelar@nicira.com> wrote: > STT reassembly can generate list of packets. But it was > handled as a single skb. Following patch fixes it. > > Fixes: e23775f20 ("datapath: Add support for lwtunnel"). > Signed-off-by: Pravin B Shelar <pshelar@nicira.com> > --- > datapath/linux/compat/stt.c | 28 ++++++++++++++++++++++------ > 1 file changed, 22 insertions(+), 6 deletions(-) > > diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c > index 107aa2b..08cf11a 100644 > --- a/datapath/linux/compat/stt.c > +++ b/datapath/linux/compat/stt.c > @@ -1286,8 +1286,24 @@ static bool set_offloads(struct sk_buff *skb) > return true; > } > > +void rcv_list(struct net_device *dev, struct sk_buff *skb, > + struct metadata_dst *tun_dst) Minor nit, I guess this could be static too. Thanks, Travis seems happy, I also compiled on rhel71. Some basic traffic tests are also positive. https://travis-ci.org/joestringer/openvswitch/builds/96140433 Acked-by: Joe Stringer <joe@ovn.org>
On Thu, Dec 10, 2015 at 6:44 PM, Joe Stringer <joe@ovn.org> wrote: > On 10 December 2015 at 14:19, Pravin B Shelar <pshelar@nicira.com> wrote: >> STT reassembly can generate list of packets. But it was >> handled as a single skb. Following patch fixes it. >> >> Fixes: e23775f20 ("datapath: Add support for lwtunnel"). >> Signed-off-by: Pravin B Shelar <pshelar@nicira.com> >> --- >> datapath/linux/compat/stt.c | 28 ++++++++++++++++++++++------ >> 1 file changed, 22 insertions(+), 6 deletions(-) >> >> diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c >> index 107aa2b..08cf11a 100644 >> --- a/datapath/linux/compat/stt.c >> +++ b/datapath/linux/compat/stt.c >> @@ -1286,8 +1286,24 @@ static bool set_offloads(struct sk_buff *skb) >> return true; >> } >> >> +void rcv_list(struct net_device *dev, struct sk_buff *skb, >> + struct metadata_dst *tun_dst) > > Minor nit, I guess this could be static too. > I made the change. > Thanks, Travis seems happy, I also compiled on rhel71. Some basic > traffic tests are also positive. > https://travis-ci.org/joestringer/openvswitch/builds/96140433 > > Acked-by: Joe Stringer <joe@ovn.org> Thanks for reviews, I pushed patch to master and branch 2.5.
diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c index 107aa2b..08cf11a 100644 --- a/datapath/linux/compat/stt.c +++ b/datapath/linux/compat/stt.c @@ -1286,8 +1286,24 @@ static bool set_offloads(struct sk_buff *skb) return true; } +void rcv_list(struct net_device *dev, struct sk_buff *skb, + struct metadata_dst *tun_dst) +{ + struct sk_buff *next; + + do { + next = skb->next; + skb->next = NULL; + if (next) { + ovs_dst_hold((struct dst_entry *)tun_dst); + ovs_skb_dst_set(next, (struct dst_entry *)tun_dst); + } + ovs_ip_tunnel_rcv(dev, skb, tun_dst); + } while ((skb = next)); +} + #ifndef HAVE_METADATA_DST -static int __rcv(struct stt_dev *stt_dev, struct sk_buff *skb) +static int __stt_rcv(struct stt_dev *stt_dev, struct sk_buff *skb) { struct metadata_dst tun_dst; @@ -1296,11 +1312,11 @@ static int __rcv(struct stt_dev *stt_dev, struct sk_buff *skb) tun_dst.u.tun_info.key.tp_src = tcp_hdr(skb)->source; tun_dst.u.tun_info.key.tp_dst = tcp_hdr(skb)->dest; - ovs_ip_tunnel_rcv(stt_dev->dev, skb, &tun_dst); + rcv_list(stt_dev->dev, skb, &tun_dst); return 0; } #else -static int __rcv(struct stt_dev *stt_dev, struct sk_buff *skb) +static int __stt_rcv(struct stt_dev *stt_dev, struct sk_buff *skb) { struct metadata_dst *tun_dst; __be16 flags; @@ -1314,11 +1330,11 @@ static int __rcv(struct stt_dev *stt_dev, struct sk_buff *skb) tun_dst->u.tun_info.key.tp_src = tcp_hdr(skb)->source; tun_dst->u.tun_info.key.tp_dst = tcp_hdr(skb)->dest; - ovs_ip_tunnel_rcv(stt_dev->dev, skb, tun_dst); + rcv_list(stt_dev->dev, skb, tun_dst); return 0; } - #endif + static void stt_rcv(struct stt_dev *stt_dev, struct sk_buff *skb) { int err; @@ -1348,7 +1364,7 @@ static void stt_rcv(struct stt_dev *stt_dev, struct sk_buff *skb) if (skb_shinfo(skb)->frag_list && try_to_segment(skb)) goto drop; - err = __rcv(stt_dev, skb); + err = __stt_rcv(stt_dev, skb); if (err) goto drop; return;
STT reassembly can generate list of packets. But it was handled as a single skb. Following patch fixes it. Fixes: e23775f20 ("datapath: Add support for lwtunnel"). Signed-off-by: Pravin B Shelar <pshelar@nicira.com> --- datapath/linux/compat/stt.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)