d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netmap: monitor: add a flag to distinguish packet direction

Browse Source 
The netmap monitor intercepts any TX/RX packets on the monitored
port. However, before this change there was no way to tell
whether an intercepted packet was being transmitted or received
on the monitored port.
A TXMON flag in the netmap slot has been added for this purpose.
This commit is contained in:
Vincenzo Maffione 2021-03-29 16:32:54 +00:00
parent a6d768d845
commit 660a47cb99
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/netmap/netmap_monitor.c
View File

@ -38,6 +38,8 @@
* the traffic transiting on both the tx and rx corresponding rings in the
* monitored adapter. During registration, the user can choose if she wants
* to intercept tx only, rx only, or both tx and rx traffic.
* The slots containing traffic intercepted in the tx direction will have
* the NS_TXMON flag set.
*
* If the monitor is not able to cope with the stream of frames, excess traffic
* will be dropped.
@ -590,6 +592,7 @@ netmap_zmon_parent_sync(struct netmap_kring *kring, int flags, enum txrx tx)
u_int beg, end, i;
u_int lim = kring->nkr_num_slots - 1,
mlim; // = mkring->nkr_num_slots - 1;
uint16_t txmon = kring->tx == NR_TX ? NS_TXMON : 0;
if (mkring == NULL) {
nm_prlim(5, "NULL monitor on %s", kring->name);
@ -659,7 +662,7 @@ netmap_zmon_parent_sync(struct netmap_kring *kring, int flags, enum txrx tx)
ms->len = s->len;
s->len = tmp;
ms->flags = s->flags;
ms->flags = (s->flags & ~NS_TXMON) | txmon;
s->flags |= NS_BUF_CHANGED;
beg = nm_next(beg, lim);
@ -726,6 +729,7 @@ static void
netmap_monitor_parent_sync(struct netmap_kring *kring, u_int first_new, int new_slots)
{
u_int j;
uint16_t txmon = kring->tx == NR_TX ? NS_TXMON : 0;
for (j = 0; j < kring->n_monitors; j++) {
struct netmap_kring *mkring = kring->monitors[j];
@ -777,7 +781,7 @@ netmap_monitor_parent_sync(struct netmap_kring *kring, u_int first_new, int new_
memcpy(dst, src, copy_len);
ms->len = copy_len;
ms->flags = s->flags;
ms->flags = (s->flags & ~NS_TXMON) | txmon;
sent++;
beg = nm_next(beg, lim);

5
sys/net/netmap.h
View File

@ -219,6 +219,11 @@ struct netmap_slot {
* The 'len' field refers to the individual fragment.
*/
#define NS_TXMON 0x0040
/* (monitor ports only) the packet comes from the TX
* ring of the monitored port
*/
#define NS_PORT_SHIFT 8
#define NS_PORT_MASK (0xff << NS_PORT_SHIFT)
/*