From patchwork Fri Mar 29 13:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 51908 X-Patchwork-Delegate: thomas@monjalon.net 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 D68CF3572; Fri, 29 Mar 2019 14:42:24 +0100 (CET) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 719A6326D for ; Fri, 29 Mar 2019 14:42:23 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us4.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 51CA1B4007C; Fri, 29 Mar 2019 13:42:22 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 29 Mar 2019 06:42:19 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Fri, 29 Mar 2019 06:42:19 -0700 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id x2TDgHLK029935; Fri, 29 Mar 2019 13:42:18 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id EA3E0161610; Fri, 29 Mar 2019 13:42:17 +0000 (GMT) From: Andrew Rybchenko To: Tomasz Kulasek , Olivier Matz CC: , Konstantin Ananyev Date: Fri, 29 Mar 2019 13:42:14 +0000 Message-ID: <1553866934-21871-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548751746-16030-1-git-send-email-arybchenko@solarflare.com> References: <1548751746-16030-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24518.005 X-TM-AS-Result: No-7.125600-4.000000-10 X-TMASE-MatchedRID: i32irAw+LfCmWOD8X0TFhPVFR4sC8dPy9l9p8mNlkgn7efdnqtsaE6Ge nlo/ebgn09NQNrxIpFYBtjkcfRMmqRjaok59OjLpLTHwnYOikQ0eDuTXcrjrsk+u3rM3lFPnBua WJMDEarYcyrMRQy3aWQxL1rBlROBuCL0sh0ktEgLr/EBmiNuXtyyZvBThPVi1AVscD1Oo0tBW3j jUNMKtEHNAZ3Iao4w9gDLqnrRlXrZ8nn9tnqel2LI7zVffJqTzS3MQAS4fCWnh4mt/qwtEXjvbn Nu+Sv9Tp5uX5Mx1LFEG/JxkfjM8Y37cGd19dSFd X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--7.125600-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24518.005 X-MDID: 1553866943-5iZD03POBaWx Subject: [dpdk-dev] [PATCH v2] mbuf: move headers not fragmented check to checksum 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" rte_validate_tx_offload() is used in Tx prepare callbacks (RTE_LIBRTE_ETHDEV_DEBUG only) to check Tx offloads consistency. Requirement that packet headers should not be fragmented is not documented and unclear where it comes from except rte_net_intel_cksum_prepare() functions which relies on it. It could be NIC vendor specific driver or hardware limitation, but, if so, it should be documented and checked in corresponding Tx prepare callbacks. Signed-off-by: Andrew Rybchenko Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf.h | 12 ------------ lib/librte_net/rte_net.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index d961ccaf6..73daa8140 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -2257,23 +2257,11 @@ static inline int rte_validate_tx_offload(const struct rte_mbuf *m) { uint64_t ol_flags = m->ol_flags; - uint64_t inner_l3_offset = m->l2_len; /* Does packet set any of available offloads? */ if (!(ol_flags & PKT_TX_OFFLOAD_MASK)) return 0; - if (ol_flags & PKT_TX_OUTER_IP_CKSUM) - /* NB: elaborating the addition like this instead of using - * += gives the result uint64_t type instead of int, - * avoiding compiler warnings on gcc 8.1 at least */ - inner_l3_offset = inner_l3_offset + m->outer_l2_len + - m->outer_l3_len; - - /* Headers are fragmented */ - if (rte_pktmbuf_data_len(m) < inner_l3_offset + m->l3_len + m->l4_len) - return -ENOTSUP; - /* IP checksum can be counted only for IPv4 packet */ if ((ol_flags & PKT_TX_IP_CKSUM) && (ol_flags & PKT_TX_IPV6)) return -EINVAL; diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h index e59760a0a..16970711b 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -118,10 +118,31 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) struct udp_hdr *udp_hdr; uint64_t inner_l3_offset = m->l2_len; +#ifdef RTE_LIBRTE_ETHDEV_DEBUG + /* + * Does packet set any of available offloads? + * Mainly it is required to avoid fragmented headers check if + * no offloads are requested. + */ + if (!(ol_flags & PKT_TX_OFFLOAD_MASK)) + return 0; +#endif + if ((ol_flags & PKT_TX_OUTER_IP_CKSUM) || (ol_flags & PKT_TX_OUTER_IPV6)) inner_l3_offset += m->outer_l2_len + m->outer_l3_len; +#ifdef RTE_LIBRTE_ETHDEV_DEBUG + /* + * Check if headers are fragmented. + * The check could be less strict depending on which offloads are + * requested and headers to be used, but let's keep it simple. + */ + if (unlikely(rte_pktmbuf_data_len(m) < + inner_l3_offset + m->l3_len + m->l4_len)) + return -ENOTSUP; +#endif + if (ol_flags & PKT_TX_IPV4) { ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, inner_l3_offset);