{"id":1375806,"url":"http://patchwork.ozlabs.org/api/patches/1375806/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/983d6a55ddf2ef68b0269554ec2f0487271b4d12.1601648734.git.lorenzo@kernel.org/","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":"<983d6a55ddf2ef68b0269554ec2f0487271b4d12.1601648734.git.lorenzo@kernel.org>","list_archive_url":null,"date":"2020-10-02T14:42:03","name":"[v4,bpf-next,05/13] net: mvneta: add multi buffer support to XDP_TX","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"e9966e1b84a5080cfba4142cc89c93bee335a219","submitter":{"id":76007,"url":"http://patchwork.ozlabs.org/api/people/76007/?format=json","name":"Lorenzo Bianconi","email":"lorenzo@kernel.org"},"delegate":{"id":77147,"url":"http://patchwork.ozlabs.org/api/users/77147/?format=json","username":"bpf","first_name":"BPF","last_name":"Maintainers","email":"bpf@iogearbox.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/983d6a55ddf2ef68b0269554ec2f0487271b4d12.1601648734.git.lorenzo@kernel.org/mbox/","series":[{"id":205635,"url":"http://patchwork.ozlabs.org/api/series/205635/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=205635","date":"2020-10-02T14:41:58","name":"mvneta: introduce XDP multi-buffer support","version":4,"mbox":"http://patchwork.ozlabs.org/series/205635/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1375806/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1375806/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming-netdev@ozlabs.org","Delivered-To":"patchwork-incoming-netdev@ozlabs.org","Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=23.128.96.18; helo=vger.kernel.org;\n envelope-from=netdev-owner@vger.kernel.org; receiver=)","ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=kernel.org","ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=default header.b=jeltZfKJ;\n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 4C2t535x05z9s1t\n\tfor ;\n Sat, 3 Oct 2020 00:42:47 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2388202AbgJBOmq (ORCPT\n );\n Fri, 2 Oct 2020 10:42:46 -0400","from mail.kernel.org ([198.145.29.99]:60844 \"EHLO mail.kernel.org\"\n rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n id S1726017AbgJBOmm (ORCPT );\n Fri, 2 Oct 2020 10:42:42 -0400","from lore-desk.redhat.com (unknown [176.207.245.61])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mail.kernel.org (Postfix) with ESMTPSA id 0CD1C20708;\n Fri, 2 Oct 2020 14:42:38 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=default; t=1601649761;\n bh=DHwBCoNNncxM6JrG4uH+mEpyA4XxNAtuDwPzRels8lE=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=jeltZfKJhEb7loo6HXku7TettDBMYy+9Vdvf+oS2UpbUSloyQpI2cjzp1ugPazfXJ\n TR3q5xlgGqg0bJxYJ2JQ4kpzRKkN1Q14jDp4TvvUN4J58NKSuqepuNdfuQRtP80DUK\n JqefJe42vBXIJ9ZtDjBO4GGY2ZcGdqfdh6yq3bpk=","From":"Lorenzo Bianconi ","To":"bpf@vger.kernel.org, netdev@vger.kernel.org","Cc":"davem@davemloft.net, kuba@kernel.org, ast@kernel.org,\n daniel@iogearbox.net, shayagr@amazon.com, sameehj@amazon.com,\n john.fastabend@gmail.com, dsahern@kernel.org, brouer@redhat.com,\n lorenzo.bianconi@redhat.com, echaudro@redhat.com","Subject":"[PATCH v4 bpf-next 05/13] net: mvneta: add multi buffer support to\n XDP_TX","Date":"Fri, 2 Oct 2020 16:42:03 +0200","Message-Id":"\n <983d6a55ddf2ef68b0269554ec2f0487271b4d12.1601648734.git.lorenzo@kernel.org>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"","References":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Introduce the capability to map non-linear xdp buffer running\nmvneta_xdp_submit_frame() for XDP_TX and XDP_REDIRECT\n\nSigned-off-by: Lorenzo Bianconi \n---\n drivers/net/ethernet/marvell/mvneta.c | 79 +++++++++++++++++----------\n 1 file changed, 49 insertions(+), 30 deletions(-)","diff":"diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c\nindex a431e8478297..f709650974ea 100644\n--- a/drivers/net/ethernet/marvell/mvneta.c\n+++ b/drivers/net/ethernet/marvell/mvneta.c\n@@ -1852,8 +1852,8 @@ static void mvneta_txq_bufs_free(struct mvneta_port *pp,\n \t\t\tbytes_compl += buf->skb->len;\n \t\t\tpkts_compl++;\n \t\t\tdev_kfree_skb_any(buf->skb);\n-\t\t} else if (buf->type == MVNETA_TYPE_XDP_TX ||\n-\t\t\t buf->type == MVNETA_TYPE_XDP_NDO) {\n+\t\t} else if ((buf->type == MVNETA_TYPE_XDP_TX ||\n+\t\t\t buf->type == MVNETA_TYPE_XDP_NDO) && buf->xdpf) {\n \t\t\tif (napi && buf->type == MVNETA_TYPE_XDP_TX)\n \t\t\t\txdp_return_frame_rx_napi(buf->xdpf);\n \t\t\telse\n@@ -2046,43 +2046,62 @@ static int\n mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq,\n \t\t\tstruct xdp_frame *xdpf, bool dma_map)\n {\n-\tstruct mvneta_tx_desc *tx_desc;\n-\tstruct mvneta_tx_buf *buf;\n-\tdma_addr_t dma_addr;\n+\tstruct skb_shared_info *sinfo = xdp_get_shared_info_from_frame(xdpf);\n+\tint i, num_frames = xdpf->mb ? sinfo->nr_frags + 1 : 1;\n+\tstruct mvneta_tx_desc *tx_desc = NULL;\n+\tstruct page *page;\n \n-\tif (txq->count >= txq->tx_stop_threshold)\n+\tif (txq->count + num_frames >= txq->tx_stop_threshold)\n \t\treturn MVNETA_XDP_DROPPED;\n \n-\ttx_desc = mvneta_txq_next_desc_get(txq);\n+\tfor (i = 0; i < num_frames; i++) {\n+\t\tstruct mvneta_tx_buf *buf = &txq->buf[txq->txq_put_index];\n+\t\tskb_frag_t *frag = i ? &sinfo->frags[i - 1] : NULL;\n+\t\tint len = frag ? skb_frag_size(frag) : xdpf->len;\n+\t\tdma_addr_t dma_addr;\n \n-\tbuf = &txq->buf[txq->txq_put_index];\n-\tif (dma_map) {\n-\t\t/* ndo_xdp_xmit */\n-\t\tdma_addr = dma_map_single(pp->dev->dev.parent, xdpf->data,\n-\t\t\t\t\t xdpf->len, DMA_TO_DEVICE);\n-\t\tif (dma_mapping_error(pp->dev->dev.parent, dma_addr)) {\n-\t\t\tmvneta_txq_desc_put(txq);\n-\t\t\treturn MVNETA_XDP_DROPPED;\n+\t\ttx_desc = mvneta_txq_next_desc_get(txq);\n+\t\tif (dma_map) {\n+\t\t\t/* ndo_xdp_xmit */\n+\t\t\tvoid *data;\n+\n+\t\t\tdata = frag ? skb_frag_address(frag) : xdpf->data;\n+\t\t\tdma_addr = dma_map_single(pp->dev->dev.parent, data,\n+\t\t\t\t\t\t len, DMA_TO_DEVICE);\n+\t\t\tif (dma_mapping_error(pp->dev->dev.parent, dma_addr)) {\n+\t\t\t\tfor (; i >= 0; i--)\n+\t\t\t\t\tmvneta_txq_desc_put(txq);\n+\t\t\t\treturn MVNETA_XDP_DROPPED;\n+\t\t\t}\n+\t\t\tbuf->type = MVNETA_TYPE_XDP_NDO;\n+\t\t} else {\n+\t\t\tpage = frag ? skb_frag_page(frag)\n+\t\t\t\t : virt_to_page(xdpf->data);\n+\t\t\tdma_addr = page_pool_get_dma_addr(page);\n+\t\t\tif (frag)\n+\t\t\t\tdma_addr += skb_frag_off(frag);\n+\t\t\telse\n+\t\t\t\tdma_addr += sizeof(*xdpf) + xdpf->headroom;\n+\t\t\tdma_sync_single_for_device(pp->dev->dev.parent,\n+\t\t\t\t\t\t dma_addr, len,\n+\t\t\t\t\t\t DMA_BIDIRECTIONAL);\n+\t\t\tbuf->type = MVNETA_TYPE_XDP_TX;\n \t\t}\n-\t\tbuf->type = MVNETA_TYPE_XDP_NDO;\n-\t} else {\n-\t\tstruct page *page = virt_to_page(xdpf->data);\n+\t\tbuf->xdpf = i ? NULL : xdpf;\n \n-\t\tdma_addr = page_pool_get_dma_addr(page) +\n-\t\t\t sizeof(*xdpf) + xdpf->headroom;\n-\t\tdma_sync_single_for_device(pp->dev->dev.parent, dma_addr,\n-\t\t\t\t\t xdpf->len, DMA_BIDIRECTIONAL);\n-\t\tbuf->type = MVNETA_TYPE_XDP_TX;\n+\t\tif (!i)\n+\t\t\ttx_desc->command = MVNETA_TXD_F_DESC;\n+\t\ttx_desc->buf_phys_addr = dma_addr;\n+\t\ttx_desc->data_size = len;\n+\n+\t\tmvneta_txq_inc_put(txq);\n \t}\n-\tbuf->xdpf = xdpf;\n \n-\ttx_desc->command = MVNETA_TXD_FLZ_DESC;\n-\ttx_desc->buf_phys_addr = dma_addr;\n-\ttx_desc->data_size = xdpf->len;\n+\t/*last descriptor */\n+\ttx_desc->command |= MVNETA_TXD_L_DESC | MVNETA_TXD_Z_PAD;\n \n-\tmvneta_txq_inc_put(txq);\n-\ttxq->pending++;\n-\ttxq->count++;\n+\ttxq->pending += num_frames;\n+\ttxq->count += num_frames;\n \n \treturn MVNETA_XDP_TX;\n }\n","prefixes":["v4","bpf-next","05/13"]}