From nobody Sun Nov 9 14:47:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155138440245588.7265927842135; Thu, 28 Feb 2019 12:06:42 -0800 (PST) Received: from localhost ([127.0.0.1]:45820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzRww-0006CV-9M for importer@patchew.org; Thu, 28 Feb 2019 15:06:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzRvj-0005j0-Us for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:05:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzRvh-0001II-Ca for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:05:19 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gzRvg-0001BH-AN for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:05:16 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1SJx8lU069647 for ; Thu, 28 Feb 2019 15:05:01 -0500 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qxmmrcv52-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Feb 2019 15:05:01 -0500 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 28 Feb 2019 20:05:00 -0000 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 28 Feb 2019 20:04:58 -0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x1SK4vDY56164354 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 28 Feb 2019 20:04:57 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 14630BE05A; Thu, 28 Feb 2019 20:04:57 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DE304BE056; Thu, 28 Feb 2019 20:04:55 +0000 (GMT) Received: from maxibm.br.ibm.com (unknown [9.18.235.184]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP; Thu, 28 Feb 2019 20:04:55 +0000 (GMT) From: "Maxiwell S. Garcia" To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 17:04:37 -0300 X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19022820-0020-0000-0000-00000EC2E661 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010681; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000281; SDB=6.01167723; UDB=6.00610067; IPR=6.00948336; MB=3.00025783; MTD=3.00000008; XFM=3.00000015; UTC=2019-02-28 20:04:59 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19022820-0021-0000-0000-000064F2E230 Message-Id: <20190228200438.5726-1-maxiwell@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-02-28_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=846 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902280134 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id x1SJx8lU069647 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v4] spapr-rtas: add ibm, get-vpd RTAS interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:sPAPR" , "Maxiwell S. Garcia" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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: =E2=80=98-M pseries,host-serial=3D{passthrough|string},host-model=3D{passth= rough|string}=E2=80=99 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. Signed-off-by: Maxiwell S. Garcia --- 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 diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 7a2cb786a3..785c453eb6 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -287,6 +287,123 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU = *cpu, rtas_st(rets, 0, ret); } =20 +static inline int vpd_st(target_ulong addr, target_ulong len, + const void *val, uint16_t val_len) +{ + hwaddr phys =3D 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_retu= rned) +{ + 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 =3D g_malloc0(sizeof(uint8_t) * + RTAS_IBM_VPD_KEYWORDS_MAX); + + int i =3D 0; + if (sm->host_serial && !g_str_equal(sm->host_serial, "none")) { + sm->rtas_vpd_keywords[i++] =3D RTAS_IBM_VPD_KEYWORD_SE; + } + if (sm->host_model && !g_str_equal(sm->host_model, "none")) { + sm->rtas_vpd_keywords[i++] =3D 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 =3D 0; + unsigned int next_seq_number =3D 1; + int status =3D RTAS_IBM_GET_VPD_PARAMETER_ERROR; + int ret =3D RTAS_OUT_PARAM_ERROR; + char *buf =3D NULL; + char *vpd_field =3D NULL; + unsigned int vpd_field_len =3D 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 =3D rtas_ld(args, 0); + work_area_addr =3D rtas_ld(args, 1); + work_area_size =3D rtas_ld(args, 2); + seq_number =3D 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 !=3D 0) || (seq_number <=3D 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=3Dpassthrough */ + if (kvmppc_get_host_serial(&buf)) { + /* LoPAPR: SE for Machine or Cabinet Serial Number */ + vpd_field =3D g_strdup_printf("SE %s", buf); + } + } else { + vpd_field =3D 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=3Dpassthrough */ + if (kvmppc_get_host_model(&buf)) { + /* LoPAPR: TM for Machine Type and Model */ + vpd_field =3D g_strdup_printf("TM %s", buf); + } + } else { + vpd_field =3D g_strdup_printf("TM %s", spapr->host_model); + } + break; + } + + if (vpd_field) { + vpd_field_len =3D strlen(vpd_field); + ret =3D vpd_st(work_area_addr, work_area_size, + vpd_field, vpd_field_len + 1); + + if (ret =3D=3D 0) { + next_seq_number =3D seq_number + 1; + if (spapr->rtas_vpd_keywords[next_seq_number - 1]) { + status =3D RTAS_IBM_GET_VPD_CONTINUE; + } else { + status =3D RTAS_IBM_GET_VPD_SUCCESS; + next_seq_number =3D 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 *fd= t, hwaddr addr) fdt_strerror(ret)); exit(1); } + + rtas_ibm_get_vpd_register_keywords(spapr); } =20 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", diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 59073a7579..ebf314a15c 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -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; =20 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) =20 -#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A) +#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2B) =20 /* 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 =20 +/* 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 --=20 2.20.1