From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH RFC 1/2] virtio-net: bql support Date: Wed, 26 Dec 2018 10:19:39 -0500 Message-ID: <20181226101528-mutt-send-email-mst@kernel.org> References: <20181205225323.12555-1-mst@redhat.com> <20181205225323.12555-2-mst@redhat.com> <21384cb5-99a6-7431-1039-b356521e1bc3@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <21384cb5-99a6-7431-1039-b356521e1bc3@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Jason Wang Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, maxime.coquelin@redhat.com, wexu@redhat.com, "David S. Miller" List-Id: virtualization@lists.linuxfoundation.org T24gVGh1LCBEZWMgMDYsIDIwMTggYXQgMDQ6MTc6MzZQTSArMDgwMCwgSmFzb24gV2FuZyB3cm90 ZToKPiAKPiBPbiAyMDE4LzEyLzYg5LiK5Y2INjo1NCwgTWljaGFlbCBTLiBUc2lya2luIHdyb3Rl Ogo+ID4gV2hlbiB1c2VfbmFwaSBpcyBzZXQsIGxldCdzIGVuYWJsZSBCUUxzLiAgTm90ZTogc29t ZSBvZiB0aGUgaXNzdWVzIGFyZQo+ID4gc2ltaWxhciB0byB3aWZpLiAgSXQncyB3b3J0aCBjb25z aWRlcmluZyB3aGV0aGVyIHNvbWV0aGluZyBzaW1pbGFyIHRvCj4gPiBjb21taXQgMzYxNDhjMmJi ZmJlICgibWFjODAyMTE6IEFkanVzdCBUU1EgcGFjaW5nIHNoaWZ0IikgbWlnaHQgYmUKPiA+IGJl bmVmaXRpYWwuCj4gCj4gCj4gSSd2ZSBwbGF5ZWQgYSBzaW1pbGFyIHBhdGNoIHNldmVyYWwgZGF5 cyBiZWZvcmUuIFRoZSB0cmlja3kgcGFydCBpcyB0aGUgbW9kZQo+IHN3aXRjaGluZyBiZXR3ZWVu IG5hcGkgYW5kIG5vIG5hcGkuIFdlIHNob3VsZCBtYWtlIHN1cmUgd2hlbiB0aGUgcGFja2V0IGlz Cj4gc2VudCBhbmQgdHJha2NlZCBieSBCUUwswqAgaXQgc2hvdWxkIGJlIGNvbnN1bWVkIGJ5IEJR TCBhcyB3ZWxsLiBJIGRpZCBpdCBieQo+IHRyYWNraW5nIGl0IHRocm91Z2ggc2tiLT5jYi7CoCBB bmQgZGVhbCB3aXRoIHRoZSBmcmVlemUgYnkgcmVzZXQgdGhlIEJRTAo+IHN0YXR1cy4gUGF0Y2gg YXR0YWNoZWQuCj4gCj4gQnV0IHdoZW4gdGVzdGluZyB3aXRoIHZob3N0LW5ldCwgSSBkb24ndCB2 ZXJ5IGEgc3RhYmxlIHBlcmZvcm1hbmNlLAoKU28gaG93IGFib3V0IGluY3JlYXNpbmcgVFNRIHBh Y2luZyBzaGlmdCB0aGVuPwoKPiBpdCB3YXMKPiBwcm9iYWJseSBiZWNhdXNlIHdlIGJhdGNoIHRo ZSB1c2VkIHJpbmcgdXBkYXRpbmcgc28gdHggaW50ZXJydXB0IG1heSBjb21lCj4gcmFuZG9tbHku IFdlIHByb2JhYmx5IG5lZWQgdG8gaW1wbGVtZW50IHRpbWUgYm91bmRlZCBjb2FsZXNjaW5nIG1l Y2hhbmlzbQo+IHdoaWNoIGNvdWxkIGJlIGNvbmZpZ3VyZWQgZnJvbSB1c2Vyc3BhY2UuCgpJIGRv bid0IHRoaW5rIGl0J3MgcmVhc29uYWJsZSB0byBleHBlY3QgdXNlcnNwYWNlIHRvIGJlIHRoYXQg c21hcnQgLi4uCldoeSBkbyB3ZSBuZWVkIHRpbWUgYm91bmRlZD8gdXNlZCByaW5nIGlzIGFsd2F5 cyB1cGRhdGVkIHdoZW4gcmluZwpiZWNvbWVzIGVtcHR5LgoKPiBCdHcsIG1heWJlIGl0J3MgdGlt ZSBqdXN0IGVuYWJsZSBuYXBpIFRYIGJ5IGRlZmF1bHQuIEkgZ2V0IH4xMCUgVENQX1JSCj4gcmVn cmVzc2lvbiBvbiBtYWNoaW5lIHdpdGhvdXQgQVBJQ3YsIChoYXZlbid0IGZvdW5kIHRpbWUgdG8g dGVzdCBBUElDdgo+IG1hY2hpbmUpLiBCdXQgY29uc2lkZXIgaXQgd2FzIGZvciBjb3JyZWN0bmVz cywgSSB0aGluayBpdCdzIGFjY2VwdGFibGU/IFRoZW4KPiB3ZSBjYW4gZG8gb3B0aW1pemF0aW9u IG9uIHRvcD8KPiAKPiAKPiBUaGFua3MKPiAKPiAKPiA+IFNpZ25lZC1vZmYtYnk6IE1pY2hhZWwg Uy4gVHNpcmtpbiA8bXN0QHJlZGhhdC5jb20+Cj4gPiAtLS0KPiA+ICAgZHJpdmVycy9uZXQvdmly dGlvX25ldC5jIHwgMjcgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCj4gPiAgIDEgZmlsZSBj aGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9uZXQvdmlydGlvX25ldC5jIGIvZHJpdmVycy9uZXQvdmlydGlvX25ldC5j Cj4gPiBpbmRleCBjZWNmZDc3YzlmM2MuLmI2NTdiZGU2Yjk0YiAxMDA2NDQKPiA+IC0tLSBhL2Ry aXZlcnMvbmV0L3ZpcnRpb19uZXQuYwo+ID4gKysrIGIvZHJpdmVycy9uZXQvdmlydGlvX25ldC5j Cj4gPiBAQCAtMTMyNSw3ICsxMzI1LDggQEAgc3RhdGljIGludCB2aXJ0bmV0X3JlY2VpdmUoc3Ry dWN0IHJlY2VpdmVfcXVldWUgKnJxLCBpbnQgYnVkZ2V0LAo+ID4gICAJcmV0dXJuIHN0YXRzLnBh Y2tldHM7Cj4gPiAgIH0KPiA+IC1zdGF0aWMgdm9pZCBmcmVlX29sZF94bWl0X3NrYnMoc3RydWN0 IHNlbmRfcXVldWUgKnNxKQo+ID4gK3N0YXRpYyB2b2lkIGZyZWVfb2xkX3htaXRfc2ticyhzdHJ1 Y3Qgc2VuZF9xdWV1ZSAqc3EsIHN0cnVjdCBuZXRkZXZfcXVldWUgKnR4cSwKPiA+ICsJCQkgICAg ICAgYm9vbCB1c2VfbmFwaSkKPiA+ICAgewo+ID4gICAJc3RydWN0IHNrX2J1ZmYgKnNrYjsKPiA+ ICAgCXVuc2lnbmVkIGludCBsZW47Cj4gPiBAQCAtMTM0Nyw2ICsxMzQ4LDkgQEAgc3RhdGljIHZv aWQgZnJlZV9vbGRfeG1pdF9za2JzKHN0cnVjdCBzZW5kX3F1ZXVlICpzcSkKPiA+ICAgCWlmICgh cGFja2V0cykKPiA+ICAgCQlyZXR1cm47Cj4gPiArCWlmICh1c2VfbmFwaSkKPiA+ICsJCW5ldGRl dl90eF9jb21wbGV0ZWRfcXVldWUodHhxLCBwYWNrZXRzLCBieXRlcyk7Cj4gPiArCj4gPiAgIAl1 NjRfc3RhdHNfdXBkYXRlX2JlZ2luKCZzcS0+c3RhdHMuc3luY3ApOwo+ID4gICAJc3EtPnN0YXRz LmJ5dGVzICs9IGJ5dGVzOwo+ID4gICAJc3EtPnN0YXRzLnBhY2tldHMgKz0gcGFja2V0czsKPiA+ IEBAIC0xMzY0LDcgKzEzNjgsNyBAQCBzdGF0aWMgdm9pZCB2aXJ0bmV0X3BvbGxfY2xlYW50eChz dHJ1Y3QgcmVjZWl2ZV9xdWV1ZSAqcnEpCj4gPiAgIAkJcmV0dXJuOwo+ID4gICAJaWYgKF9fbmV0 aWZfdHhfdHJ5bG9jayh0eHEpKSB7Cj4gPiAtCQlmcmVlX29sZF94bWl0X3NrYnMoc3EpOwo+ID4g KwkJZnJlZV9vbGRfeG1pdF9za2JzKHNxLCB0eHEsIHRydWUpOwo+ID4gICAJCV9fbmV0aWZfdHhf dW5sb2NrKHR4cSk7Cj4gPiAgIAl9Cj4gPiBAQCAtMTQ0MCw3ICsxNDQ0LDcgQEAgc3RhdGljIGlu dCB2aXJ0bmV0X3BvbGxfdHgoc3RydWN0IG5hcGlfc3RydWN0ICpuYXBpLCBpbnQgYnVkZ2V0KQo+ ID4gICAJc3RydWN0IG5ldGRldl9xdWV1ZSAqdHhxID0gbmV0ZGV2X2dldF90eF9xdWV1ZSh2aS0+ ZGV2LCB2cTJ0eHEoc3EtPnZxKSk7Cj4gPiAgIAlfX25ldGlmX3R4X2xvY2sodHhxLCByYXdfc21w X3Byb2Nlc3Nvcl9pZCgpKTsKPiA+IC0JZnJlZV9vbGRfeG1pdF9za2JzKHNxKTsKPiA+ICsJZnJl ZV9vbGRfeG1pdF9za2JzKHNxLCB0eHEsIHRydWUpOwo+ID4gICAJX19uZXRpZl90eF91bmxvY2so dHhxKTsKPiA+ICAgCXZpcnRxdWV1ZV9uYXBpX2NvbXBsZXRlKG5hcGksIHNxLT52cSwgMCk7Cj4g PiBAQCAtMTUwNSwxMyArMTUwOSwxNSBAQCBzdGF0aWMgbmV0ZGV2X3R4X3Qgc3RhcnRfeG1pdChz dHJ1Y3Qgc2tfYnVmZiAqc2tiLCBzdHJ1Y3QgbmV0X2RldmljZSAqZGV2KQo+ID4gICAJc3RydWN0 IHNlbmRfcXVldWUgKnNxID0gJnZpLT5zcVtxbnVtXTsKPiA+ICAgCWludCBlcnI7Cj4gPiAgIAlz dHJ1Y3QgbmV0ZGV2X3F1ZXVlICp0eHEgPSBuZXRkZXZfZ2V0X3R4X3F1ZXVlKGRldiwgcW51bSk7 Cj4gPiAtCWJvb2wga2ljayA9ICFza2ItPnhtaXRfbW9yZTsKPiA+ICsJYm9vbCBtb3JlID0gc2ti LT54bWl0X21vcmU7Cj4gPiAgIAlib29sIHVzZV9uYXBpID0gc3EtPm5hcGkud2VpZ2h0Owo+ID4g Kwl1bnNpZ25lZCBpbnQgYnl0ZXMgPSBza2ItPmxlbjsKPiA+ICsJYm9vbCBraWNrOwo+ID4gICAJ LyogRnJlZSB1cCBhbnkgcGVuZGluZyBvbGQgYnVmZmVycyBiZWZvcmUgcXVldWVpbmcgbmV3IG9u ZXMuICovCj4gPiAtCWZyZWVfb2xkX3htaXRfc2ticyhzcSk7Cj4gPiArCWZyZWVfb2xkX3htaXRf c2ticyhzcSwgdHhxLCB1c2VfbmFwaSk7Cj4gPiAtCWlmICh1c2VfbmFwaSAmJiBraWNrKQo+ID4g KwlpZiAodXNlX25hcGkgJiYgIW1vcmUpCj4gPiAgIAkJdmlydHF1ZXVlX2VuYWJsZV9jYl9kZWxh eWVkKHNxLT52cSk7Cj4gPiAgIAkvKiB0aW1lc3RhbXAgcGFja2V0IGluIHNvZnR3YXJlICovCj4g PiBAQCAtMTU1Miw3ICsxNTU4LDcgQEAgc3RhdGljIG5ldGRldl90eF90IHN0YXJ0X3htaXQoc3Ry dWN0IHNrX2J1ZmYgKnNrYiwgc3RydWN0IG5ldF9kZXZpY2UgKmRldikKPiA+ICAgCQlpZiAoIXVz ZV9uYXBpICYmCj4gPiAgIAkJICAgIHVubGlrZWx5KCF2aXJ0cXVldWVfZW5hYmxlX2NiX2RlbGF5 ZWQoc3EtPnZxKSkpIHsKPiA+ICAgCQkJLyogTW9yZSBqdXN0IGdvdCB1c2VkLCBmcmVlIHRoZW0g dGhlbiByZWNoZWNrLiAqLwo+ID4gLQkJCWZyZWVfb2xkX3htaXRfc2ticyhzcSk7Cj4gPiArCQkJ ZnJlZV9vbGRfeG1pdF9za2JzKHNxLCB0eHEsIGZhbHNlKTsKPiA+ICAgCQkJaWYgKHNxLT52cS0+ bnVtX2ZyZWUgPj0gMitNQVhfU0tCX0ZSQUdTKSB7Cj4gPiAgIAkJCQluZXRpZl9zdGFydF9zdWJx dWV1ZShkZXYsIHFudW0pOwo+ID4gICAJCQkJdmlydHF1ZXVlX2Rpc2FibGVfY2Ioc3EtPnZxKTsK PiA+IEBAIC0xNTYwLDcgKzE1NjYsMTIgQEAgc3RhdGljIG5ldGRldl90eF90IHN0YXJ0X3htaXQo c3RydWN0IHNrX2J1ZmYgKnNrYiwgc3RydWN0IG5ldF9kZXZpY2UgKmRldikKPiA+ICAgCQl9Cj4g PiAgIAl9Cj4gPiAtCWlmIChraWNrIHx8IG5ldGlmX3htaXRfc3RvcHBlZCh0eHEpKSB7Cj4gPiAr CWlmICh1c2VfbmFwaSkKPiA+ICsJCWtpY2sgPSBfX25ldGRldl90eF9zZW50X3F1ZXVlKHR4cSwg Ynl0ZXMsIG1vcmUpOwo+ID4gKwllbHNlCj4gPiArCQlraWNrID0gIW1vcmUgfHwgbmV0aWZfeG1p dF9zdG9wcGVkKHR4cSk7Cj4gPiArCj4gPiArCWlmIChraWNrKSB7Cj4gPiAgIAkJaWYgKHZpcnRx dWV1ZV9raWNrX3ByZXBhcmUoc3EtPnZxKSAmJiB2aXJ0cXVldWVfbm90aWZ5KHNxLT52cSkpIHsK PiA+ICAgCQkJdTY0X3N0YXRzX3VwZGF0ZV9iZWdpbigmc3EtPnN0YXRzLnN5bmNwKTsKPiA+ICAg CQkJc3EtPnN0YXRzLmtpY2tzKys7Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClZpcnR1YWxpemF0aW9uIG1haWxpbmcgbGlzdApWaXJ0dWFsaXphdGlvbkBs aXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4Zm91bmRhdGlvbi5v cmcvbWFpbG1hbi9saXN0aW5mby92aXJ0dWFsaXphdGlvbg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A6B7C43387 for ; Wed, 26 Dec 2018 15:19:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 516C82171F for ; Wed, 26 Dec 2018 15:19:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727323AbeLZPTq (ORCPT ); Wed, 26 Dec 2018 10:19:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50206 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725784AbeLZPTp (ORCPT ); Wed, 26 Dec 2018 10:19:45 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E51686671; Wed, 26 Dec 2018 15:19:45 +0000 (UTC) Received: from redhat.com (ovpn-120-80.rdu2.redhat.com [10.10.120.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9D145D965; Wed, 26 Dec 2018 15:19:39 +0000 (UTC) Date: Wed, 26 Dec 2018 10:19:39 -0500 From: "Michael S. Tsirkin" To: Jason Wang Cc: linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, tiwei.bie@intel.com, wexu@redhat.com, jfreimann@redhat.com, "David S. Miller" , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: Re: [PATCH RFC 1/2] virtio-net: bql support Message-ID: <20181226101528-mutt-send-email-mst@kernel.org> References: <20181205225323.12555-1-mst@redhat.com> <20181205225323.12555-2-mst@redhat.com> <21384cb5-99a6-7431-1039-b356521e1bc3@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <21384cb5-99a6-7431-1039-b356521e1bc3@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 26 Dec 2018 15:19:45 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 06, 2018 at 04:17:36PM +0800, Jason Wang wrote: > > On 2018/12/6 上午6:54, Michael S. Tsirkin wrote: > > When use_napi is set, let's enable BQLs. Note: some of the issues are > > similar to wifi. It's worth considering whether something similar to > > commit 36148c2bbfbe ("mac80211: Adjust TSQ pacing shift") might be > > benefitial. > > > I've played a similar patch several days before. The tricky part is the mode > switching between napi and no napi. We should make sure when the packet is > sent and trakced by BQL,  it should be consumed by BQL as well. I did it by > tracking it through skb->cb.  And deal with the freeze by reset the BQL > status. Patch attached. > > But when testing with vhost-net, I don't very a stable performance, So how about increasing TSQ pacing shift then? > it was > probably because we batch the used ring updating so tx interrupt may come > randomly. We probably need to implement time bounded coalescing mechanism > which could be configured from userspace. I don't think it's reasonable to expect userspace to be that smart ... Why do we need time bounded? used ring is always updated when ring becomes empty. > Btw, maybe it's time just enable napi TX by default. I get ~10% TCP_RR > regression on machine without APICv, (haven't found time to test APICv > machine). But consider it was for correctness, I think it's acceptable? Then > we can do optimization on top? > > > Thanks > > > > Signed-off-by: Michael S. Tsirkin > > --- > > drivers/net/virtio_net.c | 27 +++++++++++++++++++-------- > > 1 file changed, 19 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index cecfd77c9f3c..b657bde6b94b 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -1325,7 +1325,8 @@ static int virtnet_receive(struct receive_queue *rq, int budget, > > return stats.packets; > > } > > -static void free_old_xmit_skbs(struct send_queue *sq) > > +static void free_old_xmit_skbs(struct send_queue *sq, struct netdev_queue *txq, > > + bool use_napi) > > { > > struct sk_buff *skb; > > unsigned int len; > > @@ -1347,6 +1348,9 @@ static void free_old_xmit_skbs(struct send_queue *sq) > > if (!packets) > > return; > > + if (use_napi) > > + netdev_tx_completed_queue(txq, packets, bytes); > > + > > u64_stats_update_begin(&sq->stats.syncp); > > sq->stats.bytes += bytes; > > sq->stats.packets += packets; > > @@ -1364,7 +1368,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) > > return; > > if (__netif_tx_trylock(txq)) { > > - free_old_xmit_skbs(sq); > > + free_old_xmit_skbs(sq, txq, true); > > __netif_tx_unlock(txq); > > } > > @@ -1440,7 +1444,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) > > struct netdev_queue *txq = netdev_get_tx_queue(vi->dev, vq2txq(sq->vq)); > > __netif_tx_lock(txq, raw_smp_processor_id()); > > - free_old_xmit_skbs(sq); > > + free_old_xmit_skbs(sq, txq, true); > > __netif_tx_unlock(txq); > > virtqueue_napi_complete(napi, sq->vq, 0); > > @@ -1505,13 +1509,15 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > > struct send_queue *sq = &vi->sq[qnum]; > > int err; > > struct netdev_queue *txq = netdev_get_tx_queue(dev, qnum); > > - bool kick = !skb->xmit_more; > > + bool more = skb->xmit_more; > > bool use_napi = sq->napi.weight; > > + unsigned int bytes = skb->len; > > + bool kick; > > /* Free up any pending old buffers before queueing new ones. */ > > - free_old_xmit_skbs(sq); > > + free_old_xmit_skbs(sq, txq, use_napi); > > - if (use_napi && kick) > > + if (use_napi && !more) > > virtqueue_enable_cb_delayed(sq->vq); > > /* timestamp packet in software */ > > @@ -1552,7 +1558,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > > if (!use_napi && > > unlikely(!virtqueue_enable_cb_delayed(sq->vq))) { > > /* More just got used, free them then recheck. */ > > - free_old_xmit_skbs(sq); > > + free_old_xmit_skbs(sq, txq, false); > > if (sq->vq->num_free >= 2+MAX_SKB_FRAGS) { > > netif_start_subqueue(dev, qnum); > > virtqueue_disable_cb(sq->vq); > > @@ -1560,7 +1566,12 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > > } > > } > > - if (kick || netif_xmit_stopped(txq)) { > > + if (use_napi) > > + kick = __netdev_tx_sent_queue(txq, bytes, more); > > + else > > + kick = !more || netif_xmit_stopped(txq); > > + > > + if (kick) { > > if (virtqueue_kick_prepare(sq->vq) && virtqueue_notify(sq->vq)) { > > u64_stats_update_begin(&sq->stats.syncp); > > sq->stats.kicks++;