From patchwork Tue Jun 25 08:51:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Chunqi Li X-Patchwork-Id: 2775301 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D915C0AB1 for ; Tue, 25 Jun 2013 08:52:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F4242019A for ; Tue, 25 Jun 2013 08:52:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 535D1201AA for ; Tue, 25 Jun 2013 08:51:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752725Ab3FYIvx (ORCPT ); Tue, 25 Jun 2013 04:51:53 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:54876 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752693Ab3FYIvv (ORCPT ); Tue, 25 Jun 2013 04:51:51 -0400 Received: by mail-pa0-f41.google.com with SMTP id bj3so12330395pad.0 for ; Tue, 25 Jun 2013 01:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=wDALovDRdGvXE9a0iBdSmqsswge6z54eTei0E3y4rV4=; b=KATBQxQOHv3EJg/nKuCVahakaR3beyuO4tnRDKPfVnkDwIGr8Ckkrxl0CZbSXCoBAQ mrWD2stHK5ejZ6iyTir6tmRY5KrqBVutvIYLn8dVUIRbWQIjeufir4a7BCv2hRZPrHUe xN3pYHl02gXF0tJQbttWvwmj1Q1LW1FpkxH74BagGOaizuNJ+xpomZUDFLXna9G6sTkz CWQjF73bHWONSo9gwYVCCyM13pppo8X8vK1Hmxn4PXAuHKKAFVejAcGM0203nFTHxhqo T4fDcKe9pYlkTnez7c4RJL359WSxtgAKaXKBLHgLmbSDuqjRb0SqEU9zfXfAJrd3a/CV YrSA== X-Received: by 10.68.251.234 with SMTP id zn10mr27327724pbc.188.1372150310320; Tue, 25 Jun 2013 01:51:50 -0700 (PDT) Received: from Blade1-02.Blade1-02 ([162.105.146.101]) by mx.google.com with ESMTPSA id pb5sm22184793pbc.29.2013.06.25.01.51.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 01:51:49 -0700 (PDT) From: Arthur Chunqi Li To: kvm@vger.kernel.org Cc: gleb@redhat.com, pbonzini@redhat.com, jan.kiszka@web.de, Arthur Chunqi Li Subject: [PATCH 2/3] emulator: Add multibyte nopl test case Date: Tue, 25 Jun 2013 16:51:30 +0800 Message-Id: <1372150291-31096-2-git-send-email-yzt356@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372150291-31096-1-git-send-email-yzt356@gmail.com> References: <1372150291-31096-1-git-send-email-yzt356@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Test multiple byte nopl (from 1-byte nopl to 9-byte nopl) in 64-bit mode. Signed-off-by: Arthur Chunqi Li --- x86/emulator.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/x86/emulator.c b/x86/emulator.c index 6972334..bd02d5c 100755 --- a/x86/emulator.c +++ b/x86/emulator.c @@ -816,6 +816,30 @@ static void test_movabs(uint64_t *mem, uint8_t *alt_insn_page) report("64-bit mov imm2", outregs.rcx == 0x9090909090909090); } +static void test_nopl(uint64_t *mem, void *alt_insn_page) +{ + MK_INSN(nopl1, ".byte 0x90\n\r"); /* 1 byte nop */ + MK_INSN(nopl2, ".byte 0x66, 0x90\n\r"); /* 2 byte nop */ + MK_INSN(nopl3, ".byte 0x0f, 0x1f, 0x00\n\r"); /* 3 byte nop */ + MK_INSN(nopl4, ".byte 0x0f, 0x1f, 0x40, 0x00\n\r"); /* 4 byte nop */ + MK_INSN(nopl5, ".byte 0x0f, 0x1f, 0x44, 0x00, 0x00\n\r"); /* 5 byte nop */ + MK_INSN(nopl6, ".byte 0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00\n\r"); /* 6 byte nop */ + MK_INSN(nopl7, ".byte 0x0f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00\n\r"); /* 7 byte nop */ + MK_INSN(nopl8, ".byte 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00\n\r"); /* 8 byte nop */ + MK_INSN(nopl9, ".byte 0x66, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00\n\r"); /* 9 byte nop */ + + trap_emulator(mem, alt_insn_page, &insn_nopl1); + trap_emulator(mem, alt_insn_page, &insn_nopl2); + trap_emulator(mem, alt_insn_page, &insn_nopl3); + trap_emulator(mem, alt_insn_page, &insn_nopl4); + trap_emulator(mem, alt_insn_page, &insn_nopl5); + trap_emulator(mem, alt_insn_page, &insn_nopl6); + trap_emulator(mem, alt_insn_page, &insn_nopl7); + trap_emulator(mem, alt_insn_page, &insn_nopl8); + trap_emulator(mem, alt_insn_page, &insn_nopl9); + report("nopl", 1); +} + static void test_crosspage_mmio(volatile uint8_t *mem) { volatile uint16_t w, *pw; @@ -1012,6 +1036,7 @@ int main() test_mmx_movq_mf(mem, alt_insn_page); test_movabs(mem, alt_insn_page); + test_nopl(mem, alt_insn_page); test_crosspage_mmio(mem);