From patchwork Tue Jan 2 18:46:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 13509276 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 818E9C47073 for ; Tue, 2 Jan 2024 18:46:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 866B76B007D; Tue, 2 Jan 2024 13:46:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7ECDC6B0085; Tue, 2 Jan 2024 13:46:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68DDE6B0089; Tue, 2 Jan 2024 13:46:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 580346B007D for ; Tue, 2 Jan 2024 13:46:45 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 35159160175 for ; Tue, 2 Jan 2024 18:46:45 +0000 (UTC) X-FDA: 81635252370.07.9CBADC1 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by imf21.hostedemail.com (Postfix) with ESMTP id 4D4E21C000A for ; Tue, 2 Jan 2024 18:46:43 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=cLpqoVeV; spf=pass (imf21.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.49 as permitted sender) smtp.mailfrom=urezki@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=1704221203; 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=W/i8ZfJzhOkgwpvB6heisf6dptNqD+Kyc9OPs5waPNM=; b=z9DunYOOBpXTQUkqOeIvC9B6zhPxEFn21PeWujktY0wDC+2bd7yyOffqEhEDFH/cX7XQ/z qnr16n2psCMY27umaEA89JGjsWf4W83ETPwrldDelNQ+e3x1FIEYELKJ3zST2dbqtY0Nzd Tq4pteWATD76230+GgCl/lZ6L+WNwfc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704221203; a=rsa-sha256; cv=none; b=5F+l4+8eGdJFPToITMvrB23t8lsdG/4I0QaLe1XbYDifj142yzEPdqT+E3JS/lxgsrPrQK 7xwS6fVlyOWSwBBCjupBzFMIYOldpl9YgZtWyyW7lwMGRpXMfTxscfcOS0rkj9iuUqt0Y5 /cL1xzAfqF/f/XPqQmJhMETBPbhb+ME= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=cLpqoVeV; spf=pass (imf21.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.49 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-50e7c6e3c63so6621953e87.3 for ; Tue, 02 Jan 2024 10:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704221202; x=1704826002; darn=kvack.org; 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=W/i8ZfJzhOkgwpvB6heisf6dptNqD+Kyc9OPs5waPNM=; b=cLpqoVeVgUbhkRQdjVNKKibS3Jp8ZGirPlV1eldcfWiU7+233+iPvQPUmIIcIF+poi 1aHhGKsZTJyHR+D1ifvK0OYxcl4u7rk9vzihNXppvN5ng7Yf8ZRzBVfl5njcPhScjBGx /sfH+YMZ3bC/OujFhbsVVmqmqfeMRXkc+WUwKpNRGs8wsbvPs3aC3HU38I82Q9kYS2sI Fn1nZeNqHj+CXqiZoIbjmmJpPV7WKxXl7a9jLx5WqG7jakhRm3avK+R/b1OS3ZShMJt1 vUwM86EMeFF/y7YYJo06mzzy6B9TnAH2KAkP39Rw4UAjYlhbADPZwMZCsHHqF0bWbYV/ i8FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704221202; x=1704826002; 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=W/i8ZfJzhOkgwpvB6heisf6dptNqD+Kyc9OPs5waPNM=; b=YceVXFoYWYGNMoBQjS2UAJIGoXsDuwSS5bvWMsZ/+oRa1DpeqvRRdQkcEVoyHZAobW xJEXerP7LNqIt65vEGGyvXHdlDKA6zVeyI+ik+DPMtS27tXFt+eR9ExSpb131R0T9Ugo mCklO3/nC+d96cq0SF2gZKgvJq5pLcZKJaBNyN+5ffQw/9zC+wEJ97qSidhU0rWxoLTy e+kDkogFSHDgc8fXEggNZhg5VgwfW0CKcPHAA/5IZDl4KqGfsliEfaKX7ITO1FzI9y4Z ZJfbLA+ESb7OjgIF+4i8LiwIeLl36RJncW8RE5hpbbj09Am49OrddSU0agdcc0nQYG5P VlBw== X-Gm-Message-State: AOJu0Yx4ctl1dk3Q4Ji2OJ3bzhSkLhcY/hFAcegV7Wtll5o9tz9O/mWR 8rnWvihVJgyPih8UUiauQDiln4mmUTGRUQ== X-Google-Smtp-Source: AGHT+IEsu7Urp6TRXfcpo6ncKQnZwNhBJ5A87G0DxmsMgN27G74Ggz2BQ1tsbpUPmeUAXXarv+DFCQ== X-Received: by 2002:a05:6512:5d5:b0:50e:7b70:b9cb with SMTP id o21-20020a05651205d500b0050e7b70b9cbmr2003145lfo.218.1704221201423; Tue, 02 Jan 2024 10:46:41 -0800 (PST) Received: from pc638.lan (host-185-121-47-193.sydskane.nu. [185.121.47.193]) by smtp.gmail.com with ESMTPSA id q1-20020ac246e1000000b0050e7be886d9sm2592656lfo.56.2024.01.02.10.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 10:46:41 -0800 (PST) From: "Uladzislau Rezki (Sony)" To: linux-mm@kvack.org, Andrew Morton Cc: LKML , Baoquan He , Lorenzo Stoakes , Christoph Hellwig , Matthew Wilcox , "Liam R . Howlett" , Dave Chinner , "Paul E . McKenney" , Joel Fernandes , Uladzislau Rezki , Oleksiy Avramchenko Subject: [PATCH v3 05/11] mm/vmalloc: remove vmap_area_list Date: Tue, 2 Jan 2024 19:46:27 +0100 Message-Id: <20240102184633.748113-6-urezki@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240102184633.748113-1-urezki@gmail.com> References: <20240102184633.748113-1-urezki@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4D4E21C000A X-Rspam-User: X-Stat-Signature: 3upg76cq1rpyke3hesi9nrweo91hhh5e X-Rspamd-Server: rspam03 X-HE-Tag: 1704221203-8908 X-HE-Meta: U2FsdGVkX182g+N9UlvFmFIGo98LTziUMGVvK/nWSB5MYSZk0vhXNlg2AEdaQ34ApLyhjFUmZhU65UP+QI2dw3vQ6wEGmnIPPLNwpfsD9biKTXkiro7ejaeGDua5IkXZ+fw8t5jyu/5dZl11JPMlwVuhLrgMC+J/yOSOKCeCvT33TcCfaIq44fcnqiuEPhOtgHYjwJvPJvr7pI3kiSCRAsLlPl1yhfw+LEQCXRKzj1Skvha27vfbUCwRj9Ag8kKSn7YBDS0X3KsPgx1SHR3oIAzxxJo7wSphq3bQzQ0mq7uSDtYqQ161EbaShjcptm7WhEQNJ3NcTFQr9tTVNFGJajIgHvB525hijY+JNiMnheNFraumPEMtwv1N3fRP01ZeJ0DNWpMB1z3kEnzVN3AsQYvEsPJKsQviTPfhTR3AlR7nkXolec67A/2npsu4yYIu4hDin1UiYSVRydeDEPqRgG/gFqNlqbUbtt+UfXcyQB5Re8w8TuaR3xB3GVkg6mctYhpnoICu08OOj8n67pBGt4GWzgA45BVQNF20yard06RwKy6oUnC0wFv9Pc/yH0Swfa7e7dbQg8I0KxBJRDWBQJR3fXcRXaiJhogVGPgciJYhOa7E+oHWho3WrqCTt+ye2O5jRHY7WlAbmUbUmTpLRWwnGt6G3qW9N9cfK5vJ578YmVElvmAEvs2vtfxOaxqh3p2xAAtNGHLW4BtVK1GUtkyLQG/Tdv0IUDa9UkHlbqw3awHz7DbwX/J3e481BCIGyMqV61pC7mrnVOePMD0H6gG8Fb3fKFvp5x5k69GWFEbRJKaFI2dn4UuFKm8EPioMk2s55/3RiBe9/MsH0t08z78ZQW1ldFeialzhJ2EgQbwZ+Bu2Yk4YwAHSEbiJ4tATiB3QSIRrHB+bBnIcvG7iLsLUpZKsp2YLFLexmuyMG6/4KVzLX0ao62T15rRA3WmiWACTEuF0t4NOHlk6rnf kBXt4te0 WAUCRRJ9uBXNtyYPTH0kJwB98HdVaYjFyp8m7lyceS7DNlLFi2wDst1aGd6Hr9ru2ol21BkJB8DyCgWw95KvJ+ged1XW+Hcfo55vdyQw//B7gukJ5H7gZCcDfZj3YP1KsAB692U0K+nrwdA2FC5zoHwjKc9kBtKu8nk7Kj+uFZIrm4eyV/uiQJuCERk5tpSsNADA910TcQ3n/KYp9wyZo7irTSbjhAOVhfDQ/95wPHsuUI0OG3aTtcMjiF2UarFcT97o91tfwnXGr17iiqoo0hmQ4k+kqp2tpXaJbDXWMAqfC8neg8LFaej14gY+VyvZek9qOehWjZacPuxzT6nbKKRdPWvUJsGr2ioeeBdePWFcBChPcoSzUsj1u1VxsLNjSUX+X5mjfIOcAjlK/vQn6Ls28osM7Z7HivSaBAx8xfaL15lOLExGSLeC5lGWxuA1FUJuBc20Inq8HMMVji1PHEgnniYny58CJxxSDnumK6LLgxs9mc2B3lCzdA2t4SYTyKjPcOOP5qthpQOU= 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: Baoquan He Earlier, vmap_area_list is exported to vmcoreinfo so that makedumpfile get the base address of vmalloc area. Now, vmap_area_list is empty, so export VMALLOC_START to vmcoreinfo instead, and remove vmap_area_list. Signed-off-by: Baoquan He Signed-off-by: Uladzislau Rezki (Sony) Acked-by: Lorenzo Stoakes --- Documentation/admin-guide/kdump/vmcoreinfo.rst | 8 ++++---- arch/arm64/kernel/crash_core.c | 1 - arch/riscv/kernel/crash_core.c | 1 - include/linux/vmalloc.h | 1 - kernel/crash_core.c | 4 +--- kernel/kallsyms_selftest.c | 1 - mm/nommu.c | 2 -- mm/vmalloc.c | 2 -- 8 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst b/Documentation/admin-guide/kdump/vmcoreinfo.rst index 78e4d2e7ba14..df54fbeaaa16 100644 --- a/Documentation/admin-guide/kdump/vmcoreinfo.rst +++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst @@ -65,11 +65,11 @@ Defines the beginning of the text section. In general, _stext indicates the kernel start address. Used to convert a virtual address from the direct kernel map to a physical address. -vmap_area_list --------------- +VMALLOC_START +------------- -Stores the virtual area list. makedumpfile gets the vmalloc start value -from this variable and its value is necessary for vmalloc translation. +Stores the base address of vmalloc area. makedumpfile gets this value +since is necessary for vmalloc translation. mem_map ------- diff --git a/arch/arm64/kernel/crash_core.c b/arch/arm64/kernel/crash_core.c index 66cde752cd74..2a24199a9b81 100644 --- a/arch/arm64/kernel/crash_core.c +++ b/arch/arm64/kernel/crash_core.c @@ -23,7 +23,6 @@ void arch_crash_save_vmcoreinfo(void) /* Please note VMCOREINFO_NUMBER() uses "%d", not "%x" */ vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR); vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END); - vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START); vmcoreinfo_append_str("NUMBER(VMALLOC_END)=0x%lx\n", VMALLOC_END); vmcoreinfo_append_str("NUMBER(VMEMMAP_START)=0x%lx\n", VMEMMAP_START); vmcoreinfo_append_str("NUMBER(VMEMMAP_END)=0x%lx\n", VMEMMAP_END); diff --git a/arch/riscv/kernel/crash_core.c b/arch/riscv/kernel/crash_core.c index 8706736fd4e2..d18d529fd9b9 100644 --- a/arch/riscv/kernel/crash_core.c +++ b/arch/riscv/kernel/crash_core.c @@ -8,7 +8,6 @@ void arch_crash_save_vmcoreinfo(void) VMCOREINFO_NUMBER(phys_ram_base); vmcoreinfo_append_str("NUMBER(PAGE_OFFSET)=0x%lx\n", PAGE_OFFSET); - vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START); vmcoreinfo_append_str("NUMBER(VMALLOC_END)=0x%lx\n", VMALLOC_END); #ifdef CONFIG_MMU VMCOREINFO_NUMBER(VA_BITS); diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index c720be70c8dd..91810b4e9510 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -253,7 +253,6 @@ extern long vread_iter(struct iov_iter *iter, const char *addr, size_t count); /* * Internals. Don't use.. */ -extern struct list_head vmap_area_list; extern __init void vm_area_add_early(struct vm_struct *vm); extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); diff --git a/kernel/crash_core.c b/kernel/crash_core.c index d4313b53837e..b427f4a3b156 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -759,7 +759,7 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir); #endif VMCOREINFO_SYMBOL(_stext); - VMCOREINFO_SYMBOL(vmap_area_list); + vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START); #ifndef CONFIG_NUMA VMCOREINFO_SYMBOL(mem_map); @@ -800,8 +800,6 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_OFFSET(free_area, free_list); VMCOREINFO_OFFSET(list_head, next); VMCOREINFO_OFFSET(list_head, prev); - VMCOREINFO_OFFSET(vmap_area, va_start); - VMCOREINFO_OFFSET(vmap_area, list); VMCOREINFO_LENGTH(zone.free_area, MAX_ORDER + 1); log_buf_vmcoreinfo_setup(); VMCOREINFO_LENGTH(free_area.free_list, MIGRATE_TYPES); diff --git a/kernel/kallsyms_selftest.c b/kernel/kallsyms_selftest.c index b4cac76ea5e9..8a689b4ff4f9 100644 --- a/kernel/kallsyms_selftest.c +++ b/kernel/kallsyms_selftest.c @@ -89,7 +89,6 @@ static struct test_item test_items[] = { ITEM_DATA(kallsyms_test_var_data_static), ITEM_DATA(kallsyms_test_var_bss), ITEM_DATA(kallsyms_test_var_data), - ITEM_DATA(vmap_area_list), #endif }; diff --git a/mm/nommu.c b/mm/nommu.c index b6dc558d3144..5ec8f44e7ce9 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -131,8 +131,6 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address, } EXPORT_SYMBOL(follow_pfn); -LIST_HEAD(vmap_area_list); - void vfree(const void *addr) { kfree(addr); diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 786ecb18ae22..8c01f2225ef7 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -729,8 +729,6 @@ EXPORT_SYMBOL(vmalloc_to_pfn); static DEFINE_SPINLOCK(free_vmap_area_lock); -/* Export for kexec only */ -LIST_HEAD(vmap_area_list); static bool vmap_initialized __read_mostly; static struct rb_root purge_vmap_area_root = RB_ROOT;