Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3452678pxb; Mon, 1 Nov 2021 14:08:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9wWlZwohkW6BKfET02i7Xl2hCM1xYyi88gjnc7YkUhb+zvETF/zlvWeelSRXTIUq5tANJ X-Received: by 2002:a05:6e02:170a:: with SMTP id u10mr18652012ill.301.1635800891841; Mon, 01 Nov 2021 14:08:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635800891; cv=none; d=google.com; s=arc-20160816; b=dDnYQnarSCG7t0I6f/0iL8tDHxeRgMlMcSK+UGwRn/SCwcdNoaGmib1Ad1Zpu14EVV G9edgIoHofDE/uezTdlVZZCtpX3B8yQEmgEv7fsv/Mm/u2gfV8lwOUxATejw9/gWCwcH IzaqU6Edt0hAoXLqKKOUYzR4KxOV/l1m//nHJ8B+JDGjQ95g5ZutcrPgWFJjSkltn7Cg BkhPGLw3SCBfeCsMO5EGZzlyujqph4EMOrh47IOGesSQkmTYBmmNL1QjbOIxgrV917r2 gGa9GGwTX5A2IPaFyWYemeXFsdfeH2/sfLzG4VGUOfy+So/cPwjChxyzKOo+xINVeiP4 fx7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=/SAIU+IuE23Lw7sXqYvikkteMzMCec9k3mkNvwAaD1c=; b=lFjfYwuOFMB9Zqqqa4aYSXU/t+7cwikNcq7Nt7fIKolabcVvyx/0sDc48WR5B76O0E ZGEPeRgSUy4tB0cVnGrZqZngtnXYQkTb0Cd1HTG8km/0VLiMSUNvK+X6IwRSxZO3g1JJ MIx4bK6d/q5AQab7IeCmDt/tT+ClJCUWdWO/3p4xAR8UNR33UWYci72of5iYe2ZU2d5Q COGJMJHn5Pm2CjNWS8IhTJVlURpLrqlTxk714KAythwqQqs4dnzo/oFPSk+/DEo+OVjd rKMl6nwypPEf6dz+5pnDrbMxARFjqVp4o5EdLrqkVaL0NIdv0RUDNONmCDjAUV0UPk3k wz7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=JTLt05Al; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w4si25185222ilv.155.2021.11.01.14.07.59; Mon, 01 Nov 2021 14:08:11 -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=pass header.i=@gmail.com header.s=20210112 header.b=JTLt05Al; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231347AbhKAVJi (ORCPT + 99 others); Mon, 1 Nov 2021 17:09:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbhKAVJg (ORCPT ); Mon, 1 Nov 2021 17:09:36 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA2AFC061714 for ; Mon, 1 Nov 2021 14:07:02 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id g10so68366384edj.1 for ; Mon, 01 Nov 2021 14:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/SAIU+IuE23Lw7sXqYvikkteMzMCec9k3mkNvwAaD1c=; b=JTLt05AlEHI961xxW/tusGjITZ2yRmJvdTokKIPc2QLIuzEbC74+SjvP+80LlX1JY7 DZqGeDI1LYtuhuyZNhBmkcCjmnQKanNCh4eFfrVd9FWCAh0dNMO/0qTd+3QxoIJWQx2P lbiGtp7Xzj6ewwzVrhIfYJeMn2RanJ+33SGst8cCfX3xACL2fB8kr0LRWpmbqDZ4Y6DH +O3YUP6/9N5DeDqgx/+yIkiTsdQE0X41fXsk0YUt4Fo6f5tzzGfoimm7UY/GVJUSK4al JzbhCaUTmbqQtVC1DH5QOe/zUBBBzsv51PBlAWuAGTEijo61cvMl4P3U5632pPJv3zGz uh0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/SAIU+IuE23Lw7sXqYvikkteMzMCec9k3mkNvwAaD1c=; b=NEzx774KaOD8tH68izs7hcykNdJSHzYyrHqa+ccE1I8xqsiZaTB0UmRvbrPwCWwPtu Q5yS0ewZ2MfKTAxyFXlQEq/MdvrjVvFPj1v/AciqWUXIVpLB4xgCoiNqaPzv9rGZag90 eNaU8xwFCUdeA8H4VLf1Xq6tZLvrzOWK/RY0iXsr56MqwFqFlaW0QfgZy0PDKHzqqWZK IbWYy9mEtej2nqpetnccXhiO3oxwbi+eIW3mzDENC5PGja98stSvrhUn611FABX4HAg+ MaGaYS7D1BfxYb338ymL716bI4pUfacenzZwgDfP0x8SkQXsZ2XKgVxm0R/JQ2VVFAuD KDMw== X-Gm-Message-State: AOAM532GAbEr4AqF7MLoN00yNcDRDgmclx6dOgDXN5RpzytZe2tNuBXy W2caSm/v8xiupp3E7A4n9hY9PDTUP4cE2g9oBJs= X-Received: by 2002:a17:906:d20c:: with SMTP id w12mr18780674ejz.521.1635800821471; Mon, 01 Nov 2021 14:07:01 -0700 (PDT) MIME-Version: 1.0 References: <20211101194336.305546-1-shy828301@gmail.com> In-Reply-To: From: Yang Shi Date: Mon, 1 Nov 2021 14:06:49 -0700 Message-ID: Subject: Re: [PATCH] mm: page-flags: fix build failure due to missing parameter for HasHWPoisoned flag To: Matthew Wilcox Cc: Linus Torvalds , Naresh Kamboju , "Kirill A. Shutemov" , =?UTF-8?B?SE9SSUdVQ0hJIE5BT1lBKOWggOWPoyDnm7TkuZ8p?= , Andrew Morton , Linux MM , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 1, 2021 at 1:45 PM Matthew Wilcox wrote: > > Should probbaly cc Linus, and also note that Stephen noticed & fixed > this problem already. > https://lore.kernel.org/lkml/20211101174846.2b1097d7@canb.auug.org.au/ Oh, yes, I forgot that fix. Anyway picking either one is fine to me. > > I didn't know about it at the time I sent the pull request because it > hadn't been merged at that point. It is fine. I really don't mean blame to you. > > On Mon, Nov 01, 2021 at 12:43:36PM -0700, Yang Shi wrote: > > The below build failure when !CONFIG_MEMORY_FAILURE was reported for > > v5.16 merge window: > > In file included from include/linux/mmzone.h:22, > > from include/linux/gfp.h:6, > > from include/linux/slab.h:15, > > from include/linux/crypto.h:20, > > from arch/x86/kernel/asm-offsets.c:9: > > include/linux/page-flags.h:806:29: error: macro "PAGEFLAG_FALSE" > > requires 2 arguments, but only 1 given > > 806 | PAGEFLAG_FALSE(HasHWPoisoned) > > | ^ > > include/linux/page-flags.h:411: note: macro "PAGEFLAG_FALSE" defined here > > 411 | #define PAGEFLAG_FALSE(uname, lname) TESTPAGEFLAG_FALSE(uname, lname) \ > > | > > include/linux/page-flags.h:807:39: error: macro "TESTSCFLAG_FALSE" > > requires 2 arguments, but only 1 given > > 807 | TESTSCFLAG_FALSE(HasHWPoisoned) > > | ^ > > include/linux/page-flags.h:414: note: macro "TESTSCFLAG_FALSE" defined here > > 414 | #define TESTSCFLAG_FALSE(uname, lname) > > \ > > | > > include/linux/page-flags.h:806:1: error: unknown type name 'PAGEFLAG_FALSE' > > 806 | PAGEFLAG_FALSE(HasHWPoisoned) > > | ^~~~~~~~~~~~~~ > > include/linux/page-flags.h:807:25: error: expected ';' before 'static' > > 807 | TESTSCFLAG_FALSE(HasHWPoisoned) > > | ^ > > | ; > > ...... > > 815 | static inline bool is_page_hwpoison(struct page *page) > > | ~~~~~~ > > make[2]: *** [scripts/Makefile.build:121: arch/x86/kernel/asm-offsets.s] Error 1 > > > > The commit d389a4a81155 ("mm: Add folio flag manipulation functions") > > changed the definition of PAGEFLAG macros, this caused the build failure > > for HasHWPoisoned flag. The new flag was introduced by commit > > eac96c3efdb5 ("mm: filemap: check if THP has hwpoisoned subpage for PMD > > page fault") in v5.15-rc7. But the folio series pull request was > > prepared before v5.15, so this new flag was missed. > > > > Reported-by: Linux Kernel Functional Testing > > Cc: Naresh Kamboju > > Cc: Matthew Wilcox > > Cc: Kirill A. Shutemov > > Cc: Naoya Horiguchi > > Signed-off-by: Yang Shi > > --- > > include/linux/page-flags.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h > > index d8623d6e1141..981341a3c3c4 100644 > > --- a/include/linux/page-flags.h > > +++ b/include/linux/page-flags.h > > @@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map) > > PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND) > > TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND) > > #else > > -PAGEFLAG_FALSE(HasHWPoisoned) > > - TESTSCFLAG_FALSE(HasHWPoisoned) > > +PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) > > + TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) > > #endif > > > > /* > > -- > > 2.26.2 > > > >