From: "Xu, HuilongX" <huilongx.xu@intel.com>
To: "Mcnamara, John" <john.mcnamara@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v2] i40e: fix for ieee15888 with rte_next_abi
Date: Mon, 3 Aug 2015 06:27:28 +0000 [thread overview]
Message-ID: <DF2A19295B96364286FEB7F3DDA27A461D90EFC4@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1438342740-12938-1-git-send-email-john.mcnamara@intel.com>
Tested-by:huilong xu <huilongx.xu@intel.com>
Os: dpdk-fedora20 3.11.10-301.fc20.x86_64
Gcc: 4.8.3 20140911 (Red Hat 4.8.3-7)
NIC: fortville_spirit_single
Package:dpdk.org newest code(commit 921353134fe01606411d3508f3ca798f0a38da73) + patch
Test case :ieee 1588 disable and ieee 1588 enable all passed.
Test steps:
1. enable ieee1588 compile switch
sed -i -e 's/IEEE1588=n$/IEEE1588=y/' config/common_linuxapp
2. compile and install dpdk driver
3. bind dpdk driver and set 2048*2M hugepage
4. start testpmd
./x86_64-native-linuxapp-gcc/app/testpmd -c 0x6 -n 4 -- -i --txqflags=0
5. exec testpmd cmdline
a) set fwd ieee1588
b) start
6. send ieee 1588 package by scapy to testpmd port 0, and used scapy get package testpmd port1
sendp([Ether(dst="68:05:ca:27:d5:8e",type=0x88f7)/"\x00\x02"], iface="p4p2")
7. exec test pmd
Stop
8. check testpmd print
a) "IEEE1588 PTP V2 SYNC" strings in testpmd print
b) check tx time > rx time
10.check testpmd fwd a ieee1588 package
SCAPY Result:
00:00:00:00:00:00 > 68:05:ca:27:d5:8e (0x88f7) / Raw[PEXPECT]
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of John McNamara
> Sent: Friday, July 31, 2015 7:39 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] i40e: fix for ieee15888 with rte_next_abi
>
> Fixes issue where ieee15888 timestamping doesn't work for the i40e
> pmd when RTE_ABI_NEXT is enabled.
>
> Also refactors repeated ieee15888 flag checking and setting
> code into a function.
>
> Reported-by: Huilong Xu <huilongx.xu@intel.com>
> Signed-off-by: John McNamara <john.mcnamara@intel.com>
> ---
>
> v2: Fix for "unused function" warning with clang >= 3.4. Warning:
>
> i40e_rxtx.c:183:1: error: unused function 'i40e_get_iee15888_flags'
> [-Werror,-Wunused-function]
>
> v1: Initial version
>
> drivers/net/i40e/i40e_rxtx.c | 54 ++++++++++++++++++++++++---------------
> -----
> 1 file changed, 29 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
> index 891a221..473fc0e 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -176,6 +176,32 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)
> return flags;
> }
>
> +/* Function to check and set the ieee1588 timesync index and get the
> + * appropriate flags.
> + */
> +#ifdef RTE_LIBRTE_IEEE1588
> +static inline uint64_t
> +i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword)
> +{
> + uint64_t pkt_flags = 0;
> + uint16_t tsyn = (qword & (I40E_RXD_QW1_STATUS_TSYNVALID_MASK
> + | I40E_RXD_QW1_STATUS_TSYNINDX_MASK))
> + >> I40E_RX_DESC_STATUS_TSYNINDX_SHIFT;
> +
> +#ifdef RTE_NEXT_ABI
> + if ((mb->packet_type & RTE_PTYPE_L2_MASK)
> + == RTE_PTYPE_L2_ETHER_TIMESYNC)
> + pkt_flags = PKT_RX_IEEE1588_PTP;
> +#endif
> + if (tsyn & 0x04) {
> + pkt_flags |= PKT_RX_IEEE1588_TMST;
> + mb->timesync = tsyn & 0x03;
> + }
> +
> + return pkt_flags;
> +}
> +#endif
> +
> #ifdef RTE_NEXT_ABI
> /* For each value it means, datasheet of hardware can tell more details
> */
> static inline uint32_t
> @@ -1285,15 +1311,7 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)
> pkt_flags |= i40e_rxd_build_fdir(&rxdp[j], mb);
>
> #ifdef RTE_LIBRTE_IEEE1588
> - uint16_t tsyn = (qword1
> - & (I40E_RXD_QW1_STATUS_TSYNVALID_MASK
> - | I40E_RXD_QW1_STATUS_TSYNINDX_MASK))
> - >> I40E_RX_DESC_STATUS_TSYNINDX_SHIFT;
> -
> - if (tsyn & 0x04)
> - pkt_flags |= PKT_RX_IEEE1588_TMST;
> -
> - mb->timesync = tsyn & 0x03;
> + pkt_flags |= i40e_get_iee15888_flags(mb, qword1);
> #endif
> mb->ol_flags |= pkt_flags;
>
> @@ -1547,14 +1565,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts, uint16_t nb_pkts)
> pkt_flags |= i40e_rxd_build_fdir(&rxd, rxm);
>
> #ifdef RTE_LIBRTE_IEEE1588
> - uint16_t tsyn = (qword1 & (I40E_RXD_QW1_STATUS_TSYNVALID_MASK
> - | I40E_RXD_QW1_STATUS_TSYNINDX_MASK))
> - >> I40E_RX_DESC_STATUS_TSYNINDX_SHIFT;
> -
> - if (tsyn & 0x04)
> - pkt_flags |= PKT_RX_IEEE1588_TMST;
> -
> - rxm->timesync = tsyn & 0x03;
> + pkt_flags |= i40e_get_iee15888_flags(rxm, qword1);
> #endif
> rxm->ol_flags |= pkt_flags;
>
> @@ -1723,14 +1734,7 @@ i40e_recv_scattered_pkts(void *rx_queue,
> pkt_flags |= i40e_rxd_build_fdir(&rxd, rxm);
>
> #ifdef RTE_LIBRTE_IEEE1588
> - uint16_t tsyn = (qword1 & (I40E_RXD_QW1_STATUS_TSYNVALID_MASK
> - | I40E_RXD_QW1_STATUS_TSYNINDX_MASK))
> - >> I40E_RX_DESC_STATUS_TSYNINDX_SHIFT;
> -
> - if (tsyn & 0x04)
> - pkt_flags |= PKT_RX_IEEE1588_TMST;
> -
> - first_seg->timesync = tsyn & 0x03;
> + pkt_flags |= i40e_get_iee15888_flags(first_seg, qword1);
> #endif
> first_seg->ol_flags |= pkt_flags;
>
> --
> 1.8.1.4
prev parent reply other threads:[~2015-08-03 6:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-29 17:51 [dpdk-dev] [PATCH] " John McNamara
2015-07-31 11:39 ` [dpdk-dev] [PATCH v2] " John McNamara
2015-07-31 12:05 ` Gonzalez Monroy, Sergio
2015-08-03 0:44 ` Lu, Wenzhuo
2015-08-03 12:53 ` Thomas Monjalon
2015-08-03 6:27 ` Xu, HuilongX [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DF2A19295B96364286FEB7F3DDA27A461D90EFC4@SHSMSX101.ccr.corp.intel.com \
--to=huilongx.xu@intel.com \
--cc=dev@dpdk.org \
--cc=john.mcnamara@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).