From patchwork Tue Apr 4 13:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 79123 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3043484vqo; Tue, 4 Apr 2023 06:49:45 -0700 (PDT) X-Google-Smtp-Source: AKy350ZhPllLw2o4/BU8dS/5BlsmlUQ/8YzyjiHeW6A6i3H8kKu0j5zGVa4PWgbRzAq7+1chLju0 X-Received: by 2002:a05:6a20:811a:b0:d6:8c70:85ce with SMTP id g26-20020a056a20811a00b000d68c7085cemr2054542pza.54.1680616185379; Tue, 04 Apr 2023 06:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680616185; cv=none; d=google.com; s=arc-20160816; b=LwX//aEJH7DYe2/kyLv9RivG+jtyqjwEU32etTK0mrBA48TJej8sYlqG1nm1PJH0eN 4E6hsQDgQNpKFvznmdaqxZsVNgYJ9MTj/ba7SqwexzbPLhE04k1pZO0wWwOnIBiEIfWX PMjxOoGKPkTVxBRd+oz/KnnCjw2qsOF4wqWmYF+P9FUYqUNnbiFfQVf79nHDGeKUTlRS i32X2210Sg9YTu3JFBwPWJyYzliKRoxQYBm8X7zQKL7DcW/Qy0wmMCbwpO7c1QqYxSwd q4h8Mz8Y0+druPX5IhrtWTdPdGEvWEszMH1uOKZRgDA+/6UGcCpMlF0dzbDL340U3Q+k OVPg== 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=vR7Tj4itEEj3R0vhbfH04WfsZVqbNRf/z0F4kcZjGAA=; b=vVCiecuv69cJM9Rnivdwo+Wx0EulN4dndNdU9f8nRPrSjHMBHp7Kw1g4o0Mc4aquWl ic/Q7ekH8wEBi7YRVqPgCB6H118c+kaRwByV6oLFzG5RaTs+XwxVdneysVt6Wzf6l9fP OUiLMbjIrZFo4j1ayUgRKRLkm5mOw5/P/zZ1VeUYmMd5+46Lg4Mds28fKuzbj59O1H6C 0Z6prqd+5nbSzW6gSe9xBX0rV8stGqqZR3ylkpm3szg7VVxQtiJKHl3OfbYE/h5VjPIW zBlCBL+9CjDhe55O4u7vXS4xYaB1rhNBCb2Ja3aXpG+f2PERqN+Az/pEMdTKT67YQ4gY hEzA== 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 y190-20020a638ac7000000b00503a029385asi11029181pgd.849.2023.04.04.06.49.30; Tue, 04 Apr 2023 06:49:45 -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 S235174AbjDDNmx (ORCPT + 99 others); Tue, 4 Apr 2023 09:42:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234493AbjDDNmv (ORCPT ); Tue, 4 Apr 2023 09:42:51 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C11C186; Tue, 4 Apr 2023 06:42:49 -0700 (PDT) Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4PrTT50JLsz67ZTx; Tue, 4 Apr 2023 21:42:01 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 4 Apr 2023 14:42:46 +0100 From: Jonathan Cameron To: Mark Rutland , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Will Deacon , , , CC: , Dan Williams , Shaokun Zhang , Yicong Yang , Jiucheng Xu , Khuong Dinh , Robert Richter , Atish Patra , Anup Patel , Andy Gross , Bjorn Andersson , Frank Li , Shuai Xue , Vineet Gupta , Shawn Guo , Fenghua Yu , Dave Jiang , Wu Hao , Tom Rix , , Suzuki K Poulose , Liang Kan Subject: [PATCH 01/32] perf: Allow a PMU to have a parent Date: Tue, 4 Apr 2023 14:41:54 +0100 Message-ID: <20230404134225.13408-2-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230404134225.13408-1-Jonathan.Cameron@huawei.com> References: <20230404134225.13408-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.122.247.231] X-ClientProxiedBy: lhrpeml500004.china.huawei.com (7.191.163.9) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762253797286323690?= X-GMAIL-MSGID: =?utf-8?q?1762253797286323690?= Some PMUs have well defined parents such as PCI devices. As the device_initialize() and device_add() are all within pmu_dev_alloc() which is called from perf_pmu_register() there is no opportunity to set the parent from within a driver. Add a struct device *parent field to struct pmu and use that to set the parent. Signed-off-by: Jonathan Cameron Reviewed-by: Dan Williams Reviewed-by: Greg Kroah-Hartman --- Previously posted in CPMU series hence the change log. v3: No change --- include/linux/perf_event.h | 1 + kernel/events/core.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index d5628a7b5eaa..b99db1eda72c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -303,6 +303,7 @@ struct pmu { struct module *module; struct device *dev; + struct device *parent; const struct attribute_group **attr_groups; const struct attribute_group **attr_update; const char *name; diff --git a/kernel/events/core.c b/kernel/events/core.c index fb3e436bcd4a..a84c282221f2 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11367,6 +11367,7 @@ static int pmu_dev_alloc(struct pmu *pmu) dev_set_drvdata(pmu->dev, pmu); pmu->dev->bus = &pmu_bus; + pmu->dev->parent = pmu->parent; pmu->dev->release = pmu_dev_release; ret = dev_set_name(pmu->dev, "%s", pmu->name);