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 46339C43219 for ; Sat, 5 Nov 2022 06:35:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51F218E0001; Sat, 5 Nov 2022 02:35:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4CEC16B0073; Sat, 5 Nov 2022 02:35:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3967E8E0001; Sat, 5 Nov 2022 02:35:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2AAAF6B0071 for ; Sat, 5 Nov 2022 02:35:43 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EAA33ABFCA for ; Sat, 5 Nov 2022 06:35:42 +0000 (UTC) X-FDA: 80098427724.13.422DC5B Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf14.hostedemail.com (Postfix) with ESMTP id 7958E100003 for ; Sat, 5 Nov 2022 06:35:41 +0000 (UTC) Received: by mail-pj1-f45.google.com with SMTP id r61-20020a17090a43c300b00212f4e9cccdso10058689pjg.5 for ; Fri, 04 Nov 2022 23:35:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=V+ttrriw2jHbnwBq8r9WNw6hEcBwWElO92RwaTxM2O4=; b=JUkgp/e0IphClCG54NWjL/yqLptR2OE1WH8h5TEyrYSFpfliB6k3FR2lKYsnWuL6oh SyK0PjXgG139TvsIyS/25Lj4cPM3HwsOAYC7fIH8elQXWGzAi+AdpJQo9K2hoCR9G6Ym FcWOplSbLVVXPJfoLops5eLetitvWlePoZQUc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=V+ttrriw2jHbnwBq8r9WNw6hEcBwWElO92RwaTxM2O4=; b=enkRp8RpeOIoetvD3uLIUjJXajEjhjiwNRhPVBU/NtFiyl8Zfh8YJWflDNJJYctWBU mzBR5351wvKJ/d0b0oX2i9I47HGqakndPwua6KHLYaOEbzsxTU3oc4DCwJOgs6neYgls 3fJWu4lkhwHhBq2aceQo7iLaO51kfEIYopX+7ikJR3RvVPRSUz9w16yNGJFNePWHis3O SMhQu9WqulDT8z6k0rigz1iIoRQRa/S8fME+bOsPRTle7ZTtGktm0SkFpRad/Xgo98jO iS3oEqMfzJqgO/6Kfqnkr0YYFw0xsqiYQ6I1IDlqOrLPtWLwGxxG8xSy3Na7ZaL9Nk/h aMkg== X-Gm-Message-State: ACrzQf2lauGD+v2LSltlvsMbh/1MpMyFRTKaEF4spvuL8RXv8FvfWZgL gJvLCyFJtS79XShGqf1KYpBn8qdo4kyGAw== X-Google-Smtp-Source: AMsMyM6GIqPmhSXRWkyElAVjS2i8skcIDYLMxIhJaZ10L9qTgqe0jzDdEDbRPuGBca3OtaF+p3hqPA== X-Received: by 2002:a17:90a:9a8f:b0:212:ea8d:dc34 with SMTP id e15-20020a17090a9a8f00b00212ea8ddc34mr59411973pjp.30.1667630140271; Fri, 04 Nov 2022 23:35:40 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id i36-20020a635864000000b00464aa9ea6fasm678014pgm.20.2022.11.04.23.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 23:35:39 -0700 (PDT) From: Kees Cook To: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Kees Cook , Vlastimil Babka , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , linux-mm@kvack.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] mm/slab_common: Restore passing "caller" for tracing Date: Fri, 4 Nov 2022 23:35:34 -0700 Message-Id: <20221105063529.never.818-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1630; h=from:subject:message-id; bh=JSGlXxVXB24xybNyyB3Vx4Hgog1N3EuhU50a+R/H2V4=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBjZgQ1daoz1U/VFQdp/4qneXVJ7s/nT76PsVBHEcUw Hku/Y+aJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY2YENQAKCRCJcvTf3G3AJpYND/ 43VInsS7w3k6nIW0kEAEKttCAbRNuYUQth1geGAKEEnDhfwHwhs5BI39fidAQfdwJ3DUS2DkWf2Abu esup2SlME5eBOZ0ffdxyq5O2bH7IsrT1akDDnac6gMn9lrJndYJlVfeigjZlKA+zcpbXCkns6OCLL/ 24AFCoY3DQ8Pjnzlwa2FurtmroYYVT1iiYXGGZMcYUJSM9hLXe9Q+dAjex6CuyNXZp8wwdL7rNnegi qyq3bPBfpuWBA29l+r080Ua4pn74ON7En9+6CQtVaX5bibHwgcsV9aT2LxMmskIhCeMko5Xxl9cN0r u5M5qHnPyjCYLS4IXSUsuJQ7DE/SRA81W6Qh0dQXfazCHFjI1+8TSCHX/hwxCZ6811idprz+VsFoiR y0Z7wojUwvY2odkzybSQeDJoAEVzVX2A7PfzXspwoA+D9VFDdHcyrdNB0JJkfHE69wzSqVpoijFfQD hy/CkLNl9l2YS9QupqWIdzSGDqbvB0+VyxvH2aYakKv9/KxcYJscLbz+jZdtflujeR0WWvUSX68GTv oH+P+DwmUSJ2l5Y9KcfQ17ysXUbFSZRkuiAYFNV8XbYN2jtlC+GAuWWNBP4N2+ieim+FxlBMlAt9Pu sl/rXgcX304x0jVRzknC7ISFsscd2pr+27sGDOhWxNEvzSLSkFrov1lVe/9w== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667630141; a=rsa-sha256; cv=none; b=DtaZIkzBQBn/lssBEReFXqd7JJnincqkYGmhqs/GzkPMTwpqqflesq6nAOq52AGhTxLRiY dfq6kaL/k1lEAzUF8swbE6eVGMJDF8UyZvOFYnqFowikl9l8XYFQx63PFZedfes+Q3/gHT rAThj4bQZwY71Ifpt6dzdMSB1HQ4wJU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="JUkgp/e0"; spf=pass (imf14.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.45 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667630141; 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:references:dkim-signature; bh=V+ttrriw2jHbnwBq8r9WNw6hEcBwWElO92RwaTxM2O4=; b=nexZErBm7I0XJs8o1Ho3rGoTlmtN6z+LvDCI5mW4dQ8doC4GP7KwW4kKxTnAfNGpbQsM9T FP6pUWnWD0GRc/AOWS9iN4tjbZpRfeH/v0LVvhAKO35cXRSGIwpZg25BLUqlfdwd+eM28T Xc+VVFPf33elSJfUuZpXNydpQDLyPEc= Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="JUkgp/e0"; spf=pass (imf14.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.45 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 7958E100003 X-Stat-Signature: y6wd9p7kutfq1yux6nbsa5zx9i79mwuy X-HE-Tag: 1667630141-397225 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 "caller" argument was accidentally being ignored in a few places that were recently refactored. Restore these "caller" arguments, instead of _RET_IP_. Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Vlastimil Babka Cc: Christoph Lameter Cc: Pekka Enberg Cc: David Rientjes Cc: Joonsoo Kim Cc: Andrew Morton Cc: Roman Gushchin Cc: linux-mm@kvack.org Fixes: 11e9734bcb6a ("mm/slab_common: unify NUMA and UMA version of tracepoints") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook --- mm/slab_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 33b1886b06eb..0e614f9e7ed7 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -941,7 +941,7 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller if (unlikely(size > KMALLOC_MAX_CACHE_SIZE)) { ret = __kmalloc_large_node(size, flags, node); - trace_kmalloc(_RET_IP_, ret, size, + trace_kmalloc(caller, ret, size, PAGE_SIZE << get_order(size), flags, node); return ret; } @@ -953,7 +953,7 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller ret = __kmem_cache_alloc_node(s, flags, node, size, caller); ret = kasan_kmalloc(s, ret, size, flags); - trace_kmalloc(_RET_IP_, ret, size, s->size, flags, node); + trace_kmalloc(caller, ret, size, s->size, flags, node); return ret; } -- 2.34.1