From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40047.outbound.protection.outlook.com [40.107.4.47]) by dpdk.org (Postfix) with ESMTP id 3D40D8E01 for ; Thu, 4 Jan 2018 19:26:35 +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=7yAwurtzF17ZDeJs6b4a4j0WdrAyyyk9vh98TzAwLm0=; b=UsY/c+G+6OqD0EmY80FEuR4K2Bzey6XNpkyifthUvacfRPuSJYFQV4oOznE9/Kk52KXvSnxJLC++pSq1yZfKxr5/C+80GZ+a/lLCipySnnylKIp5kFS3xJjfpWiSZWEokPEueloled3zN1QAHkNhwI2rIGMJkjwDOXUavlCxKTU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from mellanox.com (37.142.13.130) by HE1PR05MB3212.eurprd05.prod.outlook.com (2603:10a6:7:35::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Thu, 4 Jan 2018 18:26:33 +0000 From: Moti Haimovsky To: pascal.mazon@6wind.com Cc: dev@dpdk.org, Moti Haimovsky Date: Thu, 4 Jan 2018 20:25:53 +0200 Message-Id: <1515090354-183605-2-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1515090354-183605-1-git-send-email-motih@mellanox.com> References: <1515090354-183605-1-git-send-email-motih@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: VI1PR0501CA0009.eurprd05.prod.outlook.com (2603:10a6:800:92::19) To HE1PR05MB3212.eurprd05.prod.outlook.com (2603:10a6:7:35::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 79543cbb-8b0d-4027-d5f0-08d553a0af1a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060); SRVR:HE1PR05MB3212; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3212; 3:Jmxzd0PGfi/Ox5WMJm6TY/I0ZyiLWCO8Xp80DyMAsK0liQgcNlJy2dj9p3z16EjSxfE6hntDgwYhEOmgcUqvC9+BA8NThIcZ/xgYLul5s0C6Yzpio0SmgqNL0rkwTWMA9Q3rN67DULppgG0i9gfE13N6CRx9+Ka5eu74Jo5vcKYJ0CsSSE19vK/pmnp8LW6YEkrXTrUmCZOsIPsEydQ43tsM4nvjdAHJjlGzsqlY8WguwXMQxs+NVSDN6xlfdz6I; 25:ME0a1kUHyx+c+fNvXmLYeNd+PNXQQEP+iI4S5EfzYZKNso+QEj+gl1b7PbyD+AFD+WgtvwGImf1UwsYrvFuXQZy8cfXVSHEx5QLbhF3rS9b7QePpmdd+CXjIGLISMug8gRk/R1LXFX6LjSkU4GxlO5AWTFjWgrmZig/wrF77+uHg5OfyaoyV05XgPxj2Sb7K9Kriz5elz0GqbO3P3ipJhvz9B5z3Aapr3tCbgF8lqK5bnXHC2TS9YMmVLm2r6IBoAJSJ2kD0aYmUo5U5H88CfVz2yN4hzDNKYgACkgiO6Pti+gPmq++oWKMqqlxvtcO5LW3i4eIhoOfpiCEiF92EaQ==; 31:75spadqz52gcWyEeSf3rZkPKDwPChExVd12/P421/6CtPClXsmLLMG0vuK1ihkFbdKUyCa/mi6Bp0gROjQzyJXuMNFtqBi/8Hu1Z398QXeA+OfqEpGr/MQLPx9V6EBob3t7h3jW+X6TVITIdymbX+FiMZf1KYv6pbbK9xRDmupqTJRglOAkjAYm+Q/DJ6e2lKfFQpznga2iXAqUNNXkehYVQjU5hXu+rQht+MxipY8o= X-MS-TrafficTypeDiagnostic: HE1PR05MB3212: X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3212; 20:K/9Sn5G10XBU0MihplFal8JBkEqX3p+D6YpY8Zk+aWKdioiLy77l4R9CC2UAI990M5dPT5tL1gPk3q5E2y0iccvoeOjI0cyKI/wzsJg8KDW17Xe6xnat86CMq6pceQIlhmvEL2bLDN4TGDzunQZyWbjuTDF5S06BD04ngSQvlaO1+rub+C4xao3vesY04kCWzal+k8YdufvxcabnKH2bW98ojHuqw+H90wJHOW4/0cHUUKdGDK1iMmjg5FzeTcCL13JPWgyei77GXVVT6pgN2uddHrkZsT23mqhvu5ufKRs/zJ6iD2ajW5MZ0UmLFpEangythtUHLti/iCjKpkgRCbGB2oaNSvyg/kn7OTIANhT7Ta4HwNpDOWbzKwdtaEXWIKSlOyKId8qmWpWX5NYhLzMNMrVT9S5/daSImv63AuRybeF6407dRrx7Pho+kmo16cXFSwiS5SEo4jap1XGiTaayQuOPcRbCbcCVauv5W3J0/iJXN26FIlao0dM1C9ag; 4:uh1t+2c6MaAnBbUCcUHQHNlpse0Dvcfr3PdKi33P7aE49Fa1dPjn3FkBh8nq7K+YrSarX9uy+WtwZqUCwvBVtvPi7cjOsPFVRk2uaPnyHWCaCJRRQLrbftxex6Q1fkiFhpB0PYKNWLdIPZ/8uNAVDG6Osws30ceRp89Wi9Mn+ugLJoZbnDM0OQWrhOTfPygDhNhCUM6d2gN8UwwNqq7/p7gXYj5e/mjKsWN7uekHwpK+9fc/A5JX7uQpAC2bepICWLrKkqbcoAytuW3AvjusBw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(3231023)(944501075)(93006095)(93001095)(10201501046)(6055026)(6041268)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HE1PR05MB3212; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR05MB3212; X-Forefront-PRVS: 054231DC40 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(39860400002)(396003)(366004)(376002)(199004)(189003)(16526018)(478600001)(50466002)(5660300001)(7736002)(305945005)(4326008)(50226002)(97736004)(6116002)(3846002)(25786009)(316002)(4720700003)(48376002)(6666003)(81156014)(68736007)(6916009)(2950100002)(8936002)(16586007)(8676002)(81166006)(107886003)(51416003)(7696005)(86362001)(52116002)(76176011)(69596002)(33026002)(53936002)(386003)(21086003)(2906002)(47776003)(2361001)(106356001)(59450400001)(66066001)(36756003)(55016002)(105586002)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3212; 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; HE1PR05MB3212; 23:25wcycPh2t468D9SM1zG7XkAVzdGVPk4czguGobVi?= =?us-ascii?Q?E5I8bWCWoROpQaUGJlpLdXmApFdc4f5fg0ZAFgwkjsLJ9zmclRf6JnTzr03u?= =?us-ascii?Q?Rw3WgGRsFVdFr8XorY3HdxhNqq69gnPZGB2YNgxgtMMMhdrhmGzsWW2RLBxH?= =?us-ascii?Q?RYihc14UcA7PnpVIgYUBK78AkUd95tKg1pMZuBR/6xSYRJAXWQQG9FA2qvyY?= =?us-ascii?Q?ADvjOw9knWED5SeyPkd1nqAdaPMJdib4LeHhKTekV31FmDpDPH56XcQoYc97?= =?us-ascii?Q?OA9qNMjL3ZOzsCMlMkoKTQ5SB3iRvWy4xCGj2esC8L0XU4oqWBH0Pu4rWQC8?= =?us-ascii?Q?5Y2E4LdMUhVMJG2/tvUS+VpS0YnZfmFDMTi/hCSTYuqdrb3NiU6QapZcTji/?= =?us-ascii?Q?l2uF9VK/5E59iKBrkspkr4iWfQ94quTaEkxjoolLq8O3pTOPt70jG+mRya3Y?= =?us-ascii?Q?b2XnxPcF2s9kdr01lAyQAwcH+HXPBlQyruPRqAjDSAtfxL1xWMwCE1zH/gTx?= =?us-ascii?Q?PRFPxcXafPmfSq6vNl4HDTliVYNqVPK5nE9zv9kucDIUNOxOKg0TytrhDEMJ?= =?us-ascii?Q?A+ih58wkdJq72TC5WsqVlAp3kayXDUKn5wxngPDretHvzKD0t2U7sTmIRg1M?= =?us-ascii?Q?vPkbsy11DMMUHChoiaPp97UqDofr1Gh56bhZ4kLljIeCl8AGbz3eGpw0TcAH?= =?us-ascii?Q?HTp4q5joI+ylyvP65GDFy8deggR/h4gtXyJ8Zct6QWT/6CcbcvyRtW8ieYKc?= =?us-ascii?Q?I9c9xuua7wi58hglHFFghpHdPD3N7V2FCNi5kjLAMOUl3R6GLtpMIJ4n8sZv?= =?us-ascii?Q?hppb5Vw4Ml/6ZfPvQoN+ml4uTHlaJFOoG3b2AdCu7EKVdMSljdnhF2XJWUk9?= =?us-ascii?Q?PBS9BI+wld3WUYF2pcWQUsmCdvzhwaVAsluz/BLYjrIny5fC9dzy0qMMRVqI?= =?us-ascii?Q?TiLOle5sYq6L/w7T2KWIc0IkrgMi4oh2Qe/3iurkJz50qoDWohmxJEYwke21?= =?us-ascii?Q?x4h1dZMVTqiGAYLFAw3bfgZf47etjxUrpGdGWxieiQQfRrbFLf+0qfnNQwiX?= =?us-ascii?Q?oVZ3C2+8hCuXmfXyyAzl/WpayGadfYF4lSdAx4XhDrAA2TDZsQ+k69a/yRzu?= =?us-ascii?Q?SjWDlhuuXTPrCLfv0XeHP8uZ795CnPonoEIsw1YrSABMq8sdqlFoelqer6mh?= =?us-ascii?Q?Q03f3jzZgUuPiD1sbaRBau1waoGtZkuszhRt0WmsF/Wo4hl8JkFNkjh7Q=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3212; 6:DzKmV7LIeHkDmDLkSq8QIYNqQrnMhloZV4KeXEiCAEclPd7LDtEtYkJlD+Neix6Bk+d4nEcHLPYqVqtpClZqQgmR4XemXHMsomjMrFoHHFSXTZ8pFm7+77HwFo3W7ZRvkZwHj1sQOH9ywdfyU4HsiRBTlHsG4iuGOCsNg0zkowlsOAQ13OiF43PK6y+GF7h/0GsvX563dkfVvzHwvPjQa/WFyWQ5LtzLqEx/ExWlGWi4iGeK+kPugr4zp+JStZnz3pZMDJuca2G6EQhD3ZDT9+EhL+vN4qW/KVo/ikddgkq7wcz1zxt+SJPPtY9ZVRoBH3AoQeSJ1F6X3qeEM2UoDjuYYbpe8xc+DNxyWEDTNko=; 5:qxTEbBptOkeJUVPk8UlmfQsUVa9RpYPZppkfQ4+6tJi6ouRwRTe29iQO6UWuT/VfZhroRvG2++gkduv/XUchRxIpkTSDdjqQJ02ypl3HgTYeq6bEbnRyFx08+S6C1flEk9prCIJ4m4kDP1qvski+dB7FattItgGr9KPyuMDH1Vw=; 24:ADrZwwoGIf53ygCIToKoHAqSy05UFIrTq/xxbDVzm7HLj0cyJ+LugxI7ONMHXxWDCSVl+Q/smPseMp/9/huLqlVOfvYH5GcoAScwRlS06/k=; 7:D6IbRBM9PMag9huWe+e/0ftW5zU26j6oQ8dtUDo9gl89qjIP3I4zbo+pEEQ1jDQfKjS4El91wtrTj3mBNBTl4+tYNCf5H9AolximFAkX8rm7fZhYSN/wuFsWieeVKYoRWTyEfn8hJldgHfr9DT4BhIoTNFUukT8vd41V96Ffu73Gvr50IV+2ANl+5s3pImraqxGKUK1JXbK5gg02axwX6WLGEvoLzRb1gdU1iayl8bQ46uiub+FykmTCvvcxVhby SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2018 18:26:33.4343 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79543cbb-8b0d-4027-d5f0-08d553a0af1a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3212 Subject: [dpdk-dev] [PATCH 1/2] net/tap: 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: , X-List-Received-Date: Thu, 04 Jan 2018 18:26:35 -0000 Ethdev Tx offloads API has changed since: commit cba7f53 ("ethdev: introduce Tx queue offloads API") This commit support the new Tx offloads API. Signed-off-by: Moti Haimovsky --- drivers/net/tap/rte_eth_tap.c | 96 +++++++++++++++++++++++++++++++++++++------ drivers/net/tap/rte_eth_tap.h | 1 + 2 files changed, 85 insertions(+), 12 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 6b27679..5925709 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -379,6 +380,42 @@ enum ioctl_mode { return num_rx; } +static uint64_t +tap_tx_offload_get_port_capa(void) +{ + /* + * In order to support legacy apps, + * report capabilities also as port capabilities. + */ + return DEV_TX_OFFLOAD_IPV4_CKSUM | + DEV_TX_OFFLOAD_UDP_CKSUM | + DEV_TX_OFFLOAD_TCP_CKSUM; +} + +static uint64_t +tap_tx_offload_get_queue_capa(void) +{ + return DEV_TX_OFFLOAD_IPV4_CKSUM | + DEV_TX_OFFLOAD_UDP_CKSUM | + DEV_TX_OFFLOAD_TCP_CKSUM; +} + +static bool +tap_txq_are_offloads_valid(struct rte_eth_dev *dev, uint64_t offloads) +{ + uint64_t port_offloads = dev->data->dev_conf.txmode.offloads; + uint64_t queue_supp_offloads = tap_tx_offload_get_queue_capa(); + uint64_t port_supp_offloads = tap_tx_offload_get_port_capa(); + + if ((offloads & (queue_supp_offloads | port_supp_offloads)) != + offloads) + return false; + /* Verify we have no conflict with port offloads */ + if ((port_offloads ^ offloads) & port_supp_offloads) + return false; + return true; +} + static void tap_tx_offload(char *packet, uint64_t ol_flags, unsigned int l2_len, unsigned int l3_len) @@ -465,9 +502,10 @@ enum ioctl_mode { rte_pktmbuf_mtod(seg, void *); seg = seg->next; } - if (mbuf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4) || - (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM || - (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM) { + if (txq->csum && + ((mbuf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4) || + (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM || + (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM))) { /* Support only packets with all data in the same seg */ if (mbuf->nb_segs > 1) break; @@ -605,6 +643,17 @@ enum ioctl_mode { static int tap_dev_configure(struct rte_eth_dev *dev) { + uint64_t supp_tx_offloads = tap_tx_offload_get_port_capa(); + uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads; + + if ((tx_offloads & supp_tx_offloads) != tx_offloads) { + rte_errno = ENOTSUP; + RTE_LOG(ERR, PMD, + "Some Tx offloads are not supported " + "requested 0x%lx supported 0x%lx\n", + tx_offloads, supp_tx_offloads); + return -rte_errno; + } if (dev->data->nb_rx_queues > RTE_PMD_TAP_MAX_QUEUES) { RTE_LOG(ERR, PMD, "%s: number of rx queues %d exceeds max num of queues %d\n", @@ -681,10 +730,9 @@ enum ioctl_mode { dev_info->rx_offload_capa = (DEV_RX_OFFLOAD_IPV4_CKSUM | DEV_RX_OFFLOAD_UDP_CKSUM | DEV_RX_OFFLOAD_TCP_CKSUM); - dev_info->tx_offload_capa = - (DEV_TX_OFFLOAD_IPV4_CKSUM | - DEV_TX_OFFLOAD_UDP_CKSUM | - DEV_TX_OFFLOAD_TCP_CKSUM); + dev_info->tx_queue_offload_capa = tap_tx_offload_get_queue_capa(); + dev_info->tx_offload_capa = dev_info->tx_queue_offload_capa | + tap_tx_offload_get_port_capa(); } static int @@ -1058,21 +1106,45 @@ enum ioctl_mode { uint16_t tx_queue_id, uint16_t nb_tx_desc __rte_unused, unsigned int socket_id __rte_unused, - const struct rte_eth_txconf *tx_conf __rte_unused) + const struct rte_eth_txconf *tx_conf) { struct pmd_internals *internals = dev->data->dev_private; + struct tx_queue *txq; int ret; if (tx_queue_id >= dev->data->nb_tx_queues) return -1; - dev->data->tx_queues[tx_queue_id] = &internals->txq[tx_queue_id]; + txq = dev->data->tx_queues[tx_queue_id]; + /* + * Don't verify port offloads for application which + * use the old API. + */ + if ((tx_conf != NULL) && + !!(tx_conf->txq_flags & ETH_TXQ_FLAGS_IGNORE)) { + if (tap_txq_are_offloads_valid(dev, tx_conf->offloads)) { + txq->csum = !!(tx_conf->offloads & + (DEV_TX_OFFLOAD_IPV4_CKSUM | + DEV_TX_OFFLOAD_UDP_CKSUM | + DEV_TX_OFFLOAD_TCP_CKSUM)); + } else { + rte_errno = ENOTSUP; + RTE_LOG(ERR, PMD, + "%p: Tx queue offloads 0x%lx don't match port " + "offloads 0x%lx or supported offloads 0x%lx", + (void *)dev, tx_conf->offloads, + dev->data->dev_conf.txmode.offloads, + tap_tx_offload_get_port_capa()); + return -rte_errno; + } + } ret = tap_setup_queue(dev, internals, tx_queue_id, 0); if (ret == -1) return -1; - - RTE_LOG(DEBUG, PMD, " TX TAP device name %s, qid %d on fd %d\n", - internals->name, tx_queue_id, internals->txq[tx_queue_id].fd); + RTE_LOG(DEBUG, PMD, + " TX TAP device name %s, qid %d on fd %d csum %s\n", + internals->name, tx_queue_id, internals->txq[tx_queue_id].fd, + txq->csum ? "on" : "off"); return 0; } diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h index 829f32f..69a1a08 100644 --- a/drivers/net/tap/rte_eth_tap.h +++ b/drivers/net/tap/rte_eth_tap.h @@ -76,6 +76,7 @@ struct rx_queue { struct tx_queue { int fd; uint16_t *mtu; /* Pointer to MTU from dev_data */ + uint16_t csum:1; /* Enable checksum offloading */ struct pkt_stats stats; /* Stats for this TX queue */ }; -- 1.8.3.1