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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7581FE7717B for ; Wed, 4 Dec 2024 12:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3TMBFu0zsYs/BK8mI3BuEemyVvVnFxsrbDwOUtwonV0=; b=ZeX/FpyJK210K431x+WVLuPlQw v51V7ySPGwQoGtUe3qTI+ixKEYU9CwDhQoROv3meqehMBtwEd6K73JLFanQVhvaqIqfkYe0I3aAc6 YvPVEOy0h/srw5lnXLUQCXDni7jDEf8cqJuah94WULY/zJcnP3BZV2yW3VXftF07PVSsXuSfmm9z1 kkImry0DPEDbK7D23AyhNSINSMH7mud52gJHss2Ckt4lhN9XtPAzVvc24dyZ2ccxDfCc88sGVuQkE auJ6g3b1Ni/BMwquIH7ioH3k0+xIpi8D4gL2mMTJ5UKjBZnG+or1kzQZ2y2h4e+WhbPHMAQwesJRK bCGdqa0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tIoxh-0000000CbZW-49Kb; Wed, 04 Dec 2024 12:58:37 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tIouK-0000000Ca9s-48Y8 for kexec@lists.infradead.org; Wed, 04 Dec 2024 12:55:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733316908; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3TMBFu0zsYs/BK8mI3BuEemyVvVnFxsrbDwOUtwonV0=; b=ZXB0Qe3SDwA17RUnOpcp43lo8CjYMTnbwYhE0Mn+TFbXoj1bmgn1pROo6WcPntOt3C5hGs /AbhT01j6InMCpUNxK36PG5W2ehXOFWS+EMzkvMZ1ZX0BHCSEoRNNuD5z9YjlAsxciA4VA nIH5QDabJZXgJKAMRVOMZQl09TeagLQ= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-84-4MSHFNrqMGqRGpCx7MuOqQ-1; Wed, 04 Dec 2024 07:55:07 -0500 X-MC-Unique: 4MSHFNrqMGqRGpCx7MuOqQ-1 X-Mimecast-MFC-AGG-ID: 4MSHFNrqMGqRGpCx7MuOqQ Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-385dfa9b758so2188675f8f.0 for ; Wed, 04 Dec 2024 04:55:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733316906; x=1733921706; 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=3TMBFu0zsYs/BK8mI3BuEemyVvVnFxsrbDwOUtwonV0=; b=GIZIs8f+DDsig7egQvcwbake8fvgBZ2t8c2kiuTNWXnxYxhq3Fe8+NRjmZrFMVK3Aj LoE0Njj1R79aL6q3gRJzvb8gIBoycOkrEubOGQuxUbgdE0fdx4FjSz5HaAsWSBWp1hBi FKrgrKd9JsiS0/1OhoUzYI/F5b1h45ASKPYwWk4wcm1vbriX1OCFiUXmr6Zr37N/v5a4 h7NPBElYkXUFoMlG68MdIkZ6B8zyFkqk7H9kSv2bNApVnHzlf4OphHXTuVyaHI13Beg4 BbOIHd9N6tFONFA0Re2FqsVcLsLct42JBQLSk1FXbklrehUs/guUZ1H4oPMAXFfANVBw eiSQ== X-Forwarded-Encrypted: i=1; AJvYcCVtNmlmTyadfpA8xdSM3VG4IStVTsH5p0FKr/ecjt1kUY0r39fDLMXn1+zQev1P7XOjCmNs2g==@lists.infradead.org X-Gm-Message-State: AOJu0Yx2FgfkjLNEyWGKyg1QD5j5ChweBBgdZ26N+8Th/3GnFUcOyYzG zO12HEowAhaKjcn1TvCMyVG4SUayJY/hZ6g/jizFt/U/n7n3ffsRUD1emsDR98cllkeLC53g8zF 5ro8UyURivxALGXF1Acn+A/lgGmyZKF4eI70QiUTfsX9UyzUHe8s+33thwQ== X-Gm-Gg: ASbGncvoP7J4BFU4i/dTQHQXWVR8rqjE1cjm5KB4TftSCF612LzQNNr9r7T0mBHMvFC jrA+E0U7bnzwM8GJyagYtTdbHNmefOq2GQWEt1kmluTP+lq90NZHzSrzkt4X/NAv2THiURupTL4 NEaHTnEi1zJ5+G7e50BZ5ixoiZCJ+FIHc6GoernQfrvvAdkvtt84mo9b5QVxf0D8gvpHMMUs69i FPAAj01P9VN/XRbu3s1Y5kDgA1YxbPjMPono18A/I/PDmeUCEkHRAkzznfh4FkdcapTT461DPAS bEnNsxkVqftAg2XGkFPqyNSzRJYgryejjj8= X-Received: by 2002:a05:6000:156e:b0:385:fa2e:a33e with SMTP id ffacd0b85a97d-38607c0e1e7mr3561590f8f.43.1733316905747; Wed, 04 Dec 2024 04:55:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3Vs5XvVpD9wVjl4Do+O4dwdUFKsmLeUCgsK0LBk5udBDNdRPox9DV3gXL42llKQONJirIJg== X-Received: by 2002:a05:6000:156e:b0:385:fa2e:a33e with SMTP id ffacd0b85a97d-38607c0e1e7mr3561572f8f.43.1733316905408; Wed, 04 Dec 2024 04:55:05 -0800 (PST) Received: from localhost (p200300cbc70be10038d68aa111b0a20a.dip0.t-ipconnect.de. [2003:cb:c70b:e100:38d6:8aa1:11b0:a20a]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-385ed8dee66sm10241947f8f.104.2024.12.04.04.55.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Dec 2024 04:55:04 -0800 (PST) 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=20P=C3=A9rez?= , Baoquan He , Vivek Goyal , Dave Young , Thomas Huth , Cornelia Huck , Janosch Frank , Claudio Imbrenda , Eric Farman , Andrew Morton Subject: [PATCH v2 06/12] fs/proc/vmcore: factor out allocating a vmcore range and adding it to a list Date: Wed, 4 Dec 2024 13:54:37 +0100 Message-ID: <20241204125444.1734652-7-david@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241204125444.1734652-1-david@redhat.com> References: <20241204125444.1734652-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Bh85ULLl07dLYu0P6QYowiO0Cv9zYGrq-B7PQzQmwfE_1733316906 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241204_045509_092788_B85F4BFE X-CRM114-Status: GOOD ( 17.45 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org Let's factor it out into include/linux/crash_dump.h, from where we can use it also outside of vmcore.c later. 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 8d262017ca11..9b72e255dd03 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -709,11 +709,6 @@ static const struct proc_ops vmcore_proc_ops = { .proc_mmap = mmap_vmcore, }; -static struct vmcore_range * __init get_new_element(void) -{ - return kzalloc(sizeof(struct vmcore_range), GFP_KERNEL); -} - static u64 get_vmcore_size(size_t elfsz, size_t elfnotesegsz, struct list_head *vc_list) { @@ -1116,7 +1111,6 @@ static int __init process_ptload_program_headers_elf64(char *elfptr, size_t elfnotes_sz, struct list_head *vc_list) { - struct vmcore_range *new; int i; Elf64_Ehdr *ehdr_ptr; Elf64_Phdr *phdr_ptr; @@ -1139,13 +1133,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_range(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); @@ -1159,7 +1148,6 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, size_t elfnotes_sz, struct list_head *vc_list) { - struct vmcore_range *new; int i; Elf32_Ehdr *ehdr_ptr; Elf32_Phdr *phdr_ptr; @@ -1182,13 +1170,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_range(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 788a45061f35..9717912ce4d1 100644 --- a/include/linux/crash_dump.h +++ b/include/linux/crash_dump.h @@ -121,6 +121,20 @@ struct vmcore_range { loff_t offset; }; +/* Allocate a vmcore range and add it to the list. */ +static inline int vmcore_alloc_add_range(struct list_head *list, + unsigned long long paddr, unsigned long long size) +{ + struct vmcore_range *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.47.1