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 2/6] mm/sparse: free section usage memory in case
 populate_section_memmap failed
Thread-Topic: [PATCH V2 2/6] mm/sparse: free section usage memory in case
 populate_section_memmap failed
Thread-Index: AQHXVf4vS9Xor91CmEmtzwvydauNs6r9sNwA
Date:   Mon, 31 May 2021 15:06:28 +0000
Message-ID: <20210531150542.inopmezthosooy5u@revolver>
References: <20210531091908.1738465-1-aisheng.dong@nxp.com>
 <20210531091908.1738465-3-aisheng.dong@nxp.com>
In-Reply-To: <20210531091908.1738465-3-aisheng.dong@nxp.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <B38145E5F794DB43B8794868F81FC83D@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 23cf1ca0-b10e-40ef-c756-08d92445aaa6
X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2021 15:06:28.3086
 (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: EkXiacOoN8IvJPyNbHun+rgB5xP1PWYa4a4Q/b3DLtlb4BDNn2GN9pkdksuXAw0jo5gWtuvkKHtfzOy9GAPdpA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1742
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10001 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 phishscore=0
 suspectscore=0 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000
 definitions=main-2105310110
X-Proofpoint-ORIG-GUID: 5yfO3ycfx44eXo563MnN8KcYIUdbPZvn
X-Proofpoint-GUID: 5yfO3ycfx44eXo563MnN8KcYIUdbPZvn
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]:
> Free section usage memory in case populate_section_memmap failed.
> We use map_count to track the remain unused memory to be freed.
>=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:
>  * using goto + lable according to Mike's suggestion
> ---
>  mm/sparse.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>=20
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 7ac481353b6b..408b737e168e 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -533,7 +533,7 @@ static void __init sparse_init_nid(int nid, unsigned =
long pnum_begin,
>  			mem_section_usage_size() * map_count);
>  	if (!usage) {
>  		pr_err("%s: node[%d] usemap allocation failed", __func__, nid);
> -		goto failed;
> +		goto failed1;

Please use better labels for goto statements.  Perhaps usemap_failed ?


>  	}
>  	sparse_buffer_init(map_count * section_map_size(), nid);
>  	for_each_present_section_nr(pnum_begin, pnum) {
> @@ -548,17 +548,20 @@ static void __init sparse_init_nid(int nid, unsigne=
d long pnum_begin,
>  			pr_err("%s: node[%d] memory map backing failed. Some memory will not =
be available.",
>  			       __func__, nid);
>  			pnum_begin =3D pnum;
> -			sparse_buffer_fini();
> -			goto failed;
> +			goto failed2;

Again, this goto label is not descriptive.

>  		}
>  		check_usemap_section_nr(nid, usage);
>  		sparse_init_one_section(__nr_to_section(pnum), pnum, map, usage,
>  				SECTION_IS_EARLY);
>  		usage =3D (void *) usage + mem_section_usage_size();
> +		map_count--;
>  	}
>  	sparse_buffer_fini();
>  	return;
> -failed:
> +failed2:
> +	sparse_buffer_fini();
> +	memblock_free_early(__pa(usage), map_count * mem_section_usage_size());
> +failed1:
>  	/* We failed to allocate, mark all the following pnums as not present *=
/
>  	for_each_present_section_nr(pnum_begin, pnum) {
>  		struct mem_section *ms;
> --=20
> 2.25.1
>=20
> =