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,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 C5C6EC433DF for ; Wed, 10 Jun 2020 20:39:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8130D206A4 for ; Wed, 10 Jun 2020 20:39:26 +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="n3ImGHOj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8130D206A4 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 300438D0024; Wed, 10 Jun 2020 16:39:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 23D3C8D000E; Wed, 10 Jun 2020 16:39:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE15A8D0024; Wed, 10 Jun 2020 16:39:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0240.hostedemail.com [216.40.44.240]) by kanga.kvack.org (Postfix) with ESMTP id D74908D000E for ; Wed, 10 Jun 2020 16:39:22 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 9899480DADA0 for ; Wed, 10 Jun 2020 20:39:22 +0000 (UTC) X-FDA: 76914467364.19.arm14_4d009e526dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 6B96E1AB9C2 for ; Wed, 10 Jun 2020 20:39:22 +0000 (UTC) X-HE-Tag: arm14_4d009e526dce X-Filterd-Recvd-Size: 2321 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 10 Jun 2020 20:39:21 +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=GNlEMLfntSDE532epxm8/a2szgwh2sOQWwXDZZAut5w=; b=n3ImGHOjuUO9zIU7NnGb9iTHx7 4sa3MibmY3FJdosztsimDOYfZBl7yLld3xeEzyDKGf83WLEqWZVZJxZu2jmNx8zRWYx9KhGV7wbbF GG1x0oC9vXRPN2ZaoPXK8/UEnBq2vRmLPg1Do8sL33L6iw+BCGAL5T3kwxZ+FVjMmoLWIjwwzUqL6 jKLdsn4yqyECBldoeveUcK/HHHx8DYtHYp0GVmX27vajxTxTGs/ODW+C8yNUl1wX7zQFpU8a/Bved ZENUz3vpikMfHQ4JuWtOClDmFfmnMUOoVzt3nUHS4qrhnrfp6HLTRIGDX6QzIbPyVxkQ+B42qF1ke HkEiZzhw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76a-0003Wn-Nc; Wed, 10 Jun 2020 20:13:48 +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 v6 36/51] mm: Allow THPs to be removed from the page cache Date: Wed, 10 Jun 2020 13:13:30 -0700 Message-Id: <20200610201345.13273-37-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: 6B96E1AB9C2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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)" page_cache_free_page() assumes THPs are PMD_SIZE; fix that assumption. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index ab9746aff766..78f888d028c5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -248,7 +248,7 @@ static void page_cache_free_page(struct address_space= *mapping, freepage(page); =20 if (PageTransHuge(page) && !PageHuge(page)) { - page_ref_sub(page, HPAGE_PMD_NR); + page_ref_sub(page, thp_nr_pages(page)); VM_BUG_ON_PAGE(page_count(page) <=3D 0, page); } else { put_page(page); --=20 2.26.2