~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,11 +1,8 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*
2	3	* GENEVE: Generic Network Virtualization Encapsulation
3	4	*
4	5	* Copyright (c) 2015 Red Hat, Inc.
5		- *
6		- * This program is free software; you can redistribute it and/or modify
7		- * it under the terms of the GNU General Public License version 2 as
8		- * published by the Free Software Foundation.
9	6	*/
10	7
11	8	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
..	..	@@ -14,6 +11,7 @@
14	11	#include <linux/module.h>
15	12	#include <linux/etherdevice.h>
16	13	#include <linux/hash.h>
	14	+#include <net/ipv6_stubs.h>
17	15	#include <net/dst_metadata.h>
18	16	#include <net/gro_cells.h>
19	17	#include <net/rtnetlink.h>
..	..	@@ -21,8 +19,6 @@
21	19	#include <net/protocol.h>
22	20
23	21	#define GENEVE_NETDEV_VER "0.6"
24		-
25		-#define GENEVE_UDP_PORT 6081
26	22
27	23	#define GENEVE_N_VID (1u << 24)
28	24	#define GENEVE_VID_MASK (GENEVE_N_VID - 1)
..	..	@@ -52,6 +48,14 @@
52	48	struct geneve_dev *geneve;
53	49	};
54	50
	51	+struct geneve_config {
	52	+ struct ip_tunnel_info info;
	53	+ bool collect_md;
	54	+ bool use_udp6_rx_checksums;
	55	+ bool ttl_inherit;
	56	+ enum ifla_geneve_df df;
	57	+};
	58	+
