spapr-rtas: add ibm, get-vpd RTAS interface
PATCH v4 1/1 spapr-rtas: add ibm, get-vpd RTAS interface
This adds a handler for ibm,get-vpd RTAS calls, allowing pseries guest to collect host information. It is disabled by default to avoid unwanted information leakage. To enable it, use:
‘-M pseries,host-serial={passthrough|string},host-model={passthrough|string}’
Only the SE and TM keywords are returned at the moment. SE for Machine or Cabinet Serial Number and
TM for Machine Type and Model
The SE and TM keywords are controlled by 'host-serial' and 'host-model' options, respectively. In the case of 'passthrough', the SE shows the host 'system-id' information and the TM shows the host 'model' information.
Powerpc-utils tools can dispatch RTAS calls to retrieve host information using this ibm,get-vpd interface. The 'host-serial' and 'host-model' nodes of device-tree hold the same information but in a static manner, which is useless after a migration operation.
--- hw/ppc/spapr_rtas.c | 121 +++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 17 +++++- 2 files changed, 137 insertions(+), 1 deletion(-)
Update v4:
* Allows enable/disable host-serial and host-model options individually
hw/ppc/spapr_rtas.c +121 -0
@@ -287,6 +287,123 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu,rtas_st (rets,0 , ret); } +static inline int vpd_st (target_ulong addr,target_ulong len, +const void *val,uint16_t val_len) +{ +hwaddr phys =ppc64_phys_to_real (addr); +if (len < val_len) { +return RTAS_OUT_PARAM_ERROR ; + } +cpu_physical_memory_write (phys, val, val_len); +return RTAS_OUT_SUCCESS ; +} + +static inline void vpd_ret (target_ulong rets,const int status, +const int next_seq_number,const int bytes_returned) +{ +rtas_st (rets,0 , status); +rtas_st (rets,1 , next_seq_number); +rtas_st (rets,2 , bytes_returned); +} + +static void rtas_ibm_get_vpd_register_keywords (sPAPRMachineState *sm) +{ + sm->rtas_vpd_keywords =g_malloc0 (sizeof (uint8_t ) * +RTAS_IBM_VPD_KEYWORDS_MAX ); + +int i =0 ; +if (sm->host_serial && !g_str_equal (sm->host_serial,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_SE ; + } +if (sm->host_model && !g_str_equal (sm->host_model,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_TM ; + } +} + +static void rtas_ibm_get_vpd (PowerPCCPU *cpu, +sPAPRMachineState *spapr, +uint32_t token,uint32_t nargs, +target_ulong args, +uint32_t nret,target_ulong rets) +{ +target_ulong loc_code_addr; +target_ulong work_area_addr; +target_ulong work_area_size; +target_ulong seq_number; +unsigned char loc_code =0 ; +unsigned int next_seq_number =1 ; +int status =RTAS_IBM_GET_VPD_PARAMETER_ERROR ; +int ret =RTAS_OUT_PARAM_ERROR ; +char *buf =NULL ; +char *vpd_field =NULL ; +unsigned int vpd_field_len =0 ; + +/* RTAS not authorized if no keywords have been registered */ +if (!spapr->rtas_vpd_keywords[0 ]) { +vpd_ret (rets,RTAS_OUT_NOT_AUTHORIZED ,1 ,0 ); +return ; + } + + loc_code_addr =rtas_ld (args,0 ); + work_area_addr =rtas_ld (args,1 ); + work_area_size =rtas_ld (args,2 ); + seq_number =rtas_ld (args,3 ); + +/* Specific Location Code is not supported and seq_number */ +/* must be checked to avoid out of bound index error */ +cpu_physical_memory_read (loc_code_addr, &loc_code,1 ); +if ((loc_code !=0 ) || (seq_number <=0 ) || + (seq_number >RTAS_IBM_VPD_KEYWORDS_MAX )) { +vpd_ret (rets,RTAS_IBM_GET_VPD_PARAMETER_ERROR ,1 ,0 ); +return ; + } + +switch (spapr->rtas_vpd_keywords[seq_number -1 ]) { +case RTAS_IBM_VPD_KEYWORD_SE : +if (g_str_equal (spapr->host_serial,"passthrough" )) { +/* -M host-serial=passthrough */ +if (kvmppc_get_host_serial (&buf)) { +/* LoPAPR: SE for Machine or Cabinet Serial Number */ + vpd_field =g_strdup_printf ("SE %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("SE %s" , spapr->host_serial); + } +break ; +case RTAS_IBM_VPD_KEYWORD_TM : +if (g_str_equal (spapr->host_model,"passthrough" )) { +/* -M host-model=passthrough */ +if (kvmppc_get_host_model (&buf)) { +/* LoPAPR: TM for Machine Type and Model */ + vpd_field =g_strdup_printf ("TM %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("TM %s" , spapr->host_model); + } +break ; + } + +if (vpd_field) { + vpd_field_len =strlen (vpd_field); + ret =vpd_st (work_area_addr, work_area_size, + vpd_field, vpd_field_len +1 ); + +if (ret ==0 ) { + next_seq_number = seq_number +1 ; +if (spapr->rtas_vpd_keywords[next_seq_number -1 ]) { + status =RTAS_IBM_GET_VPD_CONTINUE ; + }else { + status =RTAS_IBM_GET_VPD_SUCCESS ; + next_seq_number =1 ; + } + } + } + +vpd_ret (rets, status, next_seq_number, vpd_field_len); +g_free (vpd_field); +g_free (buf); +} + static void rtas_ibm_os_term(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, uint32_t nargs,
@@ -464,6 +581,8 @@ void spapr_load_rtas(sPAPRMachineState *spapr, void *fdt, hwaddr addr) fdt_strerror(ret));exit (1 ); } + +rtas_ibm_get_vpd_register_keywords (spapr); }static void core_rtas_register_types (void )
@@ -485,6 +604,8 @@ static void core_rtas_register_types(void) rtas_ibm_set_system_parameter);spapr_rtas_register (RTAS_IBM_OS_TERM ,"ibm,os-term" , rtas_ibm_os_term); +spapr_rtas_register (RTAS_IBM_GET_VPD ,"ibm,get-vpd" , + rtas_ibm_get_vpd);spapr_rtas_register (RTAS_SET_POWER_LEVEL ,"set-power-level" , rtas_set_power_level); spapr_rtas_register(RTAS_GET_POWER_LEVEL, "get-power-level",
include/hw/ppc/spapr.h +16 -1
@@ -153,6 +153,7 @@ struct sPAPRMachineState {struct PPCTimebase tb;bool has_graphics;uint32_t vsmt;/* Virtual SMT mode (KVM's "core stride") */ +uint8_t *rtas_vpd_keywords;Notifier epow_notifier; QTAILQ_HEAD(, sPAPREventLogEntry) pending_events;
@@ -608,14 +609,28 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,#define RTAS_IBM_CREATE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x27)#define RTAS_IBM_REMOVE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x28)#define RTAS_IBM_RESET_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x29) +#define RTAS_IBM_GET_VPD (RTAS_TOKEN_BASE + 0x2A) -#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A) +#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2B)/* RTAS ibm,get-system-parameter token values */ #define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20#define RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE 42#define RTAS_SYSPARM_UUID 48 +/* RTAS ibm,get-vpd status values */ +#define RTAS_IBM_GET_VPD_VPD_CHANGED -4 +#define RTAS_IBM_GET_VPD_PARAMETER_ERROR -3 +#define RTAS_IBM_GET_VPD_HARDWARE_ERROR -1 +#define RTAS_IBM_GET_VPD_SUCCESS 0 +#define RTAS_IBM_GET_VPD_CONTINUE 1 + +/* RTAS ibm,get-vpd keywords index */ +#define RTAS_IBM_VPD_KEYWORD_SE 1 +#define RTAS_IBM_VPD_KEYWORD_TM 2 + +#define RTAS_IBM_VPD_KEYWORDS_MAX 2 +/* RTAS indicator/sensor types * * as defined by PAPR+ 2.7 7.3.5.4, Table 41
Signature · 1 line
2.20.1
Hi, Maxiwell.
Quoted 98 lines · Maxiwell S. Garcia
This adds a handler for ibm,get-vpd RTAS calls, allowing pseries guest to collect host information. It is disabled by default to avoid unwanted information leakage. To enable it, use:
‘-M pseries,host-serial={passthrough|string},host-model={passthrough|string}’
Only the SE and TM keywords are returned at the moment. SE for Machine or Cabinet Serial Number and
TM for Machine Type and ModelThe SE and TM keywords are controlled by 'host-serial' and 'host-model' options, respectively. In the case of 'passthrough', the SE shows the host 'system-id' information and the TM shows the host 'model' information.
Powerpc-utils tools can dispatch RTAS calls to retrieve host information using this ibm,get-vpd interface. The 'host-serial' and 'host-model' nodes of device-tree hold the same information but in a static manner, which is useless after a migration operation.
Signed-off-by Maxiwell S. Garcia <[email protected]>--- hw/ppc/spapr_rtas.c | 121 +++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 17 +++++- 2 files changed, 137 insertions(+), 1 deletion(-)Update v4:
* Allows enable/disable host-serial and host-model options individuallyhw/ppc/spapr_rtas.c +62
-0@@ -287,6 +287,123 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu,rtas_st (rets,0 , ret); } +static inline int vpd_st (target_ulong addr,target_ulong len, +const void *val,uint16_t val_len) +{ +hwaddr phys =ppc64_phys_to_real (addr); +if (len < val_len) { +return RTAS_OUT_PARAM_ERROR ; + } +cpu_physical_memory_write (phys, val, val_len); +return RTAS_OUT_SUCCESS ; +} + +static inline void vpd_ret (target_ulong rets,const int status, +const int next_seq_number,const int bytes_returned) +{ +rtas_st (rets,0 , status); +rtas_st (rets,1 , next_seq_number); +rtas_st (rets,2 , bytes_returned); +} + +static void rtas_ibm_get_vpd_register_keywords (sPAPRMachineState *sm) +{ + sm->rtas_vpd_keywords =g_malloc0 (sizeof (uint8_t ) * +RTAS_IBM_VPD_KEYWORDS_MAX ); + +int i =0 ; +if (sm->host_serial && !g_str_equal (sm->host_serial,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_SE ; + } +if (sm->host_model && !g_str_equal (sm->host_model,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_TM ; + } +} + +static void rtas_ibm_get_vpd (PowerPCCPU *cpu, +sPAPRMachineState *spapr, +uint32_t token,uint32_t nargs, +target_ulong args, +uint32_t nret,target_ulong rets) +{ +target_ulong loc_code_addr; +target_ulong work_area_addr; +target_ulong work_area_size; +target_ulong seq_number; +unsigned char loc_code =0 ; +unsigned int next_seq_number =1 ; +int status =RTAS_IBM_GET_VPD_PARAMETER_ERROR ; +int ret =RTAS_OUT_PARAM_ERROR ; +char *buf =NULL ; +char *vpd_field =NULL ; +unsigned int vpd_field_len =0 ; + +/* RTAS not authorized if no keywords have been registered */ +if (!spapr->rtas_vpd_keywords[0 ]) { +vpd_ret (rets,RTAS_OUT_NOT_AUTHORIZED ,1 ,0 ); +return ; + } + + loc_code_addr =rtas_ld (args,0 ); + work_area_addr =rtas_ld (args,1 ); + work_area_size =rtas_ld (args,2 ); + seq_number =rtas_ld (args,3 ); +
hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 361
Quoted 10 lines
hw/ppc/spapr_rtas.c +10
-0+/* Specific Location Code is not supported and seq_number */ +/* must be checked to avoid out of bound index error */ +cpu_physical_memory_read (loc_code_addr, &loc_code,1 ); +if ((loc_code !=0 ) || (seq_number <=0 ) || + (seq_number >RTAS_IBM_VPD_KEYWORDS_MAX )) { +vpd_ret (rets,RTAS_IBM_GET_VPD_PARAMETER_ERROR ,1 ,0 ); +return ; + } + +switch (spapr->rtas_vpd_keywords[seq_number -1 ]) {
Since seq_number comes from guest userspace, we shouldn't rely its value will always be within the range of the array.
We could perhaps return RTAS_OUT_NOT_AUTHORIZED if seq_number - 1 extrapolates the array range that holds the registered keywords.
Quoted 26 lines
hw/ppc/spapr_rtas.c +26
-0+case RTAS_IBM_VPD_KEYWORD_SE : +if (g_str_equal (spapr->host_serial,"passthrough" )) { +/* -M host-serial=passthrough */ +if (kvmppc_get_host_serial (&buf)) { +/* LoPAPR: SE for Machine or Cabinet Serial Number */ + vpd_field =g_strdup_printf ("SE %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("SE %s" , spapr->host_serial); + } +break ; +case RTAS_IBM_VPD_KEYWORD_TM : +if (g_str_equal (spapr->host_model,"passthrough" )) { +/* -M host-model=passthrough */ +if (kvmppc_get_host_model (&buf)) { +/* LoPAPR: TM for Machine Type and Model */ + vpd_field =g_strdup_printf ("TM %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("TM %s" , spapr->host_model); + } +break ; + } + +if (vpd_field) { + vpd_field_len =strlen (vpd_field);
hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 397
Quoted 10 lines
hw/ppc/spapr_rtas.c +10
-0+ ret =vpd_st (work_area_addr, work_area_size, + vpd_field, vpd_field_len +1 ); + +if (ret ==0 ) { + next_seq_number = seq_number +1 ; +if (spapr->rtas_vpd_keywords[next_seq_number -1 ]) { + status =RTAS_IBM_GET_VPD_CONTINUE ; + }else { + status =RTAS_IBM_GET_VPD_SUCCESS ; + next_seq_number =1 ;
If spapr->rtas_vpd_keywords[next_seq_number - 1] doesn't exist, shouldn't we set next_seq_number=RTAS_IBM_VPD_KEYWORDS_MAX here, indicating next_seq_number reached the last registered keyword?
Quoted 73 lines
hw/ppc/spapr_rtas.c +13
-0+ } + } + } + +vpd_ret (rets, status, next_seq_number, vpd_field_len); +g_free (vpd_field); +g_free (buf); +} + static void rtas_ibm_os_term(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, uint32_t nargs,@@ -464,6 +581,8 @@ void spapr_load_rtas(sPAPRMachineState *spapr, void *fdt, hwaddr addr) fdt_strerror(ret));exit (1 ); } + +rtas_ibm_get_vpd_register_keywords (spapr); }static void core_rtas_register_types (void )@@ -485,6 +604,8 @@ static void core_rtas_register_types(void) rtas_ibm_set_system_parameter);spapr_rtas_register (RTAS_IBM_OS_TERM ,"ibm,os-term" , rtas_ibm_os_term); +spapr_rtas_register (RTAS_IBM_GET_VPD ,"ibm,get-vpd" , + rtas_ibm_get_vpd);spapr_rtas_register (RTAS_SET_POWER_LEVEL ,"set-power-level" , rtas_set_power_level); spapr_rtas_register(RTAS_GET_POWER_LEVEL, "get-power-level",include/hw/ppc/spapr.h +16
-2@@ -153,6 +153,7 @@ struct sPAPRMachineState {struct PPCTimebase tb;bool has_graphics;uint32_t vsmt;/* Virtual SMT mode (KVM's "core stride") */ +uint8_t *rtas_vpd_keywords;Notifier epow_notifier; QTAILQ_HEAD(, sPAPREventLogEntry) pending_events;@@ -608,14 +609,28 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,#define RTAS_IBM_CREATE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x27)#define RTAS_IBM_REMOVE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x28)#define RTAS_IBM_RESET_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x29) +#define RTAS_IBM_GET_VPD (RTAS_TOKEN_BASE + 0x2A) -#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A) +#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2B)/* RTAS ibm,get-system-parameter token values */ #define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20#define RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE 42#define RTAS_SYSPARM_UUID 48 +/* RTAS ibm,get-vpd status values */ +#define RTAS_IBM_GET_VPD_VPD_CHANGED -4 +#define RTAS_IBM_GET_VPD_PARAMETER_ERROR -3 +#define RTAS_IBM_GET_VPD_HARDWARE_ERROR -1 +#define RTAS_IBM_GET_VPD_SUCCESS 0 +#define RTAS_IBM_GET_VPD_CONTINUE 1 + +/* RTAS ibm,get-vpd keywords index */ +#define RTAS_IBM_VPD_KEYWORD_SE 1 +#define RTAS_IBM_VPD_KEYWORD_TM 2 + +#define RTAS_IBM_VPD_KEYWORDS_MAX 2 +/* RTAS indicator/sensor types * * as defined by PAPR+ 2.7 7.3.5.4, Table 41 --
Quoted 3 lines
2.20.1
--
Murilo
Hi Murilo,
Quoted 115 lines · Murilo Opsfelder Araujo
Hi, Maxiwell.
Quoted 98 lines · Maxiwell S. Garcia
This adds a handler for ibm,get-vpd RTAS calls, allowing pseries guest to collect host information. It is disabled by default to avoid unwanted information leakage. To enable it, use:
‘-M pseries,host-serial={passthrough|string},host-model={passthrough|string}’
Only the SE and TM keywords are returned at the moment. SE for Machine or Cabinet Serial Number and
TM for Machine Type and ModelThe SE and TM keywords are controlled by 'host-serial' and 'host-model' options, respectively. In the case of 'passthrough', the SE shows the host 'system-id' information and the TM shows the host 'model' information.
Powerpc-utils tools can dispatch RTAS calls to retrieve host information using this ibm,get-vpd interface. The 'host-serial' and 'host-model' nodes of device-tree hold the same information but in a static manner, which is useless after a migration operation.
Signed-off-by Maxiwell S. Garcia <[email protected]>--- hw/ppc/spapr_rtas.c | 121 +++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 17 +++++- 2 files changed, 137 insertions(+), 1 deletion(-)Update v4:
* Allows enable/disable host-serial and host-model options individuallyhw/ppc/spapr_rtas.c +62
-0@@ -287,6 +287,123 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu,rtas_st (rets,0 , ret); } +static inline int vpd_st (target_ulong addr,target_ulong len, +const void *val,uint16_t val_len) +{ +hwaddr phys =ppc64_phys_to_real (addr); +if (len < val_len) { +return RTAS_OUT_PARAM_ERROR ; + } +cpu_physical_memory_write (phys, val, val_len); +return RTAS_OUT_SUCCESS ; +} + +static inline void vpd_ret (target_ulong rets,const int status, +const int next_seq_number,const int bytes_returned) +{ +rtas_st (rets,0 , status); +rtas_st (rets,1 , next_seq_number); +rtas_st (rets,2 , bytes_returned); +} + +static void rtas_ibm_get_vpd_register_keywords (sPAPRMachineState *sm) +{ + sm->rtas_vpd_keywords =g_malloc0 (sizeof (uint8_t ) * +RTAS_IBM_VPD_KEYWORDS_MAX ); + +int i =0 ; +if (sm->host_serial && !g_str_equal (sm->host_serial,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_SE ; + } +if (sm->host_model && !g_str_equal (sm->host_model,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_TM ; + } +} + +static void rtas_ibm_get_vpd (PowerPCCPU *cpu, +sPAPRMachineState *spapr, +uint32_t token,uint32_t nargs, +target_ulong args, +uint32_t nret,target_ulong rets) +{ +target_ulong loc_code_addr; +target_ulong work_area_addr; +target_ulong work_area_size; +target_ulong seq_number; +unsigned char loc_code =0 ; +unsigned int next_seq_number =1 ; +int status =RTAS_IBM_GET_VPD_PARAMETER_ERROR ; +int ret =RTAS_OUT_PARAM_ERROR ; +char *buf =NULL ; +char *vpd_field =NULL ; +unsigned int vpd_field_len =0 ; + +/* RTAS not authorized if no keywords have been registered */ +if (!spapr->rtas_vpd_keywords[0 ]) { +vpd_ret (rets,RTAS_OUT_NOT_AUTHORIZED ,1 ,0 ); +return ; + } + + loc_code_addr =rtas_ld (args,0 ); + work_area_addr =rtas_ld (args,1 ); + work_area_size =rtas_ld (args,2 ); + seq_number =rtas_ld (args,3 ); +hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 361
Quoted 10 lines
hw/ppc/spapr_rtas.c +10
-0+/* Specific Location Code is not supported and seq_number */ +/* must be checked to avoid out of bound index error */ +cpu_physical_memory_read (loc_code_addr, &loc_code,1 ); +if ((loc_code !=0 ) || (seq_number <=0 ) || + (seq_number >RTAS_IBM_VPD_KEYWORDS_MAX )) { +vpd_ret (rets,RTAS_IBM_GET_VPD_PARAMETER_ERROR ,1 ,0 ); +return ; + } + +switch (spapr->rtas_vpd_keywords[seq_number -1 ]) {Since
seq_numbercomes from guest userspace, we shouldn't rely its value will always be within the range of the array.
Quoted 3 lines
We could perhaps return
RTAS_OUT_NOT_AUTHORIZEDifseq_number - 1extrapolates the array range that holds the registered keywords.
The seq_number is tested in the 'if' statement before access
the rtas_vpd_keywords array and it's returns RTAS_IBM_GET_VPD_PARAMETER_ERROR in case of out of bound index.
Quoted 32 lines
Quoted 32 lines
hw/ppc/spapr_rtas.c +32
-0+case RTAS_IBM_VPD_KEYWORD_SE : +if (g_str_equal (spapr->host_serial,"passthrough" )) { +/* -M host-serial=passthrough */ +if (kvmppc_get_host_serial (&buf)) { +/* LoPAPR: SE for Machine or Cabinet Serial Number */ + vpd_field =g_strdup_printf ("SE %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("SE %s" , spapr->host_serial); + } +break ; +case RTAS_IBM_VPD_KEYWORD_TM : +if (g_str_equal (spapr->host_model,"passthrough" )) { +/* -M host-model=passthrough */ +if (kvmppc_get_host_model (&buf)) { +/* LoPAPR: TM for Machine Type and Model */ + vpd_field =g_strdup_printf ("TM %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("TM %s" , spapr->host_model); + } +break ; + } + +if (vpd_field) { + vpd_field_len =strlen (vpd_field); + ret =vpd_st (work_area_addr, work_area_size, + vpd_field, vpd_field_len +1 ); + +if (ret ==0 ) { + next_seq_number = seq_number +1 ; +if (spapr->rtas_vpd_keywords[next_seq_number -1 ]) {
Quoted 9 lines
hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 397
Quoted 4 lines
hw/ppc/spapr_rtas.c +4
-0+ status =RTAS_IBM_GET_VPD_CONTINUE ; + }else { + status =RTAS_IBM_GET_VPD_SUCCESS ; + next_seq_number =1 ;If spapr->rtas_vpd_keywords[next_seq_number - 1] doesn't exist, shouldn't we set next_seq_number=RTAS_IBM_VPD_KEYWORDS_MAX here, indicating
next_seq_numberreached the last registered keyword?
The LoPAPR DRAFT v11 24March2016, page 239, says to return 1 if no more calls are required.
Quoted 71 lines
Quoted 71 lines
hw/ppc/spapr_rtas.c +13
-0+ } + } + } + +vpd_ret (rets, status, next_seq_number, vpd_field_len); +g_free (vpd_field); +g_free (buf); +} + static void rtas_ibm_os_term(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, uint32_t nargs,@@ -464,6 +581,8 @@ void spapr_load_rtas(sPAPRMachineState *spapr, void *fdt, hwaddr addr) fdt_strerror(ret));exit (1 ); } + +rtas_ibm_get_vpd_register_keywords (spapr); }static void core_rtas_register_types (void )@@ -485,6 +604,8 @@ static void core_rtas_register_types(void) rtas_ibm_set_system_parameter);spapr_rtas_register (RTAS_IBM_OS_TERM ,"ibm,os-term" , rtas_ibm_os_term); +spapr_rtas_register (RTAS_IBM_GET_VPD ,"ibm,get-vpd" , + rtas_ibm_get_vpd);spapr_rtas_register (RTAS_SET_POWER_LEVEL ,"set-power-level" , rtas_set_power_level); spapr_rtas_register(RTAS_GET_POWER_LEVEL, "get-power-level",include/hw/ppc/spapr.h +16
-1@@ -153,6 +153,7 @@ struct sPAPRMachineState {struct PPCTimebase tb;bool has_graphics;uint32_t vsmt;/* Virtual SMT mode (KVM's "core stride") */ +uint8_t *rtas_vpd_keywords;Notifier epow_notifier; QTAILQ_HEAD(, sPAPREventLogEntry) pending_events;@@ -608,14 +609,28 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,#define RTAS_IBM_CREATE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x27)#define RTAS_IBM_REMOVE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x28)#define RTAS_IBM_RESET_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x29) +#define RTAS_IBM_GET_VPD (RTAS_TOKEN_BASE + 0x2A) -#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A) +#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2B)/* RTAS ibm,get-system-parameter token values */ #define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20#define RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE 42#define RTAS_SYSPARM_UUID 48 +/* RTAS ibm,get-vpd status values */ +#define RTAS_IBM_GET_VPD_VPD_CHANGED -4 +#define RTAS_IBM_GET_VPD_PARAMETER_ERROR -3 +#define RTAS_IBM_GET_VPD_HARDWARE_ERROR -1 +#define RTAS_IBM_GET_VPD_SUCCESS 0 +#define RTAS_IBM_GET_VPD_CONTINUE 1 + +/* RTAS ibm,get-vpd keywords index */ +#define RTAS_IBM_VPD_KEYWORD_SE 1 +#define RTAS_IBM_VPD_KEYWORD_TM 2 + +#define RTAS_IBM_VPD_KEYWORDS_MAX 2 +/* RTAS indicator/sensor types *
Quoted 10 lines
Quoted 5 lines
include/hw/ppc/spapr.h +0
-1* as defined by PAPR+ 2.7 7.3.5.4, Table 41 --2.20.1
--
Murilo
Thanks for review
Quoted 57 lines · Maxiwell S. Garcia
This adds a handler for ibm,get-vpd RTAS calls, allowing pseries guest to collect host information. It is disabled by default to avoid unwanted information leakage. To enable it, use:
‘-M pseries,host-serial={passthrough|string},host-model={passthrough|string}’
Only the SE and TM keywords are returned at the moment. SE for Machine or Cabinet Serial Number and
TM for Machine Type and ModelThe SE and TM keywords are controlled by 'host-serial' and 'host-model' options, respectively. In the case of 'passthrough', the SE shows the host 'system-id' information and the TM shows the host 'model' information.
Powerpc-utils tools can dispatch RTAS calls to retrieve host information using this ibm,get-vpd interface. The 'host-serial' and 'host-model' nodes of device-tree hold the same information but in a static manner, which is useless after a migration operation.
Signed-off-by Maxiwell S. Garcia <[email protected]>--- hw/ppc/spapr_rtas.c | 121 +++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 17 +++++- 2 files changed, 137 insertions(+), 1 deletion(-)Update v4:
* Allows enable/disable host-serial and host-model options individuallyhw/ppc/spapr_rtas.c +21
-0@@ -287,6 +287,123 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu,rtas_st (rets,0 , ret); } +static inline int vpd_st (target_ulong addr,target_ulong len, +const void *val,uint16_t val_len) +{ +hwaddr phys =ppc64_phys_to_real (addr); +if (len < val_len) { +return RTAS_OUT_PARAM_ERROR ; + } +cpu_physical_memory_write (phys, val, val_len); +return RTAS_OUT_SUCCESS ; +} + +static inline void vpd_ret (target_ulong rets,const int status, +const int next_seq_number,const int bytes_returned) +{ +rtas_st (rets,0 , status); +rtas_st (rets,1 , next_seq_number); +rtas_st (rets,2 , bytes_returned); +} + +static void rtas_ibm_get_vpd_register_keywords (sPAPRMachineState *sm) +{
hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 320
Quoted 10 lines
hw/ppc/spapr_rtas.c +10
-0+ sm->rtas_vpd_keywords =g_malloc0 (sizeof (uint8_t ) * +RTAS_IBM_VPD_KEYWORDS_MAX ); + +int i =0 ; +if (sm->host_serial && !g_str_equal (sm->host_serial,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_SE ; + } +if (sm->host_model && !g_str_equal (sm->host_model,"none" )) { + sm->rtas_vpd_keywords[i++] =RTAS_IBM_VPD_KEYWORD_TM ; + }
Creating this "index" of keywords, then constructing each keyword's value as we step through it seems quite complex. It might be simpler to just generate the whole VPD as an array of structs, indexed by sequence number at reset time, then have get-vpd just copy that out to the guest.
That said, the current approach does work, so I'm ok to leave it if it's too much trouble to rework.
Quoted 41 lines
hw/ppc/spapr_rtas.c +41
-0+} + +static void rtas_ibm_get_vpd (PowerPCCPU *cpu, +sPAPRMachineState *spapr, +uint32_t token,uint32_t nargs, +target_ulong args, +uint32_t nret,target_ulong rets) +{ +target_ulong loc_code_addr; +target_ulong work_area_addr; +target_ulong work_area_size; +target_ulong seq_number; +unsigned char loc_code =0 ; +unsigned int next_seq_number =1 ; +int status =RTAS_IBM_GET_VPD_PARAMETER_ERROR ; +int ret =RTAS_OUT_PARAM_ERROR ; +char *buf =NULL ; +char *vpd_field =NULL ; +unsigned int vpd_field_len =0 ; + +/* RTAS not authorized if no keywords have been registered */ +if (!spapr->rtas_vpd_keywords[0 ]) { +vpd_ret (rets,RTAS_OUT_NOT_AUTHORIZED ,1 ,0 ); +return ; + } + + loc_code_addr =rtas_ld (args,0 ); + work_area_addr =rtas_ld (args,1 ); + work_area_size =rtas_ld (args,2 ); + seq_number =rtas_ld (args,3 ); + +/* Specific Location Code is not supported and seq_number */ +/* must be checked to avoid out of bound index error */ +cpu_physical_memory_read (loc_code_addr, &loc_code,1 ); +if ((loc_code !=0 ) || (seq_number <=0 ) || + (seq_number >RTAS_IBM_VPD_KEYWORDS_MAX )) { +vpd_ret (rets,RTAS_IBM_GET_VPD_PARAMETER_ERROR ,1 ,0 ); +return ; + } + +switch (spapr->rtas_vpd_keywords[seq_number -1 ]) {
hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 371
Quoted 10 lines
hw/ppc/spapr_rtas.c +10
-0+case RTAS_IBM_VPD_KEYWORD_SE : +if (g_str_equal (spapr->host_serial,"passthrough" )) { +/* -M host-serial=passthrough */ +if (kvmppc_get_host_serial (&buf)) { +/* LoPAPR: SE for Machine or Cabinet Serial Number */ + vpd_field =g_strdup_printf ("SE %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("SE %s" , spapr->host_serial); + }
I'd like to see a helper function to avoid duplicating this logic between the vpd code and the device tree generation.
hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 382
Quoted 11 lines
hw/ppc/spapr_rtas.c +11
-0+break ; +case RTAS_IBM_VPD_KEYWORD_TM : +if (g_str_equal (spapr->host_model,"passthrough" )) { +/* -M host-model=passthrough */ +if (kvmppc_get_host_model (&buf)) { +/* LoPAPR: TM for Machine Type and Model */ + vpd_field =g_strdup_printf ("TM %s" , buf); + } + }else { + vpd_field =g_strdup_printf ("TM %s" , spapr->host_model); + }
Same here.
hw/ppc/spapr_rtas.c static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, · line 393
Quoted 11 lines
hw/ppc/spapr_rtas.c +11
-0+break ; + } + +if (vpd_field) { + vpd_field_len =strlen (vpd_field); + ret =vpd_st (work_area_addr, work_area_size, + vpd_field, vpd_field_len +1 ); + +if (ret ==0 ) { + next_seq_number = seq_number +1 ; +if (spapr->rtas_vpd_keywords[next_seq_number -1 ]) {
This isn't safe. You only have exactly as many entries in your table as the maximum number of populated entries (2). So, if the table is full, this will read base the end of the table.
Quoted 62 lines
hw/ppc/spapr_rtas.c +17
-0+ status =RTAS_IBM_GET_VPD_CONTINUE ; + }else { + status =RTAS_IBM_GET_VPD_SUCCESS ; + next_seq_number =1 ; + } + } + } + +vpd_ret (rets, status, next_seq_number, vpd_field_len); +g_free (vpd_field); +g_free (buf); +} + static void rtas_ibm_os_term(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, uint32_t nargs,@@ -464,6 +581,8 @@ void spapr_load_rtas(sPAPRMachineState *spapr, void *fdt, hwaddr addr) fdt_strerror(ret));exit (1 ); } + +rtas_ibm_get_vpd_register_keywords (spapr); }static void core_rtas_register_types (void )@@ -485,6 +604,8 @@ static void core_rtas_register_types(void) rtas_ibm_set_system_parameter);spapr_rtas_register (RTAS_IBM_OS_TERM ,"ibm,os-term" , rtas_ibm_os_term); +spapr_rtas_register (RTAS_IBM_GET_VPD ,"ibm,get-vpd" , + rtas_ibm_get_vpd);spapr_rtas_register (RTAS_SET_POWER_LEVEL ,"set-power-level" , rtas_set_power_level); spapr_rtas_register(RTAS_GET_POWER_LEVEL, "get-power-level",include/hw/ppc/spapr.h +5
-1@@ -153,6 +153,7 @@ struct sPAPRMachineState {struct PPCTimebase tb;bool has_graphics;uint32_t vsmt;/* Virtual SMT mode (KVM's "core stride") */ +uint8_t *rtas_vpd_keywords;Notifier epow_notifier; QTAILQ_HEAD(, sPAPREventLogEntry) pending_events;@@ -608,14 +609,28 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,#define RTAS_IBM_CREATE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x27)#define RTAS_IBM_REMOVE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x28)#define RTAS_IBM_RESET_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x29) +#define RTAS_IBM_GET_VPD (RTAS_TOKEN_BASE + 0x2A) -#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A) +#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2B)/* RTAS ibm,get-system-parameter token values */ #define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20#define RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE 42#define RTAS_SYSPARM_UUID 48 +/* RTAS ibm,get-vpd status values */ +#define RTAS_IBM_GET_VPD_VPD_CHANGED -4
include/hw/ppc/spapr.h target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, · line 632
Quoted 10 lines
include/hw/ppc/spapr.h +10
-0+#define RTAS_IBM_GET_VPD_PARAMETER_ERROR -3 +#define RTAS_IBM_GET_VPD_HARDWARE_ERROR -1 +#define RTAS_IBM_GET_VPD_SUCCESS 0 +#define RTAS_IBM_GET_VPD_CONTINUE 1 + +/* RTAS ibm,get-vpd keywords index */ +#define RTAS_IBM_VPD_KEYWORD_SE 1 +#define RTAS_IBM_VPD_KEYWORD_TM 2 + +#define RTAS_IBM_VPD_KEYWORDS_MAX 2
AFAICT, these values aren't designated by PAPR, they're just internal. In which case they seem like an unnecessary extra layer of indirection. And the fact that they'll be mostly-but-not-always equal to the sequence_number sounds like a recipe for confusion.
Quoted 4 lines
include/hw/ppc/spapr.h +1
-0+/* RTAS indicator/sensor types * * as defined by PAPR+ 2.7 7.3.5.4, Table 41
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson