Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp631580ybz; Wed, 29 Apr 2020 06:42:35 -0700 (PDT) X-Google-Smtp-Source: APiQypKuWUtkx1Znp1NUJMhu31Ovs/PNnk9THl4+ZCFpmT0NI84i+Tsvx39vRrV/Pa9qCzfVzFFf X-Received: by 2002:a17:906:1dce:: with SMTP id v14mr2718715ejh.244.1588167754974; Wed, 29 Apr 2020 06:42:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588167754; cv=none; d=google.com; s=arc-20160816; b=mHYI9iXgDWuxsn+ys9GZcdoV+LdYuiCMQppB4SCSWRmr/b1LPWgaLiLFG+R1PIT+8Z DYZvuzPW2++ngM8Si8+qSQQLzmTzXAmltJ9zfNpnYCzoFygawjRc3s2HojQFFiJl5kVr FGl86RjX4ci3nMsmapZGRMEEwEJ+uNzffD79IFwLKr6UGL/qYe96dcLNAmYL/lkRWZAD GIy+A9l19JmcJIkhgmTUuE5xDGb9AacLx4Ia9MQvw7gjGTVsdNR3+bcXwIf1+yVKi9Lk 5JAenWyy+WgOrw/TU0Fyc6VqeVVluCiYiNB2clw/l2kVAYKLzmSFp4ekj1Wfyi8XWgLo LzQw== 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=bLegsrf1DhSkc7w1f1NHk29akaQzX/hYK/HqXtMKqBY=; b=mQkxuhG0sQXOH8cMU5K0Y28P/0Vg3AGlwRksWzfB8CIAL/+YpQKxP+q705cz3wADgM jNms5o/EKYQk7SG3qNEI++2GNF0nBYSUpUb8IdSCchhvoBiqXrKlO+x9oCBKYl9Mma9u rCYm5ifkZD2JJxFHFpZ3NdoEADec+N1EtzAWnotiLwmNlOQIyMnuodfK2nyF2NIM/Bcm bR5MleqwQwKaMUeuYVZF8dtd9WdiolQJB7Bv/O99UNlfuo5ETz+TySn/VGLnHWvduXWV DcO95gECtm7QNlzfljIDcEzSutW/FLaRT28c4++YF9jFmtFoSaGVcCQk4T1aLqIMUIzN dN7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="D/NhGevB"; 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 jz6si3719086ejb.327.2020.04.29.06.42.11; Wed, 29 Apr 2020 06:42:34 -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="D/NhGevB"; 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 S1727932AbgD2Nhp (ORCPT + 99 others); Wed, 29 Apr 2020 09:37:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727087AbgD2NhB (ORCPT ); Wed, 29 Apr 2020 09:37:01 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE717C03C1AE; Wed, 29 Apr 2020 06:36:59 -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=bLegsrf1DhSkc7w1f1NHk29akaQzX/hYK/HqXtMKqBY=; b=D/NhGevB1GCZkpjQ5e/LyIzhLa MiCHOSb2ZqRew0WiSYEp6RelJc/meuYuQ5BKuBvt4AsHoF2mYVMVBVYW9fSVTMN24WRm4ZL707JqM S9juOe2bWgsJ1km49tzmMVdnbOCLbdw0oJSsYZ8wowk6q7syX3+ZRV4UL6Hh/yIjNbCe0H4MAiL1S h3eqQ3ClygNYMAm6rlUqANJD8gOdzEuYhz6LGqut5C4c56wfeJjAN7ILxjitlYyaWc4vHQYoGrljq AJUV0zjZzknj+w64+fKBcMiJoIekzy9zw+cSYQcPoLXKaO1SBzcqPHCZuBo6wfP46o7pbMFsvfCv7 O7gxEpHQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTmtX-0005wI-Pq; Wed, 29 Apr 2020 13:36:59 +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 v3 19/25] mm: Allow large pages to be removed from the page cache Date: Wed, 29 Apr 2020 06:36:51 -0700 Message-Id: <20200429133657.22632-20-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200429133657.22632-1-willy@infradead.org> References: <20200429133657.22632-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 842afee3d066..8c174e6064d4 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