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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=unavailable 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 2946BC38A24 for ; Thu, 7 May 2020 09:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5365207DD for ; Thu, 7 May 2020 09:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588842753; bh=WN/1Sfxv+V0tvhxdgTlgCeCg1I6pk09fr+Q2outjLYM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=SNy8bKJTMlOfd/2jqgsArm7bupvaN7MKDb1iH9zFkp41ABSUX/f772X4Lhu781Hh1 N9GNmjqzbvUslFHoodXCBFbpffVxdpA4/LuFQUQctMes6z8ejMn4Y4fbPWIqwLuVX0 5uIxGS3s6D5Aer2EpX4VRMYeUiTvlIChjMtiJcwc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726408AbgEGJMb (ORCPT ); Thu, 7 May 2020 05:12:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:33498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725848AbgEGJMa (ORCPT ); Thu, 7 May 2020 05:12:30 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (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 3690D2075E; Thu, 7 May 2020 09:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588842749; bh=WN/1Sfxv+V0tvhxdgTlgCeCg1I6pk09fr+Q2outjLYM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=xEn4xIitw6ljx3iphcAnTBS31J7adH7kGvMPZJBOtI/6et/4t8DGm63fxk7kQrs7q UuGTT3EctUZW7OUyCjY0UECsdWn69vdO5YuMqKC6pIEWJ3dOlSyvWnwFKg2J1Mq3Fm whXDqqPBteH4/ScOh7LlQImwViU5JqS+qqE1CHUM= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jWcZu-00ACrT-U4; Thu, 07 May 2020 10:12:27 +0100 Date: Thu, 7 May 2020 10:12:24 +0100 From: Marc Zyngier To: Will Deacon Cc: Luke Nelson , bpf@vger.kernel.org, Luke Nelson , Xi Wang , Catalin Marinas , Daniel Borkmann , Alexei Starovoitov , Zi Shen Lim , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , Mark Rutland , Greg Kroah-Hartman , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, clang-built-linux@googlegroups.com Subject: Re: [RFC PATCH bpf-next 1/3] arm64: insn: Fix two bugs in encoding 32-bit logical immediates Message-ID: <20200507101224.33a44d71@why> In-Reply-To: <20200507082934.GA28215@willie-the-truck> References: <20200507010504.26352-1-luke.r.nels@gmail.com> <20200507010504.26352-2-luke.r.nels@gmail.com> <20200507082934.GA28215@willie-the-truck> Organization: Approximate X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: will@kernel.org, lukenels@cs.washington.edu, bpf@vger.kernel.org, luke.r.nels@gmail.com, xi.wang@gmail.com, catalin.marinas@arm.com, daniel@iogearbox.net, ast@kernel.org, zlim.lnx@gmail.com, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, andriin@fb.com, john.fastabend@gmail.com, kpsingh@chromium.org, mark.rutland@arm.com, gregkh@linuxfoundation.org, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, clang-built-linux@googlegroups.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 7 May 2020 09:29:35 +0100 Will Deacon wrote: Hi Will, > Hi Luke, > > Thanks for the patches. > > On Wed, May 06, 2020 at 06:05:01PM -0700, Luke Nelson wrote: > > This patch fixes two issues present in the current function for encoding > > arm64 logical immediates when using the 32-bit variants of instructions. > > > > First, the code does not correctly reject an all-ones 32-bit immediate > > and returns an undefined instruction encoding, which can crash the kernel. > > The fix is to add a check for this case. > > > > Second, the code incorrectly rejects some 32-bit immediates that are > > actually encodable as logical immediates. The root cause is that the code > > uses a default mask of 64-bit all-ones, even for 32-bit immediates. This > > causes an issue later on when the mask is used to fill the top bits of > > the immediate with ones, shown here: > > > > /* > > * Pattern: 0..01..10..01..1 > > * > > * Fill the unused top bits with ones, and check if > > * the result is a valid immediate (all ones with a > > * contiguous ranges of zeroes). > > */ > > imm |= ~mask; > > if (!range_of_ones(~imm)) > > return AARCH64_BREAK_FAULT; > > > > To see the problem, consider an immediate of the form 0..01..10..01..1, > > where the upper 32 bits are zero, such as 0x80000001. The code checks > > if ~(imm | ~mask) contains a range of ones: the incorrect mask yields > > 1..10..01..10..0, which fails the check; the correct mask yields > > 0..01..10..0, which succeeds. > > > > The fix is to use a 32-bit all-ones default mask for 32-bit immediates. > > > > Currently, the only user of this function is in > > arch/arm64/kvm/va_layout.c, which uses 64-bit immediates and won't > > trigger these bugs. > > Ah, so this isn't a fix or a bpf patch ;) > > I can queue it via arm64 for 5.8, along with the bpf patches since there > are some other small changes pending in the arm64 bpf backend for BTI. > > > We tested the new code against llvm-mc with all 1,302 encodable 32-bit > > logical immediates and all 5,334 encodable 64-bit logical immediates. > > > > Fixes: ef3935eeebff ("arm64: insn: Add encoder for bitwise operations using literals") > > Co-developed-by: Xi Wang > > Signed-off-by: Xi Wang > > Signed-off-by: Luke Nelson > > --- > > arch/arm64/kernel/insn.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c > > index 4a9e773a177f..42fad79546bb 100644 > > --- a/arch/arm64/kernel/insn.c > > +++ b/arch/arm64/kernel/insn.c > > @@ -1535,7 +1535,7 @@ static u32 aarch64_encode_immediate(u64 imm, > > u32 insn) > > { > > unsigned int immr, imms, n, ones, ror, esz, tmp; > > - u64 mask = ~0UL; > > + u64 mask; > > > > /* Can't encode full zeroes or full ones */ > > if (!imm || !~imm) > > It's a bit grotty spreading the checks out now. How about we tweak things > slightly along the lines of: > > > diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c > index 4a9e773a177f..60ec788eaf33 100644 > --- a/arch/arm64/kernel/insn.c > +++ b/arch/arm64/kernel/insn.c > @@ -1535,16 +1535,10 @@ static u32 aarch64_encode_immediate(u64 imm, > u32 insn) > { > unsigned int immr, imms, n, ones, ror, esz, tmp; > - u64 mask = ~0UL; > - > - /* Can't encode full zeroes or full ones */ > - if (!imm || !~imm) > - return AARCH64_BREAK_FAULT; > + u64 mask; > > switch (variant) { > case AARCH64_INSN_VARIANT_32BIT: > - if (upper_32_bits(imm)) > - return AARCH64_BREAK_FAULT; > esz = 32; > break; > case AARCH64_INSN_VARIANT_64BIT: > @@ -1556,6 +1550,12 @@ static u32 aarch64_encode_immediate(u64 imm, > return AARCH64_BREAK_FAULT; > } > > + mask = GENMASK(esz - 1, 0); > + > + /* Can't encode full zeroes or full ones */ ... nor a value wider than the mask. > + if (imm & ~mask || !imm || imm == mask) > + return AARCH64_BREAK_FAULT; > + > /* > * Inverse of Replicate(). Try to spot a repeating pattern > * with a pow2 stride. > > > What do you think? I'd be pretty happy with that. Reviewed-by: Marc Zyngier Thanks, M. -- Jazz is not dead. It just smells funny...