From patchwork Tue May 14 19:16:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164250 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp3017090ili; Tue, 14 May 2019 12:36:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwN7Y4lHSHMyPDAOb9Pparq23bYDpOZXnz0dJP6nv6+QOXlOyHzmNvFmyERuI8xf238MWCe X-Received: by 2002:a17:906:9a9:: with SMTP id q9mr29419302eje.171.1557862607839; Tue, 14 May 2019 12:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557862607; cv=none; d=google.com; s=arc-20160816; b=NSFGQxKAxmmRoX1Kc5nfgyyHK0IwLVkIJfi6ec0w21pUq5gm79xg6kvQiB+xnXp749 sVgB0B7x9TtPjAZbUBG/ssszb9c5lETOe0JLztlScGb30oUJsFq67Xc8ZQra9IU63Gp7 13Qm5Q+JuCTncAVhpkppzW2pbT5HGG8LdDkMArsSl9dSQCA43zaf2qUrLGVn4lqDwZ1S 26dN+QgKFKGBXvwKmWDSoe7LusTPtRmWFvftoSMp0FdYkYOqRi5GvuO9ugsaONiyse5y eFW+fckLDtKvbE3MAMgrdvAJj+C0Hl7XPFKWtsCk//5ijiLOdajtC2XP9mZaGNZlqjmJ Olng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=HYIlEI5x7dSKPn06Te85N+SIxFZI2TsRzdSqKh133IE=; b=YBev+xo5fTzXgtCmkBn3ot+Ex7qTvilYTToLNl50d/GWyaZnlD3JJ/ezVMDoaYAoEh fmrAEmlJ901oKKEdnk1gnqy9/D04FjObiWj+V18SSMqHTYDK6blVYyMQ2uyWveoW9QPj vTnFbvFNqTRX7O12Om/TvQpEj52AqkTHQP61j/H/TlbTCtPMf3K3yJaBNTnc2ncvu9gZ ueYy5dlY8qsWRNWxC6ubvaTb3qfGxwFhJIzqZ8pLSloJrDtT6tOHpplNHqdjA99VLlui HQmXlggXDUvt6od6LgHx1//HSNqYu+DkGwgz6RoNNTBu8ZvWfcDNPfjUPp21Lj+jhsFf OfhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rKeBW048; 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 l24si1996438edb.217.2019.05.14.12.36.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 May 2019 12:36:47 -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=fail header.i=@linaro.org header.s=google header.b=rKeBW048; 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]:53210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQdEE-0002I9-I8 for patch@linaro.org; Tue, 14 May 2019 15:36:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQcve-0002q5-W9 for qemu-devel@nongnu.org; Tue, 14 May 2019 15:17:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQcvd-0007Fb-3Q for qemu-devel@nongnu.org; Tue, 14 May 2019 15:17:34 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:39626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQcvZ-0007BT-8w for qemu-devel@nongnu.org; Tue, 14 May 2019 15:17:30 -0400 Received: by mail-pf1-x435.google.com with SMTP id z26so3276pfg.6 for ; Tue, 14 May 2019 12:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HYIlEI5x7dSKPn06Te85N+SIxFZI2TsRzdSqKh133IE=; b=rKeBW048rbZAKp/CQy6+FJuXXCdeRR2f6Ts45gVcCljIN/N82Tov1OXogSF2BQ+nu3 p0ml1kairTTI5Kw2R4tprTPkM7ahsLng3NDQUT/uioO6RD/roEgxHZP2AbtnIbRBA2Vu wpdBU+9T9w5wDR2qnEVofHe7b6c1do+3v+3Wwz5h5hyY7m/k4/p/cZocV/s4wd4ogRff 58ixcZmQLoKiOYT1X9E4HZauwsPaQoLvQ7fQckvGP5dtAhbi4tf03nKMhGCTAXwcjpAZ 15HzfXCpEhfKd07SyuJmbbIDTcj1c+AwtztkwLURq3UH+G8RCO+w1fUNhXDSnhqcA8FM Q19g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HYIlEI5x7dSKPn06Te85N+SIxFZI2TsRzdSqKh133IE=; b=ajgOl51aP9gMhmVuRAlCE249MLQLjI8LiLuWKoz834Hx/PfYAz0scOfy5E92gRR24D 2T3X6KuivZ8dRkaxIsGNMrzcvL+3OF87xCKjhxtzNvA9qeiZ1YW9deGOnfxHAV3LZDnt dtetgaleUnS4hCO8dnmxg78y2P+jg9uwPC+U/OAupFGOyxpDGeRgzdHQuUPce4EFfyfA gihGwRzhxxLEBl6MksDjHLuTWQLoVRjCqW+YCpSwaQKCSCR2Qjbvn89wfqG0p0Szzmyh GxuneRkE8tT0pBpX/1gkh13HQ09sXDEA7w3PYLqgXpEwha15w//0Gg807wN7pVfgnd7p R1Aw== X-Gm-Message-State: APjAAAVwtI7Y3/zkeOYJI7IJC09Cfy75ff0sTNj17hkZ3t3OkmOx2VM/ SbOFAGfMW6JDbWfvZ/x2XiJUmUWCFZ4= X-Received: by 2002:a62:6d47:: with SMTP id i68mr42667690pfc.189.1557861446957; Tue, 14 May 2019 12:17:26 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id o6sm18682982pfa.88.2019.05.14.12.17.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 May 2019 12:17:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 12:16:53 -0700 Message-Id: <20190514191653.31488-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190514191653.31488-1-richard.henderson@linaro.org> References: <20190514191653.31488-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::435 Subject: [Qemu-devel] [PATCH v7 24/24] target/i386: Implement CPUID_EXT_RDRAND 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: , Cc: lvivier@redhat.com, berrange@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We now have an interface for guest visible random numbers. Reviewed-by: Eduardo Habkost Signed-off-by: Richard Henderson --- target/i386/helper.h | 2 ++ target/i386/cpu.c | 5 ++-- target/i386/int_helper.c | 21 ++++++++++++++ target/i386/translate.c | 62 ++++++++++++++++++++++++++++++---------- 4 files changed, 73 insertions(+), 17 deletions(-) -- 2.17.1 diff --git a/target/i386/helper.h b/target/i386/helper.h index 6fb8fb9b74..8f9e1905c3 100644 --- a/target/i386/helper.h +++ b/target/i386/helper.h @@ -226,3 +226,5 @@ DEF_HELPER_3(rcrl, tl, env, tl, tl) DEF_HELPER_3(rclq, tl, env, tl, tl) DEF_HELPER_3(rcrq, tl, env, tl, tl) #endif + +DEF_HELPER_1(rdrand, tl, env) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 722c5514d4..1386814957 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -730,13 +730,14 @@ static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1, CPUID_EXT_MONITOR | CPUID_EXT_SSSE3 | CPUID_EXT_CX16 | \ CPUID_EXT_SSE41 | CPUID_EXT_SSE42 | CPUID_EXT_POPCNT | \ CPUID_EXT_XSAVE | /* CPUID_EXT_OSXSAVE is dynamic */ \ - CPUID_EXT_MOVBE | CPUID_EXT_AES | CPUID_EXT_HYPERVISOR) + CPUID_EXT_MOVBE | CPUID_EXT_AES | CPUID_EXT_HYPERVISOR | \ + CPUID_EXT_RDRAND) /* missing: CPUID_EXT_DTES64, CPUID_EXT_DSCPL, CPUID_EXT_VMX, CPUID_EXT_SMX, CPUID_EXT_EST, CPUID_EXT_TM2, CPUID_EXT_CID, CPUID_EXT_FMA, CPUID_EXT_XTPR, CPUID_EXT_PDCM, CPUID_EXT_PCID, CPUID_EXT_DCA, CPUID_EXT_X2APIC, CPUID_EXT_TSC_DEADLINE_TIMER, CPUID_EXT_AVX, - CPUID_EXT_F16C, CPUID_EXT_RDRAND */ + CPUID_EXT_F16C */ #ifdef TARGET_X86_64 #define TCG_EXT2_X86_64_FEATURES (CPUID_EXT2_SYSCALL | CPUID_EXT2_LM) diff --git a/target/i386/int_helper.c b/target/i386/int_helper.c index 4dc5c65991..334469ca8c 100644 --- a/target/i386/int_helper.c +++ b/target/i386/int_helper.c @@ -22,6 +22,8 @@ #include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" +#include "qapi/error.h" +#include "qemu/guest-random.h" //#define DEBUG_MULDIV @@ -470,3 +472,22 @@ void helper_cr4_testbit(CPUX86State *env, uint32_t bit) raise_exception_ra(env, EXCP06_ILLOP, GETPC()); } } + +target_ulong HELPER(rdrand)(CPUX86State *env) +{ + Error *err = NULL; + target_ulong ret; + + if (qemu_guest_getrandom(&ret, sizeof(ret), &err) < 0) { + qemu_log_mask(LOG_UNIMP, "rdrand: Crypto failure: %s", + error_get_pretty(err)); + error_free(err); + /* Failure clears CF and all other flags, and returns 0. */ + env->cc_src = 0; + return 0; + } + + /* Success sets CF and clears all others. */ + env->cc_src = CC_C; + return ret; +} diff --git a/target/i386/translate.c b/target/i386/translate.c index 77d6b73e42..03150a86e2 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -5332,31 +5332,63 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) case 0x1c7: /* cmpxchg8b */ modrm = x86_ldub_code(env, s); mod = (modrm >> 6) & 3; - if ((mod == 3) || ((modrm & 0x38) != 0x8)) - goto illegal_op; -#ifdef TARGET_X86_64 - if (dflag == MO_64) { - if (!(s->cpuid_ext_features & CPUID_EXT_CX16)) + switch ((modrm >> 3) & 7) { + case 1: /* CMPXCHG8, CMPXCHG16 */ + if (mod == 3) { goto illegal_op; - gen_lea_modrm(env, s, modrm); - if ((s->prefix & PREFIX_LOCK) && (tb_cflags(s->base.tb) & CF_PARALLEL)) { - gen_helper_cmpxchg16b(cpu_env, s->A0); - } else { - gen_helper_cmpxchg16b_unlocked(cpu_env, s->A0); } - } else +#ifdef TARGET_X86_64 + if (dflag == MO_64) { + if (!(s->cpuid_ext_features & CPUID_EXT_CX16)) { + goto illegal_op; + } + gen_lea_modrm(env, s, modrm); + if ((s->prefix & PREFIX_LOCK) && + (tb_cflags(s->base.tb) & CF_PARALLEL)) { + gen_helper_cmpxchg16b(cpu_env, s->A0); + } else { + gen_helper_cmpxchg16b_unlocked(cpu_env, s->A0); + } + set_cc_op(s, CC_OP_EFLAGS); + break; + } #endif - { - if (!(s->cpuid_features & CPUID_CX8)) + if (!(s->cpuid_features & CPUID_CX8)) { goto illegal_op; + } gen_lea_modrm(env, s, modrm); - if ((s->prefix & PREFIX_LOCK) && (tb_cflags(s->base.tb) & CF_PARALLEL)) { + if ((s->prefix & PREFIX_LOCK) && + (tb_cflags(s->base.tb) & CF_PARALLEL)) { gen_helper_cmpxchg8b(cpu_env, s->A0); } else { gen_helper_cmpxchg8b_unlocked(cpu_env, s->A0); } + set_cc_op(s, CC_OP_EFLAGS); + break; + + case 7: /* RDSEED */ + case 6: /* RDRAND */ + if (mod != 3 || + (s->prefix & (PREFIX_LOCK | PREFIX_REPZ | PREFIX_REPNZ)) || + !(s->cpuid_ext_features & CPUID_EXT_RDRAND)) { + goto illegal_op; + } + if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + } + gen_helper_rdrand(s->T0, cpu_env); + rm = (modrm & 7) | REX_B(s); + gen_op_mov_reg_v(s, dflag, rm, s->T0); + set_cc_op(s, CC_OP_EFLAGS); + if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { + gen_io_end(); + gen_jmp(s, s->pc - s->cs_base); + } + break; + + default: + goto illegal_op; } - set_cc_op(s, CC_OP_EFLAGS); break; /**************************/