| Message ID | 20240701100058.3301229-1-faizal.abdul.rahim@linux.intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [iwl-net,v1,1/1] igc: Fix packet still tx after gate close by reducing i226 MAC retry buffer | expand |
Dear Faizal, Thank you for your patch. Am 01.07.24 um 12:00 schrieb Faizal Rahim: > AVNU testing uncovered that even when the taprio gate is closed, > some packets still transmit. What is AVNU? *some* would fit on the line above. > A known i225/6 hardware errata states traffic might overflow the planned Do you have an idea for that errata? Please document it. (I see you added it at the end. Maybe use [1] notation for referencing it.) > QBV window. This happens because MAC maintains an internal buffer, > primarily for supporting half duplex retries. Therefore, when > the gate closes, residual MAC data in the buffer may still transmit. > > To mitigate this for i226, reduce the MAC's internal buffer from > 192 bytes to 88 bytes by modifying the RETX_CTL register value. … to the recommended 88 bytes … > This follows guidelines from: > > a) Ethernet Controller I225/I22 Spec Update Rev 2.1 Errata Item 9: > TSN: Packet Transmission Might Cross Qbv Window > b) I225/6 SW User Manual Rev 1.2.4: Section 8.11.5 Retry Buffer Control > > Test Steps: > 1. Send taprio cmd to board A > tc qdisc replace dev enp1s0 parent root handle 100 taprio \ > num_tc 4 \ > map 3 2 1 0 3 3 3 3 3 3 3 3 3 3 3 3 \ > queues 1@0 1@1 1@2 1@3 \ > base-time 0 \ > sched-entry S 0x07 500000 \ > sched-entry S 0x0f 500000 \ > flags 0x2 \ > txtime-delay 0 > > - Note that for TC3, gate opens for 500us and close for another 500us > > 3. Take tcpdump log on Board B > > 4. Send udp packets via UDP tai app from Board A to Board B > > 5. Analyze tcpdump log via wireshark log on Board B > - Observed that the total time from the first to the last packet > received during one cycle for TC3 does not exceed 500us Indent the list item by four spaces? (Also above?) > > Signed-off-by: Faizal Rahim <faizal.abdul.rahim@linux.intel.com> As you Cc’ed stable@vger.kernel.org, add a Fixes: tag? > --- > drivers/net/ethernet/intel/igc/igc_defines.h | 6 ++++ > drivers/net/ethernet/intel/igc/igc_tsn.c | 34 ++++++++++++++++++++ > 2 files changed, 40 insertions(+) > > diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h > index 5f92b3c7c3d4..511384f3ec5c 100644 > --- a/drivers/net/ethernet/intel/igc/igc_defines.h > +++ b/drivers/net/ethernet/intel/igc/igc_defines.h > @@ -404,6 +404,12 @@ > #define IGC_DTXMXPKTSZ_TSN 0x19 /* 1600 bytes of max TX DMA packet size */ > #define IGC_DTXMXPKTSZ_DEFAULT 0x98 /* 9728-byte Jumbo frames */ > > +/* Retry Buffer Control */ > +#define IGC_RETX_CTL 0x041C > +#define IGC_RETX_CTL_WATERMARK_MASK 0xF > +#define IGC_RETX_CTL_QBVFULLTH_SHIFT 8 /* QBV Retry Buffer Full Threshold */ > +#define IGC_RETX_CTL_QBVFULLEN 0x1000 /* Enable QBV Retry Buffer Full Threshold */ > + > /* Transmit Scheduling Latency */ > /* Latency between transmission scheduling (LaunchTime) and the time > * the packet is transmitted to the network in nanosecond. > diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/ethernet/intel/igc/igc_tsn.c > index 22cefb1eeedf..c97d908cecc5 100644 > --- a/drivers/net/ethernet/intel/igc/igc_tsn.c > +++ b/drivers/net/ethernet/intel/igc/igc_tsn.c > @@ -78,6 +78,15 @@ void igc_tsn_adjust_txtime_offset(struct igc_adapter *adapter) > wr32(IGC_GTXOFFSET, txoffset); > } > > +static void igc_tsn_restore_retx_default(struct igc_adapter *adapter) > +{ > + struct igc_hw *hw = &adapter->hw; > + u32 retxctl; > + > + retxctl = rd32(IGC_RETX_CTL) & IGC_RETX_CTL_WATERMARK_MASK; > + wr32(IGC_RETX_CTL, retxctl); > +} > + > /* Returns the TSN specific registers to their default values after > * the adapter is reset. > */ > @@ -91,6 +100,9 @@ static int igc_tsn_disable_offload(struct igc_adapter *adapter) > wr32(IGC_TXPBS, I225_TXPBSIZE_DEFAULT); > wr32(IGC_DTXMXPKTSZ, IGC_DTXMXPKTSZ_DEFAULT); > > + if (igc_is_device_id_i226(hw)) > + igc_tsn_restore_retx_default(adapter); > + > tqavctrl = rd32(IGC_TQAVCTRL); > tqavctrl &= ~(IGC_TQAVCTRL_TRANSMIT_MODE_TSN | > IGC_TQAVCTRL_ENHANCED_QAV | IGC_TQAVCTRL_FUTSCDDIS); > @@ -111,6 +123,25 @@ static int igc_tsn_disable_offload(struct igc_adapter *adapter) > return 0; > } > > +/* To partially fix i226 HW errata, reduce MAC internal buffering from 192 Bytes > + * to 88 Bytes by setting RETX_CTL register using the recommendation from: > + * a) Ethernet Controller I225/I22 Specification Update Rev 2.1 > + * Item 9: TSN: Packet Transmission Might Cross the Qbv Window > + * b) I225/6 SW User Manual Rev 1.2.4: Section 8.11.5 Retry Buffer Control > + */ > +static void igc_tsn_set_retx_qbvfullth(struct igc_adapter *adapter) It’d put threshold in the name. > +{ > + struct igc_hw *hw = &adapter->hw; > + u32 retxctl, watermark; > + > + retxctl = rd32(IGC_RETX_CTL); > + watermark = retxctl & IGC_RETX_CTL_WATERMARK_MASK; > + /* Set QBVFULLTH value using watermark and set QBVFULLEN */ > + retxctl |= (watermark << IGC_RETX_CTL_QBVFULLTH_SHIFT) | > + IGC_RETX_CTL_QBVFULLEN; > + wr32(IGC_RETX_CTL, retxctl); > +} > + > static int igc_tsn_enable_offload(struct igc_adapter *adapter) > { > struct igc_hw *hw = &adapter->hw; > @@ -123,6 +154,9 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter) > wr32(IGC_DTXMXPKTSZ, IGC_DTXMXPKTSZ_TSN); > wr32(IGC_TXPBS, IGC_TXPBSIZE_TSN); > > + if (igc_is_device_id_i226(hw)) > + igc_tsn_set_retx_qbvfullth(adapter); > + > for (i = 0; i < adapter->num_tx_queues; i++) { > struct igc_ring *ring = adapter->tx_ring[i]; > u32 txqctl = 0; Kind regards, Paul
Hi Paul, Thanks for reviewing. On 1/7/2024 8:42 pm, Paul Menzel wrote: > Dear Faizal, > > > Thank you for your patch. > > Am 01.07.24 um 12:00 schrieb Faizal Rahim: >> AVNU testing uncovered that even when the taprio gate is closed, >> some packets still transmit. > > What is AVNU? *some* would fit on the line above. AVNU stands for "Avnu Alliance." AVNU (Audio Video Bridging Network Alliance) is an industry consortium that promotes and certifies interoperability of devices implementing IEEE 802.1 standards for time-sensitive applications. This AVNU test refers to AVNU certification test plan. Should I add this information in the commit ? >> A known i225/6 hardware errata states traffic might overflow the planned > > Do you have an idea for that errata? Please document it. (I see you added > it at the end. Maybe use [1] notation for referencing it.) Sure. >> Signed-off-by: Faizal Rahim <faizal.abdul.rahim@linux.intel.com> > > As you Cc’ed stable@vger.kernel.org, add a Fixes: tag? Accidentally CC'ed stable@vger.kernel.org. Since it's a hardware bug, not software, probably Fixes: tag not needed ? Not sure which Fixes: commit to point to hmm. I'll remove stable kernel email and omit Fixes: tag, is that okay? >> /* Returns the TSN specific registers to their default values after >> * the adapter is reset. >> */ >> @@ -91,6 +100,9 @@ static int igc_tsn_disable_offload(struct igc_adapter >> *adapter) >> wr32(IGC_TXPBS, I225_TXPBSIZE_DEFAULT); >> wr32(IGC_DTXMXPKTSZ, IGC_DTXMXPKTSZ_DEFAULT); >> + if (igc_is_device_id_i226(hw)) >> + igc_tsn_restore_retx_default(adapter); >> + >> tqavctrl = rd32(IGC_TQAVCTRL); >> tqavctrl &= ~(IGC_TQAVCTRL_TRANSMIT_MODE_TSN | >> IGC_TQAVCTRL_ENHANCED_QAV | IGC_TQAVCTRL_FUTSCDDIS); >> @@ -111,6 +123,25 @@ static int igc_tsn_disable_offload(struct >> igc_adapter *adapter) >> return 0; >> } >> +/* To partially fix i226 HW errata, reduce MAC internal buffering from >> 192 Bytes >> + * to 88 Bytes by setting RETX_CTL register using the recommendation from: >> + * a) Ethernet Controller I225/I22 Specification Update Rev 2.1 >> + * Item 9: TSN: Packet Transmission Might Cross the Qbv Window >> + * b) I225/6 SW User Manual Rev 1.2.4: Section 8.11.5 Retry Buffer Control >> + */ >> +static void igc_tsn_set_retx_qbvfullth(struct igc_adapter *adapter) > > It’d put threshold in the name. My earlier thought is that it is easier to look for the keyword "qbvfullth" in the i226 SW User Manual where you'll get a hit that brings you directly to that register. "qbvfullthreshold" would not. There are some comments in the new code that links 'th' to 'threshold' for the reader. But I'm okay to change it to "qbvfullthreshold". Thoughts? Regards, Faizal
On 1/7/2024 8:42 pm, Paul Menzel wrote: > Dear Faizal, > > > Thank you for your patch. > >> This follows guidelines from: >> >> a) Ethernet Controller I225/I22 Spec Update Rev 2.1 Errata Item 9: >> TSN: Packet Transmission Might Cross Qbv Window >> b) I225/6 SW User Manual Rev 1.2.4: Section 8.11.5 Retry Buffer Control >> >> Test Steps: >> 1. Send taprio cmd to board A >> tc qdisc replace dev enp1s0 parent root handle 100 taprio \ >> num_tc 4 \ >> map 3 2 1 0 3 3 3 3 3 3 3 3 3 3 3 3 \ >> queues 1@0 1@1 1@2 1@3 \ >> base-time 0 \ >> sched-entry S 0x07 500000 \ >> sched-entry S 0x0f 500000 \ >> flags 0x2 \ >> txtime-delay 0 >> >> - Note that for TC3, gate opens for 500us and close for another 500us >> >> 3. Take tcpdump log on Board B >> >> 4. Send udp packets via UDP tai app from Board A to Board B >> >> 5. Analyze tcpdump log via wireshark log on Board B >> - Observed that the total time from the first to the last packet >> received during one cycle for TC3 does not exceed 500us > > Indent the list item by four spaces? (Also above?) Hi Paul, Would like to confirm, the indent suggestion from you is referring to which style ? (a) 1. Send taprio ... tc qdisc .. map 3 4 .. queue 1@0 .... (b) 1. Send taprio ... tc qdisc .. map 3 4 .. queue 1@0 .... (c) 1. Send taprio ... tc qdisc .. map 3 4 .. queue 1@0 .... I think it's (a), but afraid if misunderstood the suggestion. Thank you ! Regards, Faizal
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h index 5f92b3c7c3d4..511384f3ec5c 100644 --- a/drivers/net/ethernet/intel/igc/igc_defines.h +++ b/drivers/net/ethernet/intel/igc/igc_defines.h @@ -404,6 +404,12 @@ #define IGC_DTXMXPKTSZ_TSN 0x19 /* 1600 bytes of max TX DMA packet size */ #define IGC_DTXMXPKTSZ_DEFAULT 0x98 /* 9728-byte Jumbo frames */ +/* Retry Buffer Control */ +#define IGC_RETX_CTL 0x041C +#define IGC_RETX_CTL_WATERMARK_MASK 0xF +#define IGC_RETX_CTL_QBVFULLTH_SHIFT 8 /* QBV Retry Buffer Full Threshold */ +#define IGC_RETX_CTL_QBVFULLEN 0x1000 /* Enable QBV Retry Buffer Full Threshold */ + /* Transmit Scheduling Latency */ /* Latency between transmission scheduling (LaunchTime) and the time * the packet is transmitted to the network in nanosecond. diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/ethernet/intel/igc/igc_tsn.c index 22cefb1eeedf..c97d908cecc5 100644 --- a/drivers/net/ethernet/intel/igc/igc_tsn.c +++ b/drivers/net/ethernet/intel/igc/igc_tsn.c @@ -78,6 +78,15 @@ void igc_tsn_adjust_txtime_offset(struct igc_adapter *adapter) wr32(IGC_GTXOFFSET, txoffset); } +static void igc_tsn_restore_retx_default(struct igc_adapter *adapter) +{ + struct igc_hw *hw = &adapter->hw; + u32 retxctl; + + retxctl = rd32(IGC_RETX_CTL) & IGC_RETX_CTL_WATERMARK_MASK; + wr32(IGC_RETX_CTL, retxctl); +} + /* Returns the TSN specific registers to their default values after * the adapter is reset. */ @@ -91,6 +100,9 @@ static int igc_tsn_disable_offload(struct igc_adapter *adapter) wr32(IGC_TXPBS, I225_TXPBSIZE_DEFAULT); wr32(IGC_DTXMXPKTSZ, IGC_DTXMXPKTSZ_DEFAULT); + if (igc_is_device_id_i226(hw)) + igc_tsn_restore_retx_default(adapter); + tqavctrl = rd32(IGC_TQAVCTRL); tqavctrl &= ~(IGC_TQAVCTRL_TRANSMIT_MODE_TSN | IGC_TQAVCTRL_ENHANCED_QAV | IGC_TQAVCTRL_FUTSCDDIS); @@ -111,6 +123,25 @@ static int igc_tsn_disable_offload(struct igc_adapter *adapter) return 0; } +/* To partially fix i226 HW errata, reduce MAC internal buffering from 192 Bytes + * to 88 Bytes by setting RETX_CTL register using the recommendation from: + * a) Ethernet Controller I225/I22 Specification Update Rev 2.1 + * Item 9: TSN: Packet Transmission Might Cross the Qbv Window + * b) I225/6 SW User Manual Rev 1.2.4: Section 8.11.5 Retry Buffer Control + */ +static void igc_tsn_set_retx_qbvfullth(struct igc_adapter *adapter) +{ + struct igc_hw *hw = &adapter->hw; + u32 retxctl, watermark; + + retxctl = rd32(IGC_RETX_CTL); + watermark = retxctl & IGC_RETX_CTL_WATERMARK_MASK; + /* Set QBVFULLTH value using watermark and set QBVFULLEN */ + retxctl |= (watermark << IGC_RETX_CTL_QBVFULLTH_SHIFT) | + IGC_RETX_CTL_QBVFULLEN; + wr32(IGC_RETX_CTL, retxctl); +} + static int igc_tsn_enable_offload(struct igc_adapter *adapter) { struct igc_hw *hw = &adapter->hw; @@ -123,6 +154,9 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter) wr32(IGC_DTXMXPKTSZ, IGC_DTXMXPKTSZ_TSN); wr32(IGC_TXPBS, IGC_TXPBSIZE_TSN); + if (igc_is_device_id_i226(hw)) + igc_tsn_set_retx_qbvfullth(adapter); + for (i = 0; i < adapter->num_tx_queues; i++) { struct igc_ring *ring = adapter->tx_ring[i]; u32 txqctl = 0;
AVNU testing uncovered that even when the taprio gate is closed, some packets still transmit. A known i225/6 hardware errata states traffic might overflow the planned QBV window. This happens because MAC maintains an internal buffer, primarily for supporting half duplex retries. Therefore, when the gate closes, residual MAC data in the buffer may still transmit. To mitigate this for i226, reduce the MAC's internal buffer from 192 bytes to 88 bytes by modifying the RETX_CTL register value. This follows guidelines from: a) Ethernet Controller I225/I22 Spec Update Rev 2.1 Errata Item 9: TSN: Packet Transmission Might Cross Qbv Window b) I225/6 SW User Manual Rev 1.2.4: Section 8.11.5 Retry Buffer Control Test Steps: 1. Send taprio cmd to board A tc qdisc replace dev enp1s0 parent root handle 100 taprio \ num_tc 4 \ map 3 2 1 0 3 3 3 3 3 3 3 3 3 3 3 3 \ queues 1@0 1@1 1@2 1@3 \ base-time 0 \ sched-entry S 0x07 500000 \ sched-entry S 0x0f 500000 \ flags 0x2 \ txtime-delay 0 - Note that for TC3, gate opens for 500us and close for another 500us 3. Take tcpdump log on Board B 4. Send udp packets via UDP tai app from Board A to Board B 5. Analyze tcpdump log via wireshark log on Board B - Observed that the total time from the first to the last packet received during one cycle for TC3 does not exceed 500us Signed-off-by: Faizal Rahim <faizal.abdul.rahim@linux.intel.com> --- drivers/net/ethernet/intel/igc/igc_defines.h | 6 ++++ drivers/net/ethernet/intel/igc/igc_tsn.c | 34 ++++++++++++++++++++ 2 files changed, 40 insertions(+)