From mboxrd@z Thu Jan 1 00:00:00 1970 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 42EB7C00140 for ; Fri, 29 Jul 2022 02:03:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC7C4940007; Thu, 28 Jul 2022 22:03:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B77086B0072; Thu, 28 Jul 2022 22:03:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3F80940007; Thu, 28 Jul 2022 22:03:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 956486B0071 for ; Thu, 28 Jul 2022 22:03:30 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 663141C6E80 for ; Fri, 29 Jul 2022 02:03:30 +0000 (UTC) X-FDA: 79738490580.08.87115CF Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf09.hostedemail.com (Postfix) with ESMTP id 4EC0F1400C1 for ; Fri, 29 Jul 2022 02:03:29 +0000 (UTC) Received: from dggpemm500020.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Lv9hY1tzszjXLj; Fri, 29 Jul 2022 10:00:29 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500020.china.huawei.com (7.185.36.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 29 Jul 2022 10:03:24 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 29 Jul 2022 10:03:24 +0800 Message-ID: Date: Fri, 29 Jul 2022 10:03:23 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH v2] mm: memory-failure: convert to pr_fmt() Content-Language: en-US To: Andrew Morton CC: Naoya Horiguchi , Miaohe Lin , , References: <20220727032511.145506-1-wangkefeng.wang@huawei.com> <20220728183759.6a3eaab13b1b122a5810af58@linux-foundation.org> From: Kefeng Wang In-Reply-To: <20220728183759.6a3eaab13b1b122a5810af58@linux-foundation.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659060209; a=rsa-sha256; cv=none; b=hL0h9gYha7h4LmWrQVIiJNyjxkfDI6dDO97KLnwxB+TtpFjlGD6qw8A+7tCJCYnjPwaaOy Sp6vqEA3lPhxVySlxDBOFnP69Gbbm8gjKok3l/bSPqat1mFr8Vrgi3Rf7e4JCK6azPfbLn j9+j0BCmY/wtvw4Dd/LsiECqe0vJ5GA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf09.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659060209; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=auyU5wCUzdYlbMVpaZPoC7pbtQ6mHjplUTS6xdTxQ38=; b=e2FZtAxFbiv9ebpdVtyEQ6qWr5C7yOY3J7zPLHvgW6wwsMB+4OmdG8JYGe/HN9wSJTdDBy Qbc0o+h6pvSpLOtkooWZN1ZD78v/Vr+U+UprZQ609JJoqtfraEGgzTX0zvCddjqJiXV2OH vvnCTbMl2VgHoWpZ53HIBg1gmN02CKs= X-Rspamd-Queue-Id: 4EC0F1400C1 X-Rspam-User: X-Stat-Signature: pswguymfwztcmemywwza6h45cu3fc41t Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf09.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com X-Rspamd-Server: rspam08 X-HE-Tag: 1659060209-415796 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: On 2022/7/29 9:37, Andrew Morton wrote: > On Wed, 27 Jul 2022 11:25:11 +0800 Kefeng Wang wrote: > >> Use pr_fmt to prefix all pr_ output, but unpoison_memory() >> and soft_offline_page() are used by error injection, which have >> own prefixes like "Unpoison:" and "soft offline:", meanwhile, >> soft_offline_page() could be used by memory hotremove, so undef >> pr_fmt before unpoison_pr_info definition to keep the original >> output for them. >> >> ... >> >> @@ -2289,6 +2285,7 @@ static int __init memory_failure_init(void) >> } >> core_initcall(memory_failure_init); >> >> +#undef pr_fmt >> #define unpoison_pr_info(fmt, pfn, rs) \ >> ({ \ >> if (__ratelimit(rs)) \ > This change makes the build fail. sorry, should be +#undef pr_fmt +#define pr_fmt(fmt)     "" fmt will update in v3 > > In file included from ./include/linux/kernel.h:29, > from mm/memory-failure.c:39: > mm/memory-failure.c: In function 'unpoison_memory': > ./include/linux/printk.h:537:26: error: expected ')' before 'pr_fmt' > 537 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) > | ^~~~~~ > ./include/linux/printk.h:388:42: note: in definition of macro '__printk_index_emit' > 388 | if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level)) { \ > | ^~~~ > ./include/linux/printk.h:464:26: note: in expansion of macro 'printk_index_wrap' > 464 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) > | ^~~~~~~~~~~~~~~~~ > ./include/linux/printk.h:537:9: note: in expansion of macro 'printk' > 537 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) > | ^~~~~~ > mm/memory-failure.c:2292:17: note: in expansion of macro 'pr_info' > 2292 | pr_info(fmt, pfn); \ > | ^~~~~~~ > mm/memory-failure.c:2326:17: note: in expansion of macro 'unpoison_pr_info' > 2326 | unpoison_pr_info("Unpoison: Disabled after HW memory failure %#lx\n", > | ^~~~~~~~~~~~~~~~ > > [1500 lines of the same] > .