From nobody Fri Dec 19 06:31:10 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553719584867745.5998879613404; Wed, 27 Mar 2019 13:46:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:53454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9FRF-0002U7-Pm for importer@patchew.org; Wed, 27 Mar 2019 16:46:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9FMt-0007z2-Go for qemu-devel@nongnu.org; Wed, 27 Mar 2019 16:41:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9FMr-0004du-Qa for qemu-devel@nongnu.org; Wed, 27 Mar 2019 16:41:51 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:49262 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9FMr-0004d9-IU for qemu-devel@nongnu.org; Wed, 27 Mar 2019 16:41:49 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2RKd1lB008725 for ; Wed, 27 Mar 2019 16:41:48 -0400 Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) by mx0a-001b2d01.pphosted.com with ESMTP id 2rgfwhh6rv-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Mar 2019 16:41:47 -0400 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 27 Mar 2019 20:41:47 -0000 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 27 Mar 2019 20:41:43 -0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x2RKfg7j55378132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Mar 2019 20:41:42 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5738A78063; Wed, 27 Mar 2019 20:41:42 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7E90978069; Wed, 27 Mar 2019 20:41:40 +0000 (GMT) Received: from maxibm.ibmmodules.com (unknown [9.85.167.225]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 27 Mar 2019 20:41:40 +0000 (GMT) From: "Maxiwell S. Garcia" To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 17:41:02 -0300 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190327204102.20925-1-maxiwell@linux.ibm.com> References: <20190327204102.20925-1-maxiwell@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19032720-0016-0000-0000-00000997F4D6 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010825; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000282; SDB=6.01180560; UDB=6.00617829; IPR=6.00961277; MB=3.00026185; MTD=3.00000008; XFM=3.00000015; UTC=2019-03-27 20:41:45 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19032720-0017-0000-0000-0000429ACC22 Message-Id: <20190327204102.20925-3-maxiwell@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-27_13:, , 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=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903270143 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH v7 2/2] 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: qemu-ppc@nongnu.org, groug@kaod.org, "Maxiwell S. Garcia" , david@gibson.dropbear.id.au 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: -M pseries,host-serial=3D{passthrough|string},host-model=3D{passthrough|str= ing} 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 | 96 ++++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 10 ++++- 2 files changed, 105 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 24c45b12d4..c42630e95d 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -287,6 +287,98 @@ static void rtas_ibm_set_system_parameter(PowerPCCPU *= cpu, rtas_st(rets, 0, ret); } =20 +static 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 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_fields_register(SpaprMachineState *spapr) +{ + int i =3D 0; + char *buf =3D NULL; + + memset(spapr->rtas_get_vpd_fields, 0, + sizeof(spapr->rtas_get_vpd_fields)); + + buf =3D spapr_get_valid_host_serial(spapr); + if (buf) { + spapr->rtas_get_vpd_fields[i++] =3D g_strdup_printf("SE %s", buf); + g_free(buf); + } + + buf =3D spapr_get_valid_host_model(spapr); + if (buf) { + spapr->rtas_get_vpd_fields[i++] =3D g_strdup_printf("TM %s", buf); + g_free(buf); + } +} + +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 =3D rtas_ld(args, 0); + target_ulong work_area_addr =3D rtas_ld(args, 1); + target_ulong work_area_size =3D rtas_ld(args, 2); + target_ulong seq_number =3D rtas_ld(args, 3); + unsigned int next_seq_number =3D 1; + int status =3D RTAS_OUT_PARAM_ERROR; + unsigned char loc_code; + unsigned int vpd_field_len; + char *vpd_field; + int ret; + + /* 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_GET_VPD_MAX)) { + vpd_ret(rets, RTAS_OUT_PARAM_ERROR, 1, 0); + return; + } + + /* RTAS not authorized if no keywords have been registered */ + if (!spapr->rtas_get_vpd_fields[seq_number - 1]) { + vpd_ret(rets, RTAS_OUT_NOT_AUTHORIZED, 1, 0); + return; + } + + vpd_field =3D spapr->rtas_get_vpd_fields[seq_number - 1]; + 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_get_vpd_fields[next_seq_number - 1]) { + status =3D RTAS_IBM_GET_VPD_CONTINUE; + } else { + status =3D RTAS_OUT_SUCCESS; + next_seq_number =3D 1; + } + } + + vpd_ret(ret, status, next_seq_number, vpd_field_len); +} + static void rtas_ibm_os_term(PowerPCCPU *cpu, SpaprMachineState *spapr, uint32_t token, uint32_t nargs, @@ -464,6 +556,8 @@ void spapr_load_rtas(SpaprMachineState *spapr, void *fd= t, hwaddr addr) fdt_strerror(ret)); exit(1); } + + rtas_ibm_get_vpd_fields_register(spapr); } =20 static void core_rtas_register_types(void) @@ -485,6 +579,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 5e0a1b2a8a..d2e9f48057 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -99,6 +99,9 @@ typedef enum { #define SPAPR_CAP_FIXED_CCD 0x03 #define SPAPR_CAP_FIXED_NA 0x10 /* Lets leave a bit of a gap.= .. */ =20 +/* Maximum number of ibm,get-vpd fields supported */ +#define RTAS_IBM_GET_VPD_MAX 2 + typedef struct SpaprCapabilities SpaprCapabilities; struct SpaprCapabilities { uint8_t caps[SPAPR_CAP_NUM]; @@ -167,6 +170,7 @@ struct SpaprMachineState { QTAILQ_HEAD(, SpaprEventLogEntry) pending_events; bool use_hotplug_event_source; SpaprEventSource *event_sources; + char *rtas_get_vpd_fields[RTAS_IBM_GET_VPD_MAX + 1]; =20 /* ibm,client-architecture-support option negotiation */ bool cas_reboot; @@ -619,14 +623,18 @@ 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 value */ +#define RTAS_IBM_GET_VPD_CONTINUE 1 + /* RTAS indicator/sensor types * * as defined by PAPR+ 2.7 7.3.5.4, Table 41 --=20 2.20.1