Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 May 2016 16:12:11 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r300516 - in stable/10/sys/dev/ntb: if_ntb ntb_hw
Message-ID:  <201605231612.u4NGCB4E087921@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Mon May 23 16:12:11 2016
New Revision: 300516
URL: https://svnweb.freebsd.org/changeset/base/300516

Log:
  Add respective tunables to all sysctls.
  
  This is direct commit to stable/10, since head does not need it any more.

Modified:
  stable/10/sys/dev/ntb/if_ntb/if_ntb.c
  stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c

Modified: stable/10/sys/dev/ntb/if_ntb/if_ntb.c
==============================================================================
--- stable/10/sys/dev/ntb/if_ntb/if_ntb.c	Mon May 23 16:02:54 2016	(r300515)
+++ stable/10/sys/dev/ntb/if_ntb/if_ntb.c	Mon May 23 16:12:11 2016	(r300516)
@@ -96,6 +96,7 @@ enum ntb_link_event {
 static SYSCTL_NODE(_hw, OID_AUTO, if_ntb, CTLFLAG_RW, 0, "if_ntb");
 
 static unsigned g_if_ntb_debug_level;
+TUNABLE_INT("hw.if_ntb.debug_level", &g_if_ntb_debug_level);
 SYSCTL_UINT(_hw_if_ntb, OID_AUTO, debug_level, CTLFLAG_RWTUN,
     &g_if_ntb_debug_level, 0, "if_ntb log level -- higher is more verbose");
 #define ntb_printf(lvl, ...) do {			\
@@ -107,17 +108,20 @@ SYSCTL_UINT(_hw_if_ntb, OID_AUTO, debug_
 static unsigned transport_mtu = IP_MAXPACKET + ETHER_HDR_LEN + ETHER_CRC_LEN;
 
 static uint64_t max_mw_size;
+TUNABLE_QUAD("hw.if_ntb.max_mw_size", &max_mw_size);
 SYSCTL_UQUAD(_hw_if_ntb, OID_AUTO, max_mw_size, CTLFLAG_RDTUN, &max_mw_size, 0,
     "If enabled (non-zero), limit the size of large memory windows. "
     "Both sides of the NTB MUST set the same value here.");
 
 static unsigned max_num_clients;
+TUNABLE_INT("hw.if_ntb.max_num_clients", &max_num_clients);
 SYSCTL_UINT(_hw_if_ntb, OID_AUTO, max_num_clients, CTLFLAG_RDTUN,
     &max_num_clients, 0, "Maximum number of NTB transport clients.  "
     "0 (default) - use all available NTB memory windows; "
     "positive integer N - Limit to N memory windows.");
 
 static unsigned enable_xeon_watchdog;
+TUNABLE_INT("hw.if_ntb.enable_xeon_watchdog", &enable_xeon_watchdog);
 SYSCTL_UINT(_hw_if_ntb, OID_AUTO, enable_xeon_watchdog, CTLFLAG_RDTUN,
     &enable_xeon_watchdog, 0, "If non-zero, write a register every second to "
     "keep a watchdog from tearing down the NTB link");

Modified: stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c	Mon May 23 16:02:54 2016	(r300515)
+++ stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c	Mon May 23 16:12:11 2016	(r300516)
@@ -323,6 +323,7 @@ static int sysctl_handle_link_status(SYS
 static int sysctl_handle_register(SYSCTL_HANDLER_ARGS);
 
 static unsigned g_ntb_hw_debug_level;
+TUNABLE_INT("hw.ntb.debug_level", &g_ntb_hw_debug_level);
 SYSCTL_UINT(_hw_ntb, OID_AUTO, debug_level, CTLFLAG_RWTUN,
     &g_ntb_hw_debug_level, 0, "ntb_hw log level -- higher is more verbose");
 #define ntb_printf(lvl, ...) do {				\
@@ -338,6 +339,7 @@ SYSCTL_UINT(_hw_ntb, OID_AUTO, debug_lev
 #define	_NTB_PAT_WB	6
 #define	_NTB_PAT_UCM	7
 static unsigned g_ntb_mw_pat = _NTB_PAT_UC;
+TUNABLE_INT("hw.ntb.default_mw_pat", &g_ntb_mw_pat);
 SYSCTL_UINT(_hw_ntb, OID_AUTO, default_mw_pat, CTLFLAG_RDTUN,
     &g_ntb_mw_pat, 0, "Configure the default memory window cache flags (PAT): "
     "UC: "  __XSTRING(_NTB_PAT_UC) ", "
@@ -396,6 +398,7 @@ ntb_vm_memattr_to_str(vm_memattr_t pat)
 }
 
 static int g_ntb_mw_idx = -1;
+TUNABLE_INT("hw.ntb.b2b_mw_idx", &g_ntb_mw_idx);
 SYSCTL_INT(_hw_ntb, OID_AUTO, b2b_mw_idx, CTLFLAG_RDTUN, &g_ntb_mw_idx,
     0, "Use this memory window to access the peer NTB registers.  A "
     "non-negative value starts from the first MW index; a negative value "
@@ -510,30 +513,38 @@ static struct ntb_b2b_addr xeon_b2b_dsd_
 SYSCTL_NODE(_hw_ntb, OID_AUTO, xeon_b2b, CTLFLAG_RW, 0,
     "B2B MW segment overrides -- MUST be the same on both sides");
 
+TUNABLE_QUAD("hw.ntb.usd_bar2_addr64", &xeon_b2b_usd_addr.bar2_addr64);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar2_addr64, CTLFLAG_RDTUN,
     &xeon_b2b_usd_addr.bar2_addr64, 0, "If using B2B topology on Xeon "
     "hardware, use this 64-bit address on the bus between the NTB devices for "
     "the window at BAR2, on the upstream side of the link.  MUST be the same "
     "address on both sides.");
+TUNABLE_QUAD("hw.ntb.usd_bar4_addr64", &xeon_b2b_usd_addr.bar4_addr64);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar4_addr64, CTLFLAG_RDTUN,
     &xeon_b2b_usd_addr.bar4_addr64, 0, "See usd_bar2_addr64, but BAR4.");
+TUNABLE_QUAD("hw.ntb.usd_bar4_addr32", &xeon_b2b_usd_addr.bar4_addr32);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar4_addr32, CTLFLAG_RDTUN,
     &xeon_b2b_usd_addr.bar4_addr32, 0, "See usd_bar2_addr64, but BAR4 "
     "(split-BAR mode).");
+TUNABLE_QUAD("hw.ntb.usd_bar5_addr32", &xeon_b2b_usd_addr.bar5_addr32);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, usd_bar5_addr32, CTLFLAG_RDTUN,
     &xeon_b2b_usd_addr.bar5_addr32, 0, "See usd_bar2_addr64, but BAR5 "
     "(split-BAR mode).");
 
+TUNABLE_QUAD("hw.ntb.dsd_bar2_addr64", &xeon_b2b_dsd_addr.bar2_addr64);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar2_addr64, CTLFLAG_RDTUN,
     &xeon_b2b_dsd_addr.bar2_addr64, 0, "If using B2B topology on Xeon "
     "hardware, use this 64-bit address on the bus between the NTB devices for "
     "the window at BAR2, on the downstream side of the link.  MUST be the same"
     " address on both sides.");
