From owner-svn-src-head@FreeBSD.ORG Wed Jul 22 11:57:34 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA7F310656A4; Wed, 22 Jul 2009 11:57:34 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8D2B28FC0A; Wed, 22 Jul 2009 11:57:34 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6MBvYMf040617; Wed, 22 Jul 2009 11:57:34 GMT (envelope-from gallatin@svn.freebsd.org) Received: (from gallatin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6MBvYOH040614; Wed, 22 Jul 2009 11:57:34 GMT (envelope-from gallatin@svn.freebsd.org) Message-Id: <200907221157.n6MBvYOH040614@svn.freebsd.org> From: Andrew Gallatin Date: Wed, 22 Jul 2009 11:57:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195818 - in head: share/man/man4 sys/dev/mxge X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2009 11:57:35 -0000 Author: gallatin Date: Wed Jul 22 11:57:34 2009 New Revision: 195818 URL: http://svn.freebsd.org/changeset/base/195818 Log: mxge's tunable hw.mxge.rss_hash_type cannot be set from the loader, because it uses a reserved suffix (_type). Fix this by removing the "_" and renaming the tunable to hw.mxge.rss_hashtype. The old (rss_hash_type) tunable is still fetched, in case people load the driver via scripts. When both are present in the kernel environment, the new value (hw.mxge.rss_hashtype) overrides the old value. Approved by: re (kib) Modified: head/share/man/man4/mxge.4 head/sys/dev/mxge/if_mxge.c Modified: head/share/man/man4/mxge.4 ============================================================================== --- head/share/man/man4/mxge.4 Wed Jul 22 03:50:54 2009 (r195817) +++ head/share/man/man4/mxge.4 Wed Jul 22 11:57:34 2009 (r195818) @@ -125,14 +125,14 @@ A slice is comprised of a set of receive queues and an associated interrupt thread. When using multiple slices, the NIC hashes traffic to different slices based on the value of -.Va hw.mxge.rss_hash_type . +.Va hw.mxge.rss_hashtype . Using multiple slices requires that your motherboard and Myri10GE NIC both be capable of MSI-X. Older Myri10GE NICs can be field upgraded to add MSI-X using the "10G NIC Tool Kit" for FreeBSD which is available from .Pa http://www.myri.com/scs/download-10g-tools.html . .Pp -.It Va hw.mxge.rss_hash_type +.It Va hw.mxge.rss_hashtype This value determines how incoming traffic is steered to different slices. This tunable is ignored when using just a single slice. Modified: head/sys/dev/mxge/if_mxge.c ============================================================================== --- head/sys/dev/mxge/if_mxge.c Wed Jul 22 03:50:54 2009 (r195817) +++ head/sys/dev/mxge/if_mxge.c Wed Jul 22 11:57:34 2009 (r195818) @@ -4014,6 +4014,7 @@ mxge_fetch_tunables(mxge_softc_t *sc) TUNABLE_INT_FETCH("hw.mxge.lro_cnt", &sc->lro_cnt); TUNABLE_INT_FETCH("hw.mxge.always_promisc", &mxge_always_promisc); TUNABLE_INT_FETCH("hw.mxge.rss_hash_type", &mxge_rss_hash_type); + TUNABLE_INT_FETCH("hw.mxge.rss_hashtype", &mxge_rss_hash_type); TUNABLE_INT_FETCH("hw.mxge.initial_mtu", &mxge_initial_mtu); if (sc->lro_cnt != 0) mxge_lro_cnt = sc->lro_cnt;