* [PATCH net-next 1/3] drop_monitor: Implement namespace filtering/reporting for software drops
2022-11-21 13:31 [PATCH net-next 0/3] Add support for netnamespace filtering in drop monitor Nikolay Borisov
@ 2022-11-21 13:31 ` Nikolay Borisov
2022-11-21 14:24 ` Jiri Pirko
2022-11-21 13:31 ` [PATCH net-next 2/3] drop_monitor: Add namespace filtering/reporting for hardware drops Nikolay Borisov
2022-11-21 13:31 ` [PATCH net-next 3/3] selftests: net: Add drop monitor tests for namespace filtering functionality Nikolay Borisov
2 siblings, 1 reply; 6+ messages in thread
From: Nikolay Borisov @ 2022-11-21 13:31 UTC (permalink / raw)
To: nhorman; +Cc: davem, kuba, pabeni, netdev, den, khorenko, Nikolay Borisov
On hosts running multiple containers it's helpful to be able to see
in which net namespace a particular drop occured. Additionally, it's
also useful to limit drop point filtering to a single namespace,
especially for hosts which are dropping skb's at a high rate.
Signed-off-by: Nikolay Borisov <nikolay.borisov@virtuozzo.com>
---
include/uapi/linux/net_dropmon.h | 2 ++
net/core/drop_monitor.c | 36 ++++++++++++++++++++++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/net_dropmon.h b/include/uapi/linux/net_dropmon.h
index 84f622a66a7a..016c36b531da 100644
--- a/include/uapi/linux/net_dropmon.h
+++ b/include/uapi/linux/net_dropmon.h
@@ -8,6 +8,7 @@
struct net_dm_drop_point {
__u8 pc[8];
__u32 count;
+ __u32 ns_id;
};
#define is_drop_point_hw(x) do {\
@@ -82,6 +83,7 @@ enum net_dm_attr {
NET_DM_ATTR_TRUNC_LEN, /* u32 */
NET_DM_ATTR_ORIG_LEN, /* u32 */
NET_DM_ATTR_QUEUE_LEN, /* u32 */
+ NET_DM_ATTR_NS, /* u32 */
NET_DM_ATTR_STATS, /* nested */
NET_DM_ATTR_HW_STATS, /* nested */
NET_DM_ATTR_ORIGIN, /* u16 */
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 5a782d1d8fd3..d8450c1ee739 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -103,6 +103,7 @@ static unsigned long dm_hw_check_delta = 2*HZ;
static enum net_dm_alert_mode net_dm_alert_mode = NET_DM_ALERT_MODE_SUMMARY;
static u32 net_dm_trunc_len;
static u32 net_dm_queue_len = 1000;
+static u32 net_dm_ns;
struct net_dm_alert_ops {
void (*kfree_skb_probe)(void *ignore, struct sk_buff *skb,
@@ -210,6 +211,19 @@ static void sched_send_work(struct timer_list *t)
schedule_work(&data->dm_alert_work);
}
+static bool drop_point_matches(struct net_dm_drop_point *point, void *location,
+ unsigned long ns_id)
+{
+ if (net_dm_ns && point->ns_id == net_dm_ns &&
+ !memcmp(&location, &point->pc, sizeof(void *)))
+ return true;
+ else if (net_dm_ns == 0 && point->ns_id == ns_id &&
+ !memcmp(&location, &point->pc, sizeof(void *)))
+ return true;
+ else
+ return false;
+}
+
static void trace_drop_common(struct sk_buff *skb, void *location)
{
struct net_dm_alert_msg *msg;
@@ -219,7 +233,11 @@ static void trace_drop_common(struct sk_buff *skb, void *location)
int i;
struct sk_buff *dskb;
struct per_cpu_dm_data *data;
- unsigned long flags;
+ unsigned long flags, ns_id = 0;
+
+ if (skb->dev && net_dm_ns &&
+ dev_net(skb->dev)->ns.inum != net_dm_ns)
+ return;
local_irq_save(flags);
data = this_cpu_ptr(&dm_cpu_data);
@@ -233,8 +251,10 @@ static void trace_drop_common(struct sk_buff *skb, void *location)
nla = genlmsg_data(nlmsg_data(nlh));
msg = nla_data(nla);
point = msg->points;
+ if (skb->dev)
+ ns_id = dev_net(skb->dev)->ns.inum;
for (i = 0; i < msg->entries; i++) {
- if (!memcmp(&location, &point->pc, sizeof(void *))) {
+ if (drop_point_matches(point, location, ns_id)) {
point->count++;
goto out;
}
@@ -249,6 +269,7 @@ static void trace_drop_common(struct sk_buff *skb, void *location)
nla->nla_len += NLA_ALIGN(sizeof(struct net_dm_drop_point));
memcpy(point->pc, &location, sizeof(void *));
point->count = 1;
+ point->ns_id = ns_id;
msg->entries++;
if (!timer_pending(&data->send_timer)) {
@@ -1283,6 +1304,14 @@ static void net_dm_trunc_len_set(struct genl_info *info)
net_dm_trunc_len = nla_get_u32(info->attrs[NET_DM_ATTR_TRUNC_LEN]);
}
+static void net_dm_ns_set(struct genl_info *info)
+{
+ if (!info->attrs[NET_DM_ATTR_NS])
+ return;
+
+ net_dm_ns = nla_get_u32(info->attrs[NET_DM_ATTR_NS]);
+}
+
static void net_dm_queue_len_set(struct genl_info *info)
{
if (!info->attrs[NET_DM_ATTR_QUEUE_LEN])
@@ -1310,6 +1339,8 @@ static int net_dm_cmd_config(struct sk_buff *skb,
net_dm_queue_len_set(info);
+ net_dm_ns_set(info);
+
return 0;
}
@@ -1589,6 +1620,7 @@ static const struct nla_policy net_dm_nl_policy[NET_DM_ATTR_MAX + 1] = {
[NET_DM_ATTR_ALERT_MODE] = { .type = NLA_U8 },
[NET_DM_ATTR_TRUNC_LEN] = { .type = NLA_U32 },
[NET_DM_ATTR_QUEUE_LEN] = { .type = NLA_U32 },
+ [NET_DM_ATTR_NS] = { .type = NLA_U32 },
[NET_DM_ATTR_SW_DROPS] = {. type = NLA_FLAG },
[NET_DM_ATTR_HW_DROPS] = {. type = NLA_FLAG },
};
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net-next 1/3] drop_monitor: Implement namespace filtering/reporting for software drops
2022-11-21 13:31 ` [PATCH net-next 1/3] drop_monitor: Implement namespace filtering/reporting for software drops Nikolay Borisov
@ 2022-11-21 14:24 ` Jiri Pirko
2022-11-21 20:23 ` Jakub Kicinski
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Pirko @ 2022-11-21 14:24 UTC (permalink / raw)
To: Nikolay Borisov; +Cc: nhorman, davem, kuba, pabeni, netdev, den, khorenko
Mon, Nov 21, 2022 at 02:31:30PM CET, nikolay.borisov@virtuozzo.com wrote:
[...]
>diff --git a/include/uapi/linux/net_dropmon.h b/include/uapi/linux/net_dropmon.h
>index 84f622a66a7a..016c36b531da 100644
>--- a/include/uapi/linux/net_dropmon.h
>+++ b/include/uapi/linux/net_dropmon.h
>@@ -8,6 +8,7 @@
> struct net_dm_drop_point {
> __u8 pc[8];
> __u32 count;
>+ __u32 ns_id;
> };
>
> #define is_drop_point_hw(x) do {\
>@@ -82,6 +83,7 @@ enum net_dm_attr {
> NET_DM_ATTR_TRUNC_LEN, /* u32 */
> NET_DM_ATTR_ORIG_LEN, /* u32 */
> NET_DM_ATTR_QUEUE_LEN, /* u32 */
>+ NET_DM_ATTR_NS, /* u32 */
I believe that we need to add a CI warning for this kind of UAPI
breakage...
> NET_DM_ATTR_STATS, /* nested */
> NET_DM_ATTR_HW_STATS, /* nested */
> NET_DM_ATTR_ORIGIN, /* u16 */
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next 1/3] drop_monitor: Implement namespace filtering/reporting for software drops
2022-11-21 14:24 ` Jiri Pirko
@ 2022-11-21 20:23 ` Jakub Kicinski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2022-11-21 20:23 UTC (permalink / raw)
To: Jiri Pirko; +Cc: Nikolay Borisov, nhorman, davem, pabeni, netdev, den, khorenko
On Mon, 21 Nov 2022 15:24:53 +0100 Jiri Pirko wrote:
> >+ NET_DM_ATTR_NS, /* u32 */
>
> I believe that we need to add a CI warning for this kind of UAPI
> breakage...
Do you have any ideas on how to code it up in python?
I don't think we let too many such errors thru.
Nikolay, you can't add in the middle of an enum in uAPI because binary
backward compatibility would break. Always add attrs at the end / before
the "cnt" or "max" member.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 2/3] drop_monitor: Add namespace filtering/reporting for hardware drops
2022-11-21 13:31 [PATCH net-next 0/3] Add support for netnamespace filtering in drop monitor Nikolay Borisov
2022-11-21 13:31 ` [PATCH net-next 1/3] drop_monitor: Implement namespace filtering/reporting for software drops Nikolay Borisov
@ 2022-11-21 13:31 ` Nikolay Borisov
2022-11-21 13:31 ` [PATCH net-next 3/3] selftests: net: Add drop monitor tests for namespace filtering functionality Nikolay Borisov
2 siblings, 0 replies; 6+ messages in thread
From: Nikolay Borisov @ 2022-11-21 13:31 UTC (permalink / raw)
To: nhorman; +Cc: davem, kuba, pabeni, netdev, den, khorenko, Nikolay Borisov
Add support for filtering and conveying the netnamespace where a
particular drop event occured. This is counterpart to the software
drop events support that was added earlier.
Signed-off-by: Nikolay Borisov <nikolay.borisov@virtuozzo.com>
---
include/uapi/linux/net_dropmon.h | 1 +
net/core/drop_monitor.c | 28 ++++++++++++++++++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/net_dropmon.h b/include/uapi/linux/net_dropmon.h
index 016c36b531da..c6ab91e48b2a 100644
--- a/include/uapi/linux/net_dropmon.h
+++ b/include/uapi/linux/net_dropmon.h
@@ -92,6 +92,7 @@ enum net_dm_attr {
NET_DM_ATTR_HW_ENTRIES, /* nested */
NET_DM_ATTR_HW_ENTRY, /* nested */
NET_DM_ATTR_HW_TRAP_COUNT, /* u32 */
+ NET_DM_ATTR_HW_NS, /* u32 */
NET_DM_ATTR_SW_DROPS, /* flag */
NET_DM_ATTR_HW_DROPS, /* flag */
NET_DM_ATTR_FLOW_ACTION_COOKIE, /* binary */
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index d8450c1ee739..e5fba0b0dd4d 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -64,6 +64,7 @@ struct net_dm_stats {
struct net_dm_hw_entry {
char trap_name[NET_DM_MAX_HW_TRAP_NAME_LEN];
u32 count;
+ u32 ns_id;
};
struct net_dm_hw_entries {
@@ -355,6 +356,9 @@ static int net_dm_hw_entry_put(struct sk_buff *msg,
if (nla_put_u32(msg, NET_DM_ATTR_HW_TRAP_COUNT, hw_entry->count))
goto nla_put_failure;
+ if (nla_put_u32(msg, NET_DM_ATTR_HW_NS, hw_entry->ns_id))
+ goto nla_put_failure;
+
nla_nest_end(msg, attr);
return 0;
@@ -452,6 +456,21 @@ static void net_dm_hw_summary_work(struct work_struct *work)
kfree(hw_entries);
}
+static bool hw_entry_matches(struct net_dm_hw_entry *entry,
+ const char *trap_name, unsigned long ns_id)
+{
+ if (net_dm_ns && entry->ns_id == net_dm_ns &&
+ !strncmp(entry->trap_name, trap_name,
+ NET_DM_MAX_HW_TRAP_NAME_LEN - 1))
+ return true;
+ else if (net_dm_ns == 0 && entry->ns_id == ns_id &&
+ !strncmp(entry->trap_name, trap_name,
+ NET_DM_MAX_HW_TRAP_NAME_LEN - 1))
+ return true;
+ else
+ return false;
+}
+
static void
net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink,
struct sk_buff *skb,
@@ -461,11 +480,15 @@ net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink,
struct net_dm_hw_entry *hw_entry;
struct per_cpu_dm_data *hw_data;
unsigned long flags;
+ unsigned long ns_id;
int i;
if (metadata->trap_type == DEVLINK_TRAP_TYPE_CONTROL)
return;
+ if (net_dm_ns && dev_net(skb->dev)->ns.inum != net_dm_ns)
+ return;
+
hw_data = this_cpu_ptr(&dm_hw_cpu_data);
spin_lock_irqsave(&hw_data->lock, flags);
hw_entries = hw_data->hw_entries;
@@ -473,10 +496,10 @@ net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink,
if (!hw_entries)
goto out;
+ ns_id = dev_net(skb->dev)->ns.inum;
for (i = 0; i < hw_entries->num_entries; i++) {
hw_entry = &hw_entries->entries[i];
- if (!strncmp(hw_entry->trap_name, metadata->trap_name,
- NET_DM_MAX_HW_TRAP_NAME_LEN - 1)) {
+ if (hw_entry_matches(hw_entry, metadata->trap_name, ns_id)) {
hw_entry->count++;
goto out;
}
@@ -489,6 +512,7 @@ net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink,
NET_DM_MAX_HW_TRAP_NAME_LEN - 1);
hw_entry->count = 1;
hw_entries->num_entries++;
+ hw_entry->ns_id = ns_id;
if (!timer_pending(&hw_data->send_timer)) {
hw_data->send_timer.expires = jiffies + dm_delay * HZ;
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH net-next 3/3] selftests: net: Add drop monitor tests for namespace filtering functionality
2022-11-21 13:31 [PATCH net-next 0/3] Add support for netnamespace filtering in drop monitor Nikolay Borisov
2022-11-21 13:31 ` [PATCH net-next 1/3] drop_monitor: Implement namespace filtering/reporting for software drops Nikolay Borisov
2022-11-21 13:31 ` [PATCH net-next 2/3] drop_monitor: Add namespace filtering/reporting for hardware drops Nikolay Borisov
@ 2022-11-21 13:31 ` Nikolay Borisov
2 siblings, 0 replies; 6+ messages in thread
From: Nikolay Borisov @ 2022-11-21 13:31 UTC (permalink / raw)
To: nhorman; +Cc: davem, kuba, pabeni, netdev, den, khorenko, Nikolay Borisov
Extend the current set of tests with new ones covering the updated
functionality allowing to filter events based on the net namespace they
originated from. The new set of tests:
Software drops test
TEST: No filtering [ OK ]
TEST: Filter everything [ OK ]
TEST: NS2 packet drop filtered [ OK ]
TEST: Filtering reset [ OK ]
TEST: Filtering disabled [ OK ]
Hardware drops test
TEST: No filtering [ OK ]
TEST: Filter everything [ OK ]
TEST: NS2 packet drop filtered [ OK ]
TEST: Filtering reset [ OK ]
TEST: Filtering disabled [ OK ]
Signed-off-by: Nikolay Borisov <nikolay.borisov@virtuozzo.com>
---
.../selftests/net/drop_monitor_tests.sh | 127 +++++++++++++++---
1 file changed, 108 insertions(+), 19 deletions(-)
diff --git a/tools/testing/selftests/net/drop_monitor_tests.sh b/tools/testing/selftests/net/drop_monitor_tests.sh
index b7650e30d18b..776aabc036f1 100755
--- a/tools/testing/selftests/net/drop_monitor_tests.sh
+++ b/tools/testing/selftests/net/drop_monitor_tests.sh
@@ -13,14 +13,13 @@ TESTS="
hw_drops
"
-IP="ip -netns ns1"
-TC="tc -netns ns1"
-DEVLINK="devlink -N ns1"
-NS_EXEC="ip netns exec ns1"
NETDEVSIM_PATH=/sys/bus/netdevsim/
-DEV_ADDR=1337
-DEV=netdevsim${DEV_ADDR}
-DEVLINK_DEV=netdevsim/${DEV}
+DEV1_ADDR=1336
+DEV2_ADDR=1337
+DEV1=netdevsim${DEV1_ADDR}
+DEV2=netdevsim${DEV2_ADDR}
+DEVLINK_DEV1=netdevsim/${DEV1}
+DEVLINK_DEV2=netdevsim/${DEV2}
log_test()
{
@@ -44,20 +43,29 @@ setup()
set -e
ip netns add ns1
- $IP link add dummy10 up type dummy
-
- $NS_EXEC echo "$DEV_ADDR 1" > ${NETDEVSIM_PATH}/new_device
+ ip netns add ns2
+ NS1INUM=$(findmnt -t nsfs | grep -m1 ns1 | sed -rn 's/.*net:\[([[:digit:]]+)\].*/\1/p')
+ NS2INUM=$(findmnt -t nsfs | grep -m1 ns2 | sed -rn 's/.*net:\[([[:digit:]]+)\].*/\1/p')
+ ip -netns ns1 link add dummy10 up type dummy
+ ip -netns ns2 link add dummy10 up type dummy
+
+ ip netns exec ns1 echo "$DEV1_ADDR 1" > ${NETDEVSIM_PATH}/new_device
+ ip netns exec ns2 echo "$DEV2_ADDR 1" > ${NETDEVSIM_PATH}/new_device
udevadm settle
- local netdev=$($NS_EXEC ls ${NETDEVSIM_PATH}/devices/${DEV}/net/)
- $IP link set dev $netdev up
+ local netdev=$(ip netns exec ns1 ls ${NETDEVSIM_PATH}/devices/${DEV1}/net/)
+ ip -netns ns1 link set dev $netdev up
+ netdev=$(ip netns exec ns2 ls ${NETDEVSIM_PATH}/devices/${DEV2}/net/)
+ ip -netns ns2 link set dev $netdev up
set +e
}
cleanup()
{
- $NS_EXEC echo "$DEV_ADDR" > ${NETDEVSIM_PATH}/del_device
+ ip netns exec ns1 echo "$DEV1_ADDR" > ${NETDEVSIM_PATH}/del_device
+ ip netns exec ns2 echo "$DEV2_ADDR" > ${NETDEVSIM_PATH}/del_device
ip netns del ns1
+ ip netns del ns2
}
sw_drops_test()
@@ -69,13 +77,53 @@ sw_drops_test()
local dir=$(mktemp -d)
- $TC qdisc add dev dummy10 clsact
- $TC filter add dev dummy10 egress pref 1 handle 101 proto ip \
+ tc -netns ns1 qdisc add dev dummy10 clsact
+ tc -netns ns2 qdisc add dev dummy10 clsact
+ tc -netns ns1 filter add dev dummy10 egress pref 1 handle 101 proto ip \
+ flower dst_ip 192.0.2.10 action drop
+ tc -netns ns2 filter add dev dummy10 egress pref 1 handle 101 proto ip \
flower dst_ip 192.0.2.10 action drop
- $NS_EXEC mausezahn dummy10 -a 00:11:22:33:44:55 -b 00:aa:bb:cc:dd:ee \
+ ip netns exec ns1 mausezahn dummy10 -a 00:11:22:33:44:55 -b 00:aa:bb:cc:dd:ee \
-A 192.0.2.1 -B 192.0.2.10 -t udp sp=12345,dp=54321 -c 0 -q \
-d 100msec &
+ ip netns exec ns2 mausezahn dummy10 -a 00:11:22:33:44:55 -b 00:aa:bb:cc:dd:ee \
+ -A 192.0.2.1 -B 192.0.2.10 -t udp sp=12345,dp=54321 -c 0 -q \
+ -d 100msec &
+
+ # Test that if we set to 0 we get all packets
+ echo -e "set alertmode summary\nset ns 0\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q $NS1INUM $dir/output.txt
+ local ret1=$?
+ grep -q $NS2INUM $dir/output.txt
+ local ret2=$?
+ (( ret1 == 0 && ret2 == 0 ))
+ log_test $? 0 "No filtering"
+
+ # Set filter to a non-existant ns and we should see nothing
+ echo -e "set alertmode summary\nset ns -1\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q drops $dir/output.txt
+ log_test $? 1 "Filter everything"
+
+ # Set filter to NS1 so we shouldn't see NS2
+ echo -e "set ns $NS1INUM\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q $NS2INUM $dir/output.txt
+ log_test $? 1 "NS2 packet drop filtered"
+
+ # Return filter to 0 and ensure everything is fine
+ echo -e "set ns 0\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q $NS1INUM $dir/output.txt
+ ret1=$?
+ grep -q $NS2INUM $dir/output.txt
+ ret2=$?
+ (( ret1 == 0 && ret2 == 0 ))
+ log_test $? 0 "Filtering reset"
+
+ # disable ns capability at all
+ echo -e "set ns off\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q ns: $dir/output.txt
+ log_test $? 1 "Filtering disabled"
+
timeout 5 dwdump -o sw -w ${dir}/packets.pcap
(( $(tshark -r ${dir}/packets.pcap \
-Y 'ip.dst == 192.0.2.10' 2> /dev/null | wc -l) != 0))
@@ -83,7 +131,8 @@ sw_drops_test()
rm ${dir}/packets.pcap
- { kill %% && wait %%; } 2>/dev/null
+ { kill $(jobs -p) && wait $(jobs -p); } 2> /dev/null
+
timeout 5 dwdump -o sw -w ${dir}/packets.pcap
(( $(tshark -r ${dir}/packets.pcap \
-Y 'ip.dst == 192.0.2.10' 2> /dev/null | wc -l) == 0))
@@ -103,16 +152,56 @@ hw_drops_test()
local dir=$(mktemp -d)
- $DEVLINK trap set $DEVLINK_DEV trap blackhole_route action trap
+ devlink -N ns1 trap set $DEVLINK_DEV1 trap blackhole_route action trap
+ devlink -N ns2 trap set $DEVLINK_DEV2 trap blackhole_route action trap
+
+ # Test that if we set to 0 we get all packets
+ echo -e "set alertmode summary\nset ns 0\nset hw true\nstart" \
+ | timeout -s 2 5 dropwatch &> $dir/output.txt
+ #echo -e "set hw true\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -Eq ".*blackhole_route \[hardware\] \[ns: $NS1INUM\]" $dir/output.txt
+ local ret1=$?
+ grep -Eq ".*blackhole_route \[hardware\] \[ns: $NS2INUM\]" $dir/output.txt
+ local ret2=$?
+ (( ret1 == 0 && ret2 == 0 ))
+ log_test $? 0 "No filtering"
+
+ # Set filter to a non-existant ns and we should see nothing
+ echo -e "set ns -1\nset hw true\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q "\[hardware\]" $dir/output.txt
+ log_test $? 1 "Filter everything"
+
+ # Set filter to NS1 so we shouldn't see NS2
+ echo -e "set ns $NS1INUM\nset hw true\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q $NS2INUM $dir/output.txt
+ log_test $? 1 "NS2 packet drop filtered"
+
+ # Return filter to 0 and ensure everything is fine
+ echo -e "set ns 0\nset hw true\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -Eq ".*blackhole_route \[hardware\] \[ns: $NS1INUM\]" $dir/output.txt
+ local ret1=$?
+ grep -Eq ".*blackhole_route \[hardware\] \[ns: $NS2INUM\]" $dir/output.txt
+ local ret2=$?
+ (( ret1 == 0 && ret2 == 0 ))
+ log_test $? 0 "Filtering reset"
+
+ # disable ns capability at all
+ echo -e "set ns off\nset hw true\nstart" | timeout -s 2 5 dropwatch &> $dir/output.txt
+ grep -q ns: $dir/output.txt
+ log_test $? 1 "Filtering disabled"
+
timeout 5 dwdump -o hw -w ${dir}/packets.pcap
(( $(tshark -r ${dir}/packets.pcap \
-Y 'net_dm.hw_trap_name== blackhole_route' 2> /dev/null \
| wc -l) != 0))
log_test $? 0 "Capturing active hardware drops"
+ cp ${dir}/packets.pcap /root/host/
rm ${dir}/packets.pcap
- $DEVLINK trap set $DEVLINK_DEV trap blackhole_route action drop
+ devlink -N ns1 trap set $DEVLINK_DEV1 trap blackhole_route action drop
+ devlink -N ns2 trap set $DEVLINK_DEV2 trap blackhole_route action drop
+
timeout 5 dwdump -o hw -w ${dir}/packets.pcap
(( $(tshark -r ${dir}/packets.pcap \
-Y 'net_dm.hw_trap_name== blackhole_route' 2> /dev/null \
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread