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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55329C433E0 for ; Mon, 18 May 2020 14:32:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B0F320671 for ; Mon, 18 May 2020 14:32:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B0F320671 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jagp4-0007Xl-9V for qemu-devel@archiver.kernel.org; Mon, 18 May 2020 10:32:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jagnZ-0005c1-W7; Mon, 18 May 2020 10:31:22 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:14478 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jagnY-0001sQ-Mx; Mon, 18 May 2020 10:31:21 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04IE39Ld160575; Mon, 18 May 2020 10:31:16 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 313r0y0fdq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 10:31:16 -0400 Received: from m0098416.ppops.net (m0098416.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 04IE3Rhv162276; Mon, 18 May 2020 10:31:15 -0400 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0b-001b2d01.pphosted.com with ESMTP id 313r0y0fdc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 10:31:15 -0400 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 04IEU8b5001064; Mon, 18 May 2020 14:31:15 GMT Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by ppma01wdc.us.ibm.com with ESMTP id 3127t688fd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 14:31:14 +0000 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04IEVDnO28770590 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 May 2020 14:31:13 GMT Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AAD306E054; Mon, 18 May 2020 14:31:13 +0000 (GMT) Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9D7216E056; Mon, 18 May 2020 14:31:12 +0000 (GMT) Received: from localhost.localdomain (unknown [9.85.206.55]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTPS; Mon, 18 May 2020 14:31:12 +0000 (GMT) Subject: Re: [PATCH v2 6/8] s390/sclp: add extended-length sccb support for kvm guest To: Janosch Frank , qemu-devel@nongnu.org, qemu-s390x@nongnu.org References: <20200515222032.18838-1-walling@linux.ibm.com> <20200515222032.18838-7-walling@linux.ibm.com> From: Collin Walling Message-ID: Date: Mon, 18 May 2020 10:31:11 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-18_06:2020-05-15, 2020-05-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 cotscore=-2147483648 phishscore=0 mlxlogscore=999 malwarescore=0 clxscore=1015 suspectscore=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005180126 Received-SPF: pass client-ip=148.163.158.5; envelope-from=walling@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/18 10:31:16 X-ACL-Warn: Detected OS = Linux 3.x [generic] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, KHOP_DYNAMIC=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, mst@redhat.com, cohuck@redhat.com, david@redhat.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, svens@linux.ibm.com, pbonzini@redhat.com, mihajlov@linux.ibm.com, rth@twiddle.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 5/18/20 4:55 AM, Janosch Frank wrote: > On 5/16/20 12:20 AM, Collin Walling wrote: >> As more features and facilities are added to the Read SCP Info (RSCPI) >> response, more space is required to store them. The space used to store >> these new features intrudes on the space originally used to store CPU >> entries. This means as more features and facilities are added to the >> RSCPI response, less space can be used to store CPU entries. >> >> With the Extended-Length SCCB (ELS) facility, a KVM guest can execute >> the RSCPI command and determine if the SCCB is large enough to store a >> complete reponse. If it is not large enough, then the required length >> will be set in the SCCB header. >> >> The caller of the SCLP command is responsible for creating a >> large-enough SCCB to store a complete response. Proper checking should >> be in place, and the caller should execute the command once-more with >> the large-enough SCCB. >> >> This facility also enables an extended SCCB for the Read CPU Info >> (RCPUI) command. >> >> When this facility is enabled, the boundary violation response cannot >> be a result from the RSCPI, RSCPI Forced, or RCPUI commands. >> >> In order to tolerate kernels that do not yet have full support for this >> feature, a "fixed" offset to the start of the CPU Entries within the >> Read SCP Info struct is set to allow for the original 248 max entries >> when this feature is disabled. >> >> Additionally, this is introduced as a CPU feature to protect the guest >> from migrating to a machine that does not support storing an extended >> SCCB. This could otherwise hinder the VM from being able to read all >> available CPU entries after migration (such as during re-ipl). >> >> Signed-off-by: Collin Walling >> --- >> hw/s390x/sclp.c | 21 ++++++++++++++++++++- >> include/hw/s390x/sclp.h | 1 + >> target/s390x/cpu_features_def.inc.h | 1 + >> target/s390x/gen-features.c | 1 + >> target/s390x/kvm.c | 4 ++++ >> 5 files changed, 27 insertions(+), 1 deletion(-) >> >> diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c >> index 755f5f3fab..bde4c5420e 100644 >> --- a/hw/s390x/sclp.c >> +++ b/hw/s390x/sclp.c >> @@ -56,6 +56,18 @@ static bool sccb_has_valid_boundary(uint64_t sccb_addr, uint32_t code, >> uint64_t allowed_len = (sccb_addr & PAGE_MASK) + PAGE_SIZE; >> >> switch (code & SCLP_CMD_CODE_MASK) { >> + case SCLP_CMDW_READ_SCP_INFO: >> + case SCLP_CMDW_READ_SCP_INFO_FORCED: >> + case SCLP_CMDW_READ_CPU_INFO: >> + /* >> + * An extended-length SCCB is only allowed for RSCPI and RSCPU and is >> + * allowed to exceed the 4k boundary. The respective commands will >> + * set the length field to the required length if an insufficient >> + * SCCB length is provided. >> + */ >> + if (s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB)) { >> + return true; >> + } >> default: >> if (current_len <= allowed_len) { >> return true; >> @@ -72,6 +84,10 @@ static bool sccb_has_sufficient_len(SCCB *sccb, int num_cpus, int data_len) >> >> if (be16_to_cpu(sccb->h.length) < required_len) { >> sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH); >> + if (s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB) && >> + sccb->h.control_mask[2] & SCLP_VARIABLE_LENGTH_RESPONSE) { >> + sccb->h.length = required_len; >> + } >> return false; >> } >> return true; >> @@ -101,7 +117,9 @@ static void prepare_cpu_entries(MachineState *ms, CPUEntry *entry, int *count) >> */ >> static int get_read_scp_info_data_len(void) >> { >> - return offsetof(ReadInfo, entries); >> + return s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB) ? >> + offsetof(ReadInfo, entries) : >> + SCLP_READ_SCP_INFO_FIXED_CPU_OFFSET; >> } >> >> /* Provide information about the configuration, CPUs and storage */ >> @@ -116,6 +134,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) >> CPUEntry *entries_start = (void *)sccb + data_len; >> >> if (!sccb_has_sufficient_len(sccb, machine->possible_cpus->len, data_len)) { >> + warn_report("insufficient sccb size to store full read scp info response"); >> return; >> } >> >> diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h >> index 822eff4396..ef2d63eae9 100644 >> --- a/include/hw/s390x/sclp.h >> +++ b/include/hw/s390x/sclp.h >> @@ -110,6 +110,7 @@ typedef struct CPUEntry { >> uint8_t reserved1; >> } QEMU_PACKED CPUEntry; >> >> +#define SCLP_READ_SCP_INFO_FIXED_CPU_OFFSET 128 >> typedef struct ReadInfo { >> SCCBHeader h; >> uint16_t rnmax; >> diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h >> index 60db28351d..3548d65a69 100644 >> --- a/target/s390x/cpu_features_def.inc.h >> +++ b/target/s390x/cpu_features_def.inc.h >> @@ -97,6 +97,7 @@ DEF_FEAT(GUARDED_STORAGE, "gs", STFL, 133, "Guarded-storage facility") >> DEF_FEAT(VECTOR_PACKED_DECIMAL, "vxpd", STFL, 134, "Vector packed decimal facility") >> DEF_FEAT(VECTOR_ENH, "vxeh", STFL, 135, "Vector enhancements facility") >> DEF_FEAT(MULTIPLE_EPOCH, "mepoch", STFL, 139, "Multiple-epoch facility") >> +DEF_FEAT(EXTENDED_LENGTH_SCCB, "els", STFL, 140, "Extended-length SCCB facility") >> DEF_FEAT(TEST_PENDING_EXT_INTERRUPTION, "tpei", STFL, 144, "Test-pending-external-interruption facility") >> DEF_FEAT(INSERT_REFERENCE_BITS_MULT, "irbm", STFL, 145, "Insert-reference-bits-multiple facility") >> DEF_FEAT(MSA_EXT_8, "msa8-base", STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)") >> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c >> index 8ddeebc544..6857f657fb 100644 >> --- a/target/s390x/gen-features.c >> +++ b/target/s390x/gen-features.c >> @@ -522,6 +522,7 @@ static uint16_t full_GEN12_GA1[] = { >> S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL, >> S390_FEAT_AP_FACILITIES_TEST, >> S390_FEAT_AP, >> + S390_FEAT_EXTENDED_LENGTH_SCCB, >> }; >> >> static uint16_t full_GEN12_GA2[] = { >> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c >> index 69881a0da0..380fb81822 100644 >> --- a/target/s390x/kvm.c >> +++ b/target/s390x/kvm.c >> @@ -2456,6 +2456,10 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) >> KVM_S390_VM_CRYPTO_ENABLE_APIE)) { >> set_bit(S390_FEAT_AP, model->features); >> } >> + >> + /* Extended-Length SCCB is handled entirely within QEMU */ >> + set_bit(S390_FEAT_EXTENDED_LENGTH_SCCB, model->features); >> + > > We need to fence this for secure guests as the SIDA is only 4k at the > moment. > I don't know much about the SE stuff, so I'll take your word for it. Should this follow the same fencing as diag 318 and simply check for pv mode? > Do we need to take extra steps for migration safety? > I guess this is only available with host-passthrough or -model? > >> /* strip of features that are not part of the maximum model */ >> bitmap_and(model->features, model->features, model->def->full_feat, >> S390_FEAT_MAX); >> > > -- -- Regards, Collin Stay safe and stay healthy