From patchwork Wed Jul 19 07:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 122448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2283349vqt; Wed, 19 Jul 2023 01:22:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlGv4q1ryA2xJMJys+afRjPB1CfVmueE73tQfX8sfVMhlgNIGqSJMXmGmL3/4vaQXu9Yvazq X-Received: by 2002:a2e:701a:0:b0:2b6:9ab8:9031 with SMTP id l26-20020a2e701a000000b002b69ab89031mr1247667ljc.16.1689754920003; Wed, 19 Jul 2023 01:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754919; cv=none; d=google.com; s=arc-20160816; b=mJw3sfW5yVHjLJPK2qBcKxi22DJ2iemNkXd2gSgVzIwTlkyJitzl8XXyfRbqtVoikq r/vp+V/ZgAeHDUMcMTCb+FF3KlM19jm+EkKuDeB8JMiHRPwZB5DkR6F5jJFNGab0h0jK ja1niWdrd2vOWscg7GKVJhKSEFIN/Jh2XwWxMFJXq4FtidUFVoipI4c0MhB+JQWaGB5j fSoXVTJIblMaCVmKru4ayB7jlqSGpLKjaHZZptw9vx+vo+wbY6113LgDPJKh1uI3utUp zwfzEYFbLwM5uoGlNL1igarvrit7Z0KvJyL4y1M89QfPwTvqA7dFbyaBRipRz7FXJgdF VXsQ== 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=5cWrWwlManqrudfdOvGGdBUURxPlu26h088SbWtIKGE=; fh=N4J70hJn8skiBpfYtsw9ilEiGztepr9OGmrCWjv2bPM=; b=l4UFD/hNVqcOCahGoSx70dxbOZRe+iobUusqdcUrMuDyHHrJLKZ9St4qQOjujdQS99 KIB5qaJJL26afTOKebmMqxSJnTb8el2ZKzHOZiTDZZttKPbHs+LgsvUWB3SiTJ+AE4Kn lSjDihplu4ulcCfHfI9k7I6CXwU1jfFZCnUU+csDcsUa9xBmLgIzYk9LtZA4SYm/XG4k PICCjQ6bPb3KuxBXJYs6iWrtXTnDiYUZmBj5eBtQNfdlP67Ig2w43vgsGw3QSu3kwyrC AE7nzyYcjJ9zTXusj6NarwQjHQzZcl/oU1p6tCBXGQPzXGcoliiJixlwQiphddWDdtkg V8qw== 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 rh7-20020a17090720e700b00987b0a5f325si2407784ejb.1043.2023.07.19.01.21.36; Wed, 19 Jul 2023 01:21:59 -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 S229673AbjGSHkU (ORCPT + 99 others); Wed, 19 Jul 2023 03:40:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229618AbjGSHkI (ORCPT ); Wed, 19 Jul 2023 03:40:08 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0CED1FC4; Wed, 19 Jul 2023 00:40:06 -0700 (PDT) Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4R5SPj4kq2z18Lgs; Wed, 19 Jul 2023 15:39:21 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 19 Jul 2023 15:40:04 +0800 From: Kefeng Wang To: Andrew Morton CC: , , , , , , , Kefeng Wang , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH v2 4/4] perf/core: use vma_is_initial_stack() and vma_is_initial_heap() Date: Wed, 19 Jul 2023 15:51:14 +0800 Message-ID: <20230719075127.47736-5-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719075127.47736-1-wangkefeng.wang@huawei.com> References: <20230719075127.47736-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500001.china.huawei.com (7.185.36.107) 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,T_SCC_BODY_TEXT_LINE 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: 1771836455165306288 X-GMAIL-MSGID: 1771836455165306288 Use the helpers to simplify code, also kill unneeded goto cpy_name. Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Signed-off-by: Kefeng Wang Reviewed-by: David Hildenbrand --- kernel/events/core.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 78ae7b6f90fd..d59f6327472f 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8685,22 +8685,14 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) } name = (char *)arch_vma_name(vma); - if (name) - goto cpy_name; - - if (vma->vm_start <= vma->vm_mm->start_brk && - vma->vm_end >= vma->vm_mm->brk) { - name = "[heap]"; - goto cpy_name; + if (!name) { + if (vma_is_initial_heap(vma)) + name = "[heap]"; + else if (vma_is_initial_stack(vma)) + name = "[stack]"; + else + name = "//anon"; } - if (vma->vm_start <= vma->vm_mm->start_stack && - vma->vm_end >= vma->vm_mm->start_stack) { - name = "[stack]"; - goto cpy_name; - } - - name = "//anon"; - goto cpy_name; } cpy_name: