From patchwork Mon Nov 28 11:13:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9449339 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83AFB60235 for ; Mon, 28 Nov 2016 11:16:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 747FF20410 for ; Mon, 28 Nov 2016 11:16:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 695A62675C; Mon, 28 Nov 2016 11:16:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 15A3320410 for ; Mon, 28 Nov 2016 11:16:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBJsc-0005PD-Vb; Mon, 28 Nov 2016 11:13:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBJsb-0005OZ-Id for xen-devel@lists.xen.org; Mon, 28 Nov 2016 11:13:49 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 1F/85-28947-C611C385; Mon, 28 Nov 2016 11:13:48 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeJIrShJLcpLzFFi42JxWrrBXjdH0Cb C4NQtfoslHxezODB6HN39mymAMYo1My8pvyKBNePZz/1sBV2CFSc2HWVsYLzG28XIySEh4C/R u3snO4jNJqAvsfvFJyYQW0RAXeJ0x0VWEJtZIFPiyO3NQDYHh7CAvcT5A7YgYRYBVYntqz4xg ti8Ah4Ssxt6WCBGykmcP/6TGcTmFPCUODLpPRNIqxBQTec/L5CwkICaxLX+S+wQrYISJ2c+YY HYJCFx8MUL5gmMvLOQpGYhSS1gZFrFqF6cWlSWWqRrrpdUlJmeUZKbmJmja2hgrJebWlycmJ6 ak5hUrJecn7uJERg2DECwg7Hxu9MhRkkOJiVR3tuPrSOE+JLyUyozEosz4otKc1KLDzHKcHAo SfAGCNhECAkWpaanVqRl5gADGCYtwcGjJMI7AyTNW1yQmFucmQ6ROsWoKCXO6wuSEABJZJTmw bXBouYSo6yUMC8j0CFCPAWpRbmZJajyrxjFORiVhHl3gkzhycwrgZv+CmgxE9Dit6+tQRaXJC KkpBoYW3QPvr2rZnXD7oR5zdd5ByJmvz2WHfZTskJzl6bREiGhWdcNlmTuYXnNOO07P7vM9Ru 61QuKYvktQ9kjHhSYfeCSU7NiqdZPT3vGpfqXue/U1zeH/I6I8LFpzzyZzZVwyLv9yQWVbec/ 7e4IyDy2TKuV5VJSzIyc0EYR5aPx1d4ZUi1P5xYpsRRnJBpqMRcVJwIAmPD2d5UCAAA= X-Env-Sender: prvs=1334ebad9=Andrew.Cooper3@citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1480331618!17781967!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56463 invoked from network); 28 Nov 2016 11:13:46 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 28 Nov 2016 11:13:46 -0000 X-IronPort-AV: E=Sophos;i="5.31,563,1473120000"; d="scan'208";a="400418846" From: Andrew Cooper To: Xen-devel Date: Mon, 28 Nov 2016 11:13:19 +0000 Message-ID: <1480331616-6165-3-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480331616-6165-1-git-send-email-andrew.cooper3@citrix.com> References: <1480331616-6165-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Tim Deegan , Jan Beulich Subject: [Xen-devel] [PATCH v2 02/19] x86/emul: Drop X86EMUL_CMPXCHG_FAILED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP X86EMUL_CMPXCHG_FAILED was introduced in c/s d430aae25 in 2005. Even at the time it alised what is now X86EMUL_RETRY (as well as what is now X86EMUL_EXCEPTION). I am not sure why the distinction was considered useful at the time. It is only used twice; there is no need to call it out differently from other uses of X86EMUL_RETRY. No functional change. Signed-off-by: Andrew Cooper Acked-by: Tim Deegan Acked-by: Jan Beulich --- CC: Jan Beulich CC: Tim Deegan v2: * New --- xen/arch/x86/mm.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 03dcd71..5b0e9f3 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5254,7 +5254,7 @@ static int ptwr_emulated_update( { unmap_domain_page(pl1e); put_page_from_l1e(nl1e, d); - return X86EMUL_CMPXCHG_FAILED; + return X86EMUL_RETRY; } } else diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index d70b1c6..9ee48a8 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4694,7 +4694,7 @@ sh_x86_emulate_cmpxchg(struct vcpu *v, unsigned long vaddr, } if ( prev != old ) - rv = X86EMUL_CMPXCHG_FAILED; + rv = X86EMUL_RETRY; SHADOW_DEBUG(EMULATE, "va %#lx was %#lx expected %#lx" " wanted %#lx now %#lx bytes %u\n", diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 993c576..ec824ce 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -109,8 +109,6 @@ struct __attribute__((__packed__)) segment_register { #define X86EMUL_EXCEPTION 2 /* Retry the emulation for some reason. No state modified. */ #define X86EMUL_RETRY 3 - /* (cmpxchg accessor): CMPXCHG failed. Maps to X86EMUL_RETRY in caller. */ -#define X86EMUL_CMPXCHG_FAILED 3 /* FPU sub-types which may be requested via ->get_fpu(). */ enum x86_emulate_fpu_type {