{"id":818022,"url":"http://patchwork.ozlabs.org/api/patches/818022/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/e88b1cbcb0cbfb20a960c57cee3c873e3cadc4cb.1506297988.git.daniel@iogearbox.net/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":null,"date":"2017-09-25T00:25:54","name":"[net-next,5/6] bpf, nfp: add meta data support","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"cdaafad5acd059c9ab3a8d26a45c8d9d6888094a","submitter":{"id":65705,"url":"http://patchwork.ozlabs.org/api/people/65705/?format=json","name":"Daniel Borkmann","email":"daniel@iogearbox.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/e88b1cbcb0cbfb20a960c57cee3c873e3cadc4cb.1506297988.git.daniel@iogearbox.net/mbox/","series":[{"id":4860,"url":"http://patchwork.ozlabs.org/api/series/4860/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4860","date":"2017-09-25T00:25:49","name":"BPF metadata for direct access","version":1,"mbox":"http://patchwork.ozlabs.org/series/4860/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818022/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818022/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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0lKD0LRNz9s82\n\tfor ;\n\tMon, 25 Sep 2017 10:27:28 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933345AbdIYA1T (ORCPT );\n\tSun, 24 Sep 2017 20:27:19 -0400","from www62.your-server.de ([213.133.104.62]:37235 \"EHLO\n\twww62.your-server.de\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933044AbdIYA1H (ORCPT\n\t); Sun, 24 Sep 2017 20:27:07 -0400","from [85.7.161.218] (helo=localhost)\n\tby www62.your-server.de with esmtpsa\n\t(TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.85_2)\n\t(envelope-from )\n\tid 1dwHEo-0000IE-Ce; Mon, 25 Sep 2017 02:27:06 +0200"],"From":"Daniel Borkmann ","To":"davem@davemloft.net","Cc":"alexei.starovoitov@gmail.com, john.fastabend@gmail.com,\n\tpeter.waskiewicz.jr@intel.com, jakub.kicinski@netronome.com,\n\tnetdev@vger.kernel.org, Daniel Borkmann ","Subject":"[PATCH net-next 5/6] bpf, nfp: add meta data support","Date":"Mon, 25 Sep 2017 02:25:54 +0200","Message-Id":"","X-Mailer":"git-send-email 1.9.3","In-Reply-To":["",""],"References":["",""],"X-Authenticated-Sender":"daniel@iogearbox.net","X-Virus-Scanned":"Clear (ClamAV 0.99.2/23869/Sun Sep 24 18:45:57 2017)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Implement support for transferring XDP meta data into skb for\nnfp driver; before calling into the program, xdp.data_meta points\nto xdp.data, where on program return with pass verdict, we call\ninto skb_metadata_set().\n\nSigned-off-by: Daniel Borkmann \nAcked-by: Alexei Starovoitov \nAcked-by: John Fastabend \n---\n .../net/ethernet/netronome/nfp/nfp_net_common.c | 40 ++++++++--------------\n 1 file changed, 15 insertions(+), 25 deletions(-)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c\nindex e3a38be..d2f73fe 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c\n@@ -1574,27 +1574,6 @@ static void nfp_net_rx_csum(struct nfp_net_dp *dp,\n \treturn true;\n }\n \n-static int nfp_net_run_xdp(struct bpf_prog *prog, void *data, void *hard_start,\n-\t\t\t unsigned int *off, unsigned int *len)\n-{\n-\tstruct xdp_buff xdp;\n-\tvoid *orig_data;\n-\tint ret;\n-\n-\txdp.data_hard_start = hard_start;\n-\txdp.data = data + *off;\n-\txdp_set_data_meta_invalid(&xdp);\n-\txdp.data_end = data + *off + *len;\n-\n-\torig_data = xdp.data;\n-\tret = bpf_prog_run_xdp(prog, &xdp);\n-\n-\t*len -= xdp.data - orig_data;\n-\t*off += xdp.data - orig_data;\n-\n-\treturn ret;\n-}\n-\n /**\n * nfp_net_rx() - receive up to @budget packets on @rx_ring\n * @rx_ring: RX ring to receive from\n@@ -1630,6 +1609,7 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)\n \t\tstruct nfp_meta_parsed meta;\n \t\tstruct net_device *netdev;\n \t\tdma_addr_t new_dma_addr;\n+\t\tu32 meta_len_xdp = 0;\n \t\tvoid *new_frag;\n \n \t\tidx = D_IDX(rx_ring, rx_ring->rd_p);\n@@ -1708,16 +1688,24 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)\n \n \t\tif (xdp_prog && !(rxd->rxd.flags & PCIE_DESC_RX_BPF &&\n \t\t\t\t dp->bpf_offload_xdp) && !meta.portid) {\n+\t\t\tvoid *orig_data = rxbuf->frag + pkt_off;\n \t\t\tunsigned int dma_off;\n-\t\t\tvoid *hard_start;\n+\t\t\tstruct xdp_buff xdp;\n \t\t\tint act;\n \n-\t\t\thard_start = rxbuf->frag + NFP_NET_RX_BUF_HEADROOM;\n+\t\t\txdp.data_hard_start = rxbuf->frag + NFP_NET_RX_BUF_HEADROOM;\n+\t\t\txdp.data = orig_data;\n+\t\t\txdp.data_meta = orig_data;\n+\t\t\txdp.data_end = orig_data + pkt_len;\n+\n+\t\t\tact = bpf_prog_run_xdp(xdp_prog, &xdp);\n+\n+\t\t\tpkt_len -= xdp.data - orig_data;\n+\t\t\tpkt_off += xdp.data - orig_data;\n \n-\t\t\tact = nfp_net_run_xdp(xdp_prog, rxbuf->frag, hard_start,\n-\t\t\t\t\t &pkt_off, &pkt_len);\n \t\t\tswitch (act) {\n \t\t\tcase XDP_PASS:\n+\t\t\t\tmeta_len_xdp = xdp.data - xdp.data_meta;\n \t\t\t\tbreak;\n \t\t\tcase XDP_TX:\n \t\t\t\tdma_off = pkt_off - NFP_NET_RX_BUF_HEADROOM;\n@@ -1785,6 +1773,8 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)\n \t\tif (rxd->rxd.flags & PCIE_DESC_RX_VLAN)\n \t\t\t__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),\n \t\t\t\t\t le16_to_cpu(rxd->rxd.vlan));\n+\t\tif (meta_len_xdp)\n+\t\t\tskb_metadata_set(skb, meta_len_xdp);\n \n \t\tnapi_gro_receive(&rx_ring->r_vec->napi, skb);\n \t}\n","prefixes":["net-next","5/6"]}