From patchwork Fri Nov 3 20:56:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 834096 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="NXb9R9FU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yTDmL4DNdz9s7p for ; Sat, 4 Nov 2017 07:57:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755398AbdKCU44 (ORCPT ); Fri, 3 Nov 2017 16:56:56 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:49201 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754520AbdKCU4x (ORCPT ); Fri, 3 Nov 2017 16:56:53 -0400 Received: by mail-pg0-f68.google.com with SMTP id g6so3448501pgn.6 for ; Fri, 03 Nov 2017 13:56:53 -0700 (PDT) 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; bh=XZBLZlDpg2VU5ws1M/f2hRIZJ/EyWlPmwmw+CffksEI=; b=NXb9R9FUMk+MDPpP/bcLI1x67FyxFq2ui7dAO2jmwB3IdIOA1WmShCfFyyioCaGcnr pzzblJCqLFKxqNxdc0RLkFT09kL8l+6nyuxUIeaZAD3ECkaB0spNYGNM7w0VLp2rwKcT XM7DRuRtx5G0TbaJUdxTozhYv5t6WFUt3oFdpcNF5zUUGYHZQ6P2X753d6pUJX4aDYl3 y18f70WRF/8knNAmdfwWm8ROEhDjYJeakA8pt/ElZlntwLlSERuuCfjjtHa2ph9Aym52 6VuNK2HYEHRVQ0rLAOAeuI+GJt9PCienWoxRSYmJq6GK9svlYfnm3J6HzzSSG7kZFLdL My2g== 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; bh=XZBLZlDpg2VU5ws1M/f2hRIZJ/EyWlPmwmw+CffksEI=; b=LJDhsPRmS9j4/x61cyCS+qsQHhfQbXy5SOWSy0jlD+ffPL/pUov6sjW7UTGGpBhHyN OiApgxgtdsy3pmcXd05EhIpkN0YtfAEbeUMol3XN8pYj/yXtHtVcltxMcKN3b+Iz9E4h 4nSh9DTxpxrI37JUAkrGYjciAK1XjrAUA9d2fPZ1I5gxQvt2VER9WmsoWDr+JnW8dsCs 7YCCFdexdEyqHcIDcb23HRIv9yIJZDJv0kfmqgEn1ZTGo9oLSm4Axul5DmorTdzGNvka drfWs0SbrJtf3NsmbcFoPAlXEf/iGaN0SRX44mNCAu7mOdHDmLX07RLJ8VirsZuSup5S DBnQ== X-Gm-Message-State: AMCzsaUE0+RLELgWF83S7oDPqnpZOw+Xu5guT8iMcASLQ/IxmYbTamcl YPfvJew1a9vskTyAzSIDsuf2eICH X-Google-Smtp-Source: ABhQp+SdY4FVisHwUnvbLfW6W+CmLiNtv6EUkq6uC6O8F/pxqIW2Z7vg+ScPsG3HZVQFkg9jL24uDg== X-Received: by 10.99.128.199 with SMTP id j190mr8337208pgd.145.1509742612558; Fri, 03 Nov 2017 13:56:52 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id o10sm9989029pgq.69.2017.11.03.13.56.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Nov 2017 13:56:51 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, alexei.starovoitov@gmail.com, daniel@iogearbox.net, Jakub Kicinski Subject: [PATCH net-next v2 08/15] nfp: bpf: remove the register renumbering leftovers Date: Fri, 3 Nov 2017 13:56:23 -0700 Message-Id: <20171103205630.1083-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171103205630.1083-1-jakub.kicinski@netronome.com> References: <20171103205630.1083-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The register renumbering was removed and will not be coming back in its old, naive form, given that it would be fundamentally incompatible with calling functions. Remove the leftovers. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 4 ---- drivers/net/ethernet/netronome/nfp/bpf/main.h | 6 ------ drivers/net/ethernet/netronome/nfp/bpf/offload.c | 13 ++++--------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index e1907a1d269e..ff150c27f411 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -2314,9 +2314,6 @@ nfp_bpf_jit(struct bpf_prog *filter, void *prog_mem, if (ret) goto out; - nfp_prog->num_regs = MAX_BPF_REG; - nfp_prog->regs_per_thread = 32; - nfp_prog->prog = prog_mem; nfp_prog->__prog_alloc_len = prog_sz; @@ -2331,7 +2328,6 @@ nfp_bpf_jit(struct bpf_prog *filter, void *prog_mem, ret = nfp_bpf_ustore_calc(nfp_prog, (__force __le64 *)prog_mem); res->n_instr = nfp_prog->prog_len; - res->dense_mode = false; out: nfp_prog_free(nfp_prog); diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h index c5280de2ab14..85b7d9398cda 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/main.h +++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h @@ -141,8 +141,6 @@ static inline u8 mbpf_mode(const struct nfp_insn_meta *meta) * @prog_len: number of valid instructions in @prog array * @__prog_alloc_len: alloc size of @prog array * @type: BPF program type - * @num_regs: number of registers used by this program - * @regs_per_thread: number of basic registers allocated per thread * @start_off: address of the first instruction in the memory * @tgt_out: jump target for normal exit * @tgt_abort: jump target for abort (e.g. access outside of packet buffer) @@ -159,9 +157,6 @@ struct nfp_prog { enum bpf_prog_type type; - unsigned int num_regs; - unsigned int regs_per_thread; - unsigned int start_off; unsigned int tgt_out; unsigned int tgt_abort; @@ -177,7 +172,6 @@ struct nfp_prog { struct nfp_bpf_result { unsigned int n_instr; - bool dense_mode; }; int diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c index b9b5d675c4d3..268ba1ba82db 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c @@ -98,19 +98,14 @@ nfp_net_bpf_offload_prepare(struct nfp_net *nn, static void nfp_net_bpf_load_and_start(struct nfp_net *nn, u32 tc_flags, void *code, dma_addr_t dma_addr, - unsigned int code_sz, unsigned int n_instr, - bool dense_mode) + unsigned int code_sz, unsigned int n_instr) { - u64 bpf_addr = dma_addr; int err; nn->dp.bpf_offload_skip_sw = !!(tc_flags & TCA_CLS_FLAGS_SKIP_SW); - if (dense_mode) - bpf_addr |= NFP_NET_CFG_BPF_CFG_8CTX; - nn_writew(nn, NFP_NET_CFG_BPF_SIZE, n_instr); - nn_writeq(nn, NFP_NET_CFG_BPF_ADDR, bpf_addr); + nn_writeq(nn, NFP_NET_CFG_BPF_ADDR, dma_addr); /* Load up the JITed code */ err = nfp_net_reconfig(nn, NFP_NET_CFG_UPDATE_BPF); @@ -169,7 +164,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf) nfp_net_bpf_stop(nn); nfp_net_bpf_load_and_start(nn, cls_bpf->gen_flags, code, dma_addr, max_instr * sizeof(u64), - res.n_instr, res.dense_mode); + res.n_instr); return 0; case TC_CLSBPF_ADD: @@ -183,7 +178,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf) nfp_net_bpf_load_and_start(nn, cls_bpf->gen_flags, code, dma_addr, max_instr * sizeof(u64), - res.n_instr, res.dense_mode); + res.n_instr); return 0; case TC_CLSBPF_DESTROY: