From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937275AbdIZRI7 (ORCPT ); Tue, 26 Sep 2017 13:08:59 -0400 Received: from mail.skyhub.de ([5.9.137.197]:52118 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935589AbdIZRI6 (ORCPT ); Tue, 26 Sep 2017 13:08:58 -0400 From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH] x86/apic: Do not use smp_processor_id() in preemptible code Date: Tue, 26 Sep 2017 19:08:45 +0200 Message-Id: <20170926170845.13955-1-bp@alien8.de> X-Mailer: git-send-email 2.13.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Call stack is: check_preemption_disabled ? x2apic_prepare_cpu x2apic_dead_cpu cpuhp_invoke_callback ? cpuhp_kick_ap_work ? cpumask_next _cpu_down freeze_secondary_cpus hibernation_snapshot ... i.e., box is doing suspend-to-disk. Signed-off-by: Borislav Petkov --- arch/x86/kernel/apic/x2apic_cluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c index 3da94277140f..6050c5364bdc 100644 --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -156,7 +156,7 @@ static int x2apic_dead_cpu(unsigned int dead_cpu) { struct cluster_mask *cmsk = per_cpu(cluster_masks, dead_cpu); - cpumask_clear_cpu(smp_processor_id(), &cmsk->mask); + cpumask_clear_cpu(dead_cpu, &cmsk->mask); free_cpumask_var(per_cpu(ipi_mask, dead_cpu)); return 0; } -- 2.13.0