net: Add FLOWI_FLAG_CAN_SLEEP.

And set is in contexts where the route resolution can sleep.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/flow.h b/include/net/flow.h
index f2080e65276d14e308095e9cc1676ce5c8158aa1..fd0413873b8ed58e985c3377ba42657f5a15036c 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -50,6 +50,7 @@ struct flowi {
        __u8    flags;
 #define FLOWI_FLAG_ANYSRC              0x01
 #define FLOWI_FLAG_PRECOW_METRICS      0x02
+#define FLOWI_FLAG_CAN_SLEEP           0x04
        union {
                struct {
                        __be16  sport;

diff --git a/include/net/route.h b/include/net/route.h
index 6de4333d600244227c97f7d6344bcb9453cc7cbe..1be5c05a09055f90a59846210fa5b55ac94929c7 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -185,6 +185,8 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst,
                fl.flags |= FLOWI_FLAG_ANYSRC;
        if (protocol == IPPROTO_TCP)
                fl.flags |= FLOWI_FLAG_PRECOW_METRICS;
+       if (can_sleep)
+               fl.flags |= FLOWI_FLAG_CAN_SLEEP;
 
        if (!dst || !src) {
                err = __ip_route_output_key(net, rp, &fl);

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index e1857658964d33e576d3f2acec59eb5ad77d57ab..e8e8613bcbccf5c9f7a16a823bcefe9a97977328 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -555,7 +555,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                    .fl4_tos = tos,
                                    .proto = inet->hdrincl ? IPPROTO_RAW :
                                                             sk->sk_protocol,
-                                 };
+                                   .flags = FLOWI_FLAG_CAN_SLEEP,
+               };
                if (!inet->hdrincl) {
                        err = raw_probe_proto_opt(&fl, msg);
                        if (err)

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 790187b5c308b28e11765e2a22293bc2596acf54..c6bcc93debd5f4334abc90880c2ede0d3353a7db 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -914,9 +914,11 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                    .fl4_src = saddr,
                                    .fl4_tos = tos,
                                    .proto = sk->sk_protocol,
-                                   .flags = inet_sk_flowi_flags(sk),
+                                   .flags = (inet_sk_flowi_flags(sk) |
+                                             FLOWI_FLAG_CAN_SLEEP),
                                    .fl_ip_sport = inet->inet_sport,
-                                   .fl_ip_dport = dport };
+                                   .fl_ip_dport = dport
+               };
                struct net *net = sock_net(sk);
 
                security_sk_classify_flow(sk, &fl);

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 28209b2d254d4e74a1f7e6798fe4ce57206921b8..77b1942f335becda373de0f8085c16752093bc56 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1026,6 +1026,7 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
        if (final_dst)
                ipv6_addr_copy(&fl->fl6_dst, final_dst);
        if (want_blackhole) {
+               fl->flags |= FLOWI_FLAG_CAN_SLEEP;
                err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
                if (err == -EREMOTE)
                        err = ip6_dst_blackhole(sk, &dst, fl);
@@ -1070,6 +1071,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
        if (final_dst)
                ipv6_addr_copy(&fl->fl6_dst, final_dst);
        if (want_blackhole) {
+               fl->flags |= FLOWI_FLAG_CAN_SLEEP;
                err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
                if (err == -EREMOTE)
                        err = ip6_dst_blackhole(sk, &dst, fl);