From owner-freebsd-net@freebsd.org Fri Feb 5 05:44:57 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 1BCE4A9A242 for ; Fri, 5 Feb 2016 05:44:57 +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 F03FB1AFA for ; Fri, 5 Feb 2016 05:44:56 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: by phabric-backend.rbsd.freebsd.org (Postfix, from userid 1346) id EEA95107FDF; Fri, 5 Feb 2016 05:44:56 +0000 (UTC) Date: Fri, 5 Feb 2016 05:44:56 +0000 To: freebsd-net@freebsd.org From: Phabricator Reply-to: D5167+325+acc9bcb5dbcc28f2@reviews.freebsd.org Subject: [Differential] [Closed] D5167: hyperv/hn: Move LRO flush to the channel processing rollup 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: D5167: hyperv/hn: Move LRO flush to the channel processing rollup 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: Precedence: bulk In-Reply-To: References: Thread-Index: N2NlNTE2YjI3MTBjYjEzNmM4OWIyM2FkMjc1IFa0Ntg= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_c9198d81d09fe437aa4521f8bf434026" 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: Fri, 05 Feb 2016 05:44:57 -0000 --b1_c9198d81d09fe437aa4521f8bf434026 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit This revision was automatically updated to reflect the committed changes. Closed by commit rS295305: hyperv/hn: Move LRO flush to the channel processing rollup (authored by sephe). CHANGED PRIOR TO COMMIT https://reviews.freebsd.org/D5167?vs=12948&id=13039#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D5167?vs=12948&id=13039 REVISION DETAIL https://reviews.freebsd.org/D5167 AFFECTED FILES head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c CHANGE DETAILS diff --git a/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c --- a/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c +++ b/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c @@ -764,6 +764,15 @@ netvsc_channel_rollup(struct hv_device *device_ctx) { struct hn_softc *sc = device_get_softc(device_ctx->device); +#if defined(INET) || defined(INET6) + struct lro_ctrl *lro = &sc->hn_lro; + struct lro_entry *queued; + + while ((queued = SLIST_FIRST(&lro->lro_active)) != NULL) { + SLIST_REMOVE_HEAD(&lro->lro_active, next); + tcp_lro_flush(lro, queued); + } +#endif if (!sc->hn_txeof) return; @@ -1338,18 +1347,8 @@ } void -netvsc_recv_rollup(struct hv_device *device_ctx) +netvsc_recv_rollup(struct hv_device *device_ctx __unused) { -#if defined(INET) || defined(INET6) - hn_softc_t *sc = device_get_softc(device_ctx->device); - struct lro_ctrl *lro = &sc->hn_lro; - struct lro_entry *queued; - - while ((queued = SLIST_FIRST(&lro->lro_active)) != NULL) { - SLIST_REMOVE_HEAD(&lro->lro_active, next); - tcp_lro_flush(lro, queued); - } -#endif } /* EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: sepherosa_gmail.com, delphij, royger, decui_microsoft.com, honzhan_microsoft.com, howard0su_gmail.com, adrian, network Cc: freebsd-net-list --b1_c9198d81d09fe437aa4521f8bf434026 Content-Type: text/x-patch; charset=utf-8; name="D5167.13039.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5167.13039.patch" ZGlmZiAtLWdpdCBhL2hlYWQvc3lzL2Rldi9oeXBlcnYvbmV0dnNjL2h2X25ldHZzY19kcnZfZnJl ZWJzZC5jIGIvaGVhZC9zeXMvZGV2L2h5cGVydi9uZXR2c2MvaHZfbmV0dnNjX2Rydl9mcmVlYnNk LmMKLS0tIGEvaGVhZC9zeXMvZGV2L2h5cGVydi9uZXR2c2MvaHZfbmV0dnNjX2Rydl9mcmVlYnNk LmMKKysrIGIvaGVhZC9zeXMvZGV2L2h5cGVydi9uZXR2c2MvaHZfbmV0dnNjX2Rydl9mcmVlYnNk LmMKQEAgLTc2NCw2ICs3NjQsMTUgQEAKIG5ldHZzY19jaGFubmVsX3JvbGx1cChzdHJ1Y3QgaHZf ZGV2aWNlICpkZXZpY2VfY3R4KQogewogCXN0cnVjdCBobl9zb2Z0YyAqc2MgPSBkZXZpY2VfZ2V0 X3NvZnRjKGRldmljZV9jdHgtPmRldmljZSk7CisjaWYgZGVmaW5lZChJTkVUKSB8fCBkZWZpbmVk KElORVQ2KQorCXN0cnVjdCBscm9fY3RybCAqbHJvID0gJnNjLT5obl9scm87CisJc3RydWN0IGxy b19lbnRyeSAqcXVldWVkOworCisJd2hpbGUgKChxdWV1ZWQgPSBTTElTVF9GSVJTVCgmbHJvLT5s cm9fYWN0aXZlKSkgIT0gTlVMTCkgeworCQlTTElTVF9SRU1PVkVfSEVBRCgmbHJvLT5scm9fYWN0 aXZlLCBuZXh0KTsKKwkJdGNwX2xyb19mbHVzaChscm8sIHF1ZXVlZCk7CisJfQorI2VuZGlmCiAK IAlpZiAoIXNjLT5obl90eGVvZikKIAkJcmV0dXJuOwpAQCAtMTMzOCwxOCArMTM0Nyw4IEBACiB9 CiAKIHZvaWQKLW5ldHZzY19yZWN2X3JvbGx1cChzdHJ1Y3QgaHZfZGV2aWNlICpkZXZpY2VfY3R4 KQorbmV0dnNjX3JlY3Zfcm9sbHVwKHN0cnVjdCBodl9kZXZpY2UgKmRldmljZV9jdHggX191bnVz ZWQpCiB7Ci0jaWYgZGVmaW5lZChJTkVUKSB8fCBkZWZpbmVkKElORVQ2KQotCWhuX3NvZnRjX3Qg KnNjID0gZGV2aWNlX2dldF9zb2Z0YyhkZXZpY2VfY3R4LT5kZXZpY2UpOwotCXN0cnVjdCBscm9f Y3RybCAqbHJvID0gJnNjLT5obl9scm87Ci0Jc3RydWN0IGxyb19lbnRyeSAqcXVldWVkOwotCi0J d2hpbGUgKChxdWV1ZWQgPSBTTElTVF9GSVJTVCgmbHJvLT5scm9fYWN0aXZlKSkgIT0gTlVMTCkg ewotCQlTTElTVF9SRU1PVkVfSEVBRCgmbHJvLT5scm9fYWN0aXZlLCBuZXh0KTsKLQkJdGNwX2xy b19mbHVzaChscm8sIHF1ZXVlZCk7Ci0JfQotI2VuZGlmCiB9CiAKIC8qCgo= --b1_c9198d81d09fe437aa4521f8bf434026--