From patchwork Tue Aug 19 13:04:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nadav Amit X-Patchwork-Id: 4742811 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 27587C0338 for ; Tue, 19 Aug 2014 13:05:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 178D6200F4 for ; Tue, 19 Aug 2014 13:05:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3530120123 for ; Tue, 19 Aug 2014 13:05:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753333AbaHSNEZ (ORCPT ); Tue, 19 Aug 2014 09:04:25 -0400 Received: from mailgw12.technion.ac.il ([132.68.225.12]:36983 "EHLO mailgw12.technion.ac.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570AbaHSNEX (ORCPT ); Tue, 19 Aug 2014 09:04:23 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Al4CAFxK81OERCABjGdsb2JhbABZg2BXzGKHYAGBCxYQAQEBJz2EBAEFeRBRVxmIQr0ZhFwXj0wHFoQ2BYscii+fWmmCTwEBAQ X-IPAS-Result: Al4CAFxK81OERCABjGdsb2JhbABZg2BXzGKHYAGBCxYQAQEBJz2EBAEFeRBRVxmIQr0ZhFwXj0wHFoQ2BYscii+fWmmCTwEBAQ X-IronPort-AV: E=Sophos;i="5.01,893,1400014800"; d="scan'208";a="119334266" Received: from csa.cs.technion.ac.il ([132.68.32.1]) by mailgw12.technion.ac.il with ESMTP; 19 Aug 2014 16:04:22 +0300 Received: from csn.cs.technion.ac.il (csn.cs.technion.ac.il [132.68.32.15]) by csa.cs.technion.ac.il (Postfix) with ESMTP id E5BEE140033; Tue, 19 Aug 2014 16:04:20 +0300 (IDT) Received: from csl-tapuz20.cs.technion.ac.il (csl-tapuz20.cs.technion.ac.il [132.68.206.58]) by csn.cs.technion.ac.il (Postfix) with ESMTP id E0D1D598002; Tue, 19 Aug 2014 16:04:20 +0300 (IDT) From: Nadav Amit To: gleb@kernel.org Cc: kvm@vger.kernel.org, Nadav Amit Subject: [PATCH kvm-unit-tests v2] x86: Test task-switch with cs.rpl != cs.dpl Date: Tue, 19 Aug 2014 16:04:09 +0300 Message-Id: <1408453449-4243-1-git-send-email-namit@cs.technion.ac.il> X-Mailer: git-send-email 1.9.1 In-Reply-To: <53F32679.6030607@redhat.com> References: <53F32679.6030607@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Commit 5045b46803 added a check that cs.dpl equals cs.rpl during task-switch. This is a wrong check, and this patch introduces a test in which cs.dpl != cs.rpl. To do so, it configures tss.cs to be conforming with rpl=3 and dpl=0. Since the cpl after calling is 3, it does not make any prints in the callee. Signed-off-by: Nadav Amit --- x86/taskswitch2.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/x86/taskswitch2.c b/x86/taskswitch2.c index 92fc941..1fe833e 100644 --- a/x86/taskswitch2.c +++ b/x86/taskswitch2.c @@ -7,6 +7,7 @@ #define MAIN_TSS_SEL (FIRST_SPARE_SEL + 0) #define VM86_TSS_SEL (FIRST_SPARE_SEL + 8) +#define CONFORM_CS_SEL (FIRST_SPARE_SEL + 16) static volatile int test_count; static volatile unsigned int test_divider; @@ -102,6 +103,14 @@ start: goto start; } +static void user_tss(void) +{ +start: + test_count++; + asm volatile ("iret"); + goto start; +} + void test_kernel_mode_int() { unsigned int res; @@ -248,6 +257,19 @@ void test_vm86_switch(void) report("VM86", 1); } +void test_conforming_switch(void) +{ + /* test lcall with conforming segment, cs.dpl != cs.rpl */ + test_count = 0; + set_intr_task_gate(0, user_tss); + + tss_intr.cs = CONFORM_CS_SEL | 3; + tss_intr.ds = tss_intr.gs = tss_intr.fs = tss_intr.ss = USER_DS; + set_gdt_entry(CONFORM_CS_SEL, 0, 0xffffffff, 0x9f, 0xc0); + asm volatile("lcall $" xstr(TSS_INTR) ", $0xf4f4f4f4"); + report("lcall with cs.rpl != cs.dpl", test_count == 1); +} + int main() { setup_vm(); @@ -256,6 +278,7 @@ int main() test_kernel_mode_int(); test_vm86_switch(); + test_conforming_switch(); return report_summary(); }