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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E03CAC77B78 for ; Thu, 4 May 2023 19:52:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231742AbjEDTwO (ORCPT ); Thu, 4 May 2023 15:52:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231318AbjEDTuc (ORCPT ); Thu, 4 May 2023 15:50:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC2AA9005; Thu, 4 May 2023 12:46:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 900B6637C2; Thu, 4 May 2023 19:46:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B688DC433D2; Thu, 4 May 2023 19:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229603; bh=3cm8SZFDsBnS6NwwSOzv0TR1ysXO8bAgKi0mu4OgyUw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C09sAemq0NP2bsM7Mj3E7oi82KKroOPSOyql7ycm2kn3s0/0MX/Z7GIJ/XjENxqsN htNtH9/Ve3+jigOLttWz5EdF4dXad8JiHCEfzhel5nP7L/fA8ui9WbKa0+Tmzokd1I 3WznFySC+olHbqyntL7LFdBBA0HckzgZV5cVYHpwSK/bdjN4sf1jCH3yJd58wiDucG kb/ONgaBsnbBQ6am8lHvc6dTnhCe2qzvnbP71Cc+y0JK70PC2q7xyQD5QL2a4fyKDM PztBDKCKeovGfNmkQ81n+FBBBbbrvDwga+x0lmGJm1R/TeuVUmsGhVzlBjZXewym4a XWgLU7/ikV8ZQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiaxun Yang , Daniel Borkmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Johan Almbladh , Sasha Levin , tsbogend@alpha.franken.de, ast@kernel.org, andrii@kernel.org, paulburton@kernel.org, linux-mips@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 05/49] bpf, mips: Implement DADDI workarounds for JIT Date: Thu, 4 May 2023 15:45:42 -0400 Message-Id: <20230504194626.3807438-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194626.3807438-1-sashal@kernel.org> References: <20230504194626.3807438-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiaxun Yang [ Upstream commit bbefef2f07080cd502a93cb1c529e1c8a6c4ac8e ] For DADDI errata we just workaround by disable immediate operation for BPF_ADD / BPF_SUB to avoid generation of DADDIU. All other use cases in JIT won't cause overflow thus they are all safe. Signed-off-by: Jiaxun Yang Signed-off-by: Daniel Borkmann Reviewed-by: Philippe Mathieu-Daudé Acked-by: Johan Almbladh Link: https://lore.kernel.org/bpf/20230228113305.83751-2-jiaxun.yang@flygoat.com Signed-off-by: Sasha Levin --- arch/mips/Kconfig | 1 - arch/mips/net/bpf_jit_comp.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index b26b77673c2cc..44763be3bd125 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -64,7 +64,6 @@ config MIPS select HAVE_DMA_CONTIGUOUS select HAVE_DYNAMIC_FTRACE select HAVE_EBPF_JIT if !CPU_MICROMIPS && \ - !CPU_DADDI_WORKAROUNDS && \ !CPU_R4000_WORKAROUNDS && \ !CPU_R4400_WORKAROUNDS select HAVE_EXIT_THREAD diff --git a/arch/mips/net/bpf_jit_comp.c b/arch/mips/net/bpf_jit_comp.c index b17130d510d49..a40d926b65139 100644 --- a/arch/mips/net/bpf_jit_comp.c +++ b/arch/mips/net/bpf_jit_comp.c @@ -218,9 +218,13 @@ bool valid_alu_i(u8 op, s32 imm) /* All legal eBPF values are valid */ return true; case BPF_ADD: + if (IS_ENABLED(CONFIG_CPU_DADDI_WORKAROUNDS)) + return false; /* imm must be 16 bits */ return imm >= -0x8000 && imm <= 0x7fff; case BPF_SUB: + if (IS_ENABLED(CONFIG_CPU_DADDI_WORKAROUNDS)) + return false; /* -imm must be 16 bits */ return imm >= -0x7fff && imm <= 0x8000; case BPF_AND: -- 2.39.2