55	59	/* Pseudo network device */
56	60	struct geneve_dev {
57	61	struct geneve_dev_node hlist4; /* vni hash table for IPv4 socket */
..	..	@@ -60,15 +64,13 @@
60	64	#endif
61	65	struct net net; / netns for packet i/o */
62	66	struct net_device dev; / netdev for geneve tunnel */
63		- struct ip_tunnel_info info;
64	67	struct geneve_sock __rcu sock4; / IPv4 socket used for geneve tunnel */
65	68	#if IS_ENABLED(CONFIG_IPV6)
66	69	struct geneve_sock __rcu sock6; / IPv6 socket used for geneve tunnel */
67	70	#endif
68	71	struct list_head next; /* geneve's per namespace list */
69	72	struct gro_cells gro_cells;
70		- bool collect_md;
71		- bool use_udp6_rx_checksums;
	73	+ struct geneve_config cfg;
72	74	};
73	75
74	76	struct geneve_sock {
..	..	@@ -134,8 +136,8 @@
134	136	hash = geneve_net_vni_hash(vni);
135	137	vni_list_head = &gs->vni_list[hash];
136	138	hlist_for_each_entry_rcu(node, vni_list_head, hlist) {
137		- if (eq_tun_id_and_vni((u8 *)&node->geneve->info.key.tun_id, vni) &&
138		- addr == node->geneve->info.key.u.ipv4.dst)
	139	+ if (eq_tun_id_and_vni((u8 *)&node->geneve->cfg.info.key.tun_id, vni) &&
	140	+ addr == node->geneve->cfg.info.key.u.ipv4.dst)
139	141	return node->geneve;
140	142	}
141	143	return NULL;
..	..	@@ -153,8 +155,8 @@
153	155	hash = geneve_net_vni_hash(vni);
154	156	vni_list_head = &gs->vni_list[hash];
155	157	hlist_for_each_entry_rcu(node, vni_list_head, hlist) {
156		- if (eq_tun_id_and_vni((u8 *)&node->geneve->info.key.tun_id, vni) &&
157		- ipv6_addr_equal(&addr6, &node->geneve->info.key.u.ipv6.dst))
	158	+ if (eq_tun_id_and_vni((u8 *)&node->geneve->cfg.info.key.tun_id, vni) &&
	159	+ ipv6_addr_equal(&addr6, &node->geneve->cfg.info.key.u.ipv6.dst))
158	160	return node->geneve;
159	161	}
160	162	return NULL;
..	..	@@ -215,7 +217,6 @@
215	217	{
216	218	struct genevehdr *gnvh = geneve_hdr(skb);
217	219	struct metadata_dst *tun_dst = NULL;
218		- struct pcpu_sw_netstats *stats;
219	220	unsigned int len;
220	221	int err = 0;
221	222	void *oiph;
..	..	@@ -293,13 +294,9 @@
293	294
294	295	len = skb->len;
295	296	err = gro_cells_receive(&geneve->gro_cells, skb);
296		- if (likely(err == NET_RX_SUCCESS)) {
297		- stats = this_cpu_ptr(geneve->dev->tstats);
298		- u64_stats_update_begin(&stats->syncp);
299		- stats->rx_packets++;
300		- stats->rx_bytes += len;
301		- u64_stats_update_end(&stats->syncp);
302		- }
	297	+ if (likely(err == NET_RX_SUCCESS))
	298	+ dev_sw_netstats_rx_add(geneve->dev, len);
	299	+
303	300	return;
304	301	drop:
305	302	/* Consume bad packet */
..	..	@@ -322,7 +319,7 @@
322	319	return err;
323	320	}
324	321
325		- err = dst_cache_init(&geneve->info.dst_cache, GFP_KERNEL);
	322	+ err = dst_cache_init(&geneve->cfg.info.dst_cache, GFP_KERNEL);
326	323	if (err) {
327	324	free_percpu(dev->tstats);
328	325	gro_cells_destroy(&geneve->gro_cells);
..	..	@@ -335,7 +332,7 @@
335	332	{
336	333	struct geneve_dev *geneve = netdev_priv(dev);
337	334
338		- dst_cache_destroy(&geneve->info.dst_cache);
	335	+ dst_cache_destroy(&geneve->cfg.info.dst_cache);
339	336	gro_cells_destroy(&geneve->gro_cells);
340	337	free_percpu(dev->tstats);
341	338	}
..	..	@@ -383,6 +380,59 @@
383	380	/* Consume bad packet */
384	381	kfree_skb(skb);
385	382	return 0;
	383	+}
	384	+
	385	+/* Callback from net/ipv{4,6}/udp.c to check that we have a tunnel for errors */
	386	+static int geneve_udp_encap_err_lookup(struct sock sk, struct sk_buff skb)
	387	+{
	388	+ struct genevehdr *geneveh;
	389	+ struct geneve_sock *gs;
	390	+ u8 zero_vni[3] = { 0 };
	391	+ u8 *vni = zero_vni;
	392	+
	393	+ if (!pskb_may_pull(skb, skb_transport_offset(skb) + GENEVE_BASE_HLEN))
	394	+ return -EINVAL;
	395	+
	396	+ geneveh = geneve_hdr(skb);
	397	+ if (geneveh->ver != GENEVE_VER)
	398	+ return -EINVAL;
	399	+
	400	+ if (geneveh->proto_type != htons(ETH_P_TEB))
	401	+ return -EINVAL;
	402	+
	403	+ gs = rcu_dereference_sk_user_data(sk);
	404	+ if (!gs)
	405	+ return -ENOENT;
	406	+
	407	+ if (geneve_get_sk_family(gs) == AF_INET) {
	408	+ struct iphdr *iph = ip_hdr(skb);
	409	+ __be32 addr4 = 0;
	410	+
	411	+ if (!gs->collect_md) {
	412	+ vni = geneve_hdr(skb)->vni;
	413	+ addr4 = iph->daddr;
	414	+ }
	415	+
	416	+ return geneve_lookup(gs, addr4, vni) ? 0 : -ENOENT;
	417	+ }
	418	+
	419	+#if IS_ENABLED(CONFIG_IPV6)
	420	+ if (geneve_get_sk_family(gs) == AF_INET6) {
	421	+ struct ipv6hdr *ip6h = ipv6_hdr(skb);
	422	+ struct in6_addr addr6;
	423	+
	424	+ memset(&addr6, 0, sizeof(struct in6_addr));
	425	+
	426	+ if (!gs->collect_md) {
	427	+ vni = geneve_hdr(skb)->vni;
	428	+ addr6 = ip6h->daddr;
	429	+ }
	430	+
	431	+ return geneve6_lookup(gs, addr6, vni) ? 0 : -ENOENT;
	432	+ }
	433	+#endif
	434	+
	435	+ return -EPFNOSUPPORT;
386	436	}
387	437
388	438	static struct socket geneve_create_sock(struct net net, bool ipv6,
..	..	@@ -542,6 +592,7 @@
542	592	tunnel_cfg.gro_receive = geneve_gro_receive;
543	593	tunnel_cfg.gro_complete = geneve_gro_complete;
544	594	tunnel_cfg.encap_rcv = geneve_udp_encap_recv;
	595	+ tunnel_cfg.encap_err_lookup = geneve_udp_encap_err_lookup;
545	596	tunnel_cfg.encap_destroy = NULL;
546	597	setup_udp_tunnel_sock(net, sock, &tunnel_cfg);
547	598	list_add(&gs->list, &gn->sock_list);
..	..	@@ -601,19 +652,19 @@
601	652	__u8 vni[3];
602	653	__u32 hash;
603	654
604		- gs = geneve_find_sock(gn, ipv6 ? AF_INET6 : AF_INET, geneve->info.key.tp_dst);
	655	+ gs = geneve_find_sock(gn, ipv6 ? AF_INET6 : AF_INET, geneve->cfg.info.key.tp_dst);
605	656	if (gs) {
606	657	gs->refcnt++;
607	658	goto out;
608	659	}
609	660
610		- gs = geneve_socket_create(net, geneve->info.key.tp_dst, ipv6,
611		- geneve->use_udp6_rx_checksums);
	661	+ gs = geneve_socket_create(net, geneve->cfg.info.key.tp_dst, ipv6,
	662	+ geneve->cfg.use_udp6_rx_checksums);
612	663	if (IS_ERR(gs))
613	664	return PTR_ERR(gs);
614	665
615	666	out:
616		- gs->collect_md = geneve->collect_md;
	667	+ gs->collect_md = geneve->cfg.collect_md;
617	668	#if IS_ENABLED(CONFIG_IPV6)
618	669	if (ipv6) {
619	670	rcu_assign_pointer(geneve->sock6, gs);
..	..	@@ -626,7 +677,7 @@
626	677	}
627	678	node->geneve = geneve;
628	679
629		- tunnel_id_to_vni(geneve->info.key.tun_id, vni);
	680	+ tunnel_id_to_vni(geneve->cfg.info.key.tun_id, vni);
630	681	hash = geneve_net_vni_hash(vni);
631	682	hlist_add_head_rcu(&node->hlist, &gs->vni_list[hash]);
632	683	return 0;
..	..	@@ -635,11 +686,11 @@
635	686	static int geneve_open(struct net_device *dev)
636	687	{
637	688	struct geneve_dev *geneve = netdev_priv(dev);
638		- bool metadata = geneve->collect_md;
	689	+ bool metadata = geneve->cfg.collect_md;
639	690	bool ipv4, ipv6;
640	691	int ret = 0;
641	692
642		- ipv6 = geneve->info.mode & IP_TUNNEL_INFO_IPV6 \|\| metadata;
	693	+ ipv6 = geneve->cfg.info.mode & IP_TUNNEL_INFO_IPV6 \|\| metadata;
643	694	ipv4 = !ipv6 \|\| metadata;
644	695	#if IS_ENABLED(CONFIG_IPV6)
645	696	if (ipv6) {
..	..	@@ -721,7 +772,8 @@
721	772	struct geneve_sock *gs4,
722	773	struct flowi4 *fl4,
723	774	const struct ip_tunnel_info *info,
724		- __be16 dport, __be16 sport)
	775	+ __be16 dport, __be16 sport,
	776	+ __u8 *full_tos)
725	777	{
726	778	bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
727	779	struct geneve_dev *geneve = netdev_priv(dev);
..	..	@@ -741,11 +793,13 @@
741	793	fl4->fl4_sport = sport;
742	794
743	795	tos = info->key.tos;
744		- if ((tos == 1) && !geneve->collect_md) {
	796	+ if ((tos == 1) && !geneve->cfg.collect_md) {
745	797	tos = ip_tunnel_get_dsfield(ip_hdr(skb), skb);
746	798	use_cache = false;
747	799	}
748	800	fl4->flowi4_tos = RT_TOS(tos);
	801	+ if (full_tos)
	802	+ *full_tos = tos;
749	803
750	804	dst_cache = (struct dst_cache *)&info->dst_cache;
751	805	if (use_cache) {
..	..	@@ -794,13 +848,12 @@
794	848	fl6->fl6_sport = sport;
795	849
796	850	prio = info->key.tos;
797		- if ((prio == 1) && !geneve->collect_md) {
	851	+ if ((prio == 1) && !geneve->cfg.collect_md) {
798	852	prio = ip_tunnel_get_dsfield(ip_hdr(skb), skb);
799	853	use_cache = false;
800	854	}
801	855
802		- fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio),
803		- info->key.label);
	856	+ fl6->flowlabel = ip6_make_flowinfo(prio, info->key.label);
804	857	dst_cache = (struct dst_cache *)&info->dst_cache;
805	858	if (use_cache) {
806	859	dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);
..	..	@@ -834,9 +887,10 @@
834	887	const struct ip_tunnel_key *key = &info->key;
835	888	struct rtable *rt;
836	889	struct flowi4 fl4;
	890	+ __u8 full_tos;
837	891	__u8 tos, ttl;
	892	+ __be16 df = 0;
838	893	__be16 sport;
839		- __be16 df;
840	894	int err;
841	895
842	896	if (!pskb_inet_may_pull(skb))
..	..	@@ -844,28 +898,79 @@
844	898
845	899	sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
846	900	rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info,
847		- geneve->info.key.tp_dst, sport);
	901	+ geneve->cfg.info.key.tp_dst, sport, &full_tos);
848	902	if (IS_ERR(rt))
849	903	return PTR_ERR(rt);
850	904
851		- skb_tunnel_check_pmtu(skb, &rt->dst,
852		- GENEVE_IPV4_HLEN + info->options_len);
	905	+ err = skb_tunnel_check_pmtu(skb, &rt->dst,
	906	+ GENEVE_IPV4_HLEN + info->options_len,
	907	+ netif_is_any_bridge_port(dev));
	908	+ if (err < 0) {
	909	+ dst_release(&rt->dst);
	910	+ return err;
	911	+ } else if (err) {
	912	+ struct ip_tunnel_info *info;
853	913
854		- if (geneve->collect_md) {
	914	+ info = skb_tunnel_info(skb);
	915	+ if (info) {
	916	+ struct ip_tunnel_info *unclone;
	917	+
	918	+ unclone = skb_tunnel_info_unclone(skb);
	919	+ if (unlikely(!unclone)) {
	920	+ dst_release(&rt->dst);
	921	+ return -ENOMEM;
	922	+ }
	923	+
	924	+ unclone->key.u.ipv4.dst = fl4.saddr;
	925	+ unclone->key.u.ipv4.src = fl4.daddr;
	926	+ }
	927	+
	928	+ if (!pskb_may_pull(skb, ETH_HLEN)) {
	929	+ dst_release(&rt->dst);
	930	+ return -EINVAL;
	931	+ }
	932	+
	933	+ skb->protocol = eth_type_trans(skb, geneve->dev);
	934	+ netif_rx(skb);
	935	+ dst_release(&rt->dst);
	936	+ return -EMSGSIZE;
	937	+ }
	938	+
	939	+ if (geneve->cfg.collect_md) {
855	940	tos = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);
856	941	ttl = key->ttl;
	942	+
	943	+ df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;
857	944	} else {
858		- tos = ip_tunnel_ecn_encap(fl4.flowi4_tos, ip_hdr(skb), skb);
859		- ttl = key->ttl ? : ip4_dst_hoplimit(&rt->dst);
	945	+ tos = ip_tunnel_ecn_encap(full_tos, ip_hdr(skb), skb);
	946	+ if (geneve->cfg.ttl_inherit)
	947	+ ttl = ip_tunnel_get_ttl(ip_hdr(skb), skb);
	948	+ else
	949	+ ttl = key->ttl;
	950	+ ttl = ttl ? : ip4_dst_hoplimit(&rt->dst);
	951	+
	952	+ if (geneve->cfg.df == GENEVE_DF_SET) {
	953	+ df = htons(IP_DF);
	954	+ } else if (geneve->cfg.df == GENEVE_DF_INHERIT) {
	955	+ struct ethhdr *eth = eth_hdr(skb);
	956	+
	957	+ if (ntohs(eth->h_proto) == ETH_P_IPV6) {
	958	+ df = htons(IP_DF);
	959	+ } else if (ntohs(eth->h_proto) == ETH_P_IP) {
	960	+ struct iphdr *iph = ip_hdr(skb);
	961	+
	962	+ if (iph->frag_off & htons(IP_DF))
	963	+ df = htons(IP_DF);
	964	+ }
	965	+ }
860	966	}
861		- df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;
862	967
863	968	err = geneve_build_skb(&rt->dst, skb, info, xnet, sizeof(struct iphdr));
864	969	if (unlikely(err))
865	970	return err;
866	971
867	972	udp_tunnel_xmit_skb(rt, gs4->sock->sk, skb, fl4.saddr, fl4.daddr,
868		- tos, ttl, df, sport, geneve->info.key.tp_dst,
	973	+ tos, ttl, df, sport, geneve->cfg.info.key.tp_dst,
869	974	!net_eq(geneve->net, dev_net(geneve->dev)),
870	975	!(info->key.tun_flags & TUNNEL_CSUM));
871	976	return 0;
..	..	@@ -890,19 +995,54 @@
890	995
891	996	sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
892	997	dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info,
893		- geneve->info.key.tp_dst, sport);
	998	+ geneve->cfg.info.key.tp_dst, sport);
