From patchwork Fri Oct 25 15:11:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13850921 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 79066D0BB56 for ; Fri, 25 Oct 2024 15:12:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0CE476B0092; Fri, 25 Oct 2024 11:12:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 07E926B0095; Fri, 25 Oct 2024 11:12:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E88936B0096; Fri, 25 Oct 2024 11:12:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CBB786B0092 for ; Fri, 25 Oct 2024 11:12:27 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CDA7FA09ED for ; Fri, 25 Oct 2024 15:11:51 +0000 (UTC) X-FDA: 82712465472.05.281F4CD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 53D5980010 for ; Fri, 25 Oct 2024 15:11:48 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gQva7K9X; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729869020; a=rsa-sha256; cv=none; b=Tax/SOFdN3SNvjDwlmqn5LRPnEx7PwVtsAQF/D4C0JOzMyYokkKs7MHadC5IGJO/lzCdop Z/6NCx0PP/4oHqbDa6mcc5mVcpcsoyxK3nMqez/8TnGbcL5rWPkVD4MO3MptwwetGGkQzu g7VPQEwMakeN7lwPcNvkXKAeKyp5IV8= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gQva7K9X; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729869020; 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=D6QGok1SHO7tWBONbTK+qNFzpgcjUP8FVLCibVkMqhw=; b=8X9FInNGurUxVe7o365rPnt+W57SR6zdXpPaqwOWyW26MwvOx8kVSnX41EFcXtTKKJI+G0 bwWHPOTNvL5+ZiuikoFoP0oQS9mKTticp12RcW7UPYsHsbdN17YABfOrTwzidsfnGVX/Om ukCoBtHzWaJpJPDqs06dqIh1QRqe4JI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729869145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D6QGok1SHO7tWBONbTK+qNFzpgcjUP8FVLCibVkMqhw=; b=gQva7K9XGz+oR8s9WP+3kkPAwKcD4XlfTEeduDYEGgS7WxwtbiZtpo+9ZWHmr5f9LZRZ2O Qa8ldBJwRvo2ztWpvAJjq2pw2zvFyMmWasQhuWI+AckRUJkGMxBBKRwQZEbC6cRB2rpBmy WERYLwkTb5GR5d7dBHZA9t8UOfOGj+o= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-64-m7d72Gv7PTyqbx3Zkb-x3g-1; Fri, 25 Oct 2024 11:12:21 -0400 X-MC-Unique: m7d72Gv7PTyqbx3Zkb-x3g-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 65E1F1956077; Fri, 25 Oct 2024 15:12:19 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.22.65.27]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E93DA300018D; Fri, 25 Oct 2024 15:12:10 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-s390@vger.kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, kexec@lists.infradead.org, David Hildenbrand , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Baoquan He , Vivek Goyal , Dave Young , Thomas Huth , Cornelia Huck , Janosch Frank , Claudio Imbrenda , Eric Farman , Andrew Morton Subject: [PATCH v1 04/11] fs/proc/vmcore: move vmcore definitions from kcore.h to crash_dump.h Date: Fri, 25 Oct 2024 17:11:26 +0200 Message-ID: <20241025151134.1275575-5-david@redhat.com> In-Reply-To: <20241025151134.1275575-1-david@redhat.com> References: <20241025151134.1275575-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 53D5980010 X-Stat-Signature: qdknnuqzs3mwuz3kzk7akeq3qqqf1oyr X-Rspam-User: X-HE-Tag: 1729869108-921565 X-HE-Meta: U2FsdGVkX1+l2DfSKiwKJWvaSfULMSfeC+rLNBF2V2ZS5nIjARvnZQkIa3tSywxCcIWcBs3n6pDqSDFtOKG3+eTb0Yo8KuIoPaMxYhbmEMqhs47i+9oS+DVf+L4tTJlWVVIFTaFrlO245MphXWlA4yh2WIp77q7guJjPl6PVlLqhb7f8hDDu0GvvzmpKd4H8Oxt1BMuPw3vc2e5Ad0iNRbsxzZOKm/Up1ODWwuBeU2QyVZpjXxy0GP1RrjXu4jjdZVZV+ylgeo71UBX0eGy6/cWVHp1DlNH08DvtMsXi/pvl+OaSerXcsUW0bohkr/dRQpmX6qWEDS3vw+XCdYujG8K/H3C4h55v8VrxlFjptkAkmD0ZwQw1iD4m1mqEm7FId2hjmZwzeePGdUNUuajYnjUa90+RwdTBdhZI9q6xZNCceZbF9xX7pVpR8HlxiwgcYQRCHtZibGvQbY+aKj8EuJzGKiJOqSCO2Rxpqi3Ko6V3rKw7pE8FwqMsOTnRotnjtW3bdoRkBkStzrUpAgJG5feIypkBshGKpRpRk11kseYFIlP9dK3QsdL9BETzsndpbnyoWeNvECZZpzhK19DGMDgipxDIKAU7MVg92Bs19hOYMT3CgsE5KBnXVuJ6bnp76zhpO/dObpKCQV6VDwUMHlf+a4khUo3xBQehDPcYZoe8WZvBYVP/9p1hDijjh7W1+m9wnt9L9iuegGMX06kunPoUpb3+6nJNl9cFxvuvOc62mQ5OIZYmkp5kBCHHVcnu4g5baZ3iol5s/1A0lLSdovrbis0AGj8zXVr9s7lHuN/Zb1lant3XYK46TZD6YU62SeQ7yAxu5KkZIyPyNEYMjbiPTdDGtdcBN/kzZqsEUas2a+DTmy/0lsNLWqi8CMu7ciFOaZ0BYFsdolBEryNLE8U9Hfzewo2vICWRxdGI6WoFj1M2H0gmtfrVENIOOBfJc/dtRGnma/piBYUPtyA 1AvUDL2E 2BHah6a60xZ+7Z1mH/mWjnuhZBf91lbyBh86sWEj3Z8AZ7FUE0hccYWfkX+XDC8Ard1/S0xu6M10I+ABS8p7lmvsNHqoaG16L8oMcScKXvThNrrSMLU8zx1BCVGvSTMp0UrwqmQlgAlBphnCaxV2k/Ik+ZVoic8I8+SL9XLu4PDPs5c7eG9JLYcqNCXIZZf8+pK7dxYOozOVlPueAOwagxA1AA65s+H5cd+ucb0oaqoxClPs/MWPSJkDnEmntUTnV9WfwgoBgEcvKfJC9mwhRdUiRdrv1iR/UrOmhC7jzUka0ey0g0GVYzHPxGnoaA30mEkJmnOgBhElesqCmZ6sn129YLklF/NHmvZxNd818Y1Cmz4KAntPe9Bfe1w== 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: These defines are not related to /proc/kcore, move them to crash_dump.h instead. While at it, rename "struct vmcore" to "struct vmcore_mem_node", which is a more fitting name. Signed-off-by: David Hildenbrand --- fs/proc/vmcore.c | 20 ++++++++++---------- include/linux/crash_dump.h | 13 +++++++++++++ include/linux/kcore.h | 13 ------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 6371dbaa21be..47652df95202 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -304,10 +304,10 @@ static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst, */ static ssize_t __read_vmcore(struct iov_iter *iter, loff_t *fpos) { + struct vmcore_mem_node *m = NULL; ssize_t acc = 0, tmp; size_t tsz; u64 start; - struct vmcore *m = NULL; if (!iov_iter_count(iter) || *fpos >= vmcore_size) return 0; @@ -560,8 +560,8 @@ static int vmcore_remap_oldmem_pfn(struct vm_area_struct *vma, static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) { size_t size = vma->vm_end - vma->vm_start; + struct vmcore_mem_node *m; u64 start, end, len, tsz; - struct vmcore *m; start = (u64)vma->vm_pgoff << PAGE_SHIFT; end = start + size; @@ -683,16 +683,16 @@ static const struct proc_ops vmcore_proc_ops = { .proc_mmap = mmap_vmcore, }; -static struct vmcore* __init get_new_element(void) +static struct vmcore_mem_node * __init get_new_element(void) { - return kzalloc(sizeof(struct vmcore), GFP_KERNEL); + return kzalloc(sizeof(struct vmcore_mem_node), GFP_KERNEL); } static u64 get_vmcore_size(size_t elfsz, size_t elfnotesegsz, struct list_head *vc_list) { + struct vmcore_mem_node *m; u64 size; - struct vmcore *m; size = elfsz + elfnotesegsz; list_for_each_entry(m, vc_list, list) { @@ -1090,11 +1090,11 @@ static int __init process_ptload_program_headers_elf64(char *elfptr, size_t elfnotes_sz, struct list_head *vc_list) { + struct vmcore_mem_node *new; int i; Elf64_Ehdr *ehdr_ptr; Elf64_Phdr *phdr_ptr; loff_t vmcore_off; - struct vmcore *new; ehdr_ptr = (Elf64_Ehdr *)elfptr; phdr_ptr = (Elf64_Phdr*)(elfptr + sizeof(Elf64_Ehdr)); /* PT_NOTE hdr */ @@ -1133,11 +1133,11 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, size_t elfnotes_sz, struct list_head *vc_list) { + struct vmcore_mem_node *new; int i; Elf32_Ehdr *ehdr_ptr; Elf32_Phdr *phdr_ptr; loff_t vmcore_off; - struct vmcore *new; ehdr_ptr = (Elf32_Ehdr *)elfptr; phdr_ptr = (Elf32_Phdr*)(elfptr + sizeof(Elf32_Ehdr)); /* PT_NOTE hdr */ @@ -1175,8 +1175,8 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, static void set_vmcore_list_offsets(size_t elfsz, size_t elfnotes_sz, struct list_head *vc_list) { + struct vmcore_mem_node *m; loff_t vmcore_off; - struct vmcore *m; /* Skip ELF header, program headers and ELF note segment. */ vmcore_off = elfsz + elfnotes_sz; @@ -1587,9 +1587,9 @@ void vmcore_cleanup(void) /* clear the vmcore list. */ while (!list_empty(&vmcore_list)) { - struct vmcore *m; + struct vmcore_mem_node *m; - m = list_first_entry(&vmcore_list, struct vmcore, list); + m = list_first_entry(&vmcore_list, struct vmcore_mem_node, list); list_del(&m->list); kfree(m); } diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h index acc55626afdc..5e48ab12c12b 100644 --- a/include/linux/crash_dump.h +++ b/include/linux/crash_dump.h @@ -114,10 +114,23 @@ struct vmcore_cb { extern void register_vmcore_cb(struct vmcore_cb *cb); extern void unregister_vmcore_cb(struct vmcore_cb *cb); +struct vmcore_mem_node { + struct list_head list; + unsigned long long paddr; + unsigned long long size; + loff_t offset; +}; + #else /* !CONFIG_CRASH_DUMP */ static inline bool is_kdump_kernel(void) { return false; } #endif /* CONFIG_CRASH_DUMP */ +struct vmcoredd_node { + struct list_head list; /* List of dumps */ + void *buf; /* Buffer containing device's dump */ + unsigned int size; /* Size of the buffer */ +}; + /* Device Dump information to be filled by drivers */ struct vmcoredd_data { char dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Unique name of the dump */ diff --git a/include/linux/kcore.h b/include/linux/kcore.h index 86c0f1d18998..9a2fa013c91d 100644 --- a/include/linux/kcore.h +++ b/include/linux/kcore.h @@ -20,19 +20,6 @@ struct kcore_list { int type; }; -struct vmcore { - struct list_head list; - unsigned long long paddr; - unsigned long long size; - loff_t offset; -}; - -struct vmcoredd_node { - struct list_head list; /* List of dumps */ - void *buf; /* Buffer containing device's dump */ - unsigned int size; /* Size of the buffer */ -}; - #ifdef CONFIG_PROC_KCORE void __init kclist_add(struct kcore_list *, void *, size_t, int type);