| Message ID | 1440453891-214878-2-git-send-email-anjali.singhai@intel.com |
|---|---|
| State | RFC |
| Headers | show |
On Mon, Aug 24, 2015 at 3:04 PM, Anjali Singhai Jain <anjali.singhai@intel.com> wrote: > Add ndo_ops to add/del UDP ports to a device that supports geneve > offload. > > v2:Added comments for new ndo_ops and minor format fix. > > Signed-off-by: Kiran Patil <kiran.patil@intel.com> > Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> I'm a little confused - what happened to the comments on this patch and patch 4?
Sorry my bad. I meant to send the patch series to Netdev for further review feedback as you had suggested in the mean while but ended up resending here. V2 of the patches are on the way with your feedback. Thanks Anjali > -----Original Message----- > From: Jesse Gross [mailto:jesse@nicira.com] > Sent: Monday, August 24, 2015 4:00 PM > To: Singhai, Anjali > Cc: intel-wired-lan > Subject: Re: [Intel-wired-lan] [RFC v1 2/4] geneve: Add geneve udp port > offload for ethernet devices > > On Mon, Aug 24, 2015 at 3:04 PM, Anjali Singhai Jain > <anjali.singhai@intel.com> wrote: > > Add ndo_ops to add/del UDP ports to a device that supports geneve > > offload. > > > > v2:Added comments for new ndo_ops and minor format fix. > > > > Signed-off-by: Kiran Patil <kiran.patil@intel.com> > > Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> > > I'm a little confused - what happened to the comments on this patch and > patch 4?
Thanks! On Mon, Aug 24, 2015 at 4:03 PM, Singhai, Anjali <anjali.singhai@intel.com> wrote: > Sorry my bad. I meant to send the patch series to Netdev for further review feedback as you had suggested in the mean while but ended up resending here. > V2 of the patches are on the way with your feedback. > > Thanks > Anjali > >> -----Original Message----- >> From: Jesse Gross [mailto:jesse@nicira.com] >> Sent: Monday, August 24, 2015 4:00 PM >> To: Singhai, Anjali >> Cc: intel-wired-lan >> Subject: Re: [Intel-wired-lan] [RFC v1 2/4] geneve: Add geneve udp port >> offload for ethernet devices >> >> On Mon, Aug 24, 2015 at 3:04 PM, Anjali Singhai Jain >> <anjali.singhai@intel.com> wrote: >> > Add ndo_ops to add/del UDP ports to a device that supports geneve >> > offload. >> > >> > v2:Added comments for new ndo_ops and minor format fix. >> > >> > Signed-off-by: Kiran Patil <kiran.patil@intel.com> >> > Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> >> >> I'm a little confused - what happened to the comments on this patch and >> patch 4?
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f3bb290..d6f00c7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1016,6 +1016,19 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, * address family that vxlan is not listening to anymore. The operation * is protected by the vxlan_net->sock_lock. * + * void (*ndo_add_geneve_port)(struct net_device *dev, + * sa_family_t sa_family, __be16 port); + * Called by geneve to notiy a driver about the UDP port and socket + * address family that geneve is listnening to. It is called only when + * a new port starts listening. The operation is protected by the + * geneve_net->sock_lock. + * + * void (*ndo_del_geneve_port)(struct net_device *dev, + * sa_family_t sa_family, __be16 port); + * Called by geneve to notify the driver about a UDP port and socket + * address family that geneve is not listening to anymore. The operation + * is protected by the geneve_net->sock_lock. + * * void* (*ndo_dfwd_add_station)(struct net_device *pdev, * struct net_device *dev) * Called by upper layer devices to accelerate switching or other @@ -1210,7 +1223,12 @@ struct net_device_ops { void (*ndo_del_vxlan_port)(struct net_device *dev, sa_family_t sa_family, __be16 port); - + void (*ndo_add_geneve_port)(struct net_device *dev, + sa_family_t sa_family, + __be16 port); + void (*ndo_del_geneve_port)(struct net_device *dev, + sa_family_t sa_family, + __be16 port); void* (*ndo_dfwd_add_station)(struct net_device *pdev, struct net_device *dev); void (*ndo_dfwd_del_station)(struct net_device *pdev, diff --git a/net/ipv4/geneve_core.c b/net/ipv4/geneve_core.c index 311a4ba..9ea9082 100644 --- a/net/ipv4/geneve_core.c +++ b/net/ipv4/geneve_core.c @@ -234,8 +234,11 @@ static int geneve_gro_complete(struct sk_buff *skb, int nhoff, static void geneve_notify_add_rx_port(struct geneve_sock *gs) { + struct net_device *dev; struct sock *sk = gs->sock->sk; + struct net *net = sock_net(sk); sa_family_t sa_family = sk->sk_family; + __be16 port = inet_sk(sk)->inet_sport; int err; if (sa_family == AF_INET) { @@ -244,12 +247,31 @@ static void geneve_notify_add_rx_port(struct geneve_sock *gs) pr_warn("geneve: udp_add_offload failed with status %d\n", err); } + + rcu_read_lock(); + for_each_netdev_rcu(net, dev) { + if (dev->netdev_ops->ndo_add_geneve_port) + dev->netdev_ops->ndo_add_geneve_port(dev, sa_family, + port); + } + rcu_read_unlock(); } static void geneve_notify_del_rx_port(struct geneve_sock *gs) { + struct net_device *dev; struct sock *sk = gs->sock->sk; + struct net *net = sock_net(sk); sa_family_t sa_family = sk->sk_family; + __be16 port = inet_sk(sk)->inet_sport; + + rcu_read_lock(); + for_each_netdev_rcu(net, dev) { + if (dev->netdev_ops->ndo_del_geneve_port) + dev->netdev_ops->ndo_del_geneve_port(dev, sa_family, + port); + } + rcu_read_unlock(); if (sa_family == AF_INET) udp_del_offload(&gs->udp_offloads);