From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: [PATCH 1/3] virtio_net: Recycle some more rx buffer pages Date: Mon, 17 Nov 2008 13:44:57 +1030 Message-ID: <200811171344.57410.rusty@rustcorp.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Mark McLoughlin To: netdev@vger.kernel.org Return-path: Received: from ozlabs.org ([203.10.76.45]:48437 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755061AbYKQDRw (ORCPT ); Sun, 16 Nov 2008 22:17:52 -0500 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: RnJvbTogTWFyayBNY0xvdWdobGluIDxtYXJrbWNAcmVkaGF0LmNvbT4KCkVhY2ggdGltZSB3ZSBy ZS1maWxsIHRoZSByZWN2IHF1ZXVlIHdpdGggYnVmZmVycywgd2UgYWxsb2NhdGUKb25lIHRvbyBt YW55IHNrYnMgYW5kIGZyZWUgaXQgYWdhaW4gd2hlbiBhZGRpbmcgZmFpbHMuIFdlIHNob3VsZApy ZWN5Y2xlIHRoZSBwYWdlcyBhbGxvY2F0ZWQgaW4gdGhpcyBjYXNlLgoKQSBwcmV2aW91cyB2ZXJz aW9uIG9mIHRoaXMgcGF0Y2ggbWFkZSB0cmltX3BhZ2VzKCkgdHJpbSB0cmFpbGluZwp1bnVzZWQg cGFnZXMgZnJvbSBza2JzIHdpdGggc29tZSBwYWdlZCBkYXRhLCBidXQgdGhpcyBhY3R1YWxseQpj YXVzZWQgYSBiYXJlbHkgbWVhc3VyYWJsZSBzbG93ZG93bi4KClNpZ25lZC1vZmYtYnk6IE1hcmsg TWNMb3VnaGxpbiA8bWFya21jQHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IFJ1c3R5IFJ1c3Nl bGwgPHJ1c3R5QHJ1c3Rjb3JwLmNvbS5hdT4gKHVzZSBuZXRkZXZfcHJpdikKLS0tCiBkcml2ZXJz L25ldC92aXJ0aW9fbmV0LmMgfCAgIDIxICsrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9uZXQvdmlydGlvX25ldC5jIGIvZHJpdmVycy9uZXQvdmlydGlvX25ldC5jCmluZGV4IDAx OTZhMGQuLjk4NTI3MWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3ZpcnRpb19uZXQuYworKysg Yi9kcml2ZXJzL25ldC92aXJ0aW9fbmV0LmMKQEAgLTgyLDYgKzgyLDE2IEBAIHN0YXRpYyB2b2lk IGdpdmVfYV9wYWdlKHN0cnVjdCB2aXJ0bmV0X2luZm8gKnZpLCBzdHJ1Y3QgCnBhZ2UgKnBhZ2Up CiAJdmktPnBhZ2VzID0gcGFnZTsKIH0KIAorc3RhdGljIHZvaWQgdHJpbV9wYWdlcyhzdHJ1Y3Qg dmlydG5ldF9pbmZvICp2aSwgc3RydWN0IHNrX2J1ZmYgKnNrYikKK3sKKwl1bnNpZ25lZCBpbnQg aTsKKworCWZvciAoaSA9IDA7IGkgPCBza2Jfc2hpbmZvKHNrYiktPm5yX2ZyYWdzOyBpKyspCisJ CWdpdmVfYV9wYWdlKHZpLCBza2Jfc2hpbmZvKHNrYiktPmZyYWdzW2ldLnBhZ2UpOworCXNrYl9z aGluZm8oc2tiKS0+bnJfZnJhZ3MgPSAwOworCXNrYi0+ZGF0YV9sZW4gPSAwOworfQorCiBzdGF0 aWMgc3RydWN0IHBhZ2UgKmdldF9hX3BhZ2Uoc3RydWN0IHZpcnRuZXRfaW5mbyAqdmksIGdmcF90 IGdmcF9tYXNrKQogewogCXN0cnVjdCBwYWdlICpwID0gdmktPnBhZ2VzOwpAQCAtMTIxLDE0ICsx MzEsOCBAQCBzdGF0aWMgdm9pZCByZWNlaXZlX3NrYihzdHJ1Y3QgbmV0X2RldmljZSAqZGV2LCBz dHJ1Y3QgCnNrX2J1ZmYgKnNrYiwKIAl9CiAJbGVuIC09IHNpemVvZihzdHJ1Y3QgdmlydGlvX25l dF9oZHIpOwogCi0JaWYgKGxlbiA8PSBNQVhfUEFDS0VUX0xFTikgewotCQl1bnNpZ25lZCBpbnQg aTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgc2tiX3NoaW5mbyhza2IpLT5ucl9mcmFnczsgaSsrKQot CQkJZ2l2ZV9hX3BhZ2UoZGV2LT5wcml2LCBza2Jfc2hpbmZvKHNrYiktPmZyYWdzW2ldLnBhZ2Up OwotCQlza2ItPmRhdGFfbGVuID0gMDsKLQkJc2tiX3NoaW5mbyhza2IpLT5ucl9mcmFncyA9IDA7 Ci0JfQorCWlmIChsZW4gPD0gTUFYX1BBQ0tFVF9MRU4pCisJCXRyaW1fcGFnZXMobmV0ZGV2X3By aXYoZGV2KSwgc2tiKTsKIAogCWVyciA9IHBza2JfdHJpbShza2IsIGxlbik7CiAJaWYgKGVycikg ewpAQCAtMjMyLDYgKzIzNiw3IEBAIHN0YXRpYyB2b2lkIHRyeV9maWxsX3JlY3Yoc3RydWN0IHZp cnRuZXRfaW5mbyAqdmkpCiAJCWVyciA9IHZpLT5ydnEtPnZxX29wcy0+YWRkX2J1Zih2aS0+cnZx LCBzZywgMCwgbnVtLCBza2IpOwogCQlpZiAoZXJyKSB7CiAJCQlza2JfdW5saW5rKHNrYiwgJnZp LT5yZWN2KTsKKwkJCXRyaW1fcGFnZXModmksIHNrYik7CiAJCQlrZnJlZV9za2Ioc2tiKTsKIAkJ CWJyZWFrOwogCQl9CgAKCg==