Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp775104ybg; Wed, 10 Jun 2020 13:24:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFIshEID6miJNguL/jE4BbXITCpUQ+6n+0eToFjGjipa/4s34AJywXRwb+ek2IIQNh17ai X-Received: by 2002:a17:906:17c5:: with SMTP id u5mr4991744eje.275.1591820657219; Wed, 10 Jun 2020 13:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591820657; cv=none; d=google.com; s=arc-20160816; b=TkYvaNgdmtLeXr0yDTZw2eF2i4OvYrh34dM+e/F8/tG5ka24BkCoL8ASTJBh99flfh 6/4EqwJr1RpAptTT+eLTtJkaTop+0z8N9SoEBpA60ALgC3mMYnoTqQrLasNtRY5yomPm nwpkCANzods7KXHduEXH8ySAuZfiNhvauBU9gndiDU0NOSzK5Z4CgXzYqKLn5/gIKm01 0nau3hz9B29ems125Meihue9+xmuPBmseJ8pkCrYdfdwNxBGVhdzKh8NSizn3YMqrzxi PbIjrkkLgING6bocym2ayiUB9uimyQgOzxN4IxY0bnGnIQRN36wbgCRZ8uq22iUo7bxD dlUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GNlEMLfntSDE532epxm8/a2szgwh2sOQWwXDZZAut5w=; b=GItpsLljQXYXthTmSccuVHB8Q5mryiOuddwWj/DLAIQjimd/fcRfvFA1Slb/WOuoiW /NCaZUlpt1pZASNOKAffONmA/lyIjhwyIKxd0jL2PsS7GC9Od62yNkboHN2rkRHtshO3 Jt5kI/7n/HE1hwO0vp2Q1wOF5BKujxoiBJKWP8l1F0wNIjmzZ7UkFzP0q605TjKrup3p SVsSEtA3OpZ/nY6bfGFXkyduws1wyOS0dq4japuswhXaQYtexbznOdFvf9fJK/lyrCYl O00p2OOSB4B/Uk+UWqELMkTzJPuqIxv+UO0JCx6K0HD8RS67f8k5EUN6xaJfp9B4Qm/d bQOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=n3ImGHOj; 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 z14si646585ejb.309.2020.06.10.13.23.54; Wed, 10 Jun 2020 13:24:17 -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=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=n3ImGHOj; 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 S1730846AbgFJUPl (ORCPT + 99 others); Wed, 10 Jun 2020 16:15:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730570AbgFJUNv (ORCPT ); Wed, 10 Jun 2020 16:13:51 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E12BAC008637; Wed, 10 Jun 2020 13:13:48 -0700 (PDT) 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 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); 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) <= 0, page); } else { put_page(page); -- 2.26.2