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 EDAFFE7716B for ; Wed, 4 Dec 2024 12:55:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93B306B0098; Wed, 4 Dec 2024 07:55:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C2C86B0099; Wed, 4 Dec 2024 07:55:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 716F66B009A; Wed, 4 Dec 2024 07:55:11 -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 4D8D86B0098 for ; Wed, 4 Dec 2024 07:55:11 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EF47C1A0F5E for ; Wed, 4 Dec 2024 12:55:10 +0000 (UTC) X-FDA: 82857271854.02.213EBE6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 8C6F14000E for ; Wed, 4 Dec 2024 12:55:02 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZXB0Qe3S; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733316902; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3TMBFu0zsYs/BK8mI3BuEemyVvVnFxsrbDwOUtwonV0=; b=FmE1nZi7R4pOBI2ePjpsHLOxqgTEi5KJO1WbKLUH1dlODD/XNOO6qzsZAuC+mnFCymPykk RmQerk1MDGtS5OhCoF6Gqa29Tn9eIO2ZSJOP747BZtLHJjrfoEIT20sDLp/ZaSAX7h3bE4 IbvjzmfuhofZarRCyhZKKpPHnYfI7Z8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733316902; a=rsa-sha256; cv=none; b=f7CQt+ySUyTpLfOXrAIKPVEGdg67rghf799t7hx9L3SFx6M3zp5ZzEV0MX5SrgD6U7pWCa nDhkpJl9bpEpQiyVrZ6QJu7Jsw2evIrHNskA/t7xVUrtIDi87ZS+FvDnlLcYe66ikylNSd 9r3nAu1elo4HVrt66AnfXyWGZrthiHc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZXB0Qe3S; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com 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-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-470-tqBpXxNOMmu0WgDst4DU-A-1; Wed, 04 Dec 2024 07:55:07 -0500 X-MC-Unique: tqBpXxNOMmu0WgDst4DU-A-1 X-Mimecast-MFC-AGG-ID: tqBpXxNOMmu0WgDst4DU-A Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-385dcae001fso2825622f8f.1 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=PaN3U4e9ZwH4+GJ848fqsW8r0tc/7LPZhZkmxR6MXhT6Lvmy0ALVLh/m2GNKz0T+nX 1hXpfXcCX+C1JkbiPtKjNnENzuROQgJY249M5KMBua8YZeaV3VSJ5bxiysaTiOBPwr0b xF/lUXEETf8qdTjNwIxoNujhtLu80GNPehIEyeg3gRzRxvfZvZUh1ORTXx7hLm/OxrPW nahif1p08xwaw8g9zLlcp/zXQFols3zJLiCzTOGMJNqnEbNTIpb7yoAJWqiM9QO3xoc4 TCuLshal2uq1SMwVOYvlCRQ3wpXKY6HqB1iGFgY/ZytQKsyB0hQbT1AkadWhWyQFINs0 xiCQ== X-Gm-Message-State: AOJu0YxAUZybIVPvTgPz7PkV189DicKqnH02K5NYj5ct9tP3BXmHlWdM QnY7kL0u6zZxcP+6U6AC7kmZ2dXrfhDSmwlpoP/LQw6sbdauA8LNuwtYA7YA3OhLdniGybsu5Eb fgh7dP0yFdXV2cRzENXL7fKdAwM2KiKo6i6m4RzInO+0F5BZA X-Gm-Gg: ASbGnctwSXOSA64DuM+Ktx+9Hf0yzidOw8bvEYXbRfzcH1d5ec73zeXOTcsS+diMhw1 KW9a+D6ECt+3hAak0Nv36InTSK/1IGTQ9TcP4UU09GKPWrhEFatvbNdgsf0zUHCBUtLjBHNetYn SEBuda3nXPOECRqRHijrwObFQTkWtU6aAb7HmAPQep4pZgKBZn+HTj1/wMCCXLERSMNPm4sZ1Mc Khue4NndHrdhdmvuIEvdD5w3JsJIwkYwVmzlJMAVTypY8LutGesSfc39zw5AtYg0EEK/SqazMh2 StS+z4qiCd+MKqWJ6aGKCShHpal4Zc1y6c0= X-Received: by 2002:a05:6000:156e:b0:385:fa2e:a33e with SMTP id ffacd0b85a97d-38607c0e1e7mr3561607f8f.43.1733316905759; 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: G0SOST6jghLeFlVXIYDtywo0TdRcW4IuFgaVnJtssyk_1733316906 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: y5fxqz56bswtm3hqsxa1uaeqe3aw9yoq X-Rspamd-Queue-Id: 8C6F14000E X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1733316902-380828 X-HE-Meta: U2FsdGVkX18zOG1EUaPnsrxTp9D8wkuhLP4FYbHndGEuocvE9k+jyX9aWfoIo0X34+cGF+1OozKzkDv0B6OL80kTq1AoQrg1GfDVvaX0cvHeJsJZQTCY9ntJzpGU0ZZ23H+JJhY9Wc+Impcu77JTLEGTLC8OyzCFbke7uEgABK09+HO4qe9HQLHTbD1AY8hlCOIOYLSsYK9IosIhNGyeyp9qCDAlZP0/X5RK+KbAmlR8zFEVByk/tuuoz/HHHyg0svb3hZAYlTaqe7qLIaWviKdqStjR6H/SvGg4Zia0YB79nqAKjRZyA5v6oQ66dT/bBjJ0OZUAtAsUsYFx42Yryq4RvnHFrpWZQl8xBCjLcxCOp+rCt/KJqQgnYbzFMqmm6y7m7BfymotnWX1WBY9Njn0nP6ELoAD7fWxiKFKTmS8x9J/9vYo0CMzLWNU361FE85FqJJmdBzflvjzlneWT2sa6wwj0e5F9rPu/8fyMGT33Wf6IoBN3RguxQ175TyTIf2w0H4HRhNDRkkKnI1BApBW+1QughY0UzxRWAUpt3oAEFLeoTVqZW1j8GQ5CM9jKyA4fPHyOhtxNAceJaNpuBaGmA9gI8ohXjKO31zeMChyuMkPxtD+U5e4u1clpMjgkQResgFiZJk4Zs63ay9uSgNvdFdFSBaVcDup3lWsF2uVyOscMAojfKY3Z/ehA3tH8exC/63gbTM5tz1BfDgKpoZQa0Nyw71qwCCplzDYYFwNcF/AphSqiaF04XkvFXvaChhP9uMenGC9Rt/6rQYam3rZdL2kSoRbrG6Mkriygo3Kux8w/HQGycjEwCtHhBDXhKjVWXJ0SwdTV8Sy/SJVadLmSGLADZlj1lDHnPVKyT311QE60IAZvwMFY2XjFRTwUIkObZIb3o/t8eK9hjfNXxmPIeQbNxwune4avO8ugLG/96xU78vE9lh3J1ZMncToxrgnJpNjC1F0ESWmHOBQ K9XLD20Z 0SFvaQCqOAwznL10ZOLT6zL8wyUIkoBUhlLSvSVUj5cPX3+kkN3ELVrIoXZljqSLStmZElhrz+9dLWrCxHh/7N01ywIUi56CUdfBuvHxqyAhdqelApN5+KOqW7/6d0Rxnx5igXgNnHAHCz+OevIHrBHGZAeoO4KfikAGg3DeWVs6n8ZcQ69uhMH9iVRtIHfvrmzQUFkura18NUlcCTaHk3v167YoeKTBN6y/lS3gglcKKeCaeqhBRpOBL556unfLN1LcLiLHJMnpPbDLwAQSutX3T2WPQz+ci31xEc1V28hM20xrk0dFReckMB7eZCJ0YCsTrLYF9XUiTAusv/AhTcQ8V6uW8TJ0CRdM/VXJZA3Tr6UUoNI7nOuRf6IkKEiBHbwNE5JxNffVurIyZ85f2hlvfN4tkaOaRaGjdf1XXL2SX9QUYBZIj6sE77yrDdVN9rO26+o9/d3CTYDdYcfaxf7E/Lg== 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: 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