From patchwork Wed Jan 3 07:16:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 32844 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 218321B1C2; Wed, 3 Jan 2018 08:17:18 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0059.outbound.protection.outlook.com [104.47.1.59]) by dpdk.org (Postfix) with ESMTP id 3CFE41B1A1 for ; Wed, 3 Jan 2018 08:17:16 +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=3H8Czr9cHyzzz7AdBFzRPzVKyI4sG8/8bZFhRmjo824=; b=vcJSgW7zi3U/Y5KyEfgZzR2YV9m6UQYn5btlt6Yj/N4zjiQEpqdopEgS/PO5umMt3iss/7qNqS9of1iRw/JBKfD6xoEDr3LNxqThmwxtmoW7PobqFlrB/jcmR8FrRfvxgxTVAJ8ZPYB04gjYxMbMT2xXHFkqQykvkDP7IKJ6q5E= 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:13 +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:17 +0200 Message-Id: <4e34d9ab1e5717d86a6c31a29ac2f6625209bc0d.1514963302.git.shahafs@mellanox.com> 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: 423f3f34-0237-4d9d-0c1a-08d5527a03ce 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:qKRKdmJdXMthOAY5xWjjC0fXgf2TAlFcntXxOTl1HVPZEufV5s+JbdkuSkE2cMP3rno5PRwxxvcJb5965VofE/z02CX/G3T/lvMKNNe1gsNkV0ZsTG4kOLeqnibqE/fB9ZcYxVZpTPAtFxUWj8g2u3sB1/rOIhKZDfVrlyaj8d6gRe2RrWl8sx8/++s1cB+cqWM6gj4aOQqqVdgc9Lik+5uddeyXJpg3EgNRdMdFzo/03WNJo707drZj98NiGp8t; 25:InEZBHZgByZ+8QQ3ipr3/EwmHn7xh5Z7lhWNd2iaJ4d02hbjGSVyNldl6GQ/mxpM51alXRY2qQxhgkM/G+/o2enC7kWfcYtb69nx6slZzwMnlCOnrslbVKTyFXV0QW70Xh+Ljt4BGQx/zCcO7Z/sDvmDbaUVlE6kEjXA0/Ox1wmV0lwLu080uz652PIyBQSFNBZlvXvGhz+J00pbWdyWewcGdaZXmwzZhp6qEZJ/KgVe7iOCyFOgpZoqEOjod8Peq6/sopv/6oE7ujcbUxvxB99MDsmKSKm/QxyG0fG6UC54aJEl6Pmoo9nLpU+BCdIS5CvrlX5GOlcYaohJBtAAFw==; 31:UWbqFyG+euvcgCFpqg64Hs4Xhz7CWvs6K612/l75TWqg7Cldt3y9BuOjy7SKOmKaPypX7ugSaFvOSN980GQPcqIw76rDVIb49zIfCeXGlpJpvuDsfmz0cmZnODg4pZouiGxymW2tNxPHm+ssAn7cM7Yuq3W9Lua4aR32qAbqfxms061LUXYfnShsf1IlJNs0z7qTpM4b2baLzPU+PL4U904vOY2+SeYrbyZmP4efwYU= X-MS-TrafficTypeDiagnostic: HE1PR05MB3148: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 20:Euf16ILP0LX4Blxywt74z6RQCZQ+/2gurgTKKRK881HcBqBkP4kBcIm8I7rE/7eIuklPLD65Yzz4Lwzco4rnQ2B8vV7RdKVLegmA5L/ShpuFj4MpUmNzmQWodd8t4xzA2UOMeNmDvql3oFTCvRhToTzCHmGebi2YOS+f2A7+CRJXLaA5Vl7ejpbEQdoCj57Lth360YzWrWwDULjNGHAJQsEM00AHoEZqiuOGi0BRoBMRsYzO3v7jSuEfWn7SzkSXZzos7HlI76F0IQ0/udnJ+XrDvnEwexC0xtsgas6Zjc8x55xcoUf14f5eWgmwB7Ql4fmLOwAh9B1mCXS9CXQu7DHtRL9A69dHL4RhSL1SdcgomSjj/w79fkAYZSlP8Xlq8Z05aolPk4dqFBLBCi3E0EHAnmM0ULZDVMGzSxiguqYsQzokGOX63W6Wb1X6tt5mGesOpfcfOieotZXxOLaVkXbLuOOKghawU+NOYaYe10c49gnFfEsE4zxwS/Jk9YLd; 4:qhech/IjRyRWH1+FiwO7RZvLBwACxeFF2eH6Mrd2Qk74vyYZOq0IunlefR3eDLCnAwEMwMvNlFwbhRw+Qzwss9OzsKozf2yBuTXf9AH+gVYLI/72NUHDR9GyreOEBqtBwU6SbyxT/ZI8jVXVXcXEaDusqN++gxePjGjUxpvz2PnerakQMroSUEMoyp2dLzDpuXEdAvoaO7BMTEyqXnGP5KNENU03cgsRyqrODhRs+04GhsFCKxVcWsSUc2K4GuHRoKcBUU2V++5wbuj9HOFzww== 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)(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); 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:WO+wzGeJFKIWqeoufDTmSNGJR3+hgntyjQy4XRS5K?= mub3/RuahVPi/2QWDxTC7Y8gwHojE1+3ekjLD9wshf1iDoK+5CpXUwULuSqipjLSV7NDpNGsNSuxjSqLh5CM9roVKzRn5qOc+GqyH5+RGp5Qm3o+s/Q+Dn5szDFBrTWyMkySA5PluagXB6fD0WwZfkDtTXz73cB0WnqxNhnL50Qzkf5+/1GAoA+DTAaqFU6KmfFjWq6dmPaf0EIzcSatnhIBJkmCjUg9Lavz3QWdb1XjEwDr9EqJIP2QuSdut9sgWuy0JeJ5N5wI424r/MBlkh0Y0+rW1pL9PQ8rJRZ/3DRzcMNnbixSB3kueYfKpPt8cSrwtK7DXZPauXid8opLtVh5AaAJPKLCjlpsNDXtBx1bO46EdzZvDjbRs87/wbHwaj/hgE3GoBwcIfZVcFjf2qr/4Tt+As1G86cZ7jjKKpoc7dYQ4sPFhSJqDiwfOoNrfHsBYFX48PaJYxFymorAKQEFOb2gBbRdLbkA2onAAEd7wvpKntcHyNYLYPlZ3sByELg1JfduepmljtjMzge2DyUm1lmYR+AAdBUfJ+OGZndVWyBLZSCXzrKQ8/CsgaIQXd3f1ITS5FowMhJco+JWZTj2EQ/YXIyo1wutZVHKOsLehUEaCj2HF8f67h0gHbpJbaFNws5O/C4kdAGRxiDbuQCPDg7av/MrumgPTDS3ApOZg/vGgnv+Uk5LC8ZE6x+MQW8j1ywNakDoRDWuLK531FPQBNfnftMLJWAzPPACzPhrfuw1VehF1bV3FGKEgDo8iy8owF5BAXkTPFkUx8KUowwNOgwxtdtcbxz2K5AJBZteKTEWweGKZUq16MnSa9PRu5cRGz3wal5VKK+K31zzJWFT1VmZr8dLNM83vd8swvLFSXO7t3gdlHXzIsNI1AF1V89KTZwxGw91NFr/uzdjr58pNqm9chaqldTJcSpPcBUTTF7DQURXBBbGDI8QR/H0nIWdLfbtcIQPFISaMXYaHMqxqEOEvUP7OT6iGQO916XUyY5UHvtwADbGRXDEtiLO2uaE04ao4upPlo76MFil6fAcOSM/FWTbNLWm74VSD+02A== X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3148; 6:foOgwAPYUX1gIO02Az/D5wo3hOHtGYqhUM+XbKJWc1PlSP5KGxJV2jguHjRjW16W4A37QjhCwo8AuO6KbvHnmfyTDZkS0WJe4uzJ4yUPKlCgZ8TOhr1qwEE6b/TteD7AWGHa0CJNHr1Q10/1sLmFuSbxWnkUpRrAgjdtFHWI7oBOzd6ZOe8DjIck5vCzrMJF/Eia5F4XtjSzPebEG4iL6XkLglAr00ZG/473o5h2CsRnepAUzsQh2u1epcj31DNb9FkDA0/aKPefx/x9wENDdByPXMRZh7WyFI+y8axmJe1C6K3ag+92Jg2WJRfFwUUlV9s709lT+AC42xsYy7T25vzNsNqHp6CDDPLl5swg9cY=; 5:dO3Tr+UmaTwGeXu+t3vmwkyP889JZTClHhOCsTGsNXuDGocdKaBUXjeniTcQlSCu29DTi5/E80L54fQWlmxtXQVlFkmNlRQ31Ea/fKJRvghNkfvjk0uuPWKo2MMau4bwtpjNzL3kwoS/1Ba/hFsWFw3SAZRgILOb0aRlne6uu0w=; 24:7E4amoLlWjWJztRnG4uzoAqLR6PIZx6UpExlcM5BoHeY0KZxb1UYcS9ezI3pEqnpJ21J5TvazIQQuYGVCYlZ5BGfSRUItCf36uqAfS7T7z8=; 7:HLiWVI9nNek9ZMEieLvjZlWhYwsVGHSHuGlTJCWE2MxpnLKOAvYeYHSOcu/gA7P/oZjowQDWw56nq7ynow3HDpuW/fYwa40JaomJAW0mzXyV1sZdLuzRjZGm6cFMH/BQdTFIh6/opB658s96jouwQPOorhPdIOZWE1GXp0n+lR07/wn8gHwwk3j8I8z0zuKuSusaZrRhvmMHjkqyFu0/g8apdgXcK5cfogL+Ms0yryxmBik/ZzeCPgFkuQq3x6sd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2018 07:17:13.7991 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 423f3f34-0237-4d9d-0c1a-08d5527a03ce 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 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 | 10 ++--- drivers/net/mlx4/mlx4_flow.c | 5 ++- drivers/net/mlx4/mlx4_rxq.c | 78 ++++++++++++++++++++++++++++++++++--- drivers/net/mlx4/mlx4_rxtx.h | 2 + 4 files changed, 82 insertions(+), 13 deletions(-) diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c index 63e00b1da..39a23ee7b 100644 --- a/drivers/net/mlx4/mlx4_ethdev.c +++ b/drivers/net/mlx4/mlx4_ethdev.c @@ -766,13 +766,11 @@ 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_priv_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_priv_get_rx_queue_offloads(priv); + info->rx_offload_capa = (mlx4_priv_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..0cad28269 100644 --- a/drivers/net/mlx4/mlx4_rxq.c +++ b/drivers/net/mlx4/mlx4_rxq.c @@ -663,6 +663,64 @@ 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_priv_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 strucute. + * + * @return + * Supported Rx offloads. + */ +uint64_t +mlx4_priv_get_rx_port_offloads(struct priv *priv __rte_unused) +{ + uint64_t offloads = DEV_RX_OFFLOAD_VLAN_FILTER; + + 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_rx_queue_offloads_allowed(struct priv *priv, uint64_t offloads) +{ + uint64_t port_offloads = priv->dev->data->dev_conf.rxmode.offloads; + uint64_t port_supp_offloads = mlx4_priv_get_rx_port_offloads(priv); + + if (((port_offloads ^ offloads) & port_supp_offloads)) + return 0; + return 1; +} + +/** * DPDK callback to configure a Rx queue. * * @param dev @@ -707,6 +765,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 (!priv_is_rx_queue_offloads_allowed(priv, conf->offloads)) { + rte_errno = ENOTSUP; + ERROR("%p: Rx queue offloads 0x%lx don't match port " + "offloads 0x%lx or supported offloads 0x%lx", + (void *)dev, conf->offloads, + dev->data->dev_conf.rxmode.offloads, + (mlx4_priv_get_rx_port_offloads(priv) | + mlx4_priv_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 +814,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 +829,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 91971c4fb..bcb76ee27 100644 --- a/drivers/net/mlx4/mlx4_rxtx.h +++ b/drivers/net/mlx4/mlx4_rxtx.h @@ -166,6 +166,8 @@ int mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, const struct rte_eth_rxconf *conf, struct rte_mempool *mp); void mlx4_rx_queue_release(void *dpdk_rxq); +uint64_t mlx4_priv_get_rx_port_offloads(struct priv *priv); +uint64_t mlx4_priv_get_rx_queue_offloads(struct priv *priv); /* mlx4_rxtx.c */