894	999	if (IS_ERR(dst))
895	1000	return PTR_ERR(dst);
896	1001
897		- skb_tunnel_check_pmtu(skb, dst, GENEVE_IPV6_HLEN + info->options_len);
	1002	+ err = skb_tunnel_check_pmtu(skb, dst,
	1003	+ GENEVE_IPV6_HLEN + info->options_len,
	1004	+ netif_is_any_bridge_port(dev));
	1005	+ if (err < 0) {
	1006	+ dst_release(dst);
	1007	+ return err;
	1008	+ } else if (err) {
	1009	+ struct ip_tunnel_info *info = skb_tunnel_info(skb);
898	1010
899		- if (geneve->collect_md) {
	1011	+ if (info) {
	1012	+ struct ip_tunnel_info *unclone;
	1013	+
	1014	+ unclone = skb_tunnel_info_unclone(skb);
	1015	+ if (unlikely(!unclone)) {
	1016	+ dst_release(dst);
	1017	+ return -ENOMEM;
	1018	+ }
	1019	+
	1020	+ unclone->key.u.ipv6.dst = fl6.saddr;
	1021	+ unclone->key.u.ipv6.src = fl6.daddr;
	1022	+ }
	1023	+
	1024	+ if (!pskb_may_pull(skb, ETH_HLEN)) {
	1025	+ dst_release(dst);
	1026	+ return -EINVAL;
	1027	+ }
	1028	+
	1029	+ skb->protocol = eth_type_trans(skb, geneve->dev);
	1030	+ netif_rx(skb);
	1031	+ dst_release(dst);
	1032	+ return -EMSGSIZE;
	1033	+ }
	1034	+
	1035	+ if (geneve->cfg.collect_md) {
900	1036	prio = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);
901	1037	ttl = key->ttl;
902	1038	} else {
903	1039	prio = ip_tunnel_ecn_encap(ip6_tclass(fl6.flowlabel),
904	1040	ip_hdr(skb), skb);
905		- ttl = key->ttl ? : ip6_dst_hoplimit(dst);
	1041	+ if (geneve->cfg.ttl_inherit)
	1042	+ ttl = ip_tunnel_get_ttl(ip_hdr(skb), skb);
	1043	+ else
	1044	+ ttl = key->ttl;
	1045	+ ttl = ttl ? : ip6_dst_hoplimit(dst);
906	1046	}
907	1047	err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct ipv6hdr));
908	1048	if (unlikely(err))
..	..	@@ -910,7 +1050,7 @@
910	1050
911	1051	udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
912	1052	&fl6.saddr, &fl6.daddr, prio, ttl,
913		- info->key.label, sport, geneve->info.key.tp_dst,
	1053	+ info->key.label, sport, geneve->cfg.info.key.tp_dst,
914	1054	!(info->key.tun_flags & TUNNEL_CSUM));
915	1055	return 0;
916	1056	}
..	..	@@ -922,7 +1062,7 @@
922	1062	struct ip_tunnel_info *info = NULL;
923	1063	int err;
924	1064
925		- if (geneve->collect_md) {
	1065	+ if (geneve->cfg.collect_md) {
926	1066	info = skb_tunnel_info(skb);
927	1067	if (unlikely(!info \|\| !(info->mode & IP_TUNNEL_INFO_TX))) {
928	1068	netdev_dbg(dev, "no tunnel metadata\n");
..	..	@@ -931,7 +1071,7 @@
931	1071	return NETDEV_TX_OK;
932	1072	}
933	1073	} else {
934		- info = &geneve->info;
	1074	+ info = &geneve->cfg.info;
935	1075	}
936	1076
937	1077	rcu_read_lock();
..	..	@@ -946,7 +1086,8 @@
946	1086	if (likely(!err))
947	1087	return NETDEV_TX_OK;
948	1088
949		- dev_kfree_skb(skb);
	1089	+ if (err != -EMSGSIZE)
	1090	+ dev_kfree_skb(skb);
950	1091
951	1092	if (err == -ELOOP)
952	1093	dev->stats.collisions++;
..	..	@@ -983,7 +1124,7 @@
983	1124	1, USHRT_MAX, true);
984	1125
985	1126	rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info,
986		- geneve->info.key.tp_dst, sport);
	1127	+ geneve->cfg.info.key.tp_dst, sport, NULL);
