From patchwork Wed Jan 10 09:17:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 33388 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2B1011B1B0; Wed, 10 Jan 2018 10:17:48 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0066.outbound.protection.outlook.com [104.47.1.66]) by dpdk.org (Postfix) with ESMTP id BB3241B1D7 for ; Wed, 10 Jan 2018 10:17:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=V85YOm0gDglJwFW4+TtZ5y09gsWXGagr834VGOcLwQo=; b=ta7w4LGNU1vTbO12wJWoj8xTouBW4OXVYqA4s2TtMm73d+3UvdIyXVfl02aeUTpfHHutUn29wTXCDhjmUM21I1oFM4UyPA6F+AsaXpFpqN9aMu8RzAkM3Drh3PUOmBMgwg93NxvbR9c/KhRik2Ez7BIoksjN53UznfSwulE6ar4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (82.166.227.17) by AM4PR05MB3140.eurprd05.prod.outlook.com (2603:10a6:205:3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 09:17:32 +0000 From: Shahaf Shuler To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com, yskoh@mellanox.com Cc: dev@dpdk.org Date: Wed, 10 Jan 2018 11:17:03 +0200 Message-Id: <4ebfa2ffdb3ad8a756ad871a4770a012970776e3.1515575671.git.shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [82.166.227.17] X-ClientProxiedBy: VI1PR0202CA0030.eurprd02.prod.outlook.com (2603:10a6:803:14::43) To AM4PR05MB3140.eurprd05.prod.outlook.com (2603:10a6:205:3::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee18260c-24bc-4314-e265-08d5580afb27 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:AM4PR05MB3140; X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3140; 3:Hl+N/p1FVhUuHSGLVyZLgsvVOEfXOe2KdE1VCtDIoHj6cob8i1kHfvo+beBkIxs2nGc6sOChnKu6VP17wEh6+4Gqis4ohSq01f9Q2R4gbqnx4+kiWlltMlf8oWnTCTamwCdgGpTPAxf3Rmoc7SFGNRxvfOiGW0dhZ0jE0KcPGC9g6D9FUsrL6v3Gzxn9Jho2WkVRr1Liiylgex16UXyiBHvIpUo1JNcNEYRpAs84k3DbtwONrypLQGcoBbsQDG2Q; 25:kE8FTtVU1OXchnK71oluOupmcJR5pHA3FdeTyE1o4eoi9Fb7ZniLNd2l2/C/A2yrYfy9G0+P207zyagCjoZTpIkm/g4M7c94QdYikKgvDYLeEYjvld/fdhuNe5abvvq/2WKSy2rpxXIZ4B6YEcSYDV67dval3a997FETFPR0DlVDoYI4IzY43Jw6489Smwed9sG2+QHw8iSRKMOJYbQkizIOMF0nvEKPejPVCxCjG9+r1ZpQ90v0fH1GhZWBdvQCtcuPPA93ZVMeVIdFUQCs7aQ7jE6+RZ8J7O8Fa7scw39WIDmB7jEZV2aKlh+rKOKvWRreCVuEnegDUC/JdLx1mA==; 31:q//tGgj3Q3eW6JC+yiwsdh41sN9Ttr7DGV8F6j64FguwOlDn9F7nNha9q721qFIswJ+bZibtexg74N5QMgdnlv56At6llCUOcnkQLEKFrLx59gaJo3l6MtzqoAAXVdGrc7rXX/O71EJ5eDAMo92k7/H8YhLhL5EX6OHLwRaYtL53ogEqsUvNTxfm8CGDMrg6eNFLSulEs+dEMjHySBjW79/XBql+OUa6gj48+L93AVc= X-MS-TrafficTypeDiagnostic: AM4PR05MB3140: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3140; 20:2zBA2oQs+pPcJr6HjRkRVmo+oC07Skw/AG+dO+XZU7IspCTkIWD/TKpWeYkZLF2MKE7POfBAA0KVM6jh7zOj28kgBb/R/hsFdZWroPnOr8ix9Gbet70b9xt4Ni6bJW2swaOMV5CtwhjNXGhfhgyP7tJATYcwiAkUjmOkvr/hx2qJuiXYq8JYIpDUc4uZWEx4MnWfbqIxRUGR6efT+q0xcXLYUqubjRVRSICvP+yro/h66cympwa2RaJWooFx4cDEpxJNFlBYyH1ND6sSqG1pd+D3qAY8PIMPkN8UCBRp17/c7pMZHOQMWaNKPX8+fzsVyVGNktEu9wPPnWM4QqrRrF21aTyBYJoOES1+T+BakvrfEgT45RpWE5eWmsnsk2HmU53Nv+JZuJQN/h++j9JQrvw6smpJcAioTYHcNO/KfwpYt68PbMwXW3C+/et7k6OPkbvvu4InB5ovegMysC2eyB0GSWt3LBHUW9qQ214OV+VmVdbZtdSgDRK3xocsMP9r; 4:qEh+78FZgVAv401X2GEXkykqYFjm8cG83SWMEqWMTZ9PZjcEPI5MX3eU0Efj31ACovT3yF/ezoBv70uPKm57PBiWQSbAMxtVu9aE11iTtNd39VJIZ3Ic4C8OJPzN0WJc/MEKYkwVqfUuk9dh1+47aTBHEtxaf3+94T1LCLdid6EaGzvM0momauYvnE/oEQinjKN+MbDip4NLGDgiz2n8UoCqM+i8x4wHohG13UXCO15vs0qbHfLNQBT5z8RKftXrfgo9nfr4RIpV5SDQmjfmxw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231023)(944501119)(6055026)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:AM4PR05MB3140; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM4PR05MB3140; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(39860400002)(39380400002)(366004)(189003)(199004)(105586002)(16586007)(118296001)(97736004)(47776003)(66066001)(48376002)(50466002)(478600001)(106356001)(81166006)(25786009)(8676002)(53936002)(68736007)(81156014)(386003)(50226002)(4326008)(8936002)(5890100001)(316002)(16526018)(7696005)(51416003)(7736002)(52116002)(5660300001)(305945005)(6666003)(6636002)(2950100002)(76176011)(55016002)(2906002)(6116002)(3846002)(36756003)(33026002)(21086003)(69596002)(86362001)(575784001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3140; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR05MB3140; 23:FX6UfagjNlh9RCj9jpyEUGxU21ydIeE8B1d/qCODr?= wCpMfb6fHaSqJdyT4M6Wb4WlTCL9bnYV1g7ewWvh+58fEe2FnuR8A25qBOoEzuSoD5kvkiq1at3G3Vcn9Mrpp+BI3xNYeoP+WzN60gaXpXUrlttUEW3jKZmRvdBRUZvpfPfd/lY41mKlDTIwYMe4Xr44zG++TTimnMHk5ekxyiLh9fy8L1iKM6FBbksRSLJYFurqtUUPMlD/Sq+CKKwn1nUkkJ3ecIOOysIrq1ni6eC3Xffsrc+Yfip8nRZcH5Kzow5nr/8LYdDNOxEGEh50vtWgknCaNIiLfzHj0YB3Gi7LH+GwVs1tz603wzH6EZl3uBH0zK6c99g6StStTIuteQhJt5Ysap2hSySnBV/yhziIMC3H0Xh1kNV7Ch5wExuJn7fiSqpm/QjU6aTk0kiZUS7UmfKBZPrcV2XuosvfA7DqNxbCvoIIYI/H7K/7kETOiDAI4YoOzSg/hvfLkfvoGg7z+xdY/AUY6YJrX20VhW+LDH23WEasCcuNKSbDEXgiN40n3PAB9Fvra6EAtmb0qIzD3i8ZE93Mey4QtlbyZ/Rku0bSSEKzdLNXYjWndVupXFCxm8mVdJrSBj+PB1dEWu4fCZhNzqwLHMH/6yi6Li8jRSIWsPgdrOj9KdGXMjUoi6K2sa+rUTmVWXakdf0g680oFIflbkMjBuIVEnEmFtMOVNCbZjcZe8yd1F4vxwfNLY/J22VdSgAjGfHToqmHNjXiZcuTETMx/CEWCW8kgIoiFbXJ9ZOCng7zf/JZYWl1EcP45AsCTSCgh6VXoCXVe6trfhxPjRJ5B3GXy3yMXaZ76ER3uuAfnWOlUtMPXYWjHQbdO1S7p6iaoDgT0xJ1lHvxRUTB2UiVOPi8tJ2/S/wEXEHT8URGVDQverC8Siw9cUn75MZqlyjkHjic5WPZtYhf1YmWT3Bs7FXZxWFT+6wywj9QLQtCBJhU/kyliLZYmTp5Air/faZhc03v18mYGnywIHvf589r3EhrHI9W9bNcpvrJ0TKGrOBkBoEUbQJ8JJJ1d+EDPQ+oU5+S1Cu2dqkVz4hxlw3yuiel4IaGkU9hCxZ841KbD4AGKoFnqXBW+RBHRN4DhlBZJRAssxKsFidMuFSVcgUUv3zi5YtwTBSLz+h0+9jZ7RSKAxZlcnvBz4= X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3140; 6:rMJQQcnrqfLq5uBprb84h9b5lDq+1FhWTeQXAbmCrRPu0sOUyux0xCS8PHHxxwUDanJ794jviQ/UoOJGXwqw9gx5Vcn1QiqeCjHgSZ4QExzCbvExu+PKm5/Frnpp4LLbkGI7WJBf8P+aAwO3LyD9/0/sOgxqsZF/ojEKbhciMNNsk0WEDaYtg+T/B8F8jCkzYukXHOdGR2/S9Wua9aJZvztDGaPbVkLjaJaXJlf/n17X4J1tEqEeOgJh9KT8zUvyk2/wjZUEO2Ys1yywWria1Hg9mJb0Th5rmegvtowNNIT3vtYY6EmE7qZIiSYn3VC2iH4okzBaB4Onr4CgStJNc02xiRZxNb8dw9jOx+EeKLw=; 5:BEJd5w2l1IS4qUM2e5o9w+LlUhSRv/mg2KvSl2aBRsHMZlqkt0a4appvwzH2azHhLkxIXJz+QidW4+vDzrJsvFRKTBDlbCuRuX10k+eZYgO4tfV+6NbBIRB0KOMg5OqSAWlQagooUNWQufbErseBoDMICT8D3btWzLKE7Lt0caQ=; 24:ZoJMGpYovxkFUp8yJge2730l+h0A3a16qiR+xRA+XD9kx04Kwo97JsAQXW8EiDUrQx9Ym3lVC49u2d+O9QfA7sDrdmp9tcA58lYbUT8aFY0=; 7:dgPESiBmUBEsdIvbbwhgqGRq2d4aV3snRK5cqvuh9ptSvLpcRvKE17mtdaj5f9ITSsZ7cjrdFBcTScdtPTL5duM8yYgt/kZH9OHJ9ZAjB7dJeYrCa3O+5+SG7StMCebgcaVrB4hkpAapVwUsPeSLnc9y8rKWdXUVHenIX0d712V44aexa/fmez1eb/kxbhf6TTp0s3kGJIHbuS3bNJV91iBaXo7nj93otNeYgU2yRuh7Y97E/TnAAp6INFWDlZgP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 09:17:32.2374 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee18260c-24bc-4314-e265-08d5580afb27 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3140 Subject: [dpdk-dev] [PATCH v3 7/7] net/mlx4: convert to new Rx offloads API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Ethdev Rx offloads API has changed since: commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API") This commit support the new Rx offloads API. Signed-off-by: Shahaf Shuler --- drivers/net/mlx4/mlx4_ethdev.c | 9 ++--- drivers/net/mlx4/mlx4_flow.c | 5 ++- drivers/net/mlx4/mlx4_rxq.c | 77 ++++++++++++++++++++++++++++++++++--- drivers/net/mlx4/mlx4_rxtx.h | 2 + 4 files changed, 80 insertions(+), 13 deletions(-) diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c index 3602f0ad8..c80eab5a8 100644 --- a/drivers/net/mlx4/mlx4_ethdev.c +++ b/drivers/net/mlx4/mlx4_ethdev.c @@ -766,13 +766,10 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) info->max_rx_queues = max; info->max_tx_queues = max; info->max_mac_addrs = RTE_DIM(priv->mac); - info->rx_offload_capa = 0; info->tx_offload_capa = mlx4_get_tx_port_offloads(priv); - if (priv->hw_csum) { - info->rx_offload_capa |= (DEV_RX_OFFLOAD_IPV4_CKSUM | - DEV_RX_OFFLOAD_UDP_CKSUM | - DEV_RX_OFFLOAD_TCP_CKSUM); - } + info->rx_queue_offload_capa = mlx4_get_rx_queue_offloads(priv); + info->rx_offload_capa = (mlx4_get_rx_port_offloads(priv) | + info->rx_queue_offload_capa); if (mlx4_get_ifname(priv, &ifname) == 0) info->if_index = if_nametoindex(ifname); info->hash_key_size = MLX4_RSS_HASH_KEY_SIZE; diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index 69025da42..96a6a6fa7 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -1232,7 +1232,7 @@ mlx4_flow_internal_next_vlan(struct priv *priv, uint16_t vlan) * - MAC flow rules are generated from @p dev->data->mac_addrs * (@p priv->mac array). * - An additional flow rule for Ethernet broadcasts is also generated. - * - All these are per-VLAN if @p dev->data->dev_conf.rxmode.hw_vlan_filter + * - All these are per-VLAN if @p DEV_RX_OFFLOAD_VLAN_FILTER * is enabled and VLAN filters are configured. * * @param priv @@ -1300,7 +1300,8 @@ mlx4_flow_internal(struct priv *priv, struct rte_flow_error *error) }; struct ether_addr *rule_mac = ð_spec.dst; rte_be16_t *rule_vlan = - priv->dev->data->dev_conf.rxmode.hw_vlan_filter && + (priv->dev->data->dev_conf.rxmode.offloads & + DEV_RX_OFFLOAD_VLAN_FILTER) && !priv->dev->data->promiscuous ? &vlan_spec.tci : NULL; diff --git a/drivers/net/mlx4/mlx4_rxq.c b/drivers/net/mlx4/mlx4_rxq.c index 53313c56f..98ab1d266 100644 --- a/drivers/net/mlx4/mlx4_rxq.c +++ b/drivers/net/mlx4/mlx4_rxq.c @@ -663,6 +663,63 @@ mlx4_rxq_detach(struct rxq *rxq) } /** + * Returns the per-queue supported offloads. + * + * @param priv + * Pointer to private structure. + * + * @return + * Supported Tx offloads. + */ +uint64_t +mlx4_get_rx_queue_offloads(struct priv *priv) +{ + uint64_t offloads = DEV_RX_OFFLOAD_SCATTER; + + if (priv->hw_csum) + offloads |= DEV_RX_OFFLOAD_CHECKSUM; + return offloads; +} + +/** + * Returns the per-port supported offloads. + * + * @param priv + * Pointer to private structure. + * + * @return + * Supported Rx offloads. + */ +uint64_t +mlx4_get_rx_port_offloads(struct priv *priv) +{ + uint64_t offloads = DEV_RX_OFFLOAD_VLAN_FILTER; + + (void)priv; + return offloads; +} + +/** + * Checks if the per-queue offload configuration is valid. + * + * @param priv + * Pointer to private structure. + * @param requested + * Per-queue offloads configuration. + * + * @return + * Nonzero when configuration is valid. + */ +static int +mlx4_check_rx_queue_offloads(struct priv *priv, uint64_t requested) +{ + uint64_t mandatory = priv->dev->data->dev_conf.rxmode.offloads; + uint64_t supported = mlx4_get_rx_port_offloads(priv); + + return !((mandatory ^ requested) & supported); +} + +/** * DPDK callback to configure a Rx queue. * * @param dev @@ -707,6 +764,16 @@ mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, (void)conf; /* Thresholds configuration (ignored). */ DEBUG("%p: configuring queue %u for %u descriptors", (void *)dev, idx, desc); + if (!mlx4_check_rx_queue_offloads(priv, conf->offloads)) { + rte_errno = ENOTSUP; + ERROR("%p: Rx queue offloads 0x%" PRIx64 " don't match port " + "offloads 0x%" PRIx64 " or supported offloads 0x%" PRIx64, + (void *)dev, conf->offloads, + dev->data->dev_conf.rxmode.offloads, + (mlx4_get_rx_port_offloads(priv) | + mlx4_get_rx_queue_offloads(priv))); + return -rte_errno; + } if (idx >= dev->data->nb_rx_queues) { rte_errno = EOVERFLOW; ERROR("%p: queue index out of range (%u >= %u)", @@ -746,10 +813,10 @@ mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, .elts_n = rte_log2_u32(desc), .elts = elts, /* Toggle Rx checksum offload if hardware supports it. */ - .csum = (priv->hw_csum && - dev->data->dev_conf.rxmode.hw_ip_checksum), - .csum_l2tun = (priv->hw_csum_l2tun && - dev->data->dev_conf.rxmode.hw_ip_checksum), + .csum = priv->hw_csum && + (conf->offloads & DEV_RX_OFFLOAD_CHECKSUM), + .csum_l2tun = priv->hw_csum_l2tun && + (conf->offloads & DEV_RX_OFFLOAD_CHECKSUM), .l2tun_offload = priv->hw_csum_l2tun, .stats = { .idx = idx, @@ -761,7 +828,7 @@ mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, if (dev->data->dev_conf.rxmode.max_rx_pkt_len <= (mb_len - RTE_PKTMBUF_HEADROOM)) { ; - } else if (dev->data->dev_conf.rxmode.enable_scatter) { + } else if (conf->offloads & DEV_RX_OFFLOAD_SCATTER) { uint32_t size = RTE_PKTMBUF_HEADROOM + dev->data->dev_conf.rxmode.max_rx_pkt_len; diff --git a/drivers/net/mlx4/mlx4_rxtx.h b/drivers/net/mlx4/mlx4_rxtx.h index bff5ae43d..900cab372 100644 --- a/drivers/net/mlx4/mlx4_rxtx.h +++ b/drivers/net/mlx4/mlx4_rxtx.h @@ -161,6 +161,8 @@ int mlx4_rss_attach(struct mlx4_rss *rss); void mlx4_rss_detach(struct mlx4_rss *rss); int mlx4_rxq_attach(struct rxq *rxq); void mlx4_rxq_detach(struct rxq *rxq); +uint64_t mlx4_get_rx_port_offloads(struct priv *priv); +uint64_t mlx4_get_rx_queue_offloads(struct priv *priv); int mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_rxconf *conf,