From patchwork Wed Sep 25 00:52:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11159813 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49748912 for ; Wed, 25 Sep 2019 00:52:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F35AF21655 for ; Wed, 25 Sep 2019 00:52:21 +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="KBSXnigF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F35AF21655 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 06BDE6B0008; Tue, 24 Sep 2019 20:52:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 01A8E6B000C; Tue, 24 Sep 2019 20:52:20 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E23D26B000D; Tue, 24 Sep 2019 20:52:20 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0100.hostedemail.com [216.40.44.100]) by kanga.kvack.org (Postfix) with ESMTP id BBECA6B0008 for ; Tue, 24 Sep 2019 20:52:20 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 3CE4A824376D for ; Wed, 25 Sep 2019 00:52:20 +0000 (UTC) X-FDA: 75971616840.20.ball44_6ba9246af9e35 X-Spam-Summary: 2,0,0,b17dd6f785a59215,d41d8cd98f00b204,willy@infradead.org,:linux-fsdevel@vger.kernel.org::linux-kernel@vger.kernel.org:william.kucharski@oracle.com:willy@infradead.org,RULES_HIT:41:355:379:541:800:960:966:968:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:3138:3139:3140:3141:3142:3352:3608:3865:3868:3870:3871:3872:3874:4385:5007:6261:6653:7576:8603:8957:10004:11026:11473:11658:11914:12043:12296:12297:12555:12679:12895:13069:13141:13230:13311:13357:13894:14096:14181:14384:14394:14721:21080:21451:21627:30054:30064,0,RBL:198.137.202.133:@infradead.org:.lbl8.mailshell.net-62.8.0.100 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:33,LUA_SUMMARY:none X-HE-Tag: ball44_6ba9246af9e35 X-Filterd-Recvd-Size: 2869 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Sep 2019 00:52:19 +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:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=42ILn7VMcsrJTz7O5GIB2CEUGt2gPkfqKrZQV8C0eas=; b=KBSXnigFVablb8KQbZq/Yf0TKY A8I7AtrNOd1ysd54G0tMobsxGWAqgz4kRXOciO7kJgO1ccogPjiHPU2VUJu1bEVmw0BL9mTF9GAYI dop6v15ZkD9BQD5mF1RWDh62GDWB/rz9lsS0rxjw97BaE+0YlTIqNznzf19FhudztuATJyttfvoJP wJQTLB+YhNze9mVsWig0hXJCk914UIj/2mzniOFv4OCttoi8RdnnPQ7KJ9eeQfhu5zO9A9sTBRpCF GvLPTgpX3i0DBp4/aNjAgHuxrglwKrasFt7x+z18I4EftTVwJYEh3wE3q+hWX6BMZ4U0ffoGQVvNG OAkd0bFg==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCvXV-00077C-Nq; Wed, 25 Sep 2019 00:52:17 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: William Kucharski , Matthew Wilcox Subject: [PATCH 12/15] mm: Support removing arbitrary sized pages from mapping Date: Tue, 24 Sep 2019 17:52:11 -0700 Message-Id: <20190925005214.27240-13-willy@infradead.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190925005214.27240-1-willy@infradead.org> References: <20190925005214.27240-1-willy@infradead.org> MIME-Version: 1.0 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: William Kucharski __remove_mapping() assumes that pages can only be either base pages or HPAGE_PMD_SIZE. Ask the page what size it is. Signed-off-by: William Kucharski Signed-off-by: Matthew Wilcox (Oracle) --- mm/vmscan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index a7f9f379e523..9f44868e640b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -932,10 +932,7 @@ static int __remove_mapping(struct address_space *mapping, struct page *page, * Note that if SetPageDirty is always performed via set_page_dirty, * and thus under the i_pages lock, then this ordering is not required. */ - if (unlikely(PageTransHuge(page)) && PageSwapCache(page)) - refcount = 1 + HPAGE_PMD_NR; - else - refcount = 2; + refcount = 1 + compound_nr(page); if (!page_ref_freeze(page, refcount)) goto cannot_free; /* note: atomic_cmpxchg in page_ref_freeze provides the smp_rmb */