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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 4F08CC47082 for ; Tue, 1 Jun 2021 02:39:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BC0846135D for ; Tue, 1 Jun 2021 02:39:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC0846135D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EADAE8D0002; Mon, 31 May 2021 22:39:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E5E826B006E; Mon, 31 May 2021 22:39:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD7E28D0002; Mon, 31 May 2021 22:39:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0150.hostedemail.com [216.40.44.150]) by kanga.kvack.org (Postfix) with ESMTP id 99E1B6B006C for ; Mon, 31 May 2021 22:39:06 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 31C0AA776 for ; Tue, 1 Jun 2021 02:39:06 +0000 (UTC) X-FDA: 78203597892.13.EED32D9 Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) by imf22.hostedemail.com (Postfix) with ESMTP id 088E0C00CBF3 for ; Tue, 1 Jun 2021 02:38:53 +0000 (UTC) Received: by mail-oo1-f49.google.com with SMTP id i8-20020a4aa1080000b0290201edd785e7so3171033ool.1 for ; Mon, 31 May 2021 19:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NvVZjz2gRnjw/PQviXkm4XEh9QvnrEhyd6R5TbtOdh8=; b=R/C8i9ZvzNPIueQAgqTnooe76qYDKhUMqUI8TqWZFB15tCKPRG+TQJ4v9J7KxVhyOb WY6IvTgWrGkIOZsmQqkGdl0fNsJzBmR/5BqevIggtqaWD/aGNOG6ftrZ76g2x4cnudve y6wYb6mJnRAIMKhCZW+tDnjEVeJHo2nuwMyn6jmDy98fctDgIt9pQ19B01qxzUuqaTYF tAJ79plQZFLNOsJfdkHcm+jp1tX9MGAuN7YDu/LxGvXvOJZXbWBSAN5eKwzzkEccL8X+ 3evBtt+XSMPpiIlMzlRlZmPF8ZjEKTuZjUgS64bgC0G9Sfh8oY13kMacYbbd+fmnDFa1 jYkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NvVZjz2gRnjw/PQviXkm4XEh9QvnrEhyd6R5TbtOdh8=; b=fSEKKsNOdbB9bp+MRzKa2bQ69TA1ZS5KLmuu6mZjaC3nBQU7NIn45sKpP1R8cnuyZn CU4wBcxIm45lGNHRV+EfSiTDLkv+gaV9ZuUR6YpBvw+B3dlwVL1LKUDv2qP9Ikh8JmaM YXPN12IdeDR1eab8RLr762jMVnKRjatONDcIcjDS3+Q3VIxF4QSbSW5VPC0h8ZSD4E2p Pp6OG80DwSk+SM4rNT0C1d+B4oRKE3J1lT9up7i+UpUKSa5NUpe+brJJZWkVOfqNtmab z5fYpdQctrDnV/YIWbzViO3dlNLr+xyUmELq+pAtn2dezbKI9G6kfkXdHQUCnh1P+ZMq CYeQ== X-Gm-Message-State: AOAM530uAIczExsUlwjKdjQFBwRpclzmSKcgP4ds+P4wrteTQ/GYv1PS 94jWRX1kZ4IPWF+UkFgLQz75ytOixLEpAHiobTE= X-Google-Smtp-Source: ABdhPJy0p6Mc57vuZNCBsAynS+dABjULFi0fEVZA62qwqVWKmYq9FgI3sBmIsxdRhZWyIY1TSkJx0xw/2XXDNzuvhHI= X-Received: by 2002:a4a:d89a:: with SMTP id b26mr18347712oov.11.1622515145156; Mon, 31 May 2021 19:39:05 -0700 (PDT) MIME-Version: 1.0 References: <20210531091908.1738465-1-aisheng.dong@nxp.com> <20210531091908.1738465-3-aisheng.dong@nxp.com> <20210531150542.inopmezthosooy5u@revolver> In-Reply-To: <20210531150542.inopmezthosooy5u@revolver> From: Dong Aisheng Date: Tue, 1 Jun 2021 10:37:54 +0800 Message-ID: Subject: Re: [PATCH V2 2/6] mm/sparse: free section usage memory in case populate_section_memmap failed To: Liam Howlett Cc: Dong Aisheng , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Mike Rapoport Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 088E0C00CBF3 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="R/C8i9Zv"; spf=pass (imf22.hostedemail.com: domain of dongas86@gmail.com designates 209.85.161.49 as permitted sender) smtp.mailfrom=dongas86@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam04 X-Stat-Signature: bxc5788ayc7kfbiasdb1chbzdwotuezi X-HE-Tag: 1622515133-220022 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 Mon, May 31, 2021 at 11:06 PM Liam Howlett wrote: > > * Dong Aisheng [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. > > > > Cc: Andrew Morton > > Cc: Mike Rapoport > > Signed-off-by: Dong Aisheng > > --- > > ChangeLog: > > v1->v2: > > * using goto + lable according to Mike's suggestion > > --- > > mm/sparse.c | 11 +++++++---- > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > 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 ? > Thanks, I will improve it. Regards Aisheng > > > } > > 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, unsigned long pnum_begin, > > pr_err("%s: node[%d] memory map backing failed. Some memory will not be available.", > > __func__, nid); > > pnum_begin = 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 = (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; > > -- > > 2.25.1 > > > >