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.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 A816BC61CE4 for ; Sat, 19 Jan 2019 18:07:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C1752084C for ; Sat, 19 Jan 2019 18:07:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="efVnJHHz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729049AbfASSH2 (ORCPT ); Sat, 19 Jan 2019 13:07:28 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:45647 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728875AbfASSHZ (ORCPT ); Sat, 19 Jan 2019 13:07:25 -0500 Received: by mail-qt1-f196.google.com with SMTP id e5so18758521qtr.12 for ; Sat, 19 Jan 2019 10:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1q4aFkUv51IkHwt4k3g17/VMVNN46EG7Z0O9ShePG0U=; b=efVnJHHz6FYVsCwETpLYZszmWsfIlBdNMIlsbGr+Z/Vgen19k36Awav49DUkCPRARD 3ARRk8Nwi+EyK8RV+t7gbjF2R7S2Q09Gd7cSKBUubFAX9Y53SzdW6lqxHnWF/5axuiEs s5V01Tm6JSXPO6szyECKEaGhlYyogjZpQCqw44PtYur5SeFVmfmRx+ow7EIvpd1wcPng qIbKFKy1A70WNfPzEeyGjQ7qpFCliHkmlDO9Gi8oddTKVJcL88s5wu70tgq+FaH3/GGU GiBE3HF97lKM4SGYClP6xGfk0wwn2bIjDZF25+vi7iru3atRIgtIniWBVx9Mvu1i6YBE YGmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1q4aFkUv51IkHwt4k3g17/VMVNN46EG7Z0O9ShePG0U=; b=BxR4lSDbVfB2C+degptmKON/eh7xIaw/I3P3ZLH6/6rU0yaTeadB2k3OgYmCl6Doq5 4/JOifbYhWoN4lyrvJ6UpJe3fZuv48yBzXwLfDBv8hWg5KJIozzLO7Ra6id+lcCLfjes PvBjV/MWZvotAl2wUlTJgQzXtr5E/qrrDVDDgpMKQj1VvP0bjOYnxiV4/XmF++zeX5ih 5Ht4icMK1lAVf3Gzd8R5G9osUDz3r8m3z9I/Y/uzv+8tftcXMe0sSbWbbVKpPFQxMr/y kzrG396TLdAPJGvjwpSWTlphKeTs9S/X2+0zf19E4iHQAc+N0LcYKd+0mRfUfIl3NaA1 GT5Q== X-Gm-Message-State: AJcUukdL8cx2qNieIZH/aj0AwUYoRAt1VPsTeEw7QXESJjcHaXA032OI qw7U6nB46WGPjWJAewRGJsBN2g== X-Google-Smtp-Source: ALg8bN7v9XE6Ru7NzVqCQ6zWL3fuoR4Jqbgde6P/15mz/tgnZ/YnQQeLv1OaNppwwBEQk7NvaDhLFg== X-Received: by 2002:ac8:7116:: with SMTP id z22mr20106406qto.377.1547921243909; Sat, 19 Jan 2019 10:07:23 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id v2sm46521518qte.75.2019.01.19.10.07.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 10:07:23 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, yhs@fb.com, Jakub Kicinski Subject: [PATCH bpf-next v5 08/12] nfp: bpf: don't use instruction number for jump target Date: Sat, 19 Jan 2019 10:06:52 -0800 Message-Id: <20190119180656.24635-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190119180656.24635-1-jakub.kicinski@netronome.com> References: <20190119180656.24635-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Instruction number is meaningless at code gen phase. The target of the instruction is overwritten by nfp_fixup_branches(). The convention is to put the raw offset in target address as a place holder. See cmp_* functions. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index e23ca90289f7..323587dee498 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -3182,7 +3182,7 @@ bpf_to_bpf_call(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) wrp_immed_relo(nfp_prog, imm_b(nfp_prog), 0, RELO_IMMED_REL); } else { ret_tgt = nfp_prog_current_offset(nfp_prog) + 2; - emit_br(nfp_prog, BR_UNC, meta->n + 1 + meta->insn.imm, 1); + emit_br(nfp_prog, BR_UNC, meta->insn.imm, 1); offset_br = nfp_prog_current_offset(nfp_prog); } wrp_immed_relo(nfp_prog, ret_reg(nfp_prog), ret_tgt, RELO_IMMED_REL); -- 2.19.2