Commit 59c820b2 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

ipv6: elide flowlabel check if no exclusive leases exist 



Processes can request ipv6 flowlabels with cmsg IPV6_FLOWINFO.
If not set, by default an autogenerated flowlabel is selected.

Explicit flowlabels require a control operation per label plus a
datapath check on every connection (every datagram if unconnected).
This is particularly expensive on unconnected sockets multiplexing
many flows, such as QUIC.

In the common case, where no lease is exclusive, the check can be
safely elided, as both lease request and check trivially succeed.
Indeed, autoflowlabel does the same even with exclusive leases.

Elide the check if no process has requested an exclusive lease.

fl6_sock_lookup previously returns either a reference to a lease or
NULL to denote failure. Modify to return a real error and update
all callers. On return NULL, they can use the label and will elide
the atomic_dec in fl6_sock_release.

This is an optimization. Robust applications still have to revert to
requesting leases if the fast path fails due to an exclusive lease.

Changes RFC->v1:
  - use static_key_false_deferred to rate limit jump label operations
    - call static_key_deferred_flush to stop timers on exit
  - move decrement out of RCU context
  - defer optimization also if opt data is associated with a lease
  - updated all fp6_sock_lookup callers, not just udp

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee4f56f4

include/net/ipv6.h

+13 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/hardirq.h>

#include <linux/jhash.h>

#include <linux/refcount.h>

#include <linux/jump_label_ratelimit.h>

#include <net/if_inet6.h>

#include <net/ndisc.h>

#include <net/flow.h>
@@ -389,7 +390,18 @@ static inline void txopt_put(struct ipv6_txoptions *opt) 
		kfree_rcu(opt, rcu);

}



struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label);

struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label);



extern struct static_key_false_deferred ipv6_flowlabel_exclusive;

static inline struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk,

						    __be32 label)

{

	if (static_branch_unlikely(&ipv6_flowlabel_exclusive.key))

		return __fl6_sock_lookup(sk, label) ? : ERR_PTR(-ENOENT);



	return NULL;

}



struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space,

					 struct ip6_flowlabel *fl,

					 struct ipv6_txoptions *fopt);

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
		if (fl6.flowlabel & IPV6_FLOWLABEL_MASK) {

			struct ip6_flowlabel *flowlabel;

			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);

			if (flowlabel == NULL)

			if (IS_ERR(flowlabel))

				return -EINVAL;

			fl6_sock_release(flowlabel);

		}

net/ipv6/ip6_flowlabel.c

+23 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/slab.h>

#include <linux/export.h>

#include <linux/pid_namespace.h>

#include <linux/jump_label_ratelimit.h>



#include <net/net_namespace.h>

#include <net/sock.h>
@@ -53,6 +54,9 @@ static DEFINE_SPINLOCK(ip6_fl_lock); 


static DEFINE_SPINLOCK(ip6_sk_fl_lock);



DEFINE_STATIC_KEY_DEFERRED_FALSE(ipv6_flowlabel_exclusive, HZ);

EXPORT_SYMBOL(ipv6_flowlabel_exclusive);



#define for_each_fl_rcu(hash, fl)				\

	for (fl = rcu_dereference_bh(fl_ht[(hash)]);		\

	     fl != NULL;					\
@@ -90,6 +94,13 @@ static struct ip6_flowlabel *fl_lookup(struct net *net, __be32 label) 
	return fl;

}



static bool fl_shared_exclusive(struct ip6_flowlabel *fl)

{

	return fl->share == IPV6_FL_S_EXCL ||

	       fl->share == IPV6_FL_S_PROCESS ||

	       fl->share == IPV6_FL_S_USER;

}



static void fl_free_rcu(struct rcu_head *head)

{

	struct ip6_flowlabel *fl = container_of(head, struct ip6_flowlabel, rcu);
@@ -103,7 +114,12 @@ static void fl_free_rcu(struct rcu_head *head) 


static void fl_free(struct ip6_flowlabel *fl)

{

	if (fl)

	if (!fl)

		return;



	if (fl_shared_exclusive(fl) || fl->opt)

		static_branch_slow_dec_deferred(&ipv6_flowlabel_exclusive);



	call_rcu(&fl->rcu, fl_free_rcu);

}
@@ -240,7 +256,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net, 


/* Socket flowlabel lists */



struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label)

struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label)

{

	struct ipv6_fl_socklist *sfl;

	struct ipv6_pinfo *np = inet6_sk(sk);
@@ -260,7 +276,7 @@ struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label) 
	rcu_read_unlock_bh();

	return NULL;

}

EXPORT_SYMBOL_GPL(fl6_sock_lookup);

EXPORT_SYMBOL_GPL(__fl6_sock_lookup);



void fl6_free_socklist(struct sock *sk)

{
@@ -419,6 +435,8 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, 
	}

	fl->dst = freq->flr_dst;

	atomic_set(&fl->users, 1);

	if (fl_shared_exclusive(fl) || fl->opt)

		static_branch_deferred_inc(&ipv6_flowlabel_exclusive);

	switch (fl->share) {

	case IPV6_FL_S_EXCL:

	case IPV6_FL_S_ANY:
@@ -854,6 +872,7 @@ int ip6_flowlabel_init(void) 


void ip6_flowlabel_cleanup(void)

{

	static_key_deferred_flush(&ipv6_flowlabel_exclusive);

	del_timer(&ip6_fl_gc_timer);

	unregister_pernet_subsys(&ip6_flowlabel_net_ops);

}

net/ipv6/raw.c

+2 −2
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
			fl6.flowlabel = sin6->sin6_flowinfo&IPV6_FLOWINFO_MASK;

			if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) {

				flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);

				if (!flowlabel)

				if (IS_ERR(flowlabel))

					return -EINVAL;

			}

		}
@@ -876,7 +876,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
		}

		if ((fl6.flowlabel&IPV6_FLOWLABEL_MASK) && !flowlabel) {

			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);

			if (!flowlabel)

			if (IS_ERR(flowlabel))

				return -EINVAL;

		}

		if (!(opt->opt_nflen|opt->opt_flen))

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
		if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) {

			struct ip6_flowlabel *flowlabel;

			flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);

			if (!flowlabel)

			if (IS_ERR(flowlabel))

				return -EINVAL;

			fl6_sock_release(flowlabel);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE