[Devel] [PATCH RHEL8 COMMIT] net/skbuff: Don't waste memory reserves

[Konstantin Khorenko]

The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.39
------>
commit b8ac0b1bb27607b259c38bf63f2cc56d2b5f2169
Author: Andrey Ryabinin <aryabinin at virtuozzo.com>
Date:   Thu Jun 10 13:27:07 2021 +0300

    net/skbuff: Don't waste memory reserves
    
    We were observing network performance issues due to packets
    being dropped by sk_filter_trim_cap() since the 'skb' was allocated
    from pfmemalloc reserves:
    
        /*
         * If the skb was allocated from pfmemalloc reserves, only
         * allow SOCK_MEMALLOC sockets to use it as this socket is
         * helping free memory
         */
        if (skb_pfmemalloc(skb) && !sock_flag(sk, SOCK_MEMALLOC))
            return -ENOMEM;
    
    Memalloc sockets are used for stuff like swap over NBD or NFS
    and only memalloc sockets can process memalloc skbs. Since we
    don't have any memalloc sockets in our setups we shouldn't have
    memalloc skbs either. It simply doesn't make any sense to waste
    memory reserves on skb only to drop packets later.
    
    It appears that __dev_alloc_pages() unconditionally uses
    __GFP_MEMALLOC, so unless caller added __GFP_NOMEMALLOC, the
    __dev_alloc_pages() may dive into memory reserves.
    Later build_skb() or __skb_fill_page_desc() sets skb->pfmemalloc = 1
    so this skb always dropped by sk_filter_trim_cap().
    
    Instead of wasting memory reserves we should simply avoid using
    them in case of absence memalloc sockets in the system. Do this
    by adding __GFP_MEMALLOC only when such socket is present in the
    system.
    
    https://pmc.acronis.com/browse/VSTOR-21390
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
    
    Cherry-picked from vz7 commit a6b8d2a78d83 ("net/skbuff: Don't waste memory
    reserves")
    
    Ported to VZ8 in scope of https://jira.sw.ru/browse/PSBM-127844.
    Signed-off-by: Evgenii Shatokhin <eshatokhin at virtuozzo.com>
---
 include/linux/skbuff.h | 19 ++++++++++++++++++-
 include/net/sock.h     | 15 ---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 964393c55ebf..0ba740266077 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2900,6 +2900,21 @@ void napi_consume_skb(struct sk_buff *skb, int budget);
 void __kfree_skb_flush(void);
 void __kfree_skb_defer(struct sk_buff *skb);
 
+#ifdef CONFIG_NET
+DECLARE_STATIC_KEY_FALSE(memalloc_socks_key);
+static inline int sk_memalloc_socks(void)
+{
+	return static_branch_unlikely(&memalloc_socks_key);
+}
+#else
+
+static inline int sk_memalloc_socks(void)
+{
+	return 0;
+}
+
+#endif
+
 /**
  * __dev_alloc_pages - allocate page for network Rx
  * @gfp_mask: allocation priority. Set __GFP_NOMEMALLOC if not for network Rx
@@ -2920,7 +2935,9 @@ static inline struct page *__dev_alloc_pages(gfp_t gfp_mask,
 	 * 4.  __GFP_MEMALLOC is ignored if __GFP_NOMEMALLOC is set due to
 	 *     code in gfp_to_alloc_flags that should be enforcing this.
 	 */
-	gfp_mask |= __GFP_COMP | __GFP_MEMALLOC;
+	gfp_mask |= __GFP_COMP;
+	if (sk_memalloc_socks())
+		gfp_mask |= __GFP_MEMALLOC;
 
 	return alloc_pages_node(NUMA_NO_NODE, gfp_mask, order);
 }
diff --git a/include/net/sock.h b/include/net/sock.h
index 17eac20f03d5..f30589128174 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -885,21 +885,6 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag)
 	return test_bit(flag, &sk->sk_flags);
 }
 
-#ifdef CONFIG_NET
-DECLARE_STATIC_KEY_FALSE(memalloc_socks_key);
-static inline int sk_memalloc_socks(void)
-{
-	return static_branch_unlikely(&memalloc_socks_key);
-}
-#else
-
-static inline int sk_memalloc_socks(void)
-{
-	return 0;
-}
-
-#endif
-
 static inline gfp_t sk_gfp_mask(const struct sock *sk, gfp_t gfp_mask)
 {
 	return gfp_mask | (sk->sk_allocation & __GFP_MEMALLOC);