From patchwork Wed Aug 9 10:50:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9890317 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 55C65603F2 for ; Wed, 9 Aug 2017 10:53:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 610BF2624A for ; Wed, 9 Aug 2017 10:53:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55BC526E75; Wed, 9 Aug 2017 10:53:56 +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 AADF72624A for ; Wed, 9 Aug 2017 10:53:55 +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 1dfOaU-0004s5-87; Wed, 09 Aug 2017 10:51:42 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfOaT-0004ro-CT for xen-devel@lists.xenproject.org; Wed, 09 Aug 2017 10:51:41 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 28/95-03612-C39EA895; Wed, 09 Aug 2017 10:51:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42JxWrrBXtfmZVe kwQ19i+9bJjM5MHoc/nCFJYAxijUzLym/IoE1Y8ejG2wFt9wr3r9/ztTA+FG3i5GTQ0LAX2Lu jG3MIDabgI7Exbk72boYOThEBFQkbu81ADGZBcolZtyIB6kQFvCQaO/ewQ5iswBVbGluAbN5B Swl7s95wwYxUU/i7cQXjBBxQYmTM5+wgNjMApoSrdt/s0PY8hLNW2eDbRUSUJTon/eAbQIjzy wkLbOQtMxC0rKAkXkVo0ZxalFZapGukaFeUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7 uJkZg2DAAwQ7GP8sCDjFKcjApifJu0u6MFOJLyk+pzEgszogvKs1JLT7EKMPBoSTBO+t5V6SQ YFFqempFWmYOMIBh0hIcPEoivLdA0rzFBYm5xZnpEKlTjLocryb8/8YkxJKXn5cqJc7bBlIkA FKUUZoHNwIWTZcYZaWEeRmBjhLiKUgtys0sQZV/xSjOwagkzPsFZApPZl4J3KZXQEcwAR0R4d sJckRJIkJKqoExNN178tlkwUseXXOXfLZrWnZ+k4z2FQXn6XJvLOOPZlutYbiiyxwXG/tK68C Ta+u/+wn8+2SlEBDjH5N2s+Rkb+uU15KGgjdlb4jMjDvBLH+2L6P/ZXKQQ7DDrbeb+V8uDmRN +Kh6Z86+B0cFNR1KuqOVXi/ZW7R53e3C1k9aaVXJBQ0W6yuVWIozEg21mIuKEwEK0iQQoQIAA A== X-Env-Sender: prvs=3873657b9=roger.pau@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1502275898!79205219!1 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.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27354 invoked from network); 9 Aug 2017 10:51:39 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Aug 2017 10:51:39 -0000 X-IronPort-AV: E=Sophos;i="5.41,347,1498521600"; d="scan'208";a="443135662" From: Roger Pau Monne To: Date: Wed, 9 Aug 2017 11:50:45 +0100 Message-ID: <20170809105045.51180-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH v2] x86: fix printed messages in arch_set_info_hvm_guest 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 Append the target vCPU in the messages printed by arch_set_info_hvm_guest. While there constify the arguments of check_segment. Signed-off-by: Roger Pau Monné --- Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/hvm/domain.c | 89 ++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/hvm/domain.c b/xen/arch/x86/hvm/domain.c index 60474649de..7cfb0f4051 100644 --- a/xen/arch/x86/hvm/domain.c +++ b/xen/arch/x86/hvm/domain.c @@ -24,12 +24,15 @@ #include -static int check_segment(struct segment_register *reg, enum x86_segment seg) +static int check_segment(const struct vcpu *v, + const struct segment_register *reg, + const enum x86_segment seg) { if ( reg->pad != 0 ) { - gprintk(XENLOG_ERR, "Segment attribute bits 12-15 are not zero\n"); + gprintk(XENLOG_ERR, + "Segment attribute bits 12-15 are not zero for %pv\n", v); return -EINVAL; } @@ -37,7 +40,8 @@ static int check_segment(struct segment_register *reg, enum x86_segment seg) { if ( seg != x86_seg_ds && seg != x86_seg_es ) { - gprintk(XENLOG_ERR, "Null selector provided for CS, SS or TR\n"); + gprintk(XENLOG_ERR, + "Null selector provided for CS, SS or TR for %pv\n", v); return -EINVAL; } return 0; @@ -47,26 +51,29 @@ static int check_segment(struct segment_register *reg, enum x86_segment seg) { if ( reg->s ) { - gprintk(XENLOG_ERR, "Code or data segment provided for TR\n"); + gprintk(XENLOG_ERR, + "Code or data segment provided for TR for %pv\n", v); return -EINVAL; } if ( reg->type != SYS_DESC_tss_busy ) { - gprintk(XENLOG_ERR, "Non-32-bit-TSS segment provided for TR\n"); + gprintk(XENLOG_ERR, + "Non-32-bit-TSS segment provided for TR for %pv\n", v); return -EINVAL; } } else if ( !reg->s ) { gprintk(XENLOG_ERR, - "System segment provided for a code or data segment\n"); + "System segment provided for a code or data segment for %pv\n", + v); return -EINVAL; } if ( !reg->p ) { - gprintk(XENLOG_ERR, "Non-present segment provided\n"); + gprintk(XENLOG_ERR, "Non-present segment provided for %pv\n", v); return -EINVAL; } @@ -75,7 +82,8 @@ static int check_segment(struct segment_register *reg, enum x86_segment seg) case x86_seg_cs: if ( !(reg->type & 0x8) ) { - gprintk(XENLOG_ERR, "Non-code segment provided for CS\n"); + gprintk(XENLOG_ERR, "Non-code segment provided for CS for %pv\n", + v); return -EINVAL; } break; @@ -83,7 +91,8 @@ static int check_segment(struct segment_register *reg, enum x86_segment seg) case x86_seg_ss: if ( (reg->type & 0x8) || !(reg->type & 0x2) ) { - gprintk(XENLOG_ERR, "Non-writeable segment provided for SS\n"); + gprintk(XENLOG_ERR, + "Non-writeable segment provided for SS for %pv\n", v); return -EINVAL; } break; @@ -92,7 +101,8 @@ static int check_segment(struct segment_register *reg, enum x86_segment seg) case x86_seg_es: if ( (reg->type & 0x8) && !(reg->type & 0x2) ) { - gprintk(XENLOG_ERR, "Non-readable segment provided for DS or ES\n"); + gprintk(XENLOG_ERR, + "Non-readable segment provided for DS or ES for %pv\n", v); return -EINVAL; } break; @@ -141,7 +151,7 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) /* Set accessed / busy bit for present segments. */ \ if ( s.p ) \ s.type |= (x86_seg_##s != x86_seg_tr ? 1 : 2); \ - check_segment(&s, x86_seg_ ## s); }) + check_segment(v, &s, x86_seg_ ## s); }) rc = SEG(cs, regs); rc |= SEG(ds, regs); @@ -159,36 +169,41 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) limit = (limit << 12) | 0xfff; if ( regs->eip > limit ) { - gprintk(XENLOG_ERR, "EIP (%#08x) outside CS limit (%#08x)\n", - regs->eip, limit); + gprintk(XENLOG_ERR, + "EIP (%#08x) outside CS limit (%#08x) for %pv\n", + regs->eip, limit, v); return -EINVAL; } if ( ss.dpl != cs.dpl ) { - gprintk(XENLOG_ERR, "SS.DPL (%u) is different than CS.DPL (%u)\n", - ss.dpl, cs.dpl); + gprintk(XENLOG_ERR, + "SS.DPL (%u) is different than CS.DPL (%u) for %pv\n", + ss.dpl, cs.dpl, v); return -EINVAL; } if ( ds.p && ds.dpl > cs.dpl ) { - gprintk(XENLOG_ERR, "DS.DPL (%u) is greater than CS.DPL (%u)\n", - ds.dpl, cs.dpl); + gprintk(XENLOG_ERR, + "DS.DPL (%u) is greater than CS.DPL (%u) for %pv\n", + ds.dpl, cs.dpl, v); return -EINVAL; } if ( es.p && es.dpl > cs.dpl ) { - gprintk(XENLOG_ERR, "ES.DPL (%u) is greater than CS.DPL (%u)\n", - es.dpl, cs.dpl); + gprintk(XENLOG_ERR, + "ES.DPL (%u) is greater than CS.DPL (%u) for %pv\n", + es.dpl, cs.dpl, v); return -EINVAL; } if ( (regs->efer & EFER_LMA) && !(regs->efer & EFER_LME) ) { - gprintk(XENLOG_ERR, "EFER.LMA set without EFER.LME (%#016lx)\n", - regs->efer); + gprintk(XENLOG_ERR, + "EFER.LMA set without EFER.LME (%#016lx) for %pv\n", + regs->efer, v); return -EINVAL; } @@ -217,29 +232,33 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) /* Basic sanity checks. */ if ( !is_canonical_address(regs->rip) ) { - gprintk(XENLOG_ERR, "RIP contains a non-canonical address (%#lx)\n", - regs->rip); + gprintk(XENLOG_ERR, + "RIP contains a non-canonical address (%#lx) for %pv\n", + regs->rip, v); return -EINVAL; } if ( !(regs->cr0 & X86_CR0_PG) ) { - gprintk(XENLOG_ERR, "CR0 doesn't have paging enabled (%#016lx)\n", - regs->cr0); + gprintk(XENLOG_ERR, + "CR0 doesn't have paging enabled (%#016lx) for %pv\n", + regs->cr0, v); return -EINVAL; } if ( !(regs->cr4 & X86_CR4_PAE) ) { - gprintk(XENLOG_ERR, "CR4 doesn't have PAE enabled (%#016lx)\n", - regs->cr4); + gprintk(XENLOG_ERR, + "CR4 doesn't have PAE enabled (%#016lx) for %pv\n", + regs->cr4, v); return -EINVAL; } if ( !(regs->efer & EFER_LME) ) { - gprintk(XENLOG_ERR, "EFER doesn't have LME enabled (%#016lx)\n", - regs->efer); + gprintk(XENLOG_ERR, + "EFER doesn't have LME enabled (%#016lx) for %pv\n", + regs->efer, v); return -EINVAL; } @@ -274,16 +293,16 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) if ( v->arch.hvm_vcpu.guest_cr[4] & ~hvm_cr4_guest_valid_bits(v, 0) ) { - gprintk(XENLOG_ERR, "Bad CR4 value: %#016lx\n", - v->arch.hvm_vcpu.guest_cr[4]); + gprintk(XENLOG_ERR, "Bad CR4 value: %#016lx for %pv\n", + v->arch.hvm_vcpu.guest_cr[4], v); return -EINVAL; } errstr = hvm_efer_valid(v, v->arch.hvm_vcpu.guest_efer, -1); if ( errstr ) { - gprintk(XENLOG_ERR, "Bad EFER value (%#016lx): %s\n", - v->arch.hvm_vcpu.guest_efer, errstr); + gprintk(XENLOG_ERR, "Bad EFER value (%#016lx): %s for %pv\n", + v->arch.hvm_vcpu.guest_efer, errstr, v); return -EINVAL; } @@ -300,8 +319,8 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) NULL, P2M_ALLOC); if ( !page ) { - gprintk(XENLOG_ERR, "Invalid CR3: %#lx\n", - v->arch.hvm_vcpu.guest_cr[3]); + gprintk(XENLOG_ERR, "Invalid CR3: %#lx for %pv\n", + v->arch.hvm_vcpu.guest_cr[3], v); return -EINVAL; }