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=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,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 C9DA6C433ED for ; Tue, 20 Apr 2021 10:47:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9430660C3D for ; Tue, 20 Apr 2021 10:47:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231912AbhDTKru (ORCPT ); Tue, 20 Apr 2021 06:47:50 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:51708 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231673AbhDTKrR (ORCPT ); Tue, 20 Apr 2021 06:47:17 -0400 Date: Tue, 20 Apr 2021 10:46:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618915605; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=86ocYL+cFiq2XEAwR2VApdH1KWaxEoRJ6aYjoKjFXog=; b=gBcUhqmCti5/5S6QYaNEzT2fQ7luR692EJkX6qwHngRY5NITBKk9UG7xb+AHdfINWnRejl 4yZnKmgRRatODK+jCLrRIx6xI7EkVjN7RUp127Wj1AEgDZPGzoL3MbJimcTlSBLkiKrlTY Dq0lG96oeh9SQ4z3QszyQfzsZ6bIVVnOMeoKuT3J2q9vRXMKMcMutJVKLNcNj5dYleseQ0 LJ2Gi9lg0wr1Jo2khjdrnlDefM8Cbnxp2pCy7GQi2TG4t3IB8+SwZzik562hyJlbhpk+ll f8XsAcXDUBn/TjnMFyP9RQeKA/Nt2Dy5c1IuFSpmBOsFpO4OM0B0xrVbg+/NcQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618915605; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=86ocYL+cFiq2XEAwR2VApdH1KWaxEoRJ6aYjoKjFXog=; b=qduRoQGtYRwa3Dooh9S3qEaA8mHkxcYUpD0YzkcSMvKGkkwFuydMS/MHLVzSAETKNRFd2D t/LgquX8XdjSy3Bg== From: "tip-bot2 for Kan Liang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/x86: Remove temporary pmu assignment in event_init Cc: Kan Liang , "Peter Zijlstra (Intel)" , Andi Kleen , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1618237865-33448-15-git-send-email-kan.liang@linux.intel.com> References: <1618237865-33448-15-git-send-email-kan.liang@linux.intel.com> MIME-Version: 1.0 Message-ID: <161891560505.29796.6034093386968004555.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: b98567298bad891774054113690b30bd90d5738d Gitweb: https://git.kernel.org/tip/b98567298bad891774054113690b30bd90d5738d Author: Kan Liang AuthorDate: Mon, 12 Apr 2021 07:30:54 -07:00 Committer: Peter Zijlstra CommitterDate: Mon, 19 Apr 2021 20:03:27 +02:00 perf/x86: Remove temporary pmu assignment in event_init The temporary pmu assignment in event_init is unnecessary. The assignment was introduced by commit 8113070d6639 ("perf_events: Add fast-path to the rescheduling code"). At that time, event->pmu is not assigned yet when initializing an event. The assignment is required. However, from commit 7e5b2a01d2ca ("perf: provide PMU when initing events"), the event->pmu is provided before event_init is invoked. The temporary pmu assignment in event_init should be removed. Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Andi Kleen Link: https://lkml.kernel.org/r/1618237865-33448-15-git-send-email-kan.liang@linux.intel.com --- arch/x86/events/core.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 57d3fe1..ed8dcfb 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2291,7 +2291,6 @@ out: static int x86_pmu_event_init(struct perf_event *event) { - struct pmu *tmp; int err; switch (event->attr.type) { @@ -2306,20 +2305,10 @@ static int x86_pmu_event_init(struct perf_event *event) err = __x86_pmu_event_init(event); if (!err) { - /* - * we temporarily connect event to its pmu - * such that validate_group() can classify - * it as an x86 event using is_x86_event() - */ - tmp = event->pmu; - event->pmu = &pmu; - if (event->group_leader != event) err = validate_group(event); else err = validate_event(event); - - event->pmu = tmp; } if (err) { if (event->destroy)