5.19-stable patches

added patches:
	geneve-use-ip_tunnel_key-flow-flags-in-route-lookups.patch
	vxlan-use-ip_tunnel_key-flow-flags-in-route-lookups.patch

diff --git a/queue-5.19/geneve-use-ip_tunnel_key-flow-flags-in-route-lookups.patch b/queue-5.19/geneve-use-ip_tunnel_key-flow-flags-in-route-lookups.patch
new file mode 100644 (file)
index 0000000..d743521
--- /dev/null
+++ b/queue-5.19/geneve-use-ip_tunnel_key-flow-flags-in-route-lookups.patch
@@ -0,0 +1,33 @@
+From 861396ac0b47780210b72c4fea359540965a4970 Mon Sep 17 00:00:00 2001
+From: Paul Chaignon <paul@isovalent.com>
+Date: Mon, 25 Jul 2022 16:32:15 +0200
+Subject: geneve: Use ip_tunnel_key flow flags in route lookups
+
+From: Paul Chaignon <paul@isovalent.com>
+
+commit 861396ac0b47780210b72c4fea359540965a4970 upstream.
+
+Use the new ip_tunnel_key field with the flow flags in the IPv4 route
+lookups for the encapsulated packet. This will be used by the
+bpf_skb_set_tunnel_key helper in the subsequent commit.
+
+Signed-off-by: Paul Chaignon <paul@isovalent.com>
+Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
+Acked-by: Martin KaFai Lau <kafai@fb.com>
+Link: https://lore.kernel.org/bpf/fcc2e0eea01e8ea465a180126366ec20596ba530.1658759380.git.paul@isovalent.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/geneve.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/geneve.c
++++ b/drivers/net/geneve.c
+@@ -815,6 +815,7 @@ static struct rtable *geneve_get_v4_rt(s
+       fl4->saddr = info->key.u.ipv4.src;
+       fl4->fl4_dport = dport;
+       fl4->fl4_sport = sport;
++      fl4->flowi4_flags = info->key.flow_flags;
+ 
+       tos = info->key.tos;
+       if ((tos == 1) && !geneve->cfg.collect_md) {

diff --git a/queue-5.19/series b/queue-5.19/series
index 1ddf3d66b3106142ceada8222b66cc100fba80e9..e840f05a2b49343c51d079f20b3852552e1f1fe1 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -1155,3 +1155,5 @@ powerpc-kexec-fix-build-failure-from-uninitialised-variable.patch
 io_uring-mem-account-pbuf-buckets.patch
 bluetooth-l2cap-fix-l2cap_global_chan_by_psm-regression.patch
 asoc-intel-avs-use-lookup-table-to-create-modules.patch
+geneve-use-ip_tunnel_key-flow-flags-in-route-lookups.patch
+vxlan-use-ip_tunnel_key-flow-flags-in-route-lookups.patch

diff --git a/queue-5.19/vxlan-use-ip_tunnel_key-flow-flags-in-route-lookups.patch b/queue-5.19/vxlan-use-ip_tunnel_key-flow-flags-in-route-lookups.patch
new file mode 100644 (file)
index 0000000..c4602c7
--- /dev/null
+++ b/queue-5.19/vxlan-use-ip_tunnel_key-flow-flags-in-route-lookups.patch
@@ -0,0 +1,78 @@
+From 7e2fb8bc7ef6c7a63ca95751b90162dece0b3f4c Mon Sep 17 00:00:00 2001
+From: Paul Chaignon <paul@isovalent.com>
+Date: Mon, 25 Jul 2022 16:31:58 +0200
+Subject: vxlan: Use ip_tunnel_key flow flags in route lookups
+
+From: Paul Chaignon <paul@isovalent.com>
+
+commit 7e2fb8bc7ef6c7a63ca95751b90162dece0b3f4c upstream.
+
+Use the new ip_tunnel_key field with the flow flags in the IPv4 route
+lookups for the encapsulated packet. This will be used by the
+bpf_skb_set_tunnel_key helper in a subsequent commit.
+
+Signed-off-by: Paul Chaignon <paul@isovalent.com>
+Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
+Acked-by: Martin KaFai Lau <kafai@fb.com>
+Link: https://lore.kernel.org/bpf/1ffc95c3d60182fd5ec0cf6602083f8f68afe98f.1658759380.git.paul@isovalent.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/vxlan/vxlan_core.c |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/vxlan/vxlan_core.c
++++ b/drivers/net/vxlan/vxlan_core.c
+@@ -2243,7 +2243,7 @@ static struct rtable *vxlan_get_route(st
+                                     struct vxlan_sock *sock4,
+                                     struct sk_buff *skb, int oif, u8 tos,
+                                     __be32 daddr, __be32 *saddr, __be16 dport, __be16 sport,
+-                                    struct dst_cache *dst_cache,
++                                    __u8 flow_flags, struct dst_cache *dst_cache,
+                                     const struct ip_tunnel_info *info)
+ {
+       bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
+@@ -2270,6 +2270,7 @@ static struct rtable *vxlan_get_route(st
+       fl4.saddr = *saddr;
+       fl4.fl4_dport = dport;
+       fl4.fl4_sport = sport;
++      fl4.flowi4_flags = flow_flags;
+ 
+       rt = ip_route_output_key(vxlan->net, &fl4);
+       if (!IS_ERR(rt)) {
+@@ -2459,7 +2460,7 @@ static void vxlan_xmit_one(struct sk_buf
+       unsigned int pkt_len = skb->len;
+       __be16 src_port = 0, dst_port;
+       struct dst_entry *ndst = NULL;
+-      __u8 tos, ttl;
++      __u8 tos, ttl, flow_flags = 0;
+       int ifindex;
+       int err;
+       u32 flags = vxlan->cfg.flags;
+@@ -2525,6 +2526,7 @@ static void vxlan_xmit_one(struct sk_buf
+               }
+               dst = &remote_ip;
+               dst_port = info->key.tp_dst ? : vxlan->cfg.dst_port;
++              flow_flags = info->key.flow_flags;
+               vni = tunnel_id_to_key32(info->key.tun_id);
+               ifindex = 0;
+               dst_cache = &info->dst_cache;
+@@ -2555,7 +2557,7 @@ static void vxlan_xmit_one(struct sk_buf
+               rt = vxlan_get_route(vxlan, dev, sock4, skb, ifindex, tos,
+                                    dst->sin.sin_addr.s_addr,
+                                    &local_ip.sin.sin_addr.s_addr,
+-                                   dst_port, src_port,
++                                   dst_port, src_port, flow_flags,
+                                    dst_cache, info);
+               if (IS_ERR(rt)) {
+                       err = PTR_ERR(rt);
+@@ -3061,7 +3063,8 @@ static int vxlan_fill_metadata_dst(struc
+               rt = vxlan_get_route(vxlan, dev, sock4, skb, 0, info->key.tos,
+                                    info->key.u.ipv4.dst,
+                                    &info->key.u.ipv4.src, dport, sport,
+-                                   &info->dst_cache, info);
++                                   info->key.flow_flags, &info->dst_cache,
++                                   info);
+               if (IS_ERR(rt))
+                       return PTR_ERR(rt);
+               ip_rt_put(rt);