From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9739EC433F5 for ; Tue, 15 Feb 2022 15:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239108AbiBOPWS (ORCPT ); Tue, 15 Feb 2022 10:22:18 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:56768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232855AbiBOPWR (ORCPT ); Tue, 15 Feb 2022 10:22:17 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C1E489CF9; Tue, 15 Feb 2022 07:22:07 -0800 (PST) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 21FF3sEO028275; Tue, 15 Feb 2022 15:22:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pp1; bh=X4S6QHyQ0AqfItMV0a1YQlW8IhiV/aGhAGwlOmoaE2w=; b=sUvYdTtcf3z21CIHM9Ly207DQe4fkH6cBXxMNqSk3OElkpX6KTrr6NsDGfzR3SVCeViX 4XfX13phoulo3NT/VSAU1LnAqF8kydcm9y+rFmPi5LPeyjtH9ZgjTf+/ATHhoW6WXKph YelWj8M9gqVUS4j02hsgoj00U3hfGx9ZcDukvdzB7+SmLVG8zxgDorMNW+XknJkLo1pz 2n9jAJDL4z9e+VPzvqCWZfQiru3L6ZVjhhyFXTGaf/Z1Y3IKok5v5y2d0yn3SF+Biftm egGqymjTTdyfBpub4vmaaAsYgKtEe6n5GjqPrqSGsqoGK61nLxiQxkfYD/co0ts6cZZ/ Kg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3e8dqr9yaq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Feb 2022 15:22:06 +0000 Received: from m0098421.ppops.net (m0098421.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 21FF5FTX009430; Tue, 15 Feb 2022 15:22:06 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 3e8dqr9ya2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Feb 2022 15:22:06 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 21FFITgj018244; Tue, 15 Feb 2022 15:22:04 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma03ams.nl.ibm.com with ESMTP id 3e64ha0j5m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Feb 2022 15:22:04 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 21FFLviX29950414 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Feb 2022 15:21:57 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 55AFC52057; Tue, 15 Feb 2022 15:21:57 +0000 (GMT) Received: from p-imbrenda (unknown [9.145.2.54]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id E9DC852052; Tue, 15 Feb 2022 15:21:56 +0000 (GMT) Date: Tue, 15 Feb 2022 16:21:54 +0100 From: Claudio Imbrenda To: Janosch Frank Cc: Pierre Morel , linux-s390@vger.kernel.org, thuth@redhat.com, kvm@vger.kernel.org, cohuck@redhat.com, david@redhat.com, nrb@linux.ibm.com Subject: Re: [kvm-unit-tests PATCH 1/1] s390x: stsi: Define vm_is_kvm to be used in different tests Message-ID: <20220215162154.6ebd2567@p-imbrenda> In-Reply-To: References: <20220215104632.47796-1-pmorel@linux.ibm.com> <20220215104632.47796-2-pmorel@linux.ibm.com> <20220215130606.2d4f2ebb@p-imbrenda> Organization: IBM X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ReYb-fkLopu0uMffIIiuPaCdHWFneBcv X-Proofpoint-GUID: BEfoabmB-FaA7_0S3iJJcZH-bwP63zvQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-15_04,2022-02-14_04,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 phishscore=0 clxscore=1015 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202150088 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, 15 Feb 2022 16:08:16 +0100 Janosch Frank wrote: > On 2/15/22 13:06, Claudio Imbrenda wrote: > > On Tue, 15 Feb 2022 11:46:32 +0100 > > Pierre Morel wrote: > > > >> Several tests are in need of a way to check on which hypervisor > >> and virtualization level they are running on to be able to fence > >> certain tests. This patch adds functions that return true if a > >> vm is running under KVM, LPAR or generally as a level 2 guest. > >> > >> To check if we're running under KVM we use the STSI 3.2.2 > >> instruction, let's define it's response structure in a central > >> header. > >> > > > > sorry, I had replied to the old series, let me reply here too > > > > > > I think it would look cleaner if there was only one > > "detect_environment" function, that would call stsi once and detect the > > environment, then the various vm_is_* would become something like > > > > bool vm_is_*(void) > > { > > return detect_environment() == VM_IS_*; > > } > > > > of course detect_environment would also cache the result with static > > variables. > > > > bonus, we could make that function public, so a testcase could just > > switch over the type of hypervisor it's being run on, instead of having > > to use a series of ifs. > > > > and then maybe the various vm_is_* could become static inlines to be put > > in the header. > > > > please note that "detect_environment" is just the first thing that came > > to my mind, I have no preference regarding the name. > > I'd like to keep this patch as simple as possible because there are > multiple patch sets which are gated by it. > > The vm.h code and the skey.c z/VM 6 check is a thorn in my side anyway > and I'd rather have it fixed properly which will likely result in a lot > of opinions being voiced. > > So I'd propose to rename vm_is_vm() to vm_is_guest2() and pick this patch. ok for me I'll rename the function and queue the patch > > > > >> Signed-off-by: Pierre Morel > >> --- > >> lib/s390x/stsi.h | 32 ++++++++++++++++++++++++++++ > >> lib/s390x/vm.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-- > >> lib/s390x/vm.h | 3 +++ > >> s390x/stsi.c | 23 ++------------------ > >> 4 files changed, 90 insertions(+), 23 deletions(-) > >> create mode 100644 lib/s390x/stsi.h > >> > >> diff --git a/lib/s390x/stsi.h b/lib/s390x/stsi.h > >> new file mode 100644 > >> index 00000000..bebc492d > >> --- /dev/null > >> +++ b/lib/s390x/stsi.h > >> @@ -0,0 +1,32 @@ > >> +/* SPDX-License-Identifier: GPL-2.0-only */ > >> +/* > >> + * Structures used to Store System Information > >> + * > >> + * Copyright IBM Corp. 2022 > >> + */ > >> + > >> +#ifndef _S390X_STSI_H_ > >> +#define _S390X_STSI_H_ > >> + > >> +struct sysinfo_3_2_2 { > >> + uint8_t reserved[31]; > >> + uint8_t count; > >> + struct { > >> + uint8_t reserved2[4]; > >> + uint16_t total_cpus; > >> + uint16_t conf_cpus; > >> + uint16_t standby_cpus; > >> + uint16_t reserved_cpus; > >> + uint8_t name[8]; > >> + uint32_t caf; > >> + uint8_t cpi[16]; > >> + uint8_t reserved5[3]; > >> + uint8_t ext_name_encoding; > >> + uint32_t reserved3; > >> + uint8_t uuid[16]; > >> + } vm[8]; > >> + uint8_t reserved4[1504]; > >> + uint8_t ext_names[8][256]; > >> +}; > >> + > >> +#endif /* _S390X_STSI_H_ */ > >> diff --git a/lib/s390x/vm.c b/lib/s390x/vm.c > >> index a5b92863..91acd05b 100644 > >> --- a/lib/s390x/vm.c > >> +++ b/lib/s390x/vm.c > >> @@ -12,6 +12,7 @@ > >> #include > >> #include > >> #include "vm.h" > >> +#include "stsi.h" > >> > >> /** > >> * Detect whether we are running with TCG (instead of KVM) > >> @@ -26,9 +27,13 @@ bool vm_is_tcg(void) > >> if (initialized) > >> return is_tcg; > >> > >> + if (!vm_is_vm()) { > >> + initialized = true; > >> + return is_tcg; > >> + } > >> + > >> buf = alloc_page(); > >> - if (!buf) > >> - return false; > >> + assert(buf); > >> > >> if (stsi(buf, 1, 1, 1)) > >> goto out; > >> @@ -43,3 +48,49 @@ out: > >> free_page(buf); > >> return is_tcg; > >> } > >> + > >> +/** > >> + * Detect whether we are running with KVM > >> + */ > >> +bool vm_is_kvm(void) > >> +{ > >> + /* EBCDIC for "KVM/" */ > >> + const uint8_t kvm_ebcdic[] = { 0xd2, 0xe5, 0xd4, 0x61 }; > >> + static bool initialized; > >> + static bool is_kvm; > >> + struct sysinfo_3_2_2 *stsi_322; > >> + > >> + if (initialized) > >> + return is_kvm; > >> + > >> + if (!vm_is_vm() || vm_is_tcg()) { > >> + initialized = true; > >> + return is_kvm; > >> + } > >> + > >> + stsi_322 = alloc_page(); > >> + assert(stsi_322); > >> + > >> + if (stsi(stsi_322, 3, 2, 2)) > >> + goto out; > >> + > >> + /* > >> + * If the manufacturer string is "KVM/" in EBCDIC, then we > >> + * are on KVM. > >> + */ > >> + is_kvm = !memcmp(&stsi_322->vm[0].cpi, kvm_ebcdic, sizeof(kvm_ebcdic)); > >> + initialized = true; > >> +out: > >> + free_page(stsi_322); > >> + return is_kvm; > >> +} > >> + > >> +bool vm_is_lpar(void) > >> +{ > >> + return stsi_get_fc() == 2; > >> +} > >> + > >> +bool vm_is_vm(void) > >> +{ > >> + return stsi_get_fc() == 3; > >> +} > >> diff --git a/lib/s390x/vm.h b/lib/s390x/vm.h > >> index 7abba0cc..3aaf76af 100644 > >> --- a/lib/s390x/vm.h > >> +++ b/lib/s390x/vm.h > >> @@ -9,5 +9,8 @@ > >> #define _S390X_VM_H_ > >> > >> bool vm_is_tcg(void); > >> +bool vm_is_kvm(void); > >> +bool vm_is_vm(void); > >> +bool vm_is_lpar(void); > >> > >> #endif /* _S390X_VM_H_ */ > >> diff --git a/s390x/stsi.c b/s390x/stsi.c > >> index 391f8849..dccc53e7 100644 > >> --- a/s390x/stsi.c > >> +++ b/s390x/stsi.c > >> @@ -13,27 +13,8 @@ > >> #include > >> #include > >> #include > >> +#include > >> > >> -struct stsi_322 { > >> - uint8_t reserved[31]; > >> - uint8_t count; > >> - struct { > >> - uint8_t reserved2[4]; > >> - uint16_t total_cpus; > >> - uint16_t conf_cpus; > >> - uint16_t standby_cpus; > >> - uint16_t reserved_cpus; > >> - uint8_t name[8]; > >> - uint32_t caf; > >> - uint8_t cpi[16]; > >> - uint8_t reserved5[3]; > >> - uint8_t ext_name_encoding; > >> - uint32_t reserved3; > >> - uint8_t uuid[16]; > >> - } vm[8]; > >> - uint8_t reserved4[1504]; > >> - uint8_t ext_names[8][256]; > >> -}; > >> static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); > >> > >> static void test_specs(void) > >> @@ -91,7 +72,7 @@ static void test_3_2_2(void) > >> /* EBCDIC for "KVM/" */ > >> const uint8_t cpi_kvm[] = { 0xd2, 0xe5, 0xd4, 0x61 }; > >> const char vm_name_ext[] = "kvm-unit-test"; > >> - struct stsi_322 *data = (void *)pagebuf; > >> + struct sysinfo_3_2_2 *data = (void *)pagebuf; > >> > >> report_prefix_push("3.2.2"); > >> > > >