+TUNABLE_QUAD("hw.ntb.dsd_bar4_addr64", &xeon_b2b_dsd_addr.bar4_addr64);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar4_addr64, CTLFLAG_RDTUN,
     &xeon_b2b_dsd_addr.bar4_addr64, 0, "See dsd_bar2_addr64, but BAR4.");
+TUNABLE_QUAD("hw.ntb.dsd_bar4_addr32", &xeon_b2b_dsd_addr.bar4_addr32);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar4_addr32, CTLFLAG_RDTUN,
     &xeon_b2b_dsd_addr.bar4_addr32, 0, "See dsd_bar2_addr64, but BAR4 "
     "(split-BAR mode).");
+TUNABLE_QUAD("hw.ntb.dsd_bar5_addr32", &xeon_b2b_dsd_addr.bar5_addr32);
 SYSCTL_UQUAD(_hw_ntb_xeon_b2b, OID_AUTO, dsd_bar5_addr32, CTLFLAG_RDTUN,
     &xeon_b2b_dsd_addr.bar5_addr32, 0, "See dsd_bar2_addr64, but BAR5 "
     "(split-BAR mode).");
@@ -917,6 +928,7 @@ ntb_setup_msix(struct ntb_softc *ntb, ui
  * when someone gets their hands on some Xeon hardware.
  */
 static int ntb_force_remap_mode;
+TUNABLE_INT("hw.ntb.force_remap_mode", &ntb_force_remap_mode);
 SYSCTL_INT(_hw_ntb, OID_AUTO, force_remap_mode, CTLFLAG_RDTUN,
     &ntb_force_remap_mode, 0, "If enabled, force MSI-X messages to be remapped"
     " to a smaller number of ithreads, even if the desired number are "
@@ -926,6 +938,7 @@ SYSCTL_INT(_hw_ntb, OID_AUTO, force_rema
  * In case it is NOT ok, give consumers an abort button.
  */
 static int ntb_prefer_intx;
+TUNABLE_INT("hw.ntb.prefer_intx_to_remap", &ntb_prefer_intx);
 SYSCTL_INT(_hw_ntb, OID_AUTO, prefer_intx_to_remap, CTLFLAG_RDTUN,
     &ntb_prefer_intx, 0, "If enabled, prefer to use legacy INTx mode rather "
     "than remapping MSI-X messages over available slots (match Linux driver "
@@ -1453,6 +1466,7 @@ configure_atom_secondary_side_bars(struc
  * MW size is sufficiently large.
  */
 static unsigned int ntb_b2b_mw_share;
+TUNABLE_INT("hw.ntb.b2b_mw_share", &ntb_b2b_mw_share);
 SYSCTL_UINT(_hw_ntb, OID_AUTO, b2b_mw_share, CTLFLAG_RDTUN, &ntb_b2b_mw_share,
     0, "If enabled (non-zero), prefer to share half of the B2B peer register "
     "MW with higher level consumers.  Both sides of the NTB MUST set the same "



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605231612.u4NGCB4E087921>