* [PATCH net-next] openvswitch: Introduce vport_route_lookup
@ 2015-01-12 9:14 Fan Du
2015-01-12 22:31 ` Pravin Shelar
2015-01-13 2:41 ` [PATCHv2 net-next] openvswitch: Introduce ovs_tunnel_route_lookup Fan Du
0 siblings, 2 replies; 4+ messages in thread
From: Fan Du @ 2015-01-12 9:14 UTC (permalink / raw)
To: pshelar; +Cc: dev, netdev, fengyuleidian0615
Introduce vport_route_lookup to consolidate route lookup
shared by vxlan, gre, and geneve ports.
Signed-off-by: Fan Du <fan.du@intel.com>
---
net/openvswitch/vport-geneve.c | 11 +----------
net/openvswitch/vport-gre.c | 10 +---------
net/openvswitch/vport-vxlan.c | 10 +---------
net/openvswitch/vport.c | 20 ++++++++++++++++++++
net/openvswitch/vport.h | 6 ++++++
5 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index 484864d..8eef7f6 100644
--- a/net/openvswitch/vport-geneve.c
+++ b/net/openvswitch/vport-geneve.c
@@ -191,16 +191,7 @@ static int geneve_tnl_send(struct vport *vport, struct sk_buff *skb)
}
tun_key = &tun_info->tunnel;
-
- /* Route lookup */
- memset(&fl, 0, sizeof(fl));
- fl.daddr = tun_key->ipv4_dst;
- fl.saddr = tun_key->ipv4_src;
- fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
- fl.flowi4_mark = skb->mark;
- fl.flowi4_proto = IPPROTO_UDP;
-
- rt = ip_route_output_key(net, &fl);
+ rt = vport_route_lookup(tun_key, skb, &fl, net, IPPROTO_UDP);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
goto error;
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index d4168c4..2f8fdbe 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -148,15 +148,7 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb)
}
tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
- /* Route lookup */
- memset(&fl, 0, sizeof(fl));
- fl.daddr = tun_key->ipv4_dst;
- fl.saddr = tun_key->ipv4_src;
- fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
- fl.flowi4_mark = skb->mark;
- fl.flowi4_proto = IPPROTO_GRE;
-
- rt = ip_route_output_key(net, &fl);
+ rt = vport_route_lookup(tun_key, skb, &fl, net, IPPROTO_GRE);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
goto err_free_skb;
diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c
index d7c46b3..13a64ae 100644
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@ -158,15 +158,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
}
tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
- /* Route lookup */
- memset(&fl, 0, sizeof(fl));
- fl.daddr = tun_key->ipv4_dst;
- fl.saddr = tun_key->ipv4_src;
- fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
- fl.flowi4_mark = skb->mark;
- fl.flowi4_proto = IPPROTO_UDP;
-
- rt = ip_route_output_key(net, &fl);
+ rt = vport_route_lookup(tun_key, skb, &fl, net, IPPROTO_UDP);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
goto error;
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 2034c6d..32b0edf 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -633,3 +633,23 @@ int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
return vport->ops->get_egress_tun_info(vport, skb, info);
}
+
+struct rtable *vport_route_lookup(struct ovs_key_ipv4_tunnel *tun_key,
+ struct sk_buff *skb,
+ struct flowi4 *fl,
+ struct net *net,
+ u8 protocol)
+{
+ struct rtable *rt;
+
+ memset(fl, 0, sizeof(*fl));
+ fl->daddr = tun_key->ipv4_dst;
+ fl->saddr = tun_key->ipv4_src;
+ fl->flowi4_tos = RT_TOS(tun_key->ipv4_tos);
+ fl->flowi4_mark = skb->mark;
+ fl->flowi4_proto = protocol;
+
+ rt = ip_route_output_key(net, fl);
+ return rt;
+}
+EXPORT_SYMBOL_GPL(vport_route_lookup);
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 99c8e71..4487a97 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -68,6 +68,12 @@ int ovs_tunnel_get_egress_info(struct ovs_tunnel_info *egress_tun_info,
int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
struct ovs_tunnel_info *info);
+struct rtable *vport_route_lookup(struct ovs_key_ipv4_tunnel *tun_key,
+ struct sk_buff *skb,
+ struct flowi4 *fl,
+ struct net *net,
+ u8 protocol);
+
/* The following definitions are for implementers of vport devices: */
struct vport_err_stats {
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] openvswitch: Introduce vport_route_lookup
2015-01-12 9:14 [PATCH net-next] openvswitch: Introduce vport_route_lookup Fan Du
@ 2015-01-12 22:31 ` Pravin Shelar
2015-01-13 2:41 ` [PATCHv2 net-next] openvswitch: Introduce ovs_tunnel_route_lookup Fan Du
1 sibling, 0 replies; 4+ messages in thread
From: Pravin Shelar @ 2015-01-12 22:31 UTC (permalink / raw)
To: Fan Du; +Cc: dev@openvswitch.org, netdev, fengyuleidian0615
On Mon, Jan 12, 2015 at 1:14 AM, Fan Du <fan.du@intel.com> wrote:
> Introduce vport_route_lookup to consolidate route lookup
> shared by vxlan, gre, and geneve ports.
>
> Signed-off-by: Fan Du <fan.du@intel.com>
> ---
...
> }
> +
> +struct rtable *vport_route_lookup(struct ovs_key_ipv4_tunnel *tun_key,
> + struct sk_buff *skb,
> + struct flowi4 *fl,
> + struct net *net,
> + u8 protocol)
> +{
> + struct rtable *rt;
> +
> + memset(fl, 0, sizeof(*fl));
> + fl->daddr = tun_key->ipv4_dst;
> + fl->saddr = tun_key->ipv4_src;
> + fl->flowi4_tos = RT_TOS(tun_key->ipv4_tos);
> + fl->flowi4_mark = skb->mark;
> + fl->flowi4_proto = protocol;
> +
> + rt = ip_route_output_key(net, fl);
> + return rt;
> +}
> +EXPORT_SYMBOL_GPL(vport_route_lookup);
This is small function and it is in fast path, So can you inline it?
> diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
> index 99c8e71..4487a97 100644
> --- a/net/openvswitch/vport.h
> +++ b/net/openvswitch/vport.h
> @@ -68,6 +68,12 @@ int ovs_tunnel_get_egress_info(struct ovs_tunnel_info *egress_tun_info,
> int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
> struct ovs_tunnel_info *info);
>
> +struct rtable *vport_route_lookup(struct ovs_key_ipv4_tunnel *tun_key,
> + struct sk_buff *skb,
> + struct flowi4 *fl,
> + struct net *net,
> + u8 protocol);
> +
> /* The following definitions are for implementers of vport devices: */
>
Generally net is first parameter for networking functions.
Tunnel is better prefix rather than vport for the function name.
You can use new function in ovs_tunnel_get_egress_info().
> struct vport_err_stats {
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCHv2 net-next] openvswitch: Introduce ovs_tunnel_route_lookup
2015-01-12 9:14 [PATCH net-next] openvswitch: Introduce vport_route_lookup Fan Du
2015-01-12 22:31 ` Pravin Shelar
@ 2015-01-13 2:41 ` Fan Du
2015-01-13 5:52 ` Pravin Shelar
1 sibling, 1 reply; 4+ messages in thread
From: Fan Du @ 2015-01-13 2:41 UTC (permalink / raw)
To: pshelar; +Cc: dev, netdev, fengyuleidian0615
Introduce ovs_tunnel_route_lookup to consolidate route lookup
shared by vxlan, gre, and geneve ports.
Signed-off-by: Fan Du <fan.du@intel.com>
---
Chnage log:
v2:
- Use inline instead of function call
- Rename vport_route_lookup to ovs_tunnel_route_lookup
---
net/openvswitch/vport-geneve.c | 11 +----------
net/openvswitch/vport-gre.c | 10 +---------
net/openvswitch/vport-vxlan.c | 10 +---------
net/openvswitch/vport.h | 18 ++++++++++++++++++
4 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
index 484864d..0953c9f 100644
--- a/net/openvswitch/vport-geneve.c
+++ b/net/openvswitch/vport-geneve.c
@@ -191,16 +191,7 @@ static int geneve_tnl_send(struct vport *vport, struct sk_buff *skb)
}
tun_key = &tun_info->tunnel;
-
- /* Route lookup */
- memset(&fl, 0, sizeof(fl));
- fl.daddr = tun_key->ipv4_dst;
- fl.saddr = tun_key->ipv4_src;
- fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
- fl.flowi4_mark = skb->mark;
- fl.flowi4_proto = IPPROTO_UDP;
-
- rt = ip_route_output_key(net, &fl);
+ rt = ovs_tunnel_route_lookup(net, tun_key, skb, &fl, IPPROTO_UDP);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
goto error;
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index d4168c4..3171e03 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -148,15 +148,7 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb)
}
tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
- /* Route lookup */
- memset(&fl, 0, sizeof(fl));
- fl.daddr = tun_key->ipv4_dst;
- fl.saddr = tun_key->ipv4_src;
- fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
- fl.flowi4_mark = skb->mark;
- fl.flowi4_proto = IPPROTO_GRE;
-
- rt = ip_route_output_key(net, &fl);
+ rt = ovs_tunnel_route_lookup(net, tun_key, skb, &fl, IPPROTO_GRE);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
goto err_free_skb;
diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c
index d7c46b3..1528090 100644
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@ -158,15 +158,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
}
tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
- /* Route lookup */
- memset(&fl, 0, sizeof(fl));
- fl.daddr = tun_key->ipv4_dst;
- fl.saddr = tun_key->ipv4_src;
- fl.flowi4_tos = RT_TOS(tun_key->ipv4_tos);
- fl.flowi4_mark = skb->mark;
- fl.flowi4_proto = IPPROTO_UDP;
-
- rt = ip_route_output_key(net, &fl);
+ rt = ovs_tunnel_route_lookup(net, tun_key, skb, &fl, IPPROTO_UDP);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
goto error;
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 99c8e71..7b97661 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -236,4 +236,22 @@ static inline void ovs_skb_postpush_rcsum(struct sk_buff *skb,
int ovs_vport_ops_register(struct vport_ops *ops);
void ovs_vport_ops_unregister(struct vport_ops *ops);
+static inline struct rtable *ovs_tunnel_route_lookup(struct net *net,
+ struct ovs_key_ipv4_tunnel *key,
+ struct sk_buff *skb,
+ struct flowi4 *fl,
+ u8 protocol)
+{
+ struct rtable *rt;
+
+ memset(fl, 0, sizeof(*fl));
+ fl->daddr = key->ipv4_dst;
+ fl->saddr = key->ipv4_src;
+ fl->flowi4_tos = RT_TOS(key->ipv4_tos);
+ fl->flowi4_mark = skb->mark;
+ fl->flowi4_proto = protocol;
+
+ rt = ip_route_output_key(net, fl);
+ return rt;
+}
#endif /* vport.h */
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCHv2 net-next] openvswitch: Introduce ovs_tunnel_route_lookup
2015-01-13 2:41 ` [PATCHv2 net-next] openvswitch: Introduce ovs_tunnel_route_lookup Fan Du
@ 2015-01-13 5:52 ` Pravin Shelar
0 siblings, 0 replies; 4+ messages in thread
From: Pravin Shelar @ 2015-01-13 5:52 UTC (permalink / raw)
To: Fan Du; +Cc: dev@openvswitch.org, netdev, fengyuleidian0615
On Mon, Jan 12, 2015 at 6:41 PM, Fan Du <fan.du@intel.com> wrote:
> Introduce ovs_tunnel_route_lookup to consolidate route lookup
> shared by vxlan, gre, and geneve ports.
>
> Signed-off-by: Fan Du <fan.du@intel.com>
> ---
> Chnage log:
> v2:
> - Use inline instead of function call
> - Rename vport_route_lookup to ovs_tunnel_route_lookup
> ---
> net/openvswitch/vport-geneve.c | 11 +----------
> net/openvswitch/vport-gre.c | 10 +---------
> net/openvswitch/vport-vxlan.c | 10 +---------
> net/openvswitch/vport.h | 18 ++++++++++++++++++
> 4 files changed, 21 insertions(+), 28 deletions(-)
>
....
> +static inline struct rtable *ovs_tunnel_route_lookup(struct net *net,
> + struct ovs_key_ipv4_tunnel *key,
> + struct sk_buff *skb,
> + struct flowi4 *fl,
> + u8 protocol)
> +{
> + struct rtable *rt;
> +
> + memset(fl, 0, sizeof(*fl));
> + fl->daddr = key->ipv4_dst;
> + fl->saddr = key->ipv4_src;
> + fl->flowi4_tos = RT_TOS(key->ipv4_tos);
> + fl->flowi4_mark = skb->mark;
> + fl->flowi4_proto = protocol;
> +
> + rt = ip_route_output_key(net, fl);
> + return rt;
> +}
ovs_tunnel_get_egress_info() is also directly calling ip_route_output_key()
> #endif /* vport.h */
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-13 5:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-12 9:14 [PATCH net-next] openvswitch: Introduce vport_route_lookup Fan Du
2015-01-12 22:31 ` Pravin Shelar
2015-01-13 2:41 ` [PATCHv2 net-next] openvswitch: Introduce ovs_tunnel_route_lookup Fan Du
2015-01-13 5:52 ` Pravin Shelar
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).