987	1128	if (IS_ERR(rt))
988	1129	return PTR_ERR(rt);
989	1130
..	..	@@ -999,7 +1140,7 @@
999	1140	1, USHRT_MAX, true);
1000	1141
1001	1142	dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info,
1002		- geneve->info.key.tp_dst, sport);
	1143	+ geneve->cfg.info.key.tp_dst, sport);
1003	1144	if (IS_ERR(dst))
1004	1145	return PTR_ERR(dst);
1005	1146
..	..	@@ -1011,7 +1152,7 @@
1011	1152	}
1012	1153
1013	1154	info->key.tp_src = sport;
1014		- info->key.tp_dst = geneve->info.key.tp_dst;
	1155	+ info->key.tp_dst = geneve->cfg.info.key.tp_dst;
1015	1156	return 0;
1016	1157	}
1017	1158
..	..	@@ -1103,7 +1244,7 @@
1103	1244
1104	1245	static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {
1105	1246	[IFLA_GENEVE_ID] = { .type = NLA_U32 },
1106		- [IFLA_GENEVE_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
	1247	+ [IFLA_GENEVE_REMOTE] = { .len = sizeof_field(struct iphdr, daddr) },
1107	1248	[IFLA_GENEVE_REMOTE6] = { .len = sizeof(struct in6_addr) },
1108	1249	[IFLA_GENEVE_TTL] = { .type = NLA_U8 },
1109	1250	[IFLA_GENEVE_TOS] = { .type = NLA_U8 },
..	..	@@ -1113,6 +1254,8 @@
1113	1254	[IFLA_GENEVE_UDP_CSUM] = { .type = NLA_U8 },
1114	1255	[IFLA_GENEVE_UDP_ZERO_CSUM6_TX] = { .type = NLA_U8 },
1115	1256	[IFLA_GENEVE_UDP_ZERO_CSUM6_RX] = { .type = NLA_U8 },
	1257	+ [IFLA_GENEVE_TTL_INHERIT] = { .type = NLA_U8 },
	1258	+ [IFLA_GENEVE_DF] = { .type = NLA_U8 },
1116	1259	};
1117	1260
1118	1261	static int geneve_validate(struct nlattr tb[], struct nlattr data[],
..	..	@@ -1148,6 +1291,16 @@
1148	1291	}
1149	1292	}
1150	1293
	1294	+ if (data[IFLA_GENEVE_DF]) {
	1295	+ enum ifla_geneve_df df = nla_get_u8(data[IFLA_GENEVE_DF]);
	1296	+
	1297	+ if (df < 0 \|\| df > GENEVE_DF_MAX) {
	1298	+ NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_DF],
	1299	+ "Invalid DF attribute");
	1300	+ return -EINVAL;
	1301	+ }
	1302	+ }
	1303	+
