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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT 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 B9670C10F03 for ; Wed, 13 Mar 2019 19:17:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81DCE21852 for ; Wed, 13 Mar 2019 19:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504677; bh=dGThOl2T7YB5RI+20a+sddRz1f7tdgkEVFfdRwXAka8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AZYdYiHT0NqbncvAPPpAwpA8Uz1mEn/XIeKkeAXYBjb2vtNJZbAvicQ5ukhfxDNei hSQi1Wt6Dx5wxY3IBwaevM66jIXnK7h/2/ct78qB1UQiKW0Xdgh89f2wY+Q+Nj0300 ul/eIhsxgOq3S05yWSWAgOPgyU/QrtAUPGbulqgE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728973AbfCMTR4 (ORCPT ); Wed, 13 Mar 2019 15:17:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728963AbfCMTRv (ORCPT ); Wed, 13 Mar 2019 15:17:51 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 773A52171F; Wed, 13 Mar 2019 19:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504671; bh=dGThOl2T7YB5RI+20a+sddRz1f7tdgkEVFfdRwXAka8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YU5IsB6rYnYrxdAmSl6Mtihz9ezxNtyP5TGiitnik+Q/pNKxuBDCzjCmQGskEZRO9 34cgiT/O/IMbauxDgZTiLdd69KgZqjXRjD7H+wtU+D3MqVu16vIYCAmSxxvVYnth+s fNPYTOR8DKjIDpU83FjLzZNwr5wNBiFyh108TAno= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiong Wang , Daniel Borkmann , Sasha Levin , oss-drivers@netronome.com, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 21/24] nfp: bpf: fix code-gen bug on BPF_ALU | BPF_XOR | BPF_K Date: Wed, 13 Mar 2019 15:16:44 -0400 Message-Id: <20190313191647.160171-21-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191647.160171-1-sashal@kernel.org> References: <20190313191647.160171-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiong Wang [ Upstream commit 71c190249f0ced5b26377ea6bf829ab3af77a40c ] The intended optimization should be A ^ 0 = A, not A ^ -1 = A. Fixes: cd7df56ed3e6 ("nfp: add BPF to NFP code translator") Reviewed-by: Jakub Kicinski Signed-off-by: Jiong Wang Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c b/drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c index f8df5300f49c..6bfcd6eb74ca 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c @@ -1017,7 +1017,7 @@ static int xor_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) static int xor_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) { - return wrp_alu32_imm(nfp_prog, meta, ALU_OP_XOR, !~meta->insn.imm); + return wrp_alu32_imm(nfp_prog, meta, ALU_OP_XOR, !meta->insn.imm); } static int and_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) -- 2.19.1