From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH net 2/3] virtio-net: fix num calculation on frag skb allocation failure Date: Wed, 20 Nov 2013 15:37:07 +0200 Message-ID: <20131120133707.GA8523@redhat.com> References: <1384938447-3775-1-git-send-email-jasowang@redhat.com> <1384938447-3775-2-git-send-email-jasowang@redhat.com> <20131120103729.GG19341@redhat.com> <734327384.27426189.1384949330819.JavaMail.root@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: <734327384.27426189.1384949330819.JavaMail.root@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: Michael Dalton , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, Eric Dumazet List-Id: virtualization@lists.linuxfoundation.org T24gV2VkLCBOb3YgMjAsIDIwMTMgYXQgMDc6MDg6NTBBTSAtMDUwMCwgSmFzb24gV2FuZyB3cm90 ZToKPiAKPiAKPiAtLS0tLSDljp/lp4vpgq7ku7YgLS0tLS0KPiA+IE9uIFdlZCwgTm92IDIwLCAy MDEzIGF0IDA1OjA3OjI2UE0gKzA4MDAsIEphc29uIFdhbmcgd3JvdGU6Cj4gPiA+IFdlIG5lZWQg ZGVjcmVhc2UgdGhlIHJxLT5udW0gYWZ0ZXIgd2UgY2FuIGdldCBhIGJ1ZiB0aHJvdWdoCj4gPiA+ IHZpcnRxdWV1ZV9nZXRfYnVmKCkgZXZlbiBpZiB3ZSBjb3VsZCBub3QgYWxsb2NhdGUgZnJhZyBz a2IuIE90aGVyd2lzZSwgdGhlCj4gPiA+IHJlZmlsbCByb3V0aW5lIHdvbid0IGJlIHRyaWdnZXJl ZCB1bmRlciBoZWF2eSBtZW1vcnkgc3RyZXNzIHNpbmNlIHRoZQo+ID4gPiBkcml2ZXIgbWF5Cj4g PiA+IHN0aWxsIHRoaW5rIHRoZXJlJ3MgZW5vdWdoIHJvb20uCj4gPiA+IAo+ID4gPiBUaGlzIGJ1 ZyB3YXMgaW50cm9kdWNlZCBieSBjb21taXQgMjYxM2FmMGVkMThhMTFkNWM1NjZhODFmOWE2NTEw YjczMTgwNjYwYQo+ID4gPiAodmlydGlvX25ldDogbWlncmF0ZSBtZXJnZWFibGUgcnggYnVmZmVy cyB0byBwYWdlIGZyYWcgYWxsb2NhdG9ycykuCj4gPiA+IAo+ID4gPiBDYzogUnVzdHkgUnVzc2Vs bCA8cnVzdHlAcnVzdGNvcnAuY29tLmF1Pgo+ID4gPiBDYzogTWljaGFlbCBTLiBUc2lya2luIDxt c3RAcmVkaGF0LmNvbT4KPiA+ID4gQ2M6IE1pY2hhZWwgRGFsdG9uIDxtd2RhbHRvbkBnb29nbGUu Y29tPgo+ID4gPiBDYzogRXJpYyBEdW1hemV0IDxlZHVtYXpldEBnb29nbGUuY29tPgo+ID4gPiBT aWduZWQtb2ZmLWJ5OiBKYXNvbiBXYW5nIDxqYXNvd2FuZ0ByZWRoYXQuY29tPgo+ID4gCj4gPiBT byBsZXQncyB3cmFwIHZpcnRxdWV1ZV9nZXRfYnVmIHRvIG1ha2Ugc3VyZSB3ZSBnZXQgaXQgcmln aHQ/Cj4gPiAKPiAKPiBPay4gZ29vZCBpZGVhLgoKU28gSSBkaWQgdGhpcyAoYmVsb3cpIGJ1dCB0 aGUgY29tcGlsZXIgaXMgbm90IHNtYXJ0IGVub3VnaCB0bwphdm9pZCB0d28gYnJhbmNoZXMgb24g ZGF0YSBwYXRoLgpTbyBJJ20gbm90IHN1cmUgYW55bW9yZTogd2l0aCBteSBwYXRjaCBpdCdzIHBy ZXR0eSBjbGVhciBob3cKdGhlIGNvZGUgd29ya3MuCgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWVsIFMu IFRzaXJraW4gPG1zdEByZWRoYXQuY29tPgoKYnV0IEkgZG9uJ3QgdGhpbmsgd2UgbmVlZCB0byBh cHBseSB0aGlzLgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3ZpcnRpb19uZXQuYyBiL2RyaXZl cnMvbmV0L3ZpcnRpb19uZXQuYwppbmRleCAxMWQ5Y2M5Li4xY2MyZTQzIDEwMDY0NAotLS0gYS9k cml2ZXJzL25ldC92aXJ0aW9fbmV0LmMKKysrIGIvZHJpdmVycy9uZXQvdmlydGlvX25ldC5jCkBA IC0yOTYsNiArMjk2LDE0IEBAIHN0YXRpYyBzdHJ1Y3Qgc2tfYnVmZiAqcGFnZV90b19za2Ioc3Ry dWN0IHJlY2VpdmVfcXVldWUgKnJxLAogCXJldHVybiBza2I7CiB9CiAKK3N0YXRpYyB2b2lkICpy cV9nZXRfYnVmKHN0cnVjdCByZWNlaXZlX3F1ZXVlICpycSwgdW5zaWduZWQgaW50ICpsZW4pCit7 CisJdm9pZCAqYnVmID0gdmlydHF1ZXVlX2dldF9idWYocnEtPnZxLCBsZW4pOworCWlmIChidWYp CisJCXJxLT5udW0tLTsKKwlyZXR1cm4gYnVmOworfQorCiBzdGF0aWMgc3RydWN0IHNrX2J1ZmYg KnJlY2VpdmVfbWVyZ2VhYmxlKHN0cnVjdCBuZXRfZGV2aWNlICpkZXYsCiAJCQkJCSBzdHJ1Y3Qg cmVjZWl2ZV9xdWV1ZSAqcnEsCiAJCQkJCSB2b2lkICpidWYsCkBAIC0zMTUsNyArMzIzLDcgQEAg c3RhdGljIHN0cnVjdCBza19idWZmICpyZWNlaXZlX21lcmdlYWJsZShzdHJ1Y3QgbmV0X2Rldmlj ZSAqZGV2LAogCXdoaWxlICgtLW51bV9idWYpIHsKIAkJaW50IG51bV9za2JfZnJhZ3M7CiAKLQkJ YnVmID0gdmlydHF1ZXVlX2dldF9idWYocnEtPnZxLCAmbGVuKTsKKwkJYnVmID0gcnFfZ2V0X2J1 ZihycSwgJmxlbik7CiAJCWlmICh1bmxpa2VseSghYnVmKSkgewogCQkJcHJfZGVidWcoIiVzOiBy eCBlcnJvcjogJWQgYnVmZmVycyBvdXQgb2YgJWQgbWlzc2luZ1xuIiwKIAkJCQkgZGV2LT5uYW1l LCBudW1fYnVmLCBoZHItPm1oZHIubnVtX2J1ZmZlcnMpOwpAQCAtMzI5LDcgKzMzNyw2IEBAIHN0 YXRpYyBzdHJ1Y3Qgc2tfYnVmZiAqcmVjZWl2ZV9tZXJnZWFibGUoc3RydWN0IG5ldF9kZXZpY2Ug KmRldiwKIAkJfQogCiAJCXBhZ2UgPSB2aXJ0X3RvX2hlYWRfcGFnZShidWYpOwotCQktLXJxLT5u dW07CiAKIAkJbnVtX3NrYl9mcmFncyA9IHNrYl9zaGluZm8oY3Vycl9za2IpLT5ucl9mcmFnczsK IAkJaWYgKHVubGlrZWx5KG51bV9za2JfZnJhZ3MgPT0gTUFYX1NLQl9GUkFHUykpIHsKQEAgLTM3 MCw3ICszNzcsNyBAQCBlcnJfYnVmOgogCWRldi0+c3RhdHMucnhfZHJvcHBlZCsrOwogCWRldl9r ZnJlZV9za2IoaGVhZF9za2IpOwogCXdoaWxlICgtLW51bV9idWYpIHsKLQkJYnVmID0gdmlydHF1 ZXVlX2dldF9idWYocnEtPnZxLCAmbGVuKTsKKwkJYnVmID0gcnFfZ2V0X2J1ZihycSwgJmxlbik7 CiAJCWlmICh1bmxpa2VseSghYnVmKSkgewogCQkJcHJfZGVidWcoIiVzOiByeCBlcnJvcjogJWQg YnVmZmVycyBtaXNzaW5nXG4iLAogCQkJCSBkZXYtPm5hbWUsIG51bV9idWYpOwpAQCAtMzc5LDcg KzM4Niw2IEBAIGVycl9idWY6CiAJCX0KIAkJcGFnZSA9IHZpcnRfdG9faGVhZF9wYWdlKGJ1Zik7 CiAJCXB1dF9wYWdlKHBhZ2UpOwotCQktLXJxLT5udW07CiAJfQogCXJldHVybiBOVUxMOwogfQpA QCAtNjc1LDkgKzY4MSw4IEBAIHN0YXRpYyBpbnQgdmlydG5ldF9wb2xsKHN0cnVjdCBuYXBpX3N0 cnVjdCAqbmFwaSwgaW50IGJ1ZGdldCkKIAogYWdhaW46CiAJd2hpbGUgKHJlY2VpdmVkIDwgYnVk Z2V0ICYmCi0JICAgICAgIChidWYgPSB2aXJ0cXVldWVfZ2V0X2J1ZihycS0+dnEsICZsZW4pKSAh PSBOVUxMKSB7CisJICAgICAgIChidWYgPSBycV9nZXRfYnVmKHJxLCAmbGVuKSkgIT0gTlVMTCkg ewogCQlyZWNlaXZlX2J1ZihycSwgYnVmLCBsZW4pOwotCQktLXJxLT5udW07CiAJCXJlY2VpdmVk Kys7CiAJfQogCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f ClZpcnR1YWxpemF0aW9uIG1haWxpbmcgbGlzdApWaXJ0dWFsaXphdGlvbkBsaXN0cy5saW51eC1m b3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4Zm91bmRhdGlvbi5vcmcvbWFpbG1hbi9s aXN0aW5mby92aXJ0dWFsaXphdGlvbg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752958Ab3KTNeM (ORCPT ); Wed, 20 Nov 2013 08:34:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39099 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750796Ab3KTNeJ (ORCPT ); Wed, 20 Nov 2013 08:34:09 -0500 Date: Wed, 20 Nov 2013 15:37:07 +0200 From: "Michael S. Tsirkin" To: Jason Wang Cc: rusty@rustcorp.com.au, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Dalton , Eric Dumazet Subject: Re: [PATCH net 2/3] virtio-net: fix num calculation on frag skb allocation failure Message-ID: <20131120133707.GA8523@redhat.com> References: <1384938447-3775-1-git-send-email-jasowang@redhat.com> <1384938447-3775-2-git-send-email-jasowang@redhat.com> <20131120103729.GG19341@redhat.com> <734327384.27426189.1384949330819.JavaMail.root@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <734327384.27426189.1384949330819.JavaMail.root@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 20, 2013 at 07:08:50AM -0500, Jason Wang wrote: > > > ----- 原始邮件 ----- > > On Wed, Nov 20, 2013 at 05:07:26PM +0800, Jason Wang wrote: > > > We need decrease the rq->num after we can get a buf through > > > virtqueue_get_buf() even if we could not allocate frag skb. Otherwise, the > > > refill routine won't be triggered under heavy memory stress since the > > > driver may > > > still think there's enough room. > > > > > > This bug was introduced by commit 2613af0ed18a11d5c566a81f9a6510b73180660a > > > (virtio_net: migrate mergeable rx buffers to page frag allocators). > > > > > > Cc: Rusty Russell > > > Cc: Michael S. Tsirkin > > > Cc: Michael Dalton > > > Cc: Eric Dumazet > > > Signed-off-by: Jason Wang > > > > So let's wrap virtqueue_get_buf to make sure we get it right? > > > > Ok. good idea. So I did this (below) but the compiler is not smart enough to avoid two branches on data path. So I'm not sure anymore: with my patch it's pretty clear how the code works. Signed-off-by: Michael S. Tsirkin but I don't think we need to apply this. diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 11d9cc9..1cc2e43 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -296,6 +296,14 @@ static struct sk_buff *page_to_skb(struct receive_queue *rq, return skb; } +static void *rq_get_buf(struct receive_queue *rq, unsigned int *len) +{ + void *buf = virtqueue_get_buf(rq->vq, len); + if (buf) + rq->num--; + return buf; +} + static struct sk_buff *receive_mergeable(struct net_device *dev, struct receive_queue *rq, void *buf, @@ -315,7 +323,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, while (--num_buf) { int num_skb_frags; - buf = virtqueue_get_buf(rq->vq, &len); + buf = rq_get_buf(rq, &len); if (unlikely(!buf)) { pr_debug("%s: rx error: %d buffers out of %d missing\n", dev->name, num_buf, hdr->mhdr.num_buffers); @@ -329,7 +337,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, } page = virt_to_head_page(buf); - --rq->num; num_skb_frags = skb_shinfo(curr_skb)->nr_frags; if (unlikely(num_skb_frags == MAX_SKB_FRAGS)) { @@ -370,7 +377,7 @@ err_buf: dev->stats.rx_dropped++; dev_kfree_skb(head_skb); while (--num_buf) { - buf = virtqueue_get_buf(rq->vq, &len); + buf = rq_get_buf(rq, &len); if (unlikely(!buf)) { pr_debug("%s: rx error: %d buffers missing\n", dev->name, num_buf); @@ -379,7 +386,6 @@ err_buf: } page = virt_to_head_page(buf); put_page(page); - --rq->num; } return NULL; } @@ -675,9 +681,8 @@ static int virtnet_poll(struct napi_struct *napi, int budget) again: while (received < budget && - (buf = virtqueue_get_buf(rq->vq, &len)) != NULL) { + (buf = rq_get_buf(rq, &len)) != NULL) { receive_buf(rq, buf, len); - --rq->num; received++; }