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=-7.0 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 14164C433DB for ; Wed, 24 Mar 2021 12:37:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 815D761A0B for ; Wed, 24 Mar 2021 12:37:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 815D761A0B 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 118A96B02C1; Wed, 24 Mar 2021 08:37:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F0096B02C2; Wed, 24 Mar 2021 08:37:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED2E56B02C3; Wed, 24 Mar 2021 08:37:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0082.hostedemail.com [216.40.44.82]) by kanga.kvack.org (Postfix) with ESMTP id D20276B02C1 for ; Wed, 24 Mar 2021 08:37:05 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8917F181AF5D8 for ; Wed, 24 Mar 2021 12:37:05 +0000 (UTC) X-FDA: 77954717610.03.FBC1858 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by imf03.hostedemail.com (Postfix) with ESMTP id 4BC48C0007C3 for ; Wed, 24 Mar 2021 12:37:04 +0000 (UTC) Received: by mail-lf1-f52.google.com with SMTP id o10so31712765lfb.9 for ; Wed, 24 Mar 2021 05:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=nIJfnQhLwGUTSTIDPdo6RHmVYRmlX0sZ1w6RVIyynBI=; b=i5DUa2aEATi7n6D2eLMJyHy8wVNfTnyi972S30ueEKbiiHCAvOirY5mjLJ7ssFdyBb 7J2Ls4I2pPN90vYC+RcErwtG2kRYl3RB+3bTUJ3SAht6x9qYrzTvTtAzgsq326lx/yyx JiUnmR8oVnehNtcllk8wPsLTpX2mw2/sTomBnRaOg5e+J0sixfzsELbJCOQKNn9UyRw4 xuKUD1LHPYsxerOIku441hSXKa8iQI90NYgcVeyShrXJ/qqt5wQA1KIL4J6wlOhK6OIM SzbtUhCNHXS+8BncA8K7d94TfqleTbWP4LNFGftUUDn027sUxgxdNskasii0T43ivtxK Kkpw== 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:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=nIJfnQhLwGUTSTIDPdo6RHmVYRmlX0sZ1w6RVIyynBI=; b=i3OIinGlm3nZMhdR5z/fk9mlBpvMWLPhhW/ffAlEwPlKEmJy2tKRmHC8XjJIZA2UNQ 6jjGn20Ju6yX8egc1ZHfReBCjgXXp4pbsLcwVyqqDkrivy2MlRZDDIjnmV12SvuSNGj8 H2jrYAGNIr7jSVjJVYQfoM4YSiwBxEAx/R0d7FR0nesQuyQajY5bOVG9IgFdSI2ZYD+k YB7or/McA3oB2yPP7aVKQ4eDGTprm6RsPAbBEd88I3HUQEGb9riH/ANdt9cv49Q3mKqH /YSffCfBNmPaLmZyMraYmxKrpvwUlO/B6yHrzaabaO5DvlYzgRV+2uzIoip4b1suSheD R2Fw== X-Gm-Message-State: AOAM530nz566Utzlcnjd9UQuRSLp47VDJm4cKWBkeWRuRvB2LhUp0Zvz RoTrGUoqMIlQx53+H/Ez5cE= X-Google-Smtp-Source: ABdhPJy2KFt7fWcIVloNQhgT+OkHkLkGosPIQmJjZ6nALGrW8AdpeKa0/8Ng5nJlLHjReKESojuWpQ== X-Received: by 2002:a19:c14f:: with SMTP id r76mr1915986lff.218.1616589423852; Wed, 24 Mar 2021 05:37:03 -0700 (PDT) Received: from [192.168.2.145] (109-252-193-60.dynamic.spd-mgts.ru. [109.252.193.60]) by smtp.googlemail.com with ESMTPSA id d13sm218870lfi.247.2021.03.24.05.37.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Mar 2021 05:37:03 -0700 (PDT) Subject: Re: [PATCH v6] mm: cma: support sysfs To: Minchan Kim , John Hubbard Cc: Andrew Morton , linux-mm , LKML , gregkh@linuxfoundation.org, surenb@google.com, joaodias@google.com, willy@infradead.org References: <20210324010547.4134370-1-minchan@kernel.org> From: Dmitry Osipenko Message-ID: <5b1a9f6c-ea7b-6e90-1c77-a49a10896f08@gmail.com> Date: Wed, 24 Mar 2021 15:37:02 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Stat-Signature: kx3qs7zm5cpjkssha9c549fgyyc8h3zx X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 4BC48C0007C3 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf03; identity=mailfrom; envelope-from=""; helo=mail-lf1-f52.google.com; client-ip=209.85.167.52 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616589424-157304 Content-Transfer-Encoding: quoted-printable 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: 24.03.2021 08:44, Minchan Kim =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > On Tue, Mar 23, 2021 at 09:47:27PM -0700, John Hubbard wrote: >> On 3/23/21 8:27 PM, Minchan Kim wrote: >> ... >>>>> +static int __init cma_sysfs_init(void) >>>>> +{ >>>>> + unsigned int i; >>>>> + >>>>> + cma_kobj_root =3D kobject_create_and_add("cma", mm_kobj); >>>>> + if (!cma_kobj_root) >>>>> + return -ENOMEM; >>>>> + >>>>> + for (i =3D 0; i < cma_area_count; i++) { >>>>> + int err; >>>>> + struct cma *cma; >>>>> + struct cma_kobject *cma_kobj; >>>>> + >>>>> + cma_kobj =3D kzalloc(sizeof(*cma_kobj), GFP_KERNEL); >>>>> + if (!cma_kobj) { >>>>> + kobject_put(cma_kobj_root); >>>>> + return -ENOMEM; >>>> >>>> This leaks little cma_kobj's all over the floor. :) >>> >>> I thought kobject_put(cma_kobj_root) should deal with it. No? >>> >> If this fails when i > 0, there will be cma_kobj instances that >> were stashed in the cma_areas[] array. But this code only deletes >> the most recently allocated cma_kobj, not anything allocated on >> previous iterations of the loop. >=20 > Oh, I misunderstood that destroying of root kobject will release > children recursively. Seems not true. Go back to old version. >=20 >=20 > index 16c81c9cb9b7..418951a3f138 100644 > --- a/mm/cma_sysfs.c > +++ b/mm/cma_sysfs.c > @@ -80,20 +80,19 @@ static struct kobj_type cma_ktype =3D { > static int __init cma_sysfs_init(void) > { > unsigned int i; > + int err; > + struct cma *cma; > + struct cma_kobject *cma_kobj; >=20 > cma_kobj_root =3D kobject_create_and_add("cma", mm_kobj); > if (!cma_kobj_root) > return -ENOMEM; >=20 > for (i =3D 0; i < cma_area_count; i++) { > - int err; > - struct cma *cma; > - struct cma_kobject *cma_kobj; > - > cma_kobj =3D kzalloc(sizeof(*cma_kobj), GFP_KERNEL); > if (!cma_kobj) { > - kobject_put(cma_kobj_root); > - return -ENOMEM; > + err =3D -ENOMEM; > + goto out; > } >=20 > cma =3D &cma_areas[i]; > @@ -103,11 +102,21 @@ static int __init cma_sysfs_init(void) > cma_kobj_root, "%s", cma->na= me); > if (err) { > kobject_put(&cma_kobj->kobj); > - kobject_put(cma_kobj_root); > - return err; > + goto out; > } > } >=20 > return 0; > +out: > + while (--i >=3D 0) { > + cma =3D &cma_areas[i]; > + > + kobject_put(&cma->kobj->kobj); > + kfree(cma->kobj); > + cma->kobj =3D NULL; > + } > + kobject_put(cma_kobj_root); > + > + return err; > } > subsys_initcall(cma_sysfs_init); Since we don't care about the order in which kobjects are put, I'd write = it in this way, which I think looks cleaner: static void cma_sysfs_cleanup(struct kobject *cma_kobj_root) { struct cma *cma =3D cma_areas; unsigned int i; for (i =3D 0; i < cma_area_count; i++, cma++) { if (!cma->kobj) break; kobject_put(&cma->kobj->kobj); } kobject_put(cma_kobj_root); } static int __init cma_sysfs_init(void) { struct kobject *cma_kobj_root; unsigned int i; cma_kobj_root =3D kobject_create_and_add("cma", mm_kobj); if (!cma_kobj_root) return -ENOMEM; for (i =3D 0; i < cma_area_count; i++) { struct cma_kobject *cma_kobj; struct cma *cma; int err; cma_kobj =3D kzalloc(sizeof(*cma_kobj), GFP_KERNEL); if (!cma_kobj) { cma_sysfs_cleanup(cma_kobj_root); return -ENOMEM; } cma =3D &cma_areas[i]; cma->kobj =3D cma_kobj; cma_kobj->cma =3D cma; err =3D kobject_init_and_add(&cma_kobj->kobj, &cma_ktype, cma_kobj_root, "%s", cma->name); if (err) { cma_sysfs_cleanup(cma_kobj_root); return err; } } return 0; } subsys_initcall(cma_sysfs_init);