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=-8.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 C9BB3C433C1 for ; Wed, 24 Mar 2021 05:44:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3CEAC619E1 for ; Wed, 24 Mar 2021 05:44:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3CEAC619E1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5CCE56B0285; Wed, 24 Mar 2021 01:44:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 57CEE6B0288; Wed, 24 Mar 2021 01:44:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F6A56B0289; Wed, 24 Mar 2021 01:44:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0227.hostedemail.com [216.40.44.227]) by kanga.kvack.org (Postfix) with ESMTP id 237CB6B0285 for ; Wed, 24 Mar 2021 01:44:31 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D2391A775 for ; Wed, 24 Mar 2021 05:44:30 +0000 (UTC) X-FDA: 77953677900.34.278B0A3 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf25.hostedemail.com (Postfix) with ESMTP id 5DDBB6000108 for ; Wed, 24 Mar 2021 05:44:29 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id cl21-20020a17090af695b02900c61ac0f0e9so2068510pjb.1 for ; Tue, 23 Mar 2021 22:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=vZyzdZb7zClnWDp32yie1Io/7W63y0skPKX8iMwls/I=; b=FK9lVBFUYOCv1pVKWo5qZKBE7q5MZdByu7qUuLKc+azdMNFbGKAJUs9+SM5AKQa0l4 tvePM4g+hmsChf/du3SKhKtoSnkmc+l/QklFMrrsgvx1hFPVmrE9uZ34B3yk5XWZz7Nc 7zHFXMjI79KywH+FltRITP6LxldrBo1a6WsRwiRUUvjrGGwCX45ssmmKunuiL3i6tlfL 7iskn1Z28173rlaVxT00kO/WluYYHHZgZiS0fqBKvXL7h/LhStzSwWnlPiW4hqLcGyAm 6iubQAWD8jc9WZK4Vk9CLE1iPhljsKHkIFT5kM24G4sB7CewxYIrE6d+DASSeGoZHdFO PjFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=vZyzdZb7zClnWDp32yie1Io/7W63y0skPKX8iMwls/I=; b=gIzv2aT0lYyWc30SyDgUDH2dxNQlQofA4/aaCc9xn1GFj9nhT8BFGRMjJh5qtTYR8N NEyEvizOHSEU8zTkNmbHyaA1uA9waXMVkP1bbdrwNwAN6SL93TnpsyWJv+ebya8RbGW/ xt1kx+73FETbLpV8k1Fl4mTIY57FEFvEreU0dcvnbbYECyf+qqO9r7/ZTX7/p14fPjaR xlraeGA1uY1CnkMvtlm5UTvzQhxXLIQLIQA4VVv3B/2molawsx3Zq0Ja0blRq6BMzT6B bBoNRaVUo/SnxAA5r/Mcyv3fgdhjVCRqdtt15xINmr+vh352YJ/YLDSjGzHkKWSrJvBT xnLQ== X-Gm-Message-State: AOAM532mz8PRicXeqYzvP28CVh4YBiQZpJ1ww+HQYcRPQyGTgVwq7E1Y h6qoHGZdPV1rDEpHkoby6zE= X-Google-Smtp-Source: ABdhPJyzIF43r33U3LY2waAoqsy4NnUMSYlMYaSs310IbR5TDbHauQR0UJ4Teis3BamXoBW69N579Q== X-Received: by 2002:a17:90b:3884:: with SMTP id mu4mr1722306pjb.128.1616564669395; Tue, 23 Mar 2021 22:44:29 -0700 (PDT) Received: from google.com ([2620:15c:211:201:7dfa:1e53:536:7976]) by smtp.gmail.com with ESMTPSA id d8sm1013356pfq.27.2021.03.23.22.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 22:44:28 -0700 (PDT) Date: Tue, 23 Mar 2021 22:44:26 -0700 From: Minchan Kim To: John Hubbard Cc: Andrew Morton , linux-mm , LKML , gregkh@linuxfoundation.org, surenb@google.com, joaodias@google.com, willy@infradead.org, digetx@gmail.com Subject: Re: [PATCH v6] mm: cma: support sysfs Message-ID: References: <20210324010547.4134370-1-minchan@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Stat-Signature: 18eopbbq5ap7bu97h87pez7xjngsygqw X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5DDBB6000108 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf25; identity=mailfrom; envelope-from=""; helo=mail-pj1-f48.google.com; client-ip=209.85.216.48 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616564669-419899 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 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 = kobject_create_and_add("cma", mm_kobj); > > > > + if (!cma_kobj_root) > > > > + return -ENOMEM; > > > > + > > > > + for (i = 0; i < cma_area_count; i++) { > > > > + int err; > > > > + struct cma *cma; > > > > + struct cma_kobject *cma_kobj; > > > > + > > > > + cma_kobj = 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. Oh, I misunderstood that destroying of root kobject will release children recursively. Seems not true. Go back to old version. index 16c81c9cb9b7..418951a3f138 100644 --- a/mm/cma_sysfs.c +++ b/mm/cma_sysfs.c @@ -80,20 +80,19 @@ static struct kobj_type cma_ktype = { static int __init cma_sysfs_init(void) { unsigned int i; + int err; + struct cma *cma; + struct cma_kobject *cma_kobj; cma_kobj_root = kobject_create_and_add("cma", mm_kobj); if (!cma_kobj_root) return -ENOMEM; for (i = 0; i < cma_area_count; i++) { - int err; - struct cma *cma; - struct cma_kobject *cma_kobj; - cma_kobj = kzalloc(sizeof(*cma_kobj), GFP_KERNEL); if (!cma_kobj) { - kobject_put(cma_kobj_root); - return -ENOMEM; + err = -ENOMEM; + goto out; } cma = &cma_areas[i]; @@ -103,11 +102,21 @@ static int __init cma_sysfs_init(void) cma_kobj_root, "%s", cma->name); if (err) { kobject_put(&cma_kobj->kobj); - kobject_put(cma_kobj_root); - return err; + goto out; } } return 0; +out: + while (--i >= 0) { + cma = &cma_areas[i]; + + kobject_put(&cma->kobj->kobj); + kfree(cma->kobj); + cma->kobj = NULL; + } + kobject_put(cma_kobj_root); + + return err; } subsys_initcall(cma_sysfs_init);