sfc: add extra RX channel to receive MAE counter updates on ef100
authorEdward Cree <ecree.xilinx@gmail.com>
Mon, 14 Nov 2022 13:15:55 +0000 (13:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Nov 2022 09:07:02 +0000 (09:07 +0000)
Currently there is no counter-allocating machinery to connect the
 resulting counter update values to; that will be added in a
 subsequent patch.

Signed-off-by: Edward Cree <ecree.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sfc/Makefile
drivers/net/ethernet/sfc/mae_counter_format.h [new file with mode: 0644]
drivers/net/ethernet/sfc/net_driver.h
drivers/net/ethernet/sfc/tc.c
drivers/net/ethernet/sfc/tc.h
drivers/net/ethernet/sfc/tc_counters.c [new file with mode: 0644]
drivers/net/ethernet/sfc/tc_counters.h [new file with mode: 0644]

index b5e45fc..712a48d 100644 (file)
@@ -9,7 +9,7 @@ sfc-y                   += efx.o efx_common.o efx_channels.o nic.o \
                           ef100_ethtool.o ef100_rx.o ef100_tx.o
 sfc-$(CONFIG_SFC_MTD)  += mtd.o
 sfc-$(CONFIG_SFC_SRIOV)        += sriov.o ef10_sriov.o ef100_sriov.o ef100_rep.o \
-                           mae.o tc.o tc_bindings.o
+                           mae.o tc.o tc_bindings.o tc_counters.o
 
 obj-$(CONFIG_SFC)      += sfc.o
 
diff --git a/drivers/net/ethernet/sfc/mae_counter_format.h b/drivers/net/ethernet/sfc/mae_counter_format.h
new file mode 100644 (file)
index 0000000..7e252e3
--- /dev/null
@@ -0,0 +1,73 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/****************************************************************************
+ * Driver for Solarflare network controllers and boards
+ * Copyright 2020 Xilinx, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+
+/* Format of counter packets (version 2) from the ef100 Match-Action Engine */
+
+#ifndef EFX_MAE_COUNTER_FORMAT_H
+#define EFX_MAE_COUNTER_FORMAT_H
+
+
+/*------------------------------------------------------------*/
+/*
+ * ER_RX_SL_PACKETISER_HEADER_WORD(160bit):
+ * 
+ */
+#define ER_RX_SL_PACKETISER_HEADER_WORD_SIZE 20
+#define ER_RX_SL_PACKETISER_HEADER_WORD_WIDTH 160
+
+#define ERF_SC_PACKETISER_HEADER_VERSION_LBN 0
+#define ERF_SC_PACKETISER_HEADER_VERSION_WIDTH 8
+#define ERF_SC_PACKETISER_HEADER_VERSION_VALUE 2
+#define ERF_SC_PACKETISER_HEADER_IDENTIFIER_LBN 8
+#define ERF_SC_PACKETISER_HEADER_IDENTIFIER_WIDTH 8
+#define ERF_SC_PACKETISER_HEADER_IDENTIFIER_AR 0
+#define ERF_SC_PACKETISER_HEADER_IDENTIFIER_CT 1
+#define ERF_SC_PACKETISER_HEADER_IDENTIFIER_OR 2
+#define ERF_SC_PACKETISER_HEADER_HEADER_OFFSET_LBN 16
+#define ERF_SC_PACKETISER_HEADER_HEADER_OFFSET_WIDTH 8
+#define ERF_SC_PACKETISER_HEADER_HEADER_OFFSET_DEFAULT 0x4
+#define ERF_SC_PACKETISER_HEADER_PAYLOAD_OFFSET_LBN 24
+#define ERF_SC_PACKETISER_HEADER_PAYLOAD_OFFSET_WIDTH 8
+#define ERF_SC_PACKETISER_HEADER_PAYLOAD_OFFSET_DEFAULT 0x14
+#define ERF_SC_PACKETISER_HEADER_INDEX_LBN 32
+#define ERF_SC_PACKETISER_HEADER_INDEX_WIDTH 16
+#define ERF_SC_PACKETISER_HEADER_COUNT_LBN 48
+#define ERF_SC_PACKETISER_HEADER_COUNT_WIDTH 16
+#define ERF_SC_PACKETISER_HEADER_RESERVED_0_LBN 64
+#define ERF_SC_PACKETISER_HEADER_RESERVED_0_WIDTH 32
+#define ERF_SC_PACKETISER_HEADER_RESERVED_1_LBN 96
+#define ERF_SC_PACKETISER_HEADER_RESERVED_1_WIDTH 32
+#define ERF_SC_PACKETISER_HEADER_RESERVED_2_LBN 128
+#define ERF_SC_PACKETISER_HEADER_RESERVED_2_WIDTH 32
+
+
+/*------------------------------------------------------------*/
+/*
+ * ER_RX_SL_PACKETISER_PAYLOAD_WORD(128bit):
+ * 
+ */
+#define ER_RX_SL_PACKETISER_PAYLOAD_WORD_SIZE 16
+#define ER_RX_SL_PACKETISER_PAYLOAD_WORD_WIDTH 128
+
+#define ERF_SC_PACKETISER_PAYLOAD_COUNTER_INDEX_LBN 0
+#define ERF_SC_PACKETISER_PAYLOAD_COUNTER_INDEX_WIDTH 24
+#define ERF_SC_PACKETISER_PAYLOAD_RESERVED_LBN 24
+#define ERF_SC_PACKETISER_PAYLOAD_RESERVED_WIDTH 8
+#define ERF_SC_PACKETISER_PAYLOAD_PACKET_COUNT_OFST 4
+#define ERF_SC_PACKETISER_PAYLOAD_PACKET_COUNT_SIZE 6
+#define ERF_SC_PACKETISER_PAYLOAD_PACKET_COUNT_LBN 32
+#define ERF_SC_PACKETISER_PAYLOAD_PACKET_COUNT_WIDTH 48
+#define ERF_SC_PACKETISER_PAYLOAD_BYTE_COUNT_OFST 10
+#define ERF_SC_PACKETISER_PAYLOAD_BYTE_COUNT_SIZE 6
+#define ERF_SC_PACKETISER_PAYLOAD_BYTE_COUNT_LBN 80
+#define ERF_SC_PACKETISER_PAYLOAD_BYTE_COUNT_WIDTH 48
+
+
+#endif /* EFX_MAE_COUNTER_FORMAT_H */
index 1e42f34..3b49e21 100644 (file)
@@ -56,7 +56,8 @@
 #define EFX_MAX_RX_QUEUES EFX_MAX_CHANNELS
 #define EFX_EXTRA_CHANNEL_IOV  0
 #define EFX_EXTRA_CHANNEL_PTP  1
-#define EFX_MAX_EXTRA_CHANNELS 2U
+#define EFX_EXTRA_CHANNEL_TC   2
+#define EFX_MAX_EXTRA_CHANNELS 3U
 
 /* Checksum generation is a per-queue option in hardware, so each
  * queue visible to the networking core is backed by two hardware TX
index 894f578..37d56a1 100644 (file)
@@ -761,6 +761,7 @@ int efx_init_struct_tc(struct efx_nic *efx)
        efx->tc->dflt.pf.fw_id = MC_CMD_MAE_ACTION_RULE_INSERT_OUT_ACTION_RULE_ID_NULL;
        INIT_LIST_HEAD(&efx->tc->dflt.wire.acts.list);
        efx->tc->dflt.wire.fw_id = MC_CMD_MAE_ACTION_RULE_INSERT_OUT_ACTION_RULE_ID_NULL;
+       efx->extra_channel_type[EFX_EXTRA_CHANNEL_TC] = &efx_tc_channel_type;
        return 0;
 fail_match_action_ht:
        mutex_destroy(&efx->tc->mutex);
index 464fc92..97dc06f 100644 (file)
 #include <net/flow_offload.h>
 #include <linux/rhashtable.h>
 #include "net_driver.h"
-#include "mcdi_pcol.h" /* for MAE_COUNTER_TYPE_* */
-
-enum efx_tc_counter_type {
-       EFX_TC_COUNTER_TYPE_AR = MAE_COUNTER_TYPE_AR,
-       EFX_TC_COUNTER_TYPE_CT = MAE_COUNTER_TYPE_CT,
-       EFX_TC_COUNTER_TYPE_OR = MAE_COUNTER_TYPE_OR,
-       EFX_TC_COUNTER_TYPE_MAX
-};
+#include "tc_counters.h"
 
 #define IS_ALL_ONES(v) (!(typeof (v))~(v))
 
diff --git a/drivers/net/ethernet/sfc/tc_counters.c b/drivers/net/ethernet/sfc/tc_counters.c
new file mode 100644 (file)
index 0000000..4a310cd
--- /dev/null
@@ -0,0 +1,269 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/****************************************************************************
+ * Driver for Solarflare network controllers and boards
+ * Copyright 2022 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+
+#include "tc_counters.h"
+#include "mae_counter_format.h"
+#include "mae.h"
+#include "rx_common.h"
+
+/* TC Channel.  Counter updates are delivered on this channel's RXQ. */
+
+static void efx_tc_handle_no_channel(struct efx_nic *efx)
+{
+       netif_warn(efx, drv, efx->net_dev,
+                  "MAE counters require MSI-X and 1 additional interrupt vector.\n");
+}
+
+static int efx_tc_probe_channel(struct efx_channel *channel)
+{
+       struct efx_rx_queue *rx_queue = &channel->rx_queue;
+
+       channel->irq_moderation_us = 0;
+       rx_queue->core_index = 0;
+
+       INIT_WORK(&rx_queue->grant_work, efx_mae_counters_grant_credits);
+
+       return 0;
+}
+
+static int efx_tc_start_channel(struct efx_channel *channel)
+{
+       struct efx_rx_queue *rx_queue = efx_channel_get_rx_queue(channel);
+       struct efx_nic *efx = channel->efx;
+
+       return efx_mae_start_counters(efx, rx_queue);
+}
+
+static void efx_tc_stop_channel(struct efx_channel *channel)
+{
+       struct efx_rx_queue *rx_queue = efx_channel_get_rx_queue(channel);
+       struct efx_nic *efx = channel->efx;
+       int rc;
+
+       rc = efx_mae_stop_counters(efx, rx_queue);
+       if (rc)
+               netif_warn(efx, drv, efx->net_dev,
+                          "Failed to stop MAE counters streaming, rc=%d.\n",
+                          rc);
+       rx_queue->grant_credits = false;
+       flush_work(&rx_queue->grant_work);
+}
+
+static void efx_tc_remove_channel(struct efx_channel *channel)
+{
+}
+
+static void efx_tc_get_channel_name(struct efx_channel *channel,
+                                   char *buf, size_t len)
+{
+       snprintf(buf, len, "%s-mae", channel->efx->name);
+}
+
+static void efx_tc_counter_update(struct efx_nic *efx,
+                                 enum efx_tc_counter_type counter_type,
+                                 u32 counter_idx, u64 packets, u64 bytes,
+                                 u32 mark)
+{
+       /* Software counter objects do not exist yet, for now we ignore this */
+}
+
+static void efx_tc_rx_version_1(struct efx_nic *efx, const u8 *data, u32 mark)
+{
+       u16 n_counters, i;
+
+       /* Header format:
+        * + |   0    |   1    |   2    |   3    |
+        * 0 |version |         reserved         |
+        * 4 |    seq_index    |   n_counters    |
+        */
+
+       n_counters = le16_to_cpu(*(const __le16 *)(data + 6));
+
+       /* Counter update entry format:
+        * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | a | b | c | d | e | f |
+        * |  counter_idx  |     packet_count      |      byte_count       |
+        */
+       for (i = 0; i < n_counters; i++) {
+               const void *entry = data + 8 + 16 * i;
+               u64 packet_count, byte_count;
+               u32 counter_idx;
+
+               counter_idx = le32_to_cpu(*(const __le32 *)entry);
+               packet_count = le32_to_cpu(*(const __le32 *)(entry + 4)) |
+                              ((u64)le16_to_cpu(*(const __le16 *)(entry + 8)) << 32);
+               byte_count = le16_to_cpu(*(const __le16 *)(entry + 10)) |
+                            ((u64)le32_to_cpu(*(const __le32 *)(entry + 12)) << 16);
+               efx_tc_counter_update(efx, EFX_TC_COUNTER_TYPE_AR, counter_idx,
+                                     packet_count, byte_count, mark);
+       }
+}
+
+#define TCV2_HDR_PTR(pkt, field)                                               \
+       ((void)BUILD_BUG_ON_ZERO(ERF_SC_PACKETISER_HEADER_##field##_LBN & 7),   \
+        (pkt) + ERF_SC_PACKETISER_HEADER_##field##_LBN / 8)
+#define TCV2_HDR_BYTE(pkt, field)                                              \
+       ((void)BUILD_BUG_ON_ZERO(ERF_SC_PACKETISER_HEADER_##field##_WIDTH != 8),\
+        *TCV2_HDR_PTR(pkt, field))
+#define TCV2_HDR_WORD(pkt, field)                                              \
+       ((void)BUILD_BUG_ON_ZERO(ERF_SC_PACKETISER_HEADER_##field##_WIDTH != 16),\
+        (void)BUILD_BUG_ON_ZERO(ERF_SC_PACKETISER_HEADER_##field##_LBN & 15),  \
+        *(__force const __le16 *)TCV2_HDR_PTR(pkt, field))
+#define TCV2_PKT_PTR(pkt, poff, i, field)                                      \
+       ((void)BUILD_BUG_ON_ZERO(ERF_SC_PACKETISER_PAYLOAD_##field##_LBN & 7),  \
+        (pkt) + ERF_SC_PACKETISER_PAYLOAD_##field##_LBN/8 + poff +             \
+        i * ER_RX_SL_PACKETISER_PAYLOAD_WORD_SIZE)
+
+/* Read a little-endian 48-bit field with 16-bit alignment */
+static u64 efx_tc_read48(const __le16 *field)
+{
+       u64 out = 0;
+       int i;
+
+       for (i = 0; i < 3; i++)
+               out |= (u64)le16_to_cpu(field[i]) << (i * 16);
+       return out;
+}
+
+static enum efx_tc_counter_type efx_tc_rx_version_2(struct efx_nic *efx,
+                                                   const u8 *data, u32 mark)
+{
+       u8 payload_offset, header_offset, ident;
+       enum efx_tc_counter_type type;
+       u16 n_counters, i;
+
+       ident = TCV2_HDR_BYTE(data, IDENTIFIER);
+       switch (ident) {
+       case ERF_SC_PACKETISER_HEADER_IDENTIFIER_AR:
+               type = EFX_TC_COUNTER_TYPE_AR;
+               break;
+       case ERF_SC_PACKETISER_HEADER_IDENTIFIER_CT:
+               type = EFX_TC_COUNTER_TYPE_CT;
+               break;
+       case ERF_SC_PACKETISER_HEADER_IDENTIFIER_OR:
+               type = EFX_TC_COUNTER_TYPE_OR;
+               break;
+       default:
+               if (net_ratelimit())
+                       netif_err(efx, drv, efx->net_dev,
+                                 "ignored v2 MAE counter packet (bad identifier %u"
+                                 "), counters may be inaccurate\n", ident);
+               return EFX_TC_COUNTER_TYPE_MAX;
+       }
+       header_offset = TCV2_HDR_BYTE(data, HEADER_OFFSET);
+       /* mae_counter_format.h implies that this offset is fixed, since it
+        * carries on with SOP-based LBNs for the fields in this header
+        */
+       if (header_offset != ERF_SC_PACKETISER_HEADER_HEADER_OFFSET_DEFAULT) {
+               if (net_ratelimit())
+                       netif_err(efx, drv, efx->net_dev,
+                                 "choked on v2 MAE counter packet (bad header_offset %u"
+                                 "), counters may be inaccurate\n", header_offset);
+               return EFX_TC_COUNTER_TYPE_MAX;
+       }
+       payload_offset = TCV2_HDR_BYTE(data, PAYLOAD_OFFSET);
+       n_counters = le16_to_cpu(TCV2_HDR_WORD(data, COUNT));
+
+       for (i = 0; i < n_counters; i++) {
+               const void *counter_idx_p, *packet_count_p, *byte_count_p;
+               u64 packet_count, byte_count;
+               u32 counter_idx;
+
+               /* 24-bit field with 32-bit alignment */
+               counter_idx_p = TCV2_PKT_PTR(data, payload_offset, i, COUNTER_INDEX);
+               BUILD_BUG_ON(ERF_SC_PACKETISER_PAYLOAD_COUNTER_INDEX_WIDTH != 24);
+               BUILD_BUG_ON(ERF_SC_PACKETISER_PAYLOAD_COUNTER_INDEX_LBN & 31);
+               counter_idx = le32_to_cpu(*(const __le32 *)counter_idx_p) & 0xffffff;
+               /* 48-bit field with 16-bit alignment */
+               packet_count_p = TCV2_PKT_PTR(data, payload_offset, i, PACKET_COUNT);
+               BUILD_BUG_ON(ERF_SC_PACKETISER_PAYLOAD_PACKET_COUNT_WIDTH != 48);
+               BUILD_BUG_ON(ERF_SC_PACKETISER_PAYLOAD_PACKET_COUNT_LBN & 15);
+               packet_count = efx_tc_read48((const __le16 *)packet_count_p);
+               /* 48-bit field with 16-bit alignment */
+               byte_count_p = TCV2_PKT_PTR(data, payload_offset, i, BYTE_COUNT);
+               BUILD_BUG_ON(ERF_SC_PACKETISER_PAYLOAD_BYTE_COUNT_WIDTH != 48);
+               BUILD_BUG_ON(ERF_SC_PACKETISER_PAYLOAD_BYTE_COUNT_LBN & 15);
+               byte_count = efx_tc_read48((const __le16 *)byte_count_p);
+
+               if (type == EFX_TC_COUNTER_TYPE_CT) {
+                       /* CT counters are 1-bit saturating counters to update
+                        * the lastuse time in CT stats. A received CT counter
+                        * should have packet counter to 0 and only LSB bit on
+                        * in byte counter.
+                        */
+                       if (packet_count || byte_count != 1)
+                               netdev_warn_once(efx->net_dev,
+                                                "CT counter with inconsistent state (%llu, %llu)\n",
+                                                packet_count, byte_count);
+                       /* Do not increment the driver's byte counter */
+                       byte_count = 0;
+               }
+
+               efx_tc_counter_update(efx, type, counter_idx, packet_count,
+                                     byte_count, mark);
+       }
+       return type;
+}
+
+/* We always swallow the packet, whether successful or not, since it's not
+ * a network packet and shouldn't ever be forwarded to the stack.
+ * @mark is the generation count for counter allocations.
+ */
+static bool efx_tc_rx(struct efx_rx_queue *rx_queue, u32 mark)
+{
+       struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
+       struct efx_rx_buffer *rx_buf = efx_rx_buffer(rx_queue,
+                                                    channel->rx_pkt_index);
+       const u8 *data = efx_rx_buf_va(rx_buf);
+       struct efx_nic *efx = rx_queue->efx;
+       enum efx_tc_counter_type type;
+       u8 version;
+
+       /* version is always first byte of packet */
+       version = *data;
+       switch (version) {
+       case 1:
+               type = EFX_TC_COUNTER_TYPE_AR;
+               efx_tc_rx_version_1(efx, data, mark);
+               break;
+       case ERF_SC_PACKETISER_HEADER_VERSION_VALUE: // 2
+               type = efx_tc_rx_version_2(efx, data, mark);
+               break;
+       default:
+               if (net_ratelimit())
+                       netif_err(efx, drv, efx->net_dev,
+                                 "choked on MAE counter packet (bad version %u"
+                                 "); counters may be inaccurate\n",
+                                 version);
+               goto out;
+       }
+
+       /* Update seen_gen unconditionally, to avoid a missed wakeup if
+        * we race with efx_mae_stop_counters().
+        */
+       efx->tc->seen_gen[type] = mark;
+       if (efx->tc->flush_counters &&
+           (s32)(efx->tc->flush_gen[type] - mark) <= 0)
+               wake_up(&efx->tc->flush_wq);
+out:
+       efx_free_rx_buffers(rx_queue, rx_buf, 1);
+       channel->rx_pkt_n_frags = 0;
+       return true;
+}
+
+const struct efx_channel_type efx_tc_channel_type = {
+       .handle_no_channel      = efx_tc_handle_no_channel,
+       .pre_probe              = efx_tc_probe_channel,
+       .start                  = efx_tc_start_channel,
+       .stop                   = efx_tc_stop_channel,
+       .post_remove            = efx_tc_remove_channel,
+       .get_name               = efx_tc_get_channel_name,
+       .receive_raw            = efx_tc_rx,
+       .keep_eventq            = true,
+};
diff --git a/drivers/net/ethernet/sfc/tc_counters.h b/drivers/net/ethernet/sfc/tc_counters.h
new file mode 100644 (file)
index 0000000..400a39b
--- /dev/null
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/****************************************************************************
+ * Driver for Solarflare network controllers and boards
+ * Copyright 2022 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+
+#ifndef EFX_TC_COUNTERS_H
+#define EFX_TC_COUNTERS_H
+#include "net_driver.h"
+
+#include "mcdi_pcol.h" /* for MAE_COUNTER_TYPE_* */
+
+enum efx_tc_counter_type {
+       EFX_TC_COUNTER_TYPE_AR = MAE_COUNTER_TYPE_AR,
+       EFX_TC_COUNTER_TYPE_CT = MAE_COUNTER_TYPE_CT,
+       EFX_TC_COUNTER_TYPE_OR = MAE_COUNTER_TYPE_OR,
+       EFX_TC_COUNTER_TYPE_MAX
+};
+
+extern const struct efx_channel_type efx_tc_channel_type;
+
+#endif /* EFX_TC_COUNTERS_H */