From patchwork Fri Oct 6 15:18:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13411683 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 65FD8E81E07 for ; Fri, 6 Oct 2023 15:18:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D7438D0050; Fri, 6 Oct 2023 11:18:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 83AFE8D00C9; Fri, 6 Oct 2023 11:18:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57C588D0050; Fri, 6 Oct 2023 11:18:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 442BC8D00C7 for ; Fri, 6 Oct 2023 11:18:54 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1CB981A006F for ; Fri, 6 Oct 2023 15:18:54 +0000 (UTC) X-FDA: 81315394188.24.161EAD7 Received: from out-206.mta0.migadu.com (out-206.mta0.migadu.com [91.218.175.206]) by imf13.hostedemail.com (Postfix) with ESMTP id 648A22002A for ; Fri, 6 Oct 2023 15:18:52 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sdj54eOA; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.206 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696605532; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=KpaY5zOxHzDnEKIsjBbAGIMHyxq37tXIib8836JShNo=; b=acIyG9A8oAYcu+7Yr6A71yOm+akeBnvwHfZ65qYPhENeZWOhxH0mRDzDkjg91pz44kilAl aY+czW6uFfkrll8qsRoGXholBU0hxdZBI55H/M20pT0hip7NK/R7Jk50VK3iekTJFcGJ7u 1Zj6I/oSTEI49QS2cNpKTwUZO/Brj1M= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sdj54eOA; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of andrey.konovalov@linux.dev designates 91.218.175.206 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696605532; a=rsa-sha256; cv=none; b=AnSojmQnmARiJ1oRv45PgwtVMvym1mshithbfbi3ibpybqRm+MQtUbOSogfM3vcCPI+VO2 V3Q590M2PwTNXngZsRtA6nWthR7TOMvUv30MJ4AoChoiPgKaTz69x4tqkKkRd3e7dlsA5T kgc1opK4fNo+iaZOSyyZjl4yrRXtjzo= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1696605530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KpaY5zOxHzDnEKIsjBbAGIMHyxq37tXIib8836JShNo=; b=sdj54eOAoxvbDjsG1L1LrX4GPNkPYAmSqUqrEs0jwQ6Up2Z+kVeRFW4KN6fxPsOHGg6Ode 5Mx5CSch4p7iY8TzDjBanPYp0/tbMZPIExkiILwYI/bFmaEJrBGJcxjKCCCm/iwBQn+1mb QLA2DRzBrErqtsGV7G6DB5s9bC3YhF4= From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko Cc: Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH 2/5] kasan: unify printk prefixes Date: Fri, 6 Oct 2023 17:18:43 +0200 Message-Id: <35589629806cf0840e5f01ec9d8011a7bad648df.1696605143.git.andreyknvl@google.com> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: hytmuujjmgn4m4g1xzjgqxj18fjiftw5 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 648A22002A X-HE-Tag: 1696605532-985499 X-HE-Meta: U2FsdGVkX1/vbFGwetGeQolsbLt0Y9Sht2N6RyNOkH9765C9arhfkXbq3ht6FYAGB5tXJNkIsPkPOW5uNU3x2pHkkX38Jp0DsrC9iHOvfrnsmjIKVnq8kD8rbpz8hI2780vwceZEgxfRDoIXjFkB3CNw91nwB8DUfLUOmEVEDDERTAArVji9atjD6lUsfKBduMOohmHBjkJ2+a9QtpVHbAdUq6R00JSp8DZyzHkcMQZ0SKqBXiL60yRF2wihYC7ZyoeiAbcUiOQasDBL7UURKkpNSPV/IlCxj3FfMULYphj7MqRlDEXjg/0wjuFNSj/nTPYxD4TYXeNIkPL7360cpXVM2CncYU5nmwUjRk0hPOBo3ad3wmwlnbDhiz5kr1ngwYmxULoXxigfvB3AJypbA3g5MmkNAhbfKiDXKkut0/Cwrl7FmZ8SX92f/R8xTCwnl+8Q0bAM6g4VO1uUPGnL0SLyKA0e/Ap3B7G4RiSbyAhCG/GmKo45+V4ExIdlAzntNHZ9PtSbHsiJhF6PO9OsNlKjxbkmKpOJTJIjpOC1b7ychRoow2fFxbf0tAE50Lp+ZwiB5x4BU0Hvp8egzLrUElSAU0f9Nl6oINJYy/oVh/+3asbTrAIyEG2QjUNDpbMc7YJ1MN2460Htn+j5pqKzyovjoISfGLvslWmE6FCfFkvQzRSSJvYrtv5aWW2AlOGTVO96xVLf4VaKey6mEM88Zw9/ERGltkScuUF++2Ma2eKbuWnf9hyMFhwCjjpBQ6WLu2PZR++3gR2OpVT35XzL9C83wr7g2UhW8CpTcssdnCX7PCLnSSYjn0wxOLnkBi9C+IsB0uQjnfyoF2ur0n5KHphE6vXNfujE9YbekZyVP9ptnCZRUwz2/qSwGUbn3t980qyOTD9YPMzuBSQW48flWFEOZOeiGq+wj+voPCE5QLg6WMIj7N0qNroFsvyRD8Kk83Ps6cYtdW0NCayNck7 +p8BMqpQ r7Yt5GbQOpMZtoF41pJn9dhL0bNzoVhmp6S61bWT5bRSMJdDUK3oxPzxWohrIWiruNllTSz0PZys3up51B5o0FkG9zGz7AS9sObaJiVJ2razBkWRvBM7etG5+lhOADPYdaIsxDqTI4eKkYNbOMUD9dty9bFMBsAt337hQlz47UnAu/+Wo5A3Nndpd73+TLky6/v+S 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: From: Andrey Konovalov Unify prefixes for printk messages in mm/kasan/. Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver --- mm/kasan/kasan_test.c | 2 +- mm/kasan/kasan_test_module.c | 2 +- mm/kasan/quarantine.c | 4 +++- mm/kasan/report_generic.c | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c index b61cc6a42541..c707d6c6e019 100644 --- a/mm/kasan/kasan_test.c +++ b/mm/kasan/kasan_test.c @@ -5,7 +5,7 @@ * Author: Andrey Ryabinin */ -#define pr_fmt(fmt) "kasan_test: " fmt +#define pr_fmt(fmt) "kasan: test: " fmt #include #include diff --git a/mm/kasan/kasan_test_module.c b/mm/kasan/kasan_test_module.c index 7be7bed456ef..8b7b3ea2c74e 100644 --- a/mm/kasan/kasan_test_module.c +++ b/mm/kasan/kasan_test_module.c @@ -5,7 +5,7 @@ * Author: Andrey Ryabinin */ -#define pr_fmt(fmt) "kasan test: %s " fmt, __func__ +#define pr_fmt(fmt) "kasan: test: " fmt #include #include diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c index 152dca73f398..ca4529156735 100644 --- a/mm/kasan/quarantine.c +++ b/mm/kasan/quarantine.c @@ -8,6 +8,8 @@ * Based on code by Dmitry Chernenkov. */ +#define pr_fmt(fmt) "kasan: " fmt + #include #include #include @@ -414,7 +416,7 @@ static int __init kasan_cpu_quarantine_init(void) ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mm/kasan:online", kasan_cpu_online, kasan_cpu_offline); if (ret < 0) - pr_err("kasan cpu quarantine register failed [%d]\n", ret); + pr_err("cpu quarantine register failed [%d]\n", ret); return ret; } late_initcall(kasan_cpu_quarantine_init); diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c index 51a1e8a8877f..99cbcd73cff7 100644 --- a/mm/kasan/report_generic.c +++ b/mm/kasan/report_generic.c @@ -220,7 +220,7 @@ static bool __must_check tokenize_frame_descr(const char **frame_descr, const size_t tok_len = sep - *frame_descr; if (tok_len + 1 > max_tok_len) { - pr_err("KASAN internal error: frame description too long: %s\n", + pr_err("internal error: frame description too long: %s\n", *frame_descr); return false; } @@ -233,7 +233,7 @@ static bool __must_check tokenize_frame_descr(const char **frame_descr, *frame_descr = sep + 1; if (value != NULL && kstrtoul(token, 10, value)) { - pr_err("KASAN internal error: not a valid number: %s\n", token); + pr_err("internal error: not a valid number: %s\n", token); return false; } @@ -323,7 +323,7 @@ static bool __must_check get_address_stack_frame_info(const void *addr, frame = (const unsigned long *)(mem_ptr + KASAN_GRANULE_SIZE); if (frame[0] != KASAN_CURRENT_STACK_FRAME_MAGIC) { - pr_err("KASAN internal error: frame info validation failed; invalid marker: %lu\n", + pr_err("internal error: frame has invalid marker: %lu\n", frame[0]); return false; }