From patchwork Mon Aug 8 19:33:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12939040 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C077C25B08 for ; Mon, 8 Aug 2022 19:34:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 597838E0001; Mon, 8 Aug 2022 15:34:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56CE26B0078; Mon, 8 Aug 2022 15:34:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA84F8E0002; Mon, 8 Aug 2022 15:34:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B61256B0071 for ; Mon, 8 Aug 2022 15:34:49 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8B209160151 for ; Mon, 8 Aug 2022 19:34:49 +0000 (UTC) X-FDA: 79777427898.06.21C19E9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id 9F27FC0150 for ; Mon, 8 Aug 2022 19:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=BqtDNBokS9uyBPWuNbawImIMA3ufUINE/LSTsHWrTgg=; b=hvE8wJBb3sQG/Jr4pyXYhefJrZ TJFA5M9i+hEogxJ9sUOPrnKD/VKaMTebPe6/58JZ6XuH27rw/rSJhApmbaMmIPkD36iUcsYBCZfps T5ofRlk/FggKS85KZqE/7JN2OvHYwCZZhBUa4YbW12VJMzHF1Ld600X7lKvqLEZFuq3l+DtvJzarx 2Zr2LCWZRYr75V13zYSs1+sTc+S1NPrRppwDeolBP0fGnNYaHLkq7I9wHSinD+NZ9xPWDcDtx7kNo 9FzftWSn0TxJL7NVo+KtNwADb7ifJX7Z2ezTBLUigltUPd2LBFirV5p57jcViD3S44n6GBQl/3+Fk aDQCY7IA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8WT-00EAsI-E2; Mon, 08 Aug 2022 19:34:45 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 03/59] vmscan: Check folio_test_private(), not folio_get_private() Date: Mon, 8 Aug 2022 20:33:31 +0100 Message-Id: <20220808193430.3378317-4-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987289; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BqtDNBokS9uyBPWuNbawImIMA3ufUINE/LSTsHWrTgg=; b=erIZsZYYm4QqgfuNc+GaoS6WLwbDirLWydzSlpQssgeeCQ8sKuJGu4kiP104xCK4q07SB5 MRUtS1aUGHPaY6nmvUm8KsYedIwlK/I5C5sY4Dju1SoRmAjY9C/CE/Q0mqmnUT01cDTQr6 dZQaMtYjtxRSa33hBQmQ7hSa6Qulcjw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hvE8wJBb; dmarc=none; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987289; a=rsa-sha256; cv=none; b=3Zuu8tBvT2Z7W6REnQ0DpB5ILj1+ItiHH5T5Jyf1ZrjjqDsEr5uY7LRNpuROFIw9JkJLfT JgMM75GdXwYeYpr7m8vBbl5BV0Cusivgw0iGcc/tB2WvjW9EQs6bcDbhwO0IQsWQzbFOTp sQP9lonwN7sLRa/41Cx4yqqNBrmEjR8= X-Rspamd-Queue-Id: 9F27FC0150 X-Rspamd-Server: rspam03 X-Rspam-User: Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hvE8wJBb; dmarc=none; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Stat-Signature: t719xu4xqth83qr66adfkds6eraz1oku X-HE-Tag: 1659987288-185663 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: These two predicates are the same for file pages, but are not the same for anonymous pages. Reported-by: Hugh Dickins Fixes: 07f67a8dedc0 ("mm/vmscan: convert shrink_active_list() to use a folio") Signed-off-by: Matthew Wilcox (Oracle) --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index b2b1431352dc..382dbe97329f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2550,8 +2550,8 @@ static void shrink_active_list(unsigned long nr_to_scan, } if (unlikely(buffer_heads_over_limit)) { - if (folio_get_private(folio) && folio_trylock(folio)) { - if (folio_get_private(folio)) + if (folio_test_private(folio) && folio_trylock(folio)) { + if (folio_test_private(folio)) filemap_release_folio(folio, 0); folio_unlock(folio); }