From patchwork Tue Jan 30 11:37:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13537370 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25254C47DDF for ; Tue, 30 Jan 2024 11:38:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AAD896B0085; Tue, 30 Jan 2024 06:38:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A5E576B0087; Tue, 30 Jan 2024 06:38:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8FEB36B008C; Tue, 30 Jan 2024 06:38:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7C5696B0085 for ; Tue, 30 Jan 2024 06:38:10 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 52557406EE for ; Tue, 30 Jan 2024 11:38:10 +0000 (UTC) X-FDA: 81735778740.25.12AA08A Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf30.hostedemail.com (Postfix) with ESMTP id 8271780020 for ; Tue, 30 Jan 2024 11:38:07 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706614688; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e1pknDONHysj+m9kim1Vp+hm/0LOKTlssTV6yUUkXBs=; b=xmdqg+1yRmlgNPnUSdpHdhmH1m12ow/I1WgUyqM96YNWukxhbhrbaZSba4XVM/F06oOZwV X7MhFz6LnDFz/cpFpMM/mTtbe2d4IDPI4ILg5wVLUJoDXZvHxvMmj1Fb54e+eUn9oGjpFT 2LJ7WCu6H9AAd6BDmWpN6YZqHP13Kro= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706614688; a=rsa-sha256; cv=none; b=OoJIYlQ2F4dyGiZRar4rDKFZsQyRk8dudRuZnyLLvfAgJ0u0PJRJuLOtiWE8phjWJR5cTS G1+Q8SVyVjss8Iu36kq0R1vP7U0ch1VG7tpicQnMVIwFm9vk17vJIyAcn3M7wM8anRXfX5 PYFCc2cwbaOXK/sKOBMIvguLdlZHS9A= Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4TPNQz0vJ8z1Q8H5; Tue, 30 Jan 2024 19:36:11 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 1039C1A016B; Tue, 30 Jan 2024 19:38:01 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpemm500005.china.huawei.com (7.185.36.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 30 Jan 2024 19:38:00 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Alexander Duyck , "Michael S. Tsirkin" , Jason Wang , Andrew Morton , Eric Dumazet , , , Subject: [PATCH net-next v4 2/5] page_frag: unify gfp bits for order 3 page allocation Date: Tue, 30 Jan 2024 19:37:07 +0800 Message-ID: <20240130113710.34511-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240130113710.34511-1-linyunsheng@huawei.com> References: <20240130113710.34511-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Queue-Id: 8271780020 X-Rspam-User: X-Stat-Signature: dc1qfadzr8u8xdbna4ae1zq1fgbh7djk X-Rspamd-Server: rspam01 X-HE-Tag: 1706614687-578803 X-HE-Meta: U2FsdGVkX1/SsZOgyIf0a1a+NvbjHa5DsCnn2anUemkGqlxbj25p7rvxSuSHrfe1DBJ4KwCvDs280+Bixc3Yt3/hvAqVQm97MmJNahq8nrhosSLU8p34HwzbUosGF+vbpv9LjXLhJOlrb4sMAx6B8MX20fIoc7Cj/Kk3jZk5s2k2kC78JMVrWcNzm6dFBItzkBKPmXzxRKc0yzC3xIwAan0l2TY/KCoV+E7Qu4tibmmOwqsjseqNNU8EcGAMWsMepyGbe8KYtINsmCfBC0dhUJbciKPkz07rDPSEOhxuhdKuf6apjM8g7nAOUH8GmR3fS7Qk0iQe5GOzTAMzcTWMv1miU6AJfiZJ+9Vh02kLFLyKbfSjMR2v4XVFumXJjmR2XtM+rHEfDxlX29X3qYybLNs2de6tTBeGXnDsMBY2NC9B98Yw3T6wz4bxB7kC/d7aolrNnkt28A6xhlEHlRvNLzLSZdrCl73S4ku3xfQF3yANbLit05/3neWF8JFYnddntdH2dBg1Hyu2aTKajsHsEhOlMSKiIheu2xPAVncOSEjccTCnuJgmvIs2Yq2FNBdNkRFoKRBtqLMu83Y6y9dKDikO8mQOPiXlQBgWTF1hTc2GG9YTj4/brjT8kuGSCJLNtatZcAN/Ifl1Sn8br1Iggp6uOdzJQnl04BGVxSrhXk4TT0AXF+9d7t0us/eljpzsEYsvZkejW0VwpNmL1R4y3siFRAk3aIpICpIOprG26p2EUinYu6nsucCDMieFS/Wy9ZPXzRMUgZyofYbdtGKWVgi4but3F0Lo+VJB0VFnNY/ON6fl3tX79Ld7I6Excm1O2VZxpQ/FLLwoohoIeRMbmQXwKjWKhp6AWJn3/VNfVX4U/WcX+QuQCHZTWa3UyIsCzZS1T2AzHI+rw2l/mNh0oTeCYQjQt7J1wPkFTwrzU063E+JLVLxFH+zPYFJtg0Iu0VhVdH6tG3neXcR50lk Jo58M8xt 7olob3S3NotMZz2e2VSS8SMfT5evwEahwgF1Xaunc652bnOck3i/AvPk7RL/sUvPhCCH6TT8QDLaK9Se4vyLaPjrUzBrZnZXLyiZKtH/o0A/9oUFmDRnCw1SuPPVnxQCO/ej2BiXMKpw3iaP+huY7xmKZpwQzWCg9Ma66f5CAghVm0PkJX5KMW36oQXJImT83Ro8j+75gtlupCTBkGSo7WWo/38EUr+gjv0eCUtUoPhYjxdE4CZSMz7+1klNwZ+SQmoEmkaSms78JdJ/woYssFQ6HMiKBdKCPNU34WQ4uJq2UVuoG3P3afAHhNdWZbNv+kJA5HKgIi/SeI8/5nYhTfOlkXw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Currently there seems to be three page frag implementions which all try to allocate order 3 page, if that fails, it then fail back to allocate order 0 page, and each of them all allow order 3 page allocation to fail under certain condition by using specific gfp bits. The gfp bits for order 3 page allocation are different between different implementation, __GFP_NOMEMALLOC is or'd to forbid access to emergency reserves memory for __page_frag_cache_refill(), but it is not or'd in other implementions, __GFP_DIRECT_RECLAIM is masked off to avoid direct reclaim in skb_page_frag_refill(), but it is not masked off in __page_frag_cache_refill(). This patch unifies the gfp bits used between different implementions by or'ing __GFP_NOMEMALLOC and masking off __GFP_DIRECT_RECLAIM for order 3 page allocation to avoid possible pressure for mm. Signed-off-by: Yunsheng Lin Reviewed-by: Alexander Duyck CC: Alexander Duyck --- drivers/vhost/net.c | 2 +- mm/page_alloc.c | 4 ++-- net/core/sock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index f2ed7167c848..e574e21cc0ca 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -670,7 +670,7 @@ static bool vhost_net_page_frag_refill(struct vhost_net *net, unsigned int sz, /* Avoid direct reclaim but allow kswapd to wake */ pfrag->page = alloc_pages((gfp & ~__GFP_DIRECT_RECLAIM) | __GFP_COMP | __GFP_NOWARN | - __GFP_NORETRY, + __GFP_NORETRY | __GFP_NOMEMALLOC, SKB_FRAG_PAGE_ORDER); if (likely(pfrag->page)) { pfrag->size = PAGE_SIZE << SKB_FRAG_PAGE_ORDER; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c0f7e67c4250..636145c29f70 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4685,8 +4685,8 @@ static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, gfp_t gfp = gfp_mask; #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) - gfp_mask |= __GFP_COMP | __GFP_NOWARN | __GFP_NORETRY | - __GFP_NOMEMALLOC; + gfp_mask = (gfp_mask & ~__GFP_DIRECT_RECLAIM) | __GFP_COMP | + __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC; page = alloc_pages_node(NUMA_NO_NODE, gfp_mask, PAGE_FRAG_CACHE_MAX_ORDER); nc->size = page ? PAGE_FRAG_CACHE_MAX_SIZE : PAGE_SIZE; diff --git a/net/core/sock.c b/net/core/sock.c index 88bf810394a5..8289a3d8c375 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2919,7 +2919,7 @@ bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t gfp) /* Avoid direct reclaim but allow kswapd to wake */ pfrag->page = alloc_pages((gfp & ~__GFP_DIRECT_RECLAIM) | __GFP_COMP | __GFP_NOWARN | - __GFP_NORETRY, + __GFP_NORETRY | __GFP_NOMEMALLOC, SKB_FRAG_PAGE_ORDER); if (likely(pfrag->page)) { pfrag->size = PAGE_SIZE << SKB_FRAG_PAGE_ORDER;