From patchwork Wed Nov 4 08:05:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuichi Ito X-Patchwork-Id: 11879805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8636C2D0A3 for ; Wed, 4 Nov 2020 08:12:22 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 64BA922384 for ; Wed, 4 Nov 2020 08:12:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="y6GeZbqN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64BA922384 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fujitsu.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KHdkrFT82sSLIpLFV+nAJymwN46bO2G1XZUq833d7wM=; b=y6GeZbqN72MF+mzxx6POEuJmV n9c9QY0raXC7rEEdPHCMO/SRZxR3AkyOhSkCARavdzDQ99k/DIRzr64JyeH1c1wa448C72CDCFS5f 1+BloTKl7bvGUh5j3pfU6+BpSJoHFJXMGlVzmLgYS/e+ZjmJ8liKxk2wbGMPrcJ5XJxPcNEqbHz2t KsQGdlWOyBgEkTurT+5/HvsCB1VJqknIYMSsfK41Vu4xerZQJswQhHkU0DV6Ltsghcf24vRZQnASv Pe02l0TYNnkuGJrtiHSkxwVGUmJETT1oIwPK8kE/Oc6dobiRDMhuWiY0bwxgZmJK+smsxVBYXtgBk jHVB+eH9Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaDsj-0005BL-T4; Wed, 04 Nov 2020 08:11:01 +0000 Received: from esa1.hc1455-7.c3s2.iphmx.com ([207.54.90.47]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaDsU-00056e-Bz for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2020 08:10:47 +0000 IronPort-SDR: dU/2ChNZxKftcYHMutp0fqd/dLVMcyiNaoD36s63otR97q1fE0LyoEZQNBP2ibAKDLkBfnKVOT yss/7RJ6vlH8eha71k5tsGXF8E3HHI2BbKpd+GF4AZ5/tEhf++PmPh0uY1zxsaxbZA9VoDJXru RnXua0hddHC3II3zetybRFe4Hep/WclG6mmbEsVsEmhna/xayoUrcD6SzYuG3mY5tUdB92kt+h ft/yPDS8DqKYdcHyud/THnKazwQuzvv3hCvhQHhpSp8O53eAfsay5pFrIwiejqg8Y9oqhwxF67 J+Q= X-IronPort-AV: E=McAfee;i="6000,8403,9794"; a="2258695" X-IronPort-AV: E=Sophos;i="5.77,450,1596466800"; d="scan'208";a="2258695" Received: from unknown (HELO yto-r4.gw.nic.fujitsu.com) ([218.44.52.220]) by esa1.hc1455-7.c3s2.iphmx.com with ESMTP; 04 Nov 2020 17:10:43 +0900 Received: from yt-mxq.gw.nic.fujitsu.com (unknown [192.168.83.47]) by yto-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id 9D3E821EC03 for ; Wed, 4 Nov 2020 17:10:41 +0900 (JST) Received: from pumpkin.openstacklocal (pumpkin.fct.css.fujitsu.com [10.130.70.189]) by yt-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id 9AAC0AC005E for ; Wed, 4 Nov 2020 17:10:40 +0900 (JST) Received: by pumpkin.openstacklocal (Postfix, from userid 1016) id 3E7DDB9A9; Wed, 4 Nov 2020 17:08:02 +0900 (JST) From: Yuichi Ito To: maz@kernel.org, sumit.garg@linaro.org, tglx@linutronix.de, jason@lakedaemon.net, catalin.marinas@arm.com, will@kernel.org Subject: [PATCH v2 2/3] arm64: smp: Register IPI_CPU_CRASH_STOP IPI as pseudo-NMI Date: Wed, 4 Nov 2020 17:05:38 +0900 Message-Id: <20201104080539.3205889-3-ito-yuichi@fujitsu.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104080539.3205889-1-ito-yuichi@fujitsu.com> References: <20201104080539.3205889-1-ito-yuichi@fujitsu.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_031046_683926_C7CA2C78 X-CRM114-Status: GOOD ( 14.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yuichi Ito , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Register IPI_CPU_CRASH_STOP IPI as pseudo-NMI. For systems that do not support pseudo-NMI, register as a normal IRQ. Signed-off-by: Yuichi Ito --- arch/arm64/kernel/smp.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 82e75fc..fd59bc7 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -80,6 +80,8 @@ enum ipi_msg_type { static int ipi_irq_base __read_mostly; static int nr_ipi __read_mostly = NR_IPI; static struct irq_desc *ipi_desc[NR_IPI] __read_mostly; +static int ipi_crash_stop = -1; +static int ipi_crash_stop_enable_nmi; static void ipi_setup(int cpu); @@ -960,8 +962,16 @@ static void ipi_setup(int cpu) if (WARN_ON_ONCE(!ipi_irq_base)) return; - for (i = 0; i < nr_ipi; i++) - enable_percpu_irq(ipi_irq_base + i, 0); + for (i = 0; i < nr_ipi; i++) { + if (ipi_irq_base + i == ipi_crash_stop) { + if (!prepare_percpu_nmi(ipi_irq_base + i)) { + enable_percpu_nmi(ipi_irq_base + i, 0); + ipi_crash_stop_enable_nmi = 1; + } else + pr_crit("CPU%u: IPI_CPU_CRASH_STOP cannot be enabled NMI.\n", cpu); + } else + enable_percpu_irq(ipi_irq_base + i, 0); + } } #ifdef CONFIG_HOTPLUG_CPU @@ -972,24 +982,38 @@ static void ipi_teardown(int cpu) if (WARN_ON_ONCE(!ipi_irq_base)) return; - for (i = 0; i < nr_ipi; i++) - disable_percpu_irq(ipi_irq_base + i); + for (i = 0; i < nr_ipi; i++) { + if (ipi_irq_base + i == ipi_crash_stop) { + if (ipi_crash_stop_enable_nmi) { + disable_percpu_nmi(ipi_irq_base + i); + teardown_percpu_nmi(ipi_irq_base + i); + } + } else + disable_percpu_irq(ipi_irq_base + i); + } } #endif void __init set_smp_ipi_range(int ipi_base, int n) { - int i; + int i, ret; WARN_ON(n < NR_IPI); nr_ipi = min(n, NR_IPI); + ret = request_percpu_nmi(ipi_base + IPI_CPU_CRASH_STOP, + ipi_handler, "IPI", &cpu_number); + if (!ret) + ipi_crash_stop = ipi_base + IPI_CPU_CRASH_STOP; + for (i = 0; i < nr_ipi; i++) { int err; - err = request_percpu_irq(ipi_base + i, ipi_handler, - "IPI", &cpu_number); - WARN_ON(err); + if (ipi_base + i != ipi_crash_stop) { + err = request_percpu_irq(ipi_base + i, ipi_handler, + "IPI", &cpu_number); + WARN_ON(err); + } ipi_desc[i] = irq_to_desc(ipi_base + i); irq_set_status_flags(ipi_base + i, IRQ_HIDDEN);