drop_monitor: Consider all monitoring states before performing configuration

The drop monitor configuration (e.g., alert mode) is global, but user
will be able to enable monitoring of only software or hardware drops.

Therefore, ensure that monitoring of both software and hardware drops are
disabled before allowing drop monitor configuration to take place.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 6020f34..a2c7f91 100644 (file)
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -633,6 +633,11 @@ static int set_all_monitor_traces(int state, struct netlink_ext_ack *extack)
        return rc;
 }
 
+static bool net_dm_is_monitoring(void)
+{
+       return trace_state == TRACE_ON || monitor_hw;
+}
+
 static int net_dm_alert_mode_get_from_info(struct genl_info *info,
                                           enum net_dm_alert_mode *p_alert_mode)
 {
@@ -694,8 +699,8 @@ static int net_dm_cmd_config(struct sk_buff *skb,
        struct netlink_ext_ack *extack = info->extack;
        int rc;
 
-       if (trace_state == TRACE_ON) {
-               NL_SET_ERR_MSG_MOD(extack, "Cannot configure drop monitor while tracing is on");
+       if (net_dm_is_monitoring()) {
+               NL_SET_ERR_MSG_MOD(extack, "Cannot configure drop monitor during monitoring");
                return -EBUSY;
        }