From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 51F6A1B8C1 for ; Fri, 14 Dec 2018 12:14:56 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Dec 2018 03:14:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,352,1539673200"; d="scan'208";a="110361739" Received: from irsmsx110.ger.corp.intel.com ([163.33.3.25]) by orsmga003.jf.intel.com with ESMTP; 14 Dec 2018 03:14:54 -0800 Received: from irsmsx156.ger.corp.intel.com (10.108.20.68) by irsmsx110.ger.corp.intel.com (163.33.3.25) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 14 Dec 2018 11:14:53 +0000 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.26]) by IRSMSX156.ger.corp.intel.com ([169.254.3.24]) with mapi id 14.03.0415.000; Fri, 14 Dec 2018 11:14:53 +0000 From: "Iremonger, Bernard" To: "Zhang, Qi Z" , "Yigit, Ferruh" , "Richardson, Bruce" , "Wiles, Keith" , "Ananyev, Konstantin" CC: "dev@dpdk.org" , "Lu, Wenzhuo" Thread-Topic: [PATCH v2 1/3] app/testpmd: code refactory for macswap Thread-Index: AQHUkRXteYHR4p5fp0O4lwYSyEOzCKV+GKYQ Date: Fri, 14 Dec 2018 11:14:52 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C260D3D6B1@IRSMSX108.ger.corp.intel.com> References: <20181122172632.6229-1-qi.z.zhang@intel.com> <20181211055511.32284-1-qi.z.zhang@intel.com> <20181211055511.32284-2-qi.z.zhang@intel.com> In-Reply-To: <20181211055511.32284-2-qi.z.zhang@intel.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYWVlY2MxM2ItZjMyZi00NmQyLTg1NzQtNzdkNjE1ODVlYTViIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiQkl3TWVsYXp1clhwdHdPTkI0Z0pzbmVZRXRqd1dDOTR1Z2R2K2RFU00xM0VHa2RISllYcktTQkRNOHNYdVptayJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 1/3] app/testpmd: code refactory for macswap 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: Fri, 14 Dec 2018 11:14:56 -0000 Hi Qi, > -----Original Message----- > From: Zhang, Qi Z > Sent: Tuesday, December 11, 2018 5:55 AM > To: Yigit, Ferruh ; Richardson, Bruce > ; Wiles, Keith ; > Ananyev, Konstantin > Cc: dev@dpdk.org; Lu, Wenzhuo ; Iremonger, > Bernard ; Zhang, Qi Z > > Subject: [PATCH v2 1/3] app/testpmd: code refactory for macswap >=20 > Move macswap workload to dedicate function, so we can further enable > platform specific optimized version. >=20 > Signed-off-by: Qi Zhang > --- > app/test-pmd/macswap.c | 32 ++--------------------------- > app/test-pmd/macswap.h | 40 > ++++++++++++++++++++++++++++++++++++ > app/test-pmd/macswap_common.h | 47 > +++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 89 insertions(+), 30 deletions(-) create mode 100644 > app/test-pmd/macswap.h create mode 100644 app/test- > pmd/macswap_common.h >=20 > diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c index > a8384d5b8..849194fe2 100644 > --- a/app/test-pmd/macswap.c > +++ b/app/test-pmd/macswap.c > @@ -66,6 +66,7 @@ > #include >=20 > #include "testpmd.h" > +#include "macswap.h" >=20 > /* > * MAC swap forwarding mode: Swap the source and the destination > Ethernet @@ -76,15 +77,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs) > { > struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; > struct rte_port *txp; > - struct rte_mbuf *mb; > - struct ether_hdr *eth_hdr; > - struct ether_addr addr; > uint16_t nb_rx; > uint16_t nb_tx; > - uint16_t i; > uint32_t retry; > - uint64_t ol_flags =3D 0; > - uint64_t tx_offloads; > #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES > uint64_t start_tsc; > uint64_t end_tsc; > @@ -108,32 +103,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs) > #endif > fs->rx_packets +=3D nb_rx; > txp =3D &ports[fs->tx_port]; > - tx_offloads =3D txp->dev_conf.txmode.offloads; > - if (tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT) > - ol_flags =3D PKT_TX_VLAN_PKT; > - if (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT) > - ol_flags |=3D PKT_TX_QINQ_PKT; > - if (tx_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT) > - ol_flags |=3D PKT_TX_MACSEC; > - for (i =3D 0; i < nb_rx; i++) { > - if (likely(i < nb_rx - 1)) > - rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1], > - void *)); > - mb =3D pkts_burst[i]; > - eth_hdr =3D rte_pktmbuf_mtod(mb, struct ether_hdr *); >=20 > - /* Swap dest and src mac addresses. */ > - ether_addr_copy(ð_hdr->d_addr, &addr); > - ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); > - ether_addr_copy(&addr, ð_hdr->s_addr); > + do_macswap(pkts_burst, nb_rx, txp); >=20 > - mb->ol_flags &=3D IND_ATTACHED_MBUF | > EXT_ATTACHED_MBUF; > - mb->ol_flags |=3D ol_flags; > - mb->l2_len =3D sizeof(struct ether_hdr); > - mb->l3_len =3D sizeof(struct ipv4_hdr); > - mb->vlan_tci =3D txp->tx_vlan_id; > - mb->vlan_tci_outer =3D txp->tx_vlan_id_outer; > - } > nb_tx =3D rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, > nb_rx); > /* > * Retry if necessary > diff --git a/app/test-pmd/macswap.h b/app/test-pmd/macswap.h new file > mode 100644 index 000000000..14e665bd2 > --- /dev/null > +++ b/app/test-pmd/macswap.h > @@ -0,0 +1,40 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2018 Intel Corporation > + */ > + > +#ifndef _MACSWAP_H_ > +#define _MACSWAP_H_ > + > +#include "macswap_common.h" > + > +static inline void > +do_macswap(struct rte_mbuf *pkts[], uint16_t nb, > + struct rte_port *txp) > +{ > + struct ether_hdr *eth_hdr; > + struct rte_mbuf *mb; > + struct ether_addr addr; > + uint64_t ol_flags; > + int i; > + > + ol_flags =3D ol_flags_init(txp->dev_conf.txmode.offloads); > + vlan_qinq_set(pkts, nb, ol_flags, > + txp->tx_vlan_id, txp->tx_vlan_id_outer); > + > + for (i =3D 0; i < nb; i++) { > + if (likely(i < nb - 1)) > + rte_prefetch0(rte_pktmbuf_mtod(pkts[i+1], void > *)); > + mb =3D pkts[i]; > + > + eth_hdr =3D rte_pktmbuf_mtod(mb, struct ether_hdr *); > + > + /* Swap dest and src mac addresses. */ > + ether_addr_copy(ð_hdr->d_addr, &addr); > + ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); > + ether_addr_copy(&addr, ð_hdr->s_addr); > + > + mbuf_field_set(mb, ol_flags); > + } > +} > + > +#endif /* _BPF_CMD_H_ */ Previous line should be _MACSWAP_H_ > diff --git a/app/test-pmd/macswap_common.h b/app/test- > pmd/macswap_common.h new file mode 100644 index > 000000000..ab0a5b5ef > --- /dev/null > +++ b/app/test-pmd/macswap_common.h > @@ -0,0 +1,47 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2018 Intel Corporation > + */ > + > +#ifndef _MACSWAP_COMMON_H_ > +#define _MACSWAP_COMMON_H_ > + > +static inline uint64_t > +ol_flags_init(uint64_t tx_offload) > +{ > + uint64_t ol_flags =3D 0; > + > + ol_flags |=3D (tx_offload & DEV_TX_OFFLOAD_VLAN_INSERT) ? > + PKT_TX_VLAN : 0; > + ol_flags |=3D (tx_offload & DEV_TX_OFFLOAD_QINQ_INSERT) ? > + PKT_TX_QINQ : 0; > + ol_flags |=3D (tx_offload & DEV_TX_OFFLOAD_MACSEC_INSERT) ? > + PKT_TX_MACSEC : 0; > + > + return ol_flags; > +} > + > +static inline void > +vlan_qinq_set(struct rte_mbuf *pkts[], uint16_t nb, > + uint64_t ol_flags, uint16_t vlan, uint16_t outer_vlan) { > + int i; > + > + if (ol_flags & PKT_TX_VLAN) > + for (i =3D 0; i < nb; i++) > + pkts[i]->vlan_tci =3D vlan; > + if (ol_flags & PKT_TX_QINQ) > + for (i =3D 0; i < nb; i++) > + pkts[i]->vlan_tci_outer =3D outer_vlan; } > + > +static inline void > +mbuf_field_set(struct rte_mbuf *mb, uint64_t ol_flags) { > + mb->ol_flags &=3D IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF; > + mb->ol_flags |=3D ol_flags; > + mb->l2_len =3D sizeof(struct ether_hdr); > + mb->l3_len =3D sizeof(struct ipv4_hdr); > +} > + > +#endif /* _BPF_CMD_H_ */ Previous line should be _MACSWAP_COMMON_H_ > + > -- > 2.13.6 When apply the patch a whitespace error is reported Applying: app/testpmd: code refactory for macswap .git/rebase-apply/patch:169: new blank line at EOF. Regards, Bernard