Commit 2e76a06b authored by Junhao He's avatar Junhao He
Browse files

coresight: trbe: Fix TRBE potential sleep in atomic context 

mainline inclusion
from mainline-v6.5-rc1
commit c0a232f1
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8BC14
CVE: NA

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



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

smp_call_function_single() will allocate an IPI interrupt vector to
the target processor and send a function call request to the interrupt
vector. After the target processor receives the IPI interrupt, it will
execute arm_trbe_remove_coresight_cpu() call request in the interrupt
handler.

According to the device_unregister() stack information, if other process
is useing the device, the down_write() may sleep, and trigger deadlocks
or unexpected errors.

  arm_trbe_remove_coresight_cpu
    coresight_unregister
      device_unregister
        device_del
          kobject_del
            __kobject_del
              sysfs_remove_dir
                kernfs_remove
                  down_write ---------> it may sleep

Add a helper arm_trbe_disable_cpu() to disable TRBE precpu irq and reset
per TRBE.
Simply call arm_trbe_remove_coresight_cpu() directly without useing the
smp_call_function_single(), which is the same as registering the TRBE
coresight device.

Fixes: 3fbf7f01 ("coresight: sink: Add TRBE driver")
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
Link: https://lore.kernel.org/r/20230814093813.19152-2-hejunhao3@huawei.com


[ Remove duplicate cpumask checks during removal ]
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
[ v3 - Remove the operation of assigning NULL to cpudata->drvdata ]
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20230818084052.10116-1-hejunhao3@huawei.com
parent 2cd5e70f

drivers/hwtracing/coresight/coresight-trbe.c

+15 −13
Original line number Original line Diff line number Diff line
@@ -921,6 +921,14 @@ static void arm_trbe_enable_cpu(void *info) 
	enable_percpu_irq(drvdata->irq, IRQ_TYPE_NONE);

	enable_percpu_irq(drvdata->irq, IRQ_TYPE_NONE);

}

}





static void arm_trbe_disable_cpu(void *info)

{

	struct trbe_drvdata *drvdata = info;



	disable_percpu_irq(drvdata->irq);

	trbe_reset_local();

}



static void arm_trbe_register_coresight_cpu(struct trbe_drvdata *drvdata, int cpu)

static void arm_trbe_register_coresight_cpu(struct trbe_drvdata *drvdata, int cpu)

{

{

	struct trbe_cpudata *cpudata = per_cpu_ptr(drvdata->cpudata, cpu);

	struct trbe_cpudata *cpudata = per_cpu_ptr(drvdata->cpudata, cpu);
@@ -996,18 +1004,12 @@ static void arm_trbe_probe_cpu(void *info) 
	cpumask_clear_cpu(cpu, &drvdata->supported_cpus);

	cpumask_clear_cpu(cpu, &drvdata->supported_cpus);

}

}





static void arm_trbe_remove_coresight_cpu(void *info)

static void arm_trbe_remove_coresight_cpu(struct trbe_drvdata *drvdata, int cpu)

{

{

	int cpu = smp_processor_id();

	struct trbe_drvdata *drvdata = info;

	struct trbe_cpudata *cpudata = per_cpu_ptr(drvdata->cpudata, cpu);

	struct coresight_device *trbe_csdev = coresight_get_percpu_sink(cpu);

	struct coresight_device *trbe_csdev = coresight_get_percpu_sink(cpu);





	disable_percpu_irq(drvdata->irq);

	trbe_reset_local();

	if (trbe_csdev) {

	if (trbe_csdev) {

		coresight_unregister(trbe_csdev);

		coresight_unregister(trbe_csdev);

		cpudata->drvdata = NULL;

		coresight_set_percpu_sink(cpu, NULL);

		coresight_set_percpu_sink(cpu, NULL);

	}

	}

}

}
@@ -1036,8 +1038,10 @@ static int arm_trbe_remove_coresight(struct trbe_drvdata *drvdata) 
{

{

	int cpu;

	int cpu;





	for_each_cpu(cpu, &drvdata->supported_cpus)

	for_each_cpu(cpu, &drvdata->supported_cpus) {

		smp_call_function_single(cpu, arm_trbe_remove_coresight_cpu, drvdata, 1);

		smp_call_function_single(cpu, arm_trbe_disable_cpu, drvdata, 1);

		arm_trbe_remove_coresight_cpu(drvdata, cpu);

	}

	free_percpu(drvdata->cpudata);

	free_percpu(drvdata->cpudata);

	return 0;

	return 0;

}

}
@@ -1069,10 +1073,8 @@ static int arm_trbe_cpu_teardown(unsigned int cpu, struct hlist_node *node) 
{

{

	struct trbe_drvdata *drvdata = hlist_entry_safe(node, struct trbe_drvdata, hotplug_node);

	struct trbe_drvdata *drvdata = hlist_entry_safe(node, struct trbe_drvdata, hotplug_node);





	if (cpumask_test_cpu(cpu, &drvdata->supported_cpus)) {

	if (cpumask_test_cpu(cpu, &drvdata->supported_cpus))

		disable_percpu_irq(drvdata->irq);

		arm_trbe_disable_cpu(drvdata);

		trbe_reset_local();

	}

	return 0;

	return 0;

}

}