- Add read-only sysctls for all of the tunables supported by the igb and
em drivers. - Make the per-instance 'enable_aim' sysctl truly per-instance by having it change a per-instance variable (which is used to control AIM) rather than having all of the per-instance sysctls operate on a single global variable. Reviewed by: jfv (earlier version) MFC after: 1 week
This commit is contained in:
parent
acd73f5041
commit
b37e0f6e9a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=223676
@ -330,42 +330,71 @@ MODULE_DEPEND(em, ether, 1, 1, 1);
|
||||
#define CSUM_TSO 0
|
||||
#endif
|
||||
|
||||
SYSCTL_NODE(_hw, OID_AUTO, em, CTLFLAG_RD, 0, "EM driver parameters");
|
||||
|
||||
static int em_tx_int_delay_dflt = EM_TICKS_TO_USECS(EM_TIDV);
|
||||
static int em_rx_int_delay_dflt = EM_TICKS_TO_USECS(EM_RDTR);
|
||||
TUNABLE_INT("hw.em.tx_int_delay", &em_tx_int_delay_dflt);
|
||||
TUNABLE_INT("hw.em.rx_int_delay", &em_rx_int_delay_dflt);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, tx_int_delay, CTLFLAG_RDTUN, &em_tx_int_delay_dflt,
|
||||
0, "Default transmit interrupt delay in usecs");
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, rx_int_delay, CTLFLAG_RDTUN, &em_rx_int_delay_dflt,
|
||||
0, "Default receive interrupt delay in usecs");
|
||||
|
||||
static int em_tx_abs_int_delay_dflt = EM_TICKS_TO_USECS(EM_TADV);
|
||||
static int em_rx_abs_int_delay_dflt = EM_TICKS_TO_USECS(EM_RADV);
|
||||
TUNABLE_INT("hw.em.tx_abs_int_delay", &em_tx_abs_int_delay_dflt);
|
||||
TUNABLE_INT("hw.em.rx_abs_int_delay", &em_rx_abs_int_delay_dflt);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, tx_abs_int_delay, CTLFLAG_RDTUN,
|
||||
&em_tx_abs_int_delay_dflt, 0,
|
||||
"Default transmit interrupt delay limit in usecs");
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, rx_abs_int_delay, CTLFLAG_RDTUN,
|
||||
&em_rx_abs_int_delay_dflt, 0,
|
||||
"Default receive interrupt delay limit in usecs");
|
||||
|
||||
static int em_rxd = EM_DEFAULT_RXD;
|
||||
static int em_txd = EM_DEFAULT_TXD;
|
||||
TUNABLE_INT("hw.em.rxd", &em_rxd);
|
||||
TUNABLE_INT("hw.em.txd", &em_txd);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, rxd, CTLFLAG_RDTUN, &em_rxd, 0,
|
||||
"Number of receive descriptors per queue");
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, txd, CTLFLAG_RDTUN, &em_txd, 0,
|
||||
"Number of transmit descriptors per queue");
|
||||
|
||||
static int em_smart_pwr_down = FALSE;
|
||||
TUNABLE_INT("hw.em.smart_pwr_down", &em_smart_pwr_down);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, smart_pwr_down, CTLFLAG_RDTUN, &em_smart_pwr_down,
|
||||
0, "Set to true to leave smart power down enabled on newer adapters");
|
||||
|
||||
/* Controls whether promiscuous also shows bad packets */
|
||||
static int em_debug_sbp = FALSE;
|
||||
TUNABLE_INT("hw.em.sbp", &em_debug_sbp);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, sbp, CTLFLAG_RDTUN, &em_debug_sbp, 0,
|
||||
"Show bad packets in promiscuous mode");
|
||||
|
||||
static int em_enable_msix = TRUE;
|
||||
TUNABLE_INT("hw.em.enable_msix", &em_enable_msix);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &em_enable_msix, 0,
|
||||
"Enable MSI-X interrupts");
|
||||
|
||||
/* How many packets rxeof tries to clean at a time */
|
||||
static int em_rx_process_limit = 100;
|
||||
TUNABLE_INT("hw.em.rx_process_limit", &em_rx_process_limit);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN,
|
||||
&em_rx_process_limit, 0,
|
||||
"Maximum number of received packets to process at a time, -1 means unlimited");
|
||||
|
||||
/* Flow control setting - default to FULL */
|
||||
static int em_fc_setting = e1000_fc_full;
|
||||
TUNABLE_INT("hw.em.fc_setting", &em_fc_setting);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, fc_setting, CTLFLAG_RDTUN, &em_fc_setting, 0,
|
||||
"Flow control");
|
||||
|
||||
/* Energy efficient ethernet - default to OFF */
|
||||
static int eee_setting = 0;
|
||||
TUNABLE_INT("hw.em.eee_setting", &eee_setting);
|
||||
SYSCTL_INT(_hw_em, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &eee_setting, 0,
|
||||
"Enable Energy Efficient Ethernet");
|
||||
|
||||
/* Global used in WOL setup with multiport cards */
|
||||
static int global_quad_port_a = 0;
|
||||
|
@ -300,11 +300,17 @@ MODULE_DEPEND(igb, ether, 1, 1, 1);
|
||||
* Tunable default values.
|
||||
*********************************************************************/
|
||||
|
||||
SYSCTL_NODE(_hw, OID_AUTO, igb, CTLFLAG_RD, 0, "IGB driver parameters");
|
||||
|
||||
/* Descriptor defaults */
|
||||
static int igb_rxd = IGB_DEFAULT_RXD;
|
||||
static int igb_txd = IGB_DEFAULT_TXD;
|
||||
TUNABLE_INT("hw.igb.rxd", &igb_rxd);
|
||||
TUNABLE_INT("hw.igb.txd", &igb_txd);
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, rxd, CTLFLAG_RDTUN, &igb_rxd, 0,
|
||||
"Number of receive descriptors per queue");
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, txd, CTLFLAG_RDTUN, &igb_txd, 0,
|
||||
"Number of transmit descriptors per queue");
|
||||
|
||||
/*
|
||||
** AIM: Adaptive Interrupt Moderation
|
||||
@ -314,6 +320,8 @@ TUNABLE_INT("hw.igb.txd", &igb_txd);
|
||||
*/
|
||||
static int igb_enable_aim = TRUE;
|
||||
TUNABLE_INT("hw.igb.enable_aim", &igb_enable_aim);
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, enable_aim, CTLFLAG_RW, &igb_enable_aim, 0,
|
||||
"Enable adaptive interrupt moderation");
|
||||
|
||||
/*
|
||||
* MSIX should be the default for best performance,
|
||||
@ -321,12 +329,16 @@ TUNABLE_INT("hw.igb.enable_aim", &igb_enable_aim);
|
||||
*/
|
||||
static int igb_enable_msix = 1;
|
||||
TUNABLE_INT("hw.igb.enable_msix", &igb_enable_msix);
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &igb_enable_msix, 0,
|
||||
"Enable MSI-X interrupts");
|
||||
|
||||
/*
|
||||
** Tuneable Interrupt rate
|
||||
*/
|
||||
static int igb_max_interrupt_rate = 8000;
|
||||
TUNABLE_INT("hw.igb.max_interrupt_rate", &igb_max_interrupt_rate);
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN,
|
||||
&igb_max_interrupt_rate, 0, "Maximum interrupts per second");
|
||||
|
||||
/*
|
||||
** Header split causes the packet header to
|
||||
@ -338,6 +350,8 @@ TUNABLE_INT("hw.igb.max_interrupt_rate", &igb_max_interrupt_rate);
|
||||
*/
|
||||
static bool igb_header_split = FALSE;
|
||||
TUNABLE_INT("hw.igb.hdr_split", &igb_header_split);
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, header_split, CTLFLAG_RDTUN, &igb_header_split, 0,
|
||||
"Enable receive mbuf header split");
|
||||
|
||||
/*
|
||||
** This will autoconfigure based on
|
||||
@ -345,10 +359,15 @@ TUNABLE_INT("hw.igb.hdr_split", &igb_header_split);
|
||||
*/
|
||||
static int igb_num_queues = 0;
|
||||
TUNABLE_INT("hw.igb.num_queues", &igb_num_queues);
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, num_queues, CTLFLAG_RDTUN, &igb_num_queues, 0,
|
||||
"Number of queues to configure, 0 indicates autoconfigure");
|
||||
|
||||
/* How many packets rxeof tries to clean at a time */
|
||||
static int igb_rx_process_limit = 100;
|
||||
TUNABLE_INT("hw.igb.rx_process_limit", &igb_rx_process_limit);
|
||||
SYSCTL_INT(_hw_igb, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN,
|
||||
&igb_rx_process_limit, 0,
|
||||
"Maximum number of received packets to process at a time, -1 means unlimited");
|
||||
|
||||
/*********************************************************************
|
||||
* Device identification routine
|
||||
@ -435,10 +454,9 @@ igb_attach(device_t dev)
|
||||
OID_AUTO, "nvm", CTLTYPE_INT|CTLFLAG_RW, adapter, 0,
|
||||
igb_sysctl_nvm_info, "I", "NVM Information");
|
||||
|
||||
SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
|
||||
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
|
||||
OID_AUTO, "enable_aim", CTLTYPE_INT|CTLFLAG_RW,
|
||||
&igb_enable_aim, 1, "Interrupt Moderation");
|
||||
igb_set_sysctl_value(adapter, "enable_aim",
|
||||
"Interrupt Moderation", &adapter->enable_aim,
|
||||
igb_enable_aim);
|
||||
|
||||
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
|
||||
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
|
||||
@ -1498,7 +1516,7 @@ igb_msix_que(void *arg)
|
||||
|
||||
more_rx = igb_rxeof(que, adapter->rx_process_limit, NULL);
|
||||
|
||||
if (igb_enable_aim == FALSE)
|
||||
if (adapter->enable_aim == FALSE)
|
||||
goto no_calc;
|
||||
/*
|
||||
** Do Adaptive Interrupt Moderation:
|
||||
|
@ -402,6 +402,7 @@ struct adapter {
|
||||
u16 link_duplex;
|
||||
u32 smartspeed;
|
||||
u32 dmac;
|
||||
int enable_aim;
|
||||
|
||||
/* Interface queues */
|
||||
struct igb_queue *queues;
|
||||
|
Loading…
Reference in New Issue
Block a user