Monitor interface for rtl8188eu
PATCH 1/1 Monitor interface for rtl8188eu
Hello,
This was previously posted as a RFC[1] to linux-wireless. Following Larry Finger's suggestion[2] I'm resending it as a proposed patch.
This patch is intended as a debugging aid for people working on the rtl8188eu driver. I started working on it because debug logs from rtl8188eu driver got me nowhere when I wanted to see what was "going in and out". It has reached a working state where you can use TShark/Wireshark to analyze the flow of 802.11 frames:
modprobe r8188eu monitor_enable=1
ip link set mon0 up
tshark -i mon0
I've been testing it against recent staging-next (6dd19f1), in managed mode, with hardware encryption, and only with CCMP (AES) cipher in use, but it should work with any.
Performance implications? A throughput test ran with iperf for 20 minutes before and after the changes (with monitor inferace enabled and up) showed:
before: 43.0 Mbits/sec after: 41.6 Mbits/sec
[1] https://lkml.kernel.org/g/[email protected]
[2] https://github.com/lwfinger/rtl8188eu/issues/73#issuecomment-138588729
Jakub Sitnicki (1):
staging: rtl8188eu: Introduce monitor interface for IEEE 802.11 frames
drivers/staging/rtl8188eu/Makefile | 1 + drivers/staging/rtl8188eu/core/rtw_recv.c | 14 ++ drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 + drivers/staging/rtl8188eu/include/drv_types.h | 2 + drivers/staging/rtl8188eu/include/mon.h | 36 +++++ drivers/staging/rtl8188eu/os_dep/mon.c | 194 +++++++++++++++++++++++++ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 5 + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 10 ++ 9 files changed, 270 insertions(+) create mode 100644 drivers/staging/rtl8188eu/include/mon.h create mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c
Signature · 1 line
2.1.0
PATCH 1/1 staging: rtl8188eu: Introduce monitor interface for IEEE 802.11 frames
This adds support for monitoring IEEE 802.11 Data and Management frames received or transmitted by a RTL8188EU-based device handled by this driver.
The monitor interface is not enabled by default and will be registered only if monitor_enable module parameter is set to 1. When enabled it will show up as a monX network device, which can be used by the userspace programs for monitoring network traffic.
It is intended as an exploratory/debugging tool for rtl8188eu driver.
--- drivers/staging/rtl8188eu/Makefile | 1 + drivers/staging/rtl8188eu/core/rtw_recv.c | 14 ++ drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 + drivers/staging/rtl8188eu/include/drv_types.h | 2 + drivers/staging/rtl8188eu/include/mon.h | 36 +++++ drivers/staging/rtl8188eu/os_dep/mon.c | 194 +++++++++++++++++++++++++ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 5 + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 10 ++ 9 files changed, 270 insertions(+) create mode 100644 drivers/staging/rtl8188eu/include/mon.h create mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c
drivers/staging/rtl8188eu/Makefile +1 -0
@@ -42,6 +42,7 @@ r8188eu-y := \ hal/usb_halinit.o \ os_dep/ioctl_linux.o \ os_dep/mlme_linux.o \ + os_dep/mon.o \ os_dep/os_intfs.o \ os_dep/osdep_service.o \ os_dep/recv_linux.o \
drivers/staging/rtl8188eu/core/rtw_recv.c +14 -0
@@ -25,6 +25,7 @@#include <drv_types.h> #include <recv_osdep.h> #include <mlme_osdep.h> +#include <mon.h> #include <wifi.h> #include <linux/vmalloc.h>
@@ -1329,6 +1330,19 @@ static int validate_recv_frame(struct adapter *adapter,break ; } +/* +* This is the last moment before management and control frames get +* discarded. So we need to forward them to the monitor now or never. +* +* At the same time data frames can still be encrypted if software +* decryption is in use. However, decryption can occur not until later +* (see recv_func()). +* +* Hence forward the frame to the monitor anyway to preserve the order +* in which frames were received. +*/ +rtl88eu_mon_recv_hook (adapter->pmondev, precv_frame); + exit:return retval;
drivers/staging/rtl8188eu/core/rtw_xmit.c +4 -0
@@ -21,6 +21,7 @@#include <osdep_service.h> #include <drv_types.h> +#include <mon.h> #include <wifi.h> #include <osdep_intf.h> #include <linux/vmalloc.h>
@@ -1100,6 +1101,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structmemcpy (mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen); } +/* Frame is about to be encrypted. Forward it to the monitor first. */ +rtl88eu_mon_xmit_hook (padapter->pmondev, pxmitframe, frg_len); +if (xmitframe_addmic (padapter, pxmitframe) == _FAIL) {RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n" ));DBG_88E ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n" );
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +4 -0
@@ -20,6 +20,7 @@#define _RTL8188E_XMIT_C_#include <osdep_service.h> #include <drv_types.h> +#include <mon.h> #include <wifi.h> #include <osdep_intf.h> #include <usb_ops_linux.h>
@@ -684,6 +685,9 @@ enqueue:s32 rtl8188eu_mgnt_xmit (struct adapter *adapt,struct xmit_frame *pmgntframe) { +struct xmit_priv *xmitpriv = &adapt->xmitpriv; + +rtl88eu_mon_xmit_hook (adapt->pmondev, pmgntframe, xmitpriv->frag_len);return rtw_dump_xframe (adapt, pmgntframe); }
drivers/staging/rtl8188eu/include/drv_types.h +2 -0
@@ -131,6 +131,7 @@ struct registry_priv {u8 if2name[16 ];u8 notch_filter; +bool monitor_enable; };/* For registry parameters */
@@ -209,6 +210,7 @@ struct adapter {void (*intf_start)(struct adapter *adapter);void (*intf_stop)(struct adapter *adapter);struct net_device *pnetdev; +struct net_device *pmondev;/* used by rtw_rereg_nd_name related function */ struct rereg_nd_name_data {
drivers/staging/rtl8188eu/include/mon.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* RTL8188EU monitor interface +* +* Copyright (C) 2015 Jakub Sitnicki +* +* This program is free software; you can redistribute it and/or modify it under +* the terms of the GNU General Public License version 2 as published by the +* Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +* details. +*/ + +/* +* Monitor interface receives all transmitted and received IEEE 802.11 +* frames, both Data and Management, and passes them up to userspace +* preserving the WLAN headers. +*/ + +#ifndef _MON_H_ +#define _MON_H_ + +struct net_device ; +struct recv_frame ; +struct xmit_frame ; + +struct net_device *rtl88eu_mon_init (void ); +void rtl88eu_mon_deinit (struct net_device *dev); + +void rtl88eu_mon_recv_hook (struct net_device *dev,struct recv_frame *frame); +void rtl88eu_mon_xmit_hook (struct net_device *dev,struct xmit_frame *frame, +uint frag_len); + +#endif /* _MON_H_ */
drivers/staging/rtl8188eu/os_dep/mon.c new file +194 -0
194 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/os_intfs.c +5 -0
@@ -185,6 +185,10 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P")module_param_named (debug, rtw_debug, int,0444 );MODULE_PARM_DESC (debug,"Set debug level (1-9) (default 1)" ); +static bool rtw_monitor_enable; +module_param_named (monitor_enable, rtw_monitor_enable, bool,0444 ); +MODULE_PARM_DESC (monitor_enable,"Enable monitor inferface (default: false)" ); +static int netdev_open (struct net_device *pnetdev);static int netdev_close (struct net_device *pnetdev);
@@ -604,6 +608,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)snprintf (registry_par->ifname,16 ,"%s" , ifname);snprintf (registry_par->if2name,16 ,"%s" , if2name); registry_par->notch_filter = (u8 )rtw_notch_filter; + registry_par->monitor_enable = rtw_monitor_enable; }static int rtw_net_set_mac_address (struct net_device *pnetdev,void *p)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +10 -0
@@ -26,6 +26,7 @@#include <hal_intf.h> #include <linux/usb.h> #include <linux/vmalloc.h> +#include <mon.h> #include <osdep_intf.h> #include <usb_ops_linux.h>
@@ -348,6 +349,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, {struct adapter *padapter =NULL ;struct net_device *pnetdev =NULL ; +struct net_device *pmondev;int status = _FAIL; padapter = (struct adapter *)vzalloc (sizeof (*padapter));
@@ -366,6 +368,13 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,SET_NETDEV_DEV (pnetdev,dvobj_to_dev (dvobj)); padapter =rtw_netdev_priv (pnetdev); +if (padapter->registrypriv.monitor_enable) { + pmondev =rtl88eu_mon_init (); +if (pmondev ==NULL ) +netdev_warn (pnetdev,"Failed to initialize monitor interface" ); + padapter->pmondev = pmondev; + } +/* step 2. hook HalFunc, allocate HalData */ hal_set_hal_ops (padapter);
@@ -458,6 +467,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1)unregister_netdev (pnetdev);rtw_proc_remove_one (pnetdev); } +rtl88eu_mon_deinit (if1->pmondev);rtw_cancel_all_timer (if1);rtw_dev_unload (if1);
Signature · 1 line
2.1.0