1151	1304	return 0;
1152	1305	}
1153	1306
..	..	@@ -1161,13 +1314,13 @@
1161	1314	*tun_on_same_port = false;
1162	1315	*tun_collect_md = false;
1163	1316	list_for_each_entry(geneve, &gn->geneve_list, next) {
1164		- if (info->key.tp_dst == geneve->info.key.tp_dst) {
1165		- *tun_collect_md = geneve->collect_md;
	1317	+ if (info->key.tp_dst == geneve->cfg.info.key.tp_dst) {
	1318	+ *tun_collect_md = geneve->cfg.collect_md;
1166	1319	*tun_on_same_port = true;
1167	1320	}
1168		- if (info->key.tun_id == geneve->info.key.tun_id &&
1169		- info->key.tp_dst == geneve->info.key.tp_dst &&
1170		- !memcmp(&info->key.u, &geneve->info.key.u, sizeof(info->key.u)))
	1321	+ if (info->key.tun_id == geneve->cfg.info.key.tun_id &&
	1322	+ info->key.tp_dst == geneve->cfg.info.key.tp_dst &&
	1323	+ !memcmp(&info->key.u, &geneve->cfg.info.key.u, sizeof(info->key.u)))
1171	1324	t = geneve;
1172	1325	}
1173	1326	return t;
..	..	@@ -1191,15 +1344,15 @@
1191	1344
1192	1345	static int geneve_configure(struct net net, struct net_device dev,
1193	1346	struct netlink_ext_ack *extack,
1194		- const struct ip_tunnel_info *info,
1195		- bool metadata, bool ipv6_rx_csum)
	1347	+ const struct geneve_config *cfg)
1196	1348	{
1197	1349	struct geneve_net *gn = net_generic(net, geneve_net_id);
1198	1350	struct geneve_dev t, geneve = netdev_priv(dev);
	1351	+ const struct ip_tunnel_info *info = &cfg->info;
1199	1352	bool tun_collect_md, tun_on_same_port;
1200	1353	int err, encap_len;
1201	1354
1202		- if (metadata && !is_tnl_info_zero(info)) {
	1355	+ if (cfg->collect_md && !is_tnl_info_zero(info)) {
1203	1356	NL_SET_ERR_MSG(extack,
1204	1357	"Device is externally controlled, so attributes (VNI, Port, and so on) must not be specified");
1205	1358	return -EINVAL;
..	..	@@ -1214,7 +1367,7 @@
1214	1367
1215	1368	/* make enough headroom for basic scenario */
1216	1369	encap_len = GENEVE_BASE_HLEN + ETH_HLEN;
1217		- if (!metadata && ip_tunnel_info_af(info) == AF_INET) {
	1370	+ if (!cfg->collect_md && ip_tunnel_info_af(info) == AF_INET) {
1218	1371	encap_len += sizeof(struct iphdr);
1219	1372	dev->max_mtu -= sizeof(struct iphdr);
1220	1373	} else {
..	..	@@ -1223,7 +1376,7 @@
1223	1376	}
1224	1377	dev->needed_headroom = encap_len + ETH_HLEN;
1225	1378
1226		- if (metadata) {
	1379	+ if (cfg->collect_md) {
1227	1380	if (tun_on_same_port) {
1228	1381	NL_SET_ERR_MSG(extack,
1229	1382	"There can be only one externally controlled device on a destination port");
..	..	@@ -1237,10 +1390,8 @@
1237	1390	}
1238	1391	}
1239	1392
1240		- dst_cache_reset(&geneve->info.dst_cache);
1241		- geneve->info = *info;
1242		- geneve->collect_md = metadata;
1243		- geneve->use_udp6_rx_checksums = ipv6_rx_csum;
	1393	+ dst_cache_reset(&geneve->cfg.info.dst_cache);
	1394	+ memcpy(&geneve->cfg, cfg, sizeof(*cfg));
1244	1395
1245	1396	err = register_netdevice(dev);
1246	1397	if (err)
..	..	@@ -1258,9 +1409,9 @@
1258	1409
1259	1410	static int geneve_nl2info(struct nlattr tb[], struct nlattr data[],
1260	1411	struct netlink_ext_ack *extack,
1261		- struct ip_tunnel_info info, bool metadata,
1262		- bool *use_udp6_rx_checksums, bool changelink)
	1412	+ struct geneve_config *cfg, bool changelink)
1263	1413	{
	1414	+ struct ip_tunnel_info *info = &cfg->info;
1264	1415	int attrtype;
1265	1416
1266	1417	if (data[IFLA_GENEVE_REMOTE] && data[IFLA_GENEVE_REMOTE6]) {
..	..	@@ -1278,7 +1429,7 @@
1278	1429	info->key.u.ipv4.dst =
1279	1430	nla_get_in_addr(data[IFLA_GENEVE_REMOTE]);
1280	1431
1281		- if (IN_MULTICAST(ntohl(info->key.u.ipv4.dst))) {
	1432	+ if (ipv4_is_multicast(info->key.u.ipv4.dst)) {
1282	1433	NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_REMOTE],
1283	1434	"Remote IPv4 address cannot be Multicast");
1284	1435	return -EINVAL;
..	..	@@ -1308,7 +1459,7 @@
1308	1459	return -EINVAL;
1309	1460	}
1310	1461	info->key.tun_flags \|= TUNNEL_CSUM;
1311		- *use_udp6_rx_checksums = true;
	1462	+ cfg->use_udp6_rx_checksums = true;
1312	1463	#else
1313	1464	NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_REMOTE6],
1314	1465	"IPv6 support not enabled in the kernel");
..	..	@@ -1334,11 +1485,21 @@
1334	1485	info->key.tun_id = tunid;
1335	1486	}
1336	1487
1337		- if (data[IFLA_GENEVE_TTL])
	1488	+ if (data[IFLA_GENEVE_TTL_INHERIT]) {
	1489	+ if (nla_get_u8(data[IFLA_GENEVE_TTL_INHERIT]))
	1490	+ cfg->ttl_inherit = true;
	1491	+ else
	1492	+ cfg->ttl_inherit = false;
	1493	+ } else if (data[IFLA_GENEVE_TTL]) {
1338	1494	info->key.ttl = nla_get_u8(data[IFLA_GENEVE_TTL]);
	1495	+ cfg->ttl_inherit = false;
	1496	+ }
1339	1497
1340	1498	if (data[IFLA_GENEVE_TOS])
1341	1499	info->key.tos = nla_get_u8(data[IFLA_GENEVE_TOS]);
	1500	+
	1501	+ if (data[IFLA_GENEVE_DF])
	1502	+ cfg->df = nla_get_u8(data[IFLA_GENEVE_DF]);
1342	1503
1343	1504	if (data[IFLA_GENEVE_LABEL]) {
1344	1505	info->key.label = nla_get_be32(data[IFLA_GENEVE_LABEL]) &
..	..	@@ -1363,7 +1524,7 @@
1363	1524	attrtype = IFLA_GENEVE_COLLECT_METADATA;
1364	1525	goto change_notsup;
1365	1526	}
1366		- *metadata = true;
	1527	+ cfg->collect_md = true;
1367	1528	}
1368	1529
1369	1530	if (data[IFLA_GENEVE_UDP_CSUM]) {
..	..	@@ -1397,7 +1558,7 @@
1397	1558	goto change_notsup;
1398	1559	}
1399	1560	if (nla_get_u8(data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX]))
1400		- *use_udp6_rx_checksums = false;
	1561	+ cfg->use_udp6_rx_checksums = false;
