From owner-freebsd-net@freebsd.org Thu Feb 18 08:08:13 2016 Return-Path: Delivered-To: freebsd-net@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 DB61AAABFDD for ; Thu, 18 Feb 2016 08:08:12 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: from phabric-backend.rbsd.freebsd.org (unknown [IPv6:2607:fc50:2000:101::1bb:73]) by mx1.freebsd.org (Postfix) with ESMTP id C734E1AA7 for ; Thu, 18 Feb 2016 08:08:12 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: by phabric-backend.rbsd.freebsd.org (Postfix, from userid 1346) id C481F3321044; Thu, 18 Feb 2016 08:08:12 +0000 (UTC) Date: Thu, 18 Feb 2016 08:08:12 +0000 To: freebsd-net@freebsd.org From: "sepherosa_gmail.com (Sepherosa Ziehau)" Reply-to: D5316+325+0f7d5028d71a5ee9@reviews.freebsd.org Subject: [Differential] [Request, 33 lines] D5316: hyperv/hn: Add option to bind TX taskqueues to the specified CPU Message-ID: X-Priority: 3 X-Phabricator-Sent-This-Message: Yes X-Mail-Transport-Agent: MetaMTA X-Auto-Response-Suppress: All X-Phabricator-Mail-Tags: , , , Thread-Topic: D5316: hyperv/hn: Add option to bind TX taskqueues to the specified CPU X-Herald-Rules: none X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-Cc: X-Phabricator-Cc: Precedence: bulk Thread-Index: OTQ1NDdkYWNjNjEyZTViMjU4NDE4NzRjMDA2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_c0dbfdfdbd7cd3f51fdeaf46d1b46b46" X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.20 List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2016 08:08:13 -0000 --b1_c0dbfdfdbd7cd3f51fdeaf46d1b46b46 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit sepherosa_gmail.com created this revision. sepherosa_gmail.com added reviewers: network, adrian, delphij, royger, decui_microsoft.com, honzhan_microsoft.com, howard0su_gmail.com. sepherosa_gmail.com added subscribers: freebsd-net-list, freebsd-virtualization-list. REVISION DETAIL https://reviews.freebsd.org/D5316 AFFECTED FILES sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c CHANGE DETAILS diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c --- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c +++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c @@ -269,6 +269,10 @@ SYSCTL_INT(_hw_hn, OID_AUTO, use_txdesc_bufring, CTLFLAG_RD, &hn_use_txdesc_bufring, 0, "Use buf_ring for TX descriptors"); +static int hn_bind_tx_taskq = -1; +SYSCTL_INT(_hw_hn, OID_AUTO, bind_tx_taskq, CTLFLAG_RDTUN, + &hn_bind_tx_taskq, 0, "Bind TX taskqueue to the specified cpu"); + /* * Forward declarations */ @@ -383,8 +387,20 @@ if (hn_tx_taskq == NULL) { sc->hn_tx_taskq = taskqueue_create("hn_tx", M_WAITOK, taskqueue_thread_enqueue, &sc->hn_tx_taskq); - taskqueue_start_threads(&sc->hn_tx_taskq, 1, PI_NET, "%s tx", - device_get_nameunit(dev)); + if (hn_bind_tx_taskq >= 0) { + int cpu = hn_bind_tx_taskq; + cpuset_t cpu_set; + + if (cpu > mp_ncpus - 1) + cpu = mp_ncpus - 1; + CPU_SETOF(cpu, &cpu_set); + taskqueue_start_threads_cpuset(&sc->hn_tx_taskq, 1, + PI_NET, &cpu_set, "%s tx", + device_get_nameunit(dev)); + } else { + taskqueue_start_threads(&sc->hn_tx_taskq, 1, PI_NET, + "%s tx", device_get_nameunit(dev)); + } } else { sc->hn_tx_taskq = hn_tx_taskq; } @@ -2409,7 +2425,18 @@ hn_tx_taskq = taskqueue_create("hn_tx", M_WAITOK, taskqueue_thread_enqueue, &hn_tx_taskq); - taskqueue_start_threads(&hn_tx_taskq, 1, PI_NET, "hn tx"); + if (hn_bind_tx_taskq >= 0) { + int cpu = hn_bind_tx_taskq; + cpuset_t cpu_set; + + if (cpu > mp_ncpus - 1) + cpu = mp_ncpus - 1; + CPU_SETOF(cpu, &cpu_set); + taskqueue_start_threads_cpuset(&hn_tx_taskq, 1, PI_NET, + &cpu_set, "hn tx"); + } else { + taskqueue_start_threads(&hn_tx_taskq, 1, PI_NET, "hn tx"); + } } SYSINIT(hn_txtq_create, SI_SUB_DRIVERS, SI_ORDER_FIRST, hn_tx_taskq_create, NULL); EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: sepherosa_gmail.com, network, adrian, delphij, royger, decui_microsoft.com, honzhan_microsoft.com, howard0su_gmail.com Cc: freebsd-virtualization-list, freebsd-net-list --b1_c0dbfdfdbd7cd3f51fdeaf46d1b46b46 Content-Type: text/x-patch; charset=utf-8; name="D5316.13407.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5316.13407.patch" ZGlmZiAtLWdpdCBhL3N5cy9kZXYvaHlwZXJ2L25ldHZzYy9odl9uZXR2c2NfZHJ2X2ZyZWVic2Qu YyBiL3N5cy9kZXYvaHlwZXJ2L25ldHZzYy9odl9uZXR2c2NfZHJ2X2ZyZWVic2QuYwotLS0gYS9z eXMvZGV2L2h5cGVydi9uZXR2c2MvaHZfbmV0dnNjX2Rydl9mcmVlYnNkLmMKKysrIGIvc3lzL2Rl di9oeXBlcnYvbmV0dnNjL2h2X25ldHZzY19kcnZfZnJlZWJzZC5jCkBAIC0yNjksNiArMjY5LDEw IEBACiBTWVNDVExfSU5UKF9od19obiwgT0lEX0FVVE8sIHVzZV90eGRlc2NfYnVmcmluZywgQ1RM RkxBR19SRCwKICAgICAmaG5fdXNlX3R4ZGVzY19idWZyaW5nLCAwLCAiVXNlIGJ1Zl9yaW5nIGZv ciBUWCBkZXNjcmlwdG9ycyIpOwogCitzdGF0aWMgaW50IGhuX2JpbmRfdHhfdGFza3EgPSAtMTsK K1NZU0NUTF9JTlQoX2h3X2huLCBPSURfQVVUTywgYmluZF90eF90YXNrcSwgQ1RMRkxBR19SRFRV TiwKKyAgICAmaG5fYmluZF90eF90YXNrcSwgMCwgIkJpbmQgVFggdGFza3F1ZXVlIHRvIHRoZSBz cGVjaWZpZWQgY3B1Iik7CisKIC8qCiAgKiBGb3J3YXJkIGRlY2xhcmF0aW9ucwogICovCkBAIC0z ODMsOCArMzg3LDIwIEBACiAJaWYgKGhuX3R4X3Rhc2txID09IE5VTEwpIHsKIAkJc2MtPmhuX3R4 X3Rhc2txID0gdGFza3F1ZXVlX2NyZWF0ZSgiaG5fdHgiLCBNX1dBSVRPSywKIAkJICAgIHRhc2tx dWV1ZV90aHJlYWRfZW5xdWV1ZSwgJnNjLT5obl90eF90YXNrcSk7Ci0JCXRhc2txdWV1ZV9zdGFy dF90aHJlYWRzKCZzYy0+aG5fdHhfdGFza3EsIDEsIFBJX05FVCwgIiVzIHR4IiwKLQkJICAgIGRl dmljZV9nZXRfbmFtZXVuaXQoZGV2KSk7CisJCWlmIChobl9iaW5kX3R4X3Rhc2txID49IDApIHsK KwkJCWludCBjcHUgPSBobl9iaW5kX3R4X3Rhc2txOworCQkJY3B1c2V0X3QgY3B1X3NldDsKKwor CQkJaWYgKGNwdSA+IG1wX25jcHVzIC0gMSkKKwkJCQljcHUgPSBtcF9uY3B1cyAtIDE7CisJCQlD UFVfU0VUT0YoY3B1LCAmY3B1X3NldCk7CisJCQl0YXNrcXVldWVfc3RhcnRfdGhyZWFkc19jcHVz ZXQoJnNjLT5obl90eF90YXNrcSwgMSwKKwkJCSAgICBQSV9ORVQsICZjcHVfc2V0LCAiJXMgdHgi LAorCQkJICAgIGRldmljZV9nZXRfbmFtZXVuaXQoZGV2KSk7CisJCX0gZWxzZSB7CisJCQl0YXNr cXVldWVfc3RhcnRfdGhyZWFkcygmc2MtPmhuX3R4X3Rhc2txLCAxLCBQSV9ORVQsCisJCQkgICAg IiVzIHR4IiwgZGV2aWNlX2dldF9uYW1ldW5pdChkZXYpKTsKKwkJfQogCX0gZWxzZSB7CiAJCXNj LT5obl90eF90YXNrcSA9IGhuX3R4X3Rhc2txOwogCX0KQEAgLTI0MDksNyArMjQyNSwxOCBAQAog CiAJaG5fdHhfdGFza3EgPSB0YXNrcXVldWVfY3JlYXRlKCJobl90eCIsIE1fV0FJVE9LLAogCSAg ICB0YXNrcXVldWVfdGhyZWFkX2VucXVldWUsICZobl90eF90YXNrcSk7Ci0JdGFza3F1ZXVlX3N0 YXJ0X3RocmVhZHMoJmhuX3R4X3Rhc2txLCAxLCBQSV9ORVQsICJobiB0eCIpOworCWlmIChobl9i aW5kX3R4X3Rhc2txID49IDApIHsKKwkJaW50IGNwdSA9IGhuX2JpbmRfdHhfdGFza3E7CisJCWNw dXNldF90IGNwdV9zZXQ7CisKKwkJaWYgKGNwdSA+IG1wX25jcHVzIC0gMSkKKwkJCWNwdSA9IG1w X25jcHVzIC0gMTsKKwkJQ1BVX1NFVE9GKGNwdSwgJmNwdV9zZXQpOworCQl0YXNrcXVldWVfc3Rh cnRfdGhyZWFkc19jcHVzZXQoJmhuX3R4X3Rhc2txLCAxLCBQSV9ORVQsCisJCSAgICAmY3B1X3Nl dCwgImhuIHR4Iik7CisJfSBlbHNlIHsKKwkJdGFza3F1ZXVlX3N0YXJ0X3RocmVhZHMoJmhuX3R4 X3Rhc2txLCAxLCBQSV9ORVQsICJobiB0eCIpOworCX0KIH0KIFNZU0lOSVQoaG5fdHh0cV9jcmVh dGUsIFNJX1NVQl9EUklWRVJTLCBTSV9PUkRFUl9GSVJTVCwKICAgICBobl90eF90YXNrcV9jcmVh dGUsIE5VTEwpOwoK --b1_c0dbfdfdbd7cd3f51fdeaf46d1b46b46--