From patchwork Wed Jan 3 07:16:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 32843 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 162F41B1B3; Wed, 3 Jan 2018 08:17:17 +0100 (CET) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10055.outbound.protection.outlook.com [40.107.1.55]) by dpdk.org (Postfix) with ESMTP id C7D491B198 for ; Wed, 3 Jan 2018 08:17:14 +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=Xbfo2mXk1Ri+XmIQ0B6/WUkIIZiIk4eEBDt55XPlZD0=; b=dyciFcjrgtwr6as8YQpcqSRpZqQOu5Y+8eo2f3pramwPfoiqXYFFPvf4A3bf4kZCgn5+gcXPswxdeOqQdlOJkOKcPdXXagDzhpiUl2e8HwBSXPnH+oILb53GJhqWWokFeI7EAd4t0HA73EgYUFUnvdA8OlozJH7SnKwkvhcY95s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (82.166.227.17) by HE1PR05MB3148.eurprd05.prod.outlook.com (2603:10a6:7:36::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Wed, 3 Jan 2018 07:17:12 +0000 From: Shahaf Shuler To: nelio.laranjeiro@6wind.com, yskoh@mellanox.com, adrien.mazarguil@6wind.com Cc: dev@dpdk.org Date: Wed, 3 Jan 2018 09:16:16 +0200 Message-Id: X-Mailer: git-send-email 2.12.0 In-Reply-To: References: <20171123120252.143695-1-shahafs@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [82.166.227.17] X-ClientProxiedBy: DB6P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:6:29::28) To HE1PR05MB3148.eurprd05.prod.outlook.com (2603:10a6:7:36::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 625c4fa8-76cd-497f-765d-08d5527a0316 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060); SRVR:HE1PR05MB3148; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 3:6ERjraaStk2WGPXQdfJV4UJatVR2UYnoqWvWgVwpgHnrPrKF5FD+kbudDF8V7zGElyU5o/9Pdrz3PwSAuyib2HK0GgGVPwIh3rQ5yc4bHcoaxAN5D2cxgdgFpi3ErkhKHnIlckm2YtPj/vhb8CAwuYrNYLMLAKjafRybEFNRb1/R7k8j5A21H5ZhAncK6COAP0WmWik2EhOgUeNmjn18BYJPVUY8SifPYAxBQsj5bkmNxpoOiTLpePbmLUkzB0nb; 25:NvPw6Qxp0pJwKqsKxPYTlPxVY13+8klMPDv3D54sovtbK8p6rGDK3Aj8O15pg2xJCJmJn4acd6+bESUYe6+zw/IfvdmnyEtm1e74Q7ptKmLX2shK+whyM8tL9jSmP/UqNd+tYgHbrMTAEzOJMx+5nFa9LV4cBCqWVoarERyjNHIzwqs2bAQKds3e8AVQlrhk+qY6tQSHncOLKBiCceSwwwpVYQ6fbFXH9NQ6SxXfEgEA1DeBQCJz0b3UJ7+taSnjGYorF676AppGzHCpuB6lWi4h4ohaHDHYUScLhvsM4rgilph0QRlv3FgK+kg46oolA6DdsHxPX+oGicCEsWN7Ew==; 31:hlceeunHc4m93oEFaHoymYlgryBj3+9xOVVhfwWT5h/oOCGYg0Lv8iKS10fydEkioO0PpKrdk7MHaYOLQ3GXc7FsYEh/isVS77vehHS7ocmuKNBbTxBZ/maz3DicOPtiYdNHXRpbzVa9WCMS4LxSCpCohLTpcd1HtWEmbxzgAGmRpI2jW5DQnc2R6xa29ShjxQaaZj3HOCrHIgQP1HdwUXKVemZK7X3oeLHt0/tcRwE= X-MS-TrafficTypeDiagnostic: HE1PR05MB3148: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 20:rtETBwM6yavUw//w1QtIcYrmtEFYNP0Fc9StVSjN0ZozhVSoWz1kd7Jdmnes2TchCcWCG+4fOSP9DT0dN1S/gTYR8bu3zu67Z6Elu7XA9kTDA2euims9ThlKlUBCHLa/PwhM7+XgCxWOS8prgOV/3H1qrhk/Pn90aSV3LOYzBwCskOQrN9kIgNm9cy/oEzs0hEZSUqNBQ+pSVCVzom91KWN13G19WohdOXX35hEZL0qrYqYy9XjJjq7lJnBNPuJP1c+TSxoDt9zWirfJKA5to5UWcZ6KOTyA3AwgPv1+A3Mq4PlgRDw4rMACmM1sxn0LQEPqdv4NAjavVgHR6dkVhFR5rUCKDRXolxgj3PiJPBIUj0pIMIFcqzPlK6j0alp38kwEv/M4CDo6iiBKBX+7lc6fRxmNOS8uetfMpLEsJjJ/0wavnPVYNuHjTLoJ88dnkLgzkQISgjTj4NwwSM6zRtnpb0GrNSCoWL1uCp+Afc5qJfA5LkNyLBhp/x00dIV4; 4:p6p9Y3fNuQSrLhVdwAysMxDKq2+VTjFzDOS858G6yaOrUYqBSQdhOulNbyYEU/bP/taLulL9WHDFuNS300p0Vrt3Or7L7fTOD3018plZJF7LxN2FvtbXPmi+Ahbfwm1ST6c+ivMm64QZYKBcdqv86lH48aFQwUGZVMG7oYBPWE+SVYwxojJCRSaKFQ4iHPa7Tl5SBSbQ/EkElqmqaBl9be6r7858MjFilOjeeHh1yNty8fr0tVTYNz9Fv9YUnjitaLg5GljOinv0miAQysjY+w== 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)(10201501046)(93006095)(93001095)(3231023)(944501075)(3002001)(6055026)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:HE1PR05MB3148; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR05MB3148; X-Forefront-PRVS: 0541031FF6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(346002)(39860400002)(396003)(366004)(199004)(189003)(5660300001)(76176011)(51416003)(52116002)(4326008)(50226002)(7696005)(59450400001)(7736002)(8936002)(386003)(2950100002)(69596002)(81166006)(118296001)(81156014)(55016002)(478600001)(68736007)(8676002)(33026002)(106356001)(105586002)(53936002)(50466002)(3846002)(48376002)(6116002)(25786009)(2906002)(97736004)(305945005)(21086003)(66066001)(16586007)(36756003)(316002)(86362001)(16526018)(47776003)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3148; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; HE1PR05MB3148; 23:x3z8UaMrFrAdOp525RsC9cUvjYZVX4E9RLRiQyS1j?= Dgp/vHRExC18Ewoyipdar0OrJ5T4800jEMrEfNTkCuZaJ1oXHzZsb8tvxTjqs84frD9uf/MWO7v4D3jORxkHQKBxNQpWxUdMHb3yYeblVUvBseeW1lAsnTLiHHqLkX7liGe7J1aU7nBss+rlXYU/jzz9ENuOhF97p/Jo9AUh4w7m+I+YD+MPHKruLoz15KadySSI8Ve6wIxbKg78SLBAVqvKfgGKPdF2z2Obn+Ka6cmg3ULIAwE1DYhbHvMJLXMookl7vP5pl86iEMBx5nbiC4D5k+burahgKNJ+5rI0YKhgPGTrIkYQiNm8swNIWeC9cDB06bW4kG/GSQmNTJwD/SvvB8AE8GP4qbmLB8kfwtmKMPosJez2Gz4Enokd1YFoZCXZF/7pMTtMHlkeAnyRyahP8cBabkW+kvsWKxJ5MRgqKQCtMGn76W1AQv6Y/VVPKLdj5nGhd1YQIEvOuk/3mEDV9CdL36Yr8CSQSIpcsVQc53JdivPAfxPeIA7mp9eH3Exc1XEmp3oDci96JGlrBQ8MUc0FsddMmQTxH5fhhlBl4+/mWeUHeS5dqMnClF97K9EEQ27Ba7f6cwZmxHHhTD/FikKuMLwMfodCDj6Gu5Q2lGgSNz8fyXcJY/p1HlTcxFGsxlUnrnObUs65nM+Htg5296iooObxMCu+aOYKIvcF2n6snRu+n4lOip/OJHFRNgupjYCkh0SqdTtZueSF+u91zlOiiy3TE+Rp3Yt6UhzA+MIZlWDcxBO+xCFcX52tnnHuEgKyLbeRb/nrW1OT3GmSljsIFHVGrdlktnVLMkj2IOWiiNdYg5cWI2lJZNuh5r/M1loCCe6gmiqc0gXsFoQnzXslrF09LByfoHKmYQpIeziH47blfhzaZSnN7wRUQn/N23dHSumLUoM9U3QeoRHTHrUb67EOkgNINQQOhlEqYM1f/WkLZbWMZ8Wff2OLPyERM5reQVAxUcc6/uORLxf2sRtiXAC8PFgsgN1b2BHS90nCkXR+fjyYtVP12IPN0YjZVRiAscxPfvX+kvw4KEkNVCIg6NmVcEnhkLzrXDFr6dnF430zz0wFggR/mwT9bHjioDfYb2T5ooOdFoMxkR5yxEDQfRnSVax3KDZ96IkVg== X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 6:uQshl9h0bdnnYvRzVJWYRkHQbtxg0PKV37WtEM55vY7iGeUCmHYehGbZEO8M4jXTl8b9A3DrwejE+M/ibmuYXEyaxd4nK+94rQtviHsDPlOnKctz7W0srgH3F+5q1kZdNYNVnEgr9I968lSDwpDirgOKDf2epw01DhcSPfOFk3jyVaJvekwb27XHnCh9KQ7wWQAebaNeO95DharvQbRLqs37/d/8mxp04oWIeyHd2YHo1vg+Bo4H5ZBBTr8RyVHj7NgmVhRllHd8MsLBaU51uPhS7GCQBUfg0DvWTZwPw1v094QtI62glJzcVEalGAn7QdwXhEWsE25GVlips7uFYjWS1hu/vukJkyllM5dj6i0=; 5:ypBsOpqWROns2X65yzKAAMBV1IS6x33k1wATIy3Dy34zEmmBRZrsgmTXUqWgPhNE4pR4O1fYBIlduPdkkrIe/i0KMdD/VdzRLO22ugH4QBsA7IBKUhJvPB7BGWOpUhK1lVkz7coh6ho32oSv7yY/m2KW3sehTobHF2wqBy0RJg8=; 24:Splk2NsjasF4RnJCOv8WPKv51fVAPBw4zIj5FCMSypuAhltEnXBE3mr92ECmPsg1wRa3RUbeqYhPB5pnxJ8eUPTwK232mvcVet0KlsU2t2I=; 7:2Tv8wk43bah4uflucggRmOY3zlhU/lByefG+mmUsZuSEhCI2Wc9xX68ZKU0XcVS6IQdr3NbLENYfywxmlip+KvN1MechJ3Cb63FtzpCvLFT3ykijD9hHyaVDd0GJIeaT5QMe4fom7TbI3x6ZXWPo1TJ4zDPmpoFhOOhTG+w/838ygqEbijd4wAE726WoapnsNrW83Jp6Swkrq0d5oKPjiu8aTSpZOxgppArFIesSmU3Zf3AVo8wMr3pDqrVw6fAm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2018 07:17:12.6115 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 625c4fa8-76cd-497f-765d-08d5527a0316 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3148 Subject: [dpdk-dev] [PATCH v2 6/7] net/mlx4: convert to new Tx 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 Tx offloads API has changed since: commit cba7f53b717d ("ethdev: introduce Tx queue offloads API") This commit support the new Tx offloads API. Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- drivers/net/mlx4/mlx4_ethdev.c | 7 +--- drivers/net/mlx4/mlx4_rxtx.h | 1 + drivers/net/mlx4/mlx4_txq.c | 71 +++++++++++++++++++++++++++++++++++-- 3 files changed, 70 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c index 2f69e7d4f..63e00b1da 100644 --- a/drivers/net/mlx4/mlx4_ethdev.c +++ b/drivers/net/mlx4/mlx4_ethdev.c @@ -767,17 +767,12 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) info->max_tx_queues = max; info->max_mac_addrs = RTE_DIM(priv->mac); info->rx_offload_capa = 0; - info->tx_offload_capa = 0; + info->tx_offload_capa = mlx4_priv_get_tx_port_offloads(priv); if (priv->hw_csum) { - info->tx_offload_capa |= (DEV_TX_OFFLOAD_IPV4_CKSUM | - DEV_TX_OFFLOAD_UDP_CKSUM | - DEV_TX_OFFLOAD_TCP_CKSUM); info->rx_offload_capa |= (DEV_RX_OFFLOAD_IPV4_CKSUM | DEV_RX_OFFLOAD_UDP_CKSUM | DEV_RX_OFFLOAD_TCP_CKSUM); } - if (priv->hw_csum_l2tun) - info->tx_offload_capa |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM; 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_rxtx.h b/drivers/net/mlx4/mlx4_rxtx.h index b93e2bcda..91971c4fb 100644 --- a/drivers/net/mlx4/mlx4_rxtx.h +++ b/drivers/net/mlx4/mlx4_rxtx.h @@ -184,6 +184,7 @@ int mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_txconf *conf); void mlx4_tx_queue_release(void *dpdk_txq); +uint64_t mlx4_priv_get_tx_port_offloads(struct priv *priv); /** * Get memory region (MR) <-> memory pool (MP) association from txq->mp2mr[]. diff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c index d651e4980..f74e4a735 100644 --- a/drivers/net/mlx4/mlx4_txq.c +++ b/drivers/net/mlx4/mlx4_txq.c @@ -182,6 +182,53 @@ mlx4_txq_fill_dv_obj_info(struct txq *txq, struct mlx4dv_obj *mlxdv) } /** + * Returns the per-port supported offloads. + * + * @param priv + * Pointer to private structure. + * + * @return + * Supported Tx offloads. + */ +uint64_t +mlx4_priv_get_tx_port_offloads(struct priv *priv) +{ + uint64_t offloads = DEV_TX_OFFLOAD_MULTI_SEGS; + + if (priv->hw_csum) { + offloads |= (DEV_TX_OFFLOAD_IPV4_CKSUM | + DEV_TX_OFFLOAD_UDP_CKSUM | + DEV_TX_OFFLOAD_TCP_CKSUM); + } + if (priv->hw_csum_l2tun) + offloads |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM; + + return offloads; +} + +/** + * Checks if the per-queue offload configuration is valid. + * + * @param priv + * Pointer to private structure. + * @param offloads + * Per-queue offloads configuration. + * + * @return + * 1 if the configuration is valid, 0 otherwise. + */ +static int +priv_is_tx_queue_offloads_allowed(struct priv *priv, uint64_t offloads) +{ + uint64_t port_offloads = priv->dev->data->dev_conf.txmode.offloads; + uint64_t port_supp_offloads = mlx4_priv_get_tx_port_offloads(priv); + + if ((port_offloads ^ offloads) & port_supp_offloads) + return 0; + return 1; +} + +/** * DPDK callback to configure a Tx queue. * * @param dev @@ -229,9 +276,22 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, }; int ret; - (void)conf; /* Thresholds configuration (ignored). */ DEBUG("%p: configuring queue %u for %u descriptors", (void *)dev, idx, desc); + /* + * Don't verify port offloads for application which + * use the old API. + */ + if (!!(conf->txq_flags & ETH_TXQ_FLAGS_IGNORE) && + !priv_is_tx_queue_offloads_allowed(priv, conf->offloads)) { + rte_errno = ENOTSUP; + ERROR("%p: Tx queue offloads 0x%lx don't match port " + "offloads 0x%lx or supported offloads 0x%lx", + (void *)dev, conf->offloads, + dev->data->dev_conf.txmode.offloads, + mlx4_priv_get_tx_port_offloads(priv)); + return -rte_errno; + } if (idx >= dev->data->nb_tx_queues) { rte_errno = EOVERFLOW; ERROR("%p: queue index out of range (%u >= %u)", @@ -281,8 +341,13 @@ mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, RTE_MIN(MLX4_PMD_TX_PER_COMP_REQ, desc / 4), .elts_comp_cd_init = RTE_MIN(MLX4_PMD_TX_PER_COMP_REQ, desc / 4), - .csum = priv->hw_csum, - .csum_l2tun = priv->hw_csum_l2tun, + .csum = priv->hw_csum && + (conf->offloads & (DEV_TX_OFFLOAD_IPV4_CKSUM | + DEV_TX_OFFLOAD_UDP_CKSUM | + DEV_TX_OFFLOAD_TCP_CKSUM)), + .csum_l2tun = priv->hw_csum_l2tun && + (conf->offloads & + DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM), /* Enable Tx loopback for VF devices. */ .lb = !!priv->vf, .bounce_buf = bounce_buf,