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 X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0EF3C2B9F8 for ; Tue, 25 May 2021 07:55:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7A5126128B for ; Tue, 25 May 2021 07:55:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A5126128B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CD7226B006C; Tue, 25 May 2021 03:55:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CACCD6B006E; Tue, 25 May 2021 03:55:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFF4D6B0070; Tue, 25 May 2021 03:55:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0244.hostedemail.com [216.40.44.244]) by kanga.kvack.org (Postfix) with ESMTP id 7EDE16B006C for ; Tue, 25 May 2021 03:55:14 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 17647181AEF39 for ; Tue, 25 May 2021 07:55:14 +0000 (UTC) X-FDA: 78178992948.06.15FD694 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf28.hostedemail.com (Postfix) with ESMTP id DDF0E200098B for ; Tue, 25 May 2021 07:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621929313; 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=x070tQ5CLRrsBPg2h5b3DfLhZ5uEavvY3kDP5R48Mp4=; b=dipWXxEukWOQwA5mQgRnHfKIFTD62w093UwkWb+s9F1NcwfsvTx11YQTnixyYM3KWtvyP4 B3YgHUgZ7QIBdYPGSuyjB9/VvQpXqqMpfDMtR5HiGfx0Kx++hSqnE4DFWmrznOMHp6qy0u pGckVqf2NGiKBCKvEb3hrlCSCq6O7OA= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-9bFOKM6eOmaVQL-KtN959w-1; Tue, 25 May 2021 03:55:11 -0400 X-MC-Unique: 9bFOKM6eOmaVQL-KtN959w-1 Received: by mail-wr1-f70.google.com with SMTP id i15-20020a5d558f0000b029011215b1cf5cso7812915wrv.22 for ; Tue, 25 May 2021 00:55:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=x070tQ5CLRrsBPg2h5b3DfLhZ5uEavvY3kDP5R48Mp4=; b=pTpBCB+cmHkS++3rXUbtKkOZx/E8a0kKo1RKoe/u+CGZFzXpTncQhKy9fjjmPrVwF6 /wTC+QtlBF8eG/emrYjqTtPj704kzKyf/6gu/ESQ45T4qkDhsA2twwOYlBYpNggNsA8M 44GdvZzRBRob7kIGc+nqvUkltVAfoet6PZsMR70GemuEMiNoq6af8GGz69lLIg/KjY6T UjNgAw0yD0uSWA6dV7S395Di41xSImWgjJe6Fr5SevQmzDoieRUVsXmSQL250Y353C8P E9MXJO2tOiyZBNnCYllgHoA2LSYH4H5wurnhCXP/C1zkWh02ALAgfWeRl2SuGbbjiwP4 klIg== X-Gm-Message-State: AOAM533VLWzKnE8AHF8GVKH1EPPl1zksc+LLDnrpzd0n/CAtBRh5WIEQ vNBz3U9s8l0BLh7L3NPlL/7MfWOWV1m3VvQTbF2yOx83l+oRu1aeRUCLIF5F7KIq6p7eTElWh4d klpLKZhGGeOA= X-Received: by 2002:a1c:6355:: with SMTP id x82mr22644303wmb.178.1621929310383; Tue, 25 May 2021 00:55:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoK+ONNwRVXX+uxmWWrihpve5/LZGVZA6s7eNQLdabYEc3al9o19TUlVGHhEAxZ5DlmA3+Ag== X-Received: by 2002:a1c:6355:: with SMTP id x82mr22644280wmb.178.1621929310132; Tue, 25 May 2021 00:55:10 -0700 (PDT) Received: from ?IPv6:2003:d8:2f38:2400:62f4:c5fa:ba13:ac32? (p200300d82f38240062f4c5faba13ac32.dip0.t-ipconnect.de. [2003:d8:2f38:2400:62f4:c5fa:ba13:ac32]) by smtp.gmail.com with ESMTPSA id o21sm10050808wmr.44.2021.05.25.00.55.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 May 2021 00:55:09 -0700 (PDT) Subject: Re: [PATCH 4/5] mm: rename the global section array to mem_sections To: Dong Aisheng , linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, dongas86@gmail.com, Andrew Morton , Dave Young , Baoquan He , Vivek Goyal , kexec@lists.infradead.org References: <20210517112044.233138-1-aisheng.dong@nxp.com> <20210517112044.233138-5-aisheng.dong@nxp.com> From: David Hildenbrand Organization: Red Hat Message-ID: Date: Tue, 25 May 2021 09:55:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210517112044.233138-5-aisheng.dong@nxp.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dipWXxEu; spf=none (imf28.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: DDF0E200098B X-Stat-Signature: i1dgyxtcjtwaezq5rc53ua93ih6byhf7 X-HE-Tag: 1621929307-48592 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: On 17.05.21 13:20, Dong Aisheng wrote: > In order to distinguish the struct mem_section for a better code > readability and align with kernel doc [1] name below, change the > global mem section name to 'mem_sections' from 'mem_section'. > > [1] Documentation/vm/memory-model.rst > "The `mem_section` objects are arranged in a two-dimensional array > called `mem_sections`." > > Cc: Andrew Morton > Cc: Dave Young > Cc: Baoquan He > Cc: Vivek Goyal > Cc: kexec@lists.infradead.org > Signed-off-by: Dong Aisheng > --- > include/linux/mmzone.h | 10 +++++----- > kernel/crash_core.c | 4 ++-- > mm/sparse.c | 16 ++++++++-------- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index fc23e36cb165..b348a06915c5 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -1297,9 +1297,9 @@ struct mem_section { > #define SECTION_ROOT_MASK (SECTIONS_PER_ROOT - 1) > > #ifdef CONFIG_SPARSEMEM_EXTREME > -extern struct mem_section **mem_section; > +extern struct mem_section **mem_sections; > #else > -extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; > +extern struct mem_section mem_sections[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; > #endif > > static inline unsigned long *section_to_usemap(struct mem_section *ms) > @@ -1310,12 +1310,12 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms) > static inline struct mem_section *__nr_to_section(unsigned long nr) > { > #ifdef CONFIG_SPARSEMEM_EXTREME > - if (!mem_section) > + if (!mem_sections) > return NULL; > #endif > - if (!mem_section[SECTION_NR_TO_ROOT(nr)]) > + if (!mem_sections[SECTION_NR_TO_ROOT(nr)]) > return NULL; > - return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; > + return &mem_sections[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; > } > extern unsigned long __section_nr(struct mem_section *ms); > extern size_t mem_section_usage_size(void); > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > index 29cc15398ee4..fb1180d81b5a 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -414,8 +414,8 @@ static int __init crash_save_vmcoreinfo_init(void) > VMCOREINFO_SYMBOL(contig_page_data); > #endif > #ifdef CONFIG_SPARSEMEM > - VMCOREINFO_SYMBOL_ARRAY(mem_section); > - VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); > + VMCOREINFO_SYMBOL_ARRAY(mem_sections); > + VMCOREINFO_LENGTH(mem_sections, NR_SECTION_ROOTS); > VMCOREINFO_STRUCT_SIZE(mem_section); > VMCOREINFO_OFFSET(mem_section, section_mem_map); > VMCOREINFO_NUMBER(MAX_PHYSMEM_BITS); > diff --git a/mm/sparse.c b/mm/sparse.c > index df4418c12f04..a96e7e65475f 100644 > --- a/mm/sparse.c > +++ b/mm/sparse.c > @@ -24,12 +24,12 @@ > * 1) mem_section - memory sections, mem_map's for valid memory > */ > #ifdef CONFIG_SPARSEMEM_EXTREME > -struct mem_section **mem_section; > +struct mem_section **mem_sections; > #else > -struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT] > +struct mem_section mem_sections[NR_SECTION_ROOTS][SECTIONS_PER_ROOT] > ____cacheline_internodealigned_in_smp; > #endif > -EXPORT_SYMBOL(mem_section); > +EXPORT_SYMBOL(mem_sections); > > #ifdef NODE_NOT_IN_PAGE_FLAGS > /* > @@ -91,14 +91,14 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid) > * > * The mem_hotplug_lock resolves the apparent race below. > */ > - if (mem_section[root]) > + if (mem_sections[root]) > return 0; > > section = sparse_index_alloc(nid); > if (!section) > return -ENOMEM; > > - mem_section[root] = section; > + mem_sections[root] = section; > > return 0; > } > @@ -131,7 +131,7 @@ unsigned long __section_nr(struct mem_section *ms) > #else > unsigned long __section_nr(struct mem_section *ms) > { > - return (unsigned long)(ms - mem_section[0]); > + return (unsigned long)(ms - mem_sections[0]); > } > #endif > > @@ -286,8 +286,8 @@ static void __init memblocks_present(void) > #ifdef CONFIG_SPARSEMEM_EXTREME > size = sizeof(struct mem_section *) * NR_SECTION_ROOTS; > align = 1 << (INTERNODE_CACHE_SHIFT); > - mem_section = memblock_alloc(size, align); > - if (!mem_section) > + mem_sections = memblock_alloc(size, align); > + if (!mem_sections) > panic("%s: Failed to allocate %lu bytes align=0x%lx\n", > __func__, size, align); > #endif > Smells like unnecessary code churn. I'd rather just fix the doc because it doesn't really improve readability IMHO. Anyhow, just my 2 cents. -- Thanks, David / dhildenb