From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9FBF94551F; Fri, 28 Jun 2024 10:07:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D80440EF0; Fri, 28 Jun 2024 10:07:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2442740E96 for ; Fri, 28 Jun 2024 10:07:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719562054; 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:autocrypt:autocrypt; bh=m8qLzyqqJDv3Q8QYYsEdEGcmBbv42qc/O11IeUGs1AQ=; b=a/C5ACG5TSJAxagLCXSMb2Cg6QpPMa6RgNMQCrAavZTPobUOInne8CcyxGSV8dj2J7jBlw my89xGeUzkkECIfh39mgcqIn+zPq9oJm26HgwEKQ4P2gWMPPfIPXIum2OubUJlzvWxMxEk 1ctIk1SdVdiSx5R8Xpr7gkrKfxF8kl0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-680-hD26iKFsO0GsTc0X18PanA-1; Fri, 28 Jun 2024 04:07:30 -0400 X-MC-Unique: hD26iKFsO0GsTc0X18PanA-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C79341945111; Fri, 28 Jun 2024 08:07:28 +0000 (UTC) Received: from [10.39.208.42] (unknown [10.39.208.42]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E45C93000225; Fri, 28 Jun 2024 08:07:26 +0000 (UTC) Message-ID: Date: Fri, 28 Jun 2024 10:07:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 1/3] net/virtio_user: avoid cq descriptor buffer address accessing To: Srujana Challa , dev@dpdk.org, chenbox@nvidia.com Cc: jerinj@marvell.com, ndabilpuram@marvell.com, vattunuru@marvell.com References: <20240229132919.2186118-1-schalla@marvell.com> <20240229132919.2186118-2-schalla@marvell.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= xsFNBFOEQQIBEADjNLYZZqghYuWv1nlLisptPJp+TSxE/KuP7x47e1Gr5/oMDJ1OKNG8rlNg kLgBQUki3voWhUbMb69ybqdMUHOl21DGCj0BTU3lXwapYXOAnsh8q6RRM+deUpasyT+Jvf3a gU35dgZcomRh5HPmKMU4KfeA38cVUebsFec1HuJAWzOb/UdtQkYyZR4rbzw8SbsOemtMtwOx YdXodneQD7KuRU9IhJKiEfipwqk2pufm2VSGl570l5ANyWMA/XADNhcEXhpkZ1Iwj3TWO7XR uH4xfvPl8nBsLo/EbEI7fbuUULcAnHfowQslPUm6/yaGv6cT5160SPXT1t8U9QDO6aTSo59N jH519JS8oeKZB1n1eLDslCfBpIpWkW8ZElGkOGWAN0vmpLfdyiqBNNyS3eGAfMkJ6b1A24un /TKc6j2QxM0QK4yZGfAxDxtvDv9LFXec8ENJYsbiR6WHRHq7wXl/n8guyh5AuBNQ3LIK44x0 KjGXP1FJkUhUuruGyZsMrDLBRHYi+hhDAgRjqHgoXi5XGETA1PAiNBNnQwMf5aubt+mE2Q5r qLNTgwSo2dpTU3+mJ3y3KlsIfoaxYI7XNsPRXGnZi4hbxmeb2NSXgdCXhX3nELUNYm4ArKBP LugOIT/zRwk0H0+RVwL2zHdMO1Tht1UOFGfOZpvuBF60jhMzbQARAQABzSxNYXhpbWUgQ29x dWVsaW4gPG1heGltZS5jb3F1ZWxpbkByZWRoYXQuY29tPsLBeAQTAQIAIgUCV3u/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 TGDSp2rmWGJjASrOwU0EVPSbkwEQAMkaNc084Qvql+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/ABEBAAHC wV8EGAECAAkFAlT0m5MCGwwACgkQyjiNKEaHD4nU8hAAtt0xFJAy0sOWqSmyxTc7FUcX+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= In-Reply-To: <20240229132919.2186118-2-schalla@marvell.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On 2/29/24 14:29, Srujana Challa wrote: > This patch makes changes to avoid descriptor buffer address > accessing while processing shadow control queue. > So that Virtio-user can work with having IOVA as descriptor > buffer address. > > Signed-off-by: Srujana Challa > --- > .../net/virtio/virtio_user/virtio_user_dev.c | 68 +++++++++---------- > 1 file changed, 33 insertions(+), 35 deletions(-) > > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c > index d395fc1676..bf3da4340f 100644 > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c > @@ -885,11 +885,11 @@ static uint32_t > virtio_user_handle_ctrl_msg_split(struct virtio_user_dev *dev, struct vring *vring, > uint16_t idx_hdr) > { > - struct virtio_net_ctrl_hdr *hdr; > virtio_net_ctrl_ack status = ~0; > - uint16_t i, idx_data, idx_status; > + uint16_t i, idx_data; > uint32_t n_descs = 0; > int dlen[CVQ_MAX_DATA_DESCS], nb_dlen = 0; > + struct virtio_pmd_ctrl *ctrl; > > /* locate desc for header, data, and status */ > idx_data = vring->desc[idx_hdr].next; > @@ -902,34 +902,33 @@ virtio_user_handle_ctrl_msg_split(struct virtio_user_dev *dev, struct vring *vri > n_descs++; > } > > - /* locate desc for status */ > - idx_status = i; > n_descs++; > > - hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr; > - if (hdr->class == VIRTIO_NET_CTRL_MQ && > - hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > - uint16_t queues; > + /* Access control command via VA from CVQ */ > + ctrl = (struct virtio_pmd_ctrl *)dev->hw.cvq->hdr_mz->addr; > + if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > + uint16_t *queues; This is not future proof, as it just discards the index and assume the buffer will always be at the same place. We should find a way to perform the desc address translation. > > - queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr; > - status = virtio_user_handle_mq(dev, queues); > - } else if (hdr->class == VIRTIO_NET_CTRL_MQ && hdr->cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > + queues = (uint16_t *)ctrl->data; > + status = virtio_user_handle_mq(dev, *queues); > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > struct virtio_net_ctrl_rss *rss; > > - rss = (struct virtio_net_ctrl_rss *)(uintptr_t)vring->desc[idx_data].addr; > + rss = (struct virtio_net_ctrl_rss *)ctrl->data; > status = virtio_user_handle_mq(dev, rss->max_tx_vq); > - } else if (hdr->class == VIRTIO_NET_CTRL_RX || > - hdr->class == VIRTIO_NET_CTRL_MAC || > - hdr->class == VIRTIO_NET_CTRL_VLAN) { > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX || > + ctrl->hdr.class == VIRTIO_NET_CTRL_MAC || > + ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) { > status = 0; > } > > if (!status && dev->scvq) > - status = virtio_send_command(&dev->scvq->cq, > - (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen); > + status = virtio_send_command(&dev->scvq->cq, ctrl, dlen, nb_dlen); > > /* Update status */ > - *(virtio_net_ctrl_ack *)(uintptr_t)vring->desc[idx_status].addr = status; > + ctrl->status = status; > > return n_descs; > } > @@ -948,7 +947,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev, > struct vring_packed *vring, > uint16_t idx_hdr) > { > - struct virtio_net_ctrl_hdr *hdr; > + struct virtio_pmd_ctrl *ctrl; > virtio_net_ctrl_ack status = ~0; > uint16_t idx_data, idx_status; > /* initialize to one, header is first */ > @@ -971,32 +970,31 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev, > n_descs++; > } > > - hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr; > - if (hdr->class == VIRTIO_NET_CTRL_MQ && > - hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > - uint16_t queues; > + /* Access control command via VA from CVQ */ > + ctrl = (struct virtio_pmd_ctrl *)dev->hw.cvq->hdr_mz->addr; > + if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) { > + uint16_t *queues; > > - queues = *(uint16_t *)(uintptr_t) > - vring->desc[idx_data].addr; > - status = virtio_user_handle_mq(dev, queues); > - } else if (hdr->class == VIRTIO_NET_CTRL_MQ && hdr->cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > + queues = (uint16_t *)ctrl->data; > + status = virtio_user_handle_mq(dev, *queues); > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ && > + ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_RSS_CONFIG) { > struct virtio_net_ctrl_rss *rss; > > - rss = (struct virtio_net_ctrl_rss *)(uintptr_t)vring->desc[idx_data].addr; > + rss = (struct virtio_net_ctrl_rss *)ctrl->data; > status = virtio_user_handle_mq(dev, rss->max_tx_vq); > - } else if (hdr->class == VIRTIO_NET_CTRL_RX || > - hdr->class == VIRTIO_NET_CTRL_MAC || > - hdr->class == VIRTIO_NET_CTRL_VLAN) { > + } else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX || > + ctrl->hdr.class == VIRTIO_NET_CTRL_MAC || > + ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) { > status = 0; > } > > if (!status && dev->scvq) > - status = virtio_send_command(&dev->scvq->cq, > - (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen); > + status = virtio_send_command(&dev->scvq->cq, ctrl, dlen, nb_dlen); > > /* Update status */ > - *(virtio_net_ctrl_ack *)(uintptr_t) > - vring->desc[idx_status].addr = status; > + ctrl->status = status; > > /* Update used descriptor */ > vring->desc[idx_hdr].id = vring->desc[idx_status].id;