Merge branch 'ipv6-sr-perf-improvements' (f106d164) · Commits · 戴 / test

net/ipv6/seg6_iptunnel.c

+28 −3

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ static int seg6_do_srh_encap(struct sk_buff skb, struct ipv6_sr_hdr osrh)
		hdrlen = (osrh->hdrlen + 1) << 3;
		tot_len = hdrlen + sizeof(*hdr);

		err = pskb_expand_head(skb, tot_len, 0, GFP_ATOMIC);
		err = skb_cow_head(skb, tot_len);
		if (unlikely(err))
		return err;

		@@ -156,7 +156,7 @@ static int seg6_do_srh_inline(struct sk_buff skb, struct ipv6_sr_hdr osrh)

		hdrlen = (osrh->hdrlen + 1) << 3;

		err = pskb_expand_head(skb, hdrlen, 0, GFP_ATOMIC);
		err = skb_cow_head(skb, hdrlen);
		if (unlikely(err))
		return err;

		@@ -237,6 +237,9 @@ static int seg6_do_srh(struct sk_buff *skb)

		static int seg6_input(struct sk_buff *skb)
		{
		struct dst_entry *orig_dst = skb_dst(skb);
		struct dst_entry *dst = NULL;
		struct seg6_lwt *slwt;
		int err;

		err = seg6_do_srh(skb);
		@@ -245,8 +248,30 @@ static int seg6_input(struct sk_buff *skb)
		return err;
		}

		slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate);

		#ifdef CONFIG_DST_CACHE
		preempt_disable();
		dst = dst_cache_get(&slwt->cache);
		preempt_enable();
		#endif

		skb_dst_drop(skb);

		if (!dst) {
		ip6_route_input(skb);
		#ifdef CONFIG_DST_CACHE
		dst = skb_dst(skb);
		if (!dst->error) {
		preempt_disable();
		dst_cache_set_ip6(&slwt->cache, dst,
		&ipv6_hdr(skb)->saddr);
		preempt_enable();
		}
		#endif
		} else {
		skb_dst_set(skb, dst);
		}

		return dst_input(skb);
		}