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 DBBBED60D17 for ; Wed, 20 Nov 2024 09:45:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 59B056B0085; Wed, 20 Nov 2024 04:45:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 54C0A6B0088; Wed, 20 Nov 2024 04:45:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 412C16B0089; Wed, 20 Nov 2024 04:45:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 241736B0085 for ; Wed, 20 Nov 2024 04:45:15 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B6EBF1208F3 for ; Wed, 20 Nov 2024 09:45:14 +0000 (UTC) X-FDA: 82805989140.16.5EFB4A5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 3F2CD180014 for ; Wed, 20 Nov 2024 09:45:06 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ToYggRpr; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732095846; a=rsa-sha256; cv=none; b=zsVgJkMV568ZvQSE5583hFzhQ7gkxNQhLqpAIcYVyjF48HZFH4IF8QSs4Dsm/1b6lYRiRl BexjvIlfh2PW3lfmeXaezb5Gg7tq3W0WSnubNC4LYmdBqrywe80SSBMNz7LXVUSHHSC6Qq DC1OIBYgAAb7LsCeaa4M6NBtAt7CMqA= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ToYggRpr; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732095846; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3/vmlr1THzcj/O2Lltl3HGhrofUeBCh2vBg0AXGmDaA=; b=pEp+glm1tD8nfUGihTUCf1KOYN1XystFVMRgUC6ooLQFfejXW0BHPwPrc2oTv+wmSmIGj2 RcDwuzxAvNlhuDvprABXjRQYBrmo5DcvDVdjIdGLfhk+w4k/kjfKuCAAJdbfWjVgoRqnNa BSzfUn85iJNiWYGECI7jEv3zFmCzK5I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732095912; 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=3/vmlr1THzcj/O2Lltl3HGhrofUeBCh2vBg0AXGmDaA=; b=ToYggRpro5KeXRs5mCGGINp8turQ9RBohdQL0z+0IGFsn2L9SsUPBI6QQfiGV6JPMm2Bkl 8jmk5p85MfWw5djZknH0kBv/DUxhNPiSyLfHkne44yoHBg8U2+m1WHZXA6ti5FE1mJcVz2 hhhTszywAU6ZkLcfGTm+e9RvZeadt7Y= Received: from mx-prod-mc-03.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-641-OEXwKvnHMPmrea1pxaUrkA-1; Wed, 20 Nov 2024 04:45:10 -0500 X-MC-Unique: OEXwKvnHMPmrea1pxaUrkA-1 X-Mimecast-MFC-AGG-ID: OEXwKvnHMPmrea1pxaUrkA Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 749C31955F43; Wed, 20 Nov 2024 09:45:08 +0000 (UTC) Received: from localhost (unknown [10.72.113.10]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 700CA195607C; Wed, 20 Nov 2024 09:45:06 +0000 (UTC) Date: Wed, 20 Nov 2024 17:45:02 +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 05/11] fs/proc/vmcore: factor out allocating a vmcore memory node Message-ID: References: <20241025151134.1275575-1-david@redhat.com> <20241025151134.1275575-6-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241025151134.1275575-6-david@redhat.com> X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspam-User: X-Rspamd-Queue-Id: 3F2CD180014 X-Rspamd-Server: rspam01 X-Stat-Signature: 8j9ixbcctb5rygf88jextieh6phk7kda X-HE-Tag: 1732095906-178031 X-HE-Meta: U2FsdGVkX18m4ZKn5jSIyOYUz/7ZBoFX9WmRLv7J2sahrCJsnwj0idua/Da7p1sXgM6ReHFrsRlUm/PU7KoiSsvEQuiyzEozsP+Ylh7Fvbf3DP9tKKVHxtqG79FNzZSUpnkhJzToFq9cx7Q2M+xIhxWUBHHHhLxU0LMo3DUJovkIQKyPJR4TtYPkBcuz3dkaxK5p0ZD16KZjrsO11uYk1SjRU02oGKoLkUtqSvIOwEzGDsDGVp4ui1/GVdHRpMsXIkuZN5eKoiWZuAqZ+ykHjL5MI9vpJvscrs+QYVjsAAd8D9fcZwRh4nswtVKehZRsNaiuDKp7cmsVfK4xkUZSzrWM7uHMl/O0BeyLt/QCJCOusMcFHxFRAdnvVB0B1ZjsvkASKMmgQiDfmH42c04yUz7aKVM0a0/pA7iw1MRLjTuqyAVXnAL1pviGlZjBOzRAUwq+Kekz4547ZtKYO71BqZ859pBG7g6Msn8OiRzvHiXs95tlrmqeH4D5LagaQ0GGr/YHej/Ki+OgoxXn0401kwQCTZq5+PtRrhbpNMW1kcWJK2gFtSt+OdRa8491wLgqq4ZJKM6RmucnYxTox3z4aEPhlBrTdvyRCOQapddzvdya12vws4QdYXT8X92McDKXjomRoM5FbM6s1nAvh6Afk2WRlDkuTkG+so+hwQvO70XlZz8EsK3W4ovEbckAFpia/80CRE6+lA+Hmfz0jA9+B12rSaHJ0p5ykElcT5r7iqrBuSHJuAIn2RXhn9ruJRmz4mv/+i2puFNLOJZIxvT1AIcr2K0Uz9yuw4qMm5KEi7ItrXGa9uyQFZEPx3swQOWHw40v+o3IEfYmXSssC2u4lf7xyOW/hnNpA2QE18swV1n3DbELamQDfOwbXH+8qbTJS6bi/vGOUJ8H4gzFIRcWnqCBabQ5FQi9IJcere6BBLiwwBn7Utzlm6Z3sA5h9WzRWndvFpQXChdyttpF7N3 QcWOTzMq VYNEncXucV4Ie0DTG55Nc1CjTmzC0g7E4ocWK2z94uamtARZMfMcKEVZnaswyZ/zBe0er3n1ZziVQBsvqSBfJKGlAUHE4MEmFWsLxylp+pU+/ILWvZdalouhJhwLy4QCrkQTDln9taXWVJxM6kOK8BWDDn3oyw2jf9ypx5EQFm+1vfxobq6hoEuXANiuA19qoY9VqpvJMdfstCmzlTWcoIvRaL4ktIFF3crkO4DxECRz/c6VrY1B8K22T6tb/xGW+hfanG04hnxvK6NLqgS2yNF3y9LzsXbaXekVRlLPtTzPccCbJnmARgiqG70VlHGR+O2WtNRLgdFFNVEeB3zYF14EqnMje2SKlgmavn0d1ZXP7hesrNbh5euevrQ== 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: On 10/25/24 at 05:11pm, David Hildenbrand wrote: > Let's factor it out into include/linux/crash_dump.h, from where we can > use it also outside of vmcore.c later. LGTM, Acked-by: Baoquan He > > Signed-off-by: David Hildenbrand > --- > fs/proc/vmcore.c | 21 ++------------------- > include/linux/crash_dump.h | 14 ++++++++++++++ > 2 files changed, 16 insertions(+), 19 deletions(-) > > diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c > index 47652df95202..76fdc3fb8c0e 100644 > --- a/fs/proc/vmcore.c > +++ b/fs/proc/vmcore.c > @@ -683,11 +683,6 @@ static const struct proc_ops vmcore_proc_ops = { > .proc_mmap = mmap_vmcore, > }; > > -static struct vmcore_mem_node * __init get_new_element(void) > -{ > - 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) > { > @@ -1090,7 +1085,6 @@ 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; > @@ -1113,13 +1107,8 @@ static int __init process_ptload_program_headers_elf64(char *elfptr, > end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE); > size = end - start; > > - /* Add this contiguous chunk of memory to vmcore list.*/ > - new = get_new_element(); > - if (!new) > + if (vmcore_alloc_add_mem_node(vc_list, start, size)) > return -ENOMEM; > - new->paddr = start; > - new->size = size; > - list_add_tail(&new->list, vc_list); > > /* Update the program header offset. */ > phdr_ptr->p_offset = vmcore_off + (paddr - start); > @@ -1133,7 +1122,6 @@ 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; > @@ -1156,13 +1144,8 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, > end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE); > size = end - start; > > - /* Add this contiguous chunk of memory to vmcore list.*/ > - new = get_new_element(); > - if (!new) > + if (vmcore_alloc_add_mem_node(vc_list, start, size)) > return -ENOMEM; > - new->paddr = start; > - new->size = size; > - list_add_tail(&new->list, vc_list); > > /* Update the program header offset */ > phdr_ptr->p_offset = vmcore_off + (paddr - start); > diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h > index 5e48ab12c12b..ae77049fc023 100644 > --- a/include/linux/crash_dump.h > +++ b/include/linux/crash_dump.h > @@ -121,6 +121,20 @@ struct vmcore_mem_node { > loff_t offset; > }; > > +/* Allocate a vmcore memory node and add it to the list. */ > +static inline int vmcore_alloc_add_mem_node(struct list_head *list, > + unsigned long long paddr, unsigned long long size) > +{ > + struct vmcore_mem_node *m = kzalloc(sizeof(*m), GFP_KERNEL); > + > + if (!m) > + return -ENOMEM; > + m->paddr = paddr; > + m->size = size; > + list_add_tail(&m->list, list); > + return 0; > +} > + > #else /* !CONFIG_CRASH_DUMP */ > static inline bool is_kdump_kernel(void) { return false; } > #endif /* CONFIG_CRASH_DUMP */ > -- > 2.46.1 >