diff mbox

[dpdk-dev,v2] eventdev: Fix links_map initialization for sw PMD

Message ID 1488819768-9474-1-git-send-email-gage.eads@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Jerin Jacob
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Eads, Gage March 6, 2017, 5:02 p.m. UTC 
  This patch initializes the links_map array entries to
EVENT_QUEUE_SERVICE_PRIORITY_INVALID, as expected by
rte_event_port_links_get(). This is necessary for the sw eventdev PMD,
which does not initialize links_map when rte_event_port_setup() calls
rte_event_port_unlink().

Signed-off-by: Gage Eads <gage.eads@intel.com>
---
v2: Refined commit message's description of patch

 lib/librte_eventdev/rte_eventdev.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Comments

Jerin Jacob March 7, 2017, 6:12 a.m. UTC | #1 
On Mon, Mar 06, 2017 at 11:02:48AM -0600, Gage Eads wrote:

Please fix the check-git-log.sh errors with this patch. With that change,

Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>

➜ $ ./devtools/check-git-log.sh
Wrong headline format:
	eventdev: Fix links_map initialization for sw PMD
Wrong headline uppercase:
	eventdev: Fix links_map initialization for sw PMD
Wrong headline lowercase:
	eventdev: Fix links_map initialization for sw PMD
Missing 'Fixes' tag:
	eventdev: Fix links_map initialization for sw PMD



> This patch initializes the links_map array entries to
> EVENT_QUEUE_SERVICE_PRIORITY_INVALID, as expected by
> rte_event_port_links_get(). This is necessary for the sw eventdev PMD,
> which does not initialize links_map when rte_event_port_setup() calls
> rte_event_port_unlink().
> 
> Signed-off-by: Gage Eads <gage.eads@intel.com>
> ---
> v2: Refined commit message's description of patch
> 
>  lib/librte_eventdev/rte_eventdev.c | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
> index 68bfc3b..b8cd92b 100644
> --- a/lib/librte_eventdev/rte_eventdev.c
> +++ b/lib/librte_eventdev/rte_eventdev.c
> @@ -190,6 +190,8 @@ rte_event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)
>  	return 0;
>  }
>  
> +#define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)
> +
>  static inline int
>  rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
>  {
> @@ -251,6 +253,9 @@ rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
>  					"nb_ports %u", nb_ports);
>  			return -(ENOMEM);
>  		}
> +		for (i = 0; i < nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV; i++)
> +			dev->data->links_map[i] =
> +				EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
>  	} else if (dev->data->ports != NULL && nb_ports != 0) {/* re-config */
>  		RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->port_release, -ENOTSUP);
>  
> @@ -305,6 +310,10 @@ rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
>  
>  		if (nb_ports > old_nb_ports) {
>  			uint8_t new_ps = nb_ports - old_nb_ports;
> +			unsigned int old_links_map_end =
> +				old_nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV;
> +			unsigned int links_map_end =
> +				nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV;
>  
>  			memset(ports + old_nb_ports, 0,
>  				sizeof(ports[0]) * new_ps);
> @@ -312,9 +321,9 @@ rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
>  				sizeof(ports_dequeue_depth[0]) * new_ps);
>  			memset(ports_enqueue_depth + old_nb_ports, 0,
>  				sizeof(ports_enqueue_depth[0]) * new_ps);
> -			memset(links_map +
> -				(old_nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV),
> -				0, sizeof(ports_enqueue_depth[0]) * new_ps);
> +			for (i = old_links_map_end; i < links_map_end; i++)
> +				links_map[i] =
> +					EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
>  		}
>  
>  		dev->data->ports = ports;
> @@ -815,8 +824,6 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
>  	return diag;
>  }
>  
> -#define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)
> -
>  int
>  rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
>  		      uint8_t queues[], uint16_t nb_unlinks)
> -- 
> 2.7.4
>
diff mbox

Patch

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index 68bfc3b..b8cd92b 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -190,6 +190,8 @@  rte_event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)
 	return 0;
 }
 
+#define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)
+
 static inline int
 rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
 {
@@ -251,6 +253,9 @@  rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
 					"nb_ports %u", nb_ports);
 			return -(ENOMEM);
 		}
+		for (i = 0; i < nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV; i++)
+			dev->data->links_map[i] =
+				EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
 	} else if (dev->data->ports != NULL && nb_ports != 0) {/* re-config */
 		RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->port_release, -ENOTSUP);
 
@@ -305,6 +310,10 @@  rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
 
 		if (nb_ports > old_nb_ports) {
 			uint8_t new_ps = nb_ports - old_nb_ports;
+			unsigned int old_links_map_end =
+				old_nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV;
+			unsigned int links_map_end =
+				nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV;
 
 			memset(ports + old_nb_ports, 0,
 				sizeof(ports[0]) * new_ps);
@@ -312,9 +321,9 @@  rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
 				sizeof(ports_dequeue_depth[0]) * new_ps);
 			memset(ports_enqueue_depth + old_nb_ports, 0,
 				sizeof(ports_enqueue_depth[0]) * new_ps);
-			memset(links_map +
-				(old_nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV),
-				0, sizeof(ports_enqueue_depth[0]) * new_ps);
+			for (i = old_links_map_end; i < links_map_end; i++)
+				links_map[i] =
+					EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
 		}
 
 		dev->data->ports = ports;
@@ -815,8 +824,6 @@  rte_event_port_link(uint8_t dev_id, uint8_t port_id,
 	return diag;
 }
 
-#define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)
-
 int
 rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 		      uint8_t queues[], uint16_t nb_unlinks)