Skip to content

Commit f05ce73

Browse files
Faizal Rahimanguy11
authored andcommitted
igc: add support to get frame preemption statistics via ethtool
Implemented "ethtool --include-statistics --show-mm" callback for IGC. Tested preemption scenario to check preemption statistics: 1) Trigger verification handshake on both boards: $ sudo ethtool --set-mm enp1s0 pmac-enabled on $ sudo ethtool --set-mm enp1s0 tx-enabled on $ sudo ethtool --set-mm enp1s0 verify-enabled on 2) Set preemptible or express queue in taprio for tx board: $ sudo 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 F 100000 \ fp E E P P 3) Send large size packets on preemptible queue 4) Send small size packets on express queue to preempt packets in preemptible queue 5) Show preemption statistics on the receiving board: $ ethtool --include-statistics --show-mm enp1s0 MAC Merge layer state for enp1s0: pMAC enabled: on TX enabled: on TX active: on TX minimum fragment size: 64 RX minimum fragment size: 60 Verify enabled: on Verify time: 128 Max verify time: 128 Verification status: SUCCEEDED Statistics: MACMergeFrameAssErrorCount: 0 MACMergeFrameSmdErrorCount: 0 MACMergeFrameAssOkCount: 511 MACMergeFragCountRx: 764 MACMergeFragCountTx: 0 MACMergeHoldCount: 0 Co-developed-by: Vinicius Costa Gomes <[email protected]> Signed-off-by: Vinicius Costa Gomes <[email protected]> Co-developed-by: Chwee-Lin Choong <[email protected]> Signed-off-by: Chwee-Lin Choong <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> Signed-off-by: Faizal Rahim <[email protected]> Tested-by: Mor Bar-Gabay <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 10e2ffe commit f05ce73

File tree

2 files changed

+57
-0
lines changed

2 files changed

+57
-0
lines changed

drivers/net/ethernet/intel/igc/igc_ethtool.c

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,6 +1819,46 @@ static int igc_ethtool_set_mm(struct net_device *netdev,
18191819
return igc_tsn_offload_apply(adapter);
18201820
}
18211821

1822+
/**
1823+
* igc_ethtool_get_frame_ass_error - Get the frame assembly error count.
1824+
* @reg_value: Register value for IGC_PRMEXCPRCNT
1825+
* Return: The count of frame assembly errors.
1826+
*/
1827+
static u64 igc_ethtool_get_frame_ass_error(u32 reg_value)
1828+
{
1829+
/* Out of order statistics */
1830+
u32 ooo_frame_cnt, ooo_frag_cnt;
1831+
u32 miss_frame_frag_cnt;
1832+
1833+
ooo_frame_cnt = FIELD_GET(IGC_PRMEXCPRCNT_OOO_FRAME_CNT, reg_value);
1834+
ooo_frag_cnt = FIELD_GET(IGC_PRMEXCPRCNT_OOO_FRAG_CNT, reg_value);
1835+
miss_frame_frag_cnt = FIELD_GET(IGC_PRMEXCPRCNT_MISS_FRAME_FRAG_CNT,
1836+
reg_value);
1837+
1838+
return ooo_frame_cnt + ooo_frag_cnt + miss_frame_frag_cnt;
1839+
}
1840+
1841+
static u64 igc_ethtool_get_frame_smd_error(u32 reg_value)
1842+
{
1843+
return FIELD_GET(IGC_PRMEXCPRCNT_OOO_SMDC, reg_value);
1844+
}
1845+
1846+
static void igc_ethtool_get_mm_stats(struct net_device *dev,
1847+
struct ethtool_mm_stats *stats)
1848+
{
1849+
struct igc_adapter *adapter = netdev_priv(dev);
1850+
struct igc_hw *hw = &adapter->hw;
1851+
u32 reg_value;
1852+
1853+
reg_value = rd32(IGC_PRMEXCPRCNT);
1854+
1855+
stats->MACMergeFrameAssErrorCount = igc_ethtool_get_frame_ass_error(reg_value);
1856+
stats->MACMergeFrameSmdErrorCount = igc_ethtool_get_frame_smd_error(reg_value);
1857+
stats->MACMergeFrameAssOkCount = rd32(IGC_PRMPTDRCNT);
1858+
stats->MACMergeFragCountRx = rd32(IGC_PRMEVNTRCNT);
1859+
stats->MACMergeFragCountTx = rd32(IGC_PRMEVNTTCNT);
1860+
}
1861+
18221862
static int igc_ethtool_get_link_ksettings(struct net_device *netdev,
18231863
struct ethtool_link_ksettings *cmd)
18241864
{
@@ -2115,6 +2155,7 @@ static const struct ethtool_ops igc_ethtool_ops = {
21152155
.set_link_ksettings = igc_ethtool_set_link_ksettings,
21162156
.self_test = igc_ethtool_diag_test,
21172157
.get_mm = igc_ethtool_get_mm,
2158+
.get_mm_stats = igc_ethtool_get_mm_stats,
21182159
.set_mm = igc_ethtool_set_mm,
21192160
};
21202161

drivers/net/ethernet/intel/igc/igc_regs.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,22 @@
222222

223223
#define IGC_FTQF(_n) (0x059E0 + (4 * (_n))) /* 5-tuple Queue Fltr */
224224

225+
/* Time sync registers - preemption statistics */
226+
#define IGC_PRMPTDRCNT 0x04284 /* Good RX Preempted Packets */
227+
#define IGC_PRMEVNTTCNT 0x04298 /* TX Preemption event counter */
228+
#define IGC_PRMEVNTRCNT 0x0429C /* RX Preemption event counter */
229+
230+
/* Preemption Exception Counter */
231+
#define IGC_PRMEXCPRCNT 0x42A0
232+
/* Received out of order packets with SMD-C */
233+
#define IGC_PRMEXCPRCNT_OOO_SMDC 0x000000FF
234+
/* Received out of order packets with SMD-C and wrong Frame CNT */
235+
#define IGC_PRMEXCPRCNT_OOO_FRAME_CNT 0x0000FF00
236+
/* Received out of order packets with SMD-C and wrong Frag CNT */
237+
#define IGC_PRMEXCPRCNT_OOO_FRAG_CNT 0x00FF0000
238+
/* Received packets with SMD-S and wrong Frag CNT and Frame CNT */
239+
#define IGC_PRMEXCPRCNT_MISS_FRAME_FRAG_CNT 0xFF000000
240+
225241
/* Transmit Scheduling Registers */
226242
#define IGC_TQAVCTRL 0x3570
227243
#define IGC_TXQCTL(_n) (0x3344 + 0x4 * (_n))

0 commit comments

Comments
 (0)