openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

openvswitch: Remove egress_tun_info. 

tun info is passed using skb-dst pointer. Now we have
converted all vports to netdev based implementation so
Now we can remove redundant pointer to tun-info from OVS_CB.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pravin B Shelar 2015-08-29 17:44:06 -07:00 committed by David S. Miller
parent 24d43f32d8
commit 3eedb41fb4
8 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/openvswitch/actions.c
View File

@ -896,10 +896,6 @@ static int execute_set_action(struct sk_buff *skb,
skb_dst_drop(skb); skb_dst_drop(skb);
dst_hold((struct dst_entry *)tun->tun_dst); dst_hold((struct dst_entry *)tun->tun_dst);
skb_dst_set(skb, (struct dst_entry *)tun->tun_dst); skb_dst_set(skb, (struct dst_entry *)tun->tun_dst);
/* FIXME: Remove when all vports have been converted */
OVS_CB(skb)->egress_tun_info = &tun->tun_dst->u.tun_info;
return 0; return 0;
} }
@ -1159,7 +1155,6 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
int err; int err;
this_cpu_inc(exec_actions_level); this_cpu_inc(exec_actions_level);
OVS_CB(skb)->egress_tun_info = NULL;
err = do_execute_actions(dp, skb, key, err = do_execute_actions(dp, skb, key,
acts->actions, acts->actions_len); acts->actions, acts->actions_len);

1
net/openvswitch/datapath.c
View File

@ -610,7 +610,6 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
goto err_flow_free; goto err_flow_free;
rcu_assign_pointer(flow->sf_acts, acts); rcu_assign_pointer(flow->sf_acts, acts);
OVS_CB(packet)->egress_tun_info = NULL;
packet->priority = flow->key.phy.priority; packet->priority = flow->key.phy.priority;
packet->mark = flow->key.phy.skb_mark; packet->mark = flow->key.phy.skb_mark;

3
net/openvswitch/datapath.h
View File

@ -94,15 +94,12 @@ struct datapath {
/** /**
* struct ovs_skb_cb - OVS data in skb CB * struct ovs_skb_cb - OVS data in skb CB
* @egress_tun_key: Tunnel information about this packet on egress path.
* NULL if the packet is not being tunneled.
* @input_vport: The original vport packet came in on. This value is cached * @input_vport: The original vport packet came in on. This value is cached
* when a packet is received by OVS. * when a packet is received by OVS.
* @mru: The maximum received fragement size; 0 if the packet is not * @mru: The maximum received fragement size; 0 if the packet is not
* fragmented. * fragmented.
*/ */
struct ovs_skb_cb { struct ovs_skb_cb {
struct ip_tunnel_info *egress_tun_info;
struct vport *input_vport; struct vport *input_vport;
u16 mru; u16 mru;
}; };

3
net/openvswitch/vport-geneve.c
View File

@ -62,8 +62,7 @@ static int geneve_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
return ovs_tunnel_get_egress_info(egress_tun_info, return ovs_tunnel_get_egress_info(egress_tun_info,
ovs_dp_get_net(vport->dp), ovs_dp_get_net(vport->dp),
OVS_CB(skb)->egress_tun_info, skb, IPPROTO_UDP, sport, dport);
IPPROTO_UDP, skb->mark, sport, dport);
} }
static struct vport *geneve_tnl_create(const struct vport_parms *parms) static struct vport *geneve_tnl_create(const struct vport_parms *parms)

3
net/openvswitch/vport-gre.c
View File

@ -89,8 +89,7 @@ static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
{ {
return ovs_tunnel_get_egress_info(egress_tun_info, return ovs_tunnel_get_egress_info(egress_tun_info,
ovs_dp_get_net(vport->dp), ovs_dp_get_net(vport->dp),
OVS_CB(skb)->egress_tun_info, skb, IPPROTO_GRE, 0, 0);
IPPROTO_GRE, skb->mark, 0, 0);
} }
static struct vport_ops ovs_gre_vport_ops = { static struct vport_ops ovs_gre_vport_ops = {

3
net/openvswitch/vport-vxlan.c
View File

@ -160,8 +160,7 @@ static int vxlan_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
src_port = udp_flow_src_port(net, skb, 0, 0, true); src_port = udp_flow_src_port(net, skb, 0, 0, true);
return ovs_tunnel_get_egress_info(egress_tun_info, net, return ovs_tunnel_get_egress_info(egress_tun_info, net,
OVS_CB(skb)->egress_tun_info, skb, IPPROTO_UDP,
IPPROTO_UDP, skb->mark,
src_port, dst_port); src_port, dst_port);
} }

6
net/openvswitch/vport.c
View File

@ -483,7 +483,6 @@ void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
u64_stats_update_end(&stats->syncp); u64_stats_update_end(&stats->syncp);
OVS_CB(skb)->input_vport = vport; OVS_CB(skb)->input_vport = vport;
OVS_CB(skb)->egress_tun_info = NULL;
OVS_CB(skb)->mru = 0; OVS_CB(skb)->mru = 0;
/* Extract flow from 'skb' into 'key'. */ /* Extract flow from 'skb' into 'key'. */
error = ovs_flow_key_extract(tun_info, skb, &key); error = ovs_flow_key_extract(tun_info, skb, &key);
@ -575,13 +574,14 @@ EXPORT_SYMBOL_GPL(ovs_vport_deferred_free);
int ovs_tunnel_get_egress_info(struct ip_tunnel_info *egress_tun_info, int ovs_tunnel_get_egress_info(struct ip_tunnel_info *egress_tun_info,
struct net *net, struct net *net,
const struct ip_tunnel_info *tun_info, struct sk_buff *skb,
u8 ipproto, u8 ipproto,
u32 skb_mark,
__be16 tp_src, __be16 tp_src,
__be16 tp_dst) __be16 tp_dst)
{ {
const struct ip_tunnel_info *tun_info = skb_tunnel_info(skb);
const struct ip_tunnel_key *tun_key; const struct ip_tunnel_key *tun_key;
u32 skb_mark = skb->mark;
struct rtable *rt; struct rtable *rt;
struct flowi4 fl; struct flowi4 fl;

3
net/openvswitch/vport.h
View File

@ -61,9 +61,8 @@ int ovs_vport_send(struct vport *, struct sk_buff *);
int ovs_tunnel_get_egress_info(struct ip_tunnel_info *egress_tun_info, int ovs_tunnel_get_egress_info(struct ip_tunnel_info *egress_tun_info,
struct net *net, struct net *net,
const struct ip_tunnel_info *tun_info, struct sk_buff *,
u8 ipproto, u8 ipproto,
u32 skb_mark,
__be16 tp_src, __be16 tp_src,
__be16 tp_dst); __be16 tp_dst);
int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,