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=-16.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,USER_AGENT_GIT 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 E8891C433E0 for ; Mon, 15 Feb 2021 13:31:46 +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 84F0F64D79 for ; Mon, 15 Feb 2021 13:31:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84F0F64D79 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]:51116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBdyb-0001IO-O3 for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 08:31:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBdk1-0005gI-Cu for qemu-devel@nongnu.org; Mon, 15 Feb 2021 08:16:41 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:36934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBdjz-0005YO-R3 for qemu-devel@nongnu.org; Mon, 15 Feb 2021 08:16:41 -0500 Received: by mail-ej1-x62a.google.com with SMTP id jj19so11089310ejc.4 for ; Mon, 15 Feb 2021 05:16:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UXgcd0FI6AOswc8vxaoBN+OEtL7F7rxrjG3WEvBYSR0=; b=U8kU37l6HTUwHsuDqb6REtQ4sjM26+JA6VgWqZjLfvpzLCT0ybcBY2HIxSWgb37wqC 6jS2mAJb3QXUzMvYJ6oXy0EsrA5T8dxbUguriLtUD4uUyorK1IrU2pfR5FM8PxCm/xNz 88KUuxKZ6DFIGoJxK5dIyv4LHeZYTzvJicGwEHPtBxwOZbL5wybcrWdax8UagbBw51bV v3tQcNOXHK8kGVkhN6cWmaOeKP7FX5xOw4wP+Iouruq8c7+pcr0m6Cjr6P8OW/jW6FXa AUnMczQHrYV1tu3c59NMfZoRuYu94dakfhFBySVgC5ooYi/UJMa7WcdQuaXcekcKt7W8 EIxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UXgcd0FI6AOswc8vxaoBN+OEtL7F7rxrjG3WEvBYSR0=; b=M8yF9neT1QjGObftqBtQcrjnPjkW0jKggKUiDeDcvPttCmJKO6jcAJlCB6trFQZ49d +t2dXFmFpjIJ0ro1RK8hUo4P3SGEfD5/Ey0aAru2uwz0cE8OIrEyIxj/YSi5e8pJF7rv SAfn/ae4DHywjJjcVCCZ/TWoq9PBQLsSjja2pE42yPYVVezdUXYIIZj6gtk39jhgH+IN 5Pq64mGjQaISRwYac9YcVT/nHmFfwM055JmgL+M8edz6YqLCKVkNlqHWa3Yx3XEqFbAh Ysxk+7V/96IgGnc7ytmx0iAZ4TZtj1AFj2zBmunCGWc7+WVSaHHN20hSTEop5gzE6tpQ 0b3g== X-Gm-Message-State: AOAM5302Ke7DoBdbCxjOuREvjJ67dJ5TMPKAFceCyA082wbAXVDuySRl KZhFg6QxKQSSWfc6FC4gzKdSXVyroLw= X-Google-Smtp-Source: ABdhPJy0GtZd+diJKpkF7bpd67n5EgzWd5f3+MEwR6qpIFxyembbJczoXRg+qwJSeGBCJadi/285EA== X-Received: by 2002:a17:907:da9:: with SMTP id go41mr15668611ejc.326.1613394998529; Mon, 15 Feb 2021 05:16:38 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o4sm9950184edw.78.2021.02.15.05.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 05:16:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/19] hvf: Guard xgetbv call Date: Mon, 15 Feb 2021 14:16:22 +0100 Message-Id: <20210215131626.65640-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210215131626.65640-1-pbonzini@redhat.com> References: <20210215131626.65640-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Roman Bolshakov , Hill Ma , Cameron Esfahani Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Hill Ma This prevents illegal instruction on cpus that do not support xgetbv. Buglink: https://bugs.launchpad.net/qemu/+bug/1758819 Reviewed-by: Cameron Esfahani Signed-off-by: Hill Ma Message-Id: Signed-off-by: Roman Bolshakov Signed-off-by: Paolo Bonzini --- target/i386/hvf/x86_cpuid.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c index a6842912f5..32b0d131df 100644 --- a/target/i386/hvf/x86_cpuid.c +++ b/target/i386/hvf/x86_cpuid.c @@ -27,15 +27,22 @@ #include "vmx.h" #include "sysemu/hvf.h" -static uint64_t xgetbv(uint32_t xcr) +static bool xgetbv(uint32_t cpuid_ecx, uint32_t idx, uint64_t *xcr) { - uint32_t eax, edx; + uint32_t xcrl, xcrh; - __asm__ volatile ("xgetbv" - : "=a" (eax), "=d" (edx) - : "c" (xcr)); + if (cpuid_ecx & CPUID_EXT_OSXSAVE) { + /* + * The xgetbv instruction is not available to older versions of + * the assembler, so we encode the instruction manually. + */ + asm(".byte 0x0f, 0x01, 0xd0" : "=a" (xcrl), "=d" (xcrh) : "c" (idx)); - return (((uint64_t)edx) << 32) | eax; + *xcr = (((uint64_t)xcrh) << 32) | xcrl; + return true; + } + + return false; } uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, @@ -100,12 +107,15 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, break; case 0xD: if (idx == 0) { - uint64_t host_xcr0 = xgetbv(0); - uint64_t supp_xcr0 = host_xcr0 & (XSTATE_FP_MASK | XSTATE_SSE_MASK | - XSTATE_YMM_MASK | XSTATE_BNDREGS_MASK | - XSTATE_BNDCSR_MASK | XSTATE_OPMASK_MASK | - XSTATE_ZMM_Hi256_MASK | XSTATE_Hi16_ZMM_MASK); - eax &= supp_xcr0; + uint64_t host_xcr0; + if (xgetbv(ecx, 0, &host_xcr0)) { + uint64_t supp_xcr0 = host_xcr0 & (XSTATE_FP_MASK | + XSTATE_SSE_MASK | XSTATE_YMM_MASK | + XSTATE_BNDREGS_MASK | XSTATE_BNDCSR_MASK | + XSTATE_OPMASK_MASK | XSTATE_ZMM_Hi256_MASK | + XSTATE_Hi16_ZMM_MASK); + eax &= supp_xcr0; + } } else if (idx == 1) { hv_vmx_read_capability(HV_VMX_CAP_PROCBASED2, &cap); eax &= CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XGETBV1; -- 2.29.2