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 82C24C282C0 for ; Wed, 23 Jan 2019 06:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F56621726 for ; Wed, 23 Jan 2019 06:46:00 +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="TGHeLIVQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726867AbfAWGp7 (ORCPT ); Wed, 23 Jan 2019 01:45:59 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:45636 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726827AbfAWGp4 (ORCPT ); Wed, 23 Jan 2019 01:45:56 -0500 Received: by mail-qt1-f193.google.com with SMTP id e5so1173438qtr.12 for ; Tue, 22 Jan 2019 22:45:55 -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=TGHeLIVQLM79Z9JrSMW/+t6LU+dukqdRQ/zJUXUg/epc27m6r43hkqWl+waDbfTDSe FYxf/Cchj40Wywu6Iphd/E1wBDQl1Mw9sQMiD7ERDBpdTnbhjbjSvxiW/eDNaxhBqLxG GyjpcJwN3axv8d6NGe5QdzYi1cyDGfxtPLNW9/5WanAyyNVOpqETGgN9qGLQR4nffNf4 sEfFJEBoeyftuJuCeO9uNNfiYHluLhH6bXguff1434csx+nnLLqx7eTDqKpLblH9A4PN QCD3y0SGy/U82C9T79JO3Ssslt8gbFQRcp3qpPfYD7H+YiyRiy0WMth1HokIhZkeFOfw TgNw== 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=pJNtrllHFHQ95Ub/Q1NX0F0fVGSA1MRASBbcosC4Bl2kguCWuhIogXqNGwVS2QrHtu w+UgUgvRMXdU7JRJFGvsetX/zNLZjKotu1/JRs87xwG90DTO8FQGXkNjF5hW5kzOs0mn 9MaKDwA9A/tACnsQ5qNkURGOslVor+rVK26ku6i1/detaSdOSQmcG8F16jllaqeaU8Hz lEdyey2lZYo1TWu0RueSal0YbBkdrq55hzYQmZJHuJLHBwPQprQaK18mboc7rUTPBTi/ yg+FO9SSN/uTqUTvgej5KIFJUlRbQ3BE7fI9DeVs0ccivDd+TYat4WY58iRFkcnQv9MH jD0g== X-Gm-Message-State: AJcUukdHwz80hJxt+P0OGvI2S8LYDad42owCCgZYe4Oqf/OJjQc5dIXh TVi7JS6qe/LoEuX3ZHPRgh6z3g== X-Google-Smtp-Source: ALg8bN44d2bb1kSng16mlmckGRNnqtSO7K+FJelzbRFTBi8OoxkqgdQzu7kYVT7J93wsuWtGSjy8Gw== X-Received: by 2002:aed:306c:: with SMTP id 99mr982546qte.61.1548225955292; Tue, 22 Jan 2019 22:45:55 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id k6sm80589046qtk.41.2019.01.22.22.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jan 2019 22:45:54 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: yhs@fb.com, netdev@vger.kernel.org, oss-drivers@netronome.com, kafai@fb.com, Jakub Kicinski Subject: [PATCH bpf-next v5 08/12] nfp: bpf: don't use instruction number for jump target Date: Tue, 22 Jan 2019 22:45:25 -0800 Message-Id: <20190123064529.13518-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190123064529.13518-1-jakub.kicinski@netronome.com> References: <20190123064529.13518-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