From patchwork Tue Oct 24 09:29:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 157353 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1822838vqx; Tue, 24 Oct 2023 02:36:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHddqWmuvzG69/zmir9mBQJRYB4m2YISjeSuPgD4IQfUF6/8h4hvuYqKZnnSVpalpARYm/J X-Received: by 2002:a05:6a21:1a3:b0:17b:7505:8ab7 with SMTP id le35-20020a056a2101a300b0017b75058ab7mr2524416pzb.46.1698140193662; Tue, 24 Oct 2023 02:36:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698140193; cv=none; d=google.com; s=arc-20160816; b=Ho2JtC6Zc/5G9Xyi47elEN1zzGyvKq7PV7y85TA210wyp6/VLu/OIEsUUgwQgqXneO dHbyG/wCjYXq5cF/adhTYggYRiQqVSFNd+q3LQBCfsJxDHEy/U7PAF/kioIRWgy74QXy LpKVsBqgmHlC3gFrIW/Tzn/msPHLmB1Uk1rM+ci8oIukQRmj4Tn+dLsI3LPA5e32QkKo n8doLJV+kc2BEwUhVxO6SqzUq5zH1WI5c8yGiyp/SUdz5USy/Xplm0GRIBKIo0W3eFyD 3LtgzSdQW/BGujGCC0bqz/7SRqfo4gf9nGAP9lEG05AtBc40yQvwpNPI4T0n095Ipkmn KIlg== 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=58ItZ5bXyT51YCTOKKvDTbjy/J9Udtxs7bJsfjoQs08=; fh=xoaP1/qmyEPzq9R51vMaZS6yh5pwCixcbcGH9XObUYE=; b=kl73CH0XMco8JcQ0RJI1bj1ujaiQ1/207EeOkSY3NCeN/k2bJvW4vjrGVf+UXBnqjc 2IP36nAn+M91w3Vp1jDFokX+H64tTo/UhoeO8OFM1L508Y4+qc+FzupDzt4G7uKgcPxe j2+f7FmXk98DHU4Vd8TOwPGCj7A62ZaTElgodZd5c+orj+WQgr8AEQUE4xy5JHHL8Cqb 8ZZy6pQYYFCyz3SEA17OoEjvlw6tRKrjZiPfn3GokbyfMwVzn1IsPswBs4vq1XVNdyly NJajcFY1pWFa+zO/uywJhMmO0AZTlrCie98mGwVbjzAm0hbtc9zFksKyfLLyGvQJAgb8 UJAA== 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:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id z10-20020aa79f8a000000b006b798c24276si8044881pfr.348.2023.10.24.02.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 02:36:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id A1880804C4B5; Tue, 24 Oct 2023 02:36:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234006AbjJXJec (ORCPT + 26 others); Tue, 24 Oct 2023 05:34:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234199AbjJXJdt (ORCPT ); Tue, 24 Oct 2023 05:33:49 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62DE610C2 for ; Tue, 24 Oct 2023 02:32:56 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SF6FH6z43zNpKL; Tue, 24 Oct 2023 17:28:51 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 24 Oct 2023 17:32:54 +0800 From: Yicong Yang To: , , , , CC: , , , Subject: [PATCH 2/2] drivers/perf: hisi_pcie: Initialize event->cpu only on success Date: Tue, 24 Oct 2023 17:29:54 +0800 Message-ID: <20231024092954.42297-3-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20231024092954.42297-1-yangyicong@huawei.com> References: <20231024092954.42297-1-yangyicong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500009.china.huawei.com (7.192.105.203) 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 pete.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 (pete.vger.email [0.0.0.0]); Tue, 24 Oct 2023 02:36:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780629051815471895 X-GMAIL-MSGID: 1780629051815471895 From: Yicong Yang Initialize the event->cpu only on success. To be more reasonable and keep consistent with other PMUs. Signed-off-by: Yicong Yang --- drivers/perf/hisilicon/hisi_pcie_pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c index 051efffc44c8..b90ba8aca3fa 100644 --- a/drivers/perf/hisilicon/hisi_pcie_pmu.c +++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c @@ -357,8 +357,6 @@ static int hisi_pcie_pmu_event_init(struct perf_event *event) if (event->attr.type != event->pmu->type) return -ENOENT; - event->cpu = pcie_pmu->on_cpu; - if (EXT_COUNTER_IS_USED(hisi_pcie_get_event(event))) hwc->event_base = HISI_PCIE_EXT_CNT; else @@ -374,6 +372,8 @@ static int hisi_pcie_pmu_event_init(struct perf_event *event) if (!hisi_pcie_pmu_validate_event_group(event)) return -EINVAL; + event->cpu = pcie_pmu->on_cpu; + return 0; }