From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 09B0A4C93 for ; Thu, 22 Mar 2018 19:28:50 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Mar 2018 11:28:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,345,1517904000"; d="scan'208";a="213986402" Received: from silpixa00399777.ir.intel.com (HELO silpixa00399777.ger.corp.intel.com) ([10.237.222.236]) by fmsmga005.fm.intel.com with ESMTP; 22 Mar 2018 11:28:46 -0700 From: Ferruh Yigit To: Pascal Mazon Cc: dev@dpdk.org, Ferruh Yigit , motih@mellanox.com, Shahaf Shuler Date: Thu, 22 Mar 2018 18:28:43 +0000 Message-Id: <20180322182843.105732-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [PATCH] net/tap: remove queue specific offload support 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, 22 Mar 2018 18:28:52 -0000 It is not clear if tap PMD supports queue specific offloads, removing the related code. Fixes: 95ae196ae10b ("net/tap: use new Rx offloads API") Fixes: 818fe14a9891 ("net/tap: use new Tx offloads API") Cc: motih@mellanox.com Signed-off-by: Ferruh Yigit --- Cc: Shahaf Shuler --- drivers/net/tap/rte_eth_tap.c | 101 +++--------------------------------------- 1 file changed, 6 insertions(+), 95 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index c9b86a8f0..67ed9d466 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -269,33 +269,6 @@ tap_rx_offload_get_port_capa(void) DEV_RX_OFFLOAD_CRC_STRIP; } -static uint64_t -tap_rx_offload_get_queue_capa(void) -{ - return DEV_RX_OFFLOAD_SCATTER | - DEV_RX_OFFLOAD_IPV4_CKSUM | - DEV_RX_OFFLOAD_UDP_CKSUM | - DEV_RX_OFFLOAD_TCP_CKSUM | - DEV_RX_OFFLOAD_CRC_STRIP; -} - -static bool -tap_rxq_are_offloads_valid(struct rte_eth_dev *dev, uint64_t offloads) -{ - uint64_t port_offloads = dev->data->dev_conf.rxmode.offloads; - uint64_t queue_supp_offloads = tap_rx_offload_get_queue_capa(); - uint64_t port_supp_offloads = tap_rx_offload_get_port_capa(); - - if ((offloads & (queue_supp_offloads | port_supp_offloads)) != - offloads) - return false; - if ((offloads & port_offloads) ^ offloads) - return false; - if ((offloads & port_supp_offloads) ^ offloads) - return false; - return true; -} - /* Callback to handle the rx burst of packets to the correct interface and * file descriptor(s) in a multi-queue setup. */ @@ -404,31 +377,6 @@ tap_tx_offload_get_port_capa(void) DEV_TX_OFFLOAD_TCP_CKSUM; } -static uint64_t -tap_tx_offload_get_queue_capa(void) -{ - return DEV_TX_OFFLOAD_MULTI_SEGS | - 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) @@ -742,12 +690,10 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->min_rx_bufsize = 0; dev_info->pci_dev = NULL; dev_info->speed_capa = tap_dev_speed_capa(); - dev_info->rx_queue_offload_capa = tap_rx_offload_get_queue_capa(); - dev_info->rx_offload_capa = tap_rx_offload_get_port_capa() | - dev_info->rx_queue_offload_capa; - dev_info->tx_queue_offload_capa = tap_tx_offload_get_queue_capa(); - dev_info->tx_offload_capa = tap_tx_offload_get_port_capa() | - dev_info->tx_queue_offload_capa; + dev_info->rx_offload_capa = tap_rx_offload_get_port_capa(); + dev_info->tx_offload_capa = tap_tx_offload_get_port_capa(); + dev_info->rx_queue_offload_capa = 0; + dev_info->tx_queue_offload_capa = 0; } static int @@ -1063,19 +1009,6 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, return -1; } - /* Verify application offloads are valid for our port and queue. */ - if (!tap_rxq_are_offloads_valid(dev, rx_conf->offloads)) { - rte_errno = ENOTSUP; - RTE_LOG(ERR, PMD, - "%p: Rx queue offloads 0x%" PRIx64 - " don't match port offloads 0x%" PRIx64 - " or supported offloads 0x%" PRIx64 "\n", - (void *)dev, rx_conf->offloads, - dev->data->dev_conf.rxmode.offloads, - (tap_rx_offload_get_port_capa() | - tap_rx_offload_get_queue_capa())); - return -rte_errno; - } rxq->mp = mp; rxq->trigger_seen = 1; /* force initial burst */ rxq->in_port = dev->data->port_id; @@ -1134,7 +1067,7 @@ tap_tx_queue_setup(struct rte_eth_dev *dev, 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) + const struct rte_eth_txconf *tx_conf __rte_unused) { struct pmd_internals *internals = dev->data->dev_private; struct tx_queue *txq; @@ -1144,29 +1077,7 @@ tap_tx_queue_setup(struct rte_eth_dev *dev, 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%" PRIx64 - " don't match port offloads 0x%" PRIx64 - " or supported offloads 0x%" PRIx64, - (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; -- 2.13.6