| Message ID | 20240624163348.1751454-2-jiaqiyan@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Userspace controls soft-offline pages | expand |
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@google.com> > --- > 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. .
On Mon, Jun 24, 2024 at 11:41 PM Miaohe Lin <linmiaohe@huawei.com> wrote: > > 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@google.com> > > --- > > 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. Ah, I missed a ":", thanks for catching this! > Thanks. > .
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); return 0; } @@ -2711,7 +2714,7 @@ static int soft_offline_in_use_page(struct page *page) folio_unlock(folio); if (ret) { - pr_info("soft_offline: %#lx: invalidated\n", pfn); + pr_info("%#lx: invalidated\n", pfn); page_handle_poison(page, false, true); return 0; } @@ -2728,13 +2731,13 @@ static int soft_offline_in_use_page(struct page *page) if (!list_empty(&pagelist)) putback_movable_pages(&pagelist); - pr_info("soft offline: %#lx: %s migration failed %ld, type %pGp\n", + pr_info("%#lx: %s migration failed %ld, type %pGp\n", pfn, msg_page[huge], ret, &page->flags); if (ret > 0) ret = -EBUSY; } } else { - pr_info("soft offline: %#lx: %s isolation failed, page count %d, type %pGp\n", + pr_info("%#lx: %s isolation failed, page count %d, type %pGp\n", pfn, msg_page[huge], page_count(page), &page->flags); ret = -EBUSY; } @@ -2786,7 +2789,7 @@ int soft_offline_page(unsigned long pfn, int flags) mutex_lock(&mf_mutex); if (PageHWPoison(page)) { - pr_info("%s: %#lx page already poisoned\n", __func__, pfn); + pr_info("%#lx: page already poisoned\n", pfn); put_ref_page(pfn, flags); mutex_unlock(&mf_mutex); return 0;
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@google.com> --- mm/memory-failure.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)