From patchwork Mon Feb 4 17:00:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1036074 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="GoUUFf6L"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43tYqs2L2Kz9s7T for ; Tue, 5 Feb 2019 04:00:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730360AbfBDRAj (ORCPT ); Mon, 4 Feb 2019 12:00:39 -0500 Received: from mail-eopbgr40072.outbound.protection.outlook.com ([40.107.4.72]:30193 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729295AbfBDRAi (ORCPT ); Mon, 4 Feb 2019 12:00:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zsXx6envHLz1sURQggUnYcFTPvhhy0y09cQ1NTFnlzs=; b=GoUUFf6L9zMY8cOdWh3l9tOvlDfRr5ghKYAGYcOgYwvk7NESOcPf6UnnzBAyvQcntYCODI4uRsJfS6mnFoKGlQzaeJS7F7MANru8JC1+FJyVt4p1sqjS6Bo0S412g4zcaT6obL2VR6vBC9gJryPniVV51Z2LXHw3tJhuSP/retY= Received: from AM0PR04MB4994.eurprd04.prod.outlook.com (20.177.40.15) by AM0PR04MB4900.eurprd04.prod.outlook.com (20.176.215.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.20; Mon, 4 Feb 2019 17:00:35 +0000 Received: from AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa]) by AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa%3]) with mapi id 15.20.1580.019; Mon, 4 Feb 2019 17:00:35 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei , "brouer@redhat.com" , "ilias.apalodimas@linaro.org" Subject: [PATCH net-next 1/4] dpaa2-eth: Use a single page per Rx buffer Thread-Topic: [PATCH net-next 1/4] dpaa2-eth: Use a single page per Rx buffer Thread-Index: AQHUvKslDyKJEqbAr0abIbDgd19nMQ== Date: Mon, 4 Feb 2019 17:00:35 +0000 Message-ID: <1549299625-28399-2-git-send-email-ruxandra.radulescu@nxp.com> References: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0701CA0060.eurprd07.prod.outlook.com (2603:10a6:800:5f::22) To AM0PR04MB4994.eurprd04.prod.outlook.com (2603:10a6:208:c7::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [86.34.165.90] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4900; 6:ebMWqQXajD3Dw5bXwg4E16KqSjsYf8tlO9xmKYw1Dhnx469zqQvORtUDMxvo966vCrR9Nlb7+CxVp2Kai5cStPZxWf9DraSVkw/UeqaG7ayU/01OhPd0fjmVpVEIad2jffY7ygqk3z/cpN9yjJ3OuyjIUir95waZEP4UvLga1WApPzy9kvJIZFyDLzjM3NWcyJrMkhSe+YX1HeKU7MpollsnZIu074TuzZg0wyLtloUxgeu3/xZfDi0MSQZKFNbx/PHSpaBmBl/1UwETZ0uguiV+m39fE2wnUOiS6g/H8WRs5CCxteV8t+0PGCM16Lcs7sypavlyuJCU8S6b4ss9ddYl/znDppz7i3Hd6GE39Ggc6SX5h7UoYMVtxCQHmeTHIYVTp7ntOi/FAOwQcpwAuwwkL8PuO800cdlk/VXIz0MSkakliHYUg7iGRcckI2YmJfxFMjGMBSdu/BaRUse5pw==; 5:8cJMtWIB4FWrIlXP/fJZUZaU89dtAEDylPbM/DFWgnioGC9rAQF5YcCDisn3G8KNLHfOT3Yeo/0oUstdGBa/H71Wyaga7Lg+3tpig7lm/gN/DCrIdepJNmk2aQLRe6rphOBoL9ghedEQLwoOSu7OPf1ZZ2hfgCBEhP9EqHe/GMoZ9LDAaMnVSMLw7ldMhRBzX6gNIyRH59PQzLToiRtoPA==; 7:ERry6bzPTyxRgYmjvvDLY6vTgO4qjuCuAf2B802CiBKXXjcW7kw+ykK04q1tbWGlXl2+RHmLGgj0AT9AqHkc8m0a7Q44URzHrAtA75Q11z0ssqOBAN8uy9SKidipOmgNMNnzFKhZbK9rKBpXcbZgsA== x-ms-office365-filtering-correlation-id: 93ae903e-a49d-405d-354b-08d68ac24790 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4900; x-ms-traffictypediagnostic: AM0PR04MB4900: x-microsoft-antispam-prvs: x-forefront-prvs: 0938781D02 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(366004)(39860400002)(199004)(189003)(478600001)(476003)(2906002)(102836004)(7736002)(11346002)(446003)(25786009)(66066001)(14454004)(97736004)(71200400001)(486006)(26005)(76176011)(81156014)(81166006)(2616005)(2501003)(71190400001)(8676002)(50226002)(36756003)(86362001)(8936002)(106356001)(99286004)(52116002)(316002)(53936002)(110136005)(105586002)(6486002)(68736007)(4326008)(54906003)(6436002)(256004)(14444005)(6116002)(3846002)(305945005)(186003)(6506007)(6512007)(386003)(60764002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4900; H:AM0PR04MB4994.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: vuL3X0zx3Zx3+yX2EVC1ZKSmIpofqGQfya7S+lpdB0hBWetxdOu6NvQD4L/adKjCQ6LGzCIvjBCoHxGfqsFS5GE2xlSDc/inj5ZPz/O1BIAlFPHdt7eqm/U83ancS0dLb95DdQqVL7ILvxyttiVLzf5xdAEVJlN6vtMzWB6a1yDMphRvCFF+CDv2IyMC85EVSqGG01hQnkO4G2AwhKkG/6ABkAakQR4c4Dq1XHfANuONjNsgdMxqjoIXW8LvF4W7y3mJwxWdrYRI+t19yZ/oG3ItUeRgUT+h9tzfWIFXYRNoJ3jt2H/6nTB/CcuXBjwWE3M8ftfneHp6w4qA6c4BSA7PqaAYnVnfJYVc7anO0NWSIjdgNRiBfqmxNTef31Va1hTJhlU62uJEa6zauRkE/KefPoqAimXsT+2NgYhp7Gs= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93ae903e-a49d-405d-354b-08d68ac24790 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2019 17:00:34.4863 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4900 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Instead of allocating page fragments via the network stack, use the page allocator directly. For now, we consume one page for each Rx buffer. With the new memory model we are free to consider adding more XDP support. Performance decreases slightly in some IP forwarding cases. No visible effect on termination traffic. The driver memory footprint increases as a result of this change, but it is still small enough to not really matter. Another side effect is that now Rx buffer alignment requirements are naturally satisfied without any additional actions needed. Remove alignment related code, except in the buffer layout information conveyed to MC, as hardware still needs to know the alignment value we guarantee. Signed-off-by: Ioana Ciornei Signed-off-by: Ioana Radulescu --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 61 +++++++++++++----------- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 21 +++----- 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 04925c7..6e58de6 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -86,16 +86,16 @@ static void free_rx_fd(struct dpaa2_eth_priv *priv, for (i = 1; i < DPAA2_ETH_MAX_SG_ENTRIES; i++) { addr = dpaa2_sg_get_addr(&sgt[i]); sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr); - dma_unmap_single(dev, addr, DPAA2_ETH_RX_BUF_SIZE, - DMA_BIDIRECTIONAL); + dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE, + DMA_BIDIRECTIONAL); - skb_free_frag(sg_vaddr); + free_pages((unsigned long)sg_vaddr, 0); if (dpaa2_sg_is_final(&sgt[i])) break; } free_buf: - skb_free_frag(vaddr); + free_pages((unsigned long)vaddr, 0); } /* Build a linear skb based on a single-buffer frame descriptor */ @@ -109,7 +109,7 @@ static struct sk_buff *build_linear_skb(struct dpaa2_eth_channel *ch, ch->buf_count--; - skb = build_skb(fd_vaddr, DPAA2_ETH_SKB_SIZE); + skb = build_skb(fd_vaddr, DPAA2_ETH_RX_BUF_RAW_SIZE); if (unlikely(!skb)) return NULL; @@ -144,19 +144,19 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv, /* Get the address and length from the S/G entry */ sg_addr = dpaa2_sg_get_addr(sge); sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, sg_addr); - dma_unmap_single(dev, sg_addr, DPAA2_ETH_RX_BUF_SIZE, - DMA_BIDIRECTIONAL); + dma_unmap_page(dev, sg_addr, DPAA2_ETH_RX_BUF_SIZE, + DMA_BIDIRECTIONAL); sg_length = dpaa2_sg_get_len(sge); if (i == 0) { /* We build the skb around the first data buffer */ - skb = build_skb(sg_vaddr, DPAA2_ETH_SKB_SIZE); + skb = build_skb(sg_vaddr, DPAA2_ETH_RX_BUF_RAW_SIZE); if (unlikely(!skb)) { /* Free the first SG entry now, since we already * unmapped it and obtained the virtual address */ - skb_free_frag(sg_vaddr); + free_pages((unsigned long)sg_vaddr, 0); /* We still need to subtract the buffers used * by this FD from our software counter @@ -211,9 +211,9 @@ static void free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array, int count) for (i = 0; i < count; i++) { vaddr = dpaa2_iova_to_virt(priv->iommu_domain, buf_array[i]); - dma_unmap_single(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE, - DMA_BIDIRECTIONAL); - skb_free_frag(vaddr); + dma_unmap_page(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE, + DMA_BIDIRECTIONAL); + free_pages((unsigned long)vaddr, 0); } } @@ -378,16 +378,16 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, return; } - dma_unmap_single(dev, addr, DPAA2_ETH_RX_BUF_SIZE, - DMA_BIDIRECTIONAL); + dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE, + DMA_BIDIRECTIONAL); skb = build_linear_skb(ch, fd, vaddr); } else if (fd_format == dpaa2_fd_sg) { WARN_ON(priv->xdp_prog); - dma_unmap_single(dev, addr, DPAA2_ETH_RX_BUF_SIZE, - DMA_BIDIRECTIONAL); + dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE, + DMA_BIDIRECTIONAL); skb = build_frag_skb(priv, ch, buf_data); - skb_free_frag(vaddr); + free_pages((unsigned long)vaddr, 0); percpu_extras->rx_sg_frames++; percpu_extras->rx_sg_bytes += dpaa2_fd_get_len(fd); } else { @@ -903,7 +903,7 @@ static int add_bufs(struct dpaa2_eth_priv *priv, { struct device *dev = priv->net_dev->dev.parent; u64 buf_array[DPAA2_ETH_BUFS_PER_CMD]; - void *buf; + struct page *page; dma_addr_t addr; int i, err; @@ -911,14 +911,16 @@ static int add_bufs(struct dpaa2_eth_priv *priv, /* Allocate buffer visible to WRIOP + skb shared info + * alignment padding */ - buf = napi_alloc_frag(dpaa2_eth_buf_raw_size(priv)); - if (unlikely(!buf)) + /* allocate one page for each Rx buffer. WRIOP sees + * the entire page except for a tailroom reserved for + * skb shared info + */ + page = dev_alloc_pages(0); + if (!page) goto err_alloc; - buf = PTR_ALIGN(buf, priv->rx_buf_align); - - addr = dma_map_single(dev, buf, DPAA2_ETH_RX_BUF_SIZE, - DMA_BIDIRECTIONAL); + addr = dma_map_page(dev, page, 0, DPAA2_ETH_RX_BUF_SIZE, + DMA_BIDIRECTIONAL); if (unlikely(dma_mapping_error(dev, addr))) goto err_map; @@ -926,7 +928,7 @@ static int add_bufs(struct dpaa2_eth_priv *priv, /* tracing point */ trace_dpaa2_eth_buf_seed(priv->net_dev, - buf, dpaa2_eth_buf_raw_size(priv), + page, DPAA2_ETH_RX_BUF_RAW_SIZE, addr, DPAA2_ETH_RX_BUF_SIZE, bpid); } @@ -948,7 +950,7 @@ static int add_bufs(struct dpaa2_eth_priv *priv, return i; err_map: - skb_free_frag(buf); + __free_pages(page, 0); err_alloc: /* If we managed to allocate at least some buffers, * release them to hardware @@ -2134,6 +2136,7 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv) { struct device *dev = priv->net_dev->dev.parent; struct dpni_buffer_layout buf_layout = {0}; + u16 rx_buf_align; int err; /* We need to check for WRIOP version 1.0.0, but depending on the MC @@ -2142,9 +2145,9 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv) */ if (priv->dpni_attrs.wriop_version == DPAA2_WRIOP_VERSION(0, 0, 0) || priv->dpni_attrs.wriop_version == DPAA2_WRIOP_VERSION(1, 0, 0)) - priv->rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN_REV1; + rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN_REV1; else - priv->rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN; + rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN; /* tx buffer */ buf_layout.private_data_size = DPAA2_ETH_SWA_SIZE; @@ -2184,7 +2187,7 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv) /* rx buffer */ buf_layout.pass_frame_status = true; buf_layout.pass_parser_result = true; - buf_layout.data_align = priv->rx_buf_align; + buf_layout.data_align = rx_buf_align; buf_layout.data_head_room = dpaa2_eth_rx_head_room(priv); buf_layout.private_data_size = 0; buf_layout.options = DPNI_BUF_LAYOUT_OPT_PARSER_RESULT | diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h index 31fe486..da3d039 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -63,9 +63,11 @@ /* Hardware requires alignment for ingress/egress buffer addresses */ #define DPAA2_ETH_TX_BUF_ALIGN 64 -#define DPAA2_ETH_RX_BUF_SIZE 2048 -#define DPAA2_ETH_SKB_SIZE \ - (DPAA2_ETH_RX_BUF_SIZE + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) +#define DPAA2_ETH_RX_BUF_RAW_SIZE PAGE_SIZE +#define DPAA2_ETH_RX_BUF_TAILROOM \ + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) +#define DPAA2_ETH_RX_BUF_SIZE \ + (DPAA2_ETH_RX_BUF_RAW_SIZE - DPAA2_ETH_RX_BUF_TAILROOM) /* Hardware annotation area in RX/TX buffers */ #define DPAA2_ETH_RX_HWA_SIZE 64 @@ -343,7 +345,6 @@ struct dpaa2_eth_priv { bool rx_tstamp; /* Rx timestamping enabled */ u16 tx_qdid; - u16 rx_buf_align; struct fsl_mc_io *mc_io; /* Cores which have an affine DPIO/DPCON. * This is the cpu set on which Rx and Tx conf frames are processed @@ -418,15 +419,6 @@ enum dpaa2_eth_rx_dist { DPAA2_ETH_RX_DIST_CLS }; -/* Hardware only sees DPAA2_ETH_RX_BUF_SIZE, but the skb built around - * the buffer also needs space for its shared info struct, and we need - * to allocate enough to accommodate hardware alignment restrictions - */ -static inline unsigned int dpaa2_eth_buf_raw_size(struct dpaa2_eth_priv *priv) -{ - return DPAA2_ETH_SKB_SIZE + priv->rx_buf_align; -} - static inline unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv, struct sk_buff *skb) @@ -451,8 +443,7 @@ unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv, */ static inline unsigned int dpaa2_eth_rx_head_room(struct dpaa2_eth_priv *priv) { - return priv->tx_data_offset + DPAA2_ETH_TX_BUF_ALIGN - - DPAA2_ETH_RX_HWA_SIZE; + return priv->tx_data_offset - DPAA2_ETH_RX_HWA_SIZE; } int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags); From patchwork Mon Feb 4 17:00:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1036075 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="KNmHuB7K"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43tYr25pjhz9s3l for ; Tue, 5 Feb 2019 04:00:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730378AbfBDRAu (ORCPT ); Mon, 4 Feb 2019 12:00:50 -0500 Received: from mail-eopbgr140047.outbound.protection.outlook.com ([40.107.14.47]:26877 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728479AbfBDRAt (ORCPT ); Mon, 4 Feb 2019 12:00:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vcpmsHaV2isJ7q7L+a/qWwwCkSD8r6m1Sd8Hj9k0wTI=; b=KNmHuB7KERrDZ7Gwcx6XfcCuArVVwD5MGpO7yLppqihZzSdewNF0BYW/DcYsWZ6PKj33Sp5svcuVDFSTcl1YZzIImw4QyHvo7glCqUJdLydEFmDF34cJeYjVGIyOvRdYUg89+A+13D8PDBJ66gALp8VMR4aTdOwpg2u3c7IFcfw= Received: from AM0PR04MB4994.eurprd04.prod.outlook.com (20.177.40.15) by AM0PR04MB4900.eurprd04.prod.outlook.com (20.176.215.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.20; Mon, 4 Feb 2019 17:00:36 +0000 Received: from AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa]) by AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa%3]) with mapi id 15.20.1580.019; Mon, 4 Feb 2019 17:00:36 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei , "brouer@redhat.com" , "ilias.apalodimas@linaro.org" Subject: [PATCH net-next 2/4] dpaa2-eth: Use napi_consume_skb() Thread-Topic: [PATCH net-next 2/4] dpaa2-eth: Use napi_consume_skb() Thread-Index: AQHUvKslDGRwjnllm0mQsVIsEj8dgg== Date: Mon, 4 Feb 2019 17:00:35 +0000 Message-ID: <1549299625-28399-3-git-send-email-ruxandra.radulescu@nxp.com> References: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0701CA0060.eurprd07.prod.outlook.com (2603:10a6:800:5f::22) To AM0PR04MB4994.eurprd04.prod.outlook.com (2603:10a6:208:c7::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [86.34.165.90] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4900; 6:Pozmq5HGt8ySTgcRSxHYI3oiwbGoNtlXQ5rsYUYs/a7rqciBWu6GdTyQk5wCwHAPl7Qnzdi23BQGdwpPdyfUqHdT9zMktXeIPIBwJFJ6QBU8ciKVS72QCccZeC4ov/78BoOSDoIj9MnfLSVZUZKJTKBMniT5ra7fUWzMOx0dCbNUJNe1X4R8YN71TF4iiYexovlQ7MgZoz+/PekaW5JL8VPgEJp5+KvexksACCG4gFySeRwuyfeDYk2DmKVjRicyC9oQ+43jhgUXvRgv7ApS9Rm1UNrLF0RbsUrIni48l7lIvGwNMGFZsXRXHob+kn0S3TEBBxb9rfxu5x9TiAYEKG3AbtifLUic7NJe7RmBq78VST1Zd3syI0S9JalE2pP151iV0HyT4K3AhlSKWiI9PEVZVAjSzNtlnxayAjHlUZpc+c+823869q5pbv8+IlDXu445bzXNBQMdnknqpyVV0Q==; 5:j/gyMVc3/WShpOVuEVuNN1pgmtDbzPAzd/t8fzU8I7P6Yv423EWTMMRynanlsyXyeMZB2PkNhFtnCBFd7FKWiw/C0OPySNsz12EhylZ/7/LGo9C3nTQ9QwPQ8BHt/N/Lgf8WFKc255u0FmenOnWuWLHknxatLy6pRP+yCjAza23LDjMYZkkC3Rfk+UXUnL04q9Qhq3cKfvJpsxSfj+eZlQ==; 7:ZKkOWAs0crrxahV0zuc4aWW76gdLta4Hss1YQ20LwpG9/nraqCiCY8elEy7IHjreTLYREsxQR8pMQNP1z8hag3WzVxhuDgPqKLAyeAwHx0UqUZrxTwqs1gfI5u9mW0rpnWPToeptzn0O0wZSkBfsSQ== x-ms-office365-filtering-correlation-id: 08cda51d-dff2-4cef-80ba-08d68ac2480c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4900; x-ms-traffictypediagnostic: AM0PR04MB4900: x-microsoft-antispam-prvs: x-forefront-prvs: 0938781D02 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(366004)(39860400002)(199004)(189003)(478600001)(476003)(2906002)(102836004)(7736002)(11346002)(446003)(25786009)(66066001)(14454004)(97736004)(71200400001)(486006)(26005)(76176011)(81156014)(81166006)(2616005)(2501003)(71190400001)(8676002)(50226002)(36756003)(86362001)(8936002)(106356001)(99286004)(52116002)(316002)(53936002)(110136005)(105586002)(6486002)(68736007)(4326008)(54906003)(6436002)(256004)(6116002)(3846002)(305945005)(186003)(6506007)(6512007)(386003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4900; H:AM0PR04MB4994.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: kPl0HASwyr6PJs2BiMZrK2ktn87bUwONE/tHcgTZKxv3MyTPegEmSqy5+VhF6nnfqf8vkWPVb4oOCF5oobXhDiCeGCL01F1JE0MaeYNZJ0gKQDrVymt7Ldl8QShdPIeunfFIoNkt4l/iP9edxfAQ5kgPHIMNESBPuUI71VoMbasJTP0yxf+fKRUnySGRzD9EO13fN+RLfkeomaxnBFrpkckxTLn+KAVPHNPJt6By+TOOXNtmibEYC7Hw85SRQ52ifn4TJYTgDBT+LVty5Cya+DoXJflUS1+bEdpetpblVqPpdsSWuDfSShIjO/93nmH5g3S4ZwM/H7sODq+G0JxoZOGOL77rn/B7E4J3w2cDraL9nrxm6cPGyiQHq9y0k1ieSezOAZ4YTjkUm5Z3wKtAcFYA8AzoG+VeD5vMSKjLDdA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08cda51d-dff2-4cef-80ba-08d68ac2480c X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2019 17:00:35.2998 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4900 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While in NAPI context, free skbs by calling napi_consume_skb() instead of dev_kfree_skb(), to take advantage of the bulk freeing mechanism. Signed-off-by: Ioana Radulescu --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 6e58de6..3bc5437 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -657,7 +657,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv, * dpaa2_eth_tx(). */ static void free_tx_fd(const struct dpaa2_eth_priv *priv, - const struct dpaa2_fd *fd) + const struct dpaa2_fd *fd, bool in_napi) { struct device *dev = priv->net_dev->dev.parent; dma_addr_t fd_addr; @@ -712,7 +712,7 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, skb_free_frag(skbh); /* Move on with skb release */ - dev_kfree_skb(skb); + napi_consume_skb(skb, in_napi); } static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev) @@ -795,7 +795,7 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev) if (unlikely(err < 0)) { percpu_stats->tx_errors++; /* Clean up everything, including freeing the skb */ - free_tx_fd(priv, &fd); + free_tx_fd(priv, &fd, false); } else { fd_len = dpaa2_fd_get_len(&fd); percpu_stats->tx_packets++; @@ -837,7 +837,7 @@ static void dpaa2_eth_tx_conf(struct dpaa2_eth_priv *priv, /* Check frame errors in the FD field */ fd_errors = dpaa2_fd_get_ctrl(fd) & DPAA2_FD_TX_ERR_MASK; - free_tx_fd(priv, fd); + free_tx_fd(priv, fd, true); if (likely(!fd_errors)) return; From patchwork Mon Feb 4 17:00:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1036076 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="ZCdndn5t"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43tYr43shyz9s3l for ; Tue, 5 Feb 2019 04:00:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730368AbfBDRAt (ORCPT ); Mon, 4 Feb 2019 12:00:49 -0500 Received: from mail-eopbgr00056.outbound.protection.outlook.com ([40.107.0.56]:45536 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728147AbfBDRAt (ORCPT ); Mon, 4 Feb 2019 12:00:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aijKjw6KnJKCsnuy2wlJNwEdN38GZq8PrJwvJf+DRkI=; b=ZCdndn5tIwKQEFD6+YORORy8YXpl0J7viPJguUU7WMPgpcICNq/zmVF0CjtL1ZSD+ATFx3Wk0dHW6TOiBT2JBcnhIPaSAyzW6VgCEvLaRGdihRON1F1oPkKCMR5ipTqHcc1QI+I6pJd9E+ykpSxOAeYzz0TchWrRhS8dVe/szB0= Received: from AM0PR04MB4994.eurprd04.prod.outlook.com (20.177.40.15) by AM0PR04MB4148.eurprd04.prod.outlook.com (52.134.125.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Mon, 4 Feb 2019 17:00:46 +0000 Received: from AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa]) by AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa%3]) with mapi id 15.20.1580.019; Mon, 4 Feb 2019 17:00:46 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei , "brouer@redhat.com" , "ilias.apalodimas@linaro.org" Subject: [PATCH net-next 3/4] dpaa2-eth: Use FQ-based DPIO enqueue API Thread-Topic: [PATCH net-next 3/4] dpaa2-eth: Use FQ-based DPIO enqueue API Thread-Index: AQHUvKsmUkDDvFSWm0W9XmPw/xDjpQ== Date: Mon, 4 Feb 2019 17:00:36 +0000 Message-ID: <1549299625-28399-4-git-send-email-ruxandra.radulescu@nxp.com> References: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0701CA0060.eurprd07.prod.outlook.com (2603:10a6:800:5f::22) To AM0PR04MB4994.eurprd04.prod.outlook.com (2603:10a6:208:c7::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [86.34.165.90] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4148; 6:bRDNxF3pHIWQfpsObPlho38n75ZPgrDJPgY/SSRY63bpP7YYKy2KYbVIWIC2nde/ZPRm/jN0ECtOSc/zCrTJX+dJ3LWbyJh/kCEh9yX0q9khzVBodVZMDgD2RHgqpdmFz+I1yJIj/9OMNFM+wW+rMZJMPXY3+T5HItuWzWnQYI1DTzxPoqiPxCKSyJLz1s0ieiNZqm2oJo9Hay1/k5fBD7EBlCXZm2DR2spwgvIrVHCLKJvXjd02wbD7y+5NEApn3Tt9/RAS/jJbKLWpBh9IQaNTki43p5EpqXYa8gbPzIBLgcR7roh3H94bpmV9eVj6DaPsVK0kjXPzLCp66Fb6hXGy+eUcK6L2UfoDzgrDERYPKhfkojvkz2MMIkQj/BGzs0aoWPGPOPq1ZID05XL4KnPjkQsjcPmAh9+ft4O8to2UTml/nxRfegHayYzQi+n3bIdm9ZjmASfUt4ToS/dGvg==; 5:JQ3owpsROWrGefzR8AlplKBtlJP0hxDPNYY7gTPzqQurd6Azi738vxyCDmiyYSIrQMVCx3bI1P8U1Ih2T8BDYwTmQVx7xxePfVerK1LSkHAwPHJZgeqLWcUNf3/extanc0W0YM9ooUzuid9KTgdK3QMoNl5oM080pMPbKGFmGROhi4jcYIg7gMoaakwviNUBAf8nDUXm2KfpsxtGWgax0Q==; 7:l8Wb5tynCfZjY3Orf1hbe5q1XhoNm9HB4RAuOpmZWUY9qXi4JhfxAB2rVdOskzZwrhBwWn4d6QqLJjeYbbPjloOTV24+OTmzKlZJCf9kmxv2/4v03o2lgQOoYzcvYgPBR6gY6dVr2PWgpXaEuYcezQ== x-ms-office365-filtering-correlation-id: a03e8ce5-f47c-4ea6-a7f1-08d68ac24872 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605077)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4148; x-ms-traffictypediagnostic: AM0PR04MB4148: x-microsoft-antispam-prvs: x-forefront-prvs: 0938781D02 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(376002)(39860400002)(396003)(136003)(199004)(189003)(97736004)(36756003)(2906002)(54906003)(110136005)(102836004)(2501003)(186003)(6506007)(52116002)(76176011)(99286004)(316002)(26005)(256004)(14444005)(68736007)(2616005)(11346002)(476003)(486006)(446003)(4326008)(53936002)(6512007)(7736002)(81166006)(305945005)(386003)(50226002)(81156014)(8676002)(14454004)(25786009)(478600001)(6666004)(105586002)(66066001)(71200400001)(71190400001)(6436002)(6486002)(86362001)(106356001)(8936002)(6116002)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4148; H:AM0PR04MB4994.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: K38zmU5qkw3OsY6SmqDcUhBRxYhe1CFTH6Q6dVQYZk6wT7XDkOBz9WwJzrtItMlMuYjYxrl6N8VieFQGNfwGM284g1NgmAPXimnznvlEEE1Jff0mqX/5dUPltVe0YP4AYObnMxDAEBFVvHtYz/erfoauNH4sq/Sq4+XawFe12+jDJcxrNgLZo2rZsfxTw0fGmJ6aE+iQb7QA72T6GzoOI7pcbJ9cRmEHKdbrs264PqpVUUYNe9IcLJzj8TYSJY1Gz7Rik9U0Agqw1FgID8U6V0Xg0U2XBwTHkqTidZ9doAqA59O1CIrgAfFD5sW/2iXdisbmvHmbYXXWDYsclmRSCxcMvzJYMRuh6jGUGsZvTLsp974z6SK12mucCnXxnASQaG+50cJu1wBgJ6B26nW1EPs3J3bQbeSxS/1p7QmtcTI= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a03e8ce5-f47c-4ea6-a7f1-08d68ac24872 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2019 17:00:35.9713 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4148 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Starting with MC10.14.0, dpaa2_io_service_enqueue_fq() API is functional. Since there are a number of cases where it offers better performance compared to the currently used enqueue function, switch to it for firmware versions that support it. Signed-off-by: Ioana Radulescu --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 41 ++++++++++++++++++++---- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 4 +++ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 3bc5437..87777b0 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -264,9 +264,7 @@ static int xdp_enqueue(struct dpaa2_eth_priv *priv, struct dpaa2_fd *fd, fq = &priv->fq[queue_id]; for (i = 0; i < DPAA2_ETH_ENQUEUE_RETRIES; i++) { - err = dpaa2_io_service_enqueue_qd(fq->channel->dpio, - priv->tx_qdid, 0, - fq->tx_qdbin, fd); + err = priv->enqueue(priv, fq, fd, 0); if (err != -EBUSY) break; } @@ -785,9 +783,7 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev) queue_mapping = skb_get_queue_mapping(skb); fq = &priv->fq[queue_mapping]; for (i = 0; i < DPAA2_ETH_ENQUEUE_RETRIES; i++) { - err = dpaa2_io_service_enqueue_qd(fq->channel->dpio, - priv->tx_qdid, 0, - fq->tx_qdbin, &fd); + err = priv->enqueue(priv, fq, &fd, 0); if (err != -EBUSY) break; } @@ -2205,6 +2201,36 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv) return 0; } +#define DPNI_ENQUEUE_FQID_VER_MAJOR 7 +#define DPNI_ENQUEUE_FQID_VER_MINOR 9 + +static inline int dpaa2_eth_enqueue_qd(struct dpaa2_eth_priv *priv, + struct dpaa2_eth_fq *fq, + struct dpaa2_fd *fd, u8 prio) +{ + return dpaa2_io_service_enqueue_qd(fq->channel->dpio, + priv->tx_qdid, prio, + fq->tx_qdbin, fd); +} + +static inline int dpaa2_eth_enqueue_fq(struct dpaa2_eth_priv *priv, + struct dpaa2_eth_fq *fq, + struct dpaa2_fd *fd, + u8 prio __always_unused) +{ + return dpaa2_io_service_enqueue_fq(fq->channel->dpio, + fq->tx_fqid, fd); +} + +static void set_enqueue_mode(struct dpaa2_eth_priv *priv) +{ + if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_ENQUEUE_FQID_VER_MAJOR, + DPNI_ENQUEUE_FQID_VER_MINOR) < 0) + priv->enqueue = dpaa2_eth_enqueue_qd; + else + priv->enqueue = dpaa2_eth_enqueue_fq; +} + /* Configure the DPNI object this interface is associated with */ static int setup_dpni(struct fsl_mc_device *ls_dev) { @@ -2258,6 +2284,8 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) if (err) goto close; + set_enqueue_mode(priv); + priv->cls_rules = devm_kzalloc(dev, sizeof(struct dpaa2_eth_cls_rule) * dpaa2_eth_fs_count(priv), GFP_KERNEL); if (!priv->cls_rules) @@ -2342,6 +2370,7 @@ static int setup_tx_flow(struct dpaa2_eth_priv *priv, } fq->tx_qdbin = qid.qdbin; + fq->tx_fqid = qid.fqid; err = dpni_get_queue(priv->mc_io, 0, priv->mc_token, DPNI_QUEUE_TX_CONFIRM, 0, fq->flowid, diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h index da3d039..3e29dec 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -276,6 +276,7 @@ struct dpaa2_eth_priv; struct dpaa2_eth_fq { u32 fqid; u32 tx_qdbin; + u32 tx_fqid; u16 flowid; int target_cpu; u32 dq_frames; @@ -328,6 +329,9 @@ struct dpaa2_eth_priv { u8 num_fqs; struct dpaa2_eth_fq fq[DPAA2_ETH_MAX_QUEUES]; + int (*enqueue)(struct dpaa2_eth_priv *priv, + struct dpaa2_eth_fq *fq, + struct dpaa2_fd *fd, u8 prio); u8 num_channels; struct dpaa2_eth_channel *channel[DPAA2_ETH_MAX_DPCONS]; From patchwork Mon Feb 4 17:00:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1036077 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="tEe6cMSC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43tYr53NF8z9s7h for ; Tue, 5 Feb 2019 04:00:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730401AbfBDRAw (ORCPT ); Mon, 4 Feb 2019 12:00:52 -0500 Received: from mail-eopbgr00056.outbound.protection.outlook.com ([40.107.0.56]:45536 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729103AbfBDRAv (ORCPT ); Mon, 4 Feb 2019 12:00:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nlm9z7cUTi9MEKJC+2uSaYmIQ6xkMQf82Kl6YPzSrH4=; b=tEe6cMSCb04FpdX/QrXBpzTlymxHtRO64+MVyealFlEq0uzTGmHtREgr73I8mgR9nY6yOTy2Dq5YboQ5t+j56vv4/VQ3lrVbixNDmJjVrmsKdLRKgZt+ZuyUhs1Uv02lNdEOD64FHBWbQDVZNh4XHTPVVwjdSuneI/szHt8CFJ0= Received: from AM0PR04MB4994.eurprd04.prod.outlook.com (20.177.40.15) by AM0PR04MB4148.eurprd04.prod.outlook.com (52.134.125.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Mon, 4 Feb 2019 17:00:46 +0000 Received: from AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa]) by AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::4dc:92fb:eaf8:d6fa%3]) with mapi id 15.20.1580.019; Mon, 4 Feb 2019 17:00:46 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei , "brouer@redhat.com" , "ilias.apalodimas@linaro.org" Subject: [PATCH net-next 4/4] dpaa2-eth: Update buffer pool refill threshold Thread-Topic: [PATCH net-next 4/4] dpaa2-eth: Update buffer pool refill threshold Thread-Index: AQHUvKsmQWoRYr5rdkKAgD9PJmtWTg== Date: Mon, 4 Feb 2019 17:00:37 +0000 Message-ID: <1549299625-28399-5-git-send-email-ruxandra.radulescu@nxp.com> References: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1549299625-28399-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR0701CA0060.eurprd07.prod.outlook.com (2603:10a6:800:5f::22) To AM0PR04MB4994.eurprd04.prod.outlook.com (2603:10a6:208:c7::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [86.34.165.90] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4148; 6:CbbdnlmSGVtLoHvIP3t5nniO4406V+S4eY2bDhIYZb6nx8bM7gIDjP2OBiYTqwfq9a4NJP93mTFpaCEfNGG98OGGQ3VXqGJULp30LZ996VANbCiUo3FtQQuePbQVTJVLlZKHgQCPU7nOmscbiVFtYV+ZxdjgI9TUP6fXwOvaJk7LFZk98Aa4p79Y/UYn7v+t2lDjp9kJiaMEfGchEYszU8Sjkeq9ZeZkGpOLknnttZ3QAfQXvfxir97At/X3nbcMVl7pI1WlGPx5WhODdxupUzRYhvRVOG+/o2YTB2B2CS/xrzJmMEo1bJczmr8m1jQRVYqrf6z6iVWMlMGmvqzCWwucQayU5R2LtN+ZkapB6bw2qCNr+eYNaYh3RP0OrJKGL4nMWtaVkmQ91xERXisOiWByc543dWiHYpC0v1h1dPb0XWBskOa1R2YdBUcuxj127uw6druZSD7oJqva5kOnJw==; 5:FtKTEAFWy1QSVDDW9k2KiDZhyHHOhRLTFP8hyq4VDHwblAxQHZr+VwURT1ZuZey4f2oecP13CRPNFclZzSZdA68cn76LnAnw+YkSg4dGuqnN6zIQkD6vq6uOzgTYXt9EH+yDNYSXiO3wJWAmnNroCUANbp3v/ZiP+ohVV9yL4DJUM85ZEyL8+tGNjLEcDMxCqvSZ5Hy78/ekFUnmok1AfQ==; 7:mDHhsKEbc/DqX7D9r873GP+jy/wIu4Q4k9gXuWa7h8rcrLt8hDOC/FEn4fF8F27qoP+B933RqGMwz1qowesi8953rDctVA1rKOl4UHcBIcVtDZzYxSYuIhxVMtj//iKlnGxh40q/jTberBxRGm458A== x-ms-office365-filtering-correlation-id: 311a4a39-0149-4dc0-e0c6-08d68ac248d9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605077)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4148; x-ms-traffictypediagnostic: AM0PR04MB4148: x-microsoft-antispam-prvs: x-forefront-prvs: 0938781D02 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(376002)(39860400002)(396003)(136003)(199004)(189003)(97736004)(36756003)(2906002)(54906003)(110136005)(102836004)(2501003)(186003)(6506007)(52116002)(76176011)(99286004)(316002)(26005)(256004)(14444005)(68736007)(2616005)(11346002)(476003)(486006)(446003)(4326008)(53936002)(6512007)(7736002)(81166006)(305945005)(386003)(50226002)(81156014)(8676002)(14454004)(25786009)(478600001)(6666004)(105586002)(66066001)(71200400001)(71190400001)(6436002)(6486002)(86362001)(106356001)(8936002)(6116002)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4148; H:AM0PR04MB4994.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: zicxbgbGMLE3GTMJgYWlJcqbh/x92KT26bRyXEiR54v+0rolWHMl84gq1wp2YHrpbGEdTTO0yLEVzoe2Fm4AoEpiuEcFotnNUDttS0372dxDMWKGKjA6j7LqzhkSQpu5LabAN5DlB3EsLw5fNFq2zcBGb1atd6Uqk0q4joomyG3FVfNIrrEtkJ9nL1uq+EovAj2ln1BXYAaSYTeuU371wpi0rNOoX7NQAgfReHr0FJqOG92VjTipeiFPAQnISNXvJVjpZYPhHW6OCoiSNW96ioNoVSt3sZ+NOr9UDrr2H/kpmmMHAQdfHFNWZEMfIyQM7EcYBuK1rnYM35j+vz9ifVOyGxUMb7Z+YOBJIAutsST8SMb6p/31yYfLaVPNt7F3sJAHq44jKJf+P+fw5na/24FroQ4EF0iQhhLTC3jlKe4= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 311a4a39-0149-4dc0-e0c6-08d68ac248d9 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2019 17:00:36.6468 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4148 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add more buffers to the Rx buffer pool as soon as 7 of them get consumed, instead of waiting for their number to drop below a fixed threshold. 7 is the number of buffers that can be released in the pool via a single DPIO command. Signed-off-by: Ioana Radulescu --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h index 3e29dec..9510928 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -53,7 +53,8 @@ */ #define DPAA2_ETH_MAX_FRAMES_PER_QUEUE (DPAA2_ETH_TAILDROP_THRESH / 64) #define DPAA2_ETH_NUM_BUFS (DPAA2_ETH_MAX_FRAMES_PER_QUEUE + 256) -#define DPAA2_ETH_REFILL_THRESH DPAA2_ETH_MAX_FRAMES_PER_QUEUE +#define DPAA2_ETH_REFILL_THRESH \ + (DPAA2_ETH_NUM_BUFS - DPAA2_ETH_BUFS_PER_CMD) /* Maximum number of buffers that can be acquired/released through a single * QBMan command