igc: Add support for multiple in-flight TX timestamps
Subsystems (2)
PATCH v2 1/1 igc: Add support for multiple in-flight TX timestamps
Add support for using the four sets of timestamping registers that i225/i226 have available for TX.
In some workloads, where multiple applications request hardware transmission timestamps, it was possible that some of those requests were denied because the only in use register was already occupied.
This is also in preparation to future support for hardware timestamping wwith multiple PTP domains. With multiple domains chances of multiple TX timestamps being requested at the same time increase.
Before:
$ sudo ./ntpperf -i enp3s0 -m 10:22:22:22:22:21 -d 192.168.1.3 -s 172.18.0.0/16 -I -H -o 37
| responses | TX timestamp offset (ns)
rate clients | lost invalid basic xleave | min mean max stddev
1000 100 0.00% 0.00% 0.00% 100.00% +1 +41 +73 13
1500 150 0.00% 0.00% 0.00% 100.00% +9 +49 +87 15
2250 225 0.00% 0.00% 0.00% 100.00% +9 +42 +79 13
3375 337 0.00% 0.00% 0.00% 100.00% +11 +46 +81 13
5062 506 0.00% 0.00% 0.00% 100.00% +7 +44 +80 13
7593 759 0.00% 0.00% 0.00% 100.00% +9 +44 +79 12
11389 1138 0.00% 0.00% 0.00% 100.00% +14 +51 +87 13
17083 1708 0.00% 0.00% 0.00% 100.00% +1 +41 +80 14
25624 2562 0.00% 0.00% 0.00% 100.00% +11 +50 +5107 51
38436 3843 0.00% 0.00% 0.00% 100.00% -2 +36 +7843 38
57654 5765 0.00% 0.00% 0.00% 100.00% +4 +42 +10503 69
86481 8648 0.00% 0.00% 0.00% 100.00% +11 +54 +5492 65
129721 12972 0.00% 0.00% 0.00% 100.00% +31 +2680 +6942 2606
194581 16384 16.79% 0.00% 0.87% 82.34% +73 +4444 +15879 3116
291871 16384 35.05% 0.00% 1.53% 63.42% +188 +5381 +17019 3035
437806 16384 54.95% 0.00% 2.55% 42.50% +233 +6302 +13885 2846After:
$ sudo ./ntpperf -i enp3s0 -m 10:22:22:22:22:21 -d 192.168.1.3 -s 172.18.0.0/16 -I -H -o 37
| responses | TX timestamp offset (ns)
rate clients | lost invalid basic xleave | min mean max stddev
1000 100 0.00% 0.00% 0.00% 100.00% -20 +12 +43 13
1500 150 0.00% 0.00% 0.00% 100.00% -23 +18 +57 14
2250 225 0.00% 0.00% 0.00% 100.00% -2 +33 +67 13
3375 337 0.00% 0.00% 0.00% 100.00% +1 +38 +76 13
5062 506 0.00% 0.00% 0.00% 100.00% +9 +52 +93 14
7593 759 0.00% 0.00% 0.00% 100.00% +11 +47 +82 13
11389 1138 0.00% 0.00% 0.00% 100.00% -9 +27 +74 13
17083 1708 0.00% 0.00% 0.00% 100.00% -13 +25 +66 14
25624 2562 0.00% 0.00% 0.00% 100.00% -8 +28 +65 13
38436 3843 0.00% 0.00% 0.00% 100.00% -13 +28 +69 13
57654 5765 0.00% 0.00% 0.00% 100.00% -11 +32 +71 14
86481 8648 0.00% 0.00% 0.00% 100.00% +2 +44 +83 14
129721 12972 15.36% 0.00% 0.35% 84.29% -2 +2248 +22907 4252
194581 16384 42.98% 0.00% 1.98% 55.04% -4 +5278 +65039 5856
291871 16384 54.33% 0.00% 2.21% 43.46% -3 +6306 +22608 5665We can see that with 4 registers, as expected, we are able to handle a increasing number of requests more consistently, but as soon as all registers are in use, the decrease in quality of service happens in a sharp step.
---
v1 -> v2:
- Removed patches sent as fixes to the net tree;
- More details to the commit message, ntpperf comparison (with the right clientloglimit, as Miroslav Lichvar suggested);
v1: https://lore.kernel.org/r/[email protected]/
drivers/net/ethernet/intel/igc/igc.h | 18 +- drivers/net/ethernet/intel/igc/igc_base.h | 3 + drivers/net/ethernet/intel/igc/igc_defines.h | 7 + drivers/net/ethernet/intel/igc/igc_main.c | 41 ++++- drivers/net/ethernet/intel/igc/igc_ptp.c | 179 +++++++++++++------ drivers/net/ethernet/intel/igc/igc_regs.h | 12 ++ 6 files changed, 195 insertions(+), 65 deletions(-)
drivers/net/ethernet/intel/igc/igc.h +16 -2
@@ -37,6 +37,8 @@ void igc_ethtool_set_ops(struct net_device *);#define MAX_FLEX_FILTER 32 +#define IGC_MAX_TX_TSTAMP_REGS 4 +enum igc_mac_filter_type {IGC_MAC_FILTER_TYPE_DST =0 ,IGC_MAC_FILTER_TYPE_SRC
@@ -69,6 +71,15 @@ struct igc_rx_packet_stats {u64 other_packets; }; +struct igc_tx_timestamp_request { +struct sk_buff *skb;/* reference to the packet being timestamped */ +unsigned long start;/* when the tstamp request started (jiffies) */ +u32 mask;/* _TSYNCTXCTL_TXTT_{X} bit for this request */ +u32 regl;/* which TXSTMPL_{X} register should be used */ +u32 regh;/* which TXSTMPH_{X} register should be used */ +u32 flags;/* flags that should be added to the tx_buffer */ +}; +struct igc_ring_container {struct igc_ring *ring;/* pointer to linked list of rings */ unsigned int total_bytes;/* total bytes processed this int */
@@ -240,9 +251,8 @@ struct igc_adapter {* ptp_tx_lock. */ spinlock_t ptp_tx_lock; -struct sk_buff *ptp_tx_skb; +struct igc_tx_timestamp_request tx_tstamp[IGC_MAX_TX_TSTAMP_REGS ];struct hwtstamp_config tstamp_config; -unsigned long ptp_tx_start;unsigned int ptp_flags;/* System time value lock */ spinlock_t tmreg_lock;
@@ -450,6 +460,10 @@ enum igc_tx_flags {/* olinfo flags */ IGC_TX_FLAGS_IPV4 =0x10 ,IGC_TX_FLAGS_CSUM =0x20 , + +IGC_TX_FLAGS_TSTAMP_1 =0x100 , +IGC_TX_FLAGS_TSTAMP_2 =0x200 , + IGC_TX_FLAGS_TSTAMP_3 = 0x400, }; enum igc_boards {
drivers/net/ethernet/intel/igc/igc_base.h +3 -0
@@ -34,6 +34,9 @@ struct igc_adv_tx_context_desc {/* Adv Transmit Descriptor Config Masks */ #define IGC_ADVTXD_MAC_TSTAMP 0x00080000/* IEEE1588 Timestamp packet */ +#define IGC_ADVTXD_TSTAMP_REG_1 0x00010000/* Select register 1 for timestamp */ +#define IGC_ADVTXD_TSTAMP_REG_2 0x00020000/* Select register 2 for timestamp */ +#define IGC_ADVTXD_TSTAMP_REG_3 0x00030000/* Select register 3 for timestamp */ #define IGC_ADVTXD_DTYP_CTXT 0x00200000/* Advanced Context Descriptor */ #define IGC_ADVTXD_DTYP_DATA 0x00300000/* Advanced Data Descriptor */ #define IGC_ADVTXD_DCMD_EOP 0x01000000/* End of Packet */
drivers/net/ethernet/intel/igc/igc_defines.h +7 -0
@@ -454,6 +454,9 @@/* Time Sync Transmit Control bit definitions */ #define IGC_TSYNCTXCTL_TXTT_0 0x00000001/* Tx timestamp reg 0 valid */ +#define IGC_TSYNCTXCTL_TXTT_1 0x00000002/* Tx timestamp reg 1 valid */ +#define IGC_TSYNCTXCTL_TXTT_2 0x00000004/* Tx timestamp reg 2 valid */ +#define IGC_TSYNCTXCTL_TXTT_3 0x00000008/* Tx timestamp reg 3 valid */ #define IGC_TSYNCTXCTL_ENABLED 0x00000010/* enable Tx timestamping */ #define IGC_TSYNCTXCTL_MAX_ALLOWED_DLY_MASK 0x0000F000/* max delay */ #define IGC_TSYNCTXCTL_SYNC_COMP_ERR 0x20000000/* sync err */
@@ -461,6 +464,10 @@#define IGC_TSYNCTXCTL_START_SYNC 0x80000000/* initiate sync */ #define IGC_TSYNCTXCTL_TXSYNSIG 0x00000020/* Sample TX tstamp in PHY sop */ +#define IGC_TSYNCTXCTL_TXTT_ANY ( \ + IGC_TSYNCTXCTL_TXTT_0 | IGC_TSYNCTXCTL_TXTT_1 | \ + IGC_TSYNCTXCTL_TXTT_2 | IGC_TSYNCTXCTL_TXTT_3) +/* Timer selection bits */ #define IGC_AUX_IO_TIMER_SEL_SYSTIM0 (0u << 30)/* Select SYSTIM0 for auxiliary time stamp */ #define IGC_AUX_IO_TIMER_SEL_SYSTIM1 (1u << 30)/* Select SYSTIM1 for auxiliary time stamp */
drivers/net/ethernet/intel/igc/igc_main.c +35 -6
65 lines not on this page · raw message
drivers/net/ethernet/intel/igc/igc_ptp.c +122 -57
252 lines not on this page · raw message
drivers/net/ethernet/intel/igc/igc_regs.h +12 -0
@@ -243,6 +243,18 @@#define IGC_SYSTIMR 0x0B6F8/* System time register Residue */ #define IGC_TIMINCA 0x0B608/* Increment attributes register - RW */ +/* TX Timestamp Low */ +#define IGC_TXSTMPL_0 0x0B618 +#define IGC_TXSTMPL_1 0x0B698 +#define IGC_TXSTMPL_2 0x0B6B8 +#define IGC_TXSTMPL_3 0x0B6D8 + +/* TX Timestamp High */ +#define IGC_TXSTMPH_0 0x0B61C +#define IGC_TXSTMPH_1 0x0B69C +#define IGC_TXSTMPH_2 0x0B6BC +#define IGC_TXSTMPH_3 0x0B6DC +#define IGC_TXSTMPL 0x0B618/* Tx timestamp value Low - RO */ #define IGC_TXSTMPH 0x0B61C/* Tx timestamp value High - RO */
Signature · 6 lines
2.41.0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Tony Nguyen
maintainerOn 7/26/2023 5:06 PM, Vinicius Costa Gomes wrote:
...
Quoted 4 lines
/**
*igc_ptp_tx_hwtstamp- utility function which checks for TX time stamp
* @adapter: Board private structure
+ * @mask: bitmask of which timestamp registers are ready
Probably a remnant of previous work but...
igc_ptp.c:761: warning: Excess function parameter 'mask' description in 'igc_ptp_tx_hwtstamp'
Quoted 11 lines
*- * If we were asked to do hardware stamping and such a time stamp is
- * available, then it must have been for this skb here because we only
- * allow only one such packet into the queue.
+ * Check against the ready mask for which of the timestamp register
+ * sets are ready to be retrieved, then retrieve that and notify the
+ * rest of the stack.
*
* Context: Expectsadapter->ptp_tx_lockto be held by caller. */
static voidigc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Quoted 9 lines · Tony Nguyen
On 7/26/2023 5:06 PM, Vinicius Costa Gomes wrote:
...
Quoted 4 lines
/**
*igc_ptp_tx_hwtstamp- utility function which checks for TX time stamp
* @adapter: Board private structure
+ * @mask: bitmask of which timestamp registers are ready
Quoted 5 lines
Probably a remnant of previous work but...
igc_ptp.c:761: warning: Excess function parameter 'mask' description in '
igc_ptp_tx_hwtstamp'
Will fix.
Quoted 11 lines
Quoted 11 lines
*- * If we were asked to do hardware stamping and such a time stamp is
- * available, then it must have been for this skb here because we only
- * allow only one such packet into the queue.
+ * Check against the ready mask for which of the timestamp register
+ * sets are ready to be retrieved, then retrieve that and notify the
+ * rest of the stack.
*
* Context: Expectsadapter->ptp_tx_lockto be held by caller. */
static voidigc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
Cheers,
Signature · 5 lines
Vinicius _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan