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=-10.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 EF9ACC63798 for ; Thu, 26 Nov 2020 21:02:05 +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 90C0721D7F for ; Thu, 26 Nov 2020 21:02:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uofnOXUY"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="JCkEhwv9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90C0721D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=D/g1gGiVSRKFJAQefBRph6dVaiyRbrscAzLYm0ukAkM=; b=uofnOXUY1Nqqfv44hCds1dcAV APMFsVCj8X30UW/j6S8SSWXTIjfC9EbeD2DQm91u68n7QMNA6gAVmxUSy7Uyba6EMQE3xlTfVHbhh QIbdhVEvhrBPyc8+CTQQd4kNp9nECL5n//3N/n2YXVpSw7pXoQDs3QVs5uCBlRner/0hTsTqvA7ew U6BSx6Nl05NcUslY/DDN3ZzVgyr7cV8YOR3AWI/S9Vv0WuOOSVRJK93nSRbuWmZeIWbLyWfy3F9A9 bHVVoY0JWcgn2pTVIdRvrUjmOdxSZa6unL2GbPd++VhfU9WkE87nGnig/84JP1tnGTkUwt8q6o6z5 vSs+CwGew==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiONg-0003M0-0k; Thu, 26 Nov 2020 21:00:44 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiONb-0003L1-OB for linux-arm-kernel@lists.infradead.org; Thu, 26 Nov 2020 21:00:40 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C6EB21D7F; Thu, 26 Nov 2020 21:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606424438; bh=zEVOi7I893yPLhnplfwfxDtQK4rSWfV1M9d1bLMZJXM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JCkEhwv92a1iqX9/MMixHwUFxShdcQZ4T/zfsJj4YNuOy2yVIjFyCEYXnJrBKNdVn qpE2+zGquV0HUjtk3kCU8ee5yx0JuRWSAbkajdfMiSItSe9JkVvPKRSbw33YBpPwWu VzHme35BwN8QOHPATM+QFHPyUR7GG4OJYzyAcGAw= Date: Thu, 26 Nov 2020 21:00:33 +0000 From: Will Deacon To: Mark Rutland Subject: Re: [PATCH 10/11] arm64: entry: fix NMI {user,kernel}->kernel transitions Message-ID: <20201126210033.GA19126@willie-the-truck> References: <20201126123602.23454-1-mark.rutland@arm.com> <20201126123602.23454-11-mark.rutland@arm.com> <20201126184159.GG38486@C02TD0UTHF1T.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201126184159.GG38486@C02TD0UTHF1T.local> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201126_160040_002889_9411B95D X-CRM114-Status: GOOD ( 16.62 ) 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, linux-arm-kernel@lists.infradead.org, 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 06:41:59PM +0000, Mark Rutland wrote: > 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. Cheers, I've pushed that on top. Let's see how far we get this time... Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel