From: Martin <martin.varghese@nokia.com>
Date: Sun, 28 Jun 2020 23:18:23 +0530
Subject: bareudp: Added attribute to enable & disable rx metadata collection
Patch-mainline: v5.9-rc1
Git-commit: fe80536acf8397827be77f9b8ada384b90e790d0
References: jsc#SLE-15172
Metadata need not be collected in receive if the packet from bareudp
device is not targeted to openvswitch.
Signed-off-by: Martin <martin.varghese@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
Documentation/networking/bareudp.rst | 6 ++++--
drivers/net/bareudp.c | 23 +++++++++++++++++------
include/net/bareudp.h | 1 +
include/uapi/linux/if_link.h | 1 +
4 files changed, 23 insertions(+), 8 deletions(-)
--- a/Documentation/networking/bareudp.rst
+++ b/Documentation/networking/bareudp.rst
@@ -47,5 +47,7 @@ enabled.
The bareudp device could be used along with OVS or flower filter in TC.
The OVS or TC flower layer must set the tunnel information in SKB dst field before
sending packet buffer to the bareudp device for transmission. On reception the
-bareudp device extracts and stores the tunnel information in SKB dst field before
-passing the packet buffer to the network stack.
+bareudp device decapsulates the udp header and passes the inner packet to the
+network stack. If RX_COLLECT_METADATA flag is enabled in the device the tunnel
+information will be stored in the SKB dst field before the packet buffer is
+passed to the network stack.
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -46,6 +46,7 @@ struct bareudp_dev {
__be16 port;
u16 sport_min;
bool multi_proto_mode;
+ bool rx_collect_metadata;
struct socket __rcu *sock;
struct list_head next; /* bareudp node on namespace list */
struct gro_cells gro_cells;
@@ -125,13 +126,14 @@ static int bareudp_udp_encap_recv(struct
bareudp->dev->stats.rx_dropped++;
goto drop;
}
-
- tun_dst = udp_tun_rx_dst(skb, family, TUNNEL_KEY, 0, 0);
- if (!tun_dst) {
- bareudp->dev->stats.rx_dropped++;
- goto drop;
+ if (bareudp->rx_collect_metadata) {
+ tun_dst = udp_tun_rx_dst(skb, family, TUNNEL_KEY, 0, 0);
+ if (!tun_dst) {
+ bareudp->dev->stats.rx_dropped++;
+ goto drop;
+ }
+ skb_dst_set(skb, &tun_dst->dst);
}
- skb_dst_set(skb, &tun_dst->dst);
skb->dev = bareudp->dev;
oiph = skb_network_header(skb);
skb_reset_network_header(skb);
@@ -590,6 +592,9 @@ static int bareudp2info(struct nlattr *d
if (data[IFLA_BAREUDP_MULTIPROTO_MODE])
conf->multi_proto_mode = true;
+ if (data[IFLA_BAREUDP_RX_COLLECT_METADATA])
+ conf->rx_collect_metadata = true;
+
return 0;
}
@@ -627,6 +632,8 @@ static int bareudp_configure(struct net
bareudp->ethertype = conf->ethertype;
bareudp->sport_min = conf->sport_min;
bareudp->multi_proto_mode = conf->multi_proto_mode;
+ bareudp->rx_collect_metadata = conf->rx_collect_metadata;
+
err = register_netdevice(dev);
if (err)
return err;
@@ -684,6 +691,7 @@ static size_t bareudp_get_size(const str
nla_total_size(sizeof(__be16)) + /* IFLA_BAREUDP_ETHERTYPE */
nla_total_size(sizeof(__u16)) + /* IFLA_BAREUDP_SRCPORT_MIN */
nla_total_size(0) + /* IFLA_BAREUDP_MULTIPROTO_MODE */
+ nla_total_size(0) + /* IFLA_BAREUDP_RX_COLLECT_METADATA */
0;
}
@@ -700,6 +708,9 @@ static int bareudp_fill_info(struct sk_b
if (bareudp->multi_proto_mode &&
nla_put_flag(skb, IFLA_BAREUDP_MULTIPROTO_MODE))
goto nla_put_failure;
+ if (bareudp->rx_collect_metadata &&
+ nla_put_flag(skb, IFLA_BAREUDP_RX_COLLECT_METADATA))
+ goto nla_put_failure;
return 0;
--- a/include/net/bareudp.h
+++ b/include/net/bareudp.h
@@ -12,6 +12,7 @@ struct bareudp_conf {
__be16 port;
u16 sport_min;
bool multi_proto_mode;
+ bool rx_collect_metadata;
};
struct net_device *bareudp_dev_create(struct net *net, const char *name,
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -590,6 +590,7 @@ enum {
IFLA_BAREUDP_ETHERTYPE,
IFLA_BAREUDP_SRCPORT_MIN,
IFLA_BAREUDP_MULTIPROTO_MODE,
+ IFLA_BAREUDP_RX_COLLECT_METADATA,
__IFLA_BAREUDP_MAX
};