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 9979BC05027 for ; Mon, 23 Jan 2023 17:05:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C9A96B0074; Mon, 23 Jan 2023 12:05:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 279946B0075; Mon, 23 Jan 2023 12:05:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1410C6B0078; Mon, 23 Jan 2023 12:05:12 -0500 (EST) 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 0209B6B0074 for ; Mon, 23 Jan 2023 12:05:11 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C42AA1212F6 for ; Mon, 23 Jan 2023 17:05:11 +0000 (UTC) X-FDA: 80386689222.04.5A12D3A Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by imf05.hostedemail.com (Postfix) with ESMTP id CDA0F100029 for ; Mon, 23 Jan 2023 17:05:09 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=enfabrica.net header.s=google header.b=So8Z6Rqf; spf=pass (imf05.hostedemail.com: domain of george@enfabrica.net designates 209.85.167.176 as permitted sender) smtp.mailfrom=george@enfabrica.net; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674493509; 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=Kp4WYRpASf5CVsJFYjl+ZnZkRci2IQqrsIcj0lr85Wg=; b=M6ZF1vBLKn8rwPUfwQRoaFQd14NtqVndEYElUWpmQoOX6FA3lSlsCK6VhI72exwa7fbw86 8k+PXlk1waZGI34wGAtnA1WFNCPHJ6iDtLvFYbhRRBC7BMAYRlLZ56PrYPwElHY/14LvzV DJ/53bYRbFAs4e62tlxzqFF6z1C+7mM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=enfabrica.net header.s=google header.b=So8Z6Rqf; spf=pass (imf05.hostedemail.com: domain of george@enfabrica.net designates 209.85.167.176 as permitted sender) smtp.mailfrom=george@enfabrica.net; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674493509; a=rsa-sha256; cv=none; b=7n2OfDpVcYf57J1XFrLuYeG/qZJb8KyEY1tkxw1AHF0wzQjYPxWxro/Y2tiS1WjP1nzER+ 9F43Lfd9bNkZNpxCaBmUO0KxayuXrCPu2L3Bw+e3YSqtoz6UZiXkCohWIEMQ1Kn80uvNkh OYpMwOJvAg/Y/jmw6I7UQltMrA6memI= Received: by mail-oi1-f176.google.com with SMTP id r205so10909733oib.9 for ; Mon, 23 Jan 2023 09:05:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enfabrica.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Kp4WYRpASf5CVsJFYjl+ZnZkRci2IQqrsIcj0lr85Wg=; b=So8Z6Rqf1NYD+bATgnx25yeR3ZEQYv6xfpev5aAJBoSfG0j6uNny0FS3K8CyhMwahK VxlTg7zggBSoEtqV9ZoZKkrhRfYhDRYT/aHS8hUc4S8IahBStPNwBWjYddsZaiduXtaL +fvHuVuUAVcrg4M+v9xOhd7Yw2REstoxg9WzPgGEpv3zo2QisRZzSno1G32LUG/6t38U xj//tnhcajOK+iOekBC+deLs5/CakXMUWxw03E3DsXu2vAktxqs1YMn840No/iWRsryS Ybkl28Qh0h3+YYcP23/lrgMYCIpGXi5x822cqBOqRVDkzSJhZOn54To1sN9Low5BrKq1 ZwQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kp4WYRpASf5CVsJFYjl+ZnZkRci2IQqrsIcj0lr85Wg=; b=ilIrM4ZzTN7qUy1mcpN0GLahXR5dZJ3IiFjHSnEFLzTMZYggLaog/u7rkHtuKWxG4O Yn58A+HmxT38tnSXGPYHgWzKs6ee54vYonnNlGEBq9S9rvuoEfBZTDavvNr4yQxrM9sD UZPSOhbh1MNzhIPTKVfZgsqPxRScau/YXBrjtGZqSyVkrdG7F6arSP5hwrvO+Sn9UlEK b3ZerV7vjzPbdoSv2yE5XEiOMpf3LJz6UlK12jNkcZTs72sr7j0GVKLhDNnUwHByLNpV UpW89giDRussyaHBYmn37D64MIwqrZxz7Iw2L6LdwOmcXglKqRdkvLowXmOwhsUyObL2 JeUg== X-Gm-Message-State: AFqh2krO6Gx1BXokftHOUOsKBf5KzVrTPWEtNur23pzb0JXFN2Ma1by0 H8c8u75crluKY/wfABD3pJtMH4Y7QLT6yLCvH+oGZA== X-Google-Smtp-Source: AMrXdXuN1RJ5ZNaZEPdtdf1wuP6Clsbzl7xIblCQ8qoK09KR8XE7O+qkKulzCI9CedZR0H4QTQwr8g== X-Received: by 2002:aca:230f:0:b0:364:d7f0:3847 with SMTP id e15-20020aca230f000000b00364d7f03847mr10623413oie.38.1674493508937; Mon, 23 Jan 2023 09:05:08 -0800 (PST) Received: from DESKTOP-B7RB26P.localdomain (cpe-70-114-202-97.austin.res.rr.com. [70.114.202.97]) by smtp.gmail.com with ESMTPSA id 2-20020aca0502000000b0035ec1384c9esm23160163oif.23.2023.01.23.09.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 09:05:08 -0800 (PST) From: George Prekas To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Catalin Marinas , Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Thomas Gleixner , "Eric W. Biederman" , Sebastian Andrzej Siewior , Andy Lutomirski , Peter Zijlstra , "Liam R. Howlett" , Fenghua Yu , Andrei Vagin , George Prekas Subject: [PATCH 2/9] Revert "mm/kmemleak: make create_object return void" Date: Mon, 23 Jan 2023 11:04:12 -0600 Message-Id: <20230123170419.7292-3-george@enfabrica.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123170419.7292-1-george@enfabrica.net> References: <20230123170419.7292-1-george@enfabrica.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: obrpcbkoe6j3ytn97ta1sob4i6ubtt1i X-Rspamd-Queue-Id: CDA0F100029 X-HE-Tag: 1674493509-152574 X-HE-Meta: U2FsdGVkX18Ipvx+hn2p0HYk5aEe1QW8pZFpdTAcf5Xy5EM84j0ScEurw66FswgXgsQfyTKh/4XIF6cVdD5HYD9Th3OUKXV/IZlMQTI+1rJvlm4bjOj2MeO0q+4LLe6Xm/jmlRJmyt8zmNoigTp2KhNvaOGzKNzJk+8R0aWu9ACd/8d5mziyJj4D37vciS81sV7jCOt9nvckHAG39pJgRB/e3pKasLEErfmdgSOFjX0rksKXU7Qt6VhYOqZp6FyKfAAfxnuHaEZRiY1Jrd+erTXFpcW8AOq9bBTbMkZZcdM7wXMP0D/MgNG6ws4q9544pb47DquqlsxIfH0XtayXxoTOwq/Qp603nomnAegYbQ112TyYweiBN0YJR99tUibGUKYEFF/x5iLyHTS8J5ZnRmkIVBCUxI/cwgJSpF52AmSjXAQsZG1j6DRDZX6BuzPBsdH3pLq6F0uiB2F2hCB9Eo0GEWRPl62wEUtyRhcf/uzEZ7oqPTH0eYvnWFn9HvHdPxxx8Ob2ErSXY9buNVHZ9BeC4dd6L73fHjtPzb0fP9pH79cjy8bykivcYBRhLOfzQJ6Tr4pSGylVUVI5kTsjfE6WMSKYmBj6+IGJ8h3w1g4z++7kvS5dJy9+doyCXrvE4o4S+RpgrH2cFMZjZd+JcC0mwZq9LXorgzdrGvlxL1Ybm1kyzL8Moz2GrZzBLC0/sAdrLLwpHISQGadMxGHhGRVe+tHqdkVlhHcDUjHfL/4yiIGWdWU0b7Hbe6+UMTtNEHqcN3IO0DRQAVr/J4zFL1g36Y4TKMgt2lqzmLvTWEq6BFyfDxv7F0BJyFlwd3HeZhXZyKM9TNjSrRrrzv1oIVqb+waGlmXn4menrUlAXjO5mXFkU7iwC9nyG4Tc8IPiPQnZjbaeGWMrCYDbJ2tsboFw+N6G3X8cppyA1+RdY0DtD8uddFn5fHViPeNy2sUrLNtWUDUHm8ueW7cDSdK 744ypnSS 9C7D3+boChg8UeCKibRXtHOmh0tBdSiwncIZmMGCn8eCtT8rJlt81X7Qnt849zoq2w0TCBIjei6i9wiFgujprWft64xq2J9K5GtV4HXPqtDazm+DcZ890BQAVgO8gC1jjo3pT75kRFs3KW5ySyfr/pq94WvzbGE7iCLHAPdBYKNoqHpsPpriiGsO7PHnkDTMLaQa8Cj9NY8etF5s+JTcGriGnQHoFFXXBT4NefQYZ/C62spLHnf1OUkPeHQ+6AwU+yw3hPfNdpAWr37pGjjhmWskZLAAiEfLR4g07dMbqv5FxzFI6SoB8HJ1smXBW98V4wPWxgopnnd15wrLeoSD+v6njR5/lI1FuWB6ReVbZyyIY4oTUOYF6BfmUqrrLY1Uu2aMl8NDFqCRPu+jE2oY9OE2WZdN3cz+XMhS7p7Jk8Gnbu97Bzk4YNlExITTKZFxc1M9sVvK3UAF2TvUuhqY60rNo0TdHlMpAy5dNxjFnOwnqlzDdeLcmyt/v/QyRSgWEdH3w/8CXcxel/9Y= 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: This reverts commit b955aa70a3ac9f1dd5e26d4c7673ec3c28a8c2af. The function delete_object_part can use the return value of create_object to propagate flags from the old object to the new objects. Signed-off-by: George Prekas --- mm/kmemleak.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index b40735539abd..2b9c9ad68806 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -616,8 +616,9 @@ static noinline depot_stack_handle_t set_track_prepare(void) * memory block and add it to the object_list and object_tree_root (or * object_phys_tree_root). */ -static void __create_object(unsigned long ptr, size_t size, - int min_count, gfp_t gfp, bool is_phys) +static struct kmemleak_object *__create_object(unsigned long ptr, size_t size, + int min_count, gfp_t gfp, + bool is_phys) { unsigned long flags; struct kmemleak_object *object, *parent; @@ -629,7 +630,7 @@ static void __create_object(unsigned long ptr, size_t size, if (!object) { pr_warn("Cannot allocate a kmemleak_object structure\n"); kmemleak_disable(); - return; + return NULL; } INIT_LIST_HEAD(&object->object_list); @@ -698,6 +699,7 @@ static void __create_object(unsigned long ptr, size_t size, */ dump_object_info(parent); kmem_cache_free(object_cache, object); + object = NULL; goto out; } } @@ -707,20 +709,21 @@ static void __create_object(unsigned long ptr, size_t size, list_add_tail_rcu(&object->object_list, &object_list); out: raw_spin_unlock_irqrestore(&kmemleak_lock, flags); + return object; } /* Create kmemleak object which allocated with virtual address. */ -static void create_object(unsigned long ptr, size_t size, - int min_count, gfp_t gfp) +static struct kmemleak_object *create_object(unsigned long ptr, size_t size, + int min_count, gfp_t gfp) { - __create_object(ptr, size, min_count, gfp, false); + return __create_object(ptr, size, min_count, gfp, false); } /* Create kmemleak object which allocated with physical address. */ -static void create_object_phys(unsigned long ptr, size_t size, - int min_count, gfp_t gfp) +static struct kmemleak_object *create_object_phys(unsigned long ptr, size_t size, + int min_count, gfp_t gfp) { - __create_object(ptr, size, min_count, gfp, true); + return __create_object(ptr, size, min_count, gfp, true); } /* -- 2.37.1