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 CB775C433FE for ; Thu, 3 Nov 2022 14:22:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21DEC6B0072; Thu, 3 Nov 2022 10:22:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A7D96B0073; Thu, 3 Nov 2022 10:22:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F15766B0074; Thu, 3 Nov 2022 10:22:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E0FAB6B0072 for ; Thu, 3 Nov 2022 10:22:30 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CBD7816085A for ; Thu, 3 Nov 2022 14:22:29 +0000 (UTC) X-FDA: 80092346418.04.954BF82 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by imf22.hostedemail.com (Postfix) with ESMTP id 0C39AC0012 for ; Thu, 3 Nov 2022 14:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667485349; x=1699021349; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=/IF6fr28+mBjtFe4CYg0cYnXQTHF0AWObAx5RMemp2E=; b=UmZqEFphG9VhE9FhvRRXW5mCuOmuEwI+Gb16F/J8oTuOVTg8p9vbK6gL cGPSiLSomW5RfaE1zkYGSE/Z8TOCfd9r64KKaxyyA1wTPywL/Iu3rVQvi AT1A9Eju3OmsESH5FGqQtOMzOZKyVSRRT36cShCViF/tQYeYDebfKcicB RJunbGXI8g2UHm9mqnjG4gwfB4M7b1NyMAHNRWBLmjhdownVwkjYzwVqi ngNEBZbMSlVcuXpjVh7iaCY6YXpgiBHmbvnuSZSPiHQaQUceoWMQHImUC gGZInBMzTNM1NSNLaR3AfcQqYlRWwRhS+iPd1StDbmvgLmkXEV4IjlVBN w==; X-IronPort-AV: E=McAfee;i="6500,9779,10520"; a="293018842" X-IronPort-AV: E=Sophos;i="5.96,235,1665471600"; d="scan'208";a="293018842" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2022 07:19:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10520"; a="703690367" X-IronPort-AV: E=Sophos;i="5.96,235,1665471600"; d="scan'208";a="703690367" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2022 07:19:35 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 3 Nov 2022 07:19:35 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Thu, 3 Nov 2022 07:19:35 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.109) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Thu, 3 Nov 2022 07:19:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W67d4GGI9CVkoWT3+gsyNpKkhBsdMNsBQ+OHMsajgBFRC6fsjq3ulOwkbppfgg625muFTV6PLJbfEPfi7Pu3u/JzDMqxQAwaMQDObAuBokgpszcv0kbxwoURkTFLUWrPT3Y7s9rn/98kRw3z3Nz5OJAeKBCVyhGqJ895opHTmMlODCAijf9cWmzzNbc+lL065F1LbHruYony/h0/WcODhn3baDyB/hCvtLQTo5Y9t3Wdx1AyJ4tG9Uz/LwpDEUSmqYtYrjfh0huWtrJJPlM30Qx82bznBCnpQexM1VFu8YtNkOEodDkYhPHXE5C+ImMzE8B0TsjBC81gP6bxiLWPHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9Hytu0ClCaUeD7K6RlMm0Gx2SWbYu5/I136HN3A8CKg=; b=ZwtyyQMMXO0c6XQKSb+EZG0GjvAEta2DMmfGd9RRpYsXYSvvGxWJ0J/l0LyXAEMH4BmF1+9JpWxbys/MdRmpMwipReCLblOnqzfLjCpMIHrJX+qJv/ftqOFSWA0EpQ+0iwczac2MFq89JYurRBswqzzuJUI4J+jdqfbjpDUOKBO4EC7KY3T3ZtvXrZ0Dhkz/3/Dt8pv/djwiyEPJ8q2WSunKvru9HXGEvLyqidYnKmpr1MVRFr53W4+kXc6kkwKDu2Dnr951BfkbekKHF7A7rXedC0SrqUZU7Pzu9Cd3VWkA4ig8R2ZmQOl72vdf9AkdTzmRpOvomMDKO9kxNcVQ8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MN0PR11MB6304.namprd11.prod.outlook.com (2603:10b6:208:3c0::7) by CY5PR11MB6368.namprd11.prod.outlook.com (2603:10b6:930:38::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Thu, 3 Nov 2022 14:19:27 +0000 Received: from MN0PR11MB6304.namprd11.prod.outlook.com ([fe80::c00f:264f:c005:3a5b]) by MN0PR11MB6304.namprd11.prod.outlook.com ([fe80::c00f:264f:c005:3a5b%3]) with mapi id 15.20.5769.021; Thu, 3 Nov 2022 14:19:27 +0000 Date: Thu, 3 Nov 2022 22:16:12 +0800 From: Feng Tang To: Vlastimil Babka CC: John Thomson , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrew Morton , "Christoph Lameter" , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Dmitry Vyukov , "Jonathan Corbet" , Andrey Konovalov , "Hansen, Dave" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "kasan-dev@googlegroups.com" , Robin Murphy , John Garry , Kefeng Wang , Thomas Bogendoerfer , "linux-mips@vger.kernel.org" Subject: Re: [PATCH v6 1/4] mm/slub: enable debugging memory wasting of kmalloc Message-ID: References: <9b71ae3e-7f53-4c9e-90c4-79d3d649f94c@app.fastmail.com> <53b53476-bb1e-402e-9f65-fd7f0ecf94c2@app.fastmail.com> <29271a2b-cf19-4af9-bfe5-5bcff8a23fda@app.fastmail.com> <097d8fba-bd10-a312-24a3-a4068c4f424c@suse.cz> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: SI2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::11) To MN0PR11MB6304.namprd11.prod.outlook.com (2603:10b6:208:3c0::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN0PR11MB6304:EE_|CY5PR11MB6368:EE_ X-MS-Office365-Filtering-Correlation-Id: 47db4366-c8e5-4e9d-3b1a-08dabda669f8 X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TxRuRkISGROoUenb1tpqSFbHAKP6Iz5dfekrVbsz0JOotXK6Si24K1RFTaATxQgSzepqHeIAu1H1ktohRGMg703xKqSuHLimn+1Ia77yEWnDnLH86X4ANTX+ewLNAFiNE1NpC5eFkO8L0/bAnQyO0ezgDK7364OQUJfUnobgykwe6ZXVSLhOTuIM/KfDZ+OVEYi+hBAl4XR6JEpnIL4jQzUM6OA43iTQSVz/xtRys4GXyLijOT3ZySJt56UkY/IkKG/YTxYQ3fs45eAeFuhcpgx71V/TkK6zaCvYjzbmVKun+rcm2XyFrT//nY4uhSuA2TE9CVg2cWXbm4gc0WKO+teuKnv3VFFDmjBLR7frDpXaQo8+RttxGC76EoaYaA1cHpCp+0CKu9Ni45kOYW3a+r6SWUGYp74U9vTLWsVjMJx++u/G5aadX1MzdysF6LeXAsFZrlqsIuiaP+Mxa4LkdfRaSR2Da/G9vLGD3K6yKx89wVl/BxVpL3prwjiNnPrY0+v6Uy5G00iJ4avSxDGjX3oMP1KHN2jaCMbo5B74q1ZAcSiaSQwot2THwOHknTPOM9T0f1Ptz855LDrlrq0ksUUKOuBRDJM9VNCKZV82/fHilhDh6RRZ9J9Cccazzkkhyph9LlfphvCftMN7rBUFuqDz70As4FGBJGKo+/UPF79I5hPXWVykTzkKu0dyEEIwHtKlkjbKLEPF64MDb5eULA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN0PR11MB6304.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(7916004)(39860400002)(376002)(346002)(366004)(136003)(396003)(451199015)(83380400001)(478600001)(54906003)(38100700002)(33716001)(316002)(82960400001)(53546011)(8676002)(6666004)(66946007)(66476007)(4326008)(6916009)(66556008)(6506007)(6486002)(8936002)(9686003)(26005)(6512007)(41300700001)(5660300002)(7416002)(2906002)(186003)(86362001)(44832011);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mnIW/4hFAJOAMPxxXE4ITUb7mdVLL6qb6FhCnshD8U50Tht/1LXgyL9hYh6F?= =?us-ascii?Q?JDjtdv2cZ/4aZjBD2FqDVrRZ1sca/Ix6x7RNQmDijMzPdOpTsE+SwVICETDg?= =?us-ascii?Q?uefhomXiG3XEqmNwvWuPdx0pVqOTWmNPc8TAQvWSDUMdrIuo5XEtP+/mAwja?= =?us-ascii?Q?TMyvWWqQsal1Olg3oxh5wg7e238xMI9MVrAnGKbrknr1pgXZk+eOFvHkiPul?= =?us-ascii?Q?lyLYqHtoOIwoFI/H0HL1MYBmTE7d7RJm3rsIgT5edJvP6ItkVLGvUcuXMf1f?= =?us-ascii?Q?RclUXYd+ppnlBZ7frhxTnNXtRvNhR2pFrltyyZ3wXKIbpxGklCov+kmc8rlU?= =?us-ascii?Q?vtJFFMnVGapTLIY9oPjfP9zlGj+aodSfu6sdkiOorqetb5m15kbh/5ZMmrxy?= =?us-ascii?Q?rJ41kUIJlMbPx16w5QPHnLYtV8cKulE/JaOLCQHKZCtu/mAaruXhKVAVeij/?= =?us-ascii?Q?xwDIvf7wEyYDOsTr3+WQcDEM++GypYNZGdbIzQyRIuVYW9wSJgYMiHC4vbQF?= =?us-ascii?Q?45zutgcgIedNy9wg/FTmS0d8B2cJk3ul/eWQtkYGtYLpZMtNNlWL7uaiBOyI?= =?us-ascii?Q?72M4T3KT01IEEbdHUc7Evhil4Vlf2cqZnbU3Fs5Yhe/Ih6oG8YHuF0qjNvyB?= =?us-ascii?Q?tEHDeVs8reGcqMqyE/N/rcwfPkeOZAH5tawj7H63B2j/W/eJ8A24JcYgDs38?= =?us-ascii?Q?w/CValfGTrJQHpx3rSaHGOPqGMMS3R3F1h8F+PDnWQdApNObWa89l9/rmK27?= =?us-ascii?Q?do2t8r3+UKRPwU8dzA8aIN3PWqgP+TshHxo9mFI7zN7Mk+Z3VW+U0pNNMV2z?= =?us-ascii?Q?4JKYY9IWB2xAkyteQIYl20qngKueY7wbYyg7z8B6izx6K68P8yROO4MeesY1?= =?us-ascii?Q?oWMM3lIBrZxo6uF/CcT+y5S05LNrX3PQP6sBwzEZdByDBuq92jTw7rhwSfUm?= =?us-ascii?Q?l572hNIayWGbRyLs7usFKKJQajAtEnJZU2LfkPOCZ4ROuMy9u4TL3Lkpi4z2?= =?us-ascii?Q?34W9nGGfH2eGdoiCHpPKW52Ei+hyg5NsBeJxr2g47auq8Fx4M6DyoAIMcPwR?= =?us-ascii?Q?uoVOUikjvn/u3NkuetGpoBRZJ+auklKlGoc56TeKkm9lj4vGnZDycewd5iCs?= =?us-ascii?Q?FJLFxpOKTj9Iykq79ZAJWfK209jNTs5oMFSAq5MTz4QaYYDziu2NjMExXNFo?= =?us-ascii?Q?42V+N6HSXeVGdN1bAuLwU01Ggg7x09EWMMZ+w8jrjnJNqLlAxzyDs/hSTv+7?= =?us-ascii?Q?zlf745NbEUbpJhlEX1MtWe6VDmShnLoT8Rt9yd9H3wLRYF+fC0uWY77SmlYJ?= =?us-ascii?Q?/dgan6l84onMiy6WQZ++uwaRU8GE0HWCJtj0/oMrBBLRQpkU5VKSmrGfElcG?= =?us-ascii?Q?vCLC/P+VEAS7WZ9zvibv696WQwBYixO8IVnarEJ5Vr38mlXLPICoUSNTl9XM?= =?us-ascii?Q?xwr+ETQfvGYSFfnVAahR2BaS/5lN6ZYILqNADL74GV/8bEBHbyoxCyHYoV6p?= =?us-ascii?Q?K5RxcK8zxCn3tS7hW4WO0zkzewIXxYq5A/U5F2yTMfksLiMDAMx1y1ByAMEK?= =?us-ascii?Q?6xrf2XoSjXTwsJspLY3SAvgzjUUVR2uCnn+wDDCt?= X-MS-Exchange-CrossTenant-Network-Message-Id: 47db4366-c8e5-4e9d-3b1a-08dabda669f8 X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6304.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2022 14:19:26.9424 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xmERxHJrd6kRVGeuWw5IoLBNZKDyHvnbPrA1vzNdWAI7Atmsxn5NRDWNhSu/HbZmXzRgwIM7VvkXM2x90wCW6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6368 X-OriginatorOrg: intel.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667485349; 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=9Hytu0ClCaUeD7K6RlMm0Gx2SWbYu5/I136HN3A8CKg=; b=xIkYxd1Ob2qe+PJgowmL8vOtdzP7hLDaEf15Dd0WNPwHUnf2ciZjb3pNOUKLd9mSI2s5cl 2M8B9iycHOwSB0yqPR4uPrK2LbEaWjI1dp9RZJRgoXYSjU5CIuTYyOx9lcbJ6FQ+Txmk+r ESTK9v/q6EKdwARF3nfJl0rtcrMqqKA= ARC-Authentication-Results: i=2; imf22.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=UmZqEFph; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf22.hostedemail.com: domain of feng.tang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=feng.tang@intel.com; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1667485349; a=rsa-sha256; cv=fail; b=iGT+Gjz5Whef/hEX1aTU6aCtUqUo4UNr6rdykFRHEevl/trnyHOa2wF84ULxFPeIvP4U9X L83qXc95ttChMz6PPVXRS2m+k+PBDkQ7in4jYtrmRwEImIzDRBFwcqgfZD0HempU7TiWe5 A4rcpkQTX3O0HDch+sqSsJe52b6y5/M= Authentication-Results: imf22.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=UmZqEFph; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf22.hostedemail.com: domain of feng.tang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=feng.tang@intel.com; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 0C39AC0012 X-Stat-Signature: rcjribkcos73k3pexxnseu6cpmywtnzh X-HE-Tag: 1667485348-403899 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: On Thu, Nov 03, 2022 at 09:33:28AM +0100, Vlastimil Babka wrote: [...] > >> AFAICS before this patch, we "survive" "kmem_cache *s" being NULL as > >> slab_pre_alloc_hook() will happen to return NULL and we bail out from > >> slab_alloc_node(). But this is a side-effect, not an intended protection. > >> Also the CONFIG_TRACING variant of kmalloc_trace() would have called > >> trace_kmalloc dereferencing s->size anyway even before this patch. > >> > >> I don't think we should add WARNS in the slab hot paths just to prevent this > >> rare error of using slab too early. At most VM_WARN... would be acceptable > >> but still not necessary as crashing immediately from a NULL pointer is > >> sufficient. > >> > >> So IMHO mips should fix their soc init, > > > > Yes, for the mips fix, John has proposed to defer the calling of prom_soc_init(), > > which looks reasonable. > > > >> and we should look into the > >> CONFIG_TRACING=n variant of kmalloc_trace(), to pass orig_size properly. > > > > You mean check if the pointer is NULL and bail out early. > > No I mean here: > > #else /* CONFIG_TRACING */ > /* Save a function call when CONFIG_TRACING=n */ > static __always_inline __alloc_size(3) > void *kmalloc_trace(struct kmem_cache *s, gfp_t flags, size_t size) > { > void *ret = kmem_cache_alloc(s, flags); > > ret = kasan_kmalloc(s, ret, size, flags); > return ret; > } > > we call kmem_cache_alloc() and discard the size parameter, so it will assume > s->object_size (and as the side-effect, crash if s is NULL). We shouldn't > add "s is NULL?" checks, but fix passing the size - probably switch to > __kmem_cache_alloc_node()? and in the following kmalloc_node_trace() analogically. Got it, thanks! I might have missed it during some rebasing for the kmalloc wastage debug patch. How about the following fix? Thanks, Feng --- >From 9f9fa9da8946fd44625f873c0f51167357075be1 Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Thu, 3 Nov 2022 21:32:10 +0800 Subject: [PATCH] mm/slub: Add missing orig_size parameter for wastage debug commit 6edf2576a6cc ("mm/slub: enable debugging memory wasting of kmalloc") was introduced for debugging kmalloc memory wastage, and it missed to pass the original request size for kmalloc_trace() and kmalloc_node_trace() in CONFIG_TRACING=n path. Fix it by using __kmem_cache_alloc_node() with correct original request size. Fixes: 6edf2576a6cc ("mm/slub: enable debugging memory wasting of kmalloc") Suggested-by: Vlastimil Babka Signed-off-by: Feng Tang --- include/linux/slab.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 90877fcde70b..9691afa569e1 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -469,6 +469,9 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignm __alloc_size(1); void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t flags, int node) __assume_slab_alignment __malloc; +void *__kmem_cache_alloc_node(struct kmem_cache *s, gfp_t flags, int node, + size_t orig_size, unsigned long caller) __assume_slab_alignment + __malloc; #ifdef CONFIG_TRACING void *kmalloc_trace(struct kmem_cache *s, gfp_t flags, size_t size) @@ -482,7 +485,8 @@ void *kmalloc_node_trace(struct kmem_cache *s, gfp_t gfpflags, static __always_inline __alloc_size(3) void *kmalloc_trace(struct kmem_cache *s, gfp_t flags, size_t size) { - void *ret = kmem_cache_alloc(s, flags); + void *ret = __kmem_cache_alloc_node(s, flags, NUMA_NO_NODE, + size, _RET_IP_); ret = kasan_kmalloc(s, ret, size, flags); return ret; @@ -492,7 +496,8 @@ static __always_inline __alloc_size(4) void *kmalloc_node_trace(struct kmem_cache *s, gfp_t gfpflags, int node, size_t size) { - void *ret = kmem_cache_alloc_node(s, gfpflags, node); + void *ret = __kmem_cache_alloc_node(s, gfpflags, node, + size, _RET_IP_); ret = kasan_kmalloc(s, ret, size, gfpflags); return ret; -- 2.34.1