From patchwork Wed Jan 9 18:05:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lam, Tiago" X-Patchwork-Id: 1022572 X-Patchwork-Delegate: ian.stokes@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ZcZm4mQTz9s9h for ; Thu, 10 Jan 2019 05:09:04 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 32FDBF39; Wed, 9 Jan 2019 18:06:08 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1A023F37 for ; Wed, 9 Jan 2019 18:06:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 743FC855 for ; Wed, 9 Jan 2019 18:06:06 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2019 10:06:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,458,1539673200"; d="scan'208";a="124724126" Received: from silpixa00399125.ir.intel.com ([10.237.223.34]) by orsmga002.jf.intel.com with ESMTP; 09 Jan 2019 10:06:03 -0800 From: Tiago Lam To: ovs-dev@openvswitch.org Date: Wed, 9 Jan 2019 18:05:41 +0000 Message-Id: <1547057147-217466-6-git-send-email-tiago.lam@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547057147-217466-1-git-send-email-tiago.lam@intel.com> References: <1547057147-217466-1-git-send-email-tiago.lam@intel.com> X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: fbl@sysclose.org, Michael Qiu , i.maximets@samsung.com Subject: [ovs-dev] [PATCH v13 05/11] dp-packet: copy data from multi-seg. DPDK mbuf X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Michael Qiu When doing packet clone, if packet source is from DPDK driver, multi-segment must be considered, and copy the segment's data one by one. Also, lots of DPDK mbuf's info is missed during a copy, like packet type, ol_flags, etc. That information is very important for DPDK to do packets processing. Co-authored-by: Mark Kavanagh Co-authored-by: Tiago Lam Signed-off-by: Michael Qiu Signed-off-by: Mark Kavanagh Signed-off-by: Tiago Lam Acked-by: Eelco Chaudron --- lib/dp-packet.c | 62 ++++++++++++++++++++++++++++++++++++++----------------- lib/dp-packet.h | 29 ++++++++++++++++++++++++++ lib/netdev-dpdk.c | 1 + 3 files changed, 73 insertions(+), 19 deletions(-) diff --git a/lib/dp-packet.c b/lib/dp-packet.c index 9ea3f78..4e4b8fb 100644 --- a/lib/dp-packet.c +++ b/lib/dp-packet.c @@ -159,39 +159,63 @@ dp_packet_clone(const struct dp_packet *buffer) return dp_packet_clone_with_headroom(buffer, 0); } +#ifdef DPDK_NETDEV +struct dp_packet * +dp_packet_clone_with_headroom(const struct dp_packet *b, size_t headroom) { + struct dp_packet *new_buffer; + uint32_t pkt_len = dp_packet_size(b); + + /* Copy multi-seg data. */ + if (b->source == DPBUF_DPDK && !rte_pktmbuf_is_contiguous(&b->mbuf)) { + void *dst = NULL; + struct rte_mbuf *mbuf = CONST_CAST(struct rte_mbuf *, &b->mbuf); + + new_buffer = dp_packet_new_with_headroom(pkt_len, headroom); + dst = dp_packet_data(new_buffer); + dp_packet_set_size(new_buffer, pkt_len); + + if (!rte_pktmbuf_read(mbuf, 0, pkt_len, dst)) { + dp_packet_delete(new_buffer); + return NULL; + } + } else { + new_buffer = dp_packet_clone_data_with_headroom(dp_packet_data(b), + dp_packet_size(b), + headroom); + } + + dp_packet_copy_common_members(new_buffer, b); + + dp_packet_copy_mbuf_flags(new_buffer, b); + if (dp_packet_rss_valid(new_buffer)) { + new_buffer->mbuf.hash.rss = b->mbuf.hash.rss; + } + + return new_buffer; +} +#else /* Creates and returns a new dp_packet whose data are copied from 'buffer'. * The returned dp_packet will additionally have 'headroom' bytes of * headroom. */ struct dp_packet * -dp_packet_clone_with_headroom(const struct dp_packet *buffer, size_t headroom) +dp_packet_clone_with_headroom(const struct dp_packet *b, size_t headroom) { struct dp_packet *new_buffer; + uint32_t pkt_len = dp_packet_size(b); - new_buffer = dp_packet_clone_data_with_headroom(dp_packet_data(buffer), - dp_packet_size(buffer), - headroom); - /* Copy the following fields into the returned buffer: l2_pad_size, - * l2_5_ofs, l3_ofs, l4_ofs, cutlen, packet_type and md. */ - memcpy(&new_buffer->l2_pad_size, &buffer->l2_pad_size, - sizeof(struct dp_packet) - - offsetof(struct dp_packet, l2_pad_size)); + new_buffer = dp_packet_clone_data_with_headroom(dp_packet_data(b), + pkt_len, headroom); -#ifdef DPDK_NETDEV - new_buffer->mbuf.ol_flags = buffer->mbuf.ol_flags; -#else - new_buffer->rss_hash_valid = buffer->rss_hash_valid; -#endif + dp_packet_copy_common_members(new_buffer, b); + new_buffer->rss_hash_valid = b->rss_hash_valid; if (dp_packet_rss_valid(new_buffer)) { -#ifdef DPDK_NETDEV - new_buffer->mbuf.hash.rss = buffer->mbuf.hash.rss; -#else - new_buffer->rss_hash = buffer->rss_hash; -#endif + new_buffer->rss_hash = b->rss_hash; } return new_buffer; } +#endif /* Creates and returns a new dp_packet that initially contains a copy of the * 'size' bytes of data starting at 'data' with no headroom or tailroom. */ diff --git a/lib/dp-packet.h b/lib/dp-packet.h index 08e79af..a003546 100644 --- a/lib/dp-packet.h +++ b/lib/dp-packet.h @@ -129,6 +129,10 @@ struct dp_packet *dp_packet_clone_data_with_headroom(const void *, size_t, size_t headroom); static inline void dp_packet_delete(struct dp_packet *); +static inline void +dp_packet_copy_common_members(struct dp_packet *new_b, + const struct dp_packet *b); + static inline void *dp_packet_at(const struct dp_packet *, size_t offset, size_t size); static inline void *dp_packet_at_assert(const struct dp_packet *, @@ -139,6 +143,8 @@ dp_packet_mbuf_from_offset(const struct dp_packet *b, size_t *offset); void dp_packet_mbuf_write(struct rte_mbuf *mbuf, int16_t ofs, uint32_t len, const void *data); +static inline void +dp_packet_copy_mbuf_flags(struct dp_packet *dst, const struct dp_packet *src); #endif static inline void *dp_packet_tail(const struct dp_packet *); static inline void *dp_packet_end(const struct dp_packet *); @@ -187,6 +193,17 @@ dp_packet_delete(struct dp_packet *b) } } +/* Copies the following fields into the 'new_b', which represent the common + * fields between DPDK and non-DPDK packets: l2_pad_size, l2_5_ofs, l3_ofs, + * l4_ofs, cutlen, packet_type and md. */ +static inline void +dp_packet_copy_common_members(struct dp_packet *new_b, + const struct dp_packet *b) { + memcpy(&new_b->l2_pad_size, &b->l2_pad_size, + sizeof(struct dp_packet) - + offsetof(struct dp_packet, l2_pad_size)); +} + /* If 'b' contains at least 'offset + size' bytes of data, returns a pointer to * byte 'offset'. Otherwise, returns a null pointer. */ static inline void * @@ -700,6 +717,18 @@ dp_packet_set_allocated(struct dp_packet *b, uint16_t s) b->mbuf.buf_len = s; } +static inline void +dp_packet_copy_mbuf_flags(struct dp_packet *dst, const struct dp_packet *src) +{ + ovs_assert(dst != NULL && src != NULL); + struct rte_mbuf *buf_dst = &dst->mbuf; + const struct rte_mbuf *buf_src = &src->mbuf; + + buf_dst->ol_flags = buf_src->ol_flags; + buf_dst->packet_type = buf_src->packet_type; + buf_dst->tx_offload = buf_src->tx_offload; +} + /* Returns the RSS hash of the packet 'p'. Note that the returned value is * correct only if 'dp_packet_rss_valid(p)' returns true */ static inline uint32_t diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index ea84c41..a0df9fc 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -2381,6 +2381,7 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch) memcpy(rte_pktmbuf_mtod(pkts[txcnt], void *), dp_packet_data(packet), size); dp_packet_set_size((struct dp_packet *)pkts[txcnt], size); + dp_packet_copy_mbuf_flags((struct dp_packet *)pkts[txcnt], packet); txcnt++; }