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=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 AE62AC433EF for ; Mon, 9 Sep 2019 10:21:04 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 382302089F for ; Mon, 9 Sep 2019 10:21:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 382302089F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0578E1EBD9; Mon, 9 Sep 2019 12:21:03 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C14121EBD8 for ; Mon, 9 Sep 2019 12:21:01 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F17224904; Mon, 9 Sep 2019 10:21:00 +0000 (UTC) Received: from [10.36.112.25] (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6F656061E; Mon, 9 Sep 2019 10:20:58 +0000 (UTC) To: JinYu , dev@dpdk.org Cc: changpeng.liu@intel.com, tiwei.bie@intel.com, zhihong.wang@intel.com, Lin Li , Xun Ni , Yu Zhang References: <20190806182500.22320> <20190829141224.49700-1-jin.yu@intel.com> <20190829141224.49700-6-jin.yu@intel.com> From: Maxime Coquelin Openpgp: preference=signencrypt Autocrypt: addr=maxime.coquelin@redhat.com; keydata= mQINBFOEQQIBEADjNLYZZqghYuWv1nlLisptPJp+TSxE/KuP7x47e1Gr5/oMDJ1OKNG8rlNg kLgBQUki3voWhUbMb69ybqdMUHOl21DGCj0BTU3lXwapYXOAnsh8q6RRM+deUpasyT+Jvf3a gU35dgZcomRh5HPmKMU4KfeA38cVUebsFec1HuJAWzOb/UdtQkYyZR4rbzw8SbsOemtMtwOx YdXodneQD7KuRU9IhJKiEfipwqk2pufm2VSGl570l5ANyWMA/XADNhcEXhpkZ1Iwj3TWO7XR uH4xfvPl8nBsLo/EbEI7fbuUULcAnHfowQslPUm6/yaGv6cT5160SPXT1t8U9QDO6aTSo59N jH519JS8oeKZB1n1eLDslCfBpIpWkW8ZElGkOGWAN0vmpLfdyiqBNNyS3eGAfMkJ6b1A24un /TKc6j2QxM0QK4yZGfAxDxtvDv9LFXec8ENJYsbiR6WHRHq7wXl/n8guyh5AuBNQ3LIK44x0 KjGXP1FJkUhUuruGyZsMrDLBRHYi+hhDAgRjqHgoXi5XGETA1PAiNBNnQwMf5aubt+mE2Q5r qLNTgwSo2dpTU3+mJ3y3KlsIfoaxYI7XNsPRXGnZi4hbxmeb2NSXgdCXhX3nELUNYm4ArKBP LugOIT/zRwk0H0+RVwL2zHdMO1Tht1UOFGfOZpvuBF60jhMzbQARAQABtCxNYXhpbWUgQ29x dWVsaW4gPG1heGltZS5jb3F1ZWxpbkByZWRoYXQuY29tPokCOAQTAQIAIgUCV3u/5QIbAwYL CQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQyjiNKEaHD4ma2g/+P+Hg9WkONPaY1J4AR7Uf kBneosS4NO3CRy0x4WYmUSLYMLx1I3VH6SVjqZ6uBoYy6Fs6TbF6SHNc7QbB6Qjo3neqnQR1 71Ua1MFvIob8vUEl3jAR/+oaE1UJKrxjWztpppQTukIk4oJOmXbL0nj3d8dA2QgHdTyttZ1H xzZJWWz6vqxCrUqHU7RSH9iWg9R2iuTzii4/vk1oi4Qz7y/q8ONOq6ffOy/t5xSZOMtZCspu Mll2Szzpc/trFO0pLH4LZZfz/nXh2uuUbk8qRIJBIjZH3ZQfACffgfNefLe2PxMqJZ8mFJXc RQO0ONZvwoOoHL6CcnFZp2i0P5ddduzwPdGsPq1bnIXnZqJSl3dUfh3xG5ArkliZ/++zGF1O wvpGvpIuOgLqjyCNNRoR7cP7y8F24gWE/HqJBXs1qzdj/5Hr68NVPV1Tu/l2D1KMOcL5sOrz 2jLXauqDWn1Okk9hkXAP7+0Cmi6QwAPuBT3i6t2e8UdtMtCE4sLesWS/XohnSFFscZR6Vaf3 gKdWiJ/fW64L6b9gjkWtHd4jAJBAIAx1JM6xcA1xMbAFsD8gA2oDBWogHGYcScY/4riDNKXi lw92d6IEHnSf6y7KJCKq8F+Jrj2BwRJiFKTJ6ChbOpyyR6nGTckzsLgday2KxBIyuh4w+hMq TGDSp2rmWGJjASq5Ag0EVPSbkwEQAMkaNc084Qvql+XW+wcUIY+Dn9A2D1gMr2BVwdSfVDN7 0ZYxo9PvSkzh6eQmnZNQtl8WSHl3VG3IEDQzsMQ2ftZn2sxjcCadexrQQv3Lu60Tgj7YVYRM H+fLYt9W5YuWduJ+FPLbjIKynBf6JCRMWr75QAOhhhaI0tsie3eDsKQBA0w7WCuPiZiheJaL 4MDe9hcH4rM3ybnRW7K2dLszWNhHVoYSFlZGYh+MGpuODeQKDS035+4H2rEWgg+iaOwqD7bg CQXwTZ1kSrm8NxIRVD3MBtzp9SZdUHLfmBl/tLVwDSZvHZhhvJHC6Lj6VL4jPXF5K2+Nn/Su CQmEBisOmwnXZhhu8ulAZ7S2tcl94DCo60ReheDoPBU8PR2TLg8rS5f9w6mLYarvQWL7cDtT d2eX3Z6TggfNINr/RTFrrAd7NHl5h3OnlXj7PQ1f0kfufduOeCQddJN4gsQfxo/qvWVB7PaE 1WTIggPmWS+Xxijk7xG6x9McTdmGhYaPZBpAxewK8ypl5+yubVsE9yOOhKMVo9DoVCjh5To5 aph7CQWfQsV7cd9PfSJjI2lXI0dhEXhQ7lRCFpf3V3mD6CyrhpcJpV6XVGjxJvGUale7+IOp sQIbPKUHpB2F+ZUPWds9yyVxGwDxD8WLqKKy0WLIjkkSsOb9UBNzgRyzrEC9lgQ/ABEBAAGJ Ah8EGAECAAkFAlT0m5MCGwwACgkQyjiNKEaHD4nU8hAAtt0xFJAy0sOWqSmyxTc7FUcX+pbD KVyPlpl6urKKMk1XtVMUPuae/+UwvIt0urk1mXi6DnrAN50TmQqvdjcPTQ6uoZ8zjgGeASZg jj0/bJGhgUr9U7oG7Hh2F8vzpOqZrdd65MRkxmc7bWj1k81tOU2woR/Gy8xLzi0k0KUa8ueB iYOcZcIGTcs9CssVwQjYaXRoeT65LJnTxYZif2pfNxfINFzCGw42s3EtZFteczClKcVSJ1+L +QUY/J24x0/ocQX/M1PwtZbB4c/2Pg/t5FS+s6UB1Ce08xsJDcwyOPIH6O3tccZuriHgvqKP yKz/Ble76+NFlTK1mpUlfM7PVhD5XzrDUEHWRTeTJSvJ8TIPL4uyfzhjHhlkCU0mw7Pscyxn DE8G0UYMEaNgaZap8dcGMYH/96EfE5s/nTX0M6MXV0yots7U2BDb4soLCxLOJz4tAFDtNFtA wLBhXRSvWhdBJZiig/9CG3dXmKfi2H+wdUCSvEFHRpgo7GK8/Kh3vGhgKmnnxhl8ACBaGy9n fxjSxjSO6rj4/MeenmlJw1yebzkX8ZmaSi8BHe+n6jTGEFNrbiOdWpJgc5yHIZZnwXaW54QT UhhSjDL1rV2B4F28w30jYmlRmm2RdN7iCZfbyP3dvFQTzQ4ySquuPkIGcOOHrvZzxbRjzMx1 Mwqu3GQ= Message-ID: <886312e7-b526-d371-5514-a73cacdb36f4@redhat.com> Date: Mon, 9 Sep 2019 12:20:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190829141224.49700-6-jin.yu@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 09 Sep 2019 10:21:01 +0000 (UTC) Subject: Re: [dpdk-dev] [PATCH v6 05/10] vhost: checkout and cleanup the resubmit inflight information X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 8/29/19 4:12 PM, JinYu wrote: > This patch shows how to checkout the inflight ring and construct > the resubmit information also include destroying resubmit info. > > Signed-off-by: Lin Li > Signed-off-by: Xun Ni > Signed-off-by: Yu Zhang > Signed-off-by: Jin Yu > --- > lib/librte_vhost/rte_vhost.h | 19 ++++ > lib/librte_vhost/vhost.c | 29 ++++- > lib/librte_vhost/vhost.h | 9 ++ > lib/librte_vhost/vhost_user.c | 197 ++++++++++++++++++++++++++++++++++ > 4 files changed, 253 insertions(+), 1 deletion(-) > ... > +static int > +vhost_check_queue_inflights_packed(struct virtio_net *dev, > + struct vhost_virtqueue *vq) > +{ > + uint16_t i = 0; > + uint16_t resubmit_num = 0, old_used_idx, num; > + struct rte_vhost_resubmit_info *resubmit = NULL; > + struct inflight_info_packed *inflight_packed; > + > + if (!(dev->protocol_features & > + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))) > + return RTE_VHOST_MSG_RESULT_OK; > + > + if (!vq->inflight_packed->version) { > + vq->inflight_packed->version = INFLIGHT_VERSION; > + return RTE_VHOST_MSG_RESULT_OK; > + } > + > + if ((!vq->inflight_packed)) > + return RTE_VHOST_MSG_RESULT_ERR; It needs to be checked before before being dereferenced. > + > + inflight_packed = vq->inflight_packed; > + vq->resubmit_inflight = NULL; > + vq->global_counter = 0; > + old_used_idx = inflight_packed->old_used_idx; > + > + if (inflight_packed->used_idx != old_used_idx) { > + if (inflight_packed->desc[old_used_idx].inflight == 0) { > + inflight_packed->old_used_idx = > + inflight_packed->used_idx; > + inflight_packed->old_used_wrap_counter = > + inflight_packed->used_wrap_counter; > + inflight_packed->old_free_head = > + inflight_packed->free_head; > + } else { > + inflight_packed->used_idx = > + inflight_packed->old_used_idx; > + inflight_packed->used_wrap_counter = > + inflight_packed->old_used_wrap_counter; > + inflight_packed->free_head = > + inflight_packed->old_free_head; > + } > + } > + > + for (i = 0; i < inflight_packed->desc_num; i++) { > + if (inflight_packed->desc[i].inflight == 1) > + resubmit_num++; > + } > + > + if (resubmit_num) { > + resubmit = calloc(1, sizeof(struct rte_vhost_resubmit_info)); > + if (resubmit == NULL) { > + RTE_LOG(ERR, VHOST_CONFIG, > + "Failed to allocate memory for resubmit info.\n"); > + return RTE_VHOST_MSG_RESULT_ERR; > + } > + > + resubmit->resubmit_list = calloc(resubmit_num, > + sizeof(struct rte_vhost_resubmit_desc)); > + if (resubmit->resubmit_list == NULL) { > + RTE_LOG(ERR, VHOST_CONFIG, > + "Failed to allocate memory for resubmit desc.\n"); > + return RTE_VHOST_MSG_RESULT_ERR; > + } > + > + num = 0; > + for (i = 0; i < inflight_packed->desc_num; i++) { > + if (vq->inflight_packed->desc[i].inflight == 1) { > + resubmit->resubmit_list[num].index = i; > + resubmit->resubmit_list[num].counter = > + inflight_packed->desc[i].counter; > + num++; > + } > + } > + resubmit->resubmit_num = num; > + > + if (resubmit->resubmit_num > 1) > + qsort(resubmit->resubmit_list, resubmit->resubmit_num, > + sizeof(struct rte_vhost_resubmit_desc), > + resubmit_desc_compare); > + > + vq->global_counter = resubmit->resubmit_list[0].counter + 1; > + vq->resubmit_inflight = resubmit; > + } > + > + return RTE_VHOST_MSG_RESULT_OK; > +}