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=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,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 EA75BC55178 for ; Wed, 21 Oct 2020 14:16:44 +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 4D00322248 for ; Wed, 21 Oct 2020 14:16:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U377MggU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D00322248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVEux-0001PK-Af for qemu-devel@archiver.kernel.org; Wed, 21 Oct 2020 10:16:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVEtq-0000vl-0T for qemu-devel@nongnu.org; Wed, 21 Oct 2020 10:15:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVEto-0002KY-IT for qemu-devel@nongnu.org; Wed, 21 Oct 2020 10:15:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603289731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UZF0EvBkhZhPavXpWUpN34Uvve6Rn4C2Efpam2V57+4=; b=U377MggUssmbLJorSauKa0teOXwOVKuYrKuxyGkdOLRlinJBT8hLkVmec12kWN7WyncJZ+ h+HL7icLvma/ALBlsIWZEBbuPj8Q0tL/njjZCwZuV2SzAuDRNWtjeqfMM4Ggt9+PgBrY+o cbydnoHgApAik7shF0pE6tRdyef2PmY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-VfuopI8HOEagd1thDZZjPw-1; Wed, 21 Oct 2020 10:15:27 -0400 X-MC-Unique: VfuopI8HOEagd1thDZZjPw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1C3D18C89D2; Wed, 21 Oct 2020 14:14:43 +0000 (UTC) Received: from [10.36.114.138] (ovpn-114-138.ams2.redhat.com [10.36.114.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6909100164C; Wed, 21 Oct 2020 14:14:41 +0000 (UTC) Subject: Re: [PATCH 2/2] s390x: pv: Fix diag318 PV fencing To: Janosch Frank , qemu-devel@nongnu.org References: <20201021134345.110173-1-frankja@linux.ibm.com> <20201021134345.110173-3-frankja@linux.ibm.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Wed, 21 Oct 2020 16:14:40 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: <20201021134345.110173-3-frankja@linux.ibm.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/21 02:16:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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, cohuck@redhat.com, walling@linux.ibm.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, mhartmay@linux.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 21.10.20 15:43, Janosch Frank wrote: > Diag318 fencing needs to be determined on the current VM PV state and > not on the state that the VM has when we create the CPU model. > > Signed-off-by: Janosch Frank > Reported-by: Marc Hartmayer > Reviewed-by: Christian Borntraeger > Fixes: fabdada935 ("s390: guest support for diagnose 0x318") > Tested-by: Marc Hartmayer > --- > hw/s390x/sclp.c | 10 ++++++++++ > target/s390x/kvm.c | 3 +-- > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index 0cf2290826..69aba402d3 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -22,6 +22,7 @@ > #include "hw/s390x/event-facility.h" > #include "hw/s390x/s390-pci-bus.h" > #include "hw/s390x/ipl.h" > +#include "hw/s390x/pv.h" > > static inline SCLPDevice *get_sclp_device(void) > { > @@ -142,6 +143,15 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) > if (s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB)) { > s390_get_feat_block(S390_FEAT_TYPE_SCLP_FAC134, > &read_info->fac134); > + /* > + * Diag318 is not available in protected mode and will result > + * in an operation exception. As we can dynamically move in > + * and out of protected mode, we need to fence the feature > + * here rather than when creating the CPU model. > + */ > + if (s390_is_pv()) { > + read_info->fac134 &= ~0x80; > + } Hmm, I thought firmware would handle exposing cpu features and similar, so we can't temper with it .... Can we move that into s390_get_feat_block instead and check against the feature bit instead? -- Thanks, David / dhildenb