From patchwork Wed Mar 30 14:43:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Imbrenda X-Patchwork-Id: 12795900 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 00B8AC433EF for ; Wed, 30 Mar 2022 14:44:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347148AbiC3OqA (ORCPT ); Wed, 30 Mar 2022 10:46:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347135AbiC3Opq (ORCPT ); Wed, 30 Mar 2022 10:45:46 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1DFE689AA; Wed, 30 Mar 2022 07:43:55 -0700 (PDT) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22UDEKMF031025; Wed, 30 Mar 2022 14:43:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=pWkFbHhsyw85rtG9dxCk+nuMcKBHlc9TDRduvFh+Hvc=; b=F8ZmmZFIBz5Mvb4jTPPI7ud2EV18LXxQdkqOk7x0duKOQCGKZyCWesgwfxBxD0c3R2ra UzbU+6hMckHD+9LoBKqq7bzCYTa1Hpw+fxRcCdpb+Np7edECQF5pVjMm3EfwPOiH2q0g gaGiP5BEYkkgB7NjL6ovQA5RvlIY/iNTmcdzGZgMkWpHXm9YWEDDzv0U3iwG/og5n5lQ cBauOkfirr4MDsp4Z3xJ0hrxTogcjju0OvcXCsRWLaqSzEAYZ6JVLvh8KKAm6Nj+ajkz mS1FM/LxrC7mDm1VrErqcQ32Jc5X2vSbhdBhIPakxEBoVQebHmB1HzM9hWh7IXu6NSCw Aw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3f4qwtj2ty-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:54 +0000 Received: from m0098416.ppops.net (m0098416.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 22UDSDiL031147; Wed, 30 Mar 2022 14:43:54 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0b-001b2d01.pphosted.com with ESMTP id 3f4qwtj2te-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:53 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 22UEdGI3012644; Wed, 30 Mar 2022 14:43:52 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma05fra.de.ibm.com with ESMTP id 3f1tf8ygbk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:52 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 22UEhmX038928718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Mar 2022 14:43:48 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C03EA4C046; Wed, 30 Mar 2022 14:43:48 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 33DBD4C040; Wed, 30 Mar 2022 14:43:48 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.13.95]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 30 Mar 2022 14:43:48 +0000 (GMT) From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, frankja@linux.ibm.com, scgl@linux.ibm.com, borntraeger@de.ibm.com, pmorel@linux.ibm.com, pasic@linux.ibm.com, nrb@linux.ibm.com, thuth@redhat.com, david@redhat.com Subject: [kvm-unit-tests PATCH v1 1/4] s390x: remove spurious includes Date: Wed, 30 Mar 2022 16:43:36 +0200 Message-Id: <20220330144339.261419-2-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330144339.261419-1-imbrenda@linux.ibm.com> References: <20220330144339.261419-1-imbrenda@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: GPtwGM-T93lbqOggt494jGRVdKKGP4Zd X-Proofpoint-ORIG-GUID: TkvlWLrnaEWsxc1EKRRXxW8uKzKURHxj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-30_04,2022-03-30_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 mlxlogscore=807 clxscore=1015 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203300071 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Remove unused includes of vm.h Signed-off-by: Claudio Imbrenda Reviewed-by: Janosch Frank --- s390x/mvpg-sie.c | 1 - s390x/pv-diags.c | 1 - s390x/spec_ex-sie.c | 1 - 3 files changed, 3 deletions(-) diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c index 8ae9a52a..46a2edb6 100644 --- a/s390x/mvpg-sie.c +++ b/s390x/mvpg-sie.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/s390x/pv-diags.c b/s390x/pv-diags.c index 110547ad..6899b859 100644 --- a/s390x/pv-diags.c +++ b/s390x/pv-diags.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/s390x/spec_ex-sie.c b/s390x/spec_ex-sie.c index 5dea4115..d8e25e75 100644 --- a/s390x/spec_ex-sie.c +++ b/s390x/spec_ex-sie.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include From patchwork Wed Mar 30 14:43:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Imbrenda X-Patchwork-Id: 12795902 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 5281CC433EF for ; Wed, 30 Mar 2022 14:44:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347141AbiC3OqG (ORCPT ); Wed, 30 Mar 2022 10:46:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347133AbiC3Opq (ORCPT ); Wed, 30 Mar 2022 10:45:46 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6A39689B6; Wed, 30 Mar 2022 07:43:55 -0700 (PDT) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22UDAqrc002849; Wed, 30 Mar 2022 14:43:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=nZoFbq1KBjWt9R3rWOIXqOb+/9pJfcECQCjBOYhTlJ4=; b=hTlgojBYtzJNe4YXum0hn/8nEyNH9elXy/nJro/COxHEE/otBJkra17ZAGwHLsqmdJah iTZmj7qq//iRQDYduoogMeoLi1Fc4FsNYZUnZ181PjcYK28spbj3vkMj89jL1PvSt9+Z zPnp/6jb5rLevC71O8vVBfJyba5gmWX30Q1Ndy4k8f/nwSY4vdgcm+H28SdzZEM+0HDN R61dhMoEm7AiFrRoMVlLYmX+E/N5BGs9teaHuBv2c+itvbmVRByjvN5KXAW9ggD5SKk5 kBqrsXA+5N/QHYgW0iJM7Xyul22xkeRwhwpqdsgC/MLDPHG+kjnEZLkTU1LAfQkcMecD ZA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3f4npk5gfj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:54 +0000 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 22UEfllg006530; Wed, 30 Mar 2022 14:43:54 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 3f4npk5gey-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:54 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 22UEcMih011153; Wed, 30 Mar 2022 14:43:52 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03fra.de.ibm.com with ESMTP id 3f1tf8yfyd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:52 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 22UEhn0t48300508 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Mar 2022 14:43:49 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 712AE4C04A; Wed, 30 Mar 2022 14:43:49 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E24E34C040; Wed, 30 Mar 2022 14:43:48 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.13.95]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 30 Mar 2022 14:43:48 +0000 (GMT) From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, frankja@linux.ibm.com, scgl@linux.ibm.com, borntraeger@de.ibm.com, pmorel@linux.ibm.com, pasic@linux.ibm.com, nrb@linux.ibm.com, thuth@redhat.com, david@redhat.com Subject: [kvm-unit-tests PATCH v1 2/4] lib: s390: rename and refactor vm.[ch] Date: Wed, 30 Mar 2022 16:43:37 +0200 Message-Id: <20220330144339.261419-3-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330144339.261419-1-imbrenda@linux.ibm.com> References: <20220330144339.261419-1-imbrenda@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Gbkmc8n7qfXFgD-r-KH4ueN1d97PlJWz X-Proofpoint-ORIG-GUID: uSXQ-sHGIqydBtJ3_u72iyrnxnySryc6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-30_04,2022-03-30_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 adultscore=0 bulkscore=0 clxscore=1015 spamscore=0 impostorscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203300071 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Refactor and rename vm.[ch] to hardware.[ch] * Rename vm.[ch] to hardware.[ch] * Consolidate all detection functions into detect_host, which returns what host system the test is running on * Move host_is_zvm6 to the library (was in a testcase) * Rename vm_is_* functions to host_is_*, which are then just wrappers around detect_host Signed-off-by: Claudio Imbrenda --- s390x/Makefile | 2 +- lib/s390x/hardware.h | 47 ++++++++++++++++++++++ lib/s390x/vm.h | 15 -------- lib/s390x/hardware.c | 86 +++++++++++++++++++++++++++++++++++++++++ lib/s390x/vm.c | 92 -------------------------------------------- s390x/cpumodel.c | 4 +- s390x/mvpg.c | 4 +- s390x/skey.c | 28 +------------- 8 files changed, 140 insertions(+), 138 deletions(-) create mode 100644 lib/s390x/hardware.h delete mode 100644 lib/s390x/vm.h create mode 100644 lib/s390x/hardware.c delete mode 100644 lib/s390x/vm.c diff --git a/s390x/Makefile b/s390x/Makefile index 53b0fe04..9d3a1fd7 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -78,7 +78,7 @@ cflatobjs += lib/s390x/sclp-console.o cflatobjs += lib/s390x/interrupt.o cflatobjs += lib/s390x/mmu.o cflatobjs += lib/s390x/smp.o -cflatobjs += lib/s390x/vm.o +cflatobjs += lib/s390x/hardware.o cflatobjs += lib/s390x/css_dump.o cflatobjs += lib/s390x/css_lib.o cflatobjs += lib/s390x/malloc_io.o diff --git a/lib/s390x/hardware.h b/lib/s390x/hardware.h new file mode 100644 index 00000000..93f817ca --- /dev/null +++ b/lib/s390x/hardware.h @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Functions to retrieve information about the host system. + * + * Copyright (c) 2020 Red Hat Inc + * Copyright 2022 IBM Corp. + * + * Authors: + * Claudio Imbrenda + */ + +#ifndef _S390X_HARDWARE_H_ +#define _S390X_HARDWARE_H_ +#include + +enum s390_host { + HOST_IS_UNKNOWN, + HOST_IS_LPAR, + HOST_IS_ZVM6, + HOST_IS_ZVM, + HOST_IS_KVM, + HOST_IS_TCG +}; + +enum s390_host detect_host(void); + +static inline bool host_is_tcg(void) +{ + return detect_host() == HOST_IS_TCG; +} + +static inline bool host_is_kvm(void) +{ + return detect_host() == HOST_IS_KVM; +} + +static inline bool host_is_lpar(void) +{ + return detect_host() == HOST_IS_LPAR; +} + +static inline bool host_is_zvm6(void) +{ + return detect_host() == HOST_IS_ZVM6; +} + +#endif /* _S390X_HARDWARE_H_ */ diff --git a/lib/s390x/vm.h b/lib/s390x/vm.h deleted file mode 100644 index 4456b48c..00000000 --- a/lib/s390x/vm.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Functions to retrieve VM-specific information - * - * Copyright (c) 2020 Red Hat Inc - */ - -#ifndef _S390X_VM_H_ -#define _S390X_VM_H_ - -bool vm_is_tcg(void); -bool vm_is_kvm(void); -bool vm_is_lpar(void); - -#endif /* _S390X_VM_H_ */ diff --git a/lib/s390x/hardware.c b/lib/s390x/hardware.c new file mode 100644 index 00000000..b3f44746 --- /dev/null +++ b/lib/s390x/hardware.c @@ -0,0 +1,86 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Functions to retrieve information about the host system. + * + * Copyright (c) 2020 Red Hat Inc + * Copyright 2022 IBM Corp. + * + * Authors: + * Thomas Huth + * Claudio Imbrenda + */ + +#include +#include +#include +#include "hardware.h" +#include "stsi.h" + +/* The string "QEMU" in EBCDIC */ +static const uint8_t qemu_ebcdic[] = { 0xd8, 0xc5, 0xd4, 0xe4 }; +/* The string "KVM/" in EBCDIC */ +static const uint8_t kvm_ebcdic[] = { 0xd2, 0xe5, 0xd4, 0x61 }; +/* The string "z/VM 6" in EBCDIC */ +static const uint8_t zvm6[] = { 0xa9, 0x61, 0xe5, 0xd4, 0x40, 0x40, 0x40, 0x40, 0xf6 }; + +/* Returns true if we are running under z/VM 6.x */ +static bool check_for_zvm6(uint8_t *buf) +{ + int dcbt = buf[31] & 0xf; /* descriptor block count */ + int nr; + + for (nr = 0; nr < dcbt; nr++) { + if (!memcmp(&buf[32 + nr * 64 + 24], zvm6, sizeof(zvm6))) + return true; + } + return false; +} + +static enum s390_host do_detect_host(void *buf) +{ + struct sysinfo_3_2_2 *stsi_322 = buf; + + if (stsi_get_fc() == 2) + return HOST_IS_LPAR; + + if (stsi_get_fc() != 3) + return HOST_IS_UNKNOWN; + + if (!stsi(buf, 1, 1, 1)) { + /* + * If the manufacturer string is "QEMU" in EBCDIC, then we + * are on TCG (otherwise the string is "IBM" in EBCDIC) + */ + if (!memcmp((char *)buf + 32, qemu_ebcdic, sizeof(qemu_ebcdic))) + return HOST_IS_TCG; + } + + if (!stsi(buf, 3, 2, 2)) { + /* + * If the manufacturer string is "KVM/" in EBCDIC, then we + * are on KVM. + */ + if (!memcmp(&stsi_322->vm[0].cpi, kvm_ebcdic, sizeof(kvm_ebcdic))) + return HOST_IS_KVM; + if (check_for_zvm6(buf)) + return HOST_IS_ZVM6; + } + + return HOST_IS_UNKNOWN; +} + +enum s390_host detect_host(void) +{ + static enum s390_host host = HOST_IS_UNKNOWN; + static bool initialized = false; + void *buf; + + if (initialized) + return host; + + buf = alloc_page(); + host = do_detect_host(buf); + free_page(buf); + initialized = true; + return host; +} diff --git a/lib/s390x/vm.c b/lib/s390x/vm.c deleted file mode 100644 index 33fb1c45..00000000 --- a/lib/s390x/vm.c +++ /dev/null @@ -1,92 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Functions to retrieve VM-specific information - * - * Copyright (c) 2020 Red Hat Inc - * - * Authors: - * Thomas Huth - */ - -#include -#include -#include -#include "vm.h" -#include "stsi.h" - -/** - * Detect whether we are running with TCG (instead of KVM) - */ -bool vm_is_tcg(void) -{ - const char qemu_ebcdic[] = { 0xd8, 0xc5, 0xd4, 0xe4 }; - static bool initialized = false; - static bool is_tcg = false; - uint8_t *buf; - - if (initialized) - return is_tcg; - - if (stsi_get_fc() != 3) { - initialized = true; - return is_tcg; - } - - buf = alloc_page(); - assert(buf); - - if (stsi(buf, 1, 1, 1)) - goto out; - - /* - * If the manufacturer string is "QEMU" in EBCDIC, then we - * are on TCG (otherwise the string is "IBM" in EBCDIC) - */ - is_tcg = !memcmp(&buf[32], qemu_ebcdic, sizeof(qemu_ebcdic)); - initialized = true; -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 (stsi_get_fc() != 3 || 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; -} - diff --git a/s390x/cpumodel.c b/s390x/cpumodel.c index 23ccf842..5c0b73e0 100644 --- a/s390x/cpumodel.c +++ b/s390x/cpumodel.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include #include #include @@ -118,7 +118,7 @@ int main(void) for (i = 0; i < ARRAY_SIZE(dep); i++) { report_prefix_pushf("%d implies %d", dep[i].facility, dep[i].implied); if (test_facility(dep[i].facility)) { - report_xfail(dep[i].expected_tcg_fail && vm_is_tcg(), + report_xfail(dep[i].expected_tcg_fail && host_is_tcg(), test_facility(dep[i].implied), "implication not correct"); } else { diff --git a/s390x/mvpg.c b/s390x/mvpg.c index 2b7c6cc9..62f0fc5a 100644 --- a/s390x/mvpg.c +++ b/s390x/mvpg.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include /* Used to build the appropriate test values for register 0 */ #define KFC(x) ((x) << 10) @@ -251,7 +251,7 @@ static void test_mmu_prot(void) fresh += PAGE_SIZE; /* Known issue in TCG: CCO flag is not honoured */ - if (vm_is_tcg()) { + if (host_is_tcg()) { report_prefix_push("TCG"); report_skip("destination invalid"); report_skip("source invalid"); diff --git a/s390x/skey.c b/s390x/skey.c index 58a55436..bee9fc36 100644 --- a/s390x/skey.c +++ b/s390x/skey.c @@ -13,7 +13,7 @@ #include #include #include - +#include static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); @@ -65,33 +65,9 @@ static void test_set(void) "set key test"); } -/* Returns true if we are running under z/VM 6.x */ -static bool check_for_zvm6(void) -{ - int dcbt; /* Descriptor block count */ - int nr; - static const unsigned char zvm6[] = { - /* This is "z/VM 6" in EBCDIC */ - 0xa9, 0x61, 0xe5, 0xd4, 0x40, 0x40, 0x40, 0x40, 0xf6 - }; - - if (stsi(pagebuf, 3, 2, 2)) - return false; - - dcbt = pagebuf[31] & 0xf; - - for (nr = 0; nr < dcbt; nr++) { - if (!memcmp(&pagebuf[32 + nr * 64 + 24], zvm6, sizeof(zvm6))) - return true; - } - - return false; -} - static void test_priv(void) { union skey skey; - bool is_zvm6 = check_for_zvm6(); memset(pagebuf, 0, PAGE_SIZE * 2); report_prefix_push("privileged"); @@ -106,7 +82,7 @@ static void test_priv(void) report(skey.str.acc != 3, "skey did not change on exception"); report_prefix_push("iske"); - if (is_zvm6) { + if (host_is_zvm6()) { /* There is a known bug with z/VM 6, so skip the test there */ report_skip("not working on z/VM 6"); } else { From patchwork Wed Mar 30 14:43:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Imbrenda X-Patchwork-Id: 12795903 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 139EDC433EF for ; Wed, 30 Mar 2022 14:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347155AbiC3OqI (ORCPT ); Wed, 30 Mar 2022 10:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347161AbiC3Opq (ORCPT ); Wed, 30 Mar 2022 10:45:46 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC5E97004D; Wed, 30 Mar 2022 07:43:56 -0700 (PDT) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22UE1i8R011625; Wed, 30 Mar 2022 14:43:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=8gPUcPbuK37DvQspWI7NU0gD2o14JU2zpU82KgAfRsI=; b=opTAJozv8s5pOM8tSplAH2qq/UrDcFbQY6ivOtxJKyT5v11DtsK0DoA4meVi3QwraH8U 6CJyCPWR1toGiGp3yORzEbiC+T3nvuUkDvQi68xz75iZFO94kE3U5ipTplUKCr09mH/B yWu2ps7nx/WFMXT3mSTtP4ftOgUHb53I2vcq7tCLvuQ7Le0kEHpjqQ4AVNIi27GiDMg0 wlG+ZbniQJRWRIENQTMnUKtyl+3SMHUwXl+60luDzSMP4kSLQl15EUqDs0cPkcaY0tLh 9vMb0gNeURyIsHFpy4/B+5xumPfRjmO9H56zCm4ovBTBYiiwHRRQCyHMcWE9IvBnUlhi zg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3f40c98n4v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:55 +0000 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 22UEWBQn025929; Wed, 30 Mar 2022 14:43:55 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com with ESMTP id 3f40c98n4c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:55 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 22UEcmbE015456; Wed, 30 Mar 2022 14:43:53 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma01fra.de.ibm.com with ESMTP id 3f1tf8qgc5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:53 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 22UEhoBX16122268 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Mar 2022 14:43:50 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 051184C04A; Wed, 30 Mar 2022 14:43:50 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 83A3E4C040; Wed, 30 Mar 2022 14:43:49 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.13.95]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 30 Mar 2022 14:43:49 +0000 (GMT) From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, frankja@linux.ibm.com, scgl@linux.ibm.com, borntraeger@de.ibm.com, pmorel@linux.ibm.com, pasic@linux.ibm.com, nrb@linux.ibm.com, thuth@redhat.com, david@redhat.com Subject: [kvm-unit-tests PATCH v1 3/4] lib: s390x: functions for machine models Date: Wed, 30 Mar 2022 16:43:38 +0200 Message-Id: <20220330144339.261419-4-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330144339.261419-1-imbrenda@linux.ibm.com> References: <20220330144339.261419-1-imbrenda@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: A2YhIDOH8iv5iBJ5lvJ5atjMvGRp-iXk X-Proofpoint-GUID: 2X3waP30sPGIsvM_afCMCkUAYOWT5Q3X X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-30_04,2022-03-30_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 mlxscore=0 spamscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 adultscore=0 phishscore=0 priorityscore=1501 mlxlogscore=641 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203300071 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org * move existing macros for machine models to hardware.h * add macros for all known machine models * add machine_is_* functions --- lib/s390x/asm/arch_def.h | 3 -- lib/s390x/hardware.h | 82 ++++++++++++++++++++++++++++++++++++++++ s390x/uv-host.c | 4 +- 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index 40626d72..8d860ccf 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -219,9 +219,6 @@ static inline unsigned short stap(void) return cpu_address; } -#define MACHINE_Z15A 0x8561 -#define MACHINE_Z15B 0x8562 - static inline uint16_t get_machine_id(void) { uint64_t cpuid; diff --git a/lib/s390x/hardware.h b/lib/s390x/hardware.h index 93f817ca..fb6565ad 100644 --- a/lib/s390x/hardware.h +++ b/lib/s390x/hardware.h @@ -13,6 +13,25 @@ #define _S390X_HARDWARE_H_ #include +#define MACHINE_Z900 0x2064 +#define MACHINE_Z800 0x2066 +#define MACHINE_Z990 0x2084 +#define MACHINE_Z890 0x2086 +#define MACHINE_Z9EC 0x2094 +#define MACHINE_Z9BC 0x2096 +#define MACHINE_Z10EC 0x2097 +#define MACHINE_Z10BC 0x2098 +#define MACHINE_Z196 0x2817 +#define MACHINE_Z114 0x2818 +#define MACHINE_ZEC12 0x2827 +#define MACHINE_ZBC12 0x2828 +#define MACHINE_Z13 0x2964 +#define MACHINE_Z13S 0x2965 +#define MACHINE_Z14 0x3906 +#define MACHINE_Z14ZR1 0x3907 +#define MACHINE_Z15 0x8561 +#define MACHINE_Z15T02 0x8562 + enum s390_host { HOST_IS_UNKNOWN, HOST_IS_LPAR, @@ -44,4 +63,67 @@ static inline bool host_is_zvm6(void) return detect_host() == HOST_IS_ZVM6; } +static inline bool machine_is_z900(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z900 || machine == MACHINE_Z800; +} + +static inline bool machine_is_z990(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z990 || machine == MACHINE_Z890; +} + +static inline bool machine_is_z9(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z9EC || machine == MACHINE_Z9BC; +} + +static inline bool machine_is_z10(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z10EC || machine == MACHINE_Z10BC; +} + +static inline bool machine_is_z1xx(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z196 || machine == MACHINE_Z114; +} + +static inline bool machine_is_z12(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_ZEC12 || machine == MACHINE_ZBC12; +} + +static inline bool machine_is_z13(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z13 || machine == MACHINE_Z13S; +} + +static inline bool machine_is_z14(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z14 || machine == MACHINE_Z14ZR1; +} + +static inline bool machine_is_z15(void) +{ + uint16_t machine = get_machine_id(); + + return machine == MACHINE_Z15 || machine == MACHINE_Z15T02; +} + #endif /* _S390X_HARDWARE_H_ */ diff --git a/s390x/uv-host.c b/s390x/uv-host.c index de2e4850..d3018e3c 100644 --- a/s390x/uv-host.c +++ b/s390x/uv-host.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -111,7 +112,6 @@ static void test_config_destroy(void) static void test_cpu_destroy(void) { int rc; - uint16_t machineid = get_machine_id(); struct uv_cb_nodata uvcb = { .header.len = sizeof(uvcb), .header.cmd = UVC_CMD_DESTROY_SEC_CPU, @@ -126,7 +126,7 @@ static void test_cpu_destroy(void) "hdr invalid length"); uvcb.header.len += 8; - if (machineid != MACHINE_Z15A && machineid != MACHINE_Z15B) { + if (!machine_is_z15()) { uvcb.handle += 1; rc = uv_call(0, (uint64_t)&uvcb); report(rc == 1 && uvcb.header.rc == UVC_RC_INV_CHANDLE, "invalid handle"); From patchwork Wed Mar 30 14:43:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Imbrenda X-Patchwork-Id: 12795901 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 EEA9FC4332F for ; Wed, 30 Mar 2022 14:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347123AbiC3OqE (ORCPT ); Wed, 30 Mar 2022 10:46:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347164AbiC3Opq (ORCPT ); Wed, 30 Mar 2022 10:45:46 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B00F78907; Wed, 30 Mar 2022 07:43:57 -0700 (PDT) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22UDwouc004713; Wed, 30 Mar 2022 14:43:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=+ypfw1DcsfrtS1EDOsZ61j9cykXQpXIN5Jh0hpdXLSE=; b=iKDTE2jTN6+qpn9QcW1VgZEbj78qSXPrL96RmNAL+K+kMrgB15EOfzrm8BrTHkOFt7i1 BaaLan8KEdRkoWshcRZItTZY+/aXj0zRpM/HDBiAkNb44UvxacwXnBH69HsWlHlvCNQk Px2jxmPofvwA2kUOevtjrkZiikYQDkTaa/Y94J4cd917H+3xJA5R4dIsHWQ04ooK5x9f oN4RSFu9xOoc5DhKGdCA7jl5MyrzdJ+GbdcnDdlakhuJ2WxWNp2iXZ1+xR4AbUt+3W/Z CJ7H4zeEAz/o1PdnSoptmV5W0bi/5kqeQo8naQomYOcYtLr9shfTKOWN986FLbhthVD2 Tw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3f4rjn13du-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:56 +0000 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 22UEQMeE004133; Wed, 30 Mar 2022 14:43:56 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 3f4rjn13cu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:56 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 22UEdC0k012503; Wed, 30 Mar 2022 14:43:54 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma05fra.de.ibm.com with ESMTP id 3f1tf8ygbn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Mar 2022 14:43:53 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 22UEhoUj36962618 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Mar 2022 14:43:50 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9BB274C044; Wed, 30 Mar 2022 14:43:50 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 17C774C040; Wed, 30 Mar 2022 14:43:50 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.13.95]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 30 Mar 2022 14:43:50 +0000 (GMT) From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, frankja@linux.ibm.com, scgl@linux.ibm.com, borntraeger@de.ibm.com, pmorel@linux.ibm.com, pasic@linux.ibm.com, nrb@linux.ibm.com, thuth@redhat.com, david@redhat.com Subject: [kvm-unit-tests PATCH v1 4/4] lib: s390x: stidp wrapper and move get_machine_id Date: Wed, 30 Mar 2022 16:43:39 +0200 Message-Id: <20220330144339.261419-5-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330144339.261419-1-imbrenda@linux.ibm.com> References: <20220330144339.261419-1-imbrenda@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: weDkcEGLLA1MynzeGrhJ0C8FHrpkBrfg X-Proofpoint-GUID: lBbHsZUErIUyC2F8IPKJPd5c9dUlnZlc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-30_04,2022-03-30_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=946 spamscore=0 impostorscore=0 adultscore=0 bulkscore=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203300071 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Refactor get_machine_id in arch_def.h into a simple wrapper around stidp, add back get_machine_id in hardware.h using the stidp wrapper. Signed-off-by: Claudio Imbrenda Reviewed-by: Janosch Frank --- lib/s390x/asm/arch_def.h | 4 +--- lib/s390x/hardware.h | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index 8d860ccf..bab3c374 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -219,13 +219,11 @@ static inline unsigned short stap(void) return cpu_address; } -static inline uint16_t get_machine_id(void) +static inline uint64_t stidp(void) { uint64_t cpuid; asm volatile("stidp %0" : "=Q" (cpuid)); - cpuid = cpuid >> 16; - cpuid &= 0xffff; return cpuid; } diff --git a/lib/s390x/hardware.h b/lib/s390x/hardware.h index fb6565ad..8783ae9c 100644 --- a/lib/s390x/hardware.h +++ b/lib/s390x/hardware.h @@ -43,6 +43,11 @@ enum s390_host { enum s390_host detect_host(void); +static inline uint16_t get_machine_id(void) +{ + return stidp() >> 16; +} + static inline bool host_is_tcg(void) { return detect_host() == HOST_IS_TCG;