Message ID | 20201026183136.10404-8-willy@infradead.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=wmCO=EB=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 29C1661C for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 26 Oct 2020 18:31:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E21C8222C8 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 26 Oct 2020 18:31:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="KPkJdabC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E21C8222C8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B996A6B0070; Mon, 26 Oct 2020 14:31:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B4BB66B0071; Mon, 26 Oct 2020 14:31:47 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3A106B0072; Mon, 26 Oct 2020 14:31:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0111.hostedemail.com [216.40.44.111]) by kanga.kvack.org (Postfix) with ESMTP id 72E106B0071 for <linux-mm@kvack.org>; Mon, 26 Oct 2020 14:31:47 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0C6111EF1 for <linux-mm@kvack.org>; Mon, 26 Oct 2020 18:31:47 +0000 (UTC) X-FDA: 77414920254.05.pain33_0d126cd27275 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id E8FCB1801669F for <linux-mm@kvack.org>; Mon, 26 Oct 2020 18:31:46 +0000 (UTC) X-Spam-Summary: 1,0,0,dcbb11debff17f31,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:965:968:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2689:2731:2895:3138:3139:3140:3141:3142:3352:3867:3868:3870:3872:3874:4250:4321:4390:5007:6117:6119:6261:6653:7901:8957:10004:11026:11658:11914:12043:12296:12297:12438:12555:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21451:21627:21740:30054,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04yfa8yyq4gnorj381hf73fxtdz59yci316quy8s4wun3kxaf1aj7pz8sx7ktmg.5mni3mr3bqnnapgpk41973yygadn1rmfgkuzofotdem84x1w4t7fkdyzqx36p7p.q-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: pain33_0d126cd27275 X-Filterd-Recvd-Size: 2645 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Mon, 26 Oct 2020 18:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=jHLyIiDmxeGXLQCL76Xy90AvFA3vsDCNnmRUt/Ap55Y=; b=KPkJdabCvCiouVVwWZADVaDxtT QtXkiHVf4Fo+Lh2ULqRKFikslOihRo9GbzY7tmdv/EV1WF2yzqE90/XXZZbiYIzCVJnFYdemr5AES MT+E1/M6UFkaqsVhFCX/DcYBaZbuBWQrVR9Ik+0o4BvMarA+USkaRi+lL5shCv/gy+dQ79uBjxghU Rh7br//cL35PhZkz7r4XiTjLMyZb9xiNdQgwvD6+Xh5F0CoccrZJ6nusojPAG+m9KL98ux7qPAB6b 3v32X0phAjQbT53q1ZEPLqPIKev4DV3niNXE2aHkT2f8wV74vTJZkH6m8LfjnzHkVKNkFPdwLgokU Bv9tW4BQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX7HT-0002jv-9N; Mon, 26 Oct 2020 18:31:43 +0000 From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-fsdevel@vger.kernel.org Subject: [PATCH 7/9] mm/vmscan: Free non-shmem THPs without splitting them Date: Mon, 26 Oct 2020 18:31:34 +0000 Message-Id: <20201026183136.10404-8-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201026183136.10404-1-willy@infradead.org> References: <20201026183136.10404-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: <linux-mm.kvack.org> |
Series |
More THP fixes
|
expand
|
diff --git a/mm/vmscan.c b/mm/vmscan.c index 1b8f0e059767..8e60ae2fabd1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1274,8 +1274,8 @@ static unsigned int shrink_page_list(struct list_head *page_list, /* Adding to swap updated mapping */ mapping = page_mapping(page); } - } else if (unlikely(PageTransHuge(page))) { - /* Split file THP */ + } else if (PageSwapBacked(page) && PageTransHuge(page)) { + /* Split shmem THP */ if (split_huge_page_to_list(page, page_list)) goto keep_locked; }
We have to allocate memory in order to split a file-backed page, so it's not a good idea to split them. It also doesn't work for XFS because pages have an extra reference count from page_has_private() and split_huge_page() expects that reference to have already been removed. Unfortunately, we still have to split shmem THPs because we can't handle swapping out an entire THP yet. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)