From patchwork Wed Sep 13 09:30:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 722120 Delivered-To: patch@linaro.org Received: by 2002:a5d:4387:0:b0:31d:da82:a3b4 with SMTP id i7csp192599wrq; Wed, 13 Sep 2023 02:31:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqHPEcBtVsaY4Z5jhu1jWUvECdCRNOMV52CnCqMBi9SKCNXHQdKnGuc6nyaxyNrQpOU/TZ X-Received: by 2002:a05:622a:589:b0:412:945:770b with SMTP id c9-20020a05622a058900b004120945770bmr2055815qtb.18.1694597504515; Wed, 13 Sep 2023 02:31:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694597504; cv=none; d=google.com; s=arc-20160816; b=M3sh+8BBN/v6JduW/HlbqHH4euKbN+tLlIaZkwzrhvxaMLskwwTTHwXYoY3Ycz5YpH O+GlbHJqoMzixgXgf5OwWywo9PTz6ZW8Uk30QKbOetZcP7QOivyGNKyzIf3KWX2QDAIT bRr4NnOStzzI4f1456rjQcrIg/NbHCXWW3q00Aa1R+UFJvmD7CjjqFR1J2+L8AHu4YdV By4fq0RbeqF2XeIcwO9MulO9JKwAFx3EZcA1moef5TEMXpSAxKYQG4P8YhSlXQoxpP70 v/nJ/VbS3tFX7YK8c5I3/a2vsMmJXkL4uVXclwBnduOwFG8iKPV3ZlUOQlsfGJVrFAxp Xr1g== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eKbeAfeEWeYWq6ZMSQ2gP4OMkhbj3lmxF1/S1lGxkFI=; fh=gGU+936hSKyjfCkvw+7ovSo4LbZMBSzYH7C194STwMA=; b=y7iYdJ8wAFApj7FYvJLeZMDHTqe7oW0eyVZXtgPKrvbxDWCSfizVWrElt3EOQq4DcY ifDRaQySdDxcm5BZ/hNhSzLyj+IGosGXbf0uPNWdzbXFxg5M9w2UkkKfYvah0wHwzRDw GKhs1kGkSNvt7Htc9fwG0ztrUZte5LD0+6vDIG533OIe1L5gvk/mcBnNWUDxVowIh6Ko WNKQyZhSt9iZ7snotNx30HS872j1Bc5KUrKRXTb0aeAp48HMsU6MNHxdcmWiFd7PUuOb mFyT7ytG0fgmXpoP7x3i+q8+HgeMOreEftKRodXIEkv5420l6n9Wg3OI5o81YkuvWxCF hx6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CHE19x6S; 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=pass (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 r18-20020ac85c92000000b0041220e682d3si7382244qta.596.2023.09.13.02.31.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Sep 2023 02:31:44 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=CHE19x6S; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgMCw-0001H8-MY; Wed, 13 Sep 2023 05:30:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgMCv-0001Gk-Bu for qemu-devel@nongnu.org; Wed, 13 Sep 2023 05:30:49 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgMCs-0002Ky-5V for qemu-devel@nongnu.org; Wed, 13 Sep 2023 05:30:48 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31f4a286ae1so6199289f8f.3 for ; Wed, 13 Sep 2023 02:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694597444; x=1695202244; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eKbeAfeEWeYWq6ZMSQ2gP4OMkhbj3lmxF1/S1lGxkFI=; b=CHE19x6SBYVp28nEZ6D7kT6ITh4PMkcmBelUH8DsZgnjFb5s7kS0TmVoa66QkEwquE r37JlKtPfQVC6YEnqwAp4N5uJMrIBQGQA748c62L7inPkwy7Ze9QfikXEjdanjstak96 4UvXTDciyedHazOsWDpKSKIeXyxMD8gw2+Kjf1eXKA2Rvfz4It62w0VC7NSIdPIZ8m6k nmbLml89r7NzpwmejN+ChOAkJ6vthdbaIjI5jbOvKcPkVnW0kF+kzjIlNl7Mu6zx9/1t IF65uFZfQRc2QMzx7LP9oqXAkB4I534SiLUVDJFFcFwb2/+DwftjPFZOD/ZN9fPQzget xG+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694597444; x=1695202244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eKbeAfeEWeYWq6ZMSQ2gP4OMkhbj3lmxF1/S1lGxkFI=; b=rQVbqhAHleW5yiXcwfQpI0Ksv0RiF1myS25wDxvEiRG5POdxzXxyVqm6a/gRJgKsBs NWXjJd96r3MMyJN/XcyuDaNaDvWGfp/UVAZueYiFFHfZBgBE86HTxx81COdnp6Ral4Pz FW3qO53cYZeJSV54KgmxbMUJvx8udTdbzQmK3nAsSY4z7gGy2boomnpfHoeixHndsaCy S36K4VKHKcqGy116el9Fx6j9h3jgyBdsJt9eTAMOHQ/nY1E95FXIZ2taC14F/0CJ9adR D6n71BlsAUkh1RMeOHc3d6/VJ+ysJnINxYCFlQOR28nOt/rCwb9f618pYGWT9XSJgj9j ZmAw== X-Gm-Message-State: AOJu0Yz/c+nERp8I633xn9npAAT7eJ6BpPtilv7xqUshk/JIYeyum3D7 zJBIuTiVTTj4xuSq2kZ5qeRbPrXb08aGH5ogfgk= X-Received: by 2002:adf:ebc8:0:b0:31a:e6c2:770d with SMTP id v8-20020adfebc8000000b0031ae6c2770dmr1565964wrn.36.1694597444117; Wed, 13 Sep 2023 02:30:44 -0700 (PDT) Received: from m1x-phil.lan (176-131-211-241.abo.bbox.fr. [176.131.211.241]) by smtp.gmail.com with ESMTPSA id u4-20020a5d6da4000000b0031fb91f23e9sm4107295wrs.43.2023.09.13.02.30.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Sep 2023 02:30:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , kvm@vger.kernel.org, Paolo Bonzini , Stefan Hajnoczi , Michael Tokarev , Kevin Wolf , Richard Henderson , Daniel Henrique Barboza , Marcelo Tosatti , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [RFC PATCH v5 5/6] target/i386: Restrict system-specific code from user emulation Date: Wed, 13 Sep 2023 11:30:07 +0200 Message-ID: <20230913093009.83520-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230913093009.83520-1-philmd@linaro.org> References: <20230913093009.83520-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org Restrict calls to: - kvm_arch_get_supported_cpuid() - kvm_arch_get_supported_msr_feature() - kvm_request_xsave_components() - kvm_hyperv_expand_features() so we can remove restrict "kvm/kvm_i386.h" and all its declarations to system emulation (see the next commit). Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3df85a6347..c201ff26bd 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5654,8 +5654,6 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) return cpu_list; } -#endif /* !CONFIG_USER_ONLY */ - /* * Returns the set of feature flags that are supported and migratable by * QEMU, for a given FeatureWord. @@ -5781,6 +5779,38 @@ static void x86_cpu_get_cache_cpuid(uint32_t func, uint32_t index, } } +#else /* CONFIG_USER_ONLY */ + +uint64_t x86_cpu_get_supported_feature_word(FeatureWord w, + bool migratable_only) +{ + FeatureWordInfo *wi = &feature_word_info[w]; + + return wi->tcg_features; +} + +static void x86_cpu_get_supported_cpuid(uint32_t func, uint32_t index, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) +{ + *eax = 0; + *ebx = 0; + *ecx = 0; + *edx = 0; +} + +static void x86_cpu_get_cache_cpuid(uint32_t func, uint32_t index, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) +{ + *eax = 0; + *ebx = 0; + *ecx = 0; + *edx = 0; +} + +#endif /* !CONFIG_USER_ONLY */ + /* * Only for builtin_x86_defs models initialized with x86_register_cpudef_types. */ @@ -6918,7 +6948,6 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) CPUX86State *env = &cpu->env; int i; uint64_t mask; - static bool request_perm; if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) { env->features[FEAT_XSAVE_XCR0_LO] = 0; @@ -6934,11 +6963,15 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) } } +#ifndef CONFIG_USER_ONLY + static bool request_perm; + /* Only request permission for first vcpu */ if (kvm_enabled() && !request_perm) { kvm_request_xsave_components(cpu, mask); request_perm = true; } +#endif /* !CONFIG_USER_ONLY */ env->features[FEAT_XSAVE_XCR0_LO] = mask & CPUID_XSTATE_XCR0_MASK; env->features[FEAT_XSAVE_XCR0_HI] = mask >> 32; @@ -7119,9 +7152,11 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp) env->cpuid_xlevel2 = env->cpuid_min_xlevel2; } +#ifndef CONFIG_USER_ONLY if (kvm_enabled() && !kvm_hyperv_expand_features(cpu, errp)) { return; } +#endif /* !CONFIG_USER_ONLY */ } /*