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 61392C35274 for ; Thu, 21 Dec 2023 13:37:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F05B66B0081; Thu, 21 Dec 2023 08:37:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EB55F6B0083; Thu, 21 Dec 2023 08:37:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7D956B0085; Thu, 21 Dec 2023 08:37:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C4D016B0081 for ; Thu, 21 Dec 2023 08:37:32 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 962361C173F for ; Thu, 21 Dec 2023 13:37:32 +0000 (UTC) X-FDA: 81590927544.10.14F8A0C Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf08.hostedemail.com (Postfix) with ESMTP id CE3B6160019 for ; Thu, 21 Dec 2023 13:37:30 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gnu5tmZZ; spf=pass (imf08.hostedemail.com: domain of ruipengqi7@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=ruipengqi7@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703165850; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=I8TLE2kUuGCG2w8SZOBe9ZxqNJOdz1Kg/CbBvyN0PpE=; b=pY0g+Xc6fI4ZQRYz9xhHYGPGWqWWvzIr3qF77nvJNBrNkdDhEPsq84CCCtalbO8dyvre9U Cf8bdxxBrO4bESZXEMfQOZlRC9ZMnNzFSfJBa57jOQ4ERSrWf8vA+Zyqu6usfvXn18goHR PgsTfvguOqlh1grQsislgQ6wKsC/9wI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703165850; a=rsa-sha256; cv=none; b=7Ry9BA+m8WuLhEtzsAeg/pYK00H+1t0U+wU7Aw22B7vksworXONo64w6pwssz9YIAS1bGD dgTtZn0+CI0rWT5Zw9oA2Wf30hDorMEdfTwRx4XR9TImt6RexTlwS13PZWzNiqXhwBmq9H aRw6ajYE3SgdMI1RZI2pTQd3OWsdStE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gnu5tmZZ; spf=pass (imf08.hostedemail.com: domain of ruipengqi7@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=ruipengqi7@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d408d0bb87so3929315ad.0 for ; Thu, 21 Dec 2023 05:37:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703165849; x=1703770649; darn=kvack.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I8TLE2kUuGCG2w8SZOBe9ZxqNJOdz1Kg/CbBvyN0PpE=; b=gnu5tmZZwmVCZaej+0phuIekVKnmdsyh9xnDNrlHt6XVqKVznbVKPUC+F9UwQtV/aH FVaEZD1IgX2vUqxKA5d7Vr8tZ6CfVtRrQ5yaoawKCXwp52g5d+bjHU6MaZwXUh2NpytA B/O8Fthc8uSCrPOLcXlXNfM5pwS2Nqjv98MQOjX2+yNqGZx+gLQX0QMpFgDmB70rj3B+ M7CwB8wWRUPb1LBzpvfs0B9x/pmoF2I26b+EBYAkloEX24EM0Dx49OctVX41V63neMqe sQ/WNYL0htgnvhIx4ZLEqML+7Xr2yDR/LvYlK6CBJd4Ls4dBEkEaPwnY9ZtS5rXonFV8 e1lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703165849; x=1703770649; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I8TLE2kUuGCG2w8SZOBe9ZxqNJOdz1Kg/CbBvyN0PpE=; b=l73+bIQ9X+hbPPq+TSkzFOkMQOdQI+RjhNWd2nIe0dWHsmkEt4IwEuVxAFWqAssV5E SPt1JeJ5zZ83CrPT+247HQCyg3agghWHO1Z5dP0Typ+aquD8XBk5tBx/BovQ0DltGcMJ jgCbHM4Go9d0965snT8IkdUgkAKz2SQvVPQd/SBGQdAyzfke9tXFpMHE4DwjhgsNGBko bR/MP1DJgzMj6u3jwltqikU6se9xLygAJID7fQyMZT32dSgtSfoybhZ46vMdZqYvRpiM WBLtKEy/drzltNgUB0Jsir/DLS+W2RiRFzpVm8NqoJH992fe1+WtgmAJ/6bMqXJOSJIx S5cA== X-Gm-Message-State: AOJu0Yzv5RNbsgqOPv5aL3DBrgcn4RkuX5xZHJ25F/VdsKXL/mC84u10 wNwohO2T7Z5t+wjde8mlpAg= X-Google-Smtp-Source: AGHT+IG1VZkMuki8ILhK8wkgFhj53kOB6dgGstwuC7zuTi0EnqIDuB2kQP7HxWEuA6GDaVY+kHNlPA== X-Received: by 2002:a17:902:d2cb:b0:1d3:4af3:2e75 with SMTP id n11-20020a170902d2cb00b001d34af32e75mr18726806plc.81.1703165849442; Thu, 21 Dec 2023 05:37:29 -0800 (PST) Received: from ruipeng-ThinkCentre-M730e-N010.company.local (014136220210.static.ctinets.com. [14.136.220.210]) by smtp.gmail.com with ESMTPSA id w12-20020a170902e88c00b001d06df5c1absm1636297plg.86.2023.12.21.05.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 05:37:28 -0800 (PST) From: Ruipeng Qi To: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz Cc: roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, qiruipeng Subject: [RFC PATCH 6/7] mm/slub: make slab data more observable Date: Thu, 21 Dec 2023 21:37:17 +0800 Message-Id: <20231221133717.882-1-ruipengqi7@gmail.com> X-Mailer: git-send-email 2.17.1 X-Rspamd-Queue-Id: CE3B6160019 X-Rspam-User: X-Stat-Signature: jekuc73ymfy3hhaehp8rxbpsxbp45cyc X-Rspamd-Server: rspam03 X-HE-Tag: 1703165850-206510 X-HE-Meta: U2FsdGVkX18iUfe6qqQEkc9YPxgia2gnQy7ArYfLIRAJ/b1ix9RweSXitwPMrfxWSQzhgOH2A1JwGb7WYtEE0KxS3rqIjeZU5vP41HaD2OyFUjpC4i0jcmLxf7OUH3DQ4yZAILhtcXZ8KAVu6YplNwQsxx0bQiVTLvguWnqTosk2L/9Xf/Gf6SWr2pj2ANOkysNcdJPZDltBT2f6HjftNzIR9bhlUXFS67lHmJxXv0Myx5ESV2OkHlBO/Hju9Nrn2no4mFfCk2DP00w8+amJJ83oiDv5Q0gakFUG4OP5/kxZcOjeisJ1xRU7ng09dVU2bYNh1OSG8GEAlmQrkZsMu1C3ZLChTnu3URsHd+2SlhCbmoyI/sQ3KydE07W3MdXMhSUqCb3Vu5ump/HXztRN5s8y22J3f4R5j2RJQzTYr7IILHJrk2rlyN81vbYaLtRdn2VkUODPSWrkBXRAzIl/5h1Hx9QZYDM14lBkmjrceish09ccb2w2+tOmV3djY9r7Ra8Wz68IaTE551Woc/bS23QbPTX0GkP7YeGKo1GYiDvw3oXMnqGEVJvnh2RWEy7FgmYgxicP8rgKmYOId2B6FjvSf+jpKclUWvCAYuD0YU5BOlD09OJJtvTL9pJ7u8YqhNcuIJyfX1vQyOfIJgM1dXovQzuLK0A79LeSBosNU/Tx5D5xLSjqkusabxHNL4DlsZ8hoNfG/ZKa5j7gr8MnFDFs8agDJYmhCoJCRPRCfx6lwS0wOf0DUqRlViOa9oN+RK5KN9CTGTEoF8qBwpeAegEOziJPud/oszXp0rmVM5olpTBMGBX/c0Pq6WCvtU4oB+hPou4Kd/vul6LmZrIXZA78H9AAoba1fNMCCur8vei/bsxHK1CIg840kI23VRxKK6Vw8cfPyEWKLs11BFGXkG5bGEdeSlii2/huSgynYcIU3so3Eolhvo55jOnorfIGuHMGxF6Xf10SPkFlhSb DmkS1Q1+ T836ElKAP4xWduBsUgdHKQS1I02yESMVr/WrMWZNMUfgT5tVSAcburmejYig6Ndom+saNhiQHv7WM6msmCE5e0LTQhqmnRsQ4HhQxrqLwlNYZ+bV5q0IzSVliGcqQxAanr5sINfxjIdT1sN/RPuwL5ZaTp9tAQJ6AgFWqJ16E2sAxlhiVxp4nXu8pE5ouTpSpdiB2cyG7lXki9nvewqPB7BSvcFF4f6FH41UmHytSQ/wa1JBPh/jE/CKNZJITSwzWWomf+eZzOA9NO9FMH6lKGYqbfdHIWggKsd0+ehyD04y2LW0dKPt3FNRnhRjIzSHj/K11VOrzdHbQLhxJCfQyHOoeEKaMBLSLJXL+KHrVjo+vq46lhuRF4Di2lqU35nC7wpKVJ7WgQihrfI4eucXIvUF64rzhtAZVwfQUoYq7DznKJPHkNrBCcr/GcjrHfCtmctVWbqTLumra37DMw4/xxjB6LF38mQKeWSK1j0uUWX5AANzYK+UMC0O4KylWZmV+jluwEjenxjc1VpU= 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: List-Subscribe: List-Unsubscribe: From: qiruipeng Osdump is interested in data stored within slab subsystem. Add full list back into corresponding struct, and record full list within respective functions instead of enabling SLUB_DEBUG directly, which will intruduce sensible overhead. Signed-off-by: qiruipeng --- mm/slab.h | 2 ++ mm/slub.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/mm/slab.h b/mm/slab.h index 3d07fb428393..a42a54c9c5de 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -799,6 +799,8 @@ struct kmem_cache_node { atomic_long_t nr_slabs; atomic_long_t total_objects; struct list_head full; +#elif defined(CONFIG_OS_MINIDUMP) + struct list_head full; #endif #endif diff --git a/mm/slub.c b/mm/slub.c index 63d281dfacdb..1a496ec945b6 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1730,10 +1730,26 @@ static inline int check_object(struct kmem_cache *s, struct slab *slab, static inline depot_stack_handle_t set_track_prepare(void) { return 0; } static inline void set_track(struct kmem_cache *s, void *object, enum track_item alloc, unsigned long addr) {} +#ifndef CONFIG_OS_MINIDUMP static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n, struct slab *slab) {} static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n, struct slab *slab) {} +#else +static inline void add_full(struct kmem_cache *s, + struct kmem_cache_node *n, struct slab *slab) +{ + lockdep_assert_held(&n->list_lock); + list_add(&slab->slab_list, &n->full); +} + +static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n, struct slab *slab) +{ + lockdep_assert_held(&n->list_lock); + list_del(&slab->slab_list); +} +#endif + slab_flags_t kmem_cache_flags(unsigned int object_size, slab_flags_t flags, const char *name) { @@ -2570,6 +2586,14 @@ static void deactivate_slab(struct kmem_cache *s, struct slab *slab, spin_lock_irqsave(&n->list_lock, flags); } else { mode = M_FULL_NOLIST; +#ifdef CONFIG_OS_MINIDUMP + /* + * Taking the spinlock removes the possibility that + * acquire_slab() will see a slab that is frozen + */ + spin_lock_irqsave(&n->list_lock, flags); + +#endif } @@ -2577,7 +2601,11 @@ static void deactivate_slab(struct kmem_cache *s, struct slab *slab, old.freelist, old.counters, new.freelist, new.counters, "unfreezing slab")) { +#ifndef CONFIG_OS_MINIDUMP if (mode == M_PARTIAL) +#else + if (mode != M_FREE) +#endif spin_unlock_irqrestore(&n->list_lock, flags); goto redo; } @@ -2592,6 +2620,10 @@ static void deactivate_slab(struct kmem_cache *s, struct slab *slab, discard_slab(s, slab); stat(s, FREE_SLAB); } else if (mode == M_FULL_NOLIST) { +#ifdef CONFIG_OS_MINIDUMP + add_full(s, n, slab); + spin_unlock_irqrestore(&n->list_lock, flags); +#endif stat(s, DEACTIVATE_FULL); } } @@ -4202,6 +4234,9 @@ init_kmem_cache_node(struct kmem_cache_node *n) atomic_long_set(&n->nr_slabs, 0); atomic_long_set(&n->total_objects, 0); INIT_LIST_HEAD(&n->full); +#elif defined(CONFIG_OS_MINIDUMP) + INIT_LIST_HEAD(&n->full); + #endif } @@ -5009,7 +5044,8 @@ static struct kmem_cache * __init bootstrap(struct kmem_cache *static_cache) list_for_each_entry(p, &n->partial, slab_list) p->slab_cache = s; -#ifdef CONFIG_SLUB_DEBUG +#if defined(CONFIG_SLUB_DEBUG) || \ + defined(CONFIG_OS_MINIDUMP) list_for_each_entry(p, &n->full, slab_list) p->slab_cache = s; #endif -- 2.17.1