* [dpdk-dev] [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user
@ 2021-02-01 17:46 David Marchand
2021-03-17 20:04 ` Maxime Coquelin
2021-03-31 8:41 ` Xia, Chenbo
0 siblings, 2 replies; 4+ messages in thread
From: David Marchand @ 2021-02-01 17:46 UTC (permalink / raw)
To: dev; +Cc: Maxime Coquelin, Chenbo Xia
The private virtio_user_dev structure embeds a virtio_hw which itself
contains the ethdev port_id.
Make use of it and remove the duplicate port_id field.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
Posting this cleanup that I caught when reviewing/discussing the port_id
fix from Maxime.
It can wait 21.05.
---
drivers/net/virtio/virtio_user/vhost_user.c | 3 ++-
drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 +++---
drivers/net/virtio/virtio_user/virtio_user_dev.h | 1 -
drivers/net/virtio/virtio_user_ethdev.c | 1 -
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index ec2c53c8fb..18ae29eed2 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -950,7 +950,8 @@ vhost_user_update_link_state(struct virtio_user_dev *dev)
r = recv(data->vhostfd, buf, 128, MSG_PEEK);
if (r == 0 || (r < 0 && errno != EAGAIN)) {
dev->net_status &= (~VIRTIO_NET_S_LINK_UP);
- PMD_DRV_LOG(ERR, "virtio-user port %u is down", dev->port_id);
+ PMD_DRV_LOG(ERR, "virtio-user port %u is down",
+ dev->hw.port_id);
/* This function could be called in the process
* of interrupt handling, callback cannot be
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 1b54d55bd8..2255c99a36 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -340,7 +340,7 @@ static int
virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
{
uint32_t i;
- struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
+ struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->hw.port_id];
if (!eth_dev->intr_handle) {
eth_dev->intr_handle = malloc(sizeof(*eth_dev->intr_handle));
@@ -888,7 +888,7 @@ void
virtio_user_dev_delayed_handler(void *param)
{
struct virtio_user_dev *dev = param;
- struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
+ struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->hw.port_id];
if (rte_intr_disable(eth_dev->intr_handle) < 0) {
PMD_DRV_LOG(ERR, "interrupt disable failed");
@@ -913,7 +913,7 @@ int
virtio_user_dev_server_reconnect(struct virtio_user_dev *dev)
{
int ret, old_status;
- struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
+ struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->hw.port_id];
struct virtio_hw *hw = &dev->hw;
if (!dev->ops->server_reconnect) {
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index 8a62f7ea79..7fd4622f01 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -43,7 +43,6 @@ struct virtio_user_dev {
uint64_t unsupported_features; /* unsupported features mask */
uint8_t status;
uint16_t net_status;
- uint16_t port_id;
uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
char path[PATH_MAX];
char *ifname;
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 1810a54694..fb1fe355d3 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -428,7 +428,6 @@ virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev)
hw = &dev->hw;
hw->port_id = data->port_id;
- dev->port_id = data->port_id;
VIRTIO_OPS(hw) = &virtio_user_ops;
hw->intr_lsc = 1;
--
2.23.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user
2021-02-01 17:46 [dpdk-dev] [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user David Marchand
@ 2021-03-17 20:04 ` Maxime Coquelin
2021-03-18 12:32 ` David Marchand
2021-03-31 8:41 ` Xia, Chenbo
1 sibling, 1 reply; 4+ messages in thread
From: Maxime Coquelin @ 2021-03-17 20:04 UTC (permalink / raw)
To: David Marchand, dev; +Cc: Chenbo Xia
On 2/1/21 6:46 PM, David Marchand wrote:
> The private virtio_user_dev structure embeds a virtio_hw which itself
> contains the ethdev port_id.
> Make use of it and remove the duplicate port_id field.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> Posting this cleanup that I caught when reviewing/discussing the port_id
> fix from Maxime.
> It can wait 21.05.
>
> ---
> drivers/net/virtio/virtio_user/vhost_user.c | 3 ++-
> drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 +++---
> drivers/net/virtio/virtio_user/virtio_user_dev.h | 1 -
> drivers/net/virtio/virtio_user_ethdev.c | 1 -
> 4 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
> index ec2c53c8fb..18ae29eed2 100644
> --- a/drivers/net/virtio/virtio_user/vhost_user.c
> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> @@ -950,7 +950,8 @@ vhost_user_update_link_state(struct virtio_user_dev *dev)
> r = recv(data->vhostfd, buf, 128, MSG_PEEK);
> if (r == 0 || (r < 0 && errno != EAGAIN)) {
> dev->net_status &= (~VIRTIO_NET_S_LINK_UP);
> - PMD_DRV_LOG(ERR, "virtio-user port %u is down", dev->port_id);
> + PMD_DRV_LOG(ERR, "virtio-user port %u is down",
> + dev->hw.port_id);
Trivial, but it can fit in a single line, as IIRC, we can go up to 100
chars now. If you agree, we can fix it while applying, no need to
resubmit.
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user
2021-03-17 20:04 ` Maxime Coquelin
@ 2021-03-18 12:32 ` David Marchand
0 siblings, 0 replies; 4+ messages in thread
From: David Marchand @ 2021-03-18 12:32 UTC (permalink / raw)
To: Maxime Coquelin; +Cc: dev, Chenbo Xia
On Wed, Mar 17, 2021 at 9:04 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
> > diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
> > index ec2c53c8fb..18ae29eed2 100644
> > --- a/drivers/net/virtio/virtio_user/vhost_user.c
> > +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> > @@ -950,7 +950,8 @@ vhost_user_update_link_state(struct virtio_user_dev *dev)
> > r = recv(data->vhostfd, buf, 128, MSG_PEEK);
> > if (r == 0 || (r < 0 && errno != EAGAIN)) {
> > dev->net_status &= (~VIRTIO_NET_S_LINK_UP);
> > - PMD_DRV_LOG(ERR, "virtio-user port %u is down", dev->port_id);
> > + PMD_DRV_LOG(ERR, "virtio-user port %u is down",
> > + dev->hw.port_id);
>
> Trivial, but it can fit in a single line, as IIRC, we can go up to 100
> chars now. If you agree, we can fix it while applying, no need to
> resubmit.
Yep, ok for me, thanks.
--
David Marchand
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user
2021-02-01 17:46 [dpdk-dev] [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user David Marchand
2021-03-17 20:04 ` Maxime Coquelin
@ 2021-03-31 8:41 ` Xia, Chenbo
1 sibling, 0 replies; 4+ messages in thread
From: Xia, Chenbo @ 2021-03-31 8:41 UTC (permalink / raw)
To: David Marchand, dev; +Cc: Maxime Coquelin
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Tuesday, February 2, 2021 1:46 AM
> To: dev@dpdk.org
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>; Xia, Chenbo
> <chenbo.xia@intel.com>
> Subject: [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user
>
> The private virtio_user_dev structure embeds a virtio_hw which itself
> contains the ethdev port_id.
> Make use of it and remove the duplicate port_id field.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> --
> 2.23.0
Add Maxime's suggested fix and change 'virtio_user' to 'virtio-user' to avoid
check-git-log error.
With above fixed, patch applied to next-virtio/main. Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-31 8:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 17:46 [dpdk-dev] [PATCH 21.05] net/virtio: remove duplicate port id from virtio_user David Marchand
2021-03-17 20:04 ` Maxime Coquelin
2021-03-18 12:32 ` David Marchand
2021-03-31 8:41 ` Xia, Chenbo
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).