From patchwork Tue Mar 24 16:27:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11455991 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF06E14B4 for ; Tue, 24 Mar 2020 16:28:38 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 B647320774 for ; Tue, 24 Mar 2020 16:28:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B647320774 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGmOz-0003FI-Pw; Tue, 24 Mar 2020 16:27:41 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGmOy-0003F5-VS for xen-devel@lists.xenproject.org; Tue, 24 Mar 2020 16:27:40 +0000 X-Inumbo-ID: 60b06264-6dec-11ea-a6c1-bc764e2007e4 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 60b06264-6dec-11ea-a6c1-bc764e2007e4; Tue, 24 Mar 2020 16:27:39 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 89F6CACC2; Tue, 24 Mar 2020 16:27:38 +0000 (UTC) From: Jan Beulich To: "xen-devel@lists.xenproject.org" References: Message-ID: Date: Tue, 24 Mar 2020 17:27:37 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Subject: [Xen-devel] [PATCH 4/7] x86emul: vendor specific near indirect branch behavior in 64-bit mode X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Intel CPUs ignore operand size overrides here, while AMD ones don't. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -813,6 +813,17 @@ static const struct { .opcode = { 0x66, 0x67, 0xe3, 0x10 }, .opc_len = { 4, 4 }, .disp = { 4 + 16 - MMAP_ADDR, 4 + 16 }, + }, { + .descr = "jmpw *(%rsp)", + .opcode = { 0x66, 0xff, 0x24, 0x24 }, + .opc_len = { 4, 4 }, + .disp = { STKVAL_DISP - MMAP_ADDR, STKVAL_DISP }, + }, { + .descr = "callw *(%rsp)", + .opcode = { 0x66, 0xff, 0x14, 0x24 }, + .opc_len = { 4, 4 }, + .stkoff = { -2, -8 }, + .disp = { STKVAL_DISP - MMAP_ADDR, STKVAL_DISP }, }, }; #endif --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2524,8 +2524,7 @@ x86_decode_onebyte( { case 2: /* call (near) */ case 4: /* jmp (near) */ - case 6: /* push */ - if ( mode_64bit() && op_bytes == 4 ) + if ( mode_64bit() && (op_bytes == 4 || !amd_like(ctxt)) ) op_bytes = 8; state->desc = DstNone | SrcMem | Mov; break; @@ -2537,6 +2536,12 @@ x86_decode_onebyte( op_bytes = 4; state->desc = DstNone | SrcMem | Mov; break; + + case 6: /* push */ + if ( mode_64bit() && op_bytes == 4 ) + op_bytes = 8; + state->desc = DstNone | SrcMem | Mov; + break; } break; }