From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0795C433E0 for ; Fri, 15 May 2020 13:40:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 56CAD20657 for ; Fri, 15 May 2020 13:40:34 +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="KB8xI84b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56CAD20657 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 35ABE8005B; Fri, 15 May 2020 09:40:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 30C6480054; Fri, 15 May 2020 09:40:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FAA68005B; Fri, 15 May 2020 09:40:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0126.hostedemail.com [216.40.44.126]) by kanga.kvack.org (Postfix) with ESMTP id 08F6D80054 for ; Fri, 15 May 2020 09:40:24 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id BCC00180AD801 for ; Fri, 15 May 2020 13:40:23 +0000 (UTC) X-FDA: 76819062726.15.rice47_36c79677de1c X-HE-Tag: rice47_36c79677de1c X-Filterd-Recvd-Size: 3116 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 May 2020 13:40:23 +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=J5D9xGGBSFhSBZQFLLkizdfmJQQ9VTJ9BzrD2DVYvp4=; b=KB8xI84bU5Vdya+GCcFphefntf wvsHkKCp9bbfGbppQcNHNf0QFh6cqNy4qevBWrUv4XigrxvTYt7pGT1ayXXp4iY3XnLHKuwQuTgVn QIzGJ1AceBBekhcvWCH1Ey8JApsbu6mRWmarzmhSBEmWCSYI0vBqmRGwRrNqEMHeODJo1ezIfjIgU AruDLjDFMPNoMYqmC7XcY4WSlT2NlmNV0h9XIQlL2yPwQjDbFk05SXROE3H+VMm8LdAwB4WDt1/hV 6hzYPKZtpgqcgsn38IPEnXi0ikz1GiuytgTqR/ieyDBB+VSJ7/9N0Id2VTIRrHEMx45Wodh+KySa8 O3CPAJ5A==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZaD0-0005li-Du; Fri, 15 May 2020 13:17:02 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 28/36] mm: Support storing shadow entries for large pages Date: Fri, 15 May 2020 06:16:48 -0700 Message-Id: <20200515131656.12890-29-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200515131656.12890-1-willy@infradead.org> References: <20200515131656.12890-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: From: "Matthew Wilcox (Oracle)" If the page is being replaced with a NULL, we can do a single large store= , but for now we have to use a loop to store one shadow entry in each entry= . Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 9c760dd7208e..0ec7f25a07b2 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 =3D 1; + unsigned int i, nr =3D 1, entries =3D 1; =20 mapping_set_update(&xas, mapping); =20 /* hugetlb pages are represented by a single entry in the xarray */ if (!PageHuge(page)) { - xas_set_order(&xas, page->index, compound_order(page)); - nr =3D compound_nr(page); + entries =3D nr =3D hpage_nr_pages(page); + if (!shadow) { + xas_set_order(&xas, page->index, thp_order(page)); + entries =3D 1; + } } =20 VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageTail(page), page); - VM_BUG_ON_PAGE(nr !=3D 1 && shadow, page); =20 - xas_store(&xas, shadow); - xas_init_marks(&xas); + for (i =3D 0; i < entries; i++) { + xas_store(&xas, shadow); + xas_init_marks(&xas); + xas_next(&xas); + } =20 page->mapping =3D NULL; /* Leave page->index set: truncation lookup relies upon it */ --=20 2.26.2