From owner-svn-src-stable-10@freebsd.org Sat Jul 18 04:49:38 2015 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0832B9A4F08; Sat, 18 Jul 2015 04:49:38 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C88E31697; Sat, 18 Jul 2015 04:49:37 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6I4nbi3076511; Sat, 18 Jul 2015 04:49:37 GMT (envelope-from hiren@FreeBSD.org) Received: (from hiren@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6I4nbIE076510; Sat, 18 Jul 2015 04:49:37 GMT (envelope-from hiren@FreeBSD.org) Message-Id: <201507180449.t6I4nbIE076510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hiren set sender to hiren@FreeBSD.org using -f From: Hiren Panchasara Date: Sat, 18 Jul 2015 04:49:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r285668 - stable/10/sys/dev/ixgbe X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2015 04:49:38 -0000 Author: hiren Date: Sat Jul 18 04:49:36 2015 New Revision: 285668 URL: https://svnweb.freebsd.org/changeset/base/285668 Log: Loader tunable fetching has been broken on stable/10 since ix(4) rewrite introduced by r280182. FreeBSD-head doesn't need TUNABLE_INT() now with SYSCTL_INT() but stable/10 still does. Note: This is a direct commit to stable/10. PR: 201644 Reviewed by: erj Approved by: re (gjb) Sponsored by: Limelight Networks Modified: stable/10/sys/dev/ixgbe/if_ix.c Modified: stable/10/sys/dev/ixgbe/if_ix.c ============================================================================== --- stable/10/sys/dev/ixgbe/if_ix.c Sat Jul 18 04:38:11 2015 (r285667) +++ stable/10/sys/dev/ixgbe/if_ix.c Sat Jul 18 04:49:36 2015 (r285668) @@ -237,10 +237,12 @@ static SYSCTL_NODE(_hw, OID_AUTO, ix, CT ** traffic for that interrupt vector */ static int ixgbe_enable_aim = TRUE; +TUNABLE_INT("hw.ix.enable_aim", &ixgbe_enable_aim); SYSCTL_INT(_hw_ix, OID_AUTO, enable_aim, CTLFLAG_RWTUN, &ixgbe_enable_aim, 0, "Enable adaptive interrupt moderation"); static int ixgbe_max_interrupt_rate = (4000000 / IXGBE_LOW_LATENCY); +TUNABLE_INT("hw.ix.max_interrupt_rate", &ixgbe_max_interrupt_rate); SYSCTL_INT(_hw_ix, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, &ixgbe_max_interrupt_rate, 0, "Maximum interrupts per second"); @@ -274,6 +276,7 @@ static int ixgbe_smart_speed = ixgbe_sma * but this allows it to be forced off for testing. */ static int ixgbe_enable_msix = 1; +TUNABLE_INT("hw.ix.enable_msix", &ixgbe_enable_msix); SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &ixgbe_enable_msix, 0, "Enable MSI-X interrupts"); @@ -284,6 +287,7 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix * can be overriden manually here. */ static int ixgbe_num_queues = 0; +TUNABLE_INT("hw.ix.num_queues", &ixgbe_num_queues); SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, &ixgbe_num_queues, 0, "Number of queues to configure up to a maximum of 8; " "0 indicates autoconfigure"); @@ -294,11 +298,13 @@ SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, ** the better performing choice. */ static int ixgbe_txd = PERFORM_TXD; +TUNABLE_INT("hw.ix.txd", &ixgbe_txd); SYSCTL_INT(_hw_ix, OID_AUTO, txd, CTLFLAG_RDTUN, &ixgbe_txd, 0, "Number of transmit descriptors per queue"); /* Number of RX descriptors per ring */ static int ixgbe_rxd = PERFORM_RXD; +TUNABLE_INT("hw.ix.rxd", &ixgbe_rxd); SYSCTL_INT(_hw_ix, OID_AUTO, rxd, CTLFLAG_RDTUN, &ixgbe_rxd, 0, "Number of receive descriptors per queue");