From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 2C3FBA0679 for ; Thu, 28 Mar 2019 18:04:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED5B61B3BA; Thu, 28 Mar 2019 18:04:45 +0100 (CET) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id DD5AB1B3B9 for ; Thu, 28 Mar 2019 18:04:44 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id D2259B40079; Thu, 28 Mar 2019 17:04:41 +0000 (UTC) Received: from [192.168.38.17] (91.220.146.112) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 28 Mar 2019 17:04:35 +0000 To: Tomasz Kulasek , Olivier Matz CC: , Konstantin Ananyev , "Thomas Monjalon" , Ferruh Yigit References: <1548751746-16030-1-git-send-email-arybchenko@solarflare.com> <1550557852-21882-1-git-send-email-arybchenko@solarflare.com> From: Andrew Rybchenko Message-ID: <9483be25-fc2b-9d0e-81d2-24295d68a07f@solarflare.com> Date: Thu, 28 Mar 2019 20:04:31 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <1550557852-21882-1-git-send-email-arybchenko@solarflare.com> Content-Language: en-GB X-Originating-IP: [91.220.146.112] X-ClientProxiedBy: ocex03.SolarFlarecom.com (10.20.40.36) To ukex01.SolarFlarecom.com (10.17.10.4) X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24516.003 X-TM-AS-Result: No-16.470900-8.000000-10 X-TMASE-MatchedRID: byfwvk+IcRlmd03XlK+nb/VFR4sC8dPyN/BTU5ZfZRINcckEPxfz2Dd1 jBj8QIzhEQ/pXp0YnfYndz94Tmfpa4BoGyFs+F1Mr9nDy1Fvnfnj5lyuq8IOQSz+5QCTrE/s+Vi hXqn9xLF/zqWHr6CN2Ov4h1UdnDHwoVmYC/wuD3VfLa2Qr61pJDpA2zZYJjv11R8gEUonndSwDd SthfCfMFca4ikIJKKYdA6sjiuxK/FYX0q7tjxibcOD5TU1KZy5DvJ43UwBMxRW+ZVZmGsMI/NO7 flRFqXmIGSHKu90xKWSU848M/hs6Me4Woyb+kVFyDp+jSvEtWsl3afZehJEWedlU2K5Jm9bXa82 2VCK6b+EcppKRi10PWC2mpXkc+jb/P+NVrYlIEMHGzB42DcRoYWQKSQHRQw2myiLZetSf8nJ4y0 wP1A6AKEwgORH8p/AIhDmZnlKoc8tkRHnA1D1s3+tPNMiC7nu9SZxrhDLfT4XxyFgWzHjx5u7kp d4qMlHOwZqM8RKJ/jWxPunSle1A1Xfmg5cdByCST6+Td+w1FLFhXMjdQIJpg== X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--16.470900-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24516.003 X-MDID: 1553792683-pvC4cmCLGj7y Content-Type: text/plain; charset="UTF-8"; format="flowed" Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH] 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" Message-ID: <20190328170431.w1fOpcFY1k0SXmpl_VAzTLHWN4jSa7vcW-LunVl_A2k@z> Ping? (I have a number of net/sfc patches which heavily depend on this one and must not be applied without this one) Andrew. On 2/19/19 9:30 AM, Andrew Rybchenko wrote: > 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: Konstantin Ananyev > --- > Looks good to me, though extra-testing would be needed. > Konstantin Ananyev > > lib/librte_mbuf/rte_mbuf.h | 12 ------------ > lib/librte_net/rte_net.h | 17 +++++++++++++++++ > 2 files changed, 17 insertions(+), 12 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index d961cca..73daa81 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -2257,23 +2257,11 @@ static inline int rte_pktmbuf_chain(struct rte_mbuf *head, struct rte_mbuf *tail > 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 e59760a..bd75aea 100644 > --- a/lib/librte_net/rte_net.h > +++ b/lib/librte_net/rte_net.h > @@ -118,10 +118,27 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, > struct udp_hdr *udp_hdr; > uint64_t inner_l3_offset = m->l2_len; > > + /* > + * 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; > + > 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; > > + /* > + * 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; > + > if (ol_flags & PKT_TX_IPV4) { > ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, > inner_l3_offset);