power: add fifo per core for JSON interface
cover power: add fifo per core for JSON interface
This patch implement a separate FIFO for each cpu core. Dependency to commit: 5c7c96571b7b7051ecc286f36be0b3d95b49995e (power: update for handling fifo path string).
Lukasz Krakowiak (2):
power: add fifo per core for JSON interface
doc: update according to the fifo per core impl
.../sample_app_ug/vm_power_management.rst | 53 +++-------- examples/vm_power_manager/channel_manager.c | 85 +++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++------ examples/vm_power_manager/main.c | 2 +- 5 files changed, 140 insertions(+), 98 deletions(-)
Signature · 1 line
2.19.2.windows.1
PATCH 1/2 power: add fifo per core for JSON interface
This patch implement a separate FIFO for each cpu core. For proper handling JSON interface, removed fields from cmds:core_list, resource_id, name.
--- examples/vm_power_manager/channel_manager.c | 85 +++++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++++------ examples/vm_power_manager/main.c | 2 +- 4 files changed, 129 insertions(+), 56 deletions(-)
examples/vm_power_manager/channel_manager.c +58 -27
@@ -345,10 +345,22 @@ setup_channel_info(struct virtual_machine_info **vm_info_dptr,return 0 ; } -static void -fifo_path (char *dst,unsigned int len) +static int +fifo_path (char *dst,unsigned int len,unsigned int id) { -snprintf (dst, len,"%sfifo" ,CHANNEL_MGR_SOCKET_PATH ); +int cnt; + + cnt =snprintf (dst, len,"%s%s%d" ,CHANNEL_MGR_SOCKET_PATH , +CHANNEL_MGR_FIFO_PATTERN_NAME , id); + +if ((cnt <0 ) || (cnt > (int )len -1 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Could not create proper " +"string for fifo path\n" ); + +return -1 ; + } + +return 0 ; } static int
@@ -534,40 +546,59 @@ add_channels(const char *vm_name, unsigned *channel_list, }int -add_host_channel (void ) +add_host_channels (void ) {struct channel_info *chan_info;char socket_path[PATH_MAX ];int num_channels_enabled =0 ;int ret; +struct core_info *ci; -fifo_path (socket_path,sizeof (socket_path)); - - ret =mkfifo (socket_path,0660 ); -if ((errno !=EEXIST ) && (ret <0 )) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " -"%s\n" , socket_path,strerror (errno)); + ci =get_core_info (); +if (ci ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot allocate memory for core_info\n" );return 0 ; } -if (access (socket_path,F_OK ) <0 ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " -"%s\n" , socket_path,strerror (errno)); -return 0 ; - } - chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); -if (chan_info ==NULL ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " -"channel '%s'\n" , socket_path); -return 0 ; - } -rte_strlcpy (chan_info->channel_path, socket_path,UNIX_PATH_MAX ); +do { +if (ci->cd[num_channels_enabled].global_enabled_cpus ==0 ) +continue ; -if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; - } - num_channels_enabled++; + ret =fifo_path (socket_path,sizeof (socket_path), + num_channels_enabled); +if (ret <0 ) +return 0 ; + + ret =mkfifo (socket_path,0660 ); +RTE_LOG (DEBUG ,CHANNEL_MANAGER ,"TRY CREATE fifo '%s'\n" , + socket_path); +if ((errno !=EEXIST ) && (ret <0 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + +if (access (socket_path,F_OK ) <0 ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " +"channel '%s'\n" , socket_path); +return 0 ; + } +snprintf (chan_info->channel_path, +sizeof (chan_info->channel_path), +"%s" , socket_path); + +if (setup_host_channel_info (&chan_info, + num_channels_enabled) <0 ) { +rte_free (chan_info); +return 0 ; + } + }while (++num_channels_enabled <= ci->core_count);return num_channels_enabled; }
examples/vm_power_manager/channel_manager.h +5 -2
@@ -28,6 +28,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
@@ -212,13 +215,13 @@ int add_channels(const char *vm_name, unsigned *channel_list, unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be
examples/vm_power_manager/channel_monitor.c +65 -26
200 lines not on this page · raw message
examples/vm_power_manager/main.c +1 -1
@@ -421,7 +421,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id);
Signature · 1 line
2.19.2.windows.1
PATCH 2/2 doc: update according to the fifo per core impl
In reply to Lukasz KrakowiakUpdated power management docs for fifo JSON API.
Removed from JSON API:
* 'name'
* 'resource_id'
* 'core_list'
--- .../sample_app_ug/vm_power_management.rst | 53 ++++--------------- 1 file changed, 11 insertions(+), 42 deletions(-)
doc/guides/sample_app_ug/vm_power_management.rst +11 -42
@@ -380,9 +380,16 @@ parsing functionality will not be present in the app. Sending a command or policy to the power manager application is achieved by simply opening a fifo file, writing a JSON string to that fifo, and closing -the file. +the file. In actual implementation every core has own dedicated fifo[0..n], +where n is number of the last available core. +Having a dedicated fifo file per core allows using standard filesystem permissions +to ensure a given container can only write JSON commands into fifos it is allowed +to use. -The fifo is at /tmp/powermonitor/fifo +The fifo is at /tmp/powermonitor/fifo[0..n] + +For example all cmds put to the /tmp/powermonitor/fifo7, will have +effect only on CPU[7]. The jason string can be a policy or instruction, and takes the following format:
@@ -405,19 +412,6 @@ arrays, etc. Examples of policies follow later in this document. The allowed names and value types are as follows: -:Pair Name: "name" -:Description: Name of the VM or Host. Allows the parser to associate the - policy with the relevant VM or Host OS. -:Type: string -:Values: any valid string -:Required: yes -:Example: - - .. code-block:: javascript - - "name", "ubuntu2" - - :Pair Name: "command" :Description: The type of packet we're sending to the power manager. We can be creating or destroying a policy, or sending a direct command to adjust
@@ -509,17 +503,6 @@ names and value types are as follows: "max_packet_thresh": 500000 -:Pair Name: "core_list" -:Description: The cores to which to apply the policy. -:Type: array of integers -:Values: array with list of virtual CPUs. -:Required: only policy CREATE/DESTROY -:Example: - - .. code-block:: javascript - - "core_list":[ 10, 11 ] - :Pair Name: "workload" :Description: When our policy is of type WORKLOAD, we need to specify how heavy our workload is.
@@ -566,17 +549,6 @@ names and value types are as follows: "unit", "SCALE_MAX" -:Pair Name: "resource_id" -:Description: The core to which to apply the power command. -:Type: integer -:Values: valid core id for VM or host OS. -:Required: only POWER instruction -:Example: - - .. code-block:: javascript - - "resource_id": 10 - JSON API Examples ~~~~~~~~~~~~~~~~~
@@ -598,7 +570,6 @@ Profile destroy example: .. code-block:: javascript {"profile": { - "name": "ubuntu", "command": "destroy", }}
@@ -607,17 +578,15 @@ Power command example: .. code-block:: javascript {"command": { - "name": "ubuntu", "unit": "SCALE_MAX", - "resource_id": 10 }} To send a JSON string to the Power Manager application, simply paste the -example JSON string into a text file and cat it into the fifo: +example JSON string into a text file and cat it into the proper fifo: .. code-block:: console - cat file.json >/tmp/powermonitor/fifo + cat file.json >/tmp/powermonitor/fifo[0..n] The console of the Power Manager application should indicate the command that was just received via the fifo.
Signature · 1 line
2.19.2.windows.1
v2 cover power: add fifo per core for JSON interface
In reply to Lukasz KrakowiakThis patch implement a separate FIFO for each cpu core. Dependency to commit: 5c7c96571b7b7051ecc286f36be0b3d95b49995e (power: update for handling fifo path string).
Lukasz Krakowiak (2):
power: add fifo per core for JSON interface
doc: update according to the fifo per core impl
---
v2:
* rebased on last changes on master
* updated handling vm_name (use proper buff size)
.../sample_app_ug/vm_power_management.rst | 53 +++-------- examples/vm_power_manager/channel_manager.c | 85 +++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++------ examples/vm_power_manager/main.c | 2 +- 5 files changed, 140 insertions(+), 98 deletions(-)
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH v2 1/2 power: add fifo per core for JSON interface
From: Lukasz Krakowiak <[email protected]>
This patch implement a separate FIFO for each cpu core. For proper handling JSON interface, removed fields from cmds:core_list, resource_id, name.
---
v2:
* updated handling vm_name (use proper buff size)
* rebase to master changes
--- examples/vm_power_manager/channel_manager.c | 85 +++++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++++------ examples/vm_power_manager/main.c | 2 +- 4 files changed, 129 insertions(+), 56 deletions(-)
examples/vm_power_manager/channel_manager.c +58 -27
@@ -346,10 +346,22 @@ setup_channel_info(struct virtual_machine_info **vm_info_dptr,return 0 ; } -static void -fifo_path (char *dst,unsigned int len) +static int +fifo_path (char *dst,unsigned int len,unsigned int id) { -snprintf (dst, len,"%sfifo" ,CHANNEL_MGR_SOCKET_PATH ); +int cnt; + + cnt =snprintf (dst, len,"%s%s%d" ,CHANNEL_MGR_SOCKET_PATH , +CHANNEL_MGR_FIFO_PATTERN_NAME , id); + +if ((cnt <0 ) || (cnt > (int )len -1 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Could not create proper " +"string for fifo path\n" ); + +return -1 ; + } + +return 0 ; } static int
@@ -535,40 +547,59 @@ add_channels(const char *vm_name, unsigned *channel_list, }int -add_host_channel (void ) +add_host_channels (void ) {struct channel_info *chan_info;char socket_path[PATH_MAX ];int num_channels_enabled =0 ;int ret; +struct core_info *ci; -fifo_path (socket_path,sizeof (socket_path)); - - ret =mkfifo (socket_path,0660 ); -if ((errno !=EEXIST ) && (ret <0 )) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " -"%s\n" , socket_path,strerror (errno)); + ci =get_core_info (); +if (ci ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot allocate memory for core_info\n" );return 0 ; } -if (access (socket_path,F_OK ) <0 ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " -"%s\n" , socket_path,strerror (errno)); -return 0 ; - } - chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); -if (chan_info ==NULL ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " -"channel '%s'\n" , socket_path); -return 0 ; - } -rte_strlcpy (chan_info->channel_path, socket_path,UNIX_PATH_MAX ); +do { +if (ci->cd[num_channels_enabled].global_enabled_cpus ==0 ) +continue ; -if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; - } - num_channels_enabled++; + ret =fifo_path (socket_path,sizeof (socket_path), + num_channels_enabled); +if (ret <0 ) +return 0 ; + + ret =mkfifo (socket_path,0660 ); +RTE_LOG (DEBUG ,CHANNEL_MANAGER ,"TRY CREATE fifo '%s'\n" , + socket_path); +if ((errno !=EEXIST ) && (ret <0 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + +if (access (socket_path,F_OK ) <0 ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " +"channel '%s'\n" , socket_path); +return 0 ; + } +snprintf (chan_info->channel_path, +sizeof (chan_info->channel_path), +"%s" , socket_path); + +if (setup_host_channel_info (&chan_info, + num_channels_enabled) <0 ) { +rte_free (chan_info); +return 0 ; + } + }while (++num_channels_enabled <= ci->core_count);return num_channels_enabled; }
examples/vm_power_manager/channel_manager.h +5 -2
@@ -28,6 +28,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
@@ -212,13 +215,13 @@ int add_channels(const char *vm_name, unsigned *channel_list, unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be
examples/vm_power_manager/channel_monitor.c +65 -26
200 lines not on this page · raw message
examples/vm_power_manager/main.c +1 -1
@@ -421,7 +421,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id);
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH v2 2/2 doc: update according to the fifo per core impl
In reply to Lukasz GosiewskiFrom: Lukasz Krakowiak <[email protected]>
Updated power management docs for fifo JSON API.
Removed from JSON API:
* 'name'
* 'resource_id'
* 'core_list'
--- .../sample_app_ug/vm_power_management.rst | 53 ++++--------------- 1 file changed, 11 insertions(+), 42 deletions(-)
doc/guides/sample_app_ug/vm_power_management.rst +11 -42
@@ -380,9 +380,16 @@ parsing functionality will not be present in the app. Sending a command or policy to the power manager application is achieved by simply opening a fifo file, writing a JSON string to that fifo, and closing -the file. +the file. In actual implementation every core has own dedicated fifo[0..n], +where n is number of the last available core. +Having a dedicated fifo file per core allows using standard filesystem permissions +to ensure a given container can only write JSON commands into fifos it is allowed +to use. -The fifo is at /tmp/powermonitor/fifo +The fifo is at /tmp/powermonitor/fifo[0..n] + +For example all cmds put to the /tmp/powermonitor/fifo7, will have +effect only on CPU[7]. The jason string can be a policy or instruction, and takes the following format:
@@ -405,19 +412,6 @@ arrays, etc. Examples of policies follow later in this document. The allowed names and value types are as follows: -:Pair Name: "name" -:Description: Name of the VM or Host. Allows the parser to associate the - policy with the relevant VM or Host OS. -:Type: string -:Values: any valid string -:Required: yes -:Example: - - .. code-block:: javascript - - "name", "ubuntu2" - - :Pair Name: "command" :Description: The type of packet we're sending to the power manager. We can be creating or destroying a policy, or sending a direct command to adjust
@@ -509,17 +503,6 @@ names and value types are as follows: "max_packet_thresh": 500000 -:Pair Name: "core_list" -:Description: The cores to which to apply the policy. -:Type: array of integers -:Values: array with list of virtual CPUs. -:Required: only policy CREATE/DESTROY -:Example: - - .. code-block:: javascript - - "core_list":[ 10, 11 ] - :Pair Name: "workload" :Description: When our policy is of type WORKLOAD, we need to specify how heavy our workload is.
@@ -566,17 +549,6 @@ names and value types are as follows: "unit", "SCALE_MAX" -:Pair Name: "resource_id" -:Description: The core to which to apply the power command. -:Type: integer -:Values: valid core id for VM or host OS. -:Required: only POWER instruction -:Example: - - .. code-block:: javascript - - "resource_id": 10 - JSON API Examples ~~~~~~~~~~~~~~~~~
@@ -598,7 +570,6 @@ Profile destroy example: .. code-block:: javascript {"profile": { - "name": "ubuntu", "command": "destroy", }}
@@ -607,17 +578,15 @@ Power command example: .. code-block:: javascript {"command": { - "name": "ubuntu", "unit": "SCALE_MAX", - "resource_id": 10 }} To send a JSON string to the Power Manager application, simply paste the -example JSON string into a text file and cat it into the fifo: +example JSON string into a text file and cat it into the proper fifo: .. code-block:: console - cat file.json >/tmp/powermonitor/fifo + cat file.json >/tmp/powermonitor/fifo[0..n] The console of the Power Manager application should indicate the command that was just received via the fifo.
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
12/04/2019 15:54, Lukasz Gosiewski:
Quoted 7 lines
This patch implement a separate FIFO for each cpu core. Dependency to commit:
5c7c96571b7b7051ecc286f36be0b3d95b49995e(power: update for handling fifo path string).Lukasz Krakowiak (2):
power: add fifo per core for JSON interface
doc: update according to the fifo per core impl
Deferred to 19.08 because of a lack of review.
v3 cover add fifo per core for JSON interface
In reply to Lukasz KrakowiakFrom: root <[email protected]>
Lukasz Krakowiak (2):
power: add fifo per core for JSON interface
doc: update according to the fifo per core impl
.../sample_app_ug/vm_power_management.rst | 53 +++-------- examples/vm_power_manager/channel_manager.c | 85 +++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++------ examples/vm_power_manager/main.c | 2 +- 5 files changed, 140 insertions(+), 98 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 power: add fifo per core for JSON interface
From: Lukasz Krakowiak <[email protected]>
This patch implement a separate FIFO for each cpu core. For proper handling JSON interface, removed fields from cmds:core_list, resource_id, name.
---
v2:
* updated handling vm_name (use proper buff size)
* rebase to master changes
v3:
* improvement to coding style
--- examples/vm_power_manager/channel_manager.c | 85 +++++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++++------ examples/vm_power_manager/main.c | 2 +- 4 files changed, 129 insertions(+), 56 deletions(-)
examples/vm_power_manager/channel_manager.c +58 -27
@@ -346,10 +346,22 @@ setup_channel_info(struct virtual_machine_info **vm_info_dptr,return 0 ; } -static void -fifo_path (char *dst,unsigned int len) +static int +fifo_path (char *dst,unsigned int len,unsigned int id) { -snprintf (dst, len,"%sfifo" ,CHANNEL_MGR_SOCKET_PATH ); +int cnt; + + cnt =snprintf (dst, len,"%s%s%d" ,CHANNEL_MGR_SOCKET_PATH , +CHANNEL_MGR_FIFO_PATTERN_NAME , id); + +if ((cnt <0 ) || (cnt > (int )len -1 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Could not create proper " +"string for fifo path\n" ); + +return -1 ; + } + +return 0 ; } static int
@@ -535,40 +547,59 @@ add_channels(const char *vm_name, unsigned *channel_list, }int -add_host_channel (void ) +add_host_channels (void ) {struct channel_info *chan_info;char socket_path[PATH_MAX ];int num_channels_enabled =0 ;int ret; +struct core_info *ci; -fifo_path (socket_path,sizeof (socket_path)); - - ret =mkfifo (socket_path,0660 ); -if ((errno !=EEXIST ) && (ret <0 )) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " -"%s\n" , socket_path,strerror (errno)); + ci =get_core_info (); +if (ci ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot allocate memory for core_info\n" );return 0 ; } -if (access (socket_path,F_OK ) <0 ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " -"%s\n" , socket_path,strerror (errno)); -return 0 ; - } - chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); -if (chan_info ==NULL ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " -"channel '%s'\n" , socket_path); -return 0 ; - } -rte_strlcpy (chan_info->channel_path, socket_path,UNIX_PATH_MAX ); +do { +if (ci->cd[num_channels_enabled].global_enabled_cpus ==0 ) +continue ; -if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; - } - num_channels_enabled++; + ret =fifo_path (socket_path,sizeof (socket_path), + num_channels_enabled); +if (ret <0 ) +return 0 ; + + ret =mkfifo (socket_path,0660 ); +RTE_LOG (DEBUG ,CHANNEL_MANAGER ,"TRY CREATE fifo '%s'\n" , + socket_path); +if ((errno !=EEXIST ) && (ret <0 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + +if (access (socket_path,F_OK ) <0 ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " +"channel '%s'\n" , socket_path); +return 0 ; + } +snprintf (chan_info->channel_path, +sizeof (chan_info->channel_path), +"%s" , socket_path); + +if (setup_host_channel_info (&chan_info, + num_channels_enabled) <0 ) { +rte_free (chan_info); +return 0 ; + } + }while (++num_channels_enabled <= ci->core_count);return num_channels_enabled; }
examples/vm_power_manager/channel_manager.h +5 -2
@@ -28,6 +28,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
@@ -212,13 +215,13 @@ int add_channels(const char *vm_name, unsigned *channel_list, unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be
examples/vm_power_manager/channel_monitor.c +65 -26
200 lines not on this page · raw message
examples/vm_power_manager/main.c +1 -1
@@ -421,7 +421,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id);
Signature · 1 line
2.17.1
Quoted 10 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Lukasz Gosiewski
Sent: Wednesday, April 24, 2019 10:22 AM
To: Hunt, David <[email protected]>
Cc: [email protected]; Krakowiak, LukaszX <[email protected]>; Gosiewski, LukaszX <[email protected]>
Subject: [dpdk-dev] [PATCH v3 1/2] power: add fifo per core for JSON interface
Quoted 8 lines
From: Lukasz Krakowiak <[email protected]>
This patch implement a separate FIFO for each cpu core. For proper handling JSON interface, removed fields from cmds:
core_list,resource_id, name.Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>
I belive there should be information provided that patch depends on http://patchwork.dpdk.org/patch/52186/.
Quoted 192 lines
---
v2:
* updated handlingvm_name(use proper buff size)
* rebase to master changesv3:
* improvement to coding style--- examples/vm_power_manager/channel_manager.c | 85 +++++++++++++----- - examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++++--- --- examples/vm_power_manager/main.c | 2 +- 4 files changed, 129 insertions(+), 56 deletions(-)examples/vm_power_manager/channel_manager.c +9
-3@@ -346,10 +346,22 @@ setup_channel_info(struct virtual_machine_info **vm_info_dptr, return 0; } -static void -fifo_path (char *dst,unsigned int len) +static int +fifo_path (char *dst,unsigned int len,unsigned int id) { -snprintf (dst, len,"%sfifo" ,CHANNEL_MGR_SOCKET_PATH ); +int cnt; + + cnt =snprintf (dst, len,"%s%s%d" ,CHANNEL_MGR_SOCKET_PATH , +CHANNEL_MGR_FIFO_PATTERN_NAME , id); + +if ((cnt <0 ) || (cnt > (int )len -1 )) { + RTE_LOG(ERR, CHANNEL_MANAGER, "Could not createproper "
examples/vm_power_manager/channel_manager.c +8
-6+ "string for fifo path\n"); + +return -1 ; + } + +return 0 ; } static int@@ -535,40 +547,59 @@ add_channels(const char *vm_name, unsigned *channel_list, }int -add_host_channel (void ) +add_host_channels (void ) {struct channel_info *chan_info;char socket_path[PATH_MAX ];int num_channels_enabled =0 ;int ret; +struct core_info *ci; -fifo_path (socket_path,sizeof (socket_path)); - - ret =mkfifo (socket_path,0660 ); -if ((errno !=EEXIST ) && (ret <0 )) { - RTE_LOG(ERR, CHANNEL_MANAGER, "Cannot create fifo '%s'error: "
examples/vm_power_manager/channel_manager.c +3
-1- "%s\n", socket_path, strerror(errno)); + ci =get_core_info (); +if (ci ==NULL ) { + RTE_LOG(ERR, CHANNEL_MANAGER, "Cannot allocatememory for
examples/vm_power_manager/channel_manager.c +1
-2+core_info\n");return 0 ; } -if (access (socket_path,F_OK ) <0 ) { - RTE_LOG(ERR, CHANNEL_MANAGER, "Channel path '%s'error: "
examples/vm_power_manager/channel_manager.c +0
-6- "%s\n", socket_path, strerror(errno)); -return 0 ; - } - chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); -if (chan_info ==NULL ) { - RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocatingmemory for "
examples/vm_power_manager/channel_manager.c +0
-4- "channel '%s'\n", socket_path); -return 0 ; - } - rte_strlcpy(chan_info->channel_path, socket_path,
UNIX_PATH_MAX);examples/vm_power_manager/channel_manager.c +5
-5+ do { + if (ci->cd[num_channels_enabled].global_enabled_cpus == 0) + continue; -if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; - } - num_channels_enabled++; + ret = fifo_path(socket_path, sizeof(socket_path), +num_channels_enabled);examples/vm_power_manager/channel_manager.c +5
-0+if (ret <0 ) +return 0 ; + + ret =mkfifo (socket_path,0660 ); + RTE_LOG(DEBUG, CHANNEL_MANAGER, "TRY CREATE fifo'%s'\n",
examples/vm_power_manager/channel_manager.c +3
-0+ socket_path); +if ((errno !=EEXIST ) && (ret <0 )) { + RTE_LOG(ERR, CHANNEL_MANAGER, "Cannot createfifo '%s' error: "
examples/vm_power_manager/channel_manager.c +1
-0+ "%s\n", socket_path,strerror(errno));
examples/vm_power_manager/channel_manager.c +5
-0+return 0 ; + } + +if (access (socket_path,F_OK ) <0 ) { + RTE_LOG(ERR, CHANNEL_MANAGER, "Channel path'%s' error: "
examples/vm_power_manager/channel_manager.c +1
-0+ "%s\n", socket_path,strerror(errno));
examples/vm_power_manager/channel_manager.c +5
-0+return 0 ; + } + chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { + RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocatingmemory for "
examples/vm_power_manager/channel_manager.c +13
-0+ "channel '%s'\n", socket_path); +return 0 ; + } +snprintf (chan_info->channel_path, +sizeof (chan_info->channel_path), +"%s" , socket_path); + +if (setup_host_channel_info (&chan_info, + num_channels_enabled) <0 ) { +rte_free (chan_info); +return 0 ; + } + }while (++num_channels_enabled <= ci->core_count);return num_channels_enabled; }examples/vm_power_manager/channel_manager.h +4
-0@@ -28,6 +28,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path) @@ -212,13 +215,13 @@ int add_channels(const char *vm_name, unsigned
*channel_list,examples/vm_power_manager/channel_manager.h +2
-2unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be examples/vm_power_manager/channel_monitor.c +1
-0@@ -29,6 +29,7 @@#include <rte_cycles.h> #include <rte_ethdev.h> #include <rte_pmd_i40e.h> +#include <rte_string_fns.h> #include <libvirt/libvirt.h> #include "channel_monitor.h" @@ -51,7 +52,7 @@ static volatile unsigned run_loop = 1; static int
Quoted 3 lines
global_event_fd; static unsigned intpolicy_is_set; static structepoll_event*global_events_list; -static struct policy policies[MAX_CLIENTS]; +static struct policy policies[POWER_MGR_MAX_CPUS];
POWER_MGR_MAX_CPUS was deleted. RTE_MAX_LCORE should be used instead I think.
Quoted 217 lines
#ifdef
USE_JANSSONexamples/vm_power_manager/channel_monitor.c +39
-5@@ -130,13 +131,45 @@ set_policy_mac(struct channel_packet *pkt, int idx, char *mac)return 0 ; } +static char * +get_resource_name_from_chn_path (const char *channel_path) { +char *substr =NULL ; + + substr =strstr (channel_path,CHANNEL_MGR_FIFO_PATTERN_NAME ); + +return substr; +}static int -parse_json_to_pkt (json_t *element,struct channel_packet *pkt) +get_resource_id_from_vmname (const char *vm_name) { +int result =-1 ; +int off =0 ; + +if (vm_name ==NULL ) +return -1 ; + +while (vm_name[off] !='\0' ) { +if (isdigit (vm_name[off])) +break ; + off++; + } + result =atoi (&vm_name[off]); +if ((result ==0 ) && (vm_name[off] !='0' )) +return -1 ; + +return result; +} + +static int +parse_json_to_pkt (json_t *element,struct channel_packet *pkt, +const char *vm_name) {const char *key;json_t *value;int ret; +int resource_id;memset (pkt,0 ,sizeof (struct channel_packet ));@@ -147,19 +180,23 @@ parse_json_to_pkt(json_t *element, struct channel_packet *pkt) pkt->command = PKT_POLICY; pkt->core_type =CORE_TYPE_PHYSICAL ; +if (vm_name ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MONITOR , +"vm_name is NULL, request rejected !\n" ); +return -1 ; + } + json_object_foreach(element, key, value) {if (!strcmp (key,"policy" )) {/* Recurse in to get the contents of profile */ - ret =parse_json_to_pkt (value, pkt); + ret =parse_json_to_pkt (value, pkt, vm_name);if (ret)return ret; }else if (!strcmp (key,"instruction" )) {/* Recurse in to get the contents of instruction */ - ret =parse_json_to_pkt (value, pkt); + ret =parse_json_to_pkt (value, pkt, vm_name);if (ret)return ret; - }else if (!strcmp (key,"name" )) { -strcpy (pkt->vm_name,json_string_value (value)); }else if (!strcmp (key,"command" )) {char command[32 ];
strlcpy(command, json_string_value(value), 32); @@
-222,16 +259,6 @@parse_json_to_pkt(json_t *element, struct channel_packet *pkt)examples/vm_power_manager/channel_monitor.c +1
-10json_array_get(value, i)); pkt->timer_policy.quiet_hours[i] = hour; } - }else if (!strcmp (key,"core_list" )) { -unsigned int i; -size_t size =json_array_size (value); - -for (i =0 ; i < size; i++) { -int core = (int )json_integer_value ( -json_array_get (value, i)); - pkt->vcpu_to_control[i] = core; - } - pkt->num_vcpu = size; } else if (!strcmp(key, "mac_list")) { unsigned int i; size_t size = json_array_size(value); @@ -270,13 +297,21 @@ parse_json_to_pkt(json_t *element, struct channel_packet*pkt)
"Invalid command received in
JSON\n");examples/vm_power_manager/channel_monitor.c +0
-2return -1 ; } - }else if (!strcmp (key,"resource_id" )) { - pkt->resource_id =(uint32_t)json_integer_value(value);
examples/vm_power_manager/channel_monitor.c +5
-0}else {RTE_LOG (ERR ,CHANNEL_MONITOR ,"Unknown key received in JSON string: %s\n" , key); } + + resource_id =get_resource_id_from_vmname (vm_name); +if (resource_id <0 ) { + RTE_LOG(ERR, CHANNEL_MONITOR, + "Could not get resource_id fromvm_name:%s\n",
examples/vm_power_manager/channel_monitor.c +13
-5+ vm_name); +return -1 ; + } +rte_strlcpy (pkt->vm_name, vm_name,VM_MAX_NAME_SZ ); + pkt->resource_id = resource_id; }return 0 ; }@@ -426,13 +461,13 @@ update_policy(struct channel_packet *pkt) {unsigned int updated =0 ; -int i; +unsigned int i;RTE_LOG (INFO ,CHANNEL_MONITOR ,"Applying policy for %s\n" , pkt->vm_name); -for (i =0 ; i <MAX_CLIENTS ; i++) { +for (i =0 ; i <RTE_DIM (policies); i++) {if (strcmp (policies[i].pkt.vm_name, pkt->vm_name) ==0 ) {/* Copy the contents of *pkt into the policy.pkt */ policies[i].pkt = *pkt;@@ -447,7 +482,7 @@ update_policy(struct channel_packet *pkt) } }if (!updated) { -for (i =0 ; i <MAX_CLIENTS ; i++) { +for (i =0 ; i <RTE_DIM (policies); i++) {if (policies[i].enabled ==0 ) { policies[i].pkt = *pkt;get_pcpu_to_control (&policies[i]);@@ -465,13 +500,13 @@ update_policy(struct channel_packet *pkt) static int remove_policy(struct channel_packet *pkt __rte_unused) { -int i; +unsigned int i;/* * Disabling the policy is simply a case of setting * enabled to 0 */ -for (i =0 ; i <MAX_CLIENTS ; i++) { +for (i =0 ; i <RTE_DIM (policies); i++) {if (strcmp (policies[i].pkt.vm_name, pkt->vm_name) ==0 ) { policies[i].enabled =0 ;return 0 ;@@ -792,6 +827,8 @@ read_json_packet(struct channel_info *chan_info)int n_bytes, ret;json_t *root;json_error_t error; +const char *resource_name; +/* read opening brace to closing brace */ do {@@ -828,13 +865,15 @@ read_json_packet(struct channel_info *chan_info) root =json_loads (json_data,0 , &error);if (root) { + resource_name =get_resource_name_from_chn_path(
examples/vm_power_manager/channel_monitor.c +4
-3+ chan_info->channel_path);/* * Because our data is now in the json * object, we can overwrite the pkt * with a channel_packet struct, using * parse_json_to_pkt() */ - ret =parse_json_to_pkt (root, &pkt); + ret =parse_json_to_pkt (root, &pkt, resource_name);json_decref (root);if (ret) { RTE_LOG(ERR, CHANNEL_MONITOR,@@ -891,9 +930,9 @@ run_channel_monitor(void) }rte_delay_us (time_period_ms*1000 );if (policy_is_set) { -int j; +unsigned int j; -for (j =0 ; j <MAX_CLIENTS ; j++) { +for (j =0 ; j <RTE_DIM (policies); j++) {if (policies[j].enabled ==1 )apply_policy (&policies[j]); }examples/vm_power_manager/main.c +1
-2@@ -421,7 +421,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id); --
Quoted 1 line
2.17.1
PATCH v3 2/2 doc: update according to the fifo per core impl
In reply to Lukasz GosiewskiFrom: Lukasz Krakowiak <[email protected]>
Updated power management docs for fifo JSON API.
Removed from JSON API:
* 'name'
* 'resource_id'
* 'core_list'
--- .../sample_app_ug/vm_power_management.rst | 53 ++++--------------- 1 file changed, 11 insertions(+), 42 deletions(-)
doc/guides/sample_app_ug/vm_power_management.rst +11 -42
@@ -380,9 +380,16 @@ parsing functionality will not be present in the app. Sending a command or policy to the power manager application is achieved by simply opening a fifo file, writing a JSON string to that fifo, and closing -the file. +the file. In actual implementation every core has own dedicated fifo[0..n], +where n is number of the last available core. +Having a dedicated fifo file per core allows using standard filesystem permissions +to ensure a given container can only write JSON commands into fifos it is allowed +to use. -The fifo is at /tmp/powermonitor/fifo +The fifo is at /tmp/powermonitor/fifo[0..n] + +For example all cmds put to the /tmp/powermonitor/fifo7, will have +effect only on CPU[7]. The jason string can be a policy or instruction, and takes the following format:
@@ -405,19 +412,6 @@ arrays, etc. Examples of policies follow later in this document. The allowed names and value types are as follows: -:Pair Name: "name" -:Description: Name of the VM or Host. Allows the parser to associate the - policy with the relevant VM or Host OS. -:Type: string -:Values: any valid string -:Required: yes -:Example: - - .. code-block:: javascript - - "name", "ubuntu2" - - :Pair Name: "command" :Description: The type of packet we're sending to the power manager. We can be creating or destroying a policy, or sending a direct command to adjust
@@ -509,17 +503,6 @@ names and value types are as follows: "max_packet_thresh": 500000 -:Pair Name: "core_list" -:Description: The cores to which to apply the policy. -:Type: array of integers -:Values: array with list of virtual CPUs. -:Required: only policy CREATE/DESTROY -:Example: - - .. code-block:: javascript - - "core_list":[ 10, 11 ] - :Pair Name: "workload" :Description: When our policy is of type WORKLOAD, we need to specify how heavy our workload is.
@@ -566,17 +549,6 @@ names and value types are as follows: "unit", "SCALE_MAX" -:Pair Name: "resource_id" -:Description: The core to which to apply the power command. -:Type: integer -:Values: valid core id for VM or host OS. -:Required: only POWER instruction -:Example: - - .. code-block:: javascript - - "resource_id": 10 - JSON API Examples ~~~~~~~~~~~~~~~~~
@@ -598,7 +570,6 @@ Profile destroy example: .. code-block:: javascript {"profile": { - "name": "ubuntu", "command": "destroy", }}
@@ -607,17 +578,15 @@ Power command example: .. code-block:: javascript {"command": { - "name": "ubuntu", "unit": "SCALE_MAX", - "resource_id": 10 }} To send a JSON string to the Power Manager application, simply paste the -example JSON string into a text file and cat it into the fifo: +example JSON string into a text file and cat it into the proper fifo: .. code-block:: console - cat file.json >/tmp/powermonitor/fifo + cat file.json >/tmp/powermonitor/fifo[0..n] The console of the Power Manager application should indicate the command that was just received via the fifo.
Signature · 1 line
2.17.1
v4 cover Fifo per core
In reply to Lukasz GosiewskiFrom: Marcin Hajkowski <[email protected]>
This patch implement a separate FIFO for each cpu core. For proper handling JSON interface, removed fields from cmds:core_list, resource_id, name.
Please note that this patchset depends on
http://patchwork.dpdk.org/patch/52824/
---
v4:
* changes due to code rebase
v3:
* improvement to coding style
v2:
* updated handling vm_name (use proper buff size)
* rebase to master changes
Marcin Hajkowski (2):
power: add fifo per core for JSON interface
doc: update according to the fifo per core impl
.../sample_app_ug/vm_power_management.rst | 61 +++--------- examples/vm_power_manager/channel_manager.c | 84 +++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 92 +++++++++++++------ examples/vm_power_manager/main.c | 2 +- 5 files changed, 142 insertions(+), 104 deletions(-)
Signature · 1 line
2.17.2
PATCH v4 1/2 power: add fifo per core for JSON interface
From: Marcin Hajkowski <[email protected]>
This patch implement a separate FIFO for each cpu core. For proper handling JSON interface, removed fields from cmds:core_list, resource_id, name.
--- examples/vm_power_manager/channel_manager.c | 84 +++++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 92 +++++++++++++++------ examples/vm_power_manager/main.c | 2 +- 4 files changed, 128 insertions(+), 57 deletions(-)
examples/vm_power_manager/channel_manager.c +57 -27
@@ -346,10 +346,22 @@ setup_channel_info(struct virtual_machine_info **vm_info_dptr,return 0 ; } -static void -fifo_path (char *dst,unsigned int len) +static int +fifo_path (char *dst,unsigned int len,unsigned int id) { -snprintf (dst, len,"%sfifo" ,CHANNEL_MGR_SOCKET_PATH ); +int cnt; + + cnt =snprintf (dst, len,"%s%s%d" ,CHANNEL_MGR_SOCKET_PATH , +CHANNEL_MGR_FIFO_PATTERN_NAME , id); + +if ((cnt <0 ) || (cnt > (int )len -1 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Could not create proper " +"string for fifo path\n" ); + +return -1 ; + } + +return 0 ; } static int
@@ -535,40 +547,58 @@ add_channels(const char *vm_name, unsigned *channel_list, }int -add_host_channel (void ) +add_host_channels (void ) {struct channel_info *chan_info;char socket_path[PATH_MAX ];int num_channels_enabled =0 ;int ret; +struct core_info *ci; -fifo_path (socket_path,sizeof (socket_path)); - - ret =mkfifo (socket_path,0660 ); -if ((errno !=EEXIST ) && (ret <0 )) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " -"%s\n" , socket_path,strerror (errno)); + ci =get_core_info (); +if (ci ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot allocate memory for core_info\n" );return 0 ; } -if (access (socket_path,F_OK ) <0 ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " -"%s\n" , socket_path,strerror (errno)); -return 0 ; - } - chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); -if (chan_info ==NULL ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " -"channel '%s'\n" , socket_path); -return 0 ; - } -rte_strlcpy (chan_info->channel_path, socket_path,UNIX_PATH_MAX ); +do { +if (ci->cd[num_channels_enabled].global_enabled_cpus ==0 ) +continue ; -if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; - } - num_channels_enabled++; + ret =fifo_path (socket_path,sizeof (socket_path), + num_channels_enabled); +if (ret <0 ) +return 0 ; + + ret =mkfifo (socket_path,0660 ); +RTE_LOG (DEBUG ,CHANNEL_MANAGER ,"TRY CREATE fifo '%s'\n" , + socket_path); +if ((errno !=EEXIST ) && (ret <0 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + +if (access (socket_path,F_OK ) <0 ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " +"channel '%s'\n" , socket_path); +return 0 ; + } +strlcpy (chan_info->channel_path, socket_path, +sizeof (chan_info->channel_path)); + +if (setup_host_channel_info (&chan_info, + num_channels_enabled) <0 ) { +rte_free (chan_info); +return 0 ; + } + }while (++num_channels_enabled <= ci->core_count);return num_channels_enabled; }
examples/vm_power_manager/channel_manager.h +5 -2
@@ -22,6 +22,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
@@ -206,13 +209,13 @@ int add_channels(const char *vm_name, unsigned *channel_list, unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be
examples/vm_power_manager/channel_monitor.c +65 -27
201 lines not on this page · raw message
examples/vm_power_manager/main.c +1 -1
@@ -434,7 +434,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id);
Signature · 1 line
2.17.2
Quoted 10 lines · Hajkowski
From: Marcin Hajkowski <[email protected]>
This patch implement a separate FIFO for each cpu core. For proper handling JSON interface, removed fields from cmds:
core_list,resource_id, name.Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>Signed-off-by Marcin Hajkowski <[email protected]>---
<snip>
Quoted 8 lines
examples/vm_power_manager/channel_manager.c +3
-5-RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " -"channel '%s'\n" , socket_path); -return 0 ; - } -rte_strlcpy (chan_info->channel_path, socket_path,UNIX_PATH_MAX ); + do { + if (ci->cd[num_channels_enabled].global_enabled_cpus == 0) + continue;
examples/vm_power_manager/channel_manager.c add_channels(const char *vm_name, unsigned *channel_list, · line 571
Quoted 10 lines
examples/vm_power_manager/channel_manager.c +4
-5-if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; - } - num_channels_enabled++; + ret =fifo_path (socket_path,sizeof (socket_path), + num_channels_enabled); +if (ret <0 ) +return 0 ;
So if we encounter *any* failure, *all* channels become invalid? Should we at least roll back the changes we've made by this point? This is consistent with previous behavior so maybe not in this patch, but still...
Quoted 5 lines
examples/vm_power_manager/channel_manager.c +5
-0+ + ret =mkfifo (socket_path,0660 ); +RTE_LOG (DEBUG ,CHANNEL_MANAGER ,"TRY CREATE fifo '%s'\n" , + socket_path); +if ((errno !=EEXIST ) && (ret <0 )) {
examples/vm_power_manager/channel_manager.c add_channels(const char *vm_name, unsigned *channel_list, · line 586
Quoted 10 lines
examples/vm_power_manager/channel_manager.c +10
-0+RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + } + +if (access (socket_path,F_OK ) <0 ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " +"%s\n" , socket_path,strerror (errno)); +return 0 ; + }
I believe this is not needed. Trying to do this here is a TOCTOU issue, and if the access fails on open later, you handle that and free the channel info anyway, so this check is essentially useless.
examples/vm_power_manager/channel_manager.c add_channels(const char *vm_name, unsigned *channel_list, · line 594
Quoted 8 lines
examples/vm_power_manager/channel_manager.c +8
-0+ chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " +"channel '%s'\n" , socket_path); +return 0 ; + } +strlcpy (chan_info->channel_path, socket_path, +sizeof (chan_info->channel_path));
should this be rte_strlcpy?
examples/vm_power_manager/channel_manager.c add_channels(const char *vm_name, unsigned *channel_list, · line 601
Quoted 7 lines
examples/vm_power_manager/channel_manager.c +7
-0+ +if (setup_host_channel_info (&chan_info, + num_channels_enabled) <0 ) { +rte_free (chan_info); +return 0 ; + } + }while (++num_channels_enabled <= ci->core_count);
This looks like a for-loop, why is while used here? I mean, i don't care either way, it's just a for-loop would have been a more obvious choice...
Signature · 2 lines
Thanks, Anatoly
PATCH v5 1/1 power: add fifo per core for JSON interface
In reply to HajkowskiFrom: Marcin Hajkowski <[email protected]>
This patch implements a separate FIFO for each cpu core to improve the previous functionality where anyone with access to the FIFO could affect any core on the system. By using appropriate permissions, fifo interfaces can be configured to only affect the particular cores.
Because each FIFO is per core, the following fields have been removed from the command JSON format: core_list, resource_id, name.
---
v2:
* updated handling vm_name (use proper buff size)
* rebase to master changes
v3:
* improvement to coding style
v4:
* rebase to tip of master
v5:
* merged docs into same patch as the code, as per mailing list policy
* made changes out of review by Anatoly.
--- .../sample_app_ug/vm_power_management.rst | 61 +++--------- examples/vm_power_manager/channel_manager.c | 90 +++++++++++++----- examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 92 +++++++++++++------ examples/vm_power_manager/main.c | 2 +- 5 files changed, 150 insertions(+), 102 deletions(-)
doc/guides/sample_app_ug/vm_power_management.rst +14 -47
@@ -380,9 +380,16 @@ parsing functionality will not be present in the app. Sending a command or policy to the power manager application is achieved by simply opening a fifo file, writing a JSON string to that fifo, and closing -the file. +the file. In actual implementation every core has own dedicated fifo[0..n], +where n is number of the last available core. +Having a dedicated fifo file per core allows using standard filesystem permissions +to ensure a given container can only write JSON commands into fifos it is allowed +to use. -The fifo is at /tmp/powermonitor/fifo +The fifo is at /tmp/powermonitor/fifo[0..n] + +For example all cmds put to the /tmp/powermonitor/fifo7, will have +effect only on CPU[7]. The JSON string can be a policy or instruction, and takes the following format:
@@ -405,19 +412,6 @@ arrays, etc. Examples of policies follow later in this document. The allowed names and value types are as follows: -:Pair Name: "name" -:Description: Name of the VM or Host. Allows the parser to associate the - policy with the relevant VM or Host OS. -:Type: string -:Values: any valid string -:Required: yes -:Example: - - .. code-block:: javascript - - "name", "ubuntu2" - - :Pair Name: "command" :Description: The type of packet we're sending to the power manager. We can be creating or destroying a policy, or sending a direct command to adjust
@@ -509,17 +503,6 @@ names and value types are as follows: "max_packet_thresh": 500000 -:Pair Name: "core_list" -:Description: The cores to which to apply the policy. -:Type: array of integers -:Values: array with list of virtual CPUs. -:Required: only policy CREATE/DESTROY -:Example: - - .. code-block:: javascript - - "core_list":[ 10, 11 ] - :Pair Name: "workload" :Description: When our policy is of type WORKLOAD, we need to specify how heavy our workload is.
@@ -566,17 +549,6 @@ names and value types are as follows: "unit", "SCALE_MAX" -:Pair Name: "resource_id" -:Description: The core to which to apply the power command. -:Type: integer -:Values: valid core id for VM or host OS. -:Required: only POWER instruction -:Example: - - .. code-block:: javascript - - "resource_id": 10 - JSON API Examples ~~~~~~~~~~~~~~~~~
@@ -585,12 +557,10 @@ Profile create example: .. code-block:: javascript {"policy": { - "name": "ubuntu", "command": "create", "policy_type": "TIME", "busy_hours":[ 17, 18, 19, 20, 21, 22, 23 ], - "quiet_hours":[ 2, 3, 4, 5, 6 ], - "core_list":[ 11 ] + "quiet_hours":[ 2, 3, 4, 5, 6 ] }} Profile destroy example:
@@ -598,8 +568,7 @@ Profile destroy example: .. code-block:: javascript {"policy": { - "name": "ubuntu", - "command": "destroy", + "command": "destroy" }} Power command example:
@@ -607,18 +576,16 @@ Power command example: .. code-block:: javascript {"instruction": { - "name": "ubuntu", "command": "power", - "unit": "SCALE_MAX", - "resource_id": 10 + "unit": "SCALE_MAX" }} To send a JSON string to the Power Manager application, simply paste the -example JSON string into a text file and cat it into the fifo: +example JSON string into a text file and cat it into the proper fifo: .. code-block:: console - cat file.json >/tmp/powermonitor/fifo + cat file.json >/tmp/powermonitor/fifo[0..n] The console of the Power Manager application should indicate the command that was just received via the fifo.
examples/vm_power_manager/channel_manager.c +65 -25
117 lines not on this page · raw message
examples/vm_power_manager/channel_manager.h +5 -2
@@ -22,6 +22,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
@@ -206,13 +209,13 @@ int add_channels(const char *vm_name, unsigned *channel_list, unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be
examples/vm_power_manager/channel_monitor.c +65 -27
201 lines not on this page · raw message
examples/vm_power_manager/main.c +1 -1
@@ -434,7 +434,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id);
Signature · 1 line
2.17.1
Quoted 30 lines · David Hunt
From: Marcin Hajkowski <[email protected]>
This patch implements a separate FIFO for each cpu core to improve the previous functionality where anyone with access to the FIFO could affect any core on the system. By using appropriate permissions, fifo interfaces can be configured to only affect the particular cores.
Because each FIFO is per core, the following fields have been removed from the command JSON format:
core_list,resource_id, name.Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>Signed-off-by Marcin Hajkowski <[email protected]>Tested-by David Hunt <[email protected]>---
v2:
* updated handlingvm_name(use proper buff size)
* rebase to master changesv3:
* improvement to coding stylev4:
* rebase to tip of masterv5:
* merged docs into same patch as the code, as per mailing list policy
* made changes out of review by Anatoly.
---
<snip>
Quoted 28 lines
examples/vm_power_manager/channel_manager.c +25
-3-if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; + ret =fifo_path (socket_path,sizeof (socket_path), i); +if (ret <0 ) + goto error; + + ret =mkfifo (socket_path,0660 ); +RTE_LOG (DEBUG ,CHANNEL_MANAGER ,"TRY CREATE fifo '%s'\n" , + socket_path); +if ((errno !=EEXIST ) && (ret <0 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " +"%s\n" , socket_path,strerror (errno)); + goto error; + } + chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " +"channel '%s'\n" , socket_path); + goto error; + } + chan_infos[i] = chan_info; +rte_strlcpy (chan_info->channel_path, socket_path, +sizeof (chan_info->channel_path)); + +if (setup_host_channel_info (&chan_info, i) <0 ) { +rte_free (chan_info); + chan_infos[i] =NULL ;
examples/vm_power_manager/channel_manager.c add_channels(const char *vm_name, unsigned *channel_list, · line 605
Quoted 10 lines
examples/vm_power_manager/channel_manager.c +6
-1+ goto error; + } + num_channels_enabled++; } - num_channels_enabled++;return num_channels_enabled; +error: +/* Clean up the channels opened before we hit an error. */ +for (i =0 ; i <RTE_MAX_LCORE ; i++) {
You're going up to RTE_MAX_LCORE here, but up to ci->core_count in the original loop. Is that intentional?
Other than that,
Signature · 2 lines
Thanks, Anatoly
Hi Anatoly,
Quoted 76 lines · Anatoly
Quoted 30 lines · David Hunt
From: Marcin Hajkowski <[email protected]>
This patch implements a separate FIFO for each cpu core to improve the previous functionality where anyone with access to the FIFO could affect any core on the system. By using appropriate permissions, fifo interfaces can be configured to only affect the particular cores.
Because each FIFO is per core, the following fields have been removed from the command JSON format:
core_list,resource_id, name.Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>Signed-off-by Marcin Hajkowski <[email protected]>Tested-by David Hunt <[email protected]>---
v2:
* updated handlingvm_name(use proper buff size)
* rebase to master changesv3:
* improvement to coding stylev4:
* rebase to tip of masterv5:
* merged docs into same patch as the code, as per mailing list policy
* made changes out of review by Anatoly.
---<snip>
Quoted 31 lines
- if (
setup_host_channel_info(&chan_info, 0)< 0) {
-rte_free(chan_info);
- return 0;
+ ret =fifo_path(socket_path, sizeof(socket_path), i); + if (ret < 0)
+ goto error;
+
+ ret =mkfifo(socket_path, 0660);
+RTE_LOG(DEBUG, CHANNEL_MANAGER, "TRY CREATE fifo '%s'\n", + socket_path);
+ if ((errno != EEXIST) && (ret < 0)) {
+ RTE_LOG(ERR,CHANNEL_MANAGER, "Cannot create fifo '%s'
error: "
+ "%s\n",socket_path, strerror(errno)); + goto error;
+ }
+chan_info=rte_malloc(NULL, sizeof(*chan_info), 0); + if (chan_info== NULL) {
+ RTE_LOG(ERR,CHANNEL_MANAGER, "Error allocating memory for "
+ "channel '%s'\n",socket_path);
+ goto error;
+ }
+ chan_infos[i] =chan_info;
+ rte_strlcpy(chan_info->channel_path,socket_path, +sizeof(chan_info->channel_path));
+
+ if (setup_host_channel_info(&chan_info, i)< 0) { +rte_free(chan_info);
+ chan_infos[i] = NULL;
+ goto error;Quoted 8 lines
+ }
+ num_channels_enabled++;
}
- num_channels_enabled++;
returnnum_channels_enabled;
+error:
+ /* Clean up the channels opened before we hit an error. */ + for (i = 0; i <RTE_MAX_LCORE; i++) {You're going up to
RTE_MAX_LCOREhere, but up toci->core_countin the original loop. Is that intentional?
Quoted 4 lines
Other than that,
Acked-by Anatoly Burakov <[email protected]>
Just to be totally clean, I've fixed the loop limit, and respun as v6. :)
Thanks for the review.
Rgds,
Dave.
PATCH v6 1/1 power: add fifo per core for JSON interface
In reply to HajkowskiFrom: Marcin Hajkowski <[email protected]>
This patch implements a separate FIFO for each cpu core to improve the previous functionality where anyone with access to the FIFO could affect any core on the system. By using appropriate permissions, fifo interfaces can be configured to only affect the particular cores.
Because each FIFO is per core, the following fields have been removed from the command JSON format: core_list, resource_id, name.
---
v2:
* updated handling vm_name (use proper buff size)
* rebase to master changes
v3:
* improvement to coding style
v4:
* rebase to tip of master
v5:
* merged docs into same patch as the code, as per mailing list policy
* made changes out of review by Anatoly.
v6:
* Slight optimisation in the range of a for loop.
--- .../sample_app_ug/vm_power_management.rst | 61 +++--------- examples/vm_power_manager/channel_manager.c | 90 +++++++++++++----- examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 92 +++++++++++++------ examples/vm_power_manager/main.c | 2 +- 5 files changed, 150 insertions(+), 102 deletions(-)
doc/guides/sample_app_ug/vm_power_management.rst +14 -47
@@ -380,9 +380,16 @@ parsing functionality will not be present in the app. Sending a command or policy to the power manager application is achieved by simply opening a fifo file, writing a JSON string to that fifo, and closing -the file. +the file. In actual implementation every core has own dedicated fifo[0..n], +where n is number of the last available core. +Having a dedicated fifo file per core allows using standard filesystem permissions +to ensure a given container can only write JSON commands into fifos it is allowed +to use. -The fifo is at /tmp/powermonitor/fifo +The fifo is at /tmp/powermonitor/fifo[0..n] + +For example all cmds put to the /tmp/powermonitor/fifo7, will have +effect only on CPU[7]. The JSON string can be a policy or instruction, and takes the following format:
@@ -405,19 +412,6 @@ arrays, etc. Examples of policies follow later in this document. The allowed names and value types are as follows: -:Pair Name: "name" -:Description: Name of the VM or Host. Allows the parser to associate the - policy with the relevant VM or Host OS. -:Type: string -:Values: any valid string -:Required: yes -:Example: - - .. code-block:: javascript - - "name", "ubuntu2" - - :Pair Name: "command" :Description: The type of packet we're sending to the power manager. We can be creating or destroying a policy, or sending a direct command to adjust
@@ -509,17 +503,6 @@ names and value types are as follows: "max_packet_thresh": 500000 -:Pair Name: "core_list" -:Description: The cores to which to apply the policy. -:Type: array of integers -:Values: array with list of virtual CPUs. -:Required: only policy CREATE/DESTROY -:Example: - - .. code-block:: javascript - - "core_list":[ 10, 11 ] - :Pair Name: "workload" :Description: When our policy is of type WORKLOAD, we need to specify how heavy our workload is.
@@ -566,17 +549,6 @@ names and value types are as follows: "unit", "SCALE_MAX" -:Pair Name: "resource_id" -:Description: The core to which to apply the power command. -:Type: integer -:Values: valid core id for VM or host OS. -:Required: only POWER instruction -:Example: - - .. code-block:: javascript - - "resource_id": 10 - JSON API Examples ~~~~~~~~~~~~~~~~~
@@ -585,12 +557,10 @@ Profile create example: .. code-block:: javascript {"policy": { - "name": "ubuntu", "command": "create", "policy_type": "TIME", "busy_hours":[ 17, 18, 19, 20, 21, 22, 23 ], - "quiet_hours":[ 2, 3, 4, 5, 6 ], - "core_list":[ 11 ] + "quiet_hours":[ 2, 3, 4, 5, 6 ] }} Profile destroy example:
@@ -598,8 +568,7 @@ Profile destroy example: .. code-block:: javascript {"policy": { - "name": "ubuntu", - "command": "destroy", + "command": "destroy" }} Power command example:
@@ -607,18 +576,16 @@ Power command example: .. code-block:: javascript {"instruction": { - "name": "ubuntu", "command": "power", - "unit": "SCALE_MAX", - "resource_id": 10 + "unit": "SCALE_MAX" }} To send a JSON string to the Power Manager application, simply paste the -example JSON string into a text file and cat it into the fifo: +example JSON string into a text file and cat it into the proper fifo: .. code-block:: console - cat file.json >/tmp/powermonitor/fifo + cat file.json >/tmp/powermonitor/fifo[0..n] The console of the Power Manager application should indicate the command that was just received via the fifo.
examples/vm_power_manager/channel_manager.c +65 -25
117 lines not on this page · raw message
examples/vm_power_manager/channel_manager.h +5 -2
@@ -22,6 +22,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
@@ -206,13 +209,13 @@ int add_channels(const char *vm_name, unsigned *channel_list, unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be
examples/vm_power_manager/channel_monitor.c +65 -27
201 lines not on this page · raw message
examples/vm_power_manager/main.c +1 -1
@@ -434,7 +434,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id);
Signature · 1 line
2.17.1
Hi Thomas,
Fyi, I am unable mark v4 as superseded in patchwork (http://patches.dpdk.org/project/dpdk/list/?series=4997), although I've done that with v5, v6 is the latest version.
Rgds,
Dave.
Quoted 549 lines · David Hunt
From: Marcin Hajkowski <[email protected]>
This patch implements a separate FIFO for each cpu core to improve the previous functionality where anyone with access to the FIFO could affect any core on the system. By using appropriate permissions, fifo interfaces can be configured to only affect the particular cores.
Because each FIFO is per core, the following fields have been removed from the command JSON format:
core_list,resource_id, name.Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>Signed-off-by Marcin Hajkowski <[email protected]>Tested-by David Hunt <[email protected]>Acked-by Anatoly Burakov <[email protected]>---
v2:
* updated handlingvm_name(use proper buff size)
* rebase to master changesv3:
* improvement to coding stylev4:
* rebase to tip of masterv5:
* merged docs into same patch as the code, as per mailing list policy
* made changes out of review by Anatoly.v6:
* Slight optimisation in the range of a for loop.--- .../sample_app_ug/vm_power_management.rst | 61 +++--------- examples/vm_power_manager/channel_manager.c | 90 +++++++++++++----- examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 92 +++++++++++++------ examples/vm_power_manager/main.c | 2 +- 5 files changed, 150 insertions(+), 102 deletions(-)doc/guides/sample_app_ug/vm_power_management.rst +14
-47@@ -380,9 +380,16 @@ parsing functionality will not be present in the app. Sending a command or policy to the power manager application is achieved by simply opening a fifo file, writing a JSON string to that fifo, and closing -the file. +the file. In actual implementation every core has own dedicated fifo[0..n], +where n is number of the last available core. +Having a dedicated fifo file per core allows using standard filesystem permissions +to ensure a given container can only write JSON commands into fifos it is allowed +to use. -The fifo is at /tmp/powermonitor/fifo +The fifo is at /tmp/powermonitor/fifo[0..n] + +For example all cmds put to the /tmp/powermonitor/fifo7, will have +effect only on CPU[7]. The JSON string can be a policy or instruction, and takes the following format:@@ -405,19 +412,6 @@ arrays, etc. Examples of policies follow later in this document. The allowed names and value types are as follows: -:Pair Name: "name" -:Description: Name of the VM or Host. Allows the parser to associate the - policy with the relevant VM or Host OS. -:Type: string -:Values: any valid string -:Required: yes -:Example: - - .. code-block:: javascript - - "name", "ubuntu2" - - :Pair Name: "command" :Description: The type of packet we're sending to the power manager. We can be creating or destroying a policy, or sending a direct command to adjust@@ -509,17 +503,6 @@ names and value types are as follows: "max_packet_thresh": 500000 -:Pair Name: "core_list" -:Description: The cores to which to apply the policy. -:Type: array of integers -:Values: array with list of virtual CPUs. -:Required: only policy CREATE/DESTROY -:Example: - - .. code-block:: javascript - - "core_list":[ 10, 11 ] - :Pair Name: "workload" :Description: When our policy is of type WORKLOAD, we need to specify how heavy our workload is.@@ -566,17 +549,6 @@ names and value types are as follows: "unit", "SCALE_MAX" -:Pair Name: "resource_id" -:Description: The core to which to apply the power command. -:Type: integer -:Values: valid core id for VM or host OS. -:Required: only POWER instruction -:Example: - - .. code-block:: javascript - - "resource_id": 10 - JSON API Examples ~~~~~~~~~~~~~~~~~@@ -585,12 +557,10 @@ Profile create example: .. code-block:: javascript {"policy": { - "name": "ubuntu", "command": "create", "policy_type": "TIME", "busy_hours":[ 17, 18, 19, 20, 21, 22, 23 ], - "quiet_hours":[ 2, 3, 4, 5, 6 ], - "core_list":[ 11 ] + "quiet_hours":[ 2, 3, 4, 5, 6 ] }} Profile destroy example:@@ -598,8 +568,7 @@ Profile destroy example: .. code-block:: javascript {"policy": { - "name": "ubuntu", - "command": "destroy", + "command": "destroy" }} Power command example:@@ -607,18 +576,16 @@ Power command example: .. code-block:: javascript {"instruction": { - "name": "ubuntu", "command": "power", - "unit": "SCALE_MAX", - "resource_id": 10 + "unit": "SCALE_MAX" }} To send a JSON string to the Power Manager application, simply paste the -example JSON string into a text file and cat it into the fifo: +example JSON string into a text file and cat it into the proper fifo: .. code-block:: console - cat file.json >/tmp/powermonitor/fifo + cat file.json >/tmp/powermonitor/fifo[0..n] The console of the Power Manager application should indicate the command that was just received via the fifo.examples/vm_power_manager/channel_manager.c +65
-25@@ -345,10 +345,22 @@ setup_channel_info(struct virtual_machine_info **vm_info_dptr,return 0 ; } -static void -fifo_path (char *dst,unsigned int len) +static int +fifo_path (char *dst,unsigned int len,unsigned int id) { -snprintf (dst, len,"%sfifo" ,CHANNEL_MGR_SOCKET_PATH ); +int cnt; + + cnt =snprintf (dst, len,"%s%s%d" ,CHANNEL_MGR_SOCKET_PATH , +CHANNEL_MGR_FIFO_PATTERN_NAME , id); + +if ((cnt <0 ) || (cnt > (int )len -1 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Could not create proper " +"string for fifo path\n" ); + +return -1 ; + } + +return 0 ; } static int@@ -534,42 +546,70 @@ add_channels(const char *vm_name, unsigned *channel_list, }int -add_host_channel (void ) +add_host_channels (void ) {struct channel_info *chan_info;char socket_path[PATH_MAX ];int num_channels_enabled =0 ;int ret; +struct core_info *ci; +struct channel_info *chan_infos[RTE_MAX_LCORE ]; +int i; -fifo_path (socket_path,sizeof (socket_path)); +for (i =0 ; i <RTE_MAX_LCORE ; i++) + chan_infos[i] =NULL ; - ret =mkfifo (socket_path,0660 ); -if ((errno !=EEXIST ) && (ret <0 )) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " -"%s\n" , socket_path,strerror (errno)); + ci =get_core_info (); +if (ci ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot allocate memory for core_info\n" );return 0 ; } -if (access (socket_path,F_OK ) <0 ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Channel path '%s' error: " -"%s\n" , socket_path,strerror (errno)); -return 0 ; - } - chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); -if (chan_info ==NULL ) { -RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " -"channel '%s'\n" , socket_path); -return 0 ; - } -rte_strlcpy (chan_info->channel_path, socket_path,UNIX_PATH_MAX ); +for (i =0 ; i < ci->core_count; i++) { +if (ci->cd[i].global_enabled_cpus ==0 ) +continue ; -if (setup_host_channel_info (&chan_info,0 ) <0 ) { -rte_free (chan_info); -return 0 ; + ret =fifo_path (socket_path,sizeof (socket_path), i); +if (ret <0 ) + goto error; + + ret =mkfifo (socket_path,0660 ); +RTE_LOG (DEBUG ,CHANNEL_MANAGER ,"TRY CREATE fifo '%s'\n" , + socket_path); +if ((errno !=EEXIST ) && (ret <0 )) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Cannot create fifo '%s' error: " +"%s\n" , socket_path,strerror (errno)); + goto error; + } + chan_info =rte_malloc (NULL ,sizeof (*chan_info),0 ); +if (chan_info ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MANAGER ,"Error allocating memory for " +"channel '%s'\n" , socket_path); + goto error; + } + chan_infos[i] = chan_info; +rte_strlcpy (chan_info->channel_path, socket_path, +sizeof (chan_info->channel_path)); + +if (setup_host_channel_info (&chan_info, i) <0 ) { +rte_free (chan_info); + chan_infos[i] =NULL ; + goto error; + } + num_channels_enabled++; } - num_channels_enabled++;return num_channels_enabled; +error: +/* Clean up the channels opened before we hit an error. */ +for (i =0 ; i < ci->core_count; i++) { +if (chan_infos[i] !=NULL ) { +remove_channel_from_monitor (chan_infos[i]); +close (chan_infos[i]->fd); +rte_free (chan_infos[i]); + } + } +return 0 ; }int examples/vm_power_manager/channel_manager.h +5
-2@@ -22,6 +22,9 @@ extern "C" {/* File socket directory */ #define CHANNEL_MGR_SOCKET_PATH "/tmp/powermonitor/" +/* FIFO file name template */ +#define CHANNEL_MGR_FIFO_PATTERN_NAME "fifo" +#ifndef UNIX_PATH_MAX struct sockaddr_un _sockaddr_un;#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)@@ -206,13 +209,13 @@ int add_channels(const char *vm_name, unsigned *channel_list, unsigned num_channels);/** -* Set up a fifo by which host applications can send command an policies +* Set up fifos by which host applications can send command an policies * through a fifo to the vm_power_manager * * @return * - 0 for success */ -int add_host_channel (void ); +int add_host_channels (void );/** * Remove a channel definition from the channel manager. This must only be examples/vm_power_manager/channel_monitor.c +65
-27@@ -29,6 +29,7 @@#include <rte_cycles.h> #include <rte_ethdev.h> #include <rte_pmd_i40e.h> +#include <rte_string_fns.h> #include <libvirt/libvirt.h> #include "channel_monitor.h" @@ -51,7 +52,7 @@ static volatile unsigned run_loop = 1;static int global_event_fd;static unsigned int policy_is_set;static struct epoll_event *global_events_list; -static struct policy policies[MAX_CLIENTS ]; +static struct policy policies[RTE_MAX_LCORE ];#ifdef USE_JANSSON @@ -130,13 +131,45 @@ set_policy_mac(struct channel_packet *pkt, int idx, char *mac)return 0 ; } +static char * +get_resource_name_from_chn_path (const char *channel_path) +{ +char *substr =NULL ; + + substr =strstr (channel_path,CHANNEL_MGR_FIFO_PATTERN_NAME ); + +return substr; +}static int -parse_json_to_pkt (json_t *element,struct channel_packet *pkt) +get_resource_id_from_vmname (const char *vm_name) +{ +int result =-1 ; +int off =0 ; + +if (vm_name ==NULL ) +return -1 ; + +while (vm_name[off] !='\0' ) { +if (isdigit (vm_name[off])) +break ; + off++; + } + result =atoi (&vm_name[off]); +if ((result ==0 ) && (vm_name[off] !='0' )) +return -1 ; + +return result; +} + +static int +parse_json_to_pkt (json_t *element,struct channel_packet *pkt, +const char *vm_name) {const char *key;json_t *value;int ret; +int resource_id;memset (pkt,0 ,sizeof (struct channel_packet ));@@ -147,20 +180,23 @@ parse_json_to_pkt(json_t *element, struct channel_packet *pkt) pkt->command =PKT_POLICY ; pkt->core_type =CORE_TYPE_PHYSICAL ; +if (vm_name ==NULL ) { +RTE_LOG (ERR ,CHANNEL_MONITOR , +"vm_name is NULL, request rejected !\n" ); +return -1 ; + } + json_object_foreach(element, key, value) {if (!strcmp (key,"policy" )) {/* Recurse in to get the contents of profile */ - ret =parse_json_to_pkt (value, pkt); + ret =parse_json_to_pkt (value, pkt, vm_name);if (ret)return ret; }else if (!strcmp (key,"instruction" )) {/* Recurse in to get the contents of instruction */ - ret =parse_json_to_pkt (value, pkt); + ret =parse_json_to_pkt (value, pkt, vm_name);if (ret)return ret; - }else if (!strcmp (key,"name" )) { -strlcpy (pkt->vm_name,json_string_value (value), -sizeof (pkt->vm_name)); }else if (!strcmp (key,"command" )) {char command[32 ];strlcpy (command,json_string_value (value),32 );@@ -223,16 +259,6 @@ parse_json_to_pkt(json_t *element, struct channel_packet *pkt) json_array_get(value, i)); pkt->timer_policy.quiet_hours[i] = hour; } - }else if (!strcmp (key,"core_list" )) { -unsigned int i; -size_t size =json_array_size (value); - -for (i =0 ; i < size; i++) { -int core = (int )json_integer_value ( -json_array_get (value, i)); - pkt->vcpu_to_control[i] = core; - } - pkt->num_vcpu = size; }else if (!strcmp (key,"mac_list" )) {unsigned int i;size_t size =json_array_size (value);@@ -271,13 +297,21 @@ parse_json_to_pkt(json_t *element, struct channel_packet *pkt) "Invalid command received in JSON\n");return -1 ; } - }else if (!strcmp (key,"resource_id" )) { - pkt->resource_id = (uint32_t )json_integer_value (value); }else {RTE_LOG (ERR ,CHANNEL_MONITOR ,"Unknown key received in JSON string: %s\n" , key); } + + resource_id =get_resource_id_from_vmname (vm_name); +if (resource_id <0 ) { +RTE_LOG (ERR ,CHANNEL_MONITOR , +"Could not get resource_id from vm_name:%s\n" , + vm_name); +return -1 ; + } +rte_strlcpy (pkt->vm_name, vm_name,VM_MAX_NAME_SZ ); + pkt->resource_id = resource_id; }return 0 ; }@@ -427,13 +461,13 @@ update_policy(struct channel_packet *pkt) {unsigned int updated =0 ; -int i; +unsigned int i;RTE_LOG (INFO ,CHANNEL_MONITOR ,"Applying policy for %s\n" , pkt->vm_name); -for (i =0 ; i <MAX_CLIENTS ; i++) { +for (i =0 ; i <RTE_DIM (policies); i++) {if (strcmp (policies[i].pkt.vm_name, pkt->vm_name) ==0 ) {/* Copy the contents of *pkt into the policy.pkt */ policies[i].pkt = *pkt;@@ -451,7 +485,7 @@ update_policy(struct channel_packet *pkt) } }if (!updated) { -for (i =0 ; i <MAX_CLIENTS ; i++) { +for (i =0 ; i <RTE_DIM (policies); i++) {if (policies[i].enabled ==0 ) { policies[i].pkt = *pkt;get_pcpu_to_control (&policies[i]);@@ -474,13 +508,13 @@ update_policy(struct channel_packet *pkt)static int remove_policy(struct channel_packet *pkt __rte_unused) { -int i; +unsigned int i;/* * Disabling the policy is simply a case of setting * enabled to 0 */ -for (i =0 ; i <MAX_CLIENTS ; i++) { +for (i =0 ; i <RTE_DIM (policies); i++) {if (strcmp (policies[i].pkt.vm_name, pkt->vm_name) ==0 ) { policies[i].enabled =0 ;return 0 ;@@ -801,6 +835,8 @@ read_json_packet(struct channel_info *chan_info)int n_bytes, ret;json_t *root;json_error_t error; +const char *resource_name; +/* read opening brace to closing brace */ do {@@ -832,13 +868,15 @@ read_json_packet(struct channel_info *chan_info) root =json_loads (json_data,0 , &error);if (root) { + resource_name =get_resource_name_from_chn_path ( + chan_info->channel_path);/* * Because our data is now in the json * object, we can overwrite the pkt * with a channel_packet struct, using * parse_json_to_pkt() */ - ret =parse_json_to_pkt (root, &pkt); + ret =parse_json_to_pkt (root, &pkt, resource_name);json_decref (root);if (ret) { RTE_LOG(ERR, CHANNEL_MONITOR,@@ -895,9 +933,9 @@ run_channel_monitor(void) }rte_delay_us (time_period_ms*1000 );if (policy_is_set) { -int j; +unsigned int j; -for (j =0 ; j <MAX_CLIENTS ; j++) { +for (j =0 ; j <RTE_DIM (policies); j++) {if (policies[j].enabled ==1 )apply_policy (&policies[j]); }examples/vm_power_manager/main.c +1
-1@@ -434,7 +434,7 @@ main(int argc, char **argv)return -1 ; } -add_host_channel (); +add_host_channels ();printf ("Running core monitor on lcore id %d\n" , lcore_id);rte_eal_remote_launch (run_core_monitor,NULL , lcore_id);
09/07/2019 17:27, Hunt, David:
Quoted 5 lines
Hi Thomas,
Fyi, I am unable mark v4 as superseded in patchwork
(http://patches.dpdk.org/project/dpdk/list/?series=4997), although I've done that with v5, v6 is the latest version.
OK, done, thanks
Thomas Monjalon
Applied09/07/2019 17:21, David Hunt:
Quoted 7 lines
From: Marcin Hajkowski <[email protected]>
This patch implements a separate FIFO for each cpu core to improve the previous functionality where anyone with access to the FIFO could affect any core on the system. By using appropriate permissions, fifo interfaces can be configured to only affect the particular cores.
Quoted 8 lines
Because each FIFO is per core, the following fields have been removed from the command JSON format:
core_list,resource_id, name.Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>Signed-off-by Marcin Hajkowski <[email protected]>Tested-by David Hunt <[email protected]>Acked-by Anatoly Burakov <[email protected]>
Applied, thanks
PS: I removed a duplicated include of rte_string_fns.h
PATCH v4 2/2 doc: update according to the fifo per core impl
In reply to HajkowskiFrom: Marcin Hajkowski <[email protected]>
Updated power management docs for fifo JSON API.
Removed from JSON API:
* 'name'
* 'resource_id'
* 'core_list'
--- .../sample_app_ug/vm_power_management.rst | 61 +++++-------------- 1 file changed, 14 insertions(+), 47 deletions(-)
doc/guides/sample_app_ug/vm_power_management.rst +14 -47
@@ -380,9 +380,16 @@ parsing functionality will not be present in the app. Sending a command or policy to the power manager application is achieved by simply opening a fifo file, writing a JSON string to that fifo, and closing -the file. +the file. In actual implementation every core has own dedicated fifo[0..n], +where n is number of the last available core. +Having a dedicated fifo file per core allows using standard filesystem permissions +to ensure a given container can only write JSON commands into fifos it is allowed +to use. -The fifo is at /tmp/powermonitor/fifo +The fifo is at /tmp/powermonitor/fifo[0..n] + +For example all cmds put to the /tmp/powermonitor/fifo7, will have +effect only on CPU[7]. The JSON string can be a policy or instruction, and takes the following format:
@@ -405,19 +412,6 @@ arrays, etc. Examples of policies follow later in this document. The allowed names and value types are as follows: -:Pair Name: "name" -:Description: Name of the VM or Host. Allows the parser to associate the - policy with the relevant VM or Host OS. -:Type: string -:Values: any valid string -:Required: yes -:Example: - - .. code-block:: javascript - - "name", "ubuntu2" - - :Pair Name: "command" :Description: The type of packet we're sending to the power manager. We can be creating or destroying a policy, or sending a direct command to adjust
@@ -509,17 +503,6 @@ names and value types are as follows: "max_packet_thresh": 500000 -:Pair Name: "core_list" -:Description: The cores to which to apply the policy. -:Type: array of integers -:Values: array with list of virtual CPUs. -:Required: only policy CREATE/DESTROY -:Example: - - .. code-block:: javascript - - "core_list":[ 10, 11 ] - :Pair Name: "workload" :Description: When our policy is of type WORKLOAD, we need to specify how heavy our workload is.
@@ -566,17 +549,6 @@ names and value types are as follows: "unit", "SCALE_MAX" -:Pair Name: "resource_id" -:Description: The core to which to apply the power command. -:Type: integer -:Values: valid core id for VM or host OS. -:Required: only POWER instruction -:Example: - - .. code-block:: javascript - - "resource_id": 10 - JSON API Examples ~~~~~~~~~~~~~~~~~
@@ -585,12 +557,10 @@ Profile create example: .. code-block:: javascript {"policy": { - "name": "ubuntu", "command": "create", "policy_type": "TIME", "busy_hours":[ 17, 18, 19, 20, 21, 22, 23 ], - "quiet_hours":[ 2, 3, 4, 5, 6 ], - "core_list":[ 11 ] + "quiet_hours":[ 2, 3, 4, 5, 6 ] }} Profile destroy example:
@@ -598,8 +568,7 @@ Profile destroy example: .. code-block:: javascript {"policy": { - "name": "ubuntu", - "command": "destroy", + "command": "destroy" }} Power command example:
@@ -607,18 +576,16 @@ Power command example: .. code-block:: javascript {"instruction": { - "name": "ubuntu", "command": "power", - "unit": "SCALE_MAX", - "resource_id": 10 + "unit": "SCALE_MAX" }} To send a JSON string to the Power Manager application, simply paste the -example JSON string into a text file and cat it into the fifo: +example JSON string into a text file and cat it into the proper fifo: .. code-block:: console - cat file.json >/tmp/powermonitor/fifo + cat file.json >/tmp/powermonitor/fifo[0..n] The console of the Power Manager application should indicate the command that was just received via the fifo.
Signature · 1 line
2.17.2
Re: [dpdk-dev] [PATCH v4 2/2] doc: update according to the fifo per core impl
Quoted 8 lines · Hajkowski
From: Marcin Hajkowski <[email protected]>
Updated power management docs for fifo JSON API.
Removed from JSON API:
* 'name'
* 'resource_id'
* 'core_list'
Quoted 4 lines
Signed-off-by Marcin Hajkowski <[email protected]>Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>---
I think current policy is, doc updates should be part of the patch that introduces the changes.
Signature · 2 lines
Thanks, Anatoly
Re: [dpdk-dev] [PATCH v4 2/2] doc: update according to the fifo per core impl
Hi Anatoly,
Quoted 9 lines · Anatoly
Quoted 8 lines · Hajkowski
From: Marcin Hajkowski <[email protected]>
Updated power management docs for fifo JSON API.
Removed from JSON API:
* 'name'
* 'resource_id'
* 'core_list'
Quoted 7 lines
Quoted 4 lines
Signed-off-by Marcin Hajkowski <[email protected]>Signed-off-by Lukasz Krakowiak <[email protected]>Signed-off-by Lukasz Gosiewski <[email protected]>---
I think current policy is, doc updates should be part of the patch that introduces the changes.
Thanks, I'll squash into a single patch and re-spin.
Rgds,
Dave.
Re: [dpdk-dev] [PATCH v4 0/2] Fifo per core
In reply to Hajkowski13/06/2019 11:21, Hajkowski:
Quoted 3 lines
Marcin Hajkowski (2):
power: add fifo per core for JSON interface
doc: update according to the fifo per core impl
We are missing a review of these patches.
Quoted 24 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Lukasz Krakowiak
Sent: Monday, April 8, 2019 12:45 PM
To: Hunt, David <[email protected]>
Cc: [email protected]; Krakowiak, LukaszX <[email protected]>
Subject: [dpdk-dev] [PATCH 0/2] power: add fifo per core for JSON interfaceThis patch implement a separate FIFO for each cpu core. Dependency to commit:
5c7c96571b7b7051ecc286f36be0b3d95b49995e(power: update for handling fifo path string).Lukasz Krakowiak (2):
power: add fifo per core for JSON interface
doc: update according to the fifo per core impl.../sample_app_ug/vm_power_management.rst | 53 +++-------- examples/vm_power_manager/channel_manager.c | 85 +++++++++++------ examples/vm_power_manager/channel_manager.h | 7 +- examples/vm_power_manager/channel_monitor.c | 91 +++++++++++++---- -- examples/vm_power_manager/main.c | 2 +- 5 files changed, 140 insertions(+), 98 deletions(-)
Quoted 2 lines
--
2.19.2.windows.1
I belive this patchset should be marked as superseded since new version is provided by Lukasz Gosiewski:
http://patchwork.dpdk.org/cover/53036/