From patchwork Sat Aug 12 08:49:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 134846 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1610305vqi; Sat, 12 Aug 2023 02:23:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHoCf9WRP5do3JzJIXyJoj8kO8hEKhRiNl1IK4dfod8PwwJZ+vJRa5uq5HHoxaTIYtWP/b0 X-Received: by 2002:aa7:c695:0:b0:523:4b9d:a80f with SMTP id n21-20020aa7c695000000b005234b9da80fmr3278040edq.15.1691832216792; Sat, 12 Aug 2023 02:23:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691832216; cv=none; d=google.com; s=arc-20160816; b=q58LR0EXqWw8KUVQFjLPc+H/I7RUL0Zfo/qTtpBe4nyEgP6CIV0DhrFFj0fGQdUd1I EhwucTfVRy7WRJKA1BphMSthuPKqX6vuKhNxKWR0rHUApvhrm450BOP7gfdSA69rU17r dx4mBHwo5efEzkvkWVGOHbqp7/5/hzV3zx5YFM+2rchsks2bb/fyMx8aJaMRXON41hLy QlW1od+isBPu38ZAoI4zov28TJjjAw//MAq8jyqQmeKqRQ1ZVhRc57NNw28F9qEZpOr2 7Ui07elFfq/7Fe32eyRhuwovyxxKped4detaF/9Exu0yzSAmXNyfSoD6NwTOjU2t6gLM MSnQ== 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=fjyk1dDB1vhlay9Gbq2Ed2kiTxQMPSYFDY+F3mjOTEI=; fh=yJzUIAXk3G9GFZhd7AEi53Yh6JaeRXiXWLsFmPRnLKo=; b=unumLRgBCeRCuuRoTNpOxXxPO4dqMYQ73C3SHWlGJQ0xWxQIwneYF5iNdfEbPEIFzX S2ywD9YhqzXBkiDwprgrBLq6WYU7fhw9/iGQYN9P90Q7h0LrpzlZjr/2HP+V6lWbJvbz qnulNiZ43hKyW9aXAuU0DBIuITAGOlUSF0QOoNWcQHtYdtNV2llqNbEmFCO91gVFlbEk 8ULz6kVeDUYLTDzv2OpBVXyPBsYhFTWjtZWzrVi99JMaY0tGd3g/M0uJOd4tlJcwew3q 3NkkaAhDWJY/NzEpBDoe7iFUrnCxYad7Fhs4ity22qg3nAsW4kU6yM2viXr9VY2+OnlM gF7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j22-20020aa7c416000000b0051de2e74786si4425396edq.266.2023.08.12.02.23.13; Sat, 12 Aug 2023 02:23:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236939AbjHLIwp (ORCPT + 99 others); Sat, 12 Aug 2023 04:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236086AbjHLIwD (ORCPT ); Sat, 12 Aug 2023 04:52:03 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 038072696; Sat, 12 Aug 2023 01:52:05 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RNDpP21LFztRQh; Sat, 12 Aug 2023 16:48:29 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Sat, 12 Aug 2023 16:52:00 +0800 From: Yang Jihong To: , , , , , , , , , , , , , CC: Subject: [RFC v1 01/16] perf kwork: Fix incorrect and missing free atom in work_push_atom() Date: Sat, 12 Aug 2023 08:49:02 +0000 Message-ID: <20230812084917.169338-2-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20230812084917.169338-1-yangjihong1@huawei.com> References: <20230812084917.169338-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774014658723725621 X-GMAIL-MSGID: 1774014658723725621 1. Atoms are managed in page mode and should be released using atom_free() instead of free(). 2. When the event does not match, the atom needs to free. Fixes: f98919ec4fcc ("perf kwork: Implement 'report' subcommand") Signed-off-by: Yang Jihong --- tools/perf/builtin-kwork.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index 14bf7a8429e7..73b5dc099a8a 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -406,12 +406,14 @@ static int work_push_atom(struct perf_kwork *kwork, work = work_findnew(&class->work_root, &key, &kwork->cmp_id); if (work == NULL) { - free(atom); + atom_free(atom); return -1; } - if (!profile_event_match(kwork, work, sample)) + if (!profile_event_match(kwork, work, sample)) { + atom_free(atom); return 0; + } if (dst_type < KWORK_TRACE_MAX) { dst_atom = list_last_entry_or_null(&work->atom_list[dst_type],