Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1291769/?format=api
{ "id": 1291769, "url": "http://patchwork.ozlabs.org/api/patches/1291769/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200516004226.4795-9-anthony.l.nguyen@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200516004226.4795-9-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-16T00:42:21", "name": "[S44,09/14] ice: Refactor ice_setup_rx_ctx", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "ee4ba15d52c32d39b39f72b4be35d5c5ce506bce", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200516004226.4795-9-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 177328, "url": "http://patchwork.ozlabs.org/api/series/177328/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=177328", "date": "2020-05-16T00:42:13", "name": "[S44,01/14] ice: Don't allow VLAN stripping change when pvid set", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/177328/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1291769/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1291769/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49P64r6snzz9sTL\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 16 May 2020 10:45:16 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 15DB922795;\n\tSat, 16 May 2020 00:45:15 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id Bt6J-FgwrHaC; Sat, 16 May 2020 00:45:09 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id DE6BD2283A;\n\tSat, 16 May 2020 00:45:07 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by ash.osuosl.org (Postfix) with ESMTP id 0B4001BF2B9\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:45:04 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by fraxinus.osuosl.org (Postfix) with ESMTP id 03DF387F93\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:45:04 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id emK4LBQH-K42 for <intel-wired-lan@lists.osuosl.org>;\n Sat, 16 May 2020 00:45:01 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by fraxinus.osuosl.org (Postfix) with ESMTPS id A984B880B7\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:45:01 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 May 2020 17:45:00 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by fmsmga004.fm.intel.com with ESMTP; 15 May 2020 17:45:00 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n BU39Ski9qIlDmGcizzsWX5yUsjh/3sCdsH2DlOgnKj7U+lPH/Ra9u+Xjl7mf0gcPeT6O7Xhw7B\n f+/sixa0xx+g==", "\n bbRixmiT0ex01iBFF4b+gQKy4se5QKr1KfIxnERDbw85IfdvG6k4ijCg4DI3C2XyS/HhcGLpey\n POyVtKnxa1nA==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,397,1583222400\"; d=\"scan'208\";a=\"287960352\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 15 May 2020 17:42:21 -0700", "Message-Id": "<20200516004226.4795-9-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200516004226.4795-1-anthony.l.nguyen@intel.com>", "References": "<20200516004226.4795-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S44 09/14] ice: Refactor ice_setup_rx_ctx", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Krzysztof Kazimierczak <krzysztof.kazimierczak@intel.com>\n\nMove AF_XDP logic and buffer allocation out of ice_setup_rx_ctx() to a\nnew function ice_vsi_cfg_rxq(), so the function actually sets up the Rx\ncontext.\n\nSigned-off-by: Krzysztof Kazimierczak <krzysztof.kazimierczak@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_base.c | 123 +++++++++++++---------\n drivers/net/ethernet/intel/ice/ice_base.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_lib.c | 10 +-\n drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +-\n 4 files changed, 80 insertions(+), 57 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c\nindex 74fdd4296937..798b173e81e0 100644\n--- a/drivers/net/ethernet/intel/ice/ice_base.c\n+++ b/drivers/net/ethernet/intel/ice/ice_base.c\n@@ -278,11 +278,9 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)\n *\n * Configure the Rx descriptor ring in RLAN context.\n */\n-int ice_setup_rx_ctx(struct ice_ring *ring)\n+static int ice_setup_rx_ctx(struct ice_ring *ring)\n {\n-\tstruct device *dev = ice_pf_to_dev(ring->vsi->back);\n \tint chain_len = ICE_MAX_CHAINED_RX_BUFS;\n-\tu16 num_bufs = ICE_DESC_UNUSED(ring);\n \tstruct ice_vsi *vsi = ring->vsi;\n \tu32 rxdid = ICE_RXDID_FLEX_NIC;\n \tstruct ice_rlan_ctx rlan_ctx;\n@@ -299,49 +297,6 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t/* clear the context structure first */\n \tmemset(&rlan_ctx, 0, sizeof(rlan_ctx));\n \n-\tring->rx_buf_len = vsi->rx_buf_len;\n-\n-\tif (ring->vsi->type == ICE_VSI_PF) {\n-\t\tif (!xdp_rxq_info_is_reg(&ring->xdp_rxq))\n-\t\t\t/* coverity[check_return] */\n-\t\t\txdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,\n-\t\t\t\t\t ring->q_index);\n-\n-\t\tring->xsk_umem = ice_xsk_umem(ring);\n-\t\tif (ring->xsk_umem) {\n-\t\t\txdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);\n-\n-\t\t\tring->rx_buf_len = ring->xsk_umem->chunk_size_nohr -\n-\t\t\t\t\t XDP_PACKET_HEADROOM;\n-\t\t\t/* For AF_XDP ZC, we disallow packets to span on\n-\t\t\t * multiple buffers, thus letting us skip that\n-\t\t\t * handling in the fast-path.\n-\t\t\t */\n-\t\t\tchain_len = 1;\n-\t\t\tring->zca.free = ice_zca_free;\n-\t\t\terr = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,\n-\t\t\t\t\t\t\t MEM_TYPE_ZERO_COPY,\n-\t\t\t\t\t\t\t &ring->zca);\n-\t\t\tif (err)\n-\t\t\t\treturn err;\n-\n-\t\t\tdev_info(dev, \"Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\\n\",\n-\t\t\t\t ring->q_index);\n-\t\t} else {\n-\t\t\tring->zca.free = NULL;\n-\t\t\tif (!xdp_rxq_info_is_reg(&ring->xdp_rxq))\n-\t\t\t\t/* coverity[check_return] */\n-\t\t\t\txdp_rxq_info_reg(&ring->xdp_rxq,\n-\t\t\t\t\t\t ring->netdev,\n-\t\t\t\t\t\t ring->q_index);\n-\n-\t\t\terr = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,\n-\t\t\t\t\t\t\t MEM_TYPE_PAGE_SHARED,\n-\t\t\t\t\t\t\t NULL);\n-\t\t\tif (err)\n-\t\t\t\treturn err;\n-\t\t}\n-\t}\n \t/* Receive Queue Base Address.\n \t * Indicates the starting address of the descriptor queue defined in\n \t * 128 Byte units.\n@@ -376,6 +331,12 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t */\n \trlan_ctx.showiv = 0;\n \n+\t/* For AF_XDP ZC, we disallow packets to span on\n+\t * multiple buffers, thus letting us skip that\n+\t * handling in the fast-path.\n+\t */\n+\tif (ring->xsk_umem)\n+\t\tchain_len = 1;\n \t/* Max packet size for this queue - must not be set to a larger value\n \t * than 5 x DBUF\n \t */\n@@ -410,7 +371,8 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t/* Absolute queue number out of 2K needs to be passed */\n \terr = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);\n \tif (err) {\n-\t\tdev_err(dev, \"Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(vsi->back),\n+\t\t\t\"Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\\n\",\n \t\t\tpf_q, err);\n \t\treturn -EIO;\n \t}\n@@ -428,6 +390,67 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \tring->tail = hw->hw_addr + QRX_TAIL(pf_q);\n \twritel(0, ring->tail);\n \n+\treturn 0;\n+}\n+\n+/**\n+ * ice_vsi_cfg_rxq - Configure an Rx queue\n+ * @ring: the ring being configured\n+ *\n+ * Return 0 on success and a negative value on error.\n+ */\n+int ice_vsi_cfg_rxq(struct ice_ring *ring)\n+{\n+\tstruct device *dev = ice_pf_to_dev(ring->vsi->back);\n+\tu16 num_bufs = ICE_DESC_UNUSED(ring);\n+\tint err;\n+\n+\tring->rx_buf_len = ring->vsi->rx_buf_len;\n+\n+\tif (ring->vsi->type == ICE_VSI_PF) {\n+\t\tif (!xdp_rxq_info_is_reg(&ring->xdp_rxq))\n+\t\t\t/* coverity[check_return] */\n+\t\t\txdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,\n+\t\t\t\t\t ring->q_index);\n+\n+\t\tring->xsk_umem = ice_xsk_umem(ring);\n+\t\tif (ring->xsk_umem) {\n+\t\t\txdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);\n+\n+\t\t\tring->rx_buf_len = ring->xsk_umem->chunk_size_nohr -\n+\t\t\t\t\t XDP_PACKET_HEADROOM;\n+\t\t\tring->zca.free = ice_zca_free;\n+\t\t\terr = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,\n+\t\t\t\t\t\t\t MEM_TYPE_ZERO_COPY,\n+\t\t\t\t\t\t\t &ring->zca);\n+\t\t\tif (err)\n+\t\t\t\treturn err;\n+\n+\t\t\tdev_info(dev, \"Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\\n\",\n+\t\t\t\t ring->q_index);\n+\t\t} else {\n+\t\t\tring->zca.free = NULL;\n+\t\t\tif (!xdp_rxq_info_is_reg(&ring->xdp_rxq))\n+\t\t\t\t/* coverity[check_return] */\n+\t\t\t\txdp_rxq_info_reg(&ring->xdp_rxq,\n+\t\t\t\t\t\t ring->netdev,\n+\t\t\t\t\t\t ring->q_index);\n+\n+\t\t\terr = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,\n+\t\t\t\t\t\t\t MEM_TYPE_PAGE_SHARED,\n+\t\t\t\t\t\t\t NULL);\n+\t\t\tif (err)\n+\t\t\t\treturn err;\n+\t\t}\n+\t}\n+\n+\terr = ice_setup_rx_ctx(ring);\n+\tif (err) {\n+\t\tdev_err(dev, \"ice_setup_rx_ctx failed for RxQ %d, err %d\\n\",\n+\t\t\tring->q_index, err);\n+\t\treturn err;\n+\t}\n+\n \tif (ring->xsk_umem) {\n \t\tif (!xsk_umem_has_addrs_rq(ring->xsk_umem, num_bufs)) {\n \t\t\tdev_warn(dev, \"UMEM does not provide enough addresses to fill %d buffers on Rx ring %d\\n\",\n@@ -438,9 +461,13 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t\t}\n \n \t\terr = ice_alloc_rx_bufs_slow_zc(ring, num_bufs);\n-\t\tif (err)\n+\t\tif (err) {\n+\t\t\tu16 pf_q = ring->vsi->rxq_map[ring->q_index];\n+\n \t\t\tdev_info(dev, \"Failed to allocate some buffers on UMEM enabled Rx ring %d (pf_q %d)\\n\",\n \t\t\t\t ring->q_index, pf_q);\n+\t\t}\n+\n \t\treturn 0;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_base.h b/drivers/net/ethernet/intel/ice/ice_base.h\nindex 44efdb627043..20e1c29aa68a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_base.h\n+++ b/drivers/net/ethernet/intel/ice/ice_base.h\n@@ -6,7 +6,7 @@\n \n #include \"ice.h\"\n \n-int ice_setup_rx_ctx(struct ice_ring *ring);\n+int ice_vsi_cfg_rxq(struct ice_ring *ring);\n int __ice_vsi_get_qs(struct ice_qs_cfg *qs_cfg);\n int\n ice_vsi_ctrl_one_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx, bool wait);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 51a20958e0d0..9bee0d947651 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1648,15 +1648,11 @@ int ice_vsi_cfg_rxqs(struct ice_vsi *vsi)\n \tice_vsi_cfg_frame_size(vsi);\n setup_rings:\n \t/* set up individual rings */\n-\tfor (i = 0; i < vsi->num_rxq; i++) {\n-\t\tint err;\n+\tice_for_each_rxq(vsi, i) {\n+\t\tint err = ice_vsi_cfg_rxq(vsi->rx_rings[i]);\n \n-\t\terr = ice_setup_rx_ctx(vsi->rx_rings[i]);\n-\t\tif (err) {\n-\t\t\tdev_err(ice_pf_to_dev(vsi->back), \"ice_setup_rx_ctx failed for RxQ %d, err %d\\n\",\n-\t\t\t\ti, err);\n+\t\tif (err)\n \t\t\treturn err;\n-\t\t}\n \t}\n \n \treturn 0;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c\nindex 1e9cc550ec98..5f556faef405 100644\n--- a/drivers/net/ethernet/intel/ice/ice_xsk.c\n+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c\n@@ -237,7 +237,7 @@ static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx)\n \t\txdp_ring->xsk_umem = ice_xsk_umem(xdp_ring);\n \t}\n \n-\terr = ice_setup_rx_ctx(rx_ring);\n+\terr = ice_vsi_cfg_rxq(rx_ring);\n \tif (err)\n \t\tgoto free_buf;\n \n", "prefixes": [ "S44", "09/14" ] }