From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9250A190462 for ; Fri, 15 Nov 2024 09:45:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731663907; cv=none; b=Y+9jJthnZd5wCOoIuOukAA+UwGeS2lxcYKVyWfOrMqWonuAX1NzNb1Ch2jcF5usdXS8ZR5rQV0e0VYyl5M/IlHmzevEnwfz3MqApmhMU81lcejpZfYx+/vPrPTnVXpalSE2FaYuUj+tWy+bddfRm2Y8kEKR8qstfz1kHiL76Gl4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731663907; c=relaxed/simple; bh=6NykYV43uSEP6d0DI+aZRp4Ei25h7RDcSCzybLSvQis=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=AcrH8iVhpcVqsT19IxZtoW4J8dJ5oqC6eaKquI6e7fl5CQoE3aKDrALlvDUOiWaXcALhsvJintbL7QnScxZASBi8oDMsyclh8K2t5LYpUBOLEr4d3fko7n+mOFezL8Xv8P7sqPyqkMODduNxAKjRr0/GnI22SYnutNllXA+KEoY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gZWJ0Mrh; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gZWJ0Mrh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731663904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RorhOcPRXQj1dk9BtLyB46Na3zATBZ3YDRHJyzGTzXo=; b=gZWJ0MrhdpFVgTxWL9Z+Vg7oX1X4EjEYqlUXoF+BkEgAzIBXpGYQvul0oHDGvZogkIPAFG qcbWNmyNjzIHx7a1gxQgOAxVz0hrbeihdpdYA+0vEtntOEN2q1zCUDRHkCwpimsHCwVXHu 1xpSxPUovS27M1T38KdNo5rT6ETBNiw= Received: from mx-prod-mc-05.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-156-5UXQeT7OMAuOayEhTmaTkQ-1; Fri, 15 Nov 2024 04:45:01 -0500 X-MC-Unique: 5UXQeT7OMAuOayEhTmaTkQ-1 X-Mimecast-MFC-AGG-ID: 5UXQeT7OMAuOayEhTmaTkQ 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5F9CD1956080; Fri, 15 Nov 2024 09:44:57 +0000 (UTC) Received: from localhost (unknown [10.72.113.10]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4929D3003B71; Fri, 15 Nov 2024 09:44:55 +0000 (UTC) Date: Fri, 15 Nov 2024 17:44:49 +0800 From: Baoquan He To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, 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, Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Eugenio =?iso-8859-1?Q?P=E9rez?= , Vivek Goyal , Dave Young , Thomas Huth , Cornelia Huck , Janosch Frank , Claudio Imbrenda , Eric Farman , Andrew Morton Subject: Re: [PATCH v1 04/11] fs/proc/vmcore: move vmcore definitions from kcore.h to crash_dump.h Message-ID: References: <20241025151134.1275575-1-david@redhat.com> <20241025151134.1275575-5-david@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241025151134.1275575-5-david@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 On 10/25/24 at 05:11pm, David Hildenbrand wrote: > 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. Agree it's inappropriate to put the defintions in kcore.h. However for 'struct vmcore', it's only used in fs/proc/vmcore.c from my code serching, do you think if we can put it in fs/proc/vmcore.c directly? And 'struct vmcoredd_node' too. And about the renaming, with my understanding each instance of struct vmcore represents one memory region, isn't it a little confusing to be called vmcore_mem_node? I understand you probablly want to unify the vmcore and vmcoredd's naming. I have to admit I don't know vmcoredd well and its naming, while most of people have been knowing vmcore representing memory region very well. > > 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); > > -- > 2.46.1 >