From patchwork Tue Nov 17 17:12:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Su X-Patchwork-Id: 11913021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23041C2D0E4 for ; Tue, 17 Nov 2020 17:12:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 73E2024248 for ; Tue, 17 Nov 2020 17:12:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="BVgsmgnc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73E2024248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C6A826B0073; Tue, 17 Nov 2020 12:12:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C1A306B0074; Tue, 17 Nov 2020 12:12:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B09246B0075; Tue, 17 Nov 2020 12:12:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0126.hostedemail.com [216.40.44.126]) by kanga.kvack.org (Postfix) with ESMTP id 7D1396B0073 for ; Tue, 17 Nov 2020 12:12:50 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 185FF181AEF1E for ; Tue, 17 Nov 2020 17:12:50 +0000 (UTC) X-FDA: 77494554900.25.boy31_4c11c1527333 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id E98E41804E3A0 for ; Tue, 17 Nov 2020 17:12:49 +0000 (UTC) X-HE-Tag: boy31_4c11c1527333 X-Filterd-Recvd-Size: 3241 Received: from m12-12.163.com (m12-12.163.com [220.181.12.12]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Tue, 17 Nov 2020 17:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=KQwd9 qCt8weaMSg4b6f6nBEULFHmQDCeBY2LRkzUDI4=; b=BVgsmgncqPS8bC7xfSmsj 6F4M81F++XQTyXtcZaCfoBHQG8MBWFtfRj8/YV75ALtsUjloYwmGopOMR4c1rBJm Zw7gBREG4lhVPARyB9utZhl/sdsiyjQEpRIIj1U5U2tLsv1z1KWLhsLDaBMg3yiH eSIgFCKJhWI719yHabvc/8= Received: from localhost (unknown [101.86.213.141]) by smtp8 (Coremail) with SMTP id DMCowACXNh+KBLRfhdELCQ--.63434S2; Wed, 18 Nov 2020 01:12:42 +0800 (CST) Date: Wed, 18 Nov 2020 01:12:42 +0800 From: Hui Su To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: sh_def@163.com Subject: [PATCH] mm/lru: simplify is_file_lru() and is_active_lru() Message-ID: <20201117171242.GA120587@rlk> MIME-Version: 1.0 Content-Disposition: inline X-CM-TRANSID: DMCowACXNh+KBLRfhdELCQ--.63434S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kr4DXw18Ww4kuFyfJrW5Wrg_yoW8Ar4rpa 93GFW2krsYvr1UtFWDJFsF9ryrXanFvFy7AFy2gwn5JF1agFWvq3y7Kr4jqw4UWFZ5Z3WY 9347G3y5Cay2qF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Uc2-OUUUUU= X-Originating-IP: [101.86.213.141] X-CM-SenderInfo: xvkbvvri6rljoofrz/1tbipAvfX1r7rfQAkAAAsH X-Bogosity: Ham, tests=bogofilter, spamicity=0.015671, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: lru_list lru bit 0 can tell whether the list is avtive lru-list or not. lru_list lru bit 1 can tell whether the list is file lru-list or not. And fix some define type in shrink_active_list() and get_scan_count(). v1->v2: correct the commit message, and fix the define type. Signed-off-by: Hui Su --- include/linux/mmzone.h | 4 ++-- mm/vmscan.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index fb3bf696c05e..294369c652d0 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -258,12 +258,12 @@ enum lru_list { static inline bool is_file_lru(enum lru_list lru) { - return (lru == LRU_INACTIVE_FILE || lru == LRU_ACTIVE_FILE); + return lru & LRU_FILE; } static inline bool is_active_lru(enum lru_list lru) { - return (lru == LRU_ACTIVE_ANON || lru == LRU_ACTIVE_FILE); + return lru & LRU_ACTIVE; } #define ANON_AND_FILE 2 diff --git a/mm/vmscan.c b/mm/vmscan.c index 7b4e31eac2cf..7d8ea2fc87fc 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2020,7 +2020,7 @@ static void shrink_active_list(unsigned long nr_to_scan, struct page *page; unsigned nr_deactivate, nr_activate; unsigned nr_rotated = 0; - int file = is_file_lru(lru); + bool file = is_file_lru(lru); struct pglist_data *pgdat = lruvec_pgdat(lruvec); lru_add_drain(); @@ -2323,7 +2323,7 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, denominator = ap + fp; out: for_each_evictable_lru(lru) { - int file = is_file_lru(lru); + bool file = is_file_lru(lru); unsigned long lruvec_size; unsigned long scan; unsigned long protection;