From patchwork Thu Aug 19 15:07:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12447365 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 21357C4320A for ; Thu, 19 Aug 2021 15:07:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A259861130 for ; Thu, 19 Aug 2021 15:07:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A259861130 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 4213F8D0001; Thu, 19 Aug 2021 11:07:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3AA8A6B0072; Thu, 19 Aug 2021 11:07:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24AEC8D0001; Thu, 19 Aug 2021 11:07:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0124.hostedemail.com [216.40.44.124]) by kanga.kvack.org (Postfix) with ESMTP id 0AF746B0071 for ; Thu, 19 Aug 2021 11:07:29 -0400 (EDT) Received: from smtpin40.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8D74C182111B3 for ; Thu, 19 Aug 2021 15:07:28 +0000 (UTC) X-FDA: 78492158976.40.616FCCB Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by imf07.hostedemail.com (Postfix) with ESMTP id 1ACF710001E7 for ; Thu, 19 Aug 2021 15:07:27 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id q2so6168015pgt.6 for ; Thu, 19 Aug 2021 08:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jYuk+DEGwmqpa17SuWp9uKR9u9Vjn438MMp/iFqe6x8=; b=eTys5198HwvfjTo7k2gq3jBj0e0iiULC/gJ9XjDFKq16sZPVAETyCpQcbrkPFrbRUw IkgzfV/6xy5dS8f8NcT9fyP/VfvnGgO2+oZY71TKcIc2lTOJXdH7qPT5woOPGkUxczbO I1m8IehPcrcyjpA9NMLr5+W8wLBg8BboskU100z+Y9a8k7jByblPAPLsiD1vjHJoi6hU 0Y8R56Vrfn3LSvhiVqBbXE3iro2jb4n36m8J4xGlwBJKfJ1iWUY98Y+SMZcPklOQpLSN pjAqxuLFrI+LTra6HLnCOUAIiUXekuGn5/n1ls97WaFjbdf22AbaPq3fOhd6wg14okzp Bl6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jYuk+DEGwmqpa17SuWp9uKR9u9Vjn438MMp/iFqe6x8=; b=DBmx16Q/J/e5ynTYuIyBImX1nvZ/vjDOBD+rezdGWrQpkfV/GHlomrZyn6Xe0lWpPV 1jA0MWKqi+0Aspo/1ehwZFclUJEVGuDrmPuLj9nt/Zj5ESsdkniSKU0r5xvUbU71P9ZV 8R8J8YXse8ykSk4JOUgL06W69Cc/ZbGAw6GFV3Pa/04YN5kxjm/82ybg6siD+537A8VY IuO5jntVMi3sibIeBBIWCCI2nWvgDs5kP0C8O9AJZrkhfqMBvXuMRTXsKdcwWRNZrW9j RnM8L724mOAxK3ePuTL5F4o19y84YyqrAcCw0b0tU83rxS3U+USEQtL2mruXtZ9oI+l/ z/6g== X-Gm-Message-State: AOAM5329AfTAGeDA0JJ1xIEXIBXeoV5C/vuDpSwwZgvRYRYYgPV2EsT0 K/E8Nbvb5ynmY9LvrEGTBjxR9Q== X-Google-Smtp-Source: ABdhPJz0wxv/g3GbA0t1zv8J4Ui8EtOs//AFwfyVwvmqugO3/NcDMGWLZlbhQyxXb91CP6DEcd7JFA== X-Received: by 2002:a63:ba5c:: with SMTP id l28mr14288818pgu.311.1629385646996; Thu, 19 Aug 2021 08:07:26 -0700 (PDT) Received: from Smcdef-MBP.lan.org ([139.177.225.234]) by smtp.gmail.com with ESMTPSA id y7sm3342081pfi.204.2021.08.19.08.07.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Aug 2021 08:07:26 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com, willy@infradead.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Muchun Song Subject: [PATCH v2] mm: introduce PAGEFLAGS_MASK to replace ((1UL << NR_PAGEFLAGS) - 1) Date: Thu, 19 Aug 2021 23:07:12 +0800 Message-Id: <20210819150712.59948-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 1ACF710001E7 X-Stat-Signature: boncbr56is5tet79jxfyq1z1pok4gfoc Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=eTys5198; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf07.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-HE-Tag: 1629385647-30288 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: Instead of hard-coding ((1UL << NR_PAGEFLAGS) - 1) everywhere, introducing PAGEFLAGS_MASK to make the code clear to get the page flags. Signed-off-by: Muchun Song Reviewed-by: Roman Gushchin Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt --- Change log in v2: 1. Revert PAGEFLAGS_MASK include/linux/page-flags.h | 4 +++- include/trace/events/page_ref.h | 4 ++-- lib/test_printf.c | 2 +- lib/vsprintf.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 54c4af35c628..8e1d97d8f3bd 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -180,6 +180,8 @@ enum pageflags { PG_reported = PG_uptodate, }; +#define PAGEFLAGS_MASK ((1UL << NR_PAGEFLAGS) - 1) + #ifndef __GENERATING_BOUNDS_H static inline unsigned long _compound_head(const struct page *page) @@ -975,7 +977,7 @@ static inline void ClearPageSlabPfmemalloc(struct page *page) * alloc-free cycle to prevent from reusing the page. */ #define PAGE_FLAGS_CHECK_AT_PREP \ - (((1UL << NR_PAGEFLAGS) - 1) & ~__PG_HWPOISON) + (PAGEFLAGS_MASK & ~__PG_HWPOISON) #define PAGE_FLAGS_PRIVATE \ (1UL << PG_private | 1UL << PG_private_2) diff --git a/include/trace/events/page_ref.h b/include/trace/events/page_ref.h index 5d2ea93956ce..8a99c1cd417b 100644 --- a/include/trace/events/page_ref.h +++ b/include/trace/events/page_ref.h @@ -38,7 +38,7 @@ DECLARE_EVENT_CLASS(page_ref_mod_template, TP_printk("pfn=0x%lx flags=%s count=%d mapcount=%d mapping=%p mt=%d val=%d", __entry->pfn, - show_page_flags(__entry->flags & ((1UL << NR_PAGEFLAGS) - 1)), + show_page_flags(__entry->flags & PAGEFLAGS_MASK), __entry->count, __entry->mapcount, __entry->mapping, __entry->mt, __entry->val) @@ -88,7 +88,7 @@ DECLARE_EVENT_CLASS(page_ref_mod_and_test_template, TP_printk("pfn=0x%lx flags=%s count=%d mapcount=%d mapping=%p mt=%d val=%d ret=%d", __entry->pfn, - show_page_flags(__entry->flags & ((1UL << NR_PAGEFLAGS) - 1)), + show_page_flags(__entry->flags & PAGEFLAGS_MASK), __entry->count, __entry->mapcount, __entry->mapping, __entry->mt, __entry->val, __entry->ret) diff --git a/lib/test_printf.c b/lib/test_printf.c index 8ac71aee46af..ec69953cf80c 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -614,7 +614,7 @@ page_flags_test(int section, int node, int zone, int last_cpupid, bool append = false; int i; - flags &= BIT(NR_PAGEFLAGS) - 1; + flags &= PAGEFLAGS_MASK; if (flags) { page_flags |= flags; snprintf(cmp_buf + size, BUF_SIZE - size, "%s", name); diff --git a/lib/vsprintf.c b/lib/vsprintf.c index dd006adfe853..42ad16327c75 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2019,7 +2019,7 @@ static const struct page_flags_fields pff[] = { static char *format_page_flags(char *buf, char *end, unsigned long flags) { - unsigned long main_flags = flags & (BIT(NR_PAGEFLAGS) - 1); + unsigned long main_flags = flags & PAGEFLAGS_MASK; bool append = false; int i;