From patchwork Wed Jan 22 16:09:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11346031 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 52FE7921 for ; Wed, 22 Jan 2020 16:09:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 314732071E for ; Wed, 22 Jan 2020 16:09:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OGsqUEjP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726181AbgAVQJ6 (ORCPT ); Wed, 22 Jan 2020 11:09:58 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:20289 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725989AbgAVQJ5 (ORCPT ); Wed, 22 Jan 2020 11:09:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579709396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vG9YtgnEg9fUpGzN49dJA/kQOLEXuZAYvw61FY32mRA=; b=OGsqUEjPPO5C+cK6zaebBS7LT9O5tE3hdkSe3UyUL9BAKH6cgmN5XbR/TJvRlSU/zXQWy8 +UpircdxkmQiXy8+1vP8HZiqEAJpAucVoC05hU9qdQ9lrq9bYpt4zjuVGeIIJsAArAqgwU 3hWm9IM5ulnmm6qUq5iPyD7/O2FlaL0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-ZeYO0t_aO8KbM9gYXKyjVg-1; Wed, 22 Jan 2020 11:09:52 -0500 X-MC-Unique: ZeYO0t_aO8KbM9gYXKyjVg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCE81100550E for ; Wed, 22 Jan 2020 16:09:51 +0000 (UTC) Received: from thuth.com (ovpn-116-176.ams2.redhat.com [10.36.116.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 415CB9CA3; Wed, 22 Jan 2020 16:09:48 +0000 (UTC) From: Thomas Huth To: kvm@vger.kernel.org, Paolo Bonzini Cc: David Hildenbrand , Drew Jones Subject: [kvm-unit-tests PATCH] Fixes for the umip test Date: Wed, 22 Jan 2020 17:09:44 +0100 Message-Id: <20200122160944.29750-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When compiling umip.c with -O2 instead of -O1, there are currently two problems. First, the compiler complains: x86/umip.c: In function ‘do_ring3’: x86/umip.c:162:37: error: array subscript 4096 is above array bounds of ‘unsigned char[4096]’ [-Werror=array-bounds] [user_stack_top]"m"(user_stack[sizeof user_stack]), ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~ This can be fixed by initializing the stack to point to one of the last bytes of the array instead. The second problem is that some tests are failing - and this is due to the fact that the GP_ASM macro uses inline asm without the "volatile" keyword - so that the compiler reorders this code in certain cases where it should not. Fix it by adding "volatile" here. Signed-off-by: Thomas Huth Reviewed-by: Vitaly Kuznetsov --- x86/umip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x86/umip.c b/x86/umip.c index 7eee294..834668c 100644 --- a/x86/umip.c +++ b/x86/umip.c @@ -22,7 +22,8 @@ static void gp_handler(struct ex_regs *regs) #define GP_ASM(stmt, in, clobber) \ - asm ("mov" W " $1f, %[expected_rip]\n\t" \ + asm volatile ( \ + "mov" W " $1f, %[expected_rip]\n\t" \ "movl $2f-1f, %[skip_count]\n\t" \ "1: " stmt "\n\t" \ "2: " \ @@ -159,7 +160,7 @@ static int do_ring3(void (*fn)(const char *), const char *arg) : [ret] "=&a" (ret) : [user_ds] "i" (USER_DS), [user_cs] "i" (USER_CS), - [user_stack_top]"m"(user_stack[sizeof user_stack]), + [user_stack_top]"m"(user_stack[sizeof user_stack - 2]), [fn]"r"(fn), [arg]"D"(arg), [kernel_ds]"i"(KERNEL_DS),