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 E8C8DC30658 for ; Wed, 26 Jun 2024 05:08:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 650466B0096; Wed, 26 Jun 2024 01:08:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B0176B0098; Wed, 26 Jun 2024 01:08:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 451836B0099; Wed, 26 Jun 2024 01:08:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 21ED46B0096 for ; Wed, 26 Jun 2024 01:08:28 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CD4DB1A09EA for ; Wed, 26 Jun 2024 05:08:27 +0000 (UTC) X-FDA: 82271859054.09.30FE7FB Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf20.hostedemail.com (Postfix) with ESMTP id 07DC31C000A for ; Wed, 26 Jun 2024 05:08:25 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=n2NrQYo1; spf=pass (imf20.hostedemail.com: domain of 3SKJ7ZggKCLUedVldtVibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jiaqiyan.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3SKJ7ZggKCLUedVldtVibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719378498; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gXkC9UGwLbi0GqLoxfNlsmYzpSOeBdR127cDmlyAfFg=; b=R7Luai4mpsQrxr81xiAVhs4+Z7VECMZC3apNkyDc9ET4cwAWOkg8T2+XFoi179S7gl5LMy lD7LxGaXM2UiRE6/dbiKqAQhUBKWAK+mm1shNG2Ye2gfHvfw00d2f+MA2ZSlF92xK/12iz Q4xwTu7OvRU9GmgG2YMtS2Kf87PkB1Y= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=n2NrQYo1; spf=pass (imf20.hostedemail.com: domain of 3SKJ7ZggKCLUedVldtVibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jiaqiyan.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3SKJ7ZggKCLUedVldtVibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719378498; a=rsa-sha256; cv=none; b=MBTg5rm7Pv1Iwx3+Jgck38t4H2fSYkQYyk/TW9eyWJnq69zZLIWXcwcsAjEYMwh9mrtSJy 4+o+GAZsuu8mU/gG5QwCcnNeMxwt5jBM17hS/u72lan5poQ8P/T6PTTAB9bgXn1UYGRlGD baNUC3rc2gXn34HNhgfpp6234XocHdU= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-1f9dc746d70so65244415ad.0 for ; Tue, 25 Jun 2024 22:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719378505; x=1719983305; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=gXkC9UGwLbi0GqLoxfNlsmYzpSOeBdR127cDmlyAfFg=; b=n2NrQYo1jLMFrLBRwZZsUa2qseuh0e05z8u4rQ2ORZc4Uq4WZyWwmPSTPRjkWb5jJS VGC+X6+Bi/lZG/OXufpW6a4QS4o/7D/szK6TWgGrsoW8rQ0t2Ge8p4U+R5rHjF/w8riJ lfFNOWfdXsQmOi612UAjmLMf0wHhOLIqhkZKqJG7sM+PGVym3uvQpP6/CHVo7ucwKqh1 ZX6/fEZ6zSBlvR4ZbhHo3F0p1l+K6z2xjvA9r53D4nVO4IrY4dNEtF1E+HIX0l0njgqz xOUqZtFDHDMYobl0TDquruNVPp88TpkBbyaspW+iOrCLIEkBGxXwZ4/RJYw4rJvg31Ak 4I+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719378505; x=1719983305; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gXkC9UGwLbi0GqLoxfNlsmYzpSOeBdR127cDmlyAfFg=; b=i83c/sAuwSrTarJ3QAsz1eETVM5h32SlO4K+yGWsk18Bo+B/xEiJ4UA2DSkYS/IHAK gVx5iAf6tkfY7NkzQA8bxTC/PJkouJ45dMe3ji4+stCAUPTioWTB0Q7nD2h/q+Qe35xO LhjNbLarShBWfrAey3RGPwvKZBrL3sUwaq0ShDzOOHZsFmvjC3dN/2eSPKy34ltFXUYg x9pUrD6pf8XunzZ1vCiLIz0AurMPfMjQjV9b5N6hocNOPMeIsyk2FQ3tuqYNLQ7KusIF dqL+OsNyZA6ovBGsd1DTxMqV000H+eHKTZvN4JYIhPeKlqNRmxQIqniA9qXxXmiZs+uH jVLA== X-Forwarded-Encrypted: i=1; AJvYcCWmelxC33LIkH+J5Ha7xlFed7bgD1BitqLM3ZR03fmjxTXZV+WBQPY8Akz1nTtlEC2JjrfWNECr8g7xb+T1DYV9UXc= X-Gm-Message-State: AOJu0YzLOka4H0/p8G/ZAx6bxaCud6hgZShf/yE3o0t6DnLZ4hY2CVsq kAi04SL4oFrodOLo4/pSwq4vabJuuf/ASvbqrQemtOJnBHWlkE0VqPlbuo6LRCHfZsOEpFPkD47 qskZ5miiN/w== X-Google-Smtp-Source: AGHT+IEPP52YEAOSaOBTdeEN7RWm3wytwjEt4v74q/ZLwZQeZ8KX/WkYqZtMZc6X7SeBdJvi3Uxvj75c3h8DJA== X-Received: from yjq3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:272f]) (user=jiaqiyan job=sendgmr) by 2002:a17:902:e892:b0:1f7:ae0:3e3c with SMTP id d9443c01a7336-1fa23f8dd5fmr11037925ad.12.1719378504545; Tue, 25 Jun 2024 22:08:24 -0700 (PDT) Date: Wed, 26 Jun 2024 05:08:15 +0000 In-Reply-To: <20240626050818.2277273-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20240626050818.2277273-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240626050818.2277273-2-jiaqiyan@google.com> Subject: [PATCH v6 1/4] mm/memory-failure: refactor log format in soft offline code From: Jiaqi Yan To: nao.horiguchi@gmail.com, linmiaohe@huawei.com Cc: jane.chu@oracle.com, rdunlap@infradead.org, ioworker0@gmail.com, muchun.song@linux.dev, akpm@linux-foundation.org, shuah@kernel.org, corbet@lwn.net, osalvador@suse.de, rientjes@google.com, duenwen@google.com, fvdl@google.com, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, Jiaqi Yan Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 07DC31C000A X-Stat-Signature: d7x4yynbi6s5gcgiunfq5qorm11necjk X-HE-Tag: 1719378505-135523 X-HE-Meta: U2FsdGVkX1+6gIj436CDyneB1su68y3GQjGgRIDOYxXC/RRHbqe3NJiH21663x1NDM2D76TXWIBjVgrUEnPhqhADVbUXyuCgIcpqLQwqFFr+mkuNbSUFwxlH/xE8VutApHv28HGqIYMv1hktqo4+o3sSSs6OPUskXl/A0PxWQHH1EE5+tUsP0+bNsvxc6tI+FqyW+jOXO1KH4Ngie9tFf8l1j41SZmKizvKyyCAgXvUWYRgfTsDjntlII667olqQ2DankVpuEEitWhv6W2smtAfOg5wg2phwQELhYq0Mm6p0sSz9ACEqDAB+73G+X3fuHKLeet2Om7fvu9oK3ObIX70ZKo8z+O3R56JdKqhUl0eZdNob61MBP8bd2n5dasjj+7nBqBcNuMUsqjDudblv6oD2eaasIxFDJS40MylnSKbNxfJJM04Y4jqdL3kcrsi0Zq7DTpM/TMpV6JiHWBKQQw1rPJNbR33P8b8a+uj3HAMKbCR7lDDOVjqCuAFkvxQujxy33YZ1m15wqbanMeO+PGWcn8ZXQ8vPZdOguFws5jvH46O4C+vpxiCvTIUtHjGPRXd1qSLNjWmTr39vSo36rO3ENHz0pyZUA/9R6Kjo2bnbyhyeDK5eUYVK9e8nNI+tsgPXaKEj6t1jYSt1rZ4T7XnzrNhPCsbVbvaaXHL/8GsDU1DQ93Hzb3KTfHmOQC7VxjVbkd95b/8zn5ckygyHLcsaCKOHnb8sFfeAd811H9YVTw0JfF4oliYfHtHnvsXjEWAa9FiGGHbc9Iw7QA1H9qDUm8qGWOesduHcPn1gGBppB/B+shM1nxs62wJPWV+VzEjK4FMBJcqpx+O8qzKyMV3R4BgwfqqWtLIEgeHOrPMCVxSI88N9oWnch6SSqeopyl9qj+YZXj3LtRZPEMBIWxD6BEsDoObNrYkMkjeTweb8z6cISGXjExMCM7nzjMc6B3U9lLj9KTZdlwsEKAW Gd6TcAAI 8pPXXBfPLnSS7vhSNMTxVO9ngiZ6JH59EdDPd+hLs4WvaYDNhoK9ThHWN0NUrLod9WkS4Qg7KEge7GnvW7J801ocgv9hVEFFjxEyLZWawAXN9U3T6VSuKIAHzuAFvprl+FojqJSW/WCu3K8tJhahs6EMI/v4szAJit6I2GUNwok3GANOHthJS5LTk7cb5lfsOcr915q1o5GjkyYAboNmwXlf+b6dHcxdnctQkqJgRqvJP5zri1vUgPyYAaHeqYljjjaP8265fzoQr0uejy9VTxopl7cA7r2ExVW3AiP46iHbZeX8jPqrJ5dWdI+o9wQHnj0CrKKI1D3Za5ty0Snrxlq83qTpKp334SqOTnixeVnug9rVHku5aejfTbh0XKDtFvxzlh4wvZDrqtyd17Grsz1nRHuKlqmOMCfigfn78GijsGr0BI8V6waCD/qgr5T0rddtCraoo/pGY/AVjXcz55y7X3eE3c2H3ZuEEF28R1euaZb6j8T6ikzEJvXjIR9qRka2ZGz71qYvzlRaufRIz03rvI/vzDZastii3MdRYUr/wFM8vdUkLO9shNegd+W/qGgZTqcWhKeCG8MzpW9cEigEnK+Ce6JZYAVEfKBMxFcb6GF8yfOIzM36fFSBms4GmUOJn 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: List-Subscribe: List-Unsubscribe: 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. Acked-by: Miaohe Lin Signed-off-by: Jiaqi Yan --- 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..6f5ac334efba 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; -- 2.45.2.741.gdbec12cfda-goog