On Mon, Oct 17, 2016 at 6:02 AM, Jiri Benc <jb...@redhat.com> wrote:
> Support receiving, extracting flow key and sending of L3 packets (packets
> without an Ethernet header).
>
> Note that even after this patch, non-Ethernet interfaces are still not
> allowed to be added to bridges. Similarly, netlink interface for sending and
> receiving L3 packets to/from user space is not in place yet.
>
> Based on previous versions by Lorand Jakab and Simon Horman.
>
> Signed-off-by: Lorand Jakab <loja...@cisco.com>
> Signed-off-by: Simon Horman <simon.hor...@netronome.com>
> Signed-off-by: Jiri Benc <jb...@redhat.com>
> ---
> net/openvswitch/datapath.c | 17 ++------
> net/openvswitch/flow.c | 101
> ++++++++++++++++++++++++++++++++++-----------
> net/openvswitch/vport.c | 16 +++++++
> 3 files changed, 96 insertions(+), 38 deletions(-)
>
> diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
> index 4d67ea856067..c5b719fca8d4 100644
> --- a/net/openvswitch/datapath.c
> +++ b/net/openvswitch/datapath.c
...
...
> @@ -609,8 +597,10 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb,
> struct genl_info *info)
>
> err = ovs_flow_key_extract_userspace(net, a[OVS_PACKET_ATTR_KEY],
> packet, &flow->key, log);
> - if (err)
> + if (err) {
> + packet = NULL;
> goto err_flow_free;
> + }
>
Why packet is set to NULL? This would leak skb memory in case of error.
> err = ovs_nla_copy_actions(net, a[OVS_PACKET_ATTR_ACTIONS],
> &flow->key, &acts, log);
...
> diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
> index 96c8c4716603..7aee6e273765 100644
> --- a/net/openvswitch/flow.c
> +++ b/net/openvswitch/flow.c
...
> @@ -721,6 +734,20 @@ int ovs_flow_key_update(struct sk_buff *skb, struct
> sw_flow_key *key)
> return key_extract(skb, key);
> }
>
> +static u8 key_extract_mac_proto(struct sk_buff *skb)
> +{
> + switch (skb->dev->type) {
> + case ARPHRD_ETHER:
> + return MAC_PROTO_ETHERNET;
> + case ARPHRD_NONE:
> + if (skb->protocol == htons(ETH_P_TEB))
> + return MAC_PROTO_ETHERNET;
> + return MAC_PROTO_NONE;
> + }
> + WARN_ON_ONCE(1);
> + return MAC_PROTO_ETHERNET;
This packet should be dropped.
> +}
> +
> int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
> struct sk_buff *skb, struct sw_flow_key *key)
> {
....
> diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
> index dc0e2212edfc..8361b62a47c2 100644
> --- a/net/openvswitch/vport.c
> +++ b/net/openvswitch/vport.c
> @@ -502,6 +502,22 @@ void ovs_vport_send(struct vport *vport, struct sk_buff
> *skb, u8 mac_proto)
> {
> int mtu = vport->dev->mtu;
>
> + switch (vport->dev->type) {
> + case ARPHRD_NONE:
> + if (mac_proto != MAC_PROTO_NONE) {
> + WARN_ON_ONCE(mac_proto != MAC_PROTO_ETHERNET);
> +
It would be easy to read if you check mac_proto for MAC_PROTO_ETHERNET
and then warn otherwise.
another issue is the packet is not dropped if mac_proto is not
MAC_PROTO_ETHERNET
> + skb_reset_network_header(skb);
> + skb_reset_mac_len(skb);
> + skb->protocol = htons(ETH_P_TEB);
> + }
> + break;
> + case ARPHRD_ETHER:
> + if (mac_proto != MAC_PROTO_ETHERNET)
> + goto drop;
> + break;
> + }
> +
> if (unlikely(packet_length(skb, vport->dev) > mtu &&
> !skb_is_gso(skb))) {
> net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n",
> --
> 1.8.3.1
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
