From patchwork Tue Mar 5 16:50:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 159694 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5205301jad; Tue, 5 Mar 2019 09:11:24 -0800 (PST) X-Google-Smtp-Source: APXvYqy4iCP3WCIxcgCHgsGJQ68MkPjfWBM/E5gkb3HRBT2ohX9RxeakfyyqrYWlrR6Bl4BmmC6G X-Received: by 2002:a0d:d3c3:: with SMTP id v186mr1861636ywd.15.1551805884650; Tue, 05 Mar 2019 09:11:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551805884; cv=none; d=google.com; s=arc-20160816; b=zdCot/M+qerze/7n1Q94gTe2qCetyicaLrVC7kSaywqY/9Y0HlNSrmwUIO5PQfKl1I BlpeKZZiFHuWnZLDoRrIFc+B3gmARHXt89BaK9d3aRZV2NGQFupUSocpGXk5pJxCuqdo LnMXkc/cYUvqvLXE4z6YNyNk6g24r3UfMS7b3MKs6aDN04xYfYO+klt6FKVTKeFBaiQs YLmmRGpNGoSFAo7oGRcuzYX5RyxRa3DCWjfaoqlHQHYTQKHNoBPmJIeydfpZeXVDaF2v p1JoJq2klo88dKKOH+FVlS63JMX7q+QU7P9tOeBrWExqhSo4iQpNP/hyQ7ltCqCN0eoJ fF/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=FtOTJlSq9S5t1Hgp/jxHYFpg4nKgp8+kYiOMVJluGxE=; b=KrP5/8Um1ACW9hX0DQsuYh+h40KLvzRTD+I4GlhQyeRSuH4EXq3LMupeLmYP1d/YEX UJuWxapIvYSAJOX4gSR1HMI/fjIn3Wt2q1pZLpAK843H1btUuDWUU1162CObUdixiZve MKMRZwQqVIjykVWJPa7fTDhYtxbkcrNs5HnuggAjwAwz5NoUZRw+9X7mS+AqouTGei3Z zz0YDc+tP1oyag6uOHiXe7DQ4phG+3hnkfRIBLHV8d52OuYXqetAKO804RtAnv/POZzz PSLHnNVlYq5EpGy10NlO6iyvy9/s6dDYh3CGyN5aOQYdYVzj9VtA91/fPKchWNvHgDB/ YGhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a7S0iPEt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 134si5354542ywt.200.2019.03.05.09.11.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2019 09:11:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a7S0iPEt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:46053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DbA-0000w9-44 for patch@linaro.org; Tue, 05 Mar 2019 12:11:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DHe-0001fw-Li for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1DHd-0000zT-Rc for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:14 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:52359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1DHd-0000yU-Jq for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:13 -0500 Received: by mail-wm1-x32d.google.com with SMTP id f65so3252558wma.2 for ; Tue, 05 Mar 2019 08:51:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FtOTJlSq9S5t1Hgp/jxHYFpg4nKgp8+kYiOMVJluGxE=; b=a7S0iPEt5MKmw2zVQCjISHc/VmIDMzv/UJVyxyfiN1+BcvETxL2bAq7rIEo42eUMPB dvDsBxBD2R6NxC42VJsrNDPzD/I+AazSe5qgHJV3peoRT6I2UjJjTaEN3mIgvni9Byk7 ZaYxYrNJY9Dps1I4SXsubmCx57URhiYDeBSJhEwUdGpCsKG76ejzrOLvfDLFYXYomj9k TCSzzsuHNVL9FusTAZO3OzN/hlS7Rzw4vALcxM616YmWRnnGc438/E2Rj0sx7LSnuj7G QB2JpW5sPNb0to0JLWWNw6nhdchx11c34RPjCGCEF2phgW6XdwRMZRjbN/pOKW3qQC/1 l23w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FtOTJlSq9S5t1Hgp/jxHYFpg4nKgp8+kYiOMVJluGxE=; b=qexBS9J8AKuWcsblp4jelYm/p1uvu+7F8NahwHhXWp+OmTBj+3DoqlgYr4lkK/2iqf 1ufnmUJbFp7jSPVwSGtMLtRsMnR1OuFs53zV2dn3v0y5Q9JVZ4B9YWNaQ8cFu5qdqhx3 p46AZ5f50RwPPF8vCF2RXT7o4OsxPcO6dQqeSv44AfB3SVMMyALYCJlpNd4erAwIfXi7 /2o8fhNTz5+0LmDogWZs6x3qAbmj5KfjLv7d+wjwG/+gJR1XIA5fR94Whl9CEq4dkAYs h+V4944mi1GGX+i27sAiD/sT51GVvVFvAH963m8S+8om3gpMbbO3n/xJ3Cl+5aAnS2hj Il6g== X-Gm-Message-State: APjAAAVIeg9JdbEnqfxoIlZ4AG9Xc3yiP3FwHqQHczWhXw/3QREIjyl+ hwuu1vP0RU2f8q8Cj81uiCISEJZs+1w= X-Received: by 2002:a1c:64c1:: with SMTP id y184mr3380474wmb.0.1551804672315; Tue, 05 Mar 2019 08:51:12 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 2sm10071495wrg.89.2019.03.05.08.51.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 08:51:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2019 16:50:45 +0000 Message-Id: <20190305165051.26860-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305165051.26860-1-peter.maydell@linaro.org> References: <20190305165051.26860-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d Subject: [Qemu-devel] [PULL 16/22] kvm: add kvm_arm_get_max_vm_ipa_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger Add the kvm_arm_get_max_vm_ipa_size() helper that returns the number of bits in the IPA address space supported by KVM. This capability needs to be known to create the VM with a specific IPA max size (kvm_type passed along KVM_CREATE_VM ioctl. Signed-off-by: Eric Auger Reviewed-by: Igor Mammedov Message-id: 20190304101339.25970-6-eric.auger@redhat.com Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 13 +++++++++++++ target/arm/kvm.c | 10 ++++++++++ 2 files changed, 23 insertions(+) -- 2.20.1 diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 6393455b1d0..2a07333c615 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -207,6 +207,14 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf); */ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu); +/** + * kvm_arm_get_max_vm_ipa_size - Returns the number of bits in the + * IPA address space supported by KVM + * + * @ms: Machine state handle + */ +int kvm_arm_get_max_vm_ipa_size(MachineState *ms); + /** * kvm_arm_sync_mpstate_to_kvm * @cpu: ARMCPU @@ -239,6 +247,11 @@ static inline void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) cpu->host_cpu_probe_failed = true; } +static inline int kvm_arm_get_max_vm_ipa_size(MachineState *ms) +{ + return -ENOENT; +} + static inline int kvm_arm_vgic_probe(void) { return 0; diff --git a/target/arm/kvm.c b/target/arm/kvm.c index e00ccf9c987..79a79f01905 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -18,6 +18,7 @@ #include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/kvm_int.h" #include "kvm_arm.h" #include "cpu.h" #include "trace.h" @@ -162,6 +163,15 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) env->features = arm_host_cpu_features.features; } +int kvm_arm_get_max_vm_ipa_size(MachineState *ms) +{ + KVMState *s = KVM_STATE(ms->accelerator); + int ret; + + ret = kvm_check_extension(s, KVM_CAP_ARM_VM_IPA_SIZE); + return ret > 0 ? ret : 40; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { /* For ARM interrupt delivery is always asynchronous,