From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
To: "Tan, Jianfeng" <jianfeng.tan@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "Xie, Huawei" <huawei.xie@intel.com>
Subject: Re: [dpdk-dev] [PATCH v3 1/2] virtio: cleanup virtio_dev_queue_setup()
Date: Mon, 9 May 2016 11:04:28 -0700 [thread overview]
Message-ID: <20160509180428.GC5641@yliu-dev.sh.intel.com> (raw)
In-Reply-To: <ED26CBA2FAD1BF48A8719AEF02201E36032E1F2E@SHSMSX103.ccr.corp.intel.com>
On Mon, May 09, 2016 at 07:58:26AM +0000, Tan, Jianfeng wrote:
> Hi Yuanhan,
>
> > -----Original Message-----
> > From: Yuanhan Liu [mailto:yuanhan.liu@linux.intel.com]
> > Sent: Thursday, May 5, 2016 11:20 AM
> > To: Tan, Jianfeng
> > Cc: dev@dpdk.org; Xie, Huawei
> > Subject: Re: [PATCH v3 1/2] virtio: cleanup virtio_dev_queue_setup()
> >
> > On Fri, Apr 29, 2016 at 12:48:45AM +0000, Jianfeng Tan wrote:
> > > + if (queue_type < VTNET_RQ || queue_type > VTNET_CQ) {
> > > + PMD_INIT_LOG(ERR, "invalid queue type: %d", queue_type);
> > > + return -EINVAL;
> > > }
> >
> > I'm thinking this check is not necessary. We can make sure it's a valid
> > queue type.
>
> Yes, this is not necessary, and I was also entangled with whether to keep it or not. And ok, I'll send a new version with this check removed.
Not necessary; it's trivial for me to fix it while applying it. So,
this series is applied to dpdk-next-virtio, with following changes:
--yliu
---
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 6b291f5..70ee12a 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -266,7 +266,7 @@ virtio_dev_queue_release(struct virtqueue *vq)
if (vq) {
hw = vq->hw;
- if (vq->started)
+ if (vq->configured)
hw->vtpci_ops->del_queue(hw, vq);
rte_memzone_free(vq->mz);
@@ -311,11 +311,6 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
- if (queue_type < VTNET_RQ || queue_type > VTNET_CQ) {
- PMD_INIT_LOG(ERR, "invalid queue type: %d", queue_type);
- return -EINVAL;
- }
-
snprintf(vq_name, sizeof(vq_name), "port%d_%s%d",
dev->data->port_id, queue_names[queue_type], queue_idx);
vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
@@ -453,7 +448,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
hw->vtpci_ops->setup_queue(hw, vq);
- vq->started = 1;
+ vq->configured = 1;
*pvq = vq;
return 0;
}
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index 0006a29..4e543d2 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -201,7 +201,7 @@ struct virtqueue {
uint16_t *notify_addr;
- int started;
+ int configured;
struct vq_desc_extra {
void *cookie;
next prev parent reply other threads:[~2016-05-09 18:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 12:32 [dpdk-dev] [PATCH] virtio: fix memory leak of virtqueue memzones Jianfeng Tan
2016-04-27 22:37 ` Yuanhan Liu
2016-04-28 2:01 ` Tan, Jianfeng
2016-04-28 3:29 ` Yuanhan Liu
2016-04-28 19:03 ` [dpdk-dev] [PATCH v2 0/2] " Jianfeng Tan
2016-04-28 19:04 ` [dpdk-dev] [PATCH v2 1/2] virtio: cleanup virtio_dev_queue_setup() Jianfeng Tan
2016-04-28 19:04 ` [dpdk-dev] [PATCH v2 2/2] virtio: fix memory leak of virtqueue memzones Jianfeng Tan
2016-04-28 19:05 ` [dpdk-dev] [PATCH v2 0/2] " Tan, Jianfeng
2016-04-28 19:08 ` Tan, Jianfeng
2016-04-29 0:48 ` [dpdk-dev] [PATCH v3 " Jianfeng Tan
2016-04-29 0:48 ` [dpdk-dev] [PATCH v3 1/2] virtio: cleanup virtio_dev_queue_setup() Jianfeng Tan
2016-05-05 3:19 ` Yuanhan Liu
2016-05-09 7:58 ` Tan, Jianfeng
2016-05-09 18:04 ` Yuanhan Liu [this message]
2016-04-29 0:48 ` [dpdk-dev] [PATCH v3 2/2] virtio: fix memory leak of virtqueue memzones Jianfeng Tan
2016-04-29 5:33 ` Yuanhan Liu
2016-05-05 3:27 ` Yuanhan Liu
2016-05-05 4:51 ` Tan, Jianfeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160509180428.GC5641@yliu-dev.sh.intel.com \
--to=yuanhan.liu@linux.intel.com \
--cc=dev@dpdk.org \
--cc=huawei.xie@intel.com \
--cc=jianfeng.tan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).