1401	1562	#else
1402	1563	NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_UDP_ZERO_CSUM6_RX],
1403	1564	"IPv6 support not enabled in the kernel");
..	..	@@ -1462,23 +1623,24 @@
1462	1623	struct nlattr tb[], struct nlattr data[],
1463	1624	struct netlink_ext_ack *extack)
1464	1625	{
1465		- bool use_udp6_rx_checksums = false;
1466		- struct ip_tunnel_info info;
1467		- bool metadata = false;
	1626	+ struct geneve_config cfg = {
	1627	+ .df = GENEVE_DF_UNSET,
	1628	+ .use_udp6_rx_checksums = false,
	1629	+ .ttl_inherit = false,
	1630	+ .collect_md = false,
	1631	+ };
1468	1632	int err;
1469	1633
1470		- init_tnl_info(&info, GENEVE_UDP_PORT);
1471		- err = geneve_nl2info(tb, data, extack, &info, &metadata,
1472		- &use_udp6_rx_checksums, false);
	1634	+ init_tnl_info(&cfg.info, GENEVE_UDP_PORT);
	1635	+ err = geneve_nl2info(tb, data, extack, &cfg, false);
1473	1636	if (err)
1474	1637	return err;
1475	1638
1476		- err = geneve_configure(net, dev, extack, &info, metadata,
1477		- use_udp6_rx_checksums);
	1639	+ err = geneve_configure(net, dev, extack, &cfg);
1478	1640	if (err)
1479	1641	return err;
1480	1642
1481		- geneve_link_config(dev, &info, tb);
	1643	+ geneve_link_config(dev, &cfg.info, tb);
1482	1644
1483	1645	return 0;
1484	1646	}
..	..	@@ -1534,35 +1696,28 @@
1534	1696	{
1535	1697	struct geneve_dev *geneve = netdev_priv(dev);
1536	1698	struct geneve_sock gs4, gs6;
1537		- struct ip_tunnel_info info;
1538		- bool metadata;
1539		- bool use_udp6_rx_checksums;
	1699	+ struct geneve_config cfg;
1540	1700	int err;
1541	1701
1542	1702	/* If the geneve device is configured for metadata (or externally
1543	1703	* controlled, for example, OVS), then nothing can be changed.
1544	1704	*/
1545		- if (geneve->collect_md)
	1705	+ if (geneve->cfg.collect_md)
1546	1706	return -EOPNOTSUPP;
1547	1707
1548	1708	/* Start with the existing info. */
1549		- memcpy(&info, &geneve->info, sizeof(info));
1550		- metadata = geneve->collect_md;
1551		- use_udp6_rx_checksums = geneve->use_udp6_rx_checksums;
1552		- err = geneve_nl2info(tb, data, extack, &info, &metadata,
1553		- &use_udp6_rx_checksums, true);
	1709	+ memcpy(&cfg, &geneve->cfg, sizeof(cfg));
	1710	+ err = geneve_nl2info(tb, data, extack, &cfg, true);
1554	1711	if (err)
1555	1712	return err;
1556	1713
1557		- if (!geneve_dst_addr_equal(&geneve->info, &info)) {
1558		- dst_cache_reset(&info.dst_cache);
1559		- geneve_link_config(dev, &info, tb);
	1714	+ if (!geneve_dst_addr_equal(&geneve->cfg.info, &cfg.info)) {
	1715	+ dst_cache_reset(&cfg.info.dst_cache);
	1716	+ geneve_link_config(dev, &cfg.info, tb);
1560	1717	}
1561	1718
1562	1719	geneve_quiesce(geneve, &gs4, &gs6);
1563		- geneve->info = info;
1564		- geneve->collect_md = metadata;
1565		- geneve->use_udp6_rx_checksums = use_udp6_rx_checksums;
	1720	+ memcpy(&geneve->cfg, &cfg, sizeof(cfg));
1566	1721	geneve_unquiesce(geneve, gs4, gs6);
1567	1722
1568	1723	return 0;
..	..	@@ -1582,20 +1737,23 @@
1582	1737	nla_total_size(sizeof(struct in6_addr)) + /* IFLA_GENEVE_REMOTE{6} */
1583	1738	nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TTL */
1584	1739	nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TOS */
	1740	+ nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_DF */
1585	1741	nla_total_size(sizeof(__be32)) + /* IFLA_GENEVE_LABEL */
1586	1742	nla_total_size(sizeof(__be16)) + /* IFLA_GENEVE_PORT */
1587	1743	nla_total_size(0) + /* IFLA_GENEVE_COLLECT_METADATA */
1588	1744	nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_CSUM */
1589	1745	nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_TX */
1590	1746	nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_RX */
	1747	+ nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TTL_INHERIT */
1591	1748	0;
1592	1749	}
1593	1750
1594	1751	static int geneve_fill_info(struct sk_buff skb, const struct net_device dev)
1595	1752	{
1596	1753	struct geneve_dev *geneve = netdev_priv(dev);
1597		- struct ip_tunnel_info *info = &geneve->info;
1598		- bool metadata = geneve->collect_md;
	1754	+ struct ip_tunnel_info *info = &geneve->cfg.info;
	1755	+ bool ttl_inherit = geneve->cfg.ttl_inherit;
	1756	+ bool metadata = geneve->cfg.collect_md;
1599	1757	__u8 tmp_vni[3];
1600	1758	__u32 vni;
1601	1759
..	..	@@ -1628,6 +1786,9 @@
1628	1786	nla_put_be32(skb, IFLA_GENEVE_LABEL, info->key.label))
1629	1787	goto nla_put_failure;
1630	1788
	1789	+ if (nla_put_u8(skb, IFLA_GENEVE_DF, geneve->cfg.df))
	1790	+ goto nla_put_failure;
	1791	+
1631	1792	if (nla_put_be16(skb, IFLA_GENEVE_PORT, info->key.tp_dst))
1632	1793	goto nla_put_failure;
1633	1794
..	..	@@ -1636,9 +1797,12 @@
1636	1797
1637	1798	#if IS_ENABLED(CONFIG_IPV6)
1638	1799	if (nla_put_u8(skb, IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
1639		- !geneve->use_udp6_rx_checksums))
	1800	+ !geneve->cfg.use_udp6_rx_checksums))
1640	1801	goto nla_put_failure;
1641	1802	#endif
	1803	+
	1804	+ if (nla_put_u8(skb, IFLA_GENEVE_TTL_INHERIT, ttl_inherit))
	1805	+ goto nla_put_failure;
1642	1806
1643	1807	return 0;
1644	1808
..	..	@@ -1664,19 +1828,24 @@
1664	1828	u8 name_assign_type, u16 dst_port)
1665	1829	{
1666	1830	struct nlattr *tb[IFLA_MAX + 1];
1667		- struct ip_tunnel_info info;
1668	1831	struct net_device *dev;
1669	1832	LIST_HEAD(list_kill);
1670	1833	int err;
	1834	+ struct geneve_config cfg = {
	1835	+ .df = GENEVE_DF_UNSET,
	1836	+ .use_udp6_rx_checksums = true,
	1837	+ .ttl_inherit = false,
	1838	+ .collect_md = true,
	1839	+ };
1671	1840
1672	1841	memset(tb, 0, sizeof(tb));
1673	1842	dev = rtnl_create_link(net, name, name_assign_type,
1674		- &geneve_link_ops, tb);
	1843	+ &geneve_link_ops, tb, NULL);
1675	1844	if (IS_ERR(dev))
1676	1845	return dev;
1677	1846
1678		- init_tnl_info(&info, dst_port);
1679		- err = geneve_configure(net, dev, NULL, &info, true, true);
	1847	+ init_tnl_info(&cfg.info, dst_port);
	1848	+ err = geneve_configure(net, dev, NULL, &cfg);
1680	1849	if (err) {
1681	1850	free_netdev(dev);
1682	1851	return ERR_PTR(err);
..	..	@@ -1710,9 +1879,11 @@
1710	1879	event == NETDEV_UDP_TUNNEL_DROP_INFO) {
1711	1880	geneve_offload_rx_ports(dev, event == NETDEV_UDP_TUNNEL_PUSH_INFO);
1712	1881	} else if (event == NETDEV_UNREGISTER) {
1713		- geneve_offload_rx_ports(dev, false);
	1882	+ if (!dev->udp_tunnel_nic_info)
	1883	+ geneve_offload_rx_ports(dev, false);
1714	1884	} else if (event == NETDEV_REGISTER) {
1715		- geneve_offload_rx_ports(dev, true);
	1885	+ if (!dev->udp_tunnel_nic_info)
	1886	+ geneve_offload_rx_ports(dev, true);
1716	1887	}
1717	1888
1718	1889	return NOTIFY_DONE;