From nobody Thu Dec 18 16:17:46 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B5BB1F473A for ; Thu, 20 Feb 2025 12:18:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740053885; cv=none; b=nW6iWpV8cctg6juwmEzGpLGu9kPWvZ4vw7oXPX2hVsHVScBr+CWzCq2pBmPlmWqCbw/pgMBFeJ83sP6W4SLK4/6qdM37JeHezYpSKfIstNwfG0uwIHriUhnNC2qda8i9eomwRtmZhYgwjPsnWrZHCkoH6nJiSIgnP5yW0DLcDNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740053885; c=relaxed/simple; bh=eiRKbq2vepIQ7vYQL3IVoywHrok/Z1eF+aDZknLuwYw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gxYqqjEdxn4eyTuRAH12j2yTGicBVP9YQVdnHqC/N/wr6ah3KUedjwfIfVxI8Tvv0XkthhbOrXJayUD7ARhyCqUJuJwPNgsrAAurvhqL+XMGadro250l2XeFPCToU2tCOxqUOC/caIXbuEDUwclnT9l85xbmT6H2VDDjWN+8ZfA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=ERdu8Aaz; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="ERdu8Aaz" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22114b800f7so14227885ad.2 for ; Thu, 20 Feb 2025 04:18:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1740053882; x=1740658682; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=juzMyLx5J28dogWl0dvZjIex3AlV6esdHMv6/KGnTD4=; b=ERdu8Aaz8Cs+oY/RQIlihCzvuEoYxZv9bt6iCsgTeNJDoG/NnjIYcbjLH03gqRHEMX qBIJUsBFTByt4t9YLAsJMZpqqGPrnYu7VoVuLArYwrpge3rLCLDbQsCXONsZa+5CxUJB xM87rNW3ic/bPrRhh+ijjHfDhFJxRQKZf2gVxOQsjxxu4/RS12V+HALJGsMCbs8OVev/ ViG4KFB9W3K3GVgXOtnyFsq2wFPptIW6oA1vznISbM6u5IKq4PkGrjuBjkLYsHf5VyjC 6RFkX8WmZk3jcwCvytULZnlv2l1JFjHyoW8ScPTKsVNxyNrADSdpjQ0OVK2g1krBoR3y P8eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740053882; x=1740658682; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=juzMyLx5J28dogWl0dvZjIex3AlV6esdHMv6/KGnTD4=; b=iTzNTJQbRjSeRHH+vwaQBGER77ghM2Vn7icemSkLsdlj7cdAX/9QvEgb9vNyzTIVUO 7BoGNYci0n5KEt6+O04ryOdwxTbKAi1dHVhjlysY39AcC5GiKubxEGuCb7Aqwke9B/sI /IuXe3/SYV3J7YUjBUS4IfobhV5KYwMjg5yE3PgdMf01xWQDylZF+s3wxpWyw5L4qwmv IW4hd0Sl8Sj39fvqzcInPas1ADtZp5r6Prs5wR7cnviTw16RmXE5m3e4sRQxa4fzIQR2 Nc5EoXS/hJAohKcmfguEvVHK/TVYyun6iQ9qXb4BNLnj2MYaAceSdzg6tQkUX41rTYqt mYYg== X-Forwarded-Encrypted: i=1; AJvYcCWtl7IrWxPDWg/TTu/kvtDT3o32utxPCwdpje2mr/rHnfsuNgLOzjzPeQV+v9z3+84oQM4pg+szVey6k1I=@vger.kernel.org X-Gm-Message-State: AOJu0Yzo5GVhVlnXZTPVwiukBGbQ/tTuM9dGTAw1SCnQYH+paV/MVNKa b07pv3KyDZV4eaZkgMhCtyNrfSEx882OqZY5vCC3QUUMAQai/oacKmDQ1J7i82WXlSEtttB2wlF xZB4= X-Gm-Gg: ASbGncsqEXJoQkfNKbf/oWw/Sk/pgChqyXmJRM2whB5uSdjPXgTe4ayTRLBjTvh+9ly t1//0ZkXurJMPfv2jamEj2jNdMWwUoeKLP4GpsNPZ5fNHnb4n899mW5oHoIf9KdEZxPkDxg7DRi xc3T4nTM03GmFgctoJ4iT+FjU6LjdMLpAgessNktECI/citbsiu+hMLlKdlhqjbrDtlRhiKli2d v639v8ClPCQvge4KSmXdZPn4tWFbYW4Y/ub8DFNSVZ3Hg01iYnh57QwtyYoWOMgCURDOc/WfFD5 D+zwjnhYAMcV/qte/FmqiWjx05Q9xRp+ZrfayEDQmNv5Gi8gXQ== X-Google-Smtp-Source: AGHT+IG9TMnvbyOkty/+IgJLUTpsHYYN+sn16XIRU1xBzk2Wl5EGIuL+mvxJhhYIG67jSv/YFg65nA== X-Received: by 2002:a17:903:2309:b0:215:7dbf:f3de with SMTP id d9443c01a7336-22170988a8cmr130641525ad.28.1740053882339; Thu, 20 Feb 2025 04:18:02 -0800 (PST) Received: from L6YN4KR4K9.bytedance.net ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-221040434d9sm87773895ad.196.2025.02.20.04.17.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 20 Feb 2025 04:18:02 -0800 (PST) From: Yunhui Cui To: xueshuai@linux.alibaba.com, renyu.zj@linux.alibaba.com, will@kernel.org, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yunhui Cui Subject: [PATCH v4 1/2] perf/dwc_pcie: fix some unreleased resources Date: Thu, 20 Feb 2025 20:17:15 +0800 Message-Id: <20250220121716.50324-2-cuiyunhui@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20250220121716.50324-1-cuiyunhui@bytedance.com> References: <20250220121716.50324-1-cuiyunhui@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Release leaked resources, such as plat_dev and dev_info. Signed-off-by: Yunhui Cui Reviewed-by: Shuai Xue --- drivers/perf/dwc_pcie_pmu.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c index cccecae9823f..19fa2ba8dd67 100644 --- a/drivers/perf/dwc_pcie_pmu.c +++ b/drivers/perf/dwc_pcie_pmu.c @@ -572,8 +572,10 @@ static int dwc_pcie_register_dev(struct pci_dev *pdev) return PTR_ERR(plat_dev); =20 dev_info =3D kzalloc(sizeof(*dev_info), GFP_KERNEL); - if (!dev_info) + if (!dev_info) { + platform_device_unregister(plat_dev); return -ENOMEM; + } =20 /* Cache platform device to handle pci device hotplug */ dev_info->plat_dev =3D plat_dev; @@ -730,6 +732,15 @@ static struct platform_driver dwc_pcie_pmu_driver =3D { .driver =3D {.name =3D "dwc_pcie_pmu",}, }; =20 +static void dwc_pcie_cleanup_devices(void) +{ + struct dwc_pcie_dev_info *dev_info, *tmp; + + list_for_each_entry_safe(dev_info, tmp, &dwc_pcie_dev_info_head, dev_node= ) { + dwc_pcie_unregister_dev(dev_info); + } +} + static int __init dwc_pcie_pmu_init(void) { struct pci_dev *pdev =3D NULL; @@ -742,7 +753,7 @@ static int __init dwc_pcie_pmu_init(void) ret =3D dwc_pcie_register_dev(pdev); if (ret) { pci_dev_put(pdev); - return ret; + goto err_cleanup; } } =20 @@ -751,35 +762,35 @@ static int __init dwc_pcie_pmu_init(void) dwc_pcie_pmu_online_cpu, dwc_pcie_pmu_offline_cpu); if (ret < 0) - return ret; + goto err_cleanup; =20 dwc_pcie_pmu_hp_state =3D ret; =20 ret =3D platform_driver_register(&dwc_pcie_pmu_driver); if (ret) - goto platform_driver_register_err; + goto err_remove_cpuhp; =20 ret =3D bus_register_notifier(&pci_bus_type, &dwc_pcie_pmu_nb); if (ret) - goto platform_driver_register_err; + goto err_unregister_driver; notify =3D true; =20 return 0; =20 -platform_driver_register_err: +err_unregister_driver: + platform_driver_unregister(&dwc_pcie_pmu_driver); +err_remove_cpuhp: cpuhp_remove_multi_state(dwc_pcie_pmu_hp_state); - +err_cleanup: + dwc_pcie_cleanup_devices(); return ret; } =20 static void __exit dwc_pcie_pmu_exit(void) { - struct dwc_pcie_dev_info *dev_info, *tmp; - if (notify) bus_unregister_notifier(&pci_bus_type, &dwc_pcie_pmu_nb); - list_for_each_entry_safe(dev_info, tmp, &dwc_pcie_dev_info_head, dev_node) - dwc_pcie_unregister_dev(dev_info); + dwc_pcie_cleanup_devices(); platform_driver_unregister(&dwc_pcie_pmu_driver); cpuhp_remove_multi_state(dwc_pcie_pmu_hp_state); } --=20 2.39.2 From nobody Thu Dec 18 16:17:46 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CCB01F63EA for ; Thu, 20 Feb 2025 12:18:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740053888; cv=none; b=E5R2QtyZzmg8Z9hliYsL3FIPzCr9vVg7+dTe05XhJU4upBsNc2y99WBPBDWhRQoD4A2WmrvLHfA21AS0XuAZ7m1buUaPNOdEiO/BK7RNlaDziag7sGbbLIU8jdRXUVoApLLVXFGev8yPbkgHkNlf0IiA1yMpAhb9oMaEB5353aw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740053888; c=relaxed/simple; bh=jt77Qfc0tJ/LeMuqZA50hbOhf9DkLh5GwSGqF+4J7yQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lPy2q71o65N4hxVzyFBoqrQ1NxZHBO/oaDeVJ0t6Gex+f3h1osV3+2jAscS2wUCxMRhUAh7IoxsMTYwFaMMHtZbgHf4J3LuMpSeMtU7vN6lu+WcmgNaHptNZYYR3mygznTbiEGorvecjXgqtM0go4FqbI05V42pBlb8qBSjzvpw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=cWs7iRrC; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="cWs7iRrC" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-220c4159f87so10860595ad.0 for ; Thu, 20 Feb 2025 04:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1740053886; x=1740658686; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WQ9El+/rlrHE/18GReAOzP2LKSCPW/1amedPa/4BiFI=; b=cWs7iRrCW9ljX/xxQlG8km3uyTE1cMP9vfV3ZECtNKjoYOUL5MtkZPxwZMI6NJUIIj KTYH6f1Kv8XvwyBjfBEGIsZdavhkYR1Kmu5EUkqIEjQUEUD+j/PJOchW+bK0mAShk3ds aLhzvz/ctMaVDXG7WHJK4ZI3Wo+dtN5HeYbjl8b/pKGJz+wDsUj/CO4csnOFg/Kg26AO 6xpTpyYY5B77suICiRuJ+9sZyJqkXlEExOkeJyZFCyYV/gKl9V2PK5oJ/806dGKuiaS5 d5Al0HBIGRTpw2g/vpNIXs0Yi1fz0oZxKnwa6rxpenHIkNOJhH/aWrEN1btiLLGi/Zns Ig1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740053886; x=1740658686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WQ9El+/rlrHE/18GReAOzP2LKSCPW/1amedPa/4BiFI=; b=HNjDPPG/IM9dFuxFLB/6D0a8dupKYkxrSqNBexlwG9U8iC7Yy3KkyejQck+7gexWiU qKR+docFc5DTM/N6NRblDQYB12Sn3CAivKtBq7rJuFt2wW3Qz7reb+3wa8Me73eEJSnY 8BDlyvm1wPc3x+u4gCa7spLBaCvfEEg8IwuGFoL/7tuk0bQ0tWi3nA4Hta399xNXZqgX QJVhj08QMzb6b4su0sa0aeWwt9j65qQQS+u0rTCt7uqTD7s3M0L+ZCbYuVwoBKwjTkfh iZGNg+1LkE6GoSuPvq+iLQIrnjaqGPDrNARaYcLArEQUufkDgUSCMzlVrxz57+Svkg1j zXaA== X-Forwarded-Encrypted: i=1; AJvYcCWjZiCVmtOMZ7YJldid3jAC9kV1RGqjdB+XxhjOk4GQtTgYzlkvU5AxXjvVg4/s8DjQXdtmV4qEgZZnRoA=@vger.kernel.org X-Gm-Message-State: AOJu0YxlP5mcfyLJn+COCkleGajhIPV08bh3xkTlB7iqPxi0uvu3r0K2 2L4m9viyHW/+WK5be4xfoG0KQd48k9+bA3WaZGNgN4671q6ckDwpjsbD56pUVh8= X-Gm-Gg: ASbGncvFEI9dBeUJgoHHjJVdGlqc5MQPHxnkiJs+82a6t7jZLJOgnbvDNoCc+gPf6Fo gzksladGIAfxyK5UdCoPnPWBKtbokQO5bZrTYjP4QZX1cZDC62+ea8+SO6RX4Bsw58JNq4gUh2o OZFgwFfvt2fz/uu44oeb0792G/kRtLiKpB/6icNVfWVurXg/bl3IyQeTozm/bZFZBTgjzOOZu7k l16PRNR4r4h1PDRkteV8eVJIBu+8gJExbEra+6BQGIcHzj/dMRYt6bhHRD9xJzqXA/K22VSRGG8 KiTGMJ6U/VesP3OTQa0IRAcb/fsOndlOVeiuUyRpOQMiFypSyQ== X-Google-Smtp-Source: AGHT+IF5DERZr4x7+rVPDYf+5pG+kTBcq8I+/piPH2yH0muu1OSon/ojTej4ajQeJjQ1xdnMPN+njQ== X-Received: by 2002:a17:902:f789:b0:21f:61a9:be7d with SMTP id d9443c01a7336-221040d75abmr368001905ad.49.1740053886409; Thu, 20 Feb 2025 04:18:06 -0800 (PST) Received: from L6YN4KR4K9.bytedance.net ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-221040434d9sm87773895ad.196.2025.02.20.04.18.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 20 Feb 2025 04:18:06 -0800 (PST) From: Yunhui Cui To: xueshuai@linux.alibaba.com, renyu.zj@linux.alibaba.com, will@kernel.org, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yunhui Cui Subject: [PATCH v4 2/2] perf/dwc_pcie: fix duplicate pci_dev devices Date: Thu, 20 Feb 2025 20:17:16 +0800 Message-Id: <20250220121716.50324-3-cuiyunhui@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20250220121716.50324-1-cuiyunhui@bytedance.com> References: <20250220121716.50324-1-cuiyunhui@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" During platform_device_register, wrongly using struct device pci_dev as platform_data caused a kmemdup copy of pci_dev. Worse still, accessing the duplicated device leads to list corruption as its mutex content (e.g., list, magic) remains the same as the original. Signed-off-by: Yunhui Cui Reviewed-by: Shuai Xue --- drivers/perf/dwc_pcie_pmu.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c index 19fa2ba8dd67..f851e070760c 100644 --- a/drivers/perf/dwc_pcie_pmu.c +++ b/drivers/perf/dwc_pcie_pmu.c @@ -565,9 +565,7 @@ static int dwc_pcie_register_dev(struct pci_dev *pdev) u32 sbdf; =20 sbdf =3D (pci_domain_nr(pdev->bus) << 16) | PCI_DEVID(pdev->bus->number, = pdev->devfn); - plat_dev =3D platform_device_register_data(NULL, "dwc_pcie_pmu", sbdf, - pdev, sizeof(*pdev)); - + plat_dev =3D platform_device_register_simple("dwc_pcie_pmu", sbdf, NULL, = 0); if (IS_ERR(plat_dev)) return PTR_ERR(plat_dev); =20 @@ -616,18 +614,26 @@ static struct notifier_block dwc_pcie_pmu_nb =3D { =20 static int dwc_pcie_pmu_probe(struct platform_device *plat_dev) { - struct pci_dev *pdev =3D plat_dev->dev.platform_data; + struct pci_dev *pdev; struct dwc_pcie_pmu *pcie_pmu; char *name; u32 sbdf; u16 vsec; int ret; =20 + sbdf =3D plat_dev->id; + pdev =3D pci_get_domain_bus_and_slot(sbdf >> 16, PCI_BUS_NUM(sbdf & 0xfff= f), + sbdf & 0xff); + if (!pdev) { + pr_err("No pdev found for the sbdf 0x%x\n", sbdf); + return -ENODEV; + } + vsec =3D dwc_pcie_des_cap(pdev); if (!vsec) return -ENODEV; =20 - sbdf =3D plat_dev->id; + pci_dev_put(pdev); name =3D devm_kasprintf(&plat_dev->dev, GFP_KERNEL, "dwc_rootport_%x", sb= df); if (!name) return -ENOMEM; @@ -642,7 +648,7 @@ static int dwc_pcie_pmu_probe(struct platform_device *p= lat_dev) pcie_pmu->on_cpu =3D -1; pcie_pmu->pmu =3D (struct pmu){ .name =3D name, - .parent =3D &pdev->dev, + .parent =3D &plat_dev->dev, .module =3D THIS_MODULE, .attr_groups =3D dwc_pcie_attr_groups, .capabilities =3D PERF_PMU_CAP_NO_EXCLUDE, --=20 2.39.2