From patchwork Tue Dec 11 13:00:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Didier Pallard X-Patchwork-Id: 48634 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 29A724F9A; Tue, 11 Dec 2018 14:02:04 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 3CF174CB5 for ; Tue, 11 Dec 2018 14:02:03 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id p4so13983188wrt.7 for ; Tue, 11 Dec 2018 05:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=JOLSYBJdoMxZGzWPj1gjLIXHGYOkypZnOSWljxiogY4=; b=nZ41O5dOgUTUaK8eiJx4nLfqgTmIZgu7kGHFeL/P647iqa9wBg4PNSf7NqAqKhs8wH A8WgGFcSK8BdMw7+CNp2AtpviqG3RW5Ojn9eORlhNQpkgo8c8qduTCmvy9f8tfzh4tz9 cuwcIANwJCDgXcSdiXTa6bsgagH+8yQ+5DUfuVW6opVS/1sVLqHt5sxq/FaKAk+nSgrX 44gxeHtNtp849+e+oKTuNVudxvl6olumY+7hcCz6tjYiQsUhAkIl+cozjRjOEB7g1zTR lzXYomu4IALQqZ5FnyWZMoZUYW1/e0UXT5hDqcRgu05W8+qo5n/sn+pD/pKTWuIg+dUV j6Vg== 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=JOLSYBJdoMxZGzWPj1gjLIXHGYOkypZnOSWljxiogY4=; b=bu/cFmvDPQfwpz8lob6W3mClNfN9vr0RmmVBnO4R+0q78CeT3Bu3sxnth4FJLSM1Wk eisx6zt5X8zLvQPrdGz7nZ3y8ysA0emwcT2YRLmDqFHl1OC/Wx4o8/tvzQtM8NG+xcPO 0JLurcCUiuhXRb4Co2mueUlnjL/EzrZ69/OcUFIaL2qLyQt1qHjmTOVpf2v5XJ7KPZCV G29fXEckmqr0XDbedXtTJt6KZTKGpbnkqE+9a+Q0ZLLt5+WG5n7HqCm7BD/6EObRALzP aXND1942hv+KdqZ2rfm6J+E1dOvRXIHwmYacHnE8nTuqEkUM3jyBdbO/VXZBk2sBn2q5 h2Dg== X-Gm-Message-State: AA+aEWbOjPgPpcopLfWWjWVwaTFWz1KAVcxATcbkU6MW++PeXh/RLbQv 6xWQkmg1zSYBP+7r7Y0IVnJy969NSvQ= X-Google-Smtp-Source: AFSGD/UYzxvw4qaAxXQoQAmw7R8nUJTn3++l3BaX2rDHcPB9a+6pEpPA32CdpP08NuKWlPLQcR1SoA== X-Received: by 2002:adf:ff09:: with SMTP id k9mr12702258wrr.97.1544533322493; Tue, 11 Dec 2018 05:02:02 -0800 (PST) Received: from pala.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id l15sm13950942wrw.4.2018.12.11.05.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 05:02:01 -0800 (PST) From: Didier Pallard To: dev@dpdk.org Cc: stable@dpdk.org Date: Tue, 11 Dec 2018 14:00:28 +0100 Message-Id: <20181211130028.10769-1-didier.pallard@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH] drivers/net: fix several Tx prepare functions 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" Since below commit, several tx_prep functions are broken, they fail to pass supported Tx offload features check: PKT_TX_IPVx must be set when any PKT_TX_L4 checksum is requested, but these values are not present in the mask of supported Tx offloads of several drivers that advertise PKT_TX_L4_MASK. So any packet sent to those drivers with a L4 checksum request and one of PKT_TX_IPVx bit set is rejected by the tx prepare function. Fixes: 1037ed842c37 ("mbuf: fix Tx offload mask") Cc: stable@dpdk.org Signed-off-by: Didier Pallard Reviewed-by: Ferruh Yigit --- drivers/net/atlantic/atl_rxtx.c | 2 ++ drivers/net/e1000/em_rxtx.c | 2 ++ drivers/net/ena/ena_ethdev.c | 2 ++ drivers/net/fm10k/fm10k_rxtx.c | 2 ++ drivers/net/vmxnet3/vmxnet3_rxtx.c | 2 ++ 5 files changed, 10 insertions(+) diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c index fd909476c45f..40c913795c79 100644 --- a/drivers/net/atlantic/atl_rxtx.c +++ b/drivers/net/atlantic/atl_rxtx.c @@ -21,6 +21,8 @@ #define ATL_TX_OFFLOAD_MASK ( \ PKT_TX_VLAN | \ + PKT_TX_IPV6 | \ + PKT_TX_IPV4 | \ PKT_TX_IP_CKSUM | \ PKT_TX_L4_MASK | \ PKT_TX_TCP_SEG) diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index a9cd765186e4..005e1ea96397 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -50,6 +50,8 @@ #define E1000_RXDCTL_GRAN 0x01000000 /* RXDCTL Granularity */ #define E1000_TX_OFFLOAD_MASK ( \ + PKT_TX_IPV6 | \ + PKT_TX_IPV4 | \ PKT_TX_IP_CKSUM | \ PKT_TX_L4_MASK | \ PKT_TX_VLAN_PKT) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index a07bd2b4935d..709ad2edb43b 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -189,6 +189,8 @@ static const struct ena_stats ena_stats_ena_com_strings[] = { #define ENA_TX_OFFLOAD_MASK (\ PKT_TX_L4_MASK | \ + PKT_TX_IPV6 | \ + PKT_TX_IPV4 | \ PKT_TX_IP_CKSUM | \ PKT_TX_TCP_SEG) diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c index 4a5b46ec830a..1d0f09d25825 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c @@ -39,6 +39,8 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd) #define FM10K_TX_OFFLOAD_MASK ( \ PKT_TX_VLAN_PKT | \ + PKT_TX_IPV6 | \ + PKT_TX_IPV4 | \ PKT_TX_IP_CKSUM | \ PKT_TX_L4_MASK | \ PKT_TX_TCP_SEG) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index cf85f3d6181a..d30914a8a620 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -50,6 +50,8 @@ #define VMXNET3_TX_OFFLOAD_MASK ( \ PKT_TX_VLAN_PKT | \ + PKT_TX_IPV6 | \ + PKT_TX_IPV4 | \ PKT_TX_L4_MASK | \ PKT_TX_TCP_SEG)