Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp500520ybk; Fri, 15 May 2020 06:20:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4qBBYLwIwTg2KwkBrsFA7Q8KAWQax9pU8hw9fgccyQuhlGK1aMkzTnZGEmXhn2T4fp8jX X-Received: by 2002:a17:906:4d4a:: with SMTP id b10mr2595625ejv.262.1589548854298; Fri, 15 May 2020 06:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589548854; cv=none; d=google.com; s=arc-20160816; b=bt0bw0T8hndT+xCxwDcEZbcL0W80Wsllv1/k+LsGgq+AvTGMWtex0FcuGBGeKLmP4K bYhbdYqNg/XXcO2Av1LPuaA9NTTcmssmh45G55AKRGjZRJSeN1IFc0Uk9uk9rgqsVdpO eyQQyBvmBUMcZUyyUP0IW7bl8sg3WBhiIHlnwttRJEUFOav78GbaI7MKKXGVcYyXPEjB Lhhw87Vc+8NbjvbgAq9MJ7LF0bY9YuJd+flsOkZ+D6xBkQ7TQxWxEHmxin6dJwiEnQsj dNGE4J/JSzfsTidcA03WZ9+LVWU8t1TGUJOMmF3wGdniY0BoNWcKbhRnD8joab9DXgA5 zp7Q== 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=VBHxbXWW3Qhb1/gmMVxWWG1iraMa328VDgjrKr93eAE=; b=zSjxHeugD4HOt30bnc/v5nkSJ74d55LwzoaO3uBsqQBx2pS7TMGD1FVX6upiCStq5e nF8PkT1opzLKNuoDTW774Nx1jsBw8oVZ0A88CMf6PlGwF3ZxQ4VCNOyIb9ZCR8hIbPze 7TVdPEzzfovnXz0jqH1s1i40TG8IYDNqx4LHP+ZXPPghtol43dbnGhdgwPIm3AjBRIAy tWO8bWtlDsIdftRELQE1up+SLlNVJNfGtJJSVA0DXYElUhNNlCBtydIATmn0+SsJzPoP e2Zuz0JJm9FNFKat+70yZifEhubPFf+scuSUrTDHLBqIutXrc8buqMC08e/FYxCMz/nL wmdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=rfoG402G; 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 a4si1228598edf.478.2020.05.15.06.20.29; Fri, 15 May 2020 06:20:54 -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=rfoG402G; 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 S1727927AbgEONSV (ORCPT + 99 others); Fri, 15 May 2020 09:18:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726550AbgEONRD (ORCPT ); Fri, 15 May 2020 09:17:03 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4805EC05BD17; Fri, 15 May 2020 06:17:02 -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=VBHxbXWW3Qhb1/gmMVxWWG1iraMa328VDgjrKr93eAE=; b=rfoG402GkvPk6pL6gkT+wbdy1p r21+u08oq7R/r91zmVXwag23Vm/4KjIUp9bq9HbPlKZk5yixaeGm8AjAHgeJnrFsz2v0T6Ql82MwM jivodTXcpzQ6NsilPnzPhQUZahunzmwgJelD1eiJAxps3gD891QlE0aOgAvYBKcjqVY2ZadYZCIpD x31Yi72/sC60lYnjUIqOuz8eGF36s6VqjoYBZnUvlbgOg5Yfi8CbFAQBuTwBfsIi6NNCc+1Rzwt+Z 3EIS8pUY/49LN8TcXpyepCjcs8bzsIrKhqs2dx2g2qbZhW0q9ABiMS8lIHzZOiLZJoxCSEF/Ub1Vp MlcOBNNw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZaD0-0005iV-24; 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 23/36] mm: Allow large pages to be removed from the page cache Date: Fri, 15 May 2020 06:16:43 -0700 Message-Id: <20200515131656.12890-24-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: 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 compound pages 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 437484d42b78..9c760dd7208e 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, hpage_nr_pages(page)); VM_BUG_ON_PAGE(page_count(page) <= 0, page); } else { put_page(page); -- 2.26.2