From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Lemon Subject: [PATCH 1/2 net-next] net: Don't return pfmemalloc pages to the page pool. Date: Thu, 20 Dec 2018 14:21:32 -0800 Message-ID: <20181220222133.1314092-1-jonathan.lemon@gmail.com> Mime-Version: 1.0 Content-Type: text/plain To: Return-path: Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:39556 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732488AbeLTWVm (ORCPT ); Thu, 20 Dec 2018 17:21:42 -0500 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id wBKMEc1Q002945 for ; Thu, 20 Dec 2018 14:21:42 -0800 Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 2pggrdrnb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 20 Dec 2018 14:21:42 -0800 Sender: netdev-owner@vger.kernel.org List-ID: Return pfmemalloc pages back to the page allocator, instead of holding them in the page pool. Signed-off-by: Jonathan Lemon --- net/core/page_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 43a932cb609b..364b893be66f 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -233,7 +233,7 @@ void __page_pool_put_page(struct page_pool *pool, * * refcnt == 1 means page_pool owns page, and can recycle it. */ - if (likely(page_ref_count(page) == 1)) { + if (likely(page_ref_count(page) == 1 && !page_is_pfmemalloc(page))) { /* Read barrier done in page_ref_count / READ_ONCE */ if (allow_direct && in_serving_softirq()) -- 2.17.1