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.7 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,URIBL_BLOCKED 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 61CB9C4338F for ; Wed, 28 Jul 2021 02:50:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31C5760C3E for ; Wed, 28 Jul 2021 02:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233466AbhG1CuU (ORCPT ); Tue, 27 Jul 2021 22:50:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233223AbhG1CuT (ORCPT ); Tue, 27 Jul 2021 22:50:19 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BFE7C061757 for ; Tue, 27 Jul 2021 19:50:14 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id f11so1223296ioj.3 for ; Tue, 27 Jul 2021 19:50:14 -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=xgxaUtehHNXIz2IjW0e0Qx7jP8f1BeBvQhIRUK5iZZk=; b=A6tQHWYybwTVn4uxVkZlSTDj3Iqv29ah/h1AA+rc4FRtLMW+QjbBKfBfA0cZDF9Xdi VHi6fqRbGBc/XdQoUydVGnfc/iziUrfNLcZoNqKtGyk9PSnK8Q7q1wVSsNsw8taQSbU8 VhgSiqpNFGk+aCVRXWH5gsjAe1lgZ+w0bOQx7yaluewMEpn92P14FYkXVWf0Rtbs9kTa bGxO4AOriSAt4K/Q2SjbtMAdFkvQMrOVw+XKgIvgFamCT3264zoVkfHfnDehkDCvwAFd ti2io40w5nPiCUWdJOXwDdAMZtUhGTNMru0+dJY6uTD/M/7WFDDhFCg5lymMVcJ7vChf U1+A== 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=xgxaUtehHNXIz2IjW0e0Qx7jP8f1BeBvQhIRUK5iZZk=; b=RAFwpiszudj8sIsHz0+GA+whWvSPg/3NcyKA7ujzCJBgFgQO/Nq8XEV9vdXH3zSd/i zR1i1VCa0XCXCNnVRt0winY5D0ImvUq/1ghKfNLwFKsIfV4WCkXkgpGYaPW79aoacEJH sWs4k0BjugsD7nNqu1HonwD3ZK5Sr41lqSsUFilGaAfrh6h3bpdTws2r28Ug8PP+G/eE 2AuPuwnwp3qPuXsr21XOhuCAXBIDuLFJMS+u0i/TE4YOw8ULu4LkWuRYdLy/GUu9Wd+v bMXycR4Wiqt9QtUXPQ6mFZbL6ElEIhWZMZPivyw90graIg9DJIDIWad+sCfix3OBRLAh 2iiw== X-Gm-Message-State: AOAM5317qMVk3o2F8zVlrgIr9zmw4T0mIBnpmri4E+d3MIWJ+Wt+/Iqb BQMQD3qKGv9oEtOeUkazrtRFIlQoPoO2hN1K+OQ= X-Google-Smtp-Source: ABdhPJzS1DbmwHDkDQyZuJ1ge2qE2/h1BIrQbgSq6Qh6kgBDmgO4P0B9b7LIvRNVpIKodDSiCCgDi9vH/FaoH2Upm6Q= X-Received: by 2002:a02:ad08:: with SMTP id s8mr24445683jan.40.1627440613760; Tue, 27 Jul 2021 19:50:13 -0700 (PDT) MIME-Version: 1.0 References: <20210722030352.3966-1-thunder.leizhen@huawei.com> <20210722030352.3966-2-thunder.leizhen@huawei.com> In-Reply-To: <20210722030352.3966-2-thunder.leizhen@huawei.com> From: Lai Jiangshan Date: Wed, 28 Jul 2021 10:50:02 +0800 Message-ID: Subject: Re: [PATCH v2 1/1] workqueue: Fix possible memory leaks in wq_numa_init() To: Zhen Lei Cc: Tejun Heo , linux-kernel Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reviewed-by: Lai Jiangshan On Thu, Jul 22, 2021 at 11:04 AM Zhen Lei wrote: > > In error handling branch "if (WARN_ON(node == NUMA_NO_NODE))", the > previously allocated memories are not released. Doing this before > allocating memory eliminates memory leaks. > > Signed-off-by: Zhen Lei > --- > kernel/workqueue.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/kernel/workqueue.c b/kernel/workqueue.c > index 50142fc08902..79cc470bd9ce 100644 > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -5896,6 +5896,13 @@ static void __init wq_numa_init(void) > return; > } > > + for_each_possible_cpu(cpu) { > + if (WARN_ON(cpu_to_node(cpu) == NUMA_NO_NODE)) { > + pr_warn("workqueue: NUMA node mapping not available for cpu%d, disabling NUMA support\n", cpu); > + return; > + } > + } > + > wq_update_unbound_numa_attrs_buf = alloc_workqueue_attrs(); > BUG_ON(!wq_update_unbound_numa_attrs_buf); > > @@ -5913,11 +5920,6 @@ static void __init wq_numa_init(void) > > for_each_possible_cpu(cpu) { > node = cpu_to_node(cpu); > - if (WARN_ON(node == NUMA_NO_NODE)) { > - pr_warn("workqueue: NUMA node mapping not available for cpu%d, disabling NUMA support\n", cpu); > - /* happens iff arch is bonkers, let's just proceed */ > - return; > - } > cpumask_set_cpu(cpu, tbl[node]); > } > > -- > 2.25.1 >