Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2645515pxv; Sun, 11 Jul 2021 21:18:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx07lPubNVSHQShQasja/m4vPahOgzw0VrogRWApAl79OEFJ+JqmkdkTNd/HFMVbIN/gyyc X-Received: by 2002:a5e:dc45:: with SMTP id s5mr25242243iop.159.1626063533097; Sun, 11 Jul 2021 21:18:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626063533; cv=none; d=google.com; s=arc-20160816; b=FJu1OFCeP2FTl15iVJ9rXiSQEa0OL4qBvxAFg2W0EuIYhop8AM9VU+4hO/GFBX8cfi TQCqEkL6B9gAQzfs9eLd3JRuxwZrE5qcI79l6EPso72vj8RQVXLY1PUVHl7SgVHDig+S 9uIKMn0D6lD3A9m55/rd/FFcSA86YylDjL1FhJtDxUw6cifVcKVFP4s/UuF82plV5via GT/DcCsfuwKLbBMY0jALaMAvgd+ksDWbx0ziKY+P3p7WzVeNT1QunUPCnILFUmSC7gUW dVxq6yDWKytzPgIlrsgdFsYuBtGa87FysvVH/5U+xeDDwijfvj7zyvNrdjd/RiNs2T6H RcPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FvnKvrUT2fNk7/OyTjb1Ax4qDl3oGlD3/8sIT3O/4a8=; b=B+yAhxzExtuNXl/vDt57A0DlL4FjZAqrrocZVLniGdJ+uizJnk+wyqVc5YRJGZM4q+ BrLewj4+gZyN2t4FecyQvf0xt0WudxpXPXy9xm9/j2iM9EYPU2Z7YsgM3xI/pLK5eKyp FtT0VH9eSXAq3QGh9DGi7TAvPEBOuVDHFthMeZ3JEzD5LNqO0bO6YYsZg0jh6eJaV3iQ OQDFmQpxe1OCnjmSfTRD4SuNPydODOZn8mzXrUnmz7Zc5jwI5KUbStxKVZU4qfNGEzRe eP1fdv+Ixlu/+uqIBA1xpn5IJjuxIUZz2a+xVy3hheAEFZ6Tqw7PN3PaJulBAkS1XjOc 5n5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=fqZKTW6T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z18si17304521jat.72.2021.07.11.21.18.41; Sun, 11 Jul 2021 21:18:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=fqZKTW6T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbhGLEU4 (ORCPT + 99 others); Mon, 12 Jul 2021 00:20:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232755AbhGLEUv (ORCPT ); Mon, 12 Jul 2021 00:20:51 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 420BCC0613E9; Sun, 11 Jul 2021 21:17:16 -0700 (PDT) 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=FvnKvrUT2fNk7/OyTjb1Ax4qDl3oGlD3/8sIT3O/4a8=; b=fqZKTW6TtdDvbDhqH27ow4lpWv ITL2ujZDrU6THFtBDkEa/65oFbDX+klfUR3YNABj94//fPUtK4/y8J76LdAe3RHEaAwVKNZKb1rYa GSre3ApdeyYv8XxW1k2uMs8Ir7vR1mKagHI6C6s+iLEqQcHR5eV+6ofmV13S1jSMK2JJVYo5x0fe/ lMFLBpSIEH8iverjHjHiyDYH8Iyv/jl/RV9o8enYqkzvVtoHuy65nIj7KSB5/SJHQlsBZY8bRw1I1 HFN7+2CR1LPQN/Gz68QN/CsQ7jxX66B5JM8o2YLKu/jVHjVAfKEMTE2Lg8tNNWzM8wPGb+AchC4dm WV4rimCA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2nMu-00Greh-BD; Mon, 12 Jul 2021 04:16:40 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v13 131/137] mm/vmscan: Free non-shmem THPs without splitting them Date: Mon, 12 Jul 2021 04:06:55 +0100 Message-Id: <20210712030701.4000097-132-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712030701.4000097-1-willy@infradead.org> References: <20210712030701.4000097-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 7a2f25b904d9..8b17e46dbf32 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1470,8 +1470,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; } -- 2.30.2