From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 E36CBC56202 for ; Thu, 26 Nov 2020 18:43:29 +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 519CE21D1A for ; Thu, 26 Nov 2020 18:43:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Tvk90Vna" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 519CE21D1A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/gQyx1Bt9ajFgPi32ZNvjh9z6tnUU+DlYBUrrv8CYh0=; b=Tvk90Vnaf/a0EALCd96d2lWcx /pDlQUY59JNnhLyo8D7QFG/SrrLZ6iHjdzjm7X1JFvNpMKXiCjL5qz3WGEpOA1Vdl6VHWFlGSaMkA K41EGf1IAxZavefqXs45ZFx3oWZKNzYFtcgv/PXlvOgI+WksfS4OuvuOru+hBVcSc9YTzyTBK/tPi ve1IyIZKKp0GDeDfwaLl9QlQGMV8ZgsLyFecJ8tg0j5ZopXLjRmPPgA4D7GhsfxILoTPRBbKkP/Fn KiuF0gqLqZK3WtTesaP522c8Onvl6f27L6kU39hTTO8WqJKtvxn/B/x4sXZvxvzuvqJaTM749JePH 6HRqy7v2Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiMDZ-00041X-Q4; Thu, 26 Nov 2020 18:42:09 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiMDV-0003zB-IT for linux-arm-kernel@lists.infradead.org; Thu, 26 Nov 2020 18:42:07 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CE52E15EC; Thu, 26 Nov 2020 10:42:02 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.30.234]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 762313F885; Thu, 26 Nov 2020 10:42:01 -0800 (PST) Date: Thu, 26 Nov 2020 18:41:59 +0000 From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, will@kernel.org Subject: Re: [PATCH 10/11] arm64: entry: fix NMI {user,kernel}->kernel transitions Message-ID: <20201126184159.GG38486@C02TD0UTHF1T.local> References: <20201126123602.23454-1-mark.rutland@arm.com> <20201126123602.23454-11-mark.rutland@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201126123602.23454-11-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201126_134205_729229_7DC7E6CF X-CRM114-Status: GOOD ( 21.58 ) 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: elver@google.com, paulmck@kernel.org, peterz@infradead.org, catalin.marinas@arm.com, james.morse@arm.com, dvyukov@google.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Nov 26, 2020 at 12:36:01PM +0000, Mark Rutland wrote: > diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h > index d579b2e6db7a..0756191f44f6 100644 > --- a/arch/arm64/include/asm/exception.h > +++ b/arch/arm64/include/asm/exception.h > +void arm64_enter_nmi(struct pt_regs *regs); > +void arm64_exit_nmi(struct pt_regs *regs); [...] > -asmlinkage __kprobes notrace unsigned long > +asmlinkage noinstr unsigned long > __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg) > { > unsigned long ret; > > - nmi_enter(); > + arm64_enter_nmi(); > > ret = _sdei_handler(regs, arg); > > - nmi_exit(); > + arm64_exit_nmi(); > > return ret; > } Whoops; I forgot to pass the regs here. Will, could you please apply the fixup patch below? I've build+boot tested with the CKI config atop rc5, and made sure I hadn't done likewise in any of the other callers. Thanks, Mark ---->8---- >From a055c2d9e24ddb2383b930ea36dad01d5036c801 Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Thu, 26 Nov 2020 18:29:13 +0000 Subject: [PATCH] arm64: sdei: fix arm64_{enter,exit}_nmi() calls When converting __sdei_handler() to the new arm64 NMI entry/exit helpers I missed the `regs` argument, leading to a build failure when CONFIG_ARM_SDE_INTERFACE is selected. Fix this by adding the missing argument to both calls. Build a boot tested with CONFIG_ARM_SDE_INTERFACE selected. Signed-off-by: Mark Rutland Cc: Will Deacon --- arch/arm64/kernel/sdei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c index 162646f0d151..793c46d6a447 100644 --- a/arch/arm64/kernel/sdei.c +++ b/arch/arm64/kernel/sdei.c @@ -229,11 +229,11 @@ __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg) { unsigned long ret; - arm64_enter_nmi(); + arm64_enter_nmi(regs); ret = _sdei_handler(regs, arg); - arm64_exit_nmi(); + arm64_exit_nmi(regs); return ret; } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel