From patchwork Wed Jan 3 09:56:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13509823 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 97DA6C3DA6E for ; Wed, 3 Jan 2024 09:57:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B6BE8D0053; Wed, 3 Jan 2024 04:57:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 214DE8D0061; Wed, 3 Jan 2024 04:57:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AB168D0060; Wed, 3 Jan 2024 04:57:26 -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 E3CC58D0053 for ; Wed, 3 Jan 2024 04:57:25 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B82B2402C4 for ; Wed, 3 Jan 2024 09:57:25 +0000 (UTC) X-FDA: 81637547250.21.0265B64 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf24.hostedemail.com (Postfix) with ESMTP id 2AFBD180009 for ; Wed, 3 Jan 2024 09:57:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704275844; a=rsa-sha256; cv=none; b=k37fXJ8YxihpPM28WVnQN6ot5pN/UfWCG7k2IxcgZoencM4z1dVsPK1gNbX6dJ1rTCEpMD 8YK2RCXS7zgihJ9JN3FvZkq/Bs6lgb8mgbxP3ARYRaLsRgHDUvd3iFOc941iDAedNFhsHb ZXse9djrN/FL6LKEKAjlXo3N0Yv/GDY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704275844; 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=W4vWspD7IGDLWOIHtJgtU3+xzXnGzb0LMPh/Z5uUYMg=; b=Ihg6f3CzezGMWlUvoaB15FUZ8aCfkynZM5i7HjqrvvE7mdmJzF489nk6DIn7JcWStcLaTd ZS0UZe7vmNwuQFDYYiLnT899jUl9z+tMIMrb0toCHILJjsSjY2cYQEzhk1/+ZKSFhsVW/O SgDnXvap7Teb8M/l1XNrs21RFMaTgm8= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4T4lVn4kQZz1wrNT; Wed, 3 Jan 2024 17:56:49 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 60FA61A0172; Wed, 3 Jan 2024 17:57:19 +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; Wed, 3 Jan 2024 17:57:19 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , "Michael S. Tsirkin" , Jason Wang , Andrew Morton , Eric Dumazet , , , Subject: [PATCH net-next 2/6] page_frag: unify gfp bits for order 3 page allocation Date: Wed, 3 Jan 2024 17:56:45 +0800 Message-ID: <20240103095650.25769-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240103095650.25769-1-linyunsheng@huawei.com> References: <20240103095650.25769-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-Server: rspam08 X-Rspamd-Queue-Id: 2AFBD180009 X-Stat-Signature: kawt7cdxgtzi9xnkpp6pk1gsptuhpkdk X-Rspam-User: X-HE-Tag: 1704275842-481898 X-HE-Meta: U2FsdGVkX19GnO0ZjxZ4OgxuFIHjT3vqTpiC/KXzQjF2aNXbnUDaFIrF5Kp2uZ20bHum0oto/Z/DNkBTc7PTJVtaQ7zY/FqW5KldopX0KSgDux5Lrfhq/nn0CdLLRlEESyB4FM0TqrF8zEo5WqaKVGXAQJtin7wTOyGlDMbkcRc3E5cmYrCd3HLRc+CetFrEGdIHc3RWFd3VB1ajGA8v8K7BXboQtph4fpKJqRPHaW+wB6htMKUguJv1opRa/rB1Iw2nOoqtghgGdbwghtCweod9KiGooVpwsBHysVUQ1pzBGkzhEGIN2YqrgAmdnuC/jJGbFt0wixkRY6ktzOdpUoUeigID6gr93r0xOV0Fo48a7swNnNq1ylH73MXxfP8QeeB3TpdqmDBP+c7MCgaf6UlR+gXNENXq/ed+Jd1R5jbJYngL/bscDgLOZsc3dtXW7ndzHcCfPL2Re3bXKw1OpckF5d17VVogtnMOv8V4oL/DHazH4lQr8l0L0Vem+EH95RQX9kzUePEKSs1yaQHXoZDkyiGg0ueFvbbG2vdAMue35ubTB02gIJM8vEXUkLWH/Sc+v9N19oVkTNYVrLFqK9LAJYM2j3F/usnNPH/H3ZywMdY3DiqmR5Vxr45Z8Z6MGZa241sm1OLuz40AZ0LJSB9mciBM5bXHLWADS5N2sOp17qROiXvDsvG3diMu8PKyewodtwPUNROiRJE6vvx7oB/9Uagppg0M2YcYI+CxXdSAguVictEehkghhCDU276jfDymrHRx8IrioeWYrB5RSKnqxsuyoRVq81GpcCky6qumIZ4K0Y7xjUMWHRP6PHOQt7dqwO60LXYAlp/n5PwIL42xutP0Dn2cqyYsRXrRI4TqV64ClxnZ082oJwStND+zxhjMmVi5TwzhHwVY6jcVgXdkY1MzZXjQw+AQ0u4dLP/EZywnHPe/xRtie8V8jHJwbGSkHbge2T5e4uBQT6f 5gA== 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 CC: Alexander Duyck Reviewed-by: 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 9a16305cf985..1f0b36dd81b5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4693,8 +4693,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 446e945f736b..d643332c3ee5 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2900,7 +2900,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;