From patchwork Mon Feb 5 12:45:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13545466 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 73874C48299 for ; Mon, 5 Feb 2024 12:46:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA7516B00A0; Mon, 5 Feb 2024 07:46:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E54CE6B00A1; Mon, 5 Feb 2024 07:46:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF7446B00A3; Mon, 5 Feb 2024 07:46:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C26A26B00A0 for ; Mon, 5 Feb 2024 07:46:07 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9B7C11C130E for ; Mon, 5 Feb 2024 12:46:07 +0000 (UTC) X-FDA: 81757722774.10.C6CA2E2 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf13.hostedemail.com (Postfix) with ESMTP id 7292420015 for ; Mon, 5 Feb 2024 12:46:04 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.32 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=1707137165; a=rsa-sha256; cv=none; b=JG+67GLAWu2QQuoRz/pRhk77rr50LY1wvIT4KRB3BUeFVLKvUgcJ+u1lwoMxKt48tcJTKL jeRssvnOVcWOl2TmVJNFJui6VZil2MT8P4tBjHyhXiGj1/Zc6RkYhb0hsNvoLLKnBmD+6A UrNFeuz10ImFR+veIu+aO4h7TrBpb/Q= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.32 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=1707137165; 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=BsXUlupdD/HbECJH7RvugJyOBxOScMGKwBMypQT54K2lG0I2MJLz158/vzkbPR/DibzprY zkmWTjhrdby9tObBM3Bo69FbinBeFnzPj+h/5SDMnfVzbo54TrtjY3OpmLKmV0AHBONxmT VXTePbRGHf/FED4PAiarXfw9TulZQ+E= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4TT5hD3kdwz1vtDM; Mon, 5 Feb 2024 20:45:32 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id CB9001A0172; Mon, 5 Feb 2024 20:45:59 +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; Mon, 5 Feb 2024 20:45:59 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Alexander Duyck , "Michael S. Tsirkin" , Jason Wang , Andrew Morton , , , Subject: [PATCH net-next v5 2/5] page_frag: unify gfp bits for order 3 page allocation Date: Mon, 5 Feb 2024 20:45:02 +0800 Message-ID: <20240205124506.57670-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240205124506.57670-1-linyunsheng@huawei.com> References: <20240205124506.57670-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7292420015 X-Stat-Signature: spnj7ubhcc73bu5qeya1qbotpqqfqmtn X-HE-Tag: 1707137164-622568 X-HE-Meta: U2FsdGVkX1966h+XclQjCM4ttVpy1AK4I9Xwgs0j46+VJKgz1b1dMVtBkjzNcrAjGf5Kt7oQboQCbbhRgBVaBmfSKua8U82hN8L6ya3QCmqJhtDEvxTkqVdPrywfbaRQP1gYMvgMv/Kuy2OhADoOvfT7sncgdOSc0ZSetVME6a4CBS1bwFf1BA7IhlumzXEqIP44j9f0ALymhKTw4Rrr//m7gn41PpGigWOqiqqOB5++/9eXNAAf5BQWTwSFfKanGopR2Z+YdDE659uE9ftUXKh01BX4Dy83SCZDYQwV7dXvmgQPxmTJ79u8PrnDSejyLGI4ikh1vgn34bflyO8Em4rNtCO7IBRNAWsHQVykOPHO2HDALBHUy5pIGp7d9KsVU+CrZjgCmbg8FkzFlnDl8b6E9nsMHCWYhIHCkycjXlj8mAH+nlbp2fc8Nf06ttw/kfxVtrEx9h+99E58bTVU1rSdC5JTc7Om9EQawqXLf9kVUJsqQO3yNOOl5t1518ILQOj4gt7EhBq/H4JcyTEd+S8hTCZyBOuFILdkWxj1uaKSjepuKaLuue2Ad4XGW2gGik/fowOUICodkayD0A5DQuD5n4/tKSXtkQrXlVTs5F6PczvnFgjk6a7UgUJMNWel15jrsgOETEYQr6g7ol4PTOVhbKCP1XeFTumE6ps2dq6tur39N9TrLRMLg3+/+uWZkmWKTbKLOYAxZtCvKzuDtvb+nXdgN2gSEV55CXB5pFMzilfKzTEt7qxDKAT/8UXZy1IpoCox5nMRgWobt2qLWXuJd61JnuHeI64uBeW9u5N2hktEns4I81LFOS3mlHxTCLVYGC4xVHIYjgQQWE2jHxnuRQw/myTesSkK3IGOTLSNYz+F6Mk3nQRlKFXh+8ZCouoAEcisiiH3K/b68OB2O6ztqgFUwnS8dacgwloDjyuKbSN3Ibel3QhDtzDr9qF9NclaCQJEtZohmJGnJ0j l1H17NOA xsZXKywac91uMsDW4OMFc481yv7Yu/F71dF6+wLBkf//hP3eG6L6ZxqUd9q0MQSPFOzAiT+jkejcDHlN+Xg4c7SNfetuF54ueYtDzvecvs9MxVDXWqL4SlBjcMWl3N4n2S5nXSu4+WGHGVcFwDlJEywWdKHlFwT3mt8I+Ici/MmrZVcV1mUVqKDFjVdC4cufvuum9o1+pPnFze24h7E/FvPXPqHJzRWN0J683pp14VpCQ2pFn7vhMFyLHcneeMG+u1ZIxqDNXwQ0R5+FedAK0IeZe9sUSU7f0adYXa94wBG4RdNBwhe0Y1ejVcNyvNDmKc8nvl0lgS8sUWkeXwTuUSiwofA== 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;