Re: [PATCH v2 1/1] net: geneve: accept every ethertype

[Eyal Birger]

On Mon, Feb 27, 2023 at 10:14 AM Josef Miegl <josef@xxxxxxxx> wrote:
>
> This patch removes a restriction that prohibited receiving encapsulated
> ethertypes other than IPv4, IPv6 and Ethernet.
>
> With IFLA_GENEVE_INNER_PROTO_INHERIT flag set, GENEVE interface can now
> receive ethertypes such as MPLS.
>
> Signed-off-by: Josef Miegl <josef@xxxxxxxx>
> ---
>  drivers/net/geneve.c | 15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
> index 89ff7f8e8c7e..7973659a891f 100644
> --- a/drivers/net/geneve.c
> +++ b/drivers/net/geneve.c
> @@ -353,7 +353,6 @@ static int geneve_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
>         struct genevehdr *geneveh;
>         struct geneve_dev *geneve;
>         struct geneve_sock *gs;
> -       __be16 inner_proto;

nit: why remove the variable? - it's still used in two places and this
change just makes the patch longer.

>         int opts_len;
>
>         /* Need UDP and Geneve header to be present */
> @@ -365,13 +364,6 @@ static int geneve_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
>         if (unlikely(geneveh->ver != GENEVE_VER))
>                 goto drop;
>
> -       inner_proto = geneveh->proto_type;
> -
> -       if (unlikely((inner_proto != htons(ETH_P_TEB) &&
> -                     inner_proto != htons(ETH_P_IP) &&
> -                     inner_proto != htons(ETH_P_IPV6))))
> -               goto drop;
> -
>         gs = rcu_dereference_sk_user_data(sk);
>         if (!gs)
>                 goto drop;
> @@ -381,14 +373,15 @@ static int geneve_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
>                 goto drop;
>
>         if (unlikely((!geneve->cfg.inner_proto_inherit &&
> -                     inner_proto != htons(ETH_P_TEB)))) {
> +                     geneveh->proto_type != htons(ETH_P_TEB)))) {
>                 geneve->dev->stats.rx_dropped++;
>                 goto drop;
>         }
>
>         opts_len = geneveh->opt_len * 4;
> -       if (iptunnel_pull_header(skb, GENEVE_BASE_HLEN + opts_len, inner_proto,
> -                                !net_eq(geneve->net, dev_net(geneve->dev)))) {
> +       if (iptunnel_pull_header(skb, GENEVE_BASE_HLEN + opts_len,
> +                                geneveh->proto_type, !net_eq(geneve->net,
> +                                dev_net(geneve->dev)))) {
>                 geneve->dev->stats.rx_dropped++;
>                 goto drop;
>         }
> --
> 2.37.1
>