Message ID | 20200610201345.13273-44-willy@infradead.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=G8WG=7X=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 2217F90 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 10 Jun 2020 20:39:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E2A4E206A4 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 10 Jun 2020 20:39:06 +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="hwWRASta" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2A4E206A4 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 28AC08D0019; Wed, 10 Jun 2020 16:39:04 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 213C48D000E; Wed, 10 Jun 2020 16:39:04 -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 F0F208D0019; Wed, 10 Jun 2020 16:39:03 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0145.hostedemail.com [216.40.44.145]) by kanga.kvack.org (Postfix) with ESMTP id D90F18D000E for <linux-mm@kvack.org>; Wed, 10 Jun 2020 16:39:03 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 98B5C180AEF50 for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:39:03 +0000 (UTC) X-FDA: 76914466566.25.mist28_380d4e126dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 665DD1804E3E1 for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:39:03 +0000 (UTC) X-Spam-Summary: 2,0,0,d9e123e8876dd4a2,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3867:3870:3871:3872:3874:4321:5007:6261:6653:7576:7903:8957:10004:11026:11232:11473:11658:11914:12043:12296:12297:12555:12895:12986:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21324:21451:21627:30054,0,RBL:198.137.202.133:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.0.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:0,LUA_SUMMARY:none X-HE-Tag: mist28_380d4e126dce X-Filterd-Recvd-Size: 3141 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf24.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=WQYUHtaa1PlP1XkIa4APm8ZxDaohf3g/uelkXzjDEzk=; b=hwWRASta1tlG6WCdBl2KkJNJzr nvbYBTfI6Mu/K4m6gQEQMPCt4LO80m/FyuVq9tIMkJ18nlag0tghEzd0QiTIVzu0lZs0rset5WvKJ N5pJwzizSEwx+sOoPLBmjq8PrfTpbD7VTsJyaqD0x12p/HXI0yJPHzDqZo/Evn/z1uxGFBUvcHDVa UTyq1eTa+oiGoOwpFCZNYT+kWRClHGiofccsEnWMUQkHGAuKD8oKJPG52/BwQ3KvVEBHb4LlvZM9L HP0YPkLSaqemnXdZLxKTisKN+6Sj48890bydbdM0IWKzEuXCLJvnL1guhhfpRkJjy2LIRWjiFXayR FPX2gcfQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76b-0003Xd-0l; Wed, 10 Jun 2020 20:13:49 +0000 From: Matthew Wilcox <willy@infradead.org> To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 43/51] mm: Support storing shadow entries for THPs Date: Wed, 10 Jun 2020 13:13:37 -0700 Message-Id: <20200610201345.13273-44-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200610201345.13273-1-willy@infradead.org> References: <20200610201345.13273-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 665DD1804E3E1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 |
Large pages in the page cache
|
expand
|
diff --git a/mm/filemap.c b/mm/filemap.c index 78f888d028c5..17db007f0277 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -120,22 +120,27 @@ static void page_cache_delete(struct address_space *mapping, struct page *page, void *shadow) { XA_STATE(xas, &mapping->i_pages, page->index); - unsigned int nr = 1; + unsigned int i, nr = 1, entries = 1; mapping_set_update(&xas, mapping); /* hugetlb pages are represented by a single entry in the xarray */ if (!PageHuge(page)) { - xas_set_order(&xas, page->index, compound_order(page)); - nr = compound_nr(page); + entries = nr = thp_nr_pages(page); + if (!shadow) { + xas_set_order(&xas, page->index, thp_order(page)); + entries = 1; + } } VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageTail(page), page); - VM_BUG_ON_PAGE(nr != 1 && shadow, page); - xas_store(&xas, shadow); - xas_init_marks(&xas); + for (i = 0; i < entries; i++) { + xas_store(&xas, shadow); + xas_init_marks(&xas); + xas_next(&xas); + } page->mapping = NULL; /* Leave page->index set: truncation lookup relies upon it */