On 2024/6/25 0:33, Jiaqi Yan wrote:
> Logs from soft_offline_page and soft_offline_in_use_page have
> different formats than majority of the memory failure code:
>
> "Memory failure: 0x${pfn}: ${lower_case_message}"
>
> Convert them to the following format:
>
> "Soft offline: 0x${pfn}: ${lower_case_message}"
>
> No functional change in this commit.
>
> Signed-off-by: Jiaqi Yan <jiaqiyan@xxxxxxxxxx>
> ---
> mm/memory-failure.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index d3c830e817e3..2a097af7da0e 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -2631,6 +2631,9 @@ int unpoison_memory(unsigned long pfn)
> }
> EXPORT_SYMBOL(unpoison_memory);
>
> +#undef pr_fmt
> +#define pr_fmt(fmt) "Soft offline: " fmt
> +
> static bool mf_isolate_folio(struct folio *folio, struct list_head *pagelist)
> {
> bool isolated = false;
> @@ -2686,7 +2689,7 @@ static int soft_offline_in_use_page(struct page *page)
>
> if (!huge && folio_test_large(folio)) {
> if (try_to_split_thp_page(page)) {
> - pr_info("soft offline: %#lx: thp split failed\n", pfn);
> + pr_info("%#lx: thp split failed\n", pfn);
> return -EBUSY;
> }
> folio = page_folio(page);
> @@ -2698,7 +2701,7 @@ static int soft_offline_in_use_page(struct page *page)
> if (PageHWPoison(page)) {
> folio_unlock(folio);
> folio_put(folio);
> - pr_info("soft offline: %#lx page already poisoned\n", pfn);
> + pr_info("%#lx page already poisoned\n", pfn);
Again, it's better to be "%#lx: page" to make log format consistent.
Thanks.
.
