1 files changed, 35 insertions, 10 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 0b39e7ae4383..ab20ed9b0f31 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -475,12 +475,6 @@ discard_and_relse:
 }
 EXPORT_SYMBOL(sk_receive_skb);
 
-void sk_reset_txq(struct sock *sk)
-{
-        sk_tx_queue_clear(sk);
-}
-EXPORT_SYMBOL(sk_reset_txq);
-
 struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
 {
         struct dst_entry *dst = __sk_dst_get(sk);
@@ -914,6 +908,13 @@ set_rcvbuf:
                 }
                 break;
 #endif
+
+        case SO_MAX_PACING_RATE:
+                sk->sk_max_pacing_rate = val;
+                sk->sk_pacing_rate = min(sk->sk_pacing_rate,
+                                         sk->sk_max_pacing_rate);
+                break;
+
         default:
                 ret = -ENOPROTOOPT;
                 break;
@@ -1177,6 +1178,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                 break;
 #endif
 
+        case SO_MAX_PACING_RATE:
+                v.val = sk->sk_max_pacing_rate;
+                break;
+
         default:
                 return -ENOPROTOOPT;
         }
@@ -1836,7 +1841,17 @@ EXPORT_SYMBOL(sock_alloc_send_skb);
 /* On 32bit arches, an skb frag is limited to 2^15 */
 #define SKB_FRAG_PAGE_ORDER     get_order(32768)
 
-bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag)
+/**
+ * skb_page_frag_refill - check that a page_frag contains enough room
+ * @sz: minimum size of the fragment we want to get
+ * @pfrag: pointer to page_frag
+ * @prio: priority for memory allocation
+ *
+ * Note: While this allocator tries to use high order pages, there is
+ * no guarantee that allocations succeed. Therefore, @sz MUST be
+ * less or equal than PAGE_SIZE.
+ */
+bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio)
 {
         int order;
 
@@ -1845,16 +1860,16 @@ bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag)
                         pfrag->offset = 0;
                         return true;
                 }
-                if (pfrag->offset < pfrag->size)
+                if (pfrag->offset + sz <= pfrag->size)
                         return true;
                 put_page(pfrag->page);
         }
 
         /* We restrict high order allocations to users that can afford to wait */
-        order = (sk->sk_allocation & __GFP_WAIT) ? SKB_FRAG_PAGE_ORDER : 0;
+        order = (prio & __GFP_WAIT) ? SKB_FRAG_PAGE_ORDER : 0;
 
         do {
-                gfp_t gfp = sk->sk_allocation;
+                gfp_t gfp = prio;
 
                 if (order)
                         gfp |= __GFP_COMP | __GFP_NOWARN;
@@ -1866,6 +1881,15 @@ bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag)
                 }
         } while (--order >= 0);
 
+        return false;
+}
+EXPORT_SYMBOL(skb_page_frag_refill);
+
+bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag)
+{
+        if (likely(skb_page_frag_refill(32U, pfrag, sk->sk_allocation)))
+                return true;
+
         sk_enter_memory_pressure(sk);
         sk_stream_moderate_sndbuf(sk);
         return false;
@@ -2319,6 +2343,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
         sk->sk_ll_usec          =       sysctl_net_busy_read;
 #endif
 
+        sk->sk_max_pacing_rate = ~0U;
         sk->sk_pacing_rate = ~0U;
         /*
          * Before updating sk_refcnt, we must commit prior changes to memory