From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by dpdk.org (Postfix) with ESMTP id 52B88282 for ; Tue, 24 Jan 2017 15:23:02 +0100 (CET) Received: by mail-lf0-f49.google.com with SMTP id x1so24921937lff.0 for ; Tue, 24 Jan 2017 06:23:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=3duihS85azTX7bd1v/1WFrDqFjLUDP+5aJQ77RMSn70=; b=YlG6KMrrY/aQ56dcBbl6tOhR6VhltGcCeB8JQteJjv6JVf+g/HHd9D/V1FlQNGDlJu Bkn+6+/Tfixv6VWmnPsDUGzjyakJydH0kAeceS1LrISHiDcELTN+NSaN6Zd+VonSoiHn foco3v4qCb6vP5ryj6nhc5zUjF1C2EVnV0yufPbeeE4Y/zyKMk49YmRQqEA+a0G1tmx2 HLuMefZeyRc/bYzMIVRRMnma4gHbx1zCUbvYABpugBOf9f4xp3WXspgCcJIYdRQFAlcz Wro6/j+itRIAIUKFijbOK+QFQuBNsGfjvF78KdEXWzLKHC5MQBJw0bMQLpq+qz++nN/q oZew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3duihS85azTX7bd1v/1WFrDqFjLUDP+5aJQ77RMSn70=; b=H5l7dzjiz7OVTs/86hlfjhbLDcqTL3IgwGoSBm488t+2xivVficKhTETwxJ8Zccq+k WAIUZXFBDSUt/W5qG0m5BSr0Tof54NlJiYcZca4a1J1UPFCIfy7PXpDxn3jcv3fkEFrZ aL3AknJVJ3++mrYmjjagh9WAMNx/MH6gVBTlcYSGED3m3oDdYtZ8we1Mvl9zNFdfN3EH dRWfSMhH+8yABAKavRgTnfVSYuDZ2p1k+i3jhB4PXxFESzFRST9XR1Zzq9D+zVCU4ww+ kr/f8TPiqqAua4yVFNc8uOcCh1jAB0W9qb4zcLQTNHIs8A5uc+0uTpssrslL5XhfB7qt cUOA== X-Gm-Message-State: AIkVDXLd92d8+IhxuM2Z+F2anLEp13eDlCTq8DGBv1kS9PXrJrezbPmkKBoXwKz57fx6lg== X-Received: by 10.46.6.25 with SMTP id 25mr14415866ljg.64.1485267781800; Tue, 24 Jan 2017 06:23:01 -0800 (PST) Received: from anpa-dpdk.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id z82sm1801140lfa.8.2017.01.24.06.23.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:23:01 -0800 (PST) From: Jakub Palider To: dev@dpdk.org Cc: Jakub Palider Date: Tue, 24 Jan 2017 15:22:53 +0100 Message-Id: <1485267773-20054-1-git-send-email-jpa@semihalf.com> X-Mailer: git-send-email 2.5.0 Subject: [dpdk-dev] [PATCH] net/ena: prepare TSO offload calculation 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: Tue, 24 Jan 2017 14:23:02 -0000 While ENA can handle checksum calculations in almost all cases, it cannot do so when DF bit in IPv4 header is not set, that is DF=0, and TSO is requested. For that situation pseudo header must be prepared manually. Signed-off-by: Jakub Palider --- drivers/net/ena/ena_ethdev.c | 29 +++++++++++++++++++++++++++-- drivers/net/ena/ena_ethdev.h | 1 + 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index e99bf29..060bed9 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1360,6 +1360,10 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) /* Set max MTU for this device */ adapter->max_mtu = get_feat_ctx.dev_attr.max_mtu; + /* set device support for TSO */ + adapter->tso4_supported = get_feat_ctx.offload.tx & + ENA_ADMIN_FEATURE_OFFLOAD_DESC_TSO_IPV4_MASK; + /* Copy MAC address and point DPDK to it */ eth_dev->data->mac_addrs = (struct ether_addr *)adapter->mac_addr; ether_addr_copy((struct ether_addr *)get_feat_ctx.dev_attr.mac_addr, @@ -1585,13 +1589,20 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, } static uint16_t -eth_ena_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { int32_t ret; uint32_t i; struct rte_mbuf *m; + struct ena_ring *tx_ring = (struct ena_ring *)(tx_queue); + struct ipv4_hdr *ip_hdr; uint64_t ol_flags; + uint16_t frag_field; + + /* ENA needs partial checksum for TSO packets only, skip early */ + if (!tx_ring->adapter->tso4_supported) + return nb_pkts; for (i = 0; i != nb_pkts; i++) { m = tx_pkts[i]; @@ -1611,7 +1622,21 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, return i; } #endif - /* ENA doesn't need different phdr cskum for TSO */ + + if (!(m->ol_flags & PKT_TX_IPV4)) + continue; + + ip_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, + m->l2_len); + frag_field = rte_be_to_cpu_16(ip_hdr->fragment_offset); + if (frag_field & IPV4_HDR_DF_FLAG) + continue; + + /* In case we are supposed to TSO and have DF not set (DF=0) + * hardware must be provided with partial checksum, otherwise + * it will take care of necessary calculations. + */ + ret = rte_net_intel_cksum_flags_prepare(m, ol_flags & ~PKT_TX_TCP_SEG); if (ret != 0) { diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h index 4c7edbb..dc3080f 100644 --- a/drivers/net/ena/ena_ethdev.h +++ b/drivers/net/ena/ena_ethdev.h @@ -162,6 +162,7 @@ struct ena_adapter { u16 num_queues; u16 max_mtu; + u8 tso4_supported; int id_number; char name[ENA_NAME_MAX_LEN]; -- 1.9.1