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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 1FBFDC11F65 for ; Wed, 30 Jun 2021 15:23:05 +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 76E9561476 for ; Wed, 30 Jun 2021 15:23:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76E9561476 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]:40340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyc3L-0005A4-9S for qemu-devel@archiver.kernel.org; Wed, 30 Jun 2021 11:23:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyc2D-0004Qt-M2 for qemu-devel@nongnu.org; Wed, 30 Jun 2021 11:21:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42269) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyc2A-0006Nd-Fg for qemu-devel@nongnu.org; Wed, 30 Jun 2021 11:21:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625066509; 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: in-reply-to:in-reply-to:references:references; bh=eiPewPa3xxQsPN+zNX1qj+v6D4IiYAl+GNlFFAYjFxU=; b=MMU7/uhVZp7f928UsHzO7OqEE6qX1ZH+MgE9wbp92RtSA/2E9hyBHsNS0NzbfeNFwQOxML DiQcbmGe0YGAIW845oB5WlGMRZaLvnzuAElNFGGU/SJImJA4vNskPZ0QXTr9BfJAGmf+Gr FMukURKnud17N13mgKcIbuBUQSFtdUs= 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-152-QcZd7JbpMXaBe1RhfHu5JA-1; Wed, 30 Jun 2021 11:21:47 -0400 X-MC-Unique: QcZd7JbpMXaBe1RhfHu5JA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 81DF85074F; Wed, 30 Jun 2021 15:21:46 +0000 (UTC) Received: from localhost (ovpn-112-48.ams2.redhat.com [10.36.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E925C5C1A3; Wed, 30 Jun 2021 15:21:45 +0000 (UTC) From: Cornelia Huck To: "Cho, Yu-Chen" , qemu-devel@nongnu.org, qemu-s390x@nongnu.org Subject: Re: [RFC v6 10/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m In-Reply-To: <20210629141931.4489-11-acho@suse.com> Organization: Red Hat GmbH References: <20210629141931.4489-1-acho@suse.com> <20210629141931.4489-11-acho@suse.com> User-Agent: Notmuch/0.32.1 (https://notmuchmail.org) Date: Wed, 30 Jun 2021 17:21:44 +0200 Message-ID: <87fswzl6nr.fsf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=170.10.133.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.435, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: cfontana@suse.com, Claudio Fontana , acho@suse.com, jose.ziviani@suse.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Jun 29 2021, "Cho, Yu-Chen" wrote: > this will allow to remove the kvm stubs. > > Signed-off-by: Claudio Fontana > Signed-off-by: Cho, Yu-Chen > --- > target/s390x/diag.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/target/s390x/diag.c b/target/s390x/diag.c > index c17a2498a7..8405f69df0 100644 > --- a/target/s390x/diag.c > +++ b/target/s390x/diag.c > @@ -20,6 +20,7 @@ > #include "hw/s390x/ipl.h" > #include "hw/s390x/s390-virtio-ccw.h" > #include "hw/s390x/pv.h" > +#include "sysemu/kvm.h" > #include "kvm_s390x.h" > > int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3) > @@ -168,7 +169,7 @@ out: > return; > } > > - if (kvm_s390_get_hpage_1m()) { > + if (kvm_enabled() && kvm_s390_get_hpage_1m()) { I think I asked before whether we should introduce a s390_huge_page_backing() wrapper (which might be overkill)... any opinions on that? I'm not really opposed to this patch here, either. > error_report("Protected VMs can currently not be backed with " > "huge pages"); > env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV;