From patchwork Thu May 20 01:35:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12268725 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A069C433B4 for ; Thu, 20 May 2021 01:35:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DCE476139A for ; Thu, 20 May 2021 01:35:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCE476139A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 31CBB6B006E; Wed, 19 May 2021 21:35:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F4438D0002; Wed, 19 May 2021 21:35:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 196066B0071; Wed, 19 May 2021 21:35:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id E07276B006E for ; Wed, 19 May 2021 21:35:43 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 756B16C1F for ; Thu, 20 May 2021 01:35:43 +0000 (UTC) X-FDA: 78159892566.30.B16D2A2 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf24.hostedemail.com (Postfix) with ESMTP id D039EA0003B3 for ; Thu, 20 May 2021 01:35:41 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id t30so10712402pgl.8 for ; Wed, 19 May 2021 18:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4HdbC6Qq/yz7JB7oSzhlG/82Bio7SKh70aQI+8BeOHQ=; b=MNEfN88/RyB3mCU/7aCJ0Hw3bmPBydWEXWPEIKDFUCGCeeesdcPKbvobydNyBpKszQ pjxuf1+EDXNUoCIrGxMnXpCfNOU1oqw/zPBsQyslGsZnWqmFmyT2Sp+q9QxXREbmPA9b e1Rcwt3k7nDWGnk/drXvWqD3Wb2YHWdxOWnfA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4HdbC6Qq/yz7JB7oSzhlG/82Bio7SKh70aQI+8BeOHQ=; b=JVUY7T/C6aGd2YtT5rjy6iSjzPJk+oP+GETLbPzCNFgq25aoPyufufvmOXyfKCLf8X 95AtnZM5WRAwckC+9r0HyzMbQ8SIdPSYbb+aazp7vjfLsRnuZKxktkJys1vBeKE8Z9nm jgaxgsYu7AdOpWGh8569KSoGYGHyx8tFxojBHxv8YZYGOeRTfFd3neaWq6X2s0rPOQqT mhYCQZSy/6KId178BwbLmmsVMX/SkrwJOBD4Y/fiXd/4abXcRa+5PVAOcYdDjJL6nVmi Tc1jG+1MxzQQD9ma7u+mGm8ZA3WV8hADUA6+JBv2lx8YJCqtqlILuyV4DZaPIw32P9F8 aAdg== X-Gm-Message-State: AOAM532nSLIuKN7+pkUJb97Yp5ec8av6OHxPJ3Edzfi3uSHpzvZ66yDx mUplWtH2oinFnVZDX6d/xXOUpA== X-Google-Smtp-Source: ABdhPJz2X8JYbDmKUNUk9qvyngr+KED+DcHFzaqYy8AzZ6VANQl9OtTY+LghGfAw2P0kXqdWDbnoag== X-Received: by 2002:a63:585:: with SMTP id 127mr2033467pgf.322.1621474542276; Wed, 19 May 2021 18:35:42 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:200b:db75:4e6c:8b96]) by smtp.gmail.com with ESMTPSA id m20sm5097368pjq.40.2021.05.19.18.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 18:35:41 -0700 (PDT) From: Stephen Boyd To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , linux-mm@kvack.org Subject: [PATCH 1/3] lib/hexdump: Add a raw pointer printing format for slub debugging Date: Wed, 19 May 2021 18:35:37 -0700 Message-Id: <20210520013539.3733631-2-swboyd@chromium.org> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog In-Reply-To: <20210520013539.3733631-1-swboyd@chromium.org> References: <20210520013539.3733631-1-swboyd@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: D039EA0003B3 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="MNEfN88/"; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf24.hostedemail.com: domain of swboyd@chromium.org designates 209.85.215.172 as permitted sender) smtp.mailfrom=swboyd@chromium.org X-Rspamd-Server: rspam03 X-Stat-Signature: os51m6qeamy7mpnyd5xu5e1jc5un71tc X-HE-Tag: 1621474541-318 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: We want to get actual pointer addresses when we're looking at slub debugging reports. Add another prefix format specifier that says we want raw pointer addresses, i.e. %px, in the printk format. Signed-off-by: Stephen Boyd Acked-by: David Rientjes --- include/linux/printk.h | 1 + lib/hexdump.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index fe7eb2351610..a7b0b620982d 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -567,6 +567,7 @@ extern const struct file_operations kmsg_fops; enum { DUMP_PREFIX_NONE, DUMP_PREFIX_ADDRESS, + DUMP_PREFIX_RAW_ADDRESS, DUMP_PREFIX_OFFSET }; extern int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, diff --git a/lib/hexdump.c b/lib/hexdump.c index 9301578f98e8..87af5755563f 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -211,8 +211,12 @@ EXPORT_SYMBOL(hex_dump_to_buffer); * @level: kernel log level (e.g. KERN_DEBUG) * @prefix_str: string to prefix each line with; * caller supplies trailing spaces for alignment if desired - * @prefix_type: controls whether prefix of an offset, address, or none - * is printed (%DUMP_PREFIX_OFFSET, %DUMP_PREFIX_ADDRESS, %DUMP_PREFIX_NONE) + * @prefix_type: controls how prefix is printed + * %DUMP_PREFIX_OFFSET - offset prefix + * %DUMP_PREFIX_ADDRESS - hashed address prefix + * %DUMP_PREFIX_RAW_ADDRESS - non-hashed address prefix + * %DUMP_PREFIX_NONE - no prefix + * * @rowsize: number of bytes to print per line; must be 16 or 32 * @groupsize: number of bytes to print at a time (1, 2, 4, 8; default = 1) * @buf: data blob to dump @@ -260,6 +264,10 @@ void print_hex_dump(const char *level, const char *prefix_str, int prefix_type, printk("%s%s%p: %s\n", level, prefix_str, ptr + i, linebuf); break; + case DUMP_PREFIX_RAW_ADDRESS: + printk("%s%s%px: %s\n", + level, prefix_str, ptr + i, linebuf); + break; case DUMP_PREFIX_OFFSET: printk("%s%s%.8x: %s\n", level, prefix_str, i, linebuf); break; From patchwork Thu May 20 01:35:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12268727 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40921C433ED for ; Thu, 20 May 2021 01:35:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C6D5261279 for ; Thu, 20 May 2021 01:35:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6D5261279 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4573F8D0002; Wed, 19 May 2021 21:35:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B8338E0001; Wed, 19 May 2021 21:35:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2332F8D0003; Wed, 19 May 2021 21:35:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0051.hostedemail.com [216.40.44.51]) by kanga.kvack.org (Postfix) with ESMTP id E4A558D0002 for ; Wed, 19 May 2021 21:35:44 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 7BD1A1801A20C for ; Thu, 20 May 2021 01:35:44 +0000 (UTC) X-FDA: 78159892608.37.94D46F4 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf23.hostedemail.com (Postfix) with ESMTP id F2EEAA0003B2 for ; Thu, 20 May 2021 01:35:42 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id i5so10758532pgm.0 for ; Wed, 19 May 2021 18:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a7oHny6E+9Ko5a6rRGAeWWFvuBQtmHaL/Gza4VQifxU=; b=fcRCAtiZ5HTP3JTgOukQxkda0xWdG5rCc20MoUARwhFZYcsrtMUkfIcKJm1OfSvC1z 2pP6O78sXRx7E6OAzZ9GfOZYdOJQzxt9v8xlhB9XwTBvh+RCx6YIhbWOpkWvZmuGK3WH NDDDPsuSmrXkdjX6SDR678AMxIvyw9IuBAXXw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a7oHny6E+9Ko5a6rRGAeWWFvuBQtmHaL/Gza4VQifxU=; b=jLthLs9dGvGv8rm4q4PJuywkLGV5WioIVcprUegpxNIYMJtUdhjsAxEI1RBXGI5Rn1 KwSs6F0sSfl6W6OPMLimyP1HniRWWH3dFiqzeiOe8JQQb7i2xhpvMAVTWZ1raB76SZ0q D4kKZsllOoo49keiIJTMIH/eHBGcom54Q3m1S0oow1kE4pImIsvDzbFQhXxtDXc6aKH7 X7estVHCuLLSXAePGeUhvJE8TldN9TRwjlKclGbVeolenhlFiYENxbQ0dfx5N7y4kmoV 57vl8p3N2YfZUOmU94Twhl3LfgxlTfH5KYnG3/7jmqnSmmITV+iveEyPV0q02B+wT6cy WYDA== X-Gm-Message-State: AOAM533d2oUSr39151JdCIxbrBa6XEHg+rJNYHrg1WOWumBiwob68Qc7 Sq9kDW7XkH3zQ2bih5iYK+9Ayg== X-Google-Smtp-Source: ABdhPJxApI2DKKS7xj8Eo8mBKGs42dwKJxcluAloONpsm0qpwb5z0eKTSvWzCU0NKAYD8nTCnHEqFg== X-Received: by 2002:a63:4d52:: with SMTP id n18mr1992699pgl.147.1621474543340; Wed, 19 May 2021 18:35:43 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:200b:db75:4e6c:8b96]) by smtp.gmail.com with ESMTPSA id m20sm5097368pjq.40.2021.05.19.18.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 18:35:43 -0700 (PDT) From: Stephen Boyd To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , linux-mm@kvack.org Subject: [PATCH 2/3] slub: Print raw pointer addresses when debugging Date: Wed, 19 May 2021 18:35:38 -0700 Message-Id: <20210520013539.3733631-3-swboyd@chromium.org> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog In-Reply-To: <20210520013539.3733631-1-swboyd@chromium.org> References: <20210520013539.3733631-1-swboyd@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: F2EEAA0003B2 Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=fcRCAtiZ; spf=pass (imf23.hostedemail.com: domain of swboyd@chromium.org designates 209.85.215.178 as permitted sender) smtp.mailfrom=swboyd@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam04 X-Stat-Signature: wh6587s4nzhyajaopz7fbegqa5wpjqxo X-HE-Tag: 1621474542-105445 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: Obscuring the pointers that slub shows when debugging makes for some confusing slub debug messages: Padding overwritten. 0x0000000079f0674a-0x000000000d4dce17 Those addresses are hashed for kernel security reasons. If we're trying to be secure with slub_debug on the commandline we have some big problems given that we dump whole chunks of kernel memory to the kernel logs. Let's use %px here and dump buffers with the actual address for the buffer instead of the hashed version so that the logs are meaningful. This also helps if a kernel address is in some slub debug report so we can figure out that the object is referencing itself. Signed-off-by: Stephen Boyd --- mm/slub.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index feda53ae62ba..87eeeed1f369 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -549,7 +549,7 @@ static void print_section(char *level, char *text, u8 *addr, unsigned int length) { metadata_access_enable(); - print_hex_dump(level, kasan_reset_tag(text), DUMP_PREFIX_ADDRESS, + print_hex_dump(level, kasan_reset_tag(text), DUMP_PREFIX_RAW_ADDRESS, 16, 1, addr, length, 1); metadata_access_disable(); } @@ -650,7 +650,7 @@ void print_tracking(struct kmem_cache *s, void *object) static void print_page_info(struct page *page) { - pr_err("Slab 0x%p objects=%u used=%u fp=0x%p flags=%#lx(%pGp)\n", + pr_err("Slab 0x%px objects=%u used=%u fp=0x%px flags=%#lx(%pGp)\n", page, page->objects, page->inuse, page->freelist, page->flags, &page->flags); @@ -707,7 +707,7 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p) print_page_info(page); - pr_err("Object 0x%p @offset=%tu fp=0x%p\n\n", + pr_err("Object 0x%px @offset=%tu fp=0x%px\n\n", p, p - addr, get_freepointer(s, p)); if (s->flags & SLAB_RED_ZONE) @@ -777,7 +777,7 @@ static void init_object(struct kmem_cache *s, void *object, u8 val) static void restore_bytes(struct kmem_cache *s, char *message, u8 data, void *from, void *to) { - slab_fix(s, "Restoring 0x%p-0x%p=0x%x\n", from, to - 1, data); + slab_fix(s, "Restoring 0x%px-0x%px=0x%x\n", from, to - 1, data); memset(from, data, to - from); } @@ -800,7 +800,7 @@ static int check_bytes_and_report(struct kmem_cache *s, struct page *page, end--; slab_bug(s, "%s overwritten", what); - pr_err("0x%p-0x%p @offset=%tu. First byte 0x%x instead of 0x%x\n", + pr_err("0x%px-0x%px @offset=%tu. First byte 0x%x instead of 0x%x\n", fault, end - 1, fault - addr, fault[0], value); print_trailer(s, page, object); @@ -893,7 +893,7 @@ static int slab_pad_check(struct kmem_cache *s, struct page *page) while (end > fault && end[-1] == POISON_INUSE) end--; - slab_err(s, page, "Padding overwritten. 0x%p-0x%p @offset=%tu", + slab_err(s, page, "Padding overwritten. 0x%px-0x%px @offset=%tu", fault, end - 1, fault - start); print_section(KERN_ERR, "Padding ", pad, remainder); @@ -1041,7 +1041,7 @@ static void trace(struct kmem_cache *s, struct page *page, void *object, int alloc) { if (s->flags & SLAB_TRACE) { - pr_info("TRACE %s %s 0x%p inuse=%d fp=0x%p\n", + pr_info("TRACE %s %s 0x%px inuse=%d fp=0x%px\n", s->name, alloc ? "alloc" : "free", object, page->inuse, @@ -1186,7 +1186,7 @@ static inline int free_consistency_checks(struct kmem_cache *s, struct page *page, void *object, unsigned long addr) { if (!check_valid_pointer(s, page, object)) { - slab_err(s, page, "Invalid object pointer 0x%p", object); + slab_err(s, page, "Invalid object pointer 0x%px", object); return 0; } @@ -1200,10 +1200,10 @@ static inline int free_consistency_checks(struct kmem_cache *s, if (unlikely(s != page->slab_cache)) { if (!PageSlab(page)) { - slab_err(s, page, "Attempt to free object(0x%p) outside of slab", + slab_err(s, page, "Attempt to free object(0x%px) outside of slab", object); } else if (!page->slab_cache) { - pr_err("SLUB : no slab for object 0x%p.\n", + pr_err("SLUB : no slab for object 0x%px.\n", object); dump_stack(); } else @@ -1263,7 +1263,7 @@ static noinline int free_debug_processing( slab_unlock(page); spin_unlock_irqrestore(&n->list_lock, flags); if (!ret) - slab_fix(s, "Object at 0x%p not freed", object); + slab_fix(s, "Object at 0x%px not freed", object); return ret; } @@ -3908,7 +3908,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page, for_each_object(p, s, addr, page->objects) { if (!test_bit(__obj_to_index(s, addr, p), map)) { - pr_err("Object 0x%p @offset=%tu\n", p, p - addr); + pr_err("Object 0x%px @offset=%tu\n", p, p - addr); print_tracking(s, p); } } From patchwork Thu May 20 01:35:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12268729 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E21F6C43460 for ; Thu, 20 May 2021 01:35:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9454D610CC for ; Thu, 20 May 2021 01:35:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9454D610CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 27FCC8E0002; Wed, 19 May 2021 21:35:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2301B8E0001; Wed, 19 May 2021 21:35:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1212D8E0002; Wed, 19 May 2021 21:35:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0238.hostedemail.com [216.40.44.238]) by kanga.kvack.org (Postfix) with ESMTP id D812B8E0001 for ; Wed, 19 May 2021 21:35:45 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7643D80160B6 for ; Thu, 20 May 2021 01:35:45 +0000 (UTC) X-FDA: 78159892650.16.6DEEE1C Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf09.hostedemail.com (Postfix) with ESMTP id 08EE96000244 for ; Thu, 20 May 2021 01:35:43 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id t21so8097754plo.2 for ; Wed, 19 May 2021 18:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lQOWJqPqhCFkDp+9hhOZDwaBqtzLz23Olys+QM6koX4=; b=fNHovEwGGkeFLsJmt5RPUgE6pPjSKBrtL/sjfNc4fAHcC5j1Z54qMl6hhQDTxjTeuo liBs7Y3JAsbT6z/erPJdBtW5AAJny5TIOP4fN9LSbZtJbTPTSRDKMXWskWgtF3wis3r3 c/uHBaS+oGkXGcim33wy5jHzqGm0P3CFQ/Rzw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lQOWJqPqhCFkDp+9hhOZDwaBqtzLz23Olys+QM6koX4=; b=TNSGOq0YlAhK578Jgf8XHy5d0LO7NIinenfLAfXmHvGwNgC9Npw4Cju3z23jWfp2Xs JecIHmT6KXIVEN7pwoDZpnukFugX7zC3bdsHHc3PiEcqXALnDqZZBDZGyzZorZ5z7ub3 B1yGAC2z35cmd2NbzwnJR3/Z+jgY7LTE3ssTCVETF8qEN9hTXI1PCzVcqpCx6P+xvnxl waMTmiHD1kc3OnKVBF7kpyzsw0BzcjFzG1gBnBw95Q2kLfzsOe7hYnTyWK6jU7+vHN8G siUpszXpWM/hbFn6MUyB9BXa3kHd5qmv3TmBhpY6JdpFWBdgUvvAfRscTbdXW6tMepPp eMRQ== X-Gm-Message-State: AOAM532FfyOjk04ycFP15jeUyPpbWjSVC5u7C06RaEmcLTtjYnKMZ65n uRltvrbyclIODzF+PrL0uATnXA== X-Google-Smtp-Source: ABdhPJxamRbEtn82DfA9aIBe9DH1lgQZtgcRaoTgWKDBreuqJ7W0VqAbKf+VbVpZzqxuznHGoS1YXA== X-Received: by 2002:a17:90a:d201:: with SMTP id o1mr2459410pju.230.1621474544362; Wed, 19 May 2021 18:35:44 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:200b:db75:4e6c:8b96]) by smtp.gmail.com with ESMTPSA id m20sm5097368pjq.40.2021.05.19.18.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 18:35:44 -0700 (PDT) From: Stephen Boyd To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , linux-mm@kvack.org Subject: [PATCH 3/3] slub: Actually use 'message' in restore_bytes() Date: Wed, 19 May 2021 18:35:39 -0700 Message-Id: <20210520013539.3733631-4-swboyd@chromium.org> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog In-Reply-To: <20210520013539.3733631-1-swboyd@chromium.org> References: <20210520013539.3733631-1-swboyd@chromium.org> MIME-Version: 1.0 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=fNHovEwG; spf=pass (imf09.hostedemail.com: domain of swboyd@chromium.org designates 209.85.214.174 as permitted sender) smtp.mailfrom=swboyd@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 08EE96000244 X-Stat-Signature: 4nkxe64qg84dbc4to5dzzihxm1pcar1o X-HE-Tag: 1621474543-845251 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: The message argument isn't used here. Let's pass the string to the printk message so that the developer can figure out what's happening, instead of guessing that a redzone is being restored, etc. Signed-off-by: Stephen Boyd Reviewed-by: Vlastimil Babka Acked-by: David Rientjes Signed-off-by: Joe Perches --- mm/slub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c index 87eeeed1f369..16e8e8f8dc0c 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -777,7 +777,7 @@ static void init_object(struct kmem_cache *s, void *object, u8 val) static void restore_bytes(struct kmem_cache *s, char *message, u8 data, void *from, void *to) { - slab_fix(s, "Restoring 0x%px-0x%px=0x%x\n", from, to - 1, data); + slab_fix(s, "Restoring %s 0x%px-0x%px=0x%x\n", message, from, to - 1, data); memset(from, data, to - from); }