{"id":834096,"url":"http://patchwork.ozlabs.org/api/1.2/patches/834096/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171103205630.1083-9-jakub.kicinski@netronome.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171103205630.1083-9-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-11-03T20:56:23","name":"[net-next,v2,08/15] nfp: bpf: remove the register renumbering leftovers","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"4f15121aff5e31c217e684615092258fb0e68223","submitter":{"id":67484,"url":"http://patchwork.ozlabs.org/api/1.2/people/67484/?format=json","name":"Jakub Kicinski","email":"jakub.kicinski@netronome.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171103205630.1083-9-jakub.kicinski@netronome.com/mbox/","series":[{"id":11839,"url":"http://patchwork.ozlabs.org/api/1.2/series/11839/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11839","date":"2017-11-03T20:56:15","name":"bpf: add offload as a first class citizen","version":2,"mbox":"http://patchwork.ozlabs.org/series/11839/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/834096/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/834096/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=netronome-com.20150623.gappssmtp.com\n\theader.i=@netronome-com.20150623.gappssmtp.com\n\theader.b=\"NXb9R9FU\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yTDmL4DNdz9s7p\n\tfor ;\n\tSat, 4 Nov 2017 07:57:22 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755398AbdKCU44 (ORCPT );\n\tFri, 3 Nov 2017 16:56:56 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:49201 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754520AbdKCU4x (ORCPT\n\t); Fri, 3 Nov 2017 16:56:53 -0400","by mail-pg0-f68.google.com with SMTP id g6so3448501pgn.6\n\tfor ; Fri, 03 Nov 2017 13:56:53 -0700 (PDT)","from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\to10sm9989029pgq.69.2017.11.03.13.56.51\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 03 Nov 2017 13:56:51 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=netronome-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=XZBLZlDpg2VU5ws1M/f2hRIZJ/EyWlPmwmw+CffksEI=;\n\tb=NXb9R9FUMk+MDPpP/bcLI1x67FyxFq2ui7dAO2jmwB3IdIOA1WmShCfFyyioCaGcnr\n\tpzzblJCqLFKxqNxdc0RLkFT09kL8l+6nyuxUIeaZAD3ECkaB0spNYGNM7w0VLp2rwKcT\n\tXM7DRuRtx5G0TbaJUdxTozhYv5t6WFUt3oFdpcNF5zUUGYHZQ6P2X753d6pUJX4aDYl3\n\ty18f70WRF/8knNAmdfwWm8ROEhDjYJeakA8pt/ElZlntwLlSERuuCfjjtHa2ph9Aym52\n\t6VuNK2HYEHRVQ0rLAOAeuI+GJt9PCienWoxRSYmJq6GK9svlYfnm3J6HzzSSG7kZFLdL\n\tMy2g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=XZBLZlDpg2VU5ws1M/f2hRIZJ/EyWlPmwmw+CffksEI=;\n\tb=LJDhsPRmS9j4/x61cyCS+qsQHhfQbXy5SOWSy0jlD+ffPL/pUov6sjW7UTGGpBhHyN\n\tOiApgxgtdsy3pmcXd05EhIpkN0YtfAEbeUMol3XN8pYj/yXtHtVcltxMcKN3b+Iz9E4h\n\t4nSh9DTxpxrI37JUAkrGYjciAK1XjrAUA9d2fPZ1I5gxQvt2VER9WmsoWDr+JnW8dsCs\n\t7YCCFdexdEyqHcIDcb23HRIv9yIJZDJv0kfmqgEn1ZTGo9oLSm4Axul5DmorTdzGNvka\n\tdrfWs0SbrJtf3NsmbcFoPAlXEf/iGaN0SRX44mNCAu7mOdHDmLX07RLJ8VirsZuSup5S\n\tDBnQ==","X-Gm-Message-State":"AMCzsaUE0+RLELgWF83S7oDPqnpZOw+Xu5guT8iMcASLQ/IxmYbTamcl\n\tYPfvJew1a9vskTyAzSIDsuf2eICH","X-Google-Smtp-Source":"ABhQp+SdY4FVisHwUnvbLfW6W+CmLiNtv6EUkq6uC6O8F/pxqIW2Z7vg+ScPsG3HZVQFkg9jL24uDg==","X-Received":"by 10.99.128.199 with SMTP id j190mr8337208pgd.145.1509742612558;\n\tFri, 03 Nov 2017 13:56:52 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, alexei.starovoitov@gmail.com,\n\tdaniel@iogearbox.net, Jakub Kicinski ","Subject":"[PATCH net-next v2 08/15] nfp: bpf: remove the register renumbering\n\tleftovers","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"},"content":"The register renumbering was removed and will not be coming back\nin its old, naive form, given that it would be fundamentally\nincompatible with calling functions. Remove the leftovers.\n\nSigned-off-by: Jakub Kicinski \nReviewed-by: Quentin Monnet \n---\n drivers/net/ethernet/netronome/nfp/bpf/jit.c | 4 ----\n drivers/net/ethernet/netronome/nfp/bpf/main.h | 6 ------\n drivers/net/ethernet/netronome/nfp/bpf/offload.c | 13 ++++---------\n 3 files changed, 4 insertions(+), 19 deletions(-)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c\nindex e1907a1d269e..ff150c27f411 100644\n--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c\n+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c\n@@ -2314,9 +2314,6 @@ nfp_bpf_jit(struct bpf_prog *filter, void *prog_mem,\n \tif (ret)\n \t\tgoto out;\n \n-\tnfp_prog->num_regs = MAX_BPF_REG;\n-\tnfp_prog->regs_per_thread = 32;\n-\n \tnfp_prog->prog = prog_mem;\n \tnfp_prog->__prog_alloc_len = prog_sz;\n \n@@ -2331,7 +2328,6 @@ nfp_bpf_jit(struct bpf_prog *filter, void *prog_mem,\n \tret = nfp_bpf_ustore_calc(nfp_prog, (__force __le64 *)prog_mem);\n \n \tres->n_instr = nfp_prog->prog_len;\n-\tres->dense_mode = false;\n out:\n \tnfp_prog_free(nfp_prog);\n \ndiff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h\nindex c5280de2ab14..85b7d9398cda 100644\n--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h\n+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h\n@@ -141,8 +141,6 @@ static inline u8 mbpf_mode(const struct nfp_insn_meta *meta)\n * @prog_len: number of valid instructions in @prog array\n * @__prog_alloc_len: alloc size of @prog array\n * @type: BPF program type\n- * @num_regs: number of registers used by this program\n- * @regs_per_thread: number of basic registers allocated per thread\n * @start_off: address of the first instruction in the memory\n * @tgt_out: jump target for normal exit\n * @tgt_abort: jump target for abort (e.g. access outside of packet buffer)\n@@ -159,9 +157,6 @@ struct nfp_prog {\n \n \tenum bpf_prog_type type;\n \n-\tunsigned int num_regs;\n-\tunsigned int regs_per_thread;\n-\n \tunsigned int start_off;\n \tunsigned int tgt_out;\n \tunsigned int tgt_abort;\n@@ -177,7 +172,6 @@ struct nfp_prog {\n \n struct nfp_bpf_result {\n \tunsigned int n_instr;\n-\tbool dense_mode;\n };\n \n int\ndiff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c\nindex b9b5d675c4d3..268ba1ba82db 100644\n--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c\n+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c\n@@ -98,19 +98,14 @@ nfp_net_bpf_offload_prepare(struct nfp_net *nn,\n static void\n nfp_net_bpf_load_and_start(struct nfp_net *nn, u32 tc_flags,\n \t\t\t void *code, dma_addr_t dma_addr,\n-\t\t\t unsigned int code_sz, unsigned int n_instr,\n-\t\t\t bool dense_mode)\n+\t\t\t unsigned int code_sz, unsigned int n_instr)\n {\n-\tu64 bpf_addr = dma_addr;\n \tint err;\n \n \tnn->dp.bpf_offload_skip_sw = !!(tc_flags & TCA_CLS_FLAGS_SKIP_SW);\n \n-\tif (dense_mode)\n-\t\tbpf_addr |= NFP_NET_CFG_BPF_CFG_8CTX;\n-\n \tnn_writew(nn, NFP_NET_CFG_BPF_SIZE, n_instr);\n-\tnn_writeq(nn, NFP_NET_CFG_BPF_ADDR, bpf_addr);\n+\tnn_writeq(nn, NFP_NET_CFG_BPF_ADDR, dma_addr);\n \n \t/* Load up the JITed code */\n \terr = nfp_net_reconfig(nn, NFP_NET_CFG_UPDATE_BPF);\n@@ -169,7 +164,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf)\n \t\tnfp_net_bpf_stop(nn);\n \t\tnfp_net_bpf_load_and_start(nn, cls_bpf->gen_flags, code,\n \t\t\t\t\t dma_addr, max_instr * sizeof(u64),\n-\t\t\t\t\t res.n_instr, res.dense_mode);\n+\t\t\t\t\t res.n_instr);\n \t\treturn 0;\n \n \tcase TC_CLSBPF_ADD:\n@@ -183,7 +178,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct tc_cls_bpf_offload *cls_bpf)\n \n \t\tnfp_net_bpf_load_and_start(nn, cls_bpf->gen_flags, code,\n \t\t\t\t\t dma_addr, max_instr * sizeof(u64),\n-\t\t\t\t\t res.n_instr, res.dense_mode);\n+\t\t\t\t\t res.n_instr);\n \t\treturn 0;\n \n \tcase TC_CLSBPF_DESTROY:\n","prefixes":["net-next","v2","08/15"]}