* Re: [PATCH v3] examples/vm_power_manager: use safe version of list iterator
2022-07-08 8:51 ` [PATCH v3] " Hamza Khan
@ 2022-07-08 9:28 ` Hunt, David
2022-07-19 18:25 ` Pattan, Reshma
2022-08-22 10:58 ` [PATCH v4] " Reshma Pattan
2 siblings, 0 replies; 11+ messages in thread
From: Hunt, David @ 2022-07-08 9:28 UTC (permalink / raw)
To: Hamza Khan, dev; +Cc: alan.carew, stable
On 08/07/2022 09:51, Hamza Khan wrote:
> Currently, when vm_power_manager exits, we are using a LIST_FOREACH
> macro to iterate over VM info structures while freeing them. This
> leads to use-after-free error. To address this, replace all usages of
> LIST_* with TAILQ_* macros, and use the RTE_TAILQ_FOREACH_SAFE macro
> to iterate and delete VM info structures.
>
> * The change is small and doesn’t affect other code
> * Testing was performed on the patch
>
> Fixes: e8ae9b662506 ("examples/vm_power: channel manager and monitor in host")
> Cc: alan.carew@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Hamza Khan <hamza.khan@intel.com>
>
> ---
> V3: Update commit message
> V2: Use RTE_TAILQ_* marcos
> ---
> examples/vm_power_manager/channel_manager.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
> index 838465ab4b..e82c26ddca 100644
> --- a/examples/vm_power_manager/channel_manager.c
> +++ b/examples/vm_power_manager/channel_manager.c
> @@ -29,6 +29,8 @@
> #include "channel_monitor.h"
> #include "power_manager.h"
>
> +#include "rte_tailq.h"
> +
>
> #define RTE_LOGTYPE_CHANNEL_MANAGER RTE_LOGTYPE_USER1
>
> @@ -58,16 +60,16 @@ struct virtual_machine_info {
> virDomainInfo info;
> rte_spinlock_t config_spinlock;
> int allow_query;
> - LIST_ENTRY(virtual_machine_info) vms_info;
> + RTE_TAILQ_ENTRY(virtual_machine_info) vms_info;
> };
>
> -LIST_HEAD(, virtual_machine_info) vm_list_head;
> +RTE_TAILQ_HEAD(, virtual_machine_info) vm_list_head;
>
> static struct virtual_machine_info *
> find_domain_by_name(const char *name)
> {
> struct virtual_machine_info *info;
> - LIST_FOREACH(info, &vm_list_head, vms_info) {
> + RTE_TAILQ_FOREACH(info, &vm_list_head, vms_info) {
> if (!strncmp(info->name, name, CHANNEL_MGR_MAX_NAME_LEN-1))
> return info;
> }
> @@ -878,7 +880,7 @@ add_vm(const char *vm_name)
>
> new_domain->allow_query = 0;
> rte_spinlock_init(&(new_domain->config_spinlock));
> - LIST_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
> + TAILQ_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
> return 0;
> }
>
> @@ -900,7 +902,7 @@ remove_vm(const char *vm_name)
> rte_spinlock_unlock(&vm_info->config_spinlock);
> return -1;
> }
> - LIST_REMOVE(vm_info, vms_info);
> + TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
> rte_spinlock_unlock(&vm_info->config_spinlock);
> rte_free(vm_info);
> return 0;
> @@ -953,7 +955,7 @@ channel_manager_init(const char *path __rte_unused)
> {
> virNodeInfo info;
>
> - LIST_INIT(&vm_list_head);
> + TAILQ_INIT(&vm_list_head);
> if (connect_hypervisor(path) < 0) {
> global_n_host_cpus = 64;
> global_hypervisor_available = 0;
> @@ -1005,9 +1007,9 @@ channel_manager_exit(void)
> {
> unsigned i;
> char mask[RTE_MAX_LCORE];
> - struct virtual_machine_info *vm_info;
> + struct virtual_machine_info *vm_info, *tmp;
>
> - LIST_FOREACH(vm_info, &vm_list_head, vms_info) {
> + RTE_TAILQ_FOREACH_SAFE(vm_info, &vm_list_head, vms_info, tmp) {
>
> rte_spinlock_lock(&(vm_info->config_spinlock));
>
> @@ -1022,7 +1024,7 @@ channel_manager_exit(void)
> }
> rte_spinlock_unlock(&(vm_info->config_spinlock));
>
> - LIST_REMOVE(vm_info, vms_info);
> + TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
> rte_free(vm_info);
> }
>
Acked-by: David Hunt <david.hunt@intel.com>
^ permalink raw reply [flat|nested] 11+ messages in thread* RE: [PATCH v3] examples/vm_power_manager: use safe version of list iterator
2022-07-08 8:51 ` [PATCH v3] " Hamza Khan
2022-07-08 9:28 ` Hunt, David
@ 2022-07-19 18:25 ` Pattan, Reshma
2022-08-22 10:58 ` [PATCH v4] " Reshma Pattan
2 siblings, 0 replies; 11+ messages in thread
From: Pattan, Reshma @ 2022-07-19 18:25 UTC (permalink / raw)
To: Khan, Hamza, dev; +Cc: Hunt, David, Khan, Hamza, Carew, Alan, stable
> -----Original Message-----
> From: Hamza Khan <hamza.khan@intel.com>
<snip>
> +#include "rte_tailq.h"
Should include this as #include <rte_tailq.h>
Otherwise looks good. If you are sending next version, include my Ack in the patch.
Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.cm>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v4] examples/vm_power_manager: use safe version of list iterator
2022-07-08 8:51 ` [PATCH v3] " Hamza Khan
2022-07-08 9:28 ` Hunt, David
2022-07-19 18:25 ` Pattan, Reshma
@ 2022-08-22 10:58 ` Reshma Pattan
2022-08-22 11:29 ` Hunt, David
2022-10-04 22:09 ` [PATCH v5] " Reshma Pattan
2 siblings, 2 replies; 11+ messages in thread
From: Reshma Pattan @ 2022-08-22 10:58 UTC (permalink / raw)
To: dev, david.hunt
Cc: Hamza Khan, alan.carew, stable, Reshma Pattan, Reshma Pattan
From: Hamza Khan <hamza.khan@intel.com>
Currently, when vm_power_manager exits, we are using a LIST_FOREACH
macro to iterate over VM info structures while freeing them. This
leads to use-after-free error. To address this, replace all usages of
LIST_* with TAILQ_* macros, and use the RTE_TAILQ_FOREACH_SAFE macro
to iterate and delete VM info structures.
* The change is small and doesn’t affect other code
* Testing was performed on the patch
Fixes: e8ae9b662506 ("examples/vm_power: channel manager and monitor in host")
Cc: alan.carew@intel.com
Cc: stable@dpdk.org
Signed-off-by: Hamza Khan <hamza.khan@intel.com>
Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.cm>
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
---
v4: fix header file inclusion
---
examples/vm_power_manager/channel_manager.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
index 838465ab4b..cb872ad2d5 100644
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -22,6 +22,7 @@
#include <rte_mempool.h>
#include <rte_log.h>
#include <rte_spinlock.h>
+#include <rte_tailq.h>
#include <libvirt/libvirt.h>
@@ -30,6 +31,7 @@
#include "power_manager.h"
+
#define RTE_LOGTYPE_CHANNEL_MANAGER RTE_LOGTYPE_USER1
struct libvirt_vm_info lvm_info[MAX_CLIENTS];
@@ -58,16 +60,16 @@ struct virtual_machine_info {
virDomainInfo info;
rte_spinlock_t config_spinlock;
int allow_query;
- LIST_ENTRY(virtual_machine_info) vms_info;
+ RTE_TAILQ_ENTRY(virtual_machine_info) vms_info;
};
-LIST_HEAD(, virtual_machine_info) vm_list_head;
+RTE_TAILQ_HEAD(, virtual_machine_info) vm_list_head;
static struct virtual_machine_info *
find_domain_by_name(const char *name)
{
struct virtual_machine_info *info;
- LIST_FOREACH(info, &vm_list_head, vms_info) {
+ RTE_TAILQ_FOREACH(info, &vm_list_head, vms_info) {
if (!strncmp(info->name, name, CHANNEL_MGR_MAX_NAME_LEN-1))
return info;
}
@@ -878,7 +880,7 @@ add_vm(const char *vm_name)
new_domain->allow_query = 0;
rte_spinlock_init(&(new_domain->config_spinlock));
- LIST_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
+ TAILQ_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
return 0;
}
@@ -900,7 +902,7 @@ remove_vm(const char *vm_name)
rte_spinlock_unlock(&vm_info->config_spinlock);
return -1;
}
- LIST_REMOVE(vm_info, vms_info);
+ TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
rte_spinlock_unlock(&vm_info->config_spinlock);
rte_free(vm_info);
return 0;
@@ -953,7 +955,7 @@ channel_manager_init(const char *path __rte_unused)
{
virNodeInfo info;
- LIST_INIT(&vm_list_head);
+ TAILQ_INIT(&vm_list_head);
if (connect_hypervisor(path) < 0) {
global_n_host_cpus = 64;
global_hypervisor_available = 0;
@@ -1005,9 +1007,9 @@ channel_manager_exit(void)
{
unsigned i;
char mask[RTE_MAX_LCORE];
- struct virtual_machine_info *vm_info;
+ struct virtual_machine_info *vm_info, *tmp;
- LIST_FOREACH(vm_info, &vm_list_head, vms_info) {
+ RTE_TAILQ_FOREACH_SAFE(vm_info, &vm_list_head, vms_info, tmp) {
rte_spinlock_lock(&(vm_info->config_spinlock));
@@ -1022,7 +1024,7 @@ channel_manager_exit(void)
}
rte_spinlock_unlock(&(vm_info->config_spinlock));
- LIST_REMOVE(vm_info, vms_info);
+ TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
rte_free(vm_info);
}
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v4] examples/vm_power_manager: use safe version of list iterator
2022-08-22 10:58 ` [PATCH v4] " Reshma Pattan
@ 2022-08-22 11:29 ` Hunt, David
2022-10-04 22:09 ` [PATCH v5] " Reshma Pattan
1 sibling, 0 replies; 11+ messages in thread
From: Hunt, David @ 2022-08-22 11:29 UTC (permalink / raw)
To: Reshma Pattan, dev; +Cc: Hamza Khan, alan.carew, stable, Reshma Pattan
On 22/08/2022 11:58, Reshma Pattan wrote:
> From: Hamza Khan <hamza.khan@intel.com>
>
> Currently, when vm_power_manager exits, we are using a LIST_FOREACH
> macro to iterate over VM info structures while freeing them. This
> leads to use-after-free error. To address this, replace all usages of
> LIST_* with TAILQ_* macros, and use the RTE_TAILQ_FOREACH_SAFE macro
> to iterate and delete VM info structures.
>
> * The change is small and doesn’t affect other code
> * Testing was performed on the patch
>
> Fixes: e8ae9b662506 ("examples/vm_power: channel manager and monitor in host")
> Cc: alan.carew@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Hamza Khan <hamza.khan@intel.com>
> Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
> Acked-by: Reshma Pattan <reshma.pattan@intel.cm>
> Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
> ---
> v4: fix header file inclusion
> ---
--snip--
Acked-by: David Hunt <david.hunt@intel.com>
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v5] examples/vm_power_manager: use safe version of list iterator
2022-08-22 10:58 ` [PATCH v4] " Reshma Pattan
2022-08-22 11:29 ` Hunt, David
@ 2022-10-04 22:09 ` Reshma Pattan
2022-10-05 10:17 ` Thomas Monjalon
1 sibling, 1 reply; 11+ messages in thread
From: Reshma Pattan @ 2022-10-04 22:09 UTC (permalink / raw)
To: dev; +Cc: Hamza Khan, alan.carew, stable, Reshma Pattan, David Hunt
From: Hamza Khan <hamza.khan@intel.com>
Currently, when vm_power_manager exits, we are using a LIST_FOREACH
macro to iterate over VM info structures while freeing them. This
leads to use-after-free error. To address this, replace all usages of
LIST_* with TAILQ_* macros, and use the RTE_TAILQ_FOREACH_SAFE macro
to iterate and delete VM info structures.
Fixes: e8ae9b662506 ("examples/vm_power: channel manager and monitor in host")
Cc: alan.carew@intel.com
Cc: stable@dpdk.org
Signed-off-by: Hamza Khan <hamza.khan@intel.com>
Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
examples/vm_power_manager/channel_manager.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
index 838465ab4b..cb872ad2d5 100644
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -22,6 +22,7 @@
#include <rte_mempool.h>
#include <rte_log.h>
#include <rte_spinlock.h>
+#include <rte_tailq.h>
#include <libvirt/libvirt.h>
@@ -30,6 +31,7 @@
#include "power_manager.h"
+
#define RTE_LOGTYPE_CHANNEL_MANAGER RTE_LOGTYPE_USER1
struct libvirt_vm_info lvm_info[MAX_CLIENTS];
@@ -58,16 +60,16 @@ struct virtual_machine_info {
virDomainInfo info;
rte_spinlock_t config_spinlock;
int allow_query;
- LIST_ENTRY(virtual_machine_info) vms_info;
+ RTE_TAILQ_ENTRY(virtual_machine_info) vms_info;
};
-LIST_HEAD(, virtual_machine_info) vm_list_head;
+RTE_TAILQ_HEAD(, virtual_machine_info) vm_list_head;
static struct virtual_machine_info *
find_domain_by_name(const char *name)
{
struct virtual_machine_info *info;
- LIST_FOREACH(info, &vm_list_head, vms_info) {
+ RTE_TAILQ_FOREACH(info, &vm_list_head, vms_info) {
if (!strncmp(info->name, name, CHANNEL_MGR_MAX_NAME_LEN-1))
return info;
}
@@ -878,7 +880,7 @@ add_vm(const char *vm_name)
new_domain->allow_query = 0;
rte_spinlock_init(&(new_domain->config_spinlock));
- LIST_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
+ TAILQ_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
return 0;
}
@@ -900,7 +902,7 @@ remove_vm(const char *vm_name)
rte_spinlock_unlock(&vm_info->config_spinlock);
return -1;
}
- LIST_REMOVE(vm_info, vms_info);
+ TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
rte_spinlock_unlock(&vm_info->config_spinlock);
rte_free(vm_info);
return 0;
@@ -953,7 +955,7 @@ channel_manager_init(const char *path __rte_unused)
{
virNodeInfo info;
- LIST_INIT(&vm_list_head);
+ TAILQ_INIT(&vm_list_head);
if (connect_hypervisor(path) < 0) {
global_n_host_cpus = 64;
global_hypervisor_available = 0;
@@ -1005,9 +1007,9 @@ channel_manager_exit(void)
{
unsigned i;
char mask[RTE_MAX_LCORE];
- struct virtual_machine_info *vm_info;
+ struct virtual_machine_info *vm_info, *tmp;
- LIST_FOREACH(vm_info, &vm_list_head, vms_info) {
+ RTE_TAILQ_FOREACH_SAFE(vm_info, &vm_list_head, vms_info, tmp) {
rte_spinlock_lock(&(vm_info->config_spinlock));
@@ -1022,7 +1024,7 @@ channel_manager_exit(void)
}
rte_spinlock_unlock(&(vm_info->config_spinlock));
- LIST_REMOVE(vm_info, vms_info);
+ TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
rte_free(vm_info);
}
--
2.31.1
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v5] examples/vm_power_manager: use safe version of list iterator
2022-10-04 22:09 ` [PATCH v5] " Reshma Pattan
@ 2022-10-05 10:17 ` Thomas Monjalon
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Monjalon @ 2022-10-05 10:17 UTC (permalink / raw)
To: Reshma Pattan; +Cc: dev, Hamza Khan, stable, David Hunt, bruce.richardson
05/10/2022 00:09, Reshma Pattan:
> From: Hamza Khan <hamza.khan@intel.com>
>
> Currently, when vm_power_manager exits, we are using a LIST_FOREACH
> macro to iterate over VM info structures while freeing them. This
> leads to use-after-free error. To address this, replace all usages of
> LIST_* with TAILQ_* macros, and use the RTE_TAILQ_FOREACH_SAFE macro
> to iterate and delete VM info structures.
>
> Fixes: e8ae9b662506 ("examples/vm_power: channel manager and monitor in host")
> Cc: alan.carew@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Hamza Khan <hamza.khan@intel.com>
> Signed-off-by: Reshma Pattan <reshma.pattan@intel.com>
> Acked-by: David Hunt <david.hunt@intel.com>
> ---
> examples/vm_power_manager/channel_manager.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
> index 838465ab4b..cb872ad2d5 100644
> --- a/examples/vm_power_manager/channel_manager.c
> +++ b/examples/vm_power_manager/channel_manager.c
> @@ -22,6 +22,7 @@
> #include <rte_mempool.h>
> #include <rte_log.h>
> #include <rte_spinlock.h>
> +#include <rte_tailq.h>
>
> #include <libvirt/libvirt.h>
>
> @@ -30,6 +31,7 @@
> #include "power_manager.h"
>
>
> +
> #define RTE_LOGTYPE_CHANNEL_MANAGER RTE_LOGTYPE_USER1
I suppose we don't need a third blank line here.
Removing.
[...]
> - LIST_FOREACH(vm_info, &vm_list_head, vms_info) {
> + RTE_TAILQ_FOREACH_SAFE(vm_info, &vm_list_head, vms_info, tmp) {
Applied, thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread