From patchwork Mon Feb 27 05:09:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9592693 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 1217F60574 for ; Mon, 27 Feb 2017 05:12:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 044EB27FB1 for ; Mon, 27 Feb 2017 05:12:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7673283C2; Mon, 27 Feb 2017 05:12:36 +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 6108728372 for ; Mon, 27 Feb 2017 05:12:34 +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 1ciDZP-00066O-84; Mon, 27 Feb 2017 05:09:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciDZO-00065k-Bk for xen-devel@lists.xen.org; Mon, 27 Feb 2017 05:09:58 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 64/7C-06007-5A4B3B85; Mon, 27 Feb 2017 05:09:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsXS1taRortky+Y IgxW3zSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oyuF3uYCybrV/y4+5+1gfGzahcjJ4eQQKXE vUuz2EFsCQFeiSPLZrBC2AESJ15MZYSo6WWUWPJIB8RmE9CXWPH4IFiNiIC0xLXPl4FquDiYB RYySuz81Q6WEBYIlzjw/yqYzSKgKrFj3x22LkYODl4BW4kDp/Mg5stLXLh6igXE5hSwk7h1pp UZpEQIqGT1d5EJjLwLGBlWMWoUpxaVpRbpGpnoJRVlpmeU5CZm5ugaGhjr5aYWFyemp+YkJhX rJefnbmIEhkI9AwPjDsZXx/0OMUpyMCmJ8i4y3hghxJeUn1KZkVicEV9UmpNafIhRhoNDSYK3 f/PmCCHBotT01Iq0zBxgUMKkJTh4lER4928CSvMWFyTmFmemQ6ROMSpKifNWg/QJgCQySvPg2 mCRcIlRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMG8FyBSezLwSuOmvgBYzAS2eDXIzb3FJIk JKqoEx8ozDn8+bpJq8ggTZk1xCV38VSLeLN89w9bWKSeeXvMPh8PuywrK9N/jOKJtbKXybl/l +h/WLnhkKEy01gpeuWRTvsWq56LWrCZzO2tdZXj7af/Aoi/d0hk9H504z/Rt8el0V05K5V91j +qSdTL34bzIn6x/892bu2xcdm4TKTtndsXK8sVFLiaU4I9FQi7moOBEAJYwCOX8CAAA= X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1488172192!29448017!3 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24717 invoked from network); 27 Feb 2017 05:09:56 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-4.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 27 Feb 2017 05:09:56 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP; 26 Feb 2017 21:09:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.35,212,1484035200"; d="scan'208"; a="1115945464" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.133]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2017 21:09:54 -0800 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Mon, 27 Feb 2017 13:09:08 +0800 Message-Id: <20170227050912.28824-4-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170227050912.28824-1-haozhong.zhang@intel.com> References: <20170227050912.28824-1-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Christoph Egger , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v2 3/7] x86/mce: set mcinfo_comm.type and .size in x86_mcinfo_reserve() 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP All existing calls to x86_mcinfo_reserve() are followed by statements that set the size and the type of the reserved space, so move them into x86_mcinfo_reserve() to simplify the code. Signed-off-by: Haozhong Zhang Reviewed-by: Jan Beulich --- Cc: Christoph Egger Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mcaction.c | 4 +--- xen/arch/x86/cpu/mcheck/mce.c | 17 +++++++++-------- xen/arch/x86/cpu/mcheck/mce.h | 3 ++- xen/arch/x86/cpu/mcheck/mce_amd.c | 4 +--- xen/arch/x86/cpu/mcheck/mce_intel.c | 6 +----- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mcaction.c b/xen/arch/x86/cpu/mcheck/mcaction.c index 322163a..32056f2 100644 --- a/xen/arch/x86/cpu/mcheck/mcaction.c +++ b/xen/arch/x86/cpu/mcheck/mcaction.c @@ -13,14 +13,12 @@ mci_action_add_pageoffline(int bank, struct mc_info *mi, if (!mi) return NULL; - rec = x86_mcinfo_reserve(mi, sizeof(*rec)); + rec = x86_mcinfo_reserve(mi, sizeof(*rec), MC_TYPE_RECOVERY); if (!rec) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return NULL; } - rec->common.type = MC_TYPE_RECOVERY; - rec->common.size = sizeof(*rec); rec->mc_bank = bank; rec->action_types = MC_ACTION_PAGE_OFFLINE; rec->action_info.page_retire.mfn = mfn; diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index aa9304f..53ca29c 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -205,7 +205,7 @@ static void mca_init_bank(enum mca_source who, if (!mi) return; - mib = x86_mcinfo_reserve(mi, sizeof(*mib)); + mib = x86_mcinfo_reserve(mi, sizeof(*mib), MC_TYPE_BANK); if (!mib) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; @@ -214,8 +214,6 @@ static void mca_init_bank(enum mca_source who, mib->mc_status = mca_rdmsr(MSR_IA32_MCx_STATUS(bank)); - mib->common.type = MC_TYPE_BANK; - mib->common.size = sizeof (struct mcinfo_bank); mib->mc_bank = bank; mib->mc_domid = DOMID_INVALID; @@ -251,8 +249,6 @@ static int mca_init_global(uint32_t flags, struct mcinfo_global *mig) const struct vcpu *curr = current; /* Set global information */ - mig->common.type = MC_TYPE_GLOBAL; - mig->common.size = sizeof (struct mcinfo_global); status = mca_rdmsr(MSR_IA32_MCG_STATUS); mig->mc_gstatus = status; mig->mc_domid = DOMID_INVALID; @@ -349,7 +345,7 @@ mcheck_mca_logout(enum mca_source who, struct mca_banks *bankmask, if ( (mctc = mctelem_reserve(which)) != NULL ) { mci = mctelem_dataptr(mctc); mcinfo_clear(mci); - mig = x86_mcinfo_reserve(mci, sizeof(*mig)); + mig = x86_mcinfo_reserve(mci, sizeof(*mig), MC_TYPE_GLOBAL); /* mc_info should at least hold up the global information */ ASSERT(mig); mca_init_global(mc_flags, mig); @@ -805,7 +801,8 @@ static void mcinfo_clear(struct mc_info *mi) x86_mcinfo_nentries(mi) = 0; } -void *x86_mcinfo_reserve(struct mc_info *mi, int size) +void *x86_mcinfo_reserve(struct mc_info *mi, + unsigned int size, unsigned int type) { int i; unsigned long end1, end2; @@ -832,7 +829,11 @@ void *x86_mcinfo_reserve(struct mc_info *mi, int size) /* there's enough space. add entry. */ x86_mcinfo_nentries(mi)++; - return memset(mic_index, 0, size); + memset(mic_index, 0, size); + mic_index->size = size; + mic_index->type = type; + + return mic_index; } static void x86_mcinfo_apei_save( diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index a28e862..b479b20 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -150,7 +150,8 @@ typedef struct mcinfo_extended *(*x86_mce_callback_t) (struct mc_info *, uint16_t, uint64_t); extern void x86_mce_callback_register(x86_mce_callback_t); -void *x86_mcinfo_reserve(struct mc_info *mi, int size); +void *x86_mcinfo_reserve(struct mc_info *mi, + unsigned int size, unsigned int type); void x86_mcinfo_dump(struct mc_info *mi); static inline int mce_vendor_bank_msr(const struct vcpu *v, uint32_t msr) diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c b/xen/arch/x86/cpu/mcheck/mce_amd.c index 599e465..fe51be9 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd.c @@ -218,15 +218,13 @@ amd_f10_handler(struct mc_info *mi, uint16_t bank, uint64_t status) if ( !(status & MCi_STATUS_MISCV) ) return NULL; - mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext)); + mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext), MC_TYPE_EXTENDED); if ( !mc_ext ) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return NULL; } - mc_ext->common.type = MC_TYPE_EXTENDED; - mc_ext->common.size = sizeof(*mc_ext); mc_ext->mc_msrs = 3; mc_ext->mc_msr[0].reg = MSR_F10_MC4_MISC1; diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 005e41d..189c1ed 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -200,17 +200,13 @@ intel_get_extended_msrs(struct mcinfo_global *mig, struct mc_info *mi) !(mig->mc_gstatus & MCG_STATUS_EIPV)) return NULL; - mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext)); + mc_ext = x86_mcinfo_reserve(mi, sizeof(*mc_ext), MC_TYPE_EXTENDED); if (!mc_ext) { mi->flags |= MCINFO_FLAGS_UNCOMPLETE; return NULL; } - /* this function will called when CAP(9).MCG_EXT_P = 1 */ - mc_ext->common.type = MC_TYPE_EXTENDED; - mc_ext->common.size = sizeof(struct mcinfo_extended); - for (i = MSR_IA32_MCG_EAX; i <= MSR_IA32_MCG_MISC; i++) intel_get_extended_msr(mc_ext, i);