Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     Dong Aisheng <aisheng.dong@nxp.com>
CC:     "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "dongas86@gmail.com" <dongas86@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Rapoport <rppt@kernel.org>
Subject: Re: [PATCH V2 3/6] mm/sparse: move mem_sections allocation out of
 memory_present()
Thread-Topic: [PATCH V2 3/6] mm/sparse: move mem_sections allocation out of
 memory_present()
Thread-Index: AQHXVf4xy73mQIlGwE2q08XomPgdeqr9qV0A
Date:   Mon, 31 May 2021 14:39:02 +0000
Message-ID: <20210531143852.h226vpjrgpyo2eqw@revolver>
References: <20210531091908.1738465-1-aisheng.dong@nxp.com>
 <20210531091908.1738465-4-aisheng.dong@nxp.com>
In-Reply-To: <20210531091908.1738465-4-aisheng.dong@nxp.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <494497392C46B0449C0A1D4850CA6D18@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 624bcea5-6d23-42a5-52e9-08d92441d582
X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2021 14:39:02.2378
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 7r6yRDMVoeZUrCCrM/viD1jVw9+tRuVczeiEX930B25ihbt6+IcWjlRanfmO76jGheH0p1PTqKt4R7BOoWFNxA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4529
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10001 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 malwarescore=0
 phishscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000
 definitions=main-2105310106
X-Proofpoint-GUID: HaWhxSf_DV_yAWo5F_NhcRl-ZaQ7oJXV
X-Proofpoint-ORIG-GUID: HaWhxSf_DV_yAWo5F_NhcRl-ZaQ7oJXV
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

* Dong Aisheng <aisheng.dong@nxp.com> [210531 05:20]:
> The only path to call memory_present() is from memblocks_present().
> The struct mem_section **mem_section only needs to be initialized once,
> so no need put the initialization/allocation code in memory_present()
> which will be called multiple times for each section.
>=20
> After moving, the 'unlikely' condition statement becomes to be
> meaningless as it's only initialized one time, so dropped as well.
>=20
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Mike Rapoport <rppt@kernel.org>
> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
> ---
> ChangeLog:
> v1->v2:
>  * split into a helper function and called directly from sparse_init
> ---
>  mm/sparse.c | 29 ++++++++++++++++-------------
>  1 file changed, 16 insertions(+), 13 deletions(-)
>=20
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 408b737e168e..d02ee6bb7cbc 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -60,6 +60,18 @@ static inline void set_section_nid(unsigned long secti=
on_nr, int nid)
>  #endif
> =20
>  #ifdef CONFIG_SPARSEMEM_EXTREME
> +static void __init sparse_alloc_section_roots(void)
> +{
> +	unsigned long size, align;
> +
> +	size =3D sizeof(struct mem_section *) * NR_SECTION_ROOTS;
> +	align =3D 1 << (INTERNODE_CACHE_SHIFT);
> +	mem_section =3D memblock_alloc(size, align);
> +	if (!mem_section)
> +		panic("%s: Failed to allocate %lu bytes align=3D0x%lx\n",
> +		      __func__, size, align);
> +}
> +
>  static noinline struct mem_section __ref *sparse_index_alloc(int nid)
>  {
>  	struct mem_section *section =3D NULL;
> @@ -107,6 +119,8 @@ static inline int sparse_index_init(unsigned long sec=
tion_nr, int nid)
>  {
>  	return 0;
>  }
> +
> +static inline void sparse_alloc_section_roots(void) {}
>  #endif
> =20
>  #ifdef CONFIG_SPARSEMEM_EXTREME
> @@ -254,19 +268,6 @@ static void __init memory_present(int nid, unsigned =
long start, unsigned long en
>  {
>  	unsigned long pfn;
> =20
> -#ifdef CONFIG_SPARSEMEM_EXTREME
> -	if (unlikely(!mem_section)) {
> -		unsigned long size, align;
> -
> -		size =3D sizeof(struct mem_section *) * NR_SECTION_ROOTS;
> -		align =3D 1 << (INTERNODE_CACHE_SHIFT);
> -		mem_section =3D memblock_alloc(size, align);
> -		if (!mem_section)
> -			panic("%s: Failed to allocate %lu bytes align=3D0x%lx\n",
> -			      __func__, size, align);
> -	}
> -#endif
> -
>  	start &=3D PAGE_SECTION_MASK;
>  	mminit_validate_memmodel_limits(&start, &end);
>  	for (pfn =3D start; pfn < end; pfn +=3D PAGES_PER_SECTION) {
> @@ -582,6 +583,8 @@ void __init sparse_init(void)
>  	unsigned long pnum_end, pnum_begin, map_count =3D 1;
>  	int nid_begin;
> =20
> +	sparse_alloc_section_roots();

nit: The newline below is unnecessary

> +
>  	memblocks_present();
> =20
>  	pnum_begin =3D first_present_section_nr();
> --=20
> 2.25.1
>=20
> =