Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80cebed8 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

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: default avatarIdo Schimmel <idosch@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent edd3d007

net/core/drop_monitor.c

+7 −2
Original line number Diff line number Diff line
@@ -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;

	}