From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Rutland Subject: Re: [PATCHv2 0/6] efi: detect erroneous firmware IRQ manipulation Date: Mon, 25 Apr 2016 12:04:55 +0100 Message-ID: <20160425110455.GF25087@leverpostej> References: <1461333083-15529-1-git-send-email-mark.rutland@arm.com> <20160424212241.GO2829@codeblueprint.co.uk> <20160425101527.GP2829@codeblueprint.co.uk> <20160425102821.GQ2829@codeblueprint.co.uk> <20160425104009.GD25087@leverpostej> <20160425105153.GR2829@codeblueprint.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20160425105153.GR2829-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Matt Fleming Cc: Ard Biesheuvel , Laszlo Ersek , "linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Catalin Marinas , "hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org" , Leif Lindholm , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , Russell King - ARM Linux , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org" , "tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org" , Will Deacon List-Id: linux-efi@vger.kernel.org On Mon, Apr 25, 2016 at 11:51:53AM +0100, Matt Fleming wrote: > On Mon, 25 Apr, at 11:40:09AM, Mark Rutland wrote: > > > > It looks like irqs_disabled_flags() will do what you expect, and ignore > > everything but the interrupt flag. > > > > However, for ARM that will ignore the other exceptions we've seen FW > > erroneously unmask (e.g. FIQ), which is unfortunate, as fiddling with > > those is just as disastrous. > > Bah, right. > > > Would you be happy with an arch_efi_call_check_flags(before, after), > > instead? That way we can make the flags we check arch-specific. > > Could we just make the flag mask arch-specific instead of the call > since the rest of efi_call_virt_check_flags() is good? Yup, I meant that arch_efi_call_check_flags would only do the flag comparison, only replacing the bit currently in the WARN_ON_ONCE(). > Something like this (uncompiled, untested, half-baked), > > --- > > diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c > index c38b1cfc26e2..057d00bee7d6 100644 > --- a/drivers/firmware/efi/runtime-wrappers.c > +++ b/drivers/firmware/efi/runtime-wrappers.c > @@ -25,9 +25,12 @@ > static void efi_call_virt_check_flags(unsigned long flags, const char *call) > { > unsigned long cur_flags; > + bool mismatch; > > local_save_flags(cur_flags); > - if (!WARN_ON_ONCE(cur_flags != flags)) > + > + mismatch = (cur_flags ^ flags) & ARCH_EFI_IRQ_FLAGS_MASK; > + if (!WARN_ON_ONCE(mismatch)) > return; This style also works for me. Should I respin patch 6 as a series doing the above? I assume that the first 5 patches are fine as-is. Thanks, Mark.