From patchwork Fri Jun 3 03:54:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: patrick wang X-Patchwork-Id: 12868484 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 7B085C433EF for ; Fri, 3 Jun 2022 03:54:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 135EF6B0073; Thu, 2 Jun 2022 23:54:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0EAE26B0074; Thu, 2 Jun 2022 23:54:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9E736B0075; Thu, 2 Jun 2022 23:54:27 -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 DA08B6B0073 for ; Thu, 2 Jun 2022 23:54:27 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AEE8520A75 for ; Fri, 3 Jun 2022 03:54:27 +0000 (UTC) X-FDA: 79535557374.19.664996D Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf16.hostedemail.com (Postfix) with ESMTP id BF1F2180086 for ; Fri, 3 Jun 2022 03:54:09 +0000 (UTC) Received: by mail-pf1-f173.google.com with SMTP id p8so6301860pfh.8 for ; Thu, 02 Jun 2022 20:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AE33Ihqv1t9aLq7UPLG/US1ju2jh1U/6t4mE/T1uzCg=; b=O+PNjUduciX7Xx08NHo//9gZ1MAEWBk7QW4BZVAqte9EfoplTolcAt+C4rlOHX5Y7s XpVXx6r7vudrBQucENUyiRG9cLbeMhQSpAdY9AgLB0F5sPYCGcLVM4Y/wLLz8rAZWtXi 9HjRYy00A3RgYoP6Pe3jIAc4UOWe9+8jDWcFlPjrf8P0OZQOdcx/Bq2Sm1lb1xfnPRDw CxkUOpF30dsuRuMIerewZZj3TdikR2r1SdQqI6DBsY1ogN5ZJIlQO2QRdpehdy1M+9f3 iHYnrtfvugrsRyx1qI0D+fnq3WYXzcDJ0Im55sARe2ngvOex1lZ9ciCymoWdgrvHRCaK hQnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AE33Ihqv1t9aLq7UPLG/US1ju2jh1U/6t4mE/T1uzCg=; b=a5EwA+cXtgfON+kz5ESqzayptWOKVHGMI1wb/sLgP1w3oh0I/MualcAs4KTcnrskJw n/cW4gByi1K1t5GJfEDAMs6kUneVkRcurrf1blR4mcYjWdEODOsg/0eMYHL13ddPl1Ld OGC20u+S07/uoe8VFi30YEk1pGq3vthke+V1qAozEoMrzvJaFv/RF8Q3OSr9Tv+NzPF8 /iUpjHmV34fOqX2VPI1Kk1938uvsxxADAWiKk7WxeXK7Kbq3yV+h6smz5xq4Cvu6Iijk Oc0wUVc4B2lHfGymIAHE9igifoG/VZM2Ibt7jnrmDaRA9J40fbXkTPqlB5Zdu9J4qmqf sQWw== X-Gm-Message-State: AOAM531T8rm5QPCCqlCKYis5Kxys38KXMlOrbVS72eqPFPYke6ZJpkvO Lx1yZ5O5BPrzGRe2nzzsq4s= X-Google-Smtp-Source: ABdhPJzWnPOllcltScI/t1jtuBfhDPeuf9KuowCerL9DyIRZH7cGHTf3p+2+jOgVwDd3tiwi8WffoQ== X-Received: by 2002:a62:7cca:0:b0:4fd:e594:fac0 with SMTP id x193-20020a627cca000000b004fde594fac0mr8389022pfc.79.1654228466183; Thu, 02 Jun 2022 20:54:26 -0700 (PDT) Received: from localhost ([101.86.206.159]) by smtp.gmail.com with ESMTPSA id 4-20020a631744000000b003fbdf7cc750sm4069329pgx.89.2022.06.02.20.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 20:54:25 -0700 (PDT) From: Patrick Wang To: catalin.marinas@arm.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, yee.lee@mediatek.com, patrick.wang.shcn@gmail.com Subject: [PATCH v2 1/4] mm: kmemleak: add OBJECT_PHYS flag for objects allocated with physical address Date: Fri, 3 Jun 2022 11:54:12 +0800 Message-Id: <20220603035415.1243913-2-patrick.wang.shcn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220603035415.1243913-1-patrick.wang.shcn@gmail.com> References: <20220603035415.1243913-1-patrick.wang.shcn@gmail.com> MIME-Version: 1.0 X-Stat-Signature: s4u6x4prai41wm47mxwp9mxh83xpng3t X-Rspam-User: Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=O+PNjUdu; spf=pass (imf16.hostedemail.com: domain of patrick.wang.shcn@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=patrick.wang.shcn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BF1F2180086 X-HE-Tag: 1654228449-428542 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: Add OBJECT_PHYS flag for object. This flag is used to identify the objects allocated with physical address.The create_object() function is added an argument to set that flag. Suggested-by: Catalin Marinas Signed-off-by: Patrick Wang --- mm/kmemleak.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index a182f5ddaf68..1e9e0aa93ae5 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -172,6 +172,8 @@ struct kmemleak_object { #define OBJECT_NO_SCAN (1 << 2) /* flag set to fully scan the object when scan_area allocation failed */ #define OBJECT_FULL_SCAN (1 << 3) +/* flag set for object allocated with physical address */ +#define OBJECT_PHYS (1 << 4) #define HEX_PREFIX " " /* number of bytes to print per line; must be 16 or 32 */ @@ -575,7 +577,8 @@ static int __save_stack_trace(unsigned long *trace) * memory block and add it to the object_list and object_tree_root. */ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, - int min_count, gfp_t gfp) + int min_count, gfp_t gfp, + bool is_phys) { unsigned long flags; struct kmemleak_object *object, *parent; @@ -595,7 +598,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, INIT_HLIST_HEAD(&object->area_list); raw_spin_lock_init(&object->lock); atomic_set(&object->use_count, 1); - object->flags = OBJECT_ALLOCATED; + object->flags = OBJECT_ALLOCATED | (is_phys ? OBJECT_PHYS : 0); object->pointer = ptr; object->size = kfence_ksize((void *)ptr) ?: size; object->excess_ref = 0; @@ -729,10 +732,10 @@ static void delete_object_part(unsigned long ptr, size_t size) end = object->pointer + object->size; if (ptr > start) create_object(start, ptr - start, object->min_count, - GFP_KERNEL); + GFP_KERNEL, object->flags & OBJECT_PHYS); if (ptr + size < end) create_object(ptr + size, end - ptr - size, object->min_count, - GFP_KERNEL); + GFP_KERNEL, object->flags & OBJECT_PHYS); __delete_object(object); } @@ -904,7 +907,7 @@ void __ref kmemleak_alloc(const void *ptr, size_t size, int min_count, pr_debug("%s(0x%p, %zu, %d)\n", __func__, ptr, size, min_count); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) - create_object((unsigned long)ptr, size, min_count, gfp); + create_object((unsigned long)ptr, size, min_count, gfp, false); } EXPORT_SYMBOL_GPL(kmemleak_alloc); @@ -931,7 +934,7 @@ void __ref kmemleak_alloc_percpu(const void __percpu *ptr, size_t size, if (kmemleak_enabled && ptr && !IS_ERR(ptr)) for_each_possible_cpu(cpu) create_object((unsigned long)per_cpu_ptr(ptr, cpu), - size, 0, gfp); + size, 0, gfp, false); } EXPORT_SYMBOL_GPL(kmemleak_alloc_percpu); @@ -953,7 +956,7 @@ void __ref kmemleak_vmalloc(const struct vm_struct *area, size_t size, gfp_t gfp * the virtual address of the vmalloc'ed block. */ if (kmemleak_enabled) { - create_object((unsigned long)area->addr, size, 2, gfp); + create_object((unsigned long)area->addr, size, 2, gfp, false); object_set_excess_ref((unsigned long)area, (unsigned long)area->addr); } @@ -1966,14 +1969,14 @@ void __init kmemleak_init(void) /* register the data/bss sections */ create_object((unsigned long)_sdata, _edata - _sdata, - KMEMLEAK_GREY, GFP_ATOMIC); + KMEMLEAK_GREY, GFP_ATOMIC, false); create_object((unsigned long)__bss_start, __bss_stop - __bss_start, - KMEMLEAK_GREY, GFP_ATOMIC); + KMEMLEAK_GREY, GFP_ATOMIC, false); /* only register .data..ro_after_init if not within .data */ if (&__start_ro_after_init < &_sdata || &__end_ro_after_init > &_edata) create_object((unsigned long)__start_ro_after_init, __end_ro_after_init - __start_ro_after_init, - KMEMLEAK_GREY, GFP_ATOMIC); + KMEMLEAK_GREY, GFP_ATOMIC, false); } /*