From owner-svn-src-user@FreeBSD.ORG Fri Nov 14 08:41:28 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FCEC1065677; Fri, 14 Nov 2008 08:41:28 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A57A8FC1B; Fri, 14 Nov 2008 08:41:28 +0000 (UTC) (envelope-from kmacy@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 mAE8fRGA083081; Fri, 14 Nov 2008 08:41:28 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAE8fR0U083080; Fri, 14 Nov 2008 08:41:27 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200811140841.mAE8fR0U083080@svn.freebsd.org> From: Kip Macy Date: Fri, 14 Nov 2008 08:41:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184963 - user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2008 08:41:28 -0000 Author: kmacy Date: Fri Nov 14 08:41:27 2008 New Revision: 184963 URL: http://svn.freebsd.org/changeset/base/184963 Log: invert sense changing hw.cxgb.singleq to hw.cxgb.multiq Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c Fri Nov 14 08:35:54 2008 (r184962) +++ user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_main.c Fri Nov 14 08:41:27 2008 (r184963) @@ -206,13 +206,12 @@ SYSCTL_UINT(_hw_cxgb, OID_AUTO, ofld_dis /* * The driver uses an auto-queue algorithm by default. - * To disable it and force a single queue-set per port, use singleq = 1. + * To disable it and force a single queue-set per port, use multiq = 0 */ -static int singleq = 0; -TUNABLE_INT("hw.cxgb.singleq", &singleq); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, singleq, CTLFLAG_RDTUN, &singleq, 0, - "use a single queue-set per port"); - +static int multiq = 1; +TUNABLE_INT("hw.cxgb.multiq", &multiq); +SYSCTL_UINT(_hw_cxgb, OID_AUTO, multiq, CTLFLAG_RDTUN, &multiq, 0, + "use min(ncpus/ports, 8) queue-sets per port"); /* * By default the driver will not update the firmware unless @@ -527,7 +526,7 @@ cxgb_controller_attach(device_t dev) sc->cxgb_intr = t3b_intr; } - if ((sc->flags & USING_MSIX) && !singleq) + if ((sc->flags & USING_MSIX) && multiq) port_qsets = min((SGE_QSETS/(sc)->params.nports), mp_ncpus); /* Create a private taskqueue thread for handling driver events */ @@ -832,7 +831,7 @@ cxgb_setup_msix(adapter_t *sc, int msix_ } #if 0 #ifdef IFNET_MULTIQUEUE - if (singleq == 0) { + if (multiq) { int vector = rman_get_start(sc->msix_irq_res[k]); if (bootverbose) device_printf(sc->dev, "binding vector=%d to cpu=%d\n", vector, k % mp_ncpus);