Skip to contentSkip to conversation

common/idpf: remove unnecessary field in vport

PATCH In review Qi Zhang 2 participants 5 messages Apr 20, 2023 – Apr 26, 2023 Network drivers

lore
Share & tools
lore

Qi Zhang

author
#0 lore raw

PATCH 1/1 common/idpf: remove unnecessary field in vport

Remove the pointer to rte_eth_dev instance, as
1. there is already a pointer to rte_eth_dev_data.
2. a pointer to rte_eth_dev will break multi-process usage.

---
 drivers/common/idpf/idpf_common_device.h | 1 -
 drivers/net/cpfl/cpfl_ethdev.c           | 4 ++--
 drivers/net/idpf/idpf_ethdev.c           | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/common/idpf/idpf_common_device.h +0 -1
index 7a54f7c937..d29bcc71ab 100644
@@ -117,7 +117,6 @@ struct idpf_vport {
 
 	struct virtchnl2_vport_stats eth_stats_offset;
 
-	void *dev;
 	/* Event from ipf */
 	bool link_up;
 	uint32_t link_speed;
drivers/net/cpfl/cpfl_ethdev.c +2 -2
index f1d4425ce2..680c2326ec 100644
@@ -1061,7 +1061,8 @@ static void
 cpfl_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t msglen)
 {
 	struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
-	struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
+	struct rte_eth_dev_data *data = vport->dev_data;
+	struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
 
 	if (msglen < sizeof(struct virtchnl2_event)) {
 		PMD_DRV_LOG(ERR, "Error event");
@@ -1245,7 +1246,6 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)
 	vport->adapter = &adapter->base;
 	vport->sw_idx = param->idx;
 	vport->devarg_id = param->devarg_id;
-	vport->dev = dev;
 
 	memset(&create_vport_info, 0, sizeof(create_vport_info));
 	ret = idpf_vport_info_init(vport, &create_vport_info);
drivers/net/idpf/idpf_ethdev.c +2 -2
index e01eb3a2ec..38ad4e7ac0 100644
@@ -1024,7 +1024,8 @@ static void
 idpf_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t msglen)
 {
 	struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
-	struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
+	struct rte_eth_dev_data *data = vport->dev_data;
+	struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
 
 	if (msglen < sizeof(struct virtchnl2_event)) {
 		PMD_DRV_LOG(ERR, "Error event");
@@ -1235,7 +1236,6 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)
 	vport->adapter = &adapter->base;
 	vport->sw_idx = param->idx;
 	vport->devarg_id = param->devarg_id;
-	vport->dev = dev;
 
 	memset(&create_vport_info, 0, sizeof(create_vport_info));
 	ret = idpf_vport_info_init(vport, &create_vport_info);
Signature · 1 line
2.31.1
#1 lore raw
Quoted 9 lines

-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Friday, April 21, 2023 12:21 AM
To: Xing, Beilei <[email protected]>
Cc: [email protected]; Zhang, Qi Z <[email protected]>
Subject: [PATCH] common/idpf: remove unnecessary field in vport

Quoted 3 lines

Remove the pointer to rte_eth_dev instance, as 1. there is already a pointer to rte_eth_dev_data.
2. a pointer to rte_eth_dev will break multi-process usage.

Basically it's OK for me, do we need to add fix line?

Quoted 69 lines
---
 drivers/common/idpf/idpf_common_device.h | 1 -
 drivers/net/cpfl/cpfl_ethdev.c           | 4 ++--
 drivers/net/idpf/idpf_ethdev.c           | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/common/idpf/idpf_common_device.h +0 -1
index 7a54f7c937..d29bcc71ab 100644
@@ -117,7 +117,6 @@ struct idpf_vport {
 
 	struct virtchnl2_vport_stats eth_stats_offset;
 
-	void *dev;
 	/* Event from ipf */
 	bool link_up;
 	uint32_t link_speed;
drivers/net/cpfl/cpfl_ethdev.c +2 -2
index f1d4425ce2..680c2326ec 100644
@@ -1061,7 +1061,8 @@ static void
 cpfl_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t
 msglen)  {
 	struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
-	struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
+	struct rte_eth_dev_data *data = vport->dev_data;
+	struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
 
 	if (msglen < sizeof(struct virtchnl2_event)) {
 		PMD_DRV_LOG(ERR, "Error event");
@@ -1245,7 +1246,6 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void
 *init_params)
 	vport->adapter = &adapter->base;
 	vport->sw_idx = param->idx;
 	vport->devarg_id = param->devarg_id;
-	vport->dev = dev;
 
 	memset(&create_vport_info, 0, sizeof(create_vport_info));

ret = idpf_vport_info_init(vport, &create_vport_info); diff --git
a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index e01eb3a2ec..38ad4e7ac0 100644

drivers/net/idpf/idpf_ethdev.c +2 -2
@@ -1024,7 +1024,8 @@ static void
 idpf_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t
 msglen)  {
 	struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
-	struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
+	struct rte_eth_dev_data *data = vport->dev_data;
+	struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
 
 	if (msglen < sizeof(struct virtchnl2_event)) {
 		PMD_DRV_LOG(ERR, "Error event");
@@ -1235,7 +1236,6 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void
 *init_params)
 	vport->adapter = &adapter->base;
 	vport->sw_idx = param->idx;
 	vport->devarg_id = param->devarg_id;
-	vport->dev = dev;
 
 	memset(&create_vport_info, 0, sizeof(create_vport_info));

ret = idpf_vport_info_init(vport, &create_vport_info);
--
2.31.1

#2 lore raw
Quoted 18 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Wednesday, April 26, 2023 2:46 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH] common/idpf: remove unnecessary field in vport

Quoted 7 lines

-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Friday, April 21, 2023 12:21 AM
To: Xing, Beilei <[email protected]>
Cc: [email protected]; Zhang, Qi Z <[email protected]>
Subject: [PATCH] common/idpf: remove unnecessary field in vport

Quoted 5 lines
Quoted 3 lines

Remove the pointer to rte_eth_dev instance, as 1. there is already a pointer to rte_eth_dev_data.
2. a pointer to rte_eth_dev will break multi-process usage.

Basically it's OK for me, do we need to add fix line?

the multi-process support has not been enabled yet, so technically this is not a fix but code refactor.

Quoted 75 lines
Quoted 75 lines
---
 drivers/common/idpf/idpf_common_device.h | 1 -
 drivers/net/cpfl/cpfl_ethdev.c           | 4 ++--
 drivers/net/idpf/idpf_ethdev.c           | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/common/idpf/idpf_common_device.h +0 -1
index 7a54f7c937..d29bcc71ab 100644
@@ -117,7 +117,6 @@ struct idpf_vport {
 
 	struct virtchnl2_vport_stats eth_stats_offset;
 
-	void *dev;
 	/* Event from ipf */
 	bool link_up;
 	uint32_t link_speed;
(quoted diff) +0 -0

b/drivers/net/cpfl/cpfl_ethdev.c index f1d4425ce2..680c2326ec 100644

drivers/net/cpfl/cpfl_ethdev.c +0 -0
@@ -1061,7 +1061,8 @@ static void
 cpfl_handle_event_msg(struct idpf_vport *vport, uint8_t *msg,

uint16_t
msglen) {

drivers/net/cpfl/cpfl_ethdev.c +2 -1
 	struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
-	struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
+	struct rte_eth_dev_data *data = vport->dev_data;
+	struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
 
 	if (msglen < sizeof(struct virtchnl2_event)) {
 		PMD_DRV_LOG(ERR, "Error event");
@@ -1245,7 +1246,6 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev,

void
*init_params)

drivers/net/cpfl/cpfl_ethdev.c +0 -1
 	vport->adapter = &adapter->base;
 	vport->sw_idx = param->idx;
 	vport->devarg_id = param->devarg_id;
-	vport->dev = dev;
 
 	memset(&create_vport_info, 0, sizeof(create_vport_info));
 	ret = idpf_vport_info_init(vport, &create_vport_info); diff --git

a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index
e01eb3a2ec..38ad4e7ac0 100644

drivers/net/idpf/idpf_ethdev.c +0 -0
@@ -1024,7 +1024,8 @@ static void
 idpf_handle_event_msg(struct idpf_vport *vport, uint8_t *msg,

uint16_t
msglen) {

drivers/net/idpf/idpf_ethdev.c +2 -1
 	struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
-	struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
+	struct rte_eth_dev_data *data = vport->dev_data;
+	struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
 
 	if (msglen < sizeof(struct virtchnl2_event)) {
 		PMD_DRV_LOG(ERR, "Error event");
@@ -1235,7 +1236,6 @@ idpf_dev_vport_init(struct rte_eth_dev *dev,

void
*init_params)

drivers/net/idpf/idpf_ethdev.c +0 -2
 	vport->adapter = &adapter->base;
 	vport->sw_idx = param->idx;
 	vport->devarg_id = param->devarg_id;
-	vport->dev = dev;
 
 	memset(&create_vport_info, 0, sizeof(create_vport_info));
 	ret = idpf_vport_info_init(vport, &create_vport_info);
--

2.31.1

Acked-by on v1 1/1
#3 lore raw
In reply to Qi Zhang
Quoted 9 lines

-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Friday, April 21, 2023 12:21 AM
To: Xing, Beilei <[email protected]>
Cc: [email protected]; Zhang, Qi Z <[email protected]>
Subject: [PATCH] common/idpf: remove unnecessary field in vport

Quoted 5 lines

Remove the pointer to rte_eth_dev instance, as 1. there is already a pointer to rte_eth_dev_data.
2. a pointer to rte_eth_dev will break multi-process usage.

author Applied
#4 lore raw
Quoted 18 lines

-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Wednesday, April 26, 2023 3:38 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH] common/idpf: remove unnecessary field in vport

Quoted 7 lines

-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Friday, April 21, 2023 12:21 AM
To: Xing, Beilei <[email protected]>
Cc: [email protected]; Zhang, Qi Z <[email protected]>
Subject: [PATCH] common/idpf: remove unnecessary field in vport

Quoted 6 lines
Quoted 5 lines

Remove the pointer to rte_eth_dev instance, as 1. there is already a pointer to rte_eth_dev_data.
2. a pointer to rte_eth_dev will break multi-process usage.

Applied to dpdk-next-net-intel.

Thanks
Qi