net/sfc: add dynamic log level for MCDI messages

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>

diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
index c0b52d3..2e4c3d8 100644 (file)
--- a/doc/guides/nics/sfc_efx.rst
+++ b/doc/guides/nics/sfc_efx.rst
@@ -321,12 +321,6 @@ boolean parameters value.
   **auto** allows NIC firmware to make a choice based on
   installed licences and firmware variant configured using **sfboot**.
 
-- ``mcdi_logging`` [bool] (default **n**)
-
-  Enable extra logging of the communication with the NIC's management CPU.
-  The logging is done using RTE_LOG() with INFO level and PMD type.
-  The format is consumed by the Solarflare netlogdecode cross-platform tool.
-
 - ``stats_update_period_ms`` [long] (default **1000**)
 
   Adjust period in milliseconds to update port hardware statistics.
@@ -360,3 +354,9 @@ SFC EFX PMD provides the following log types available for control:
   Matches a subset of per-port log types registered during runtime.
   A full name for a particular type may be obtained by appending a
   dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
+
+- ``pmd.net.sfc.mcdi`` (default level is **6** - ``RTE_LOG_NOTICE``)
+
+  Extra logging of the communication with the NIC's management CPU.
+  The format of the log is consumed by the Solarflare netlogdecode
+  cross-platform tool. May be managed per-port, as explained above.

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 378c675..65a4df2 100644 (file)
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -104,7 +104,7 @@ struct sfc_mcdi {
        efsys_mem_t                     mem;
        enum sfc_mcdi_state             state;
        efx_mcdi_transport_t            transport;
-       bool                            logging;
+       uint32_t                        logtype;
        uint32_t                        proxy_handle;
        efx_rc_t                        proxy_result;
 };

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index ebd0a23..f16d520 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -2065,8 +2065,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
        SFC_KVARG_RX_DATAPATH "=" SFC_KVARG_VALUES_RX_DATAPATH " "
        SFC_KVARG_TX_DATAPATH "=" SFC_KVARG_VALUES_TX_DATAPATH " "
        SFC_KVARG_PERF_PROFILE "=" SFC_KVARG_VALUES_PERF_PROFILE " "
-       SFC_KVARG_STATS_UPDATE_PERIOD_MS "=<long> "
-       SFC_KVARG_MCDI_LOGGING "=" SFC_KVARG_VALUES_BOOL);
+       SFC_KVARG_STATS_UPDATE_PERIOD_MS "=<long>");
 
 RTE_INIT(sfc_driver_register_logtype);
 static void

diff --git a/drivers/net/sfc/sfc_kvargs.c b/drivers/net/sfc/sfc_kvargs.c
index 860adeb..9c08bff 100644 (file)
--- a/drivers/net/sfc/sfc_kvargs.c
+++ b/drivers/net/sfc/sfc_kvargs.c
@@ -23,7 +23,6 @@ sfc_kvargs_parse(struct sfc_adapter *sa)
        struct rte_devargs *devargs = eth_dev->device->devargs;
        const char **params = (const char *[]){
                SFC_KVARG_STATS_UPDATE_PERIOD_MS,
-               SFC_KVARG_MCDI_LOGGING,
                SFC_KVARG_PERF_PROFILE,
                SFC_KVARG_RX_DATAPATH,
                SFC_KVARG_TX_DATAPATH,

diff --git a/drivers/net/sfc/sfc_kvargs.h b/drivers/net/sfc/sfc_kvargs.h
index 2c7aaaf..a84dc6b 100644 (file)
--- a/drivers/net/sfc/sfc_kvargs.h
+++ b/drivers/net/sfc/sfc_kvargs.h
@@ -18,8 +18,6 @@ extern "C" {
 
 #define SFC_KVARG_VALUES_BOOL          "[1|y|yes|on|0|n|no|off]"
 
-#define SFC_KVARG_MCDI_LOGGING         "mcdi_logging"
-
 #define SFC_KVARG_PERF_PROFILE         "perf_profile"
 
 #define SFC_KVARG_PERF_PROFILE_AUTO            "auto"

diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h
index 6daab1c..d6f3435 100644 (file)
--- a/drivers/net/sfc/sfc_log.h
+++ b/drivers/net/sfc/sfc_log.h
@@ -25,6 +25,12 @@ extern uint32_t sfc_logtype_driver;
 /** Name prefix for the per-device log type used to report basic information */
 #define SFC_LOGTYPE_MAIN_STR   SFC_LOGTYPE_PREFIX "main"
 
+/** Device MCDI log type name prefix */
+#define SFC_LOGTYPE_MCDI_STR   SFC_LOGTYPE_PREFIX "mcdi"
+
+/** Level value used by MCDI log statements */
+#define SFC_LOG_LEVEL_MCDI     RTE_LOG_INFO
+
 /* Log PMD message, automatically add prefix and \n */
 #define SFC_LOG(sa, level, type, ...) \
        do {                                                            \
@@ -84,4 +90,13 @@ extern uint32_t sfc_logtype_driver;
                                RTE_FMT_TAIL(__VA_ARGS__ ,)));          \
        } while (0)
 
+#define sfc_log_mcdi(sa, ...) \
+       do {                                                            \
+               const struct sfc_adapter *_sa = (sa);                   \
+                                                                       \
+               SFC_LOG(_sa, SFC_LOG_LEVEL_MCDI, _sa->mcdi.logtype,     \
+                       __VA_ARGS__);                                   \
+       } while (0)
+
+
 #endif /* _SFC_LOG_H_ */

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 895c2f5..007506b 100644 (file)
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -15,7 +15,6 @@
 
 #include "sfc.h"
 #include "sfc_log.h"
-#include "sfc_kvargs.h"
 #include "sfc_ev.h"
 
 #define SFC_MCDI_POLL_INTERVAL_MIN_US  10              /* 10us in 1us units */
@@ -176,7 +175,7 @@ sfc_mcdi_do_log(const struct sfc_adapter *sa,
                         * at the end which is required by netlogdecode.
                         */
                        buffer[position] = '\0';
-                       sfc_notice(sa, "%s \\", buffer);
+                       sfc_log_mcdi(sa, "%s \\", buffer);
                        /* Preserve prefix for the next log message */
                        position = pfxsize;
                }
@@ -198,10 +197,17 @@ sfc_mcdi_logger(void *arg, efx_log_msg_t type,
        size_t pfxsize;
        size_t start;
 
-       if (!sa->mcdi.logging)
+       /*
+        * Unlike the other cases, MCDI logging implies more onerous work
+        * needed to produce a message. If the dynamic log level prevents
+        * the end result from being printed, the CPU time will be wasted.
+        *
+        * To avoid wasting time, the actual level is examined in advance.
+        */
+       if (rte_log_get_level(sa->mcdi.logtype) < (int)SFC_LOG_LEVEL_MCDI)
                return;
 
-       /* The format including prefix added by sfc_notice() is the format
+       /* The format including prefix added by sfc_log_mcdi() is the format
         * consumed by the Solarflare netlogdecode tool.
         */
        pfxsize = snprintf(buffer, sizeof(buffer), "MCDI RPC %s:",
@@ -212,7 +218,7 @@ sfc_mcdi_logger(void *arg, efx_log_msg_t type,
        start = sfc_mcdi_do_log(sa, buffer, data, data_size, pfxsize, start);
        if (start != pfxsize) {
                buffer[start] = '\0';
-               sfc_notice(sa, "%s", buffer);
+               sfc_log_mcdi(sa, "%s", buffer);
        }
 }
 
@@ -250,11 +256,8 @@ sfc_mcdi_init(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_dma_alloc;
 
-       /* Convert negative error to positive used in the driver */
-       rc = sfc_kvargs_process(sa, SFC_KVARG_MCDI_LOGGING,
-                               sfc_kvarg_bool_handler, &mcdi->logging);
-       if (rc != 0)
-               goto fail_kvargs_process;
+       mcdi->logtype = sfc_register_logtype(sa, SFC_LOGTYPE_MCDI_STR,
+                                            RTE_LOG_NOTICE);
 
        emtp = &mcdi->transport;
        emtp->emt_context = sa;
@@ -274,8 +277,6 @@ sfc_mcdi_init(struct sfc_adapter *sa)
 
 fail_mcdi_init:
        memset(emtp, 0, sizeof(*emtp));
-
-fail_kvargs_process:
        sfc_dma_free(sa, &mcdi->mem);
 
 fail_dma_alloc: