From patchwork Wed Feb 28 09:30:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13575103 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 96993C54E41 for ; Wed, 28 Feb 2024 09:32:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1113D6B00A3; Wed, 28 Feb 2024 04:32:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 09AF26B00A4; Wed, 28 Feb 2024 04:32:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA44A6B00A5; Wed, 28 Feb 2024 04:32:05 -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 D7A286B00A3 for ; Wed, 28 Feb 2024 04:32:05 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B561EA140F for ; Wed, 28 Feb 2024 09:32:05 +0000 (UTC) X-FDA: 81840696210.04.93E1F1A Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf20.hostedemail.com (Postfix) with ESMTP id 6A44F1C0006 for ; Wed, 28 Feb 2024 09:32:03 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.191 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=1709112724; a=rsa-sha256; cv=none; b=NTJ/jf07nnqgEXpi03YycqRbXyLQtchWqUJ+LyU3eTHc4JR+1t/uA0sWqff+TmhbAH53q/ pv+V1zYmqvJw3WOPkCU7Sa4QGf1HTUuQAOup9NoUHUtEpfBKC1wahoHEaa8KmKrd0daFWu OYMmcOGqExzIJa1PPbePBBYo/+vzi7E= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.191 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=1709112724; 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=j/1JfrnawbAOp+6kwWbvQ2Ur8RFze5N0GSOLfndyATo=; b=FV41AfsAmqpBmYJsU/RMhqkK9FSF0XMSfB8fL3SSEM3GR8rG/WT0f1CL5cpgNrMKQ/99q+ uNEEpZZIGI9OfSuZfvf2BS0R+n+H7V4byGXbq8wItdH6u+ti792ZkKc6Ddhg/Y6wmxC/u6 rMt1JXlxPt7rwvXDvzX2b0EXAS9pESE= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Tl8BW4Jfyz1b1CP; Wed, 28 Feb 2024 17:26:59 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 9A90B1A0172; Wed, 28 Feb 2024 17:31:58 +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_256_GCM_SHA384) id 15.1.2507.35; Wed, 28 Feb 2024 17:31:58 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Alexander Duyck , "Michael S. Tsirkin" , Jason Wang , Andrew Morton , , , Subject: [PATCH net-next v6 2/5] page_frag: unify gfp bits for order 3 page allocation Date: Wed, 28 Feb 2024 17:30:09 +0800 Message-ID: <20240228093013.8263-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240228093013.8263-1-linyunsheng@huawei.com> References: <20240228093013.8263-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6A44F1C0006 X-Stat-Signature: x5hj3pmnpg65e4wsdqewbwizpyw3zu6i X-HE-Tag: 1709112723-532483 X-HE-Meta: U2FsdGVkX18fDFGN+gjdnojKG8FvYNExf06kDyVOJUbQ6wJVJKlIA8LDUJDUFVgqMFZERGhg31SpUWiF1OMq1dTI/1M6goZo+77yJNFL+rkcFs01ahTo/BKgbgdp6nb8xo92OQsqBmbyckRKdaQrMSK2eQSN8xAoUx40LUHDB06LdZ3gRLh6+nuqzV2d0HSvV6qwFDrgD2SirKJ3/WicZ5SXamkm6p9Z2bLNzYMYiKTNVGKFteccuB6vzwYUBFVV/RZCtUmctLIUiEOyBL7HzVMKAwcyUkEkPx+MI+N4GHG4bv/f3Z+WSY+qcEwr0jPZ/MHVh9MDk6894UWiDwhyJQtAmUr6UyFVjsL6m6GdL3nK570VNqxSF7aBS/tx92W1KN5d/PqDLb6pfQRacFFZSre9TvjOIM3RZHrlak6MhAF+wtfGVrrCh8Ex9v/bX9Us5zdF9a32dCELdJ4T2ETeMspHQ2e0Ey28GhU0POxNPNxDCk1jL6lyIEZko6kSKssvkEBTU29j+XvyKL27GyE/1LxtAPJQjoYrM3qlj6y4WM8+BDKNUJOQUbnjC7c4nvuJ2X3LNe9q9EcAVIRObw70NAYNX8aQIBmDpyxlaZTtLfqIqvx6xKHop9WoO5O4sr9N5nFmut9tT0X7YA8nM+E7JuMBOFWImCwOi9ZH22LcBVIdbbLlGhkH1gU2K+LlDUZFV49WOwG7ptcHtY+aT0wpmFb3hSMWMgzxZ4PLXc+HPvluC1ACak0aM8nuiuee5Gd+24NqJetcdDAvwwRuahHRVzQ2gXwnCsbmUJpaDfD0slknlYr/dLdVkjdyYr9wqKjpV7gBXh9rz0MkPDdDKNsxhZrGH3aDd+XnDOlBmhxUzb+t+f77LQmRRN27Hk9ZkSZPvC2r0G3Ce6SzBweEoJBcfqOxNcpPqfKdfamjI+0bjoe8rOW+7kitZq9iCfLTOswOKHOxEVOeBSjuuaqBx8z nJQ== 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 implementations 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 vhost_net_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. Leave the gfp unifying for page frag implementation in sock.c for now as suggested by Paolo Abeni. Signed-off-by: Yunsheng Lin Reviewed-by: Alexander Duyck CC: Alexander Duyck --- drivers/vhost/net.c | 2 +- mm/page_alloc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 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;