Commit 9a60d7a5 authored by Hao Chen's avatar Hao Chen Committed by Cui GaoSheng
Browse files

drivers/perf: hisi: use cpuhp_state_remove_instance_nocalls() for hisi_hns3_pmu uninit process 

stable inclusion
from stable-v6.1.63
commit 4589403a343bb0c72a6faf5898386ff964d4e01a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RFL5
CVE: CVE-2023-52860

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4589403a343bb0c72a6faf5898386ff964d4e01a



--------------------------------

[ Upstream commit 50b560783f7f71790bcf70e9e9855155fb0af8c1 ]

When tearing down a 'hisi_hns3' PMU, we mistakenly run the CPU hotplug
callbacks after the device has been unregistered, leading to fireworks
when we try to execute empty function callbacks within the driver:

  | Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
  | CPU: 0 PID: 15 Comm: cpuhp/0 Tainted: G        W  O      5.12.0-rc4+ #1
  | Hardware name:  , BIOS KpxxxFPGA 1P B600 V143 04/22/2021
  | pstate: 80400009 (Nzcv daif +PAN -UAO -TCO BTYPE=--)
  | pc : perf_pmu_migrate_context+0x98/0x38c
  | lr : perf_pmu_migrate_context+0x94/0x38c
  |
  | Call trace:
  |  perf_pmu_migrate_context+0x98/0x38c
  |  hisi_hns3_pmu_offline_cpu+0x104/0x12c [hisi_hns3_pmu]

Use cpuhp_state_remove_instance_nocalls() instead of
cpuhp_state_remove_instance() so that the notifiers don't execute after
the PMU device has been unregistered.

Fixes: 66637ab1 ("drivers/perf: hisi: add driver for HNS3 PMU")
Signed-off-by: default avatarHao Chen <chenhao418@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Reviewed-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/20231019091352.998964-1-shaojijie@huawei.com


[will: Rewrote commit message]
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>

Conflicts:
	drivers/perf/hisilicon/hns3_pmu.c

Signed-off-by: default avatarCui GaoSheng <cuigaosheng1@huawei.com>
parent a2d508a1

drivers/perf/hisilicon/hns3_pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1558,7 +1558,7 @@ static int hns3_pmu_init_pmu(struct pci_dev *pdev, struct hns3_pmu *hns3_pmu) 
	ret = perf_pmu_register(&hns3_pmu->pmu, hns3_pmu->pmu.name, -1);

	if (ret) {

		pci_err(pdev, "failed to register perf PMU, ret = %d.\n", ret);

		cpuhp_state_remove_instance(hns3_pmu_online, &hns3_pmu->node);

		cpuhp_state_remove_instance_nocalls(hns3_pmu_online, &hns3_pmu->node);

	}



	return ret;
@@ -1569,7 +1569,7 @@ static void hns3_pmu_uninit_pmu(struct pci_dev *pdev) 
	struct hns3_pmu *hns3_pmu = pci_get_drvdata(pdev);



	perf_pmu_unregister(&hns3_pmu->pmu);

	cpuhp_state_remove_instance(hns3_pmu_online, &hns3_pmu->node);

	cpuhp_state_remove_instance_nocalls(hns3_pmu_online, &hns3_pmu->node);

}



static int hns3_pmu_init_dev(struct pci_dev *pdev)