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 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3CD9FC43334 for ; Thu, 16 Jun 2022 06:07:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AE1A341A2D; Thu, 16 Jun 2022 06:07:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZzRtc3-plhzZ; Thu, 16 Jun 2022 06:07:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id C900B41A29; Thu, 16 Jun 2022 06:07:25 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9E170C0039; Thu, 16 Jun 2022 06:07:25 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1D311C002D for ; Thu, 16 Jun 2022 06:07:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0B21B60AD1 for ; Thu, 16 Jun 2022 06:07:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id efnnUYlzODgs for ; Thu, 16 Jun 2022 06:07:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id E8D9D60A8D for ; Thu, 16 Jun 2022 06:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655359642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HNWmdhLxppKdCA9eexLAnO1+hC4KXJHf7QP0BJFQUZ8=; b=CRbKVBk0/Peo8dFblROep7JlTXCk/Ul/DGoE8FpoItrRBxbDPLWRJsY02q7vPreKMzgNDU w/NlHwgPdKDEY5RnWwUlKyDFrNek4hlkCkHZ1LOhcASdoTwzdVGwW6zlf2owNdiKmYCkWh tB9m/W7wb0UBaha2t2F6yKTGRdjXHPs= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-312-7n7Fh2i_OnKrtoiWUFFN1g-1; Thu, 16 Jun 2022 02:07:21 -0400 X-MC-Unique: 7n7Fh2i_OnKrtoiWUFFN1g-1 Received: by mail-wm1-f70.google.com with SMTP id l17-20020a05600c4f1100b0039c860db521so397401wmq.5 for ; Wed, 15 Jun 2022 23:07:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=HNWmdhLxppKdCA9eexLAnO1+hC4KXJHf7QP0BJFQUZ8=; b=oE/BTfDTDCU9IF4GgK6tfpH8/JgqwgoflF/7G7C/hKTNYEe8v+XASyM+eHolGs8iyR 2XqJzYJ6K3AJubyctw+GxS36KJthPiyP1ZRGsGh3WJyMJcYUngXDVFFtS3IqxWXF+o57 K9xhNemJ3It7kil7EFueMFzGUM06CKIVn4ODVnlWmv3kwvTZuZeIzdjz8tY/cD/iekW2 prHYKJT8/4FW0oSMQv3HQ7PQYpDVOzZFe77pUdct3bFdKKYDgyfZoO0IjoiKgePwbceP 4TvYl32x/vuw8DzWht9qv3ky18vlqEq4Lbsj46HX0dX/gQPk0sduW/Kdr4XGmO0OkeGR aqIg== X-Gm-Message-State: AOAM532G6ypz0PosTT4fsQTqKxzxWJJl47ASWWiu8onx85R7qXv9GJ8I //bPWy6pMGnSBN2exXgsLCEwCKc8pozVNHEP++GziFaoV8QHSLOEH4IDE7UQbQnM8E18lM73YZZ 2Cee10PAxe8Bm709Z/M+wDcLXV9SUpxEOI3LWLYI7+A== X-Received: by 2002:a05:600c:2256:b0:39d:4b0c:7ce4 with SMTP id a22-20020a05600c225600b0039d4b0c7ce4mr13747561wmm.146.1655359639675; Wed, 15 Jun 2022 23:07:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytTWfzuBXUqF+rTavH6EUE6BvRB+FYWOqKWlFJT60lH/tlUJz6gGZsgrjF15LFvw2O0JP/Lg== X-Received: by 2002:a05:600c:2256:b0:39d:4b0c:7ce4 with SMTP id a22-20020a05600c225600b0039d4b0c7ce4mr13747537wmm.146.1655359639345; Wed, 15 Jun 2022 23:07:19 -0700 (PDT) Received: from redhat.com ([2.55.50.22]) by smtp.gmail.com with ESMTPSA id v15-20020adff68f000000b0021576694d9dsm812535wrp.97.2022.06.15.23.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 23:07:18 -0700 (PDT) Date: Thu, 16 Jun 2022 02:07:15 -0400 From: "Michael S. Tsirkin" To: Albert Huang Subject: Re: [PATCH v2] virtio_ring : keep used_wrap_counter in vq->last_used_idx Message-ID: <20220616015331-mutt-send-email-mst@kernel.org> References: <20220616051221.28506-1-huangjie.albert@bytedance.com> MIME-Version: 1.0 In-Reply-To: <20220616051221.28506-1-huangjie.albert@bytedance.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Cc: linux-kernel@vger.kernel.org, yuanzhu@bytedance.com, virtualization@lists.linux-foundation.org X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" T24gVGh1LCBKdW4gMTYsIDIwMjIgYXQgMDE6MTI6MjFQTSArMDgwMCwgQWxiZXJ0IEh1YW5nIHdy b3RlOgo+IEZyb206ICJodWFuZ2ppZS5hbGJlcnQiIDxodWFuZ2ppZS5hbGJlcnRAYnl0ZWRhbmNl LmNvbT4KPiAKPiB0aGUgdXNlZF93cmFwX2NvdW50ZXIgYW5kIHRoZSB2cS0+bGFzdF91c2VkX2lk eCBtYXkgZ2V0Cj4gb3V0IG9mIHN5bmMgaWYgdGhleSBhcmUgc2VwYXJhdGUgYXNzaWdubWVudO+8 jGFuZCBpbnRlcnJ1cHQKPiBtaWdodCB1c2UgYW4gaW5jb3JyZWN0IHZhbHVlIHRvIGNoZWNrIGZv ciB0aGUgdXNlZCBpbmRleC4KPiAKPiBmb3IgZXhhbXBsZTpPT0IgYWNjZXNzCj4ga3NvZnRpcnFk IG1heSBjb25zdW1lIHRoZSBwYWNrZXQgYW5kIGl0IHdpbGwgY2FsbDoKPiB2aXJ0bmV0X3BvbGwK PiAJLS0+dmlydG5ldF9yZWNlaXZlCj4gCQktLT52aXJ0cXVldWVfZ2V0X2J1Zl9jdHgKPiAJCQkt LT52aXJ0cXVldWVfZ2V0X2J1Zl9jdHhfcGFja2VkCj4gYW5kIGluIHZpcnRxdWV1ZV9nZXRfYnVm X2N0eF9wYWNrZWQ6Cj4gCj4gdnEtPmxhc3RfdXNlZF9pZHggKz0gdnEtPnBhY2tlZC5kZXNjX3N0 YXRlW2lkXS5udW07Cj4gaWYgKHVubGlrZWx5KHZxLT5sYXN0X3VzZWRfaWR4ID49IHZxLT5wYWNr ZWQudnJpbmcubnVtKSkgewo+ICAgICAgICAgIHZxLT5sYXN0X3VzZWRfaWR4IC09IHZxLT5wYWNr ZWQudnJpbmcubnVtOwo+ICAgICAgICAgIHZxLT5wYWNrZWQudXNlZF93cmFwX2NvdW50ZXIgXj0g MTsKPiB9Cj4gCj4gaWYgYXQgdGhlIHNhbWUgdGltZSwgdGhlcmUgY29tZXMgYSB2cmluZyBpbnRl cnJ1cHTvvIxpbiB2cmluZ19pbnRlcnJ1cHQ6Cj4gd2Ugd2lsbCBjYWxsOgo+IHZyaW5nX2ludGVy cnVwdAo+IAktLT5tb3JlX3VzZWQKPiAJCS0tPm1vcmVfdXNlZF9wYWNrZWQKPiAJCQktLT5pc191 c2VkX2Rlc2NfcGFja2VkCj4gaW4gaXNfdXNlZF9kZXNjX3BhY2tlZCwgdGhlIGxhc3RfdXNlZF9p ZHggbWF5YmUgPj0gdnEtPnBhY2tlZC52cmluZy5udW0uCj4gc28gdGhpcyBjb3VsZCBjYXNlIGEg bWVtb3J5IG91dCBvZiBib3VuZHMgYnVnLgo+IAo+IHRoaXMgcGF0Y2ggaXMgdG8ga2VlcCB0aGUg dXNlZF93cmFwX2NvdW50ZXIgaW4gdnEtPmxhc3RfdXNlZF9pZHgKPiBzbyB3ZSBjYW4gZ2V0IHRo ZSBjb3JyZWN0IHZhbHVlIHRvIGNoZWNrIGZvciB1c2VkIGluZGV4IGluIGludGVycnVwdC4KPiAK PiB2MS0+djI6Cj4gLSByZXVzZSB0aGUgVlJJTkdfUEFDS0VEX0VWRU5UX0ZfV1JBUF9DVFIKPiAt IFJlbW92ZSBwYXJhbWV0ZXIganVkZ21lbnQgaW4gaXNfdXNlZF9kZXNjX3BhY2tlZCwKPiBiZWNh dXNlIGl0IGNhbid0IGJlIGlsbGVnYWwKPiAKPiBTaWduZWQtb2ZmLWJ5OiBodWFuZ2ppZS5hbGJl cnQgPGh1YW5namllLmFsYmVydEBieXRlZGFuY2UuY29tPgoKClRoaXMgbG9va3MgZ29vZCwganVz dCBhIHNtYWxsIHN1Z2dlc3Rpb24gYmVsb3c6Cgo+IC0tLQo+ICBkcml2ZXJzL3ZpcnRpby92aXJ0 aW9fcmluZy5jIHwgNTcgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCj4gIDEg ZmlsZSBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKPiAKPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy92aXJ0aW8vdmlydGlvX3JpbmcuYyBiL2RyaXZlcnMvdmlydGlvL3Zp cnRpb19yaW5nLmMKPiBpbmRleCAxM2E3MzQ4Y2VkZmYuLmIyMmQ5N2M5YTc1NSAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL3ZpcnRpby92aXJ0aW9fcmluZy5jCj4gKysrIGIvZHJpdmVycy92aXJ0aW8v dmlydGlvX3JpbmcuYwo+IEBAIC0xMTEsNyArMTExLDEyIEBAIHN0cnVjdCB2cmluZ192aXJ0cXVl dWUgewo+ICAJLyogTnVtYmVyIHdlJ3ZlIGFkZGVkIHNpbmNlIGxhc3Qgc3luYy4gKi8KPiAgCXVu c2lnbmVkIGludCBudW1fYWRkZWQ7Cj4gIAo+IC0JLyogTGFzdCB1c2VkIGluZGV4IHdlJ3ZlIHNl ZW4uICovCj4gKwkvKiBMYXN0IHVzZWQgaW5kZXggIHdlJ3ZlIHNlZW4uCj4gKwkgKiBmb3Igc3Bs aXQgcmluZywgaXQganVzdCBjb250YWlucyBsYXN0IHVzZWQgaW5kZXgKPiArCSAqIGZvciBwYWNr ZWQgcmluZywgaXQgbm90IG9ubHkgY29udGFpbnMgbGFzdCB1c2VkIGluZGV4LCBidXQgYWxzbwo+ ICsJICogdXNlZF93cmFwX2NvdW50ZXIsIHRoZSBWUklOR19QQUNLRURfRVZFTlRfRl9XUkFQX0NU UiBpcwo+ICsJICogdGhlIGJpdCBzaGlmdCBpbiBsYXN0X3VzZWRfaWR4Cj4gKwkgKi8KPiAgCXUx NiBsYXN0X3VzZWRfaWR4Owo+ICAKPiAgCS8qIEhpbnQgZm9yIGV2ZW50IGlkeDogYWxyZWFkeSB0 cmlnZ2VyZWQgbm8gbmVlZCB0byBkaXNhYmxlLiAqLwo+IEBAIC0xNTQsOSArMTU5LDYgQEAgc3Ry dWN0IHZyaW5nX3ZpcnRxdWV1ZSB7Cj4gIAkJCS8qIERyaXZlciByaW5nIHdyYXAgY291bnRlci4g Ki8KPiAgCQkJYm9vbCBhdmFpbF93cmFwX2NvdW50ZXI7Cj4gIAo+IC0JCQkvKiBEZXZpY2Ugcmlu ZyB3cmFwIGNvdW50ZXIuICovCj4gLQkJCWJvb2wgdXNlZF93cmFwX2NvdW50ZXI7Cj4gLQo+ICAJ CQkvKiBBdmFpbCB1c2VkIGZsYWdzLiAqLwo+ICAJCQl1MTYgYXZhaWxfdXNlZF9mbGFnczsKPiAg Cj4gQEAgLTE0MDYsOCArMTQwOCwxMiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNfdXNlZF9kZXNj X3BhY2tlZChjb25zdCBzdHJ1Y3QgdnJpbmdfdmlydHF1ZXVlICp2cSwKPiAgCj4gIHN0YXRpYyBp bmxpbmUgYm9vbCBtb3JlX3VzZWRfcGFja2VkKGNvbnN0IHN0cnVjdCB2cmluZ192aXJ0cXVldWUg KnZxKQo+ICB7Cj4gLQlyZXR1cm4gaXNfdXNlZF9kZXNjX3BhY2tlZCh2cSwgdnEtPmxhc3RfdXNl ZF9pZHgsCj4gLQkJCXZxLT5wYWNrZWQudXNlZF93cmFwX2NvdW50ZXIpOwo+ICsJdTE2IGxhc3Rf dXNlZDsKPiArCWJvb2wgdXNlZF93cmFwX2NvdW50ZXI7Cj4gKwo+ICsJbGFzdF91c2VkID0gdnEt Pmxhc3RfdXNlZF9pZHggJiB+KDEgPDwgVlJJTkdfUEFDS0VEX0VWRU5UX0ZfV1JBUF9DVFIpOwoK VGhpcyBvbmx5IHdvcmtzIGlmIGxhc3RfdXNlZF9pZHggaXMgMTYgYml0IGFuZApWUklOR19QQUNL RURfRVZFTlRfRl9XUkFQX0NUUiBpcyAxNS4KCkkgdGhpbmsgeW91IHdhbnQgCi8qIGFsbCBiaXRz IGJlbG93IFZSSU5HX1BBQ0tFRF9FVkVOVF9GX1dSQVBfQ1RSICovCnZxLT5sYXN0X3VzZWRfaWR4 ICYgfigtKDEgPDwgVlJJTkdfUEFDS0VEX0VWRU5UX0ZfV1JBUF9DVFIpKTsKCgo+ICsJdXNlZF93 cmFwX2NvdW50ZXIgPSAhISgodnEtPmxhc3RfdXNlZF9pZHgpID4+IFZSSU5HX1BBQ0tFRF9FVkVO VF9GX1dSQVBfQ1RSKTsKCgpBIGJpdCBtb3JlIGVmZmljaWVudCBhbmQgY2xlYXI6CgohIShxLT5s YXN0X3VzZWRfaWR4ICYgKDEgPDwgVlJJTkdfUEFDS0VEX0VWRU5UX0ZfV1JBUF9DVFIpKQoKCgpB bHNvIHRoaXMgbG9naWMgaXMgcmVwZWF0ZWQgaW4gbXVsdGlwbGUgcGxhY2VzLiBMZXQncyBhZGQg YSBjb3VwbGUgb2YgaW5saW5lCmZ1bmN0aW9uczoKCnN0YXRpYyBpbmxpbmUgYm9vbCBwYWNrZWRf dXNlZF93cmFwX2NvdW50ZXIodnEpCgpzdGF0aWMgaW5saW5lIHUxNiBwYWNrZWRfbGFzdF91c2Vk KHZxKQoKdGhlbiB1c2UgdGhlc2UgZXZlcnl3aGVyZS4KCgo+ICsJcmV0dXJuIGlzX3VzZWRfZGVz Y19wYWNrZWQodnEsIGxhc3RfdXNlZCwgdXNlZF93cmFwX2NvdW50ZXIpOwo+ICB9Cj4gIAo+ICBz dGF0aWMgdm9pZCAqdmlydHF1ZXVlX2dldF9idWZfY3R4X3BhY2tlZChzdHJ1Y3QgdmlydHF1ZXVl ICpfdnEsCj4gQEAgLTE0MTYsNiArMTQyMiw3IEBAIHN0YXRpYyB2b2lkICp2aXJ0cXVldWVfZ2V0 X2J1Zl9jdHhfcGFja2VkKHN0cnVjdCB2aXJ0cXVldWUgKl92cSwKPiAgewo+ICAJc3RydWN0IHZy aW5nX3ZpcnRxdWV1ZSAqdnEgPSB0b192dnEoX3ZxKTsKPiAgCXUxNiBsYXN0X3VzZWQsIGlkOwo+ ICsJYm9vbCB1c2VkX3dyYXBfY291bnRlcjsKPiAgCXZvaWQgKnJldDsKPiAgCj4gIAlTVEFSVF9V U0UodnEpOwo+IEBAIC0xNDM0LDcgKzE0NDEsOCBAQCBzdGF0aWMgdm9pZCAqdmlydHF1ZXVlX2dl dF9idWZfY3R4X3BhY2tlZChzdHJ1Y3QgdmlydHF1ZXVlICpfdnEsCj4gIAkvKiBPbmx5IGdldCB1 c2VkIGVsZW1lbnRzIGFmdGVyIHRoZXkgaGF2ZSBiZWVuIGV4cG9zZWQgYnkgaG9zdC4gKi8KPiAg CXZpcnRpb19ybWIodnEtPndlYWtfYmFycmllcnMpOwo+ICAKPiAtCWxhc3RfdXNlZCA9IHZxLT5s YXN0X3VzZWRfaWR4Owo+ICsJdXNlZF93cmFwX2NvdW50ZXIgPSAhISgodnEtPmxhc3RfdXNlZF9p ZHggPj4gVlJJTkdfUEFDS0VEX0VWRU5UX0ZfV1JBUF9DVFIpKTsKPiArCWxhc3RfdXNlZCA9ICh2 cS0+bGFzdF91c2VkX2lkeCkgJiAofigxIDw8IFZSSU5HX1BBQ0tFRF9FVkVOVF9GX1dSQVBfQ1RS KSk7Cj4gIAlpZCA9IGxlMTZfdG9fY3B1KHZxLT5wYWNrZWQudnJpbmcuZGVzY1tsYXN0X3VzZWRd LmlkKTsKPiAgCSpsZW4gPSBsZTMyX3RvX2NwdSh2cS0+cGFja2VkLnZyaW5nLmRlc2NbbGFzdF91 c2VkXS5sZW4pOwo+ICAKPiBAQCAtMTQ1MSwxMiArMTQ1OSwxNSBAQCBzdGF0aWMgdm9pZCAqdmly dHF1ZXVlX2dldF9idWZfY3R4X3BhY2tlZChzdHJ1Y3QgdmlydHF1ZXVlICpfdnEsCj4gIAlyZXQg PSB2cS0+cGFja2VkLmRlc2Nfc3RhdGVbaWRdLmRhdGE7Cj4gIAlkZXRhY2hfYnVmX3BhY2tlZCh2 cSwgaWQsIGN0eCk7Cj4gIAo+IC0JdnEtPmxhc3RfdXNlZF9pZHggKz0gdnEtPnBhY2tlZC5kZXNj X3N0YXRlW2lkXS5udW07Cj4gLQlpZiAodW5saWtlbHkodnEtPmxhc3RfdXNlZF9pZHggPj0gdnEt PnBhY2tlZC52cmluZy5udW0pKSB7Cj4gLQkJdnEtPmxhc3RfdXNlZF9pZHggLT0gdnEtPnBhY2tl ZC52cmluZy5udW07Cj4gLQkJdnEtPnBhY2tlZC51c2VkX3dyYXBfY291bnRlciBePSAxOwo+ICsJ bGFzdF91c2VkICs9IHZxLT5wYWNrZWQuZGVzY19zdGF0ZVtpZF0ubnVtOwo+ICsJaWYgKHVubGlr ZWx5KGxhc3RfdXNlZCA+PSB2cS0+cGFja2VkLnZyaW5nLm51bSkpIHsKPiArCQlsYXN0X3VzZWQg LT0gdnEtPnBhY2tlZC52cmluZy5udW07Cj4gKwkJdXNlZF93cmFwX2NvdW50ZXIgXj0gMTsKPiAg CX0KPiAgCj4gKwlsYXN0X3VzZWQgPSAobGFzdF91c2VkIHwgKHVzZWRfd3JhcF9jb3VudGVyIDw8 IFZSSU5HX1BBQ0tFRF9FVkVOVF9GX1dSQVBfQ1RSKSk7Cj4gKwl2cS0+bGFzdF91c2VkX2lkeCA9 IGxhc3RfdXNlZDsKPiArCj4gIAkvKgo+ICAJICogSWYgd2UgZXhwZWN0IGFuIGludGVycnVwdCBm b3IgdGhlIG5leHQgZW50cnksIHRlbGwgaG9zdAo+ICAJICogYnkgd3JpdGluZyBldmVudCBpbmRl eCBhbmQgZmx1c2ggb3V0IHRoZSB3cml0ZSBiZWZvcmUKPiBAQCAtMTQ2NSw5ICsxNDc2LDcgQEAg c3RhdGljIHZvaWQgKnZpcnRxdWV1ZV9nZXRfYnVmX2N0eF9wYWNrZWQoc3RydWN0IHZpcnRxdWV1 ZSAqX3ZxLAo+ICAJaWYgKHZxLT5wYWNrZWQuZXZlbnRfZmxhZ3Nfc2hhZG93ID09IFZSSU5HX1BB Q0tFRF9FVkVOVF9GTEFHX0RFU0MpCj4gIAkJdmlydGlvX3N0b3JlX21iKHZxLT53ZWFrX2JhcnJp ZXJzLAo+ICAJCQkJJnZxLT5wYWNrZWQudnJpbmcuZHJpdmVyLT5vZmZfd3JhcCwKPiAtCQkJCWNw dV90b19sZTE2KHZxLT5sYXN0X3VzZWRfaWR4IHwKPiAtCQkJCQkodnEtPnBhY2tlZC51c2VkX3dy YXBfY291bnRlciA8PAo+IC0JCQkJCSBWUklOR19QQUNLRURfRVZFTlRfRl9XUkFQX0NUUikpKTsK PiArCQkJCWNwdV90b19sZTE2KHZxLT5sYXN0X3VzZWRfaWR4KSk7Cj4gIAo+ICAJTEFTVF9BRERf VElNRV9JTlZBTElEKHZxKTsKPiAgCj4gQEAgLTE0OTksOSArMTUwOCw3IEBAIHN0YXRpYyB1bnNp Z25lZCBpbnQgdmlydHF1ZXVlX2VuYWJsZV9jYl9wcmVwYXJlX3BhY2tlZChzdHJ1Y3QgdmlydHF1 ZXVlICpfdnEpCj4gIAo+ICAJaWYgKHZxLT5ldmVudCkgewo+ICAJCXZxLT5wYWNrZWQudnJpbmcu ZHJpdmVyLT5vZmZfd3JhcCA9Cj4gLQkJCWNwdV90b19sZTE2KHZxLT5sYXN0X3VzZWRfaWR4IHwK PiAtCQkJCSh2cS0+cGFja2VkLnVzZWRfd3JhcF9jb3VudGVyIDw8Cj4gLQkJCQkgVlJJTkdfUEFD S0VEX0VWRU5UX0ZfV1JBUF9DVFIpKTsKPiArCQkJY3B1X3RvX2xlMTYodnEtPmxhc3RfdXNlZF9p ZHgpOwo+ICAJCS8qCj4gIAkJICogV2UgbmVlZCB0byB1cGRhdGUgZXZlbnQgb2Zmc2V0IGFuZCBl dmVudCB3cmFwCj4gIAkJICogY291bnRlciBmaXJzdCBiZWZvcmUgdXBkYXRpbmcgZXZlbnQgZmxh Z3MuCj4gQEAgLTE1MTgsOCArMTUyNSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgdmlydHF1ZXVl X2VuYWJsZV9jYl9wcmVwYXJlX3BhY2tlZChzdHJ1Y3QgdmlydHF1ZXVlICpfdnEpCj4gIAl9Cj4g IAo+ICAJRU5EX1VTRSh2cSk7Cj4gLQlyZXR1cm4gdnEtPmxhc3RfdXNlZF9pZHggfCAoKHUxNil2 cS0+cGFja2VkLnVzZWRfd3JhcF9jb3VudGVyIDw8Cj4gLQkJCVZSSU5HX1BBQ0tFRF9FVkVOVF9G X1dSQVBfQ1RSKTsKPiArCXJldHVybiB2cS0+bGFzdF91c2VkX2lkeDsKPiAgfQo+ICAKPiAgc3Rh dGljIGJvb2wgdmlydHF1ZXVlX3BvbGxfcGFja2VkKHN0cnVjdCB2aXJ0cXVldWUgKl92cSwgdTE2 IG9mZl93cmFwKQo+IEBAIC0xNTUwLDkgKzE1NTYsOSBAQCBzdGF0aWMgYm9vbCB2aXJ0cXVldWVf ZW5hYmxlX2NiX2RlbGF5ZWRfcGFja2VkKHN0cnVjdCB2aXJ0cXVldWUgKl92cSkKPiAgCWlmICh2 cS0+ZXZlbnQpIHsKPiAgCQkvKiBUT0RPOiB0dW5lIHRoaXMgdGhyZXNob2xkICovCj4gIAkJYnVm cyA9ICh2cS0+cGFja2VkLnZyaW5nLm51bSAtIHZxLT52cS5udW1fZnJlZSkgKiAzIC8gNDsKPiAt CQl3cmFwX2NvdW50ZXIgPSB2cS0+cGFja2VkLnVzZWRfd3JhcF9jb3VudGVyOwo+ICsJCXdyYXBf Y291bnRlciA9ICEhKHZxLT5sYXN0X3VzZWRfaWR4ID4+IFZSSU5HX1BBQ0tFRF9FVkVOVF9GX1dS QVBfQ1RSKTsKPiAgCj4gLQkJdXNlZF9pZHggPSB2cS0+bGFzdF91c2VkX2lkeCArIGJ1ZnM7Cj4g KwkJdXNlZF9pZHggPSAodnEtPmxhc3RfdXNlZF9pZHggJiB+KDEgPDwgVlJJTkdfUEFDS0VEX0VW RU5UX0ZfV1JBUF9DVFIpKSArIGJ1ZnM7Cj4gIAkJaWYgKHVzZWRfaWR4ID49IHZxLT5wYWNrZWQu dnJpbmcubnVtKSB7Cj4gIAkJCXVzZWRfaWR4IC09IHZxLT5wYWNrZWQudnJpbmcubnVtOwo+ICAJ CQl3cmFwX2NvdW50ZXIgXj0gMTsKPiBAQCAtMTU4Miw5ICsxNTg4LDkgQEAgc3RhdGljIGJvb2wg dmlydHF1ZXVlX2VuYWJsZV9jYl9kZWxheWVkX3BhY2tlZChzdHJ1Y3QgdmlydHF1ZXVlICpfdnEp Cj4gIAkgKi8KPiAgCXZpcnRpb19tYih2cS0+d2Vha19iYXJyaWVycyk7Cj4gIAo+IC0JaWYgKGlz X3VzZWRfZGVzY19wYWNrZWQodnEsCj4gLQkJCQl2cS0+bGFzdF91c2VkX2lkeCwKPiAtCQkJCXZx LT5wYWNrZWQudXNlZF93cmFwX2NvdW50ZXIpKSB7Cj4gKwl3cmFwX2NvdW50ZXIgPSAhISh2cS0+ bGFzdF91c2VkX2lkeCA+PiBWUklOR19QQUNLRURfRVZFTlRfRl9XUkFQX0NUUik7Cj4gKwl1c2Vk X2lkeCA9ICh2cS0+bGFzdF91c2VkX2lkeCAmIH4oMSA8PCBWUklOR19QQUNLRURfRVZFTlRfRl9X UkFQX0NUUikpOwo+ICsJaWYgKGlzX3VzZWRfZGVzY19wYWNrZWQodnEsIHVzZWRfaWR4LCB3cmFw X2NvdW50ZXIpKSB7Cj4gIAkJRU5EX1VTRSh2cSk7Cj4gIAkJcmV0dXJuIGZhbHNlOwo+ICAJfQo+ IEBAIC0xNjg5LDcgKzE2OTUsNyBAQCBzdGF0aWMgc3RydWN0IHZpcnRxdWV1ZSAqdnJpbmdfY3Jl YXRlX3ZpcnRxdWV1ZV9wYWNrZWQoCj4gIAl2cS0+bm90aWZ5ID0gbm90aWZ5Owo+ICAJdnEtPndl YWtfYmFycmllcnMgPSB3ZWFrX2JhcnJpZXJzOwo+ICAJdnEtPmJyb2tlbiA9IHRydWU7Cj4gLQl2 cS0+bGFzdF91c2VkX2lkeCA9IDA7Cj4gKwl2cS0+bGFzdF91c2VkX2lkeCA9IDAgfCAoMSA8PCBW UklOR19QQUNLRURfRVZFTlRfRl9XUkFQX0NUUik7Cj4gIAl2cS0+ZXZlbnRfdHJpZ2dlcmVkID0g ZmFsc2U7Cj4gIAl2cS0+bnVtX2FkZGVkID0gMDsKPiAgCXZxLT5wYWNrZWRfcmluZyA9IHRydWU7 Cj4gQEAgLTE3MjAsNyArMTcyNiw2IEBAIHN0YXRpYyBzdHJ1Y3QgdmlydHF1ZXVlICp2cmluZ19j cmVhdGVfdmlydHF1ZXVlX3BhY2tlZCgKPiAgCj4gIAl2cS0+cGFja2VkLm5leHRfYXZhaWxfaWR4 ID0gMDsKPiAgCXZxLT5wYWNrZWQuYXZhaWxfd3JhcF9jb3VudGVyID0gMTsKPiAtCXZxLT5wYWNr ZWQudXNlZF93cmFwX2NvdW50ZXIgPSAxOwo+ICAJdnEtPnBhY2tlZC5ldmVudF9mbGFnc19zaGFk b3cgPSAwOwo+ICAJdnEtPnBhY2tlZC5hdmFpbF91c2VkX2ZsYWdzID0gMSA8PCBWUklOR19QQUNL RURfREVTQ19GX0FWQUlMOwo+ICAKPiAtLSAKPiAyLjMxLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClZpcnR1YWxpemF0aW9uIG1haWxpbmcgbGlzdApW aXJ0dWFsaXphdGlvbkBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxp bnV4Zm91bmRhdGlvbi5vcmcvbWFpbG1hbi9saXN0aW5mby92aXJ0dWFsaXphdGlvbg== 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21B3AC433EF for ; Thu, 16 Jun 2022 06:07:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358921AbiFPGHj (ORCPT ); Thu, 16 Jun 2022 02:07:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358968AbiFPGHh (ORCPT ); Thu, 16 Jun 2022 02:07:37 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2C471FD21 for ; Wed, 15 Jun 2022 23:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655359650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HNWmdhLxppKdCA9eexLAnO1+hC4KXJHf7QP0BJFQUZ8=; b=QtPsu0ey/Xrb/I+AuG7cxal95fVtbRpozPBGowLy5G3oELVGAUcd/n4pFI4fX5qKt19L0K oVgBV43SmsrHTwnB95hKdbTooh4CbRC1nsOt3s9w+RRRmNgqKsWT80bC4QjwH4vFr3uVFo j0bap9J8/EKhtjkvF0tIb4UMZxw+k6U= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-496-n2gu7KqgMciZV-AgOb1HaA-1; Thu, 16 Jun 2022 02:07:20 -0400 X-MC-Unique: n2gu7KqgMciZV-AgOb1HaA-1 Received: by mail-wm1-f69.google.com with SMTP id l4-20020a05600c1d0400b0039c60535405so185253wms.6 for ; Wed, 15 Jun 2022 23:07:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=HNWmdhLxppKdCA9eexLAnO1+hC4KXJHf7QP0BJFQUZ8=; b=vDNZjatGllRMpbV6a35EMjB3xGQiHSVgAn0l73jpxIEV+UyS8CX+SnDmFfhlImWF85 6izOqd12Q1QUKhQB8/Q4CiaDexByA8AWKn8XvvgZKk3sVE0Tif2OpHvKn14vHW62q2OI rWn/sEvV8SMwJzLdLBUv5+ys6AjV2HjdxNnFcdoDQipuR0G5JdhOwyQJnSaf/va016Bg oPitKzodB+MJ7lBKLiLNc7d+RvtPDTbDsTNoVmVyj4DGz1ys1lSYG0i62oiywhKXoBNO wvKGuvfCKFSSbroaVhZ4qC00hZIBONJLzZrL9UYtwb/Iy1CbS4joD2U3kUmCJXwd6bL4 xioQ== X-Gm-Message-State: AOAM531ypuU3VuCfiGn2qCMnZetPBJ+jJGhpkg8FFo2XSrwTIF0vIJy6 Eo+qbNS1TsfN/Xi+g7Qfu11pWevt8l8g+8GsoC8VvmwdN5hz0seqLvErtSRukNS8ZDXuOm8k+8h If8moliy5UtiGhxFW4KpT9FYt X-Received: by 2002:a05:600c:2256:b0:39d:4b0c:7ce4 with SMTP id a22-20020a05600c225600b0039d4b0c7ce4mr13747559wmm.146.1655359639674; Wed, 15 Jun 2022 23:07:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytTWfzuBXUqF+rTavH6EUE6BvRB+FYWOqKWlFJT60lH/tlUJz6gGZsgrjF15LFvw2O0JP/Lg== X-Received: by 2002:a05:600c:2256:b0:39d:4b0c:7ce4 with SMTP id a22-20020a05600c225600b0039d4b0c7ce4mr13747537wmm.146.1655359639345; Wed, 15 Jun 2022 23:07:19 -0700 (PDT) Received: from redhat.com ([2.55.50.22]) by smtp.gmail.com with ESMTPSA id v15-20020adff68f000000b0021576694d9dsm812535wrp.97.2022.06.15.23.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 23:07:18 -0700 (PDT) Date: Thu, 16 Jun 2022 02:07:15 -0400 From: "Michael S. Tsirkin" To: Albert Huang Cc: jasowang@redhat.com, yuanzhu@bytedance.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] virtio_ring : keep used_wrap_counter in vq->last_used_idx Message-ID: <20220616015331-mutt-send-email-mst@kernel.org> References: <20220616051221.28506-1-huangjie.albert@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220616051221.28506-1-huangjie.albert@bytedance.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 16, 2022 at 01:12:21PM +0800, Albert Huang wrote: > From: "huangjie.albert" > > the used_wrap_counter and the vq->last_used_idx may get > out of sync if they are separate assignment，and interrupt > might use an incorrect value to check for the used index. > > for example:OOB access > ksoftirqd may consume the packet and it will call: > virtnet_poll > -->virtnet_receive > -->virtqueue_get_buf_ctx > -->virtqueue_get_buf_ctx_packed > and in virtqueue_get_buf_ctx_packed: > > vq->last_used_idx += vq->packed.desc_state[id].num; > if (unlikely(vq->last_used_idx >= vq->packed.vring.num)) { > vq->last_used_idx -= vq->packed.vring.num; > vq->packed.used_wrap_counter ^= 1; > } > > if at the same time, there comes a vring interrupt，in vring_interrupt: > we will call: > vring_interrupt > -->more_used > -->more_used_packed > -->is_used_desc_packed > in is_used_desc_packed, the last_used_idx maybe >= vq->packed.vring.num. > so this could case a memory out of bounds bug. > > this patch is to keep the used_wrap_counter in vq->last_used_idx > so we can get the correct value to check for used index in interrupt. > > v1->v2: > - reuse the VRING_PACKED_EVENT_F_WRAP_CTR > - Remove parameter judgment in is_used_desc_packed, > because it can't be illegal > > Signed-off-by: huangjie.albert This looks good, just a small suggestion below: > --- > drivers/virtio/virtio_ring.c | 57 ++++++++++++++++++++---------------- > 1 file changed, 31 insertions(+), 26 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 13a7348cedff..b22d97c9a755 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -111,7 +111,12 @@ struct vring_virtqueue { > /* Number we've added since last sync. */ > unsigned int num_added; > > - /* Last used index we've seen. */ > + /* Last used index we've seen. > + * for split ring, it just contains last used index > + * for packed ring, it not only contains last used index, but also > + * used_wrap_counter, the VRING_PACKED_EVENT_F_WRAP_CTR is > + * the bit shift in last_used_idx > + */ > u16 last_used_idx; > > /* Hint for event idx: already triggered no need to disable. */ > @@ -154,9 +159,6 @@ struct vring_virtqueue { > /* Driver ring wrap counter. */ > bool avail_wrap_counter; > > - /* Device ring wrap counter. */ > - bool used_wrap_counter; > - > /* Avail used flags. */ > u16 avail_used_flags; > > @@ -1406,8 +1408,12 @@ static inline bool is_used_desc_packed(const struct vring_virtqueue *vq, > > static inline bool more_used_packed(const struct vring_virtqueue *vq) > { > - return is_used_desc_packed(vq, vq->last_used_idx, > - vq->packed.used_wrap_counter); > + u16 last_used; > + bool used_wrap_counter; > + > + last_used = vq->last_used_idx & ~(1 << VRING_PACKED_EVENT_F_WRAP_CTR); This only works if last_used_idx is 16 bit and VRING_PACKED_EVENT_F_WRAP_CTR is 15. I think you want /* all bits below VRING_PACKED_EVENT_F_WRAP_CTR */ vq->last_used_idx & ~(-(1 << VRING_PACKED_EVENT_F_WRAP_CTR)); > + used_wrap_counter = !!((vq->last_used_idx) >> VRING_PACKED_EVENT_F_WRAP_CTR); A bit more efficient and clear: !!(q->last_used_idx & (1 << VRING_PACKED_EVENT_F_WRAP_CTR)) Also this logic is repeated in multiple places. Let's add a couple of inline functions: static inline bool packed_used_wrap_counter(vq) static inline u16 packed_last_used(vq) then use these everywhere. > + return is_used_desc_packed(vq, last_used, used_wrap_counter); > } > > static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq, > @@ -1416,6 +1422,7 @@ static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq, > { > struct vring_virtqueue *vq = to_vvq(_vq); > u16 last_used, id; > + bool used_wrap_counter; > void *ret; > > START_USE(vq); > @@ -1434,7 +1441,8 @@ static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq, > /* Only get used elements after they have been exposed by host. */ > virtio_rmb(vq->weak_barriers); > > - last_used = vq->last_used_idx; > + used_wrap_counter = !!((vq->last_used_idx >> VRING_PACKED_EVENT_F_WRAP_CTR)); > + last_used = (vq->last_used_idx) & (~(1 << VRING_PACKED_EVENT_F_WRAP_CTR)); > id = le16_to_cpu(vq->packed.vring.desc[last_used].id); > *len = le32_to_cpu(vq->packed.vring.desc[last_used].len); > > @@ -1451,12 +1459,15 @@ static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq, > ret = vq->packed.desc_state[id].data; > detach_buf_packed(vq, id, ctx); > > - vq->last_used_idx += vq->packed.desc_state[id].num; > - if (unlikely(vq->last_used_idx >= vq->packed.vring.num)) { > - vq->last_used_idx -= vq->packed.vring.num; > - vq->packed.used_wrap_counter ^= 1; > + last_used += vq->packed.desc_state[id].num; > + if (unlikely(last_used >= vq->packed.vring.num)) { > + last_used -= vq->packed.vring.num; > + used_wrap_counter ^= 1; > } > > + last_used = (last_used | (used_wrap_counter << VRING_PACKED_EVENT_F_WRAP_CTR)); > + vq->last_used_idx = last_used; > + > /* > * If we expect an interrupt for the next entry, tell host > * by writing event index and flush out the write before > @@ -1465,9 +1476,7 @@ static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq, > if (vq->packed.event_flags_shadow == VRING_PACKED_EVENT_FLAG_DESC) > virtio_store_mb(vq->weak_barriers, > &vq->packed.vring.driver->off_wrap, > - cpu_to_le16(vq->last_used_idx | > - (vq->packed.used_wrap_counter << > - VRING_PACKED_EVENT_F_WRAP_CTR))); > + cpu_to_le16(vq->last_used_idx)); > > LAST_ADD_TIME_INVALID(vq); > > @@ -1499,9 +1508,7 @@ static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq) > > if (vq->event) { > vq->packed.vring.driver->off_wrap = > - cpu_to_le16(vq->last_used_idx | > - (vq->packed.used_wrap_counter << > - VRING_PACKED_EVENT_F_WRAP_CTR)); > + cpu_to_le16(vq->last_used_idx); > /* > * We need to update event offset and event wrap > * counter first before updating event flags. > @@ -1518,8 +1525,7 @@ static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq) > } > > END_USE(vq); > - return vq->last_used_idx | ((u16)vq->packed.used_wrap_counter << > - VRING_PACKED_EVENT_F_WRAP_CTR); > + return vq->last_used_idx; > } > > static bool virtqueue_poll_packed(struct virtqueue *_vq, u16 off_wrap) > @@ -1550,9 +1556,9 @@ static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq) > if (vq->event) { > /* TODO: tune this threshold */ > bufs = (vq->packed.vring.num - vq->vq.num_free) * 3 / 4; > - wrap_counter = vq->packed.used_wrap_counter; > + wrap_counter = !!(vq->last_used_idx >> VRING_PACKED_EVENT_F_WRAP_CTR); > > - used_idx = vq->last_used_idx + bufs; > + used_idx = (vq->last_used_idx & ~(1 << VRING_PACKED_EVENT_F_WRAP_CTR)) + bufs; > if (used_idx >= vq->packed.vring.num) { > used_idx -= vq->packed.vring.num; > wrap_counter ^= 1; > @@ -1582,9 +1588,9 @@ static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq) > */ > virtio_mb(vq->weak_barriers); > > - if (is_used_desc_packed(vq, > - vq->last_used_idx, > - vq->packed.used_wrap_counter)) { > + wrap_counter = !!(vq->last_used_idx >> VRING_PACKED_EVENT_F_WRAP_CTR); > + used_idx = (vq->last_used_idx & ~(1 << VRING_PACKED_EVENT_F_WRAP_CTR)); > + if (is_used_desc_packed(vq, used_idx, wrap_counter)) { > END_USE(vq); > return false; > } > @@ -1689,7 +1695,7 @@ static struct virtqueue *vring_create_virtqueue_packed( > vq->notify = notify; > vq->weak_barriers = weak_barriers; > vq->broken = true; > - vq->last_used_idx = 0; > + vq->last_used_idx = 0 | (1 << VRING_PACKED_EVENT_F_WRAP_CTR); > vq->event_triggered = false; > vq->num_added = 0; > vq->packed_ring = true; > @@ -1720,7 +1726,6 @@ static struct virtqueue *vring_create_virtqueue_packed( > > vq->packed.next_avail_idx = 0; > vq->packed.avail_wrap_counter = 1; > - vq->packed.used_wrap_counter = 1; > vq->packed.event_flags_shadow = 0; > vq->packed.avail_used_flags = 1 << VRING_PACKED_DESC_F_AVAIL; > > -- > 2.31.1