From patchwork Mon Sep 18 05:10:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 141247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2441261vqi; Sun, 17 Sep 2023 22:15:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGAVBnqAAIcqC8/dOVXOmpBv6uIGUqdZHmhtemFIOgCvcyr3ltbH51TFMrrFwKGt1DkF4t X-Received: by 2002:a17:902:6b0a:b0:1c1:e5f7:a743 with SMTP id o10-20020a1709026b0a00b001c1e5f7a743mr6657036plk.55.1695014112970; Sun, 17 Sep 2023 22:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695014112; cv=none; d=google.com; s=arc-20160816; b=xaiAxDYV9MA6ZyM1w1Ox+nM9mvVVQeZqfDyl3hL1JQ+yanqj3tURi7VKJQITZX8e7Z 8+/iCby6kTkCbchq7WBs1qqWvgYpiWOwAnCwcG03ki1EzjDMUqoIE+1FQh9u9Mqbh/b1 zWgqDQxyROlh8mVbAew3T6AF5KkoWhnvx1nINxj2xyUGapEYEEsfec58/R5dW7a8mxkg 5vEH+AiIQ5bWaqGHNP19GifhoilDdaP5IHIuWDftnQt8Rogvqh4FIsteoeTRkfH6AHri ezag4NqxZ6vtTFi4sn5E9uJPn2ag5qTA+FkOHgwleLJtwEbtstZnyx7RPiOW1sU3vL6+ as7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=+/CYCX9ULxLJESJb0b+bDfwDJuFBVwmRb7urQTLFm4o=; fh=aYKvMLxVtMOnlqtnIoYpQJlk5qPVDBrvQNBY4G56YZA=; b=BA1Tfw9aIaiKa639sowghN3qECi2WS00H0tJJCFibDGP7G68JIicwQbLgXQHS59ZWv UNBhCWCh7Z8SQqOHdhfreiTp5hIhmLIXhbudQf70fy0sV9nSAtFviSLzWgp5+2ahSM6f cZZ38h6cEgdMWmtbKP2/5LSqhfiNWSEIZYiMqFf048YCuU6RKpQiORNc0g16xAgXkFkM ISjLDbYs5G5biAepUptupZikBcus6Jrym8hvLk5mpqgVTtJZRMkMEsR+oJtv6oTbuCWz k65mfvAYz5I6mF4uBL0pnpHQzXDKcATuNIt9tZUkWzh4OCiAaiB4jAZBwIYkg8bQWYdI cABw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id f18-20020a170902ce9200b001bbd0358ef7si7760764plg.518.2023.09.17.22.15.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 22:15:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 8BA4280C4781; Sun, 17 Sep 2023 22:12:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239586AbjIRFMN (ORCPT + 28 others); Mon, 18 Sep 2023 01:12:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236741AbjIRFMB (ORCPT ); Mon, 18 Sep 2023 01:12:01 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F69610F; Sun, 17 Sep 2023 22:11:53 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Rpt8V55WCztRn7; Mon, 18 Sep 2023 13:07:38 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Mon, 18 Sep 2023 13:11:50 +0800 From: Jinjie Ruan To: , , , , , , , , CC: Subject: [PATCH RESEND 1/2] mm/damon/core-test: Fix memory leak in damon_new_region() Date: Mon, 18 Sep 2023 13:10:43 +0800 Message-ID: <20230918051044.3814018-2-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230918051044.3814018-1-ruanjinjie@huawei.com> References: <20230918051044.3814018-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 17 Sep 2023 22:12:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777351118645546410 X-GMAIL-MSGID: 1777351118645546410 The damon_region which is allocated by kmem_cache_alloc() in damon_new_region() in damon_test_regions() and damon_test_update_monitoring_result() are not freed and it causes below memory leak. So use damon_free_region() to free it. unreferenced object 0xffff2b49c3edc000 (size 56): comm "kunit_try_catch", pid 338, jiffies 4294895280 (age 557.084s) hex dump (first 32 bytes): 01 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 49 2b ff ff ............I+.. backtrace: [<0000000088e71769>] slab_post_alloc_hook+0xb8/0x368 [<00000000b528f67c>] kmem_cache_alloc+0x168/0x284 [<000000008603f022>] damon_new_region+0x28/0x54 [<00000000a3b8c64e>] damon_test_regions+0x38/0x270 [<00000000559c4801>] kunit_try_run_case+0x50/0xac [<000000003932ed49>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<000000003c3e9211>] kthread+0x124/0x130 [<0000000028f85bdd>] ret_from_fork+0x10/0x20 unreferenced object 0xffff2b49c5b20000 (size 56): comm "kunit_try_catch", pid 354, jiffies 4294895304 (age 556.988s) hex dump (first 32 bytes): 03 00 00 00 00 00 00 00 07 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 96 00 00 00 49 2b ff ff ............I+.. backtrace: [<0000000088e71769>] slab_post_alloc_hook+0xb8/0x368 [<00000000b528f67c>] kmem_cache_alloc+0x168/0x284 [<000000008603f022>] damon_new_region+0x28/0x54 [<00000000ca019f80>] damon_test_update_monitoring_result+0x18/0x34 [<00000000559c4801>] kunit_try_run_case+0x50/0xac [<000000003932ed49>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<000000003c3e9211>] kthread+0x124/0x130 [<0000000028f85bdd>] ret_from_fork+0x10/0x20 Fixes: 17ccae8bb5c9 ("mm/damon: add kunit tests") Fixes: f4c978b6594b ("mm/damon/core-test: add a test for damon_update_monitoring_results()") Signed-off-by: Jinjie Ruan --- mm/damon/core-test.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/damon/core-test.h b/mm/damon/core-test.h index 6cc8b245586d..255f8c925c00 100644 --- a/mm/damon/core-test.h +++ b/mm/damon/core-test.h @@ -34,6 +34,7 @@ static void damon_test_regions(struct kunit *test) KUNIT_EXPECT_EQ(test, 0u, damon_nr_regions(t)); damon_free_target(t); + damon_free_region(r); } static unsigned int nr_damon_targets(struct damon_ctx *ctx) @@ -316,6 +317,8 @@ static void damon_test_update_monitoring_result(struct kunit *test) damon_update_monitoring_result(r, &old_attrs, &new_attrs); KUNIT_EXPECT_EQ(test, r->nr_accesses, 150); KUNIT_EXPECT_EQ(test, r->age, 20); + + damon_free_region(r); } static void damon_test_set_attrs(struct kunit *test) From patchwork Mon Sep 18 05:10:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 141248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2441660vqi; Sun, 17 Sep 2023 22:16:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQj6KpQeZ7S1KfoO44pbDbK+AC5Lu7d1piI76GgHFKk9j/5VDs8WU5aulpAVfr8ACawlVV X-Received: by 2002:a17:903:25d4:b0:1c4:4251:68b3 with SMTP id jc20-20020a17090325d400b001c4425168b3mr7469548plb.54.1695014190042; Sun, 17 Sep 2023 22:16:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695014190; cv=none; d=google.com; s=arc-20160816; b=UlHTq1MX91ADlQiT+snlLGvF8CLp4AO1PGo+iJ96owt2/2GunuyoFFAG5f13h1iZ+Z Z3i0hAfVxnI7nBd6BZg6gAo9ElBow1qCoBxiaTjKewD3M5gQGCEMwwr5eVOpgveWU4IU F93HWKjFyKFyi4cxbsqZ1CThu/7MT0UEeuB508zDGBSzbTC8UPqd9n1afH/sGmDWHFMp kP48RQy30s4RRS+ySe8qx6C1hULRSGiDPni8amnck0zGCsB93od4Gy+QvhVlwm2dDpir OdN54Bk1sTCc9QCXxQzKhDUid+pFzRRFOhdwbkRsddKwyQhMHPXNWDSiLv1dG9/nPN9F 1NYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=9ZaTUvZE/pjQ4z9Ivg9EXH3zCdyFK6qIfvk9hks0kD0=; fh=aYKvMLxVtMOnlqtnIoYpQJlk5qPVDBrvQNBY4G56YZA=; b=OADxTnnMxm2dVpHY6x2rZtA3YbN4EdKhYyE729aHMbCFdu/Z9T+JZ7bFRsNQJTBYQE icztjRUvqNXaBJIAqban6/M75uARP1oudPI9s/4YzJC36giq6L7l11fBqGi07ZAq32FP Bk+YLzy0eVlSzpG9koiI6IEDZS6Xcms456nVMttoAxQRLa0V1XaaS5BdOefHUCBnF+0R 7C9pQfPpNkGpS35OpU7MfrNyQIGbDY10qGu5BJ4wmAyyt+AnkxBQY3a5IpdgR2koAut0 4buvWxiWXeMnXV1LSaldt0gTeUx2Uwpp0D+8XJOZTR1HMh3zo1NGQkGNVUrcNNmTPUuV sXhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x7-20020a170902a38700b001bc63c38e17si3823147pla.244.2023.09.17.22.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 22:16:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D6FF580775BF; Sun, 17 Sep 2023 22:12:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239574AbjIRFML (ORCPT + 28 others); Mon, 18 Sep 2023 01:12:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236439AbjIRFL7 (ORCPT ); Mon, 18 Sep 2023 01:11:59 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04BE711C; Sun, 17 Sep 2023 22:11:54 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4RptC05lLcz15NQX; Mon, 18 Sep 2023 13:09:48 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Mon, 18 Sep 2023 13:11:51 +0800 From: Jinjie Ruan To: , , , , , , , , CC: Subject: [PATCH RESEND 2/2] mm/damon/core-test: Fix memory leak in damon_new_ctx() Date: Mon, 18 Sep 2023 13:10:44 +0800 Message-ID: <20230918051044.3814018-3-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230918051044.3814018-1-ruanjinjie@huawei.com> References: <20230918051044.3814018-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 17 Sep 2023 22:12:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777351199298826904 X-GMAIL-MSGID: 1777351199298826904 The damon_ctx which is allocated by kzalloc() in damon_new_ctx() in damon_test_ops_registration() and damon_test_set_attrs() are not freed and it causes below memory leak. So use damon_destroy_ctx() to free it. unreferenced object 0xffff2b49c6968800 (size 512): comm "kunit_try_catch", pid 350, jiffies 4294895294 (age 557.028s) hex dump (first 32 bytes): 88 13 00 00 00 00 00 00 a0 86 01 00 00 00 00 00 ................ 00 87 93 03 00 00 00 00 0a 00 00 00 00 00 00 00 ................ backtrace: [<0000000088e71769>] slab_post_alloc_hook+0xb8/0x368 [<0000000073acab3b>] __kmem_cache_alloc_node+0x174/0x290 [<00000000b5f89cef>] kmalloc_trace+0x40/0x164 [<00000000eb19e83f>] damon_new_ctx+0x28/0xb4 [<00000000daf6227b>] damon_test_ops_registration+0x34/0x328 [<00000000559c4801>] kunit_try_run_case+0x50/0xac [<000000003932ed49>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<000000003c3e9211>] kthread+0x124/0x130 [<0000000028f85bdd>] ret_from_fork+0x10/0x20 unreferenced object 0xffff2b49c1a9cc00 (size 512): comm "kunit_try_catch", pid 356, jiffies 4294895306 (age 557.000s) hex dump (first 32 bytes): 88 13 00 00 00 00 00 00 a0 86 01 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 0a 00 00 00 00 00 00 00 ................ backtrace: [<0000000088e71769>] slab_post_alloc_hook+0xb8/0x368 [<0000000073acab3b>] __kmem_cache_alloc_node+0x174/0x290 [<00000000b5f89cef>] kmalloc_trace+0x40/0x164 [<00000000eb19e83f>] damon_new_ctx+0x28/0xb4 [<00000000058495c4>] damon_test_set_attrs+0x30/0x1a8 [<00000000559c4801>] kunit_try_run_case+0x50/0xac [<000000003932ed49>] kunit_generic_run_threadfn_adapter+0x20/0x2c [<000000003c3e9211>] kthread+0x124/0x130 [<0000000028f85bdd>] ret_from_fork+0x10/0x20 Fixes: d1836a3b2a9a ("mm/damon/core-test: initialise context before test in damon_test_set_attrs()") Fixes: 4f540f5ab4f2 ("mm/damon/core-test: add a kunit test case for ops registration") Signed-off-by: Jinjie Ruan Reviewed-by: Feng Tang --- mm/damon/core-test.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/damon/core-test.h b/mm/damon/core-test.h index 255f8c925c00..ce86ed30fb47 100644 --- a/mm/damon/core-test.h +++ b/mm/damon/core-test.h @@ -266,6 +266,8 @@ static void damon_test_ops_registration(struct kunit *test) /* Check double-registration failure again */ KUNIT_EXPECT_EQ(test, damon_register_ops(&ops), -EINVAL); + + damon_destroy_ctx(c); } static void damon_test_set_regions(struct kunit *test) @@ -342,6 +344,8 @@ static void damon_test_set_attrs(struct kunit *test) invalid_attrs = valid_attrs; invalid_attrs.aggr_interval = 4999; KUNIT_EXPECT_EQ(test, damon_set_attrs(c, &invalid_attrs), -EINVAL); + + damon_destroy_ctx(c); } static void damos_test_new_filter(struct kunit *test)