* [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs
@ 2014-05-14 13:30 David Vrabel
2014-05-14 13:54 ` Egger, Christoph
2014-06-23 14:11 ` David Vrabel
0 siblings, 2 replies; 4+ messages in thread
From: David Vrabel @ 2014-05-14 13:30 UTC (permalink / raw)
To: xen-devel
Cc: Ian Campbell, Stefano Stabellini, Liu Jinsong, Christoph Egger,
Ian Jackson, David Vrabel
Make the set of MCEs that xen-mceinj can inject by data-driven instead
of a whole pile of cut-and-paste functions.
Add two new types of MCE: one for AMD CPUs and one fatal one (PCC
set).
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
---
I sat on this for /years/ in a vain hope I'd fix this properly by
allowing xen-mceinj to take command line options for the values to
inject. Having dusted it off this week, I think its better applied
as-is than waiting for magic fairies...
---
tools/tests/mce-test/tools/xen-mceinj.c | 260 ++++++++++++-------------------
1 file changed, 101 insertions(+), 159 deletions(-)
diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c
index 21a488b..186fa38 100644
--- a/tools/tests/mce-test/tools/xen-mceinj.c
+++ b/tools/tests/mce-test/tools/xen-mceinj.c
@@ -58,28 +58,59 @@
#define MSR_IA32_MC0_MISC 0x00000403
#define MSR_IA32_MC0_CTL2 0x00000280
-/* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */
-#define MCG_STATUS_SRAO_LLC_VAL 0x5
-#define MCE_SRAO_LLC_BANK 0x7
-#define MCi_STATUS_SRAO_LLC_VAL 0xBD2000008000017AUL
-#define MCi_MISC_SRAO_LLC_VAL 0x86UL
-
-/* Memory Patrol Scrub SRAO MCE */
-#define MCG_STATUS_SRAO_MEM_VAL 0x5
-#define MCE_SRAO_MEM_BANK 0x8
-#define MCi_STATUS_SRAO_MEM_VAL 0xBD000000004000CFUL
-#define MCi_MISC_SRAO_MEM_VAL 0x86UL
-
-/* LLC EWB UCNA Error */
-#define MCG_STATUS_UCNA_LLC_VAL 0x0
-#define CMCI_UCNA_LLC_BANK 0x9
-#define MCi_STATUS_UCNA_LLC_VAL 0xBC20000080000136UL
-#define MCi_MISC_UCNA_LLC_VAL 0x86UL
-
-/* Error Types */
-#define MCE_SRAO_MEM 0x0
-#define MCE_SRAO_LLC 0x1
-#define CMCI_UCNA_LLC 0x2
+struct mce_info {
+ const char *description;
+ uint8_t mcg_stat;
+ int bank;
+ uint64_t mci_stat;
+ uint64_t mci_misc;
+ bool cmci;
+};
+
+static struct mce_info mce_table[] = {
+ /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */
+ {
+ .description = "MCE_SRAO_MEM",
+ .mcg_stat = 0x5,
+ .bank = 7,
+ .mci_stat = 0xBD2000008000017Aull,
+ .mci_misc = 0x86ull,
+ },
+ /* Memory Patrol Scrub SRAO MCE */
+ {
+ .description = "MCE_SRAO_LLC",
+ .mcg_stat = 0x5,
+ .bank = 8,
+ .mci_stat = 0xBD000000004000CFull,
+ .mci_misc = 0x86ull,
+ },
+ /* LLC EWB UCNA Error */
+ {
+ .description = "CMCI_UCNA_LLC",
+ .mcg_stat = 0x0,
+ .bank = 9,
+ .mci_stat = 0xBC20000080000136ull,
+ .mci_misc = 0x86ull,
+ .cmci = true,
+ },
+ /* AMD L1 instruction cache data or tag parity. */
+ {
+ .description = "AMD L1 icache parity",
+ .mcg_stat = 0x5,
+ .bank = 1,
+ .mci_stat = 0x9400000000000151ull,
+ .mci_misc = 0x86ull,
+ },
+ /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */
+ {
+ .description = "MCE_SRAO_MEM (Fatal)",
+ .mcg_stat = 0x5,
+ .bank = 7,
+ .mci_stat = 0xBF2000008000017Aull,
+ .mci_misc = 0x86ull,
+ },
+};
+#define MCE_TABLE_SIZE (sizeof(mce_table)/sizeof(mce_table[0]))
#define LOGFILE stdout
@@ -156,7 +187,7 @@ static int inject_cmci(xc_interface *xc_handle, int cpu_nr)
nr_cpus = mca_cpuinfo(xc_handle);
if (!nr_cpus)
- err(xc_handle, "Failed to get mca_cpuinfo\n");
+ err(xc_handle, "Failed to get mca_cpuinfo");
mc.cmd = XEN_MC_inject_v2;
mc.interface_version = XEN_MCA_INTERFACE_VERSION;
@@ -273,7 +304,7 @@ static uint64_t guest_mfn(xc_interface *xc_handle,
max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
sizeof(domain)) + 1;
if ( max_gpfn <= 0 )
- err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn);
+ err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn);
Lprintf("Maxium gpfn for dom %d is 0x%lx\n", domain, max_gpfn);
@@ -281,24 +312,24 @@ static uint64_t guest_mfn(xc_interface *xc_handle,
if ( !get_platform_info(xc_handle, domain,
&max_mfn, &hvirt_start,
&pt_levels, &guest_width) )
- err(xc_handle, "Failed to get platform information\n");
+ err(xc_handle, "Failed to get platform information");
/* Get guest's pfn list */
pfn_buf = malloc(sizeof(uint64_t) * max_gpfn);
if ( !pfn_buf )
- err(xc_handle, "Failed to alloc pfn buf\n");
+ err(xc_handle, "Failed to alloc pfn buf");
memset(pfn_buf, 0, sizeof(uint64_t) * max_gpfn);
ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn);
if ( ret < 0 ) {
free(pfn_buf);
- err(xc_handle, "Failed to get pfn list %x\n", ret);
+ err(xc_handle, "Failed to get pfn list %x", ret);
}
/* Now get the m2p table */
live_m2p = xc_map_m2p(xc_handle, max_mfn, PROT_READ, &m2p_mfn0);
if ( !live_m2p )
- err(xc_handle, "Failed to map live M2P table\n");
+ err(xc_handle, "Failed to map live M2P table");
/* match the mapping */
for ( i = 0; i < max_gpfn; i++ )
@@ -334,7 +365,7 @@ static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle,
max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
sizeof(domain)) + 1;
if ( max_gpfn <= 0 )
- err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn);
+ err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn);
index = gfn % max_gpfn;
return guest_mfn(xc_handle, domain, index);
@@ -375,125 +406,44 @@ static int inject_mci_addr(xc_interface *xc_handle,
MCi_type_ADDR, bank, val);
}
-static int inject_llc_srao(xc_interface *xc_handle,
- uint32_t cpu_nr,
- uint32_t domain,
- uint64_t gaddr)
-{
- uint64_t gpfn, mfn, haddr;
- int ret = 0;
-
- ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_LLC_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCG_STATUS MSR\n");
-
- ret = inject_mci_status(xc_handle, cpu_nr,
- MCE_SRAO_LLC_BANK, MCi_STATUS_SRAO_LLC_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_STATUS MSR\n");
-
- ret = inject_mci_misc(xc_handle, cpu_nr,
- MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_MISC MSR\n");
-
- gpfn = gaddr >> PAGE_SHIFT;
- mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn);
- if (!mfn_valid(mfn))
- err(xc_handle, "The MFN is not valid\n");
- haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
- ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, haddr);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_ADDR MSR\n");
-
- ret = flush_msr_inj(xc_handle);
- if ( ret )
- err(xc_handle, "Failed to inject MSR\n");
- ret = inject_mce(xc_handle, cpu_nr);
- if ( ret )
- err(xc_handle, "Failed to inject MCE error\n");
-
- return 0;
-}
-
-static int inject_mem_srao(xc_interface *xc_handle,
- uint32_t cpu_nr,
- uint32_t domain,
- uint64_t gaddr)
-{
- uint64_t gpfn, mfn, haddr;
- int ret = 0;
-
- ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_MEM_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCG_STATUS MSR\n");
-
- ret = inject_mci_status(xc_handle, cpu_nr,
- MCE_SRAO_MEM_BANK, MCi_STATUS_SRAO_MEM_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_STATUS MSR\n");
-
- ret = inject_mci_misc(xc_handle, cpu_nr,
- MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_MISC MSR\n");
-
- gpfn = gaddr >> PAGE_SHIFT;
- mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn);
- if (!mfn_valid(mfn))
- err(xc_handle, "The MFN is not valid\n");
- haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
- ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, haddr);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_ADDR MSR\n");
-
- ret = flush_msr_inj(xc_handle);
- if ( ret )
- err(xc_handle, "Failed to inject MSR\n");
- ret = inject_mce(xc_handle, cpu_nr);
- if ( ret )
- err(xc_handle, "Failed to inject MCE error\n");
-
- return 0;
-}
-
-static int inject_llc_ucna(xc_interface *xc_handle,
- uint32_t cpu_nr,
- uint32_t domain,
- uint64_t gaddr)
+static int inject(xc_interface *xc_handle, struct mce_info *mce,
+ uint32_t cpu_nr, uint32_t domain, uint64_t gaddr)
{
uint64_t gpfn, mfn, haddr;
int ret = 0;
- ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_UCNA_LLC_VAL);
+ ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat);
if ( ret )
- err(xc_handle, "Failed to inject MCG_STATUS MSR\n");
+ err(xc_handle, "Failed to inject MCG_STATUS MSR");
ret = inject_mci_status(xc_handle, cpu_nr,
- CMCI_UCNA_LLC_BANK, MCi_STATUS_UCNA_LLC_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_STATUS MSR\n");
+ mce->bank, mce->mci_stat);
+ if (ret)
+ err(xc_handle, "Failed to inject MCi_STATUS MSR");
ret = inject_mci_misc(xc_handle, cpu_nr,
- CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_MISC MSR\n");
+ mce->bank, mce->mci_misc);
+ if (ret)
+ err(xc_handle, "Failed to inject MCi_MISC MSR");
gpfn = gaddr >> PAGE_SHIFT;
mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn);
if (!mfn_valid(mfn))
- err(xc_handle, "The MFN is not valid\n");
+ err(xc_handle, "The MFN is not valid");
haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
- ret = inject_mci_addr(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, haddr);
- if ( ret )
- err(xc_handle, "Failed to inject MCi_ADDR MSR\n");
+ ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, haddr);
+ if (ret)
+ err(xc_handle, "Failed to inject MCi_ADDR MSR");
ret = flush_msr_inj(xc_handle);
- if ( ret )
- err(xc_handle, "Failed to inject MSR\n");
- ret = inject_cmci(xc_handle, cpu_nr);
- if ( ret )
- err(xc_handle, "Failed to inject MCE error\n");
+ if (ret)
+ err(xc_handle, "Failed to inject MSR");
+ if (mce->cmci)
+ ret = inject_cmci(xc_handle, cpu_nr);
+ else
+ ret = inject_mce(xc_handle, cpu_nr);
+ if (ret)
+ err(xc_handle, "Failed to inject MCE error");
return 0;
}
@@ -535,6 +485,8 @@ static struct option opts[] = {
static void help(void)
{
+ int i;
+
printf("Usage: xen-mceinj [OPTION]...\n"
"\n"
"Mandatory arguments to long options are mandatory"
@@ -543,18 +495,17 @@ static void help(void)
" -c, --cpu=CPU_ID target CPU\n"
" -d, --domain=DomID target domain, the default is Xen itself\n"
" -h, --help print this page\n"
- " -p, --phyaddr physical address\n"
- " -t, --type=error error type\n"
- " 0 : MCE_SRAO_MEM\n"
- " 1 : MCE_SRAO_LLC\n"
- " 2 : CMCI_UCNA_LLC\n"
- "\n"
- );
+ " -p, --phyaddr=ADDR physical address\n"
+ " -t, --type=error error type\n");
+
+ for (i = 0; i < MCE_TABLE_SIZE; i++)
+ printf(" %2d : %s\n",
+ i, mce_table[i].description);
}
int main(int argc, char *argv[])
{
- int type = MCE_SRAO_MEM;
+ int type = 0;
int c, opt_index;
uint32_t domid;
xc_interface *xc_handle;
@@ -584,17 +535,17 @@ int main(int argc, char *argv[])
case 'c':
cpu_nr = strtol(optarg, &optarg, 10);
if ( strlen(optarg) != 0 )
- err(xc_handle, "Please input a digit parameter for CPU\n");
+ err(xc_handle, "Please input a digit parameter for CPU");
break;
case 'd':
domid = strtol(optarg, &optarg, 10);
if ( strlen(optarg) != 0 )
- err(xc_handle, "Please input a digit parameter for domain\n");
+ err(xc_handle, "Please input a digit parameter for domain");
break;
case 'p':
gaddr = strtol(optarg, &optarg, 0);
if ( strlen(optarg) != 0 )
- err(xc_handle, "Please input correct page address\n");
+ err(xc_handle, "Please input correct page address");
break;
case 't':
type = strtol(optarg, NULL, 0);
@@ -610,7 +561,7 @@ int main(int argc, char *argv[])
max_gpa = xs_get_dom_mem(domid);
Lprintf("get domain %d max gpa is: 0x%lx \n", domid, max_gpa);
if ( gaddr >= max_gpa )
- err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx\n", max_gpa);
+ err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx", max_gpa);
}
Lprintf("get gaddr of error inject is: 0x%lx \n", gaddr);
@@ -618,7 +569,7 @@ int main(int argc, char *argv[])
gpfn = gaddr >> PAGE_SHIFT;
mfn = mca_gpfn_to_mfn(xc_handle, domid, gpfn);
if (!mfn_valid(mfn))
- err(xc_handle, "The MFN is not valid\n");
+ err(xc_handle, "The MFN is not valid");
haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
if ( domid == DOMID_XEN )
Lprintf("Xen: mfn=0x%lx, haddr=0x%lx\n", mfn, haddr);
@@ -629,22 +580,13 @@ int main(int argc, char *argv[])
goto out;
}
- switch ( type )
- {
- case MCE_SRAO_MEM:
- inject_mem_srao(xc_handle, cpu_nr, domid, gaddr);
- break;
- case MCE_SRAO_LLC:
- inject_llc_srao(xc_handle, cpu_nr, domid, gaddr);
- break;
- case CMCI_UCNA_LLC:
- inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr);
- break;
- default:
- err(xc_handle, "Unsupported error type\n");
- break;
+ if (type < 0 || type >= MCE_TABLE_SIZE) {
+ err(xc_handle, "Unsupported error type");
+ goto out;
}
+ inject(xc_handle, &mce_table[type], cpu_nr, domid, gaddr);
+
out:
xc_interface_close(xc_handle);
return 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs
2014-05-14 13:30 [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs David Vrabel
@ 2014-05-14 13:54 ` Egger, Christoph
2014-06-23 14:11 ` David Vrabel
1 sibling, 0 replies; 4+ messages in thread
From: Egger, Christoph @ 2014-05-14 13:54 UTC (permalink / raw)
To: David Vrabel, xen-devel
Cc: Liu Jinsong, Ian Jackson, Ian Campbell, Stefano Stabellini
On 14.05.14 15:30, David Vrabel wrote:
> Make the set of MCEs that xen-mceinj can inject by data-driven instead
> of a whole pile of cut-and-paste functions.
>
> Add two new types of MCE: one for AMD CPUs and one fatal one (PCC
> set).
>
> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
One little cleanup nit below.
Other than that:
Acked-by: Christoph Egger <chegger@amazon.de>
> ---
> I sat on this for /years/ in a vain hope I'd fix this properly by
> allowing xen-mceinj to take command line options for the values to
> inject. Having dusted it off this week, I think its better applied
> as-is than waiting for magic fairies...
> ---
> tools/tests/mce-test/tools/xen-mceinj.c | 260 ++++++++++++-------------------
> 1 file changed, 101 insertions(+), 159 deletions(-)
>
> diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c
> index 21a488b..186fa38 100644
> --- a/tools/tests/mce-test/tools/xen-mceinj.c
> +++ b/tools/tests/mce-test/tools/xen-mceinj.c
> @@ -58,28 +58,59 @@
> #define MSR_IA32_MC0_MISC 0x00000403
> #define MSR_IA32_MC0_CTL2 0x00000280
>
> -/* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */
> -#define MCG_STATUS_SRAO_LLC_VAL 0x5
> -#define MCE_SRAO_LLC_BANK 0x7
> -#define MCi_STATUS_SRAO_LLC_VAL 0xBD2000008000017AUL
> -#define MCi_MISC_SRAO_LLC_VAL 0x86UL
> -
> -/* Memory Patrol Scrub SRAO MCE */
> -#define MCG_STATUS_SRAO_MEM_VAL 0x5
> -#define MCE_SRAO_MEM_BANK 0x8
> -#define MCi_STATUS_SRAO_MEM_VAL 0xBD000000004000CFUL
> -#define MCi_MISC_SRAO_MEM_VAL 0x86UL
> -
> -/* LLC EWB UCNA Error */
> -#define MCG_STATUS_UCNA_LLC_VAL 0x0
> -#define CMCI_UCNA_LLC_BANK 0x9
> -#define MCi_STATUS_UCNA_LLC_VAL 0xBC20000080000136UL
> -#define MCi_MISC_UCNA_LLC_VAL 0x86UL
> -
> -/* Error Types */
> -#define MCE_SRAO_MEM 0x0
> -#define MCE_SRAO_LLC 0x1
> -#define CMCI_UCNA_LLC 0x2
> +struct mce_info {
> + const char *description;
> + uint8_t mcg_stat;
> + int bank;
> + uint64_t mci_stat;
> + uint64_t mci_misc;
> + bool cmci;
> +};
> +
> +static struct mce_info mce_table[] = {
> + /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */
> + {
> + .description = "MCE_SRAO_MEM",
> + .mcg_stat = 0x5,
> + .bank = 7,
> + .mci_stat = 0xBD2000008000017Aull,
> + .mci_misc = 0x86ull,
> + },
> + /* Memory Patrol Scrub SRAO MCE */
> + {
> + .description = "MCE_SRAO_LLC",
> + .mcg_stat = 0x5,
> + .bank = 8,
> + .mci_stat = 0xBD000000004000CFull,
> + .mci_misc = 0x86ull,
> + },
> + /* LLC EWB UCNA Error */
> + {
> + .description = "CMCI_UCNA_LLC",
> + .mcg_stat = 0x0,
> + .bank = 9,
> + .mci_stat = 0xBC20000080000136ull,
> + .mci_misc = 0x86ull,
> + .cmci = true,
> + },
> + /* AMD L1 instruction cache data or tag parity. */
> + {
> + .description = "AMD L1 icache parity",
> + .mcg_stat = 0x5,
> + .bank = 1,
> + .mci_stat = 0x9400000000000151ull,
> + .mci_misc = 0x86ull,
> + },
> + /* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */
> + {
> + .description = "MCE_SRAO_MEM (Fatal)",
> + .mcg_stat = 0x5,
> + .bank = 7,
> + .mci_stat = 0xBF2000008000017Aull,
> + .mci_misc = 0x86ull,
> + },
> +};
> +#define MCE_TABLE_SIZE (sizeof(mce_table)/sizeof(mce_table[0]))
>
> #define LOGFILE stdout
>
> @@ -156,7 +187,7 @@ static int inject_cmci(xc_interface *xc_handle, int cpu_nr)
>
> nr_cpus = mca_cpuinfo(xc_handle);
> if (!nr_cpus)
> - err(xc_handle, "Failed to get mca_cpuinfo\n");
> + err(xc_handle, "Failed to get mca_cpuinfo");
>
> mc.cmd = XEN_MC_inject_v2;
> mc.interface_version = XEN_MCA_INTERFACE_VERSION;
> @@ -273,7 +304,7 @@ static uint64_t guest_mfn(xc_interface *xc_handle,
> max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
> sizeof(domain)) + 1;
> if ( max_gpfn <= 0 )
> - err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn);
> + err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn);
>
> Lprintf("Maxium gpfn for dom %d is 0x%lx\n", domain, max_gpfn);
>
> @@ -281,24 +312,24 @@ static uint64_t guest_mfn(xc_interface *xc_handle,
> if ( !get_platform_info(xc_handle, domain,
> &max_mfn, &hvirt_start,
> &pt_levels, &guest_width) )
> - err(xc_handle, "Failed to get platform information\n");
> + err(xc_handle, "Failed to get platform information");
>
> /* Get guest's pfn list */
> pfn_buf = malloc(sizeof(uint64_t) * max_gpfn);
> if ( !pfn_buf )
> - err(xc_handle, "Failed to alloc pfn buf\n");
> + err(xc_handle, "Failed to alloc pfn buf");
> memset(pfn_buf, 0, sizeof(uint64_t) * max_gpfn);
malloc + memset = calloc(), please.
> ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn);
> if ( ret < 0 ) {
> free(pfn_buf);
> - err(xc_handle, "Failed to get pfn list %x\n", ret);
> + err(xc_handle, "Failed to get pfn list %x", ret);
> }
>
> /* Now get the m2p table */
> live_m2p = xc_map_m2p(xc_handle, max_mfn, PROT_READ, &m2p_mfn0);
> if ( !live_m2p )
> - err(xc_handle, "Failed to map live M2P table\n");
> + err(xc_handle, "Failed to map live M2P table");
>
> /* match the mapping */
> for ( i = 0; i < max_gpfn; i++ )
> @@ -334,7 +365,7 @@ static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle,
> max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
> sizeof(domain)) + 1;
> if ( max_gpfn <= 0 )
> - err(xc_handle, "Failed to get max_gpfn 0x%lx\n", max_gpfn);
> + err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn);
> index = gfn % max_gpfn;
>
> return guest_mfn(xc_handle, domain, index);
> @@ -375,125 +406,44 @@ static int inject_mci_addr(xc_interface *xc_handle,
> MCi_type_ADDR, bank, val);
> }
>
> -static int inject_llc_srao(xc_interface *xc_handle,
> - uint32_t cpu_nr,
> - uint32_t domain,
> - uint64_t gaddr)
> -{
> - uint64_t gpfn, mfn, haddr;
> - int ret = 0;
> -
> - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_LLC_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCG_STATUS MSR\n");
> -
> - ret = inject_mci_status(xc_handle, cpu_nr,
> - MCE_SRAO_LLC_BANK, MCi_STATUS_SRAO_LLC_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_STATUS MSR\n");
> -
> - ret = inject_mci_misc(xc_handle, cpu_nr,
> - MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_MISC MSR\n");
> -
> - gpfn = gaddr >> PAGE_SHIFT;
> - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn);
> - if (!mfn_valid(mfn))
> - err(xc_handle, "The MFN is not valid\n");
> - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
> - ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_LLC_BANK, haddr);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_ADDR MSR\n");
> -
> - ret = flush_msr_inj(xc_handle);
> - if ( ret )
> - err(xc_handle, "Failed to inject MSR\n");
> - ret = inject_mce(xc_handle, cpu_nr);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCE error\n");
> -
> - return 0;
> -}
> -
> -static int inject_mem_srao(xc_interface *xc_handle,
> - uint32_t cpu_nr,
> - uint32_t domain,
> - uint64_t gaddr)
> -{
> - uint64_t gpfn, mfn, haddr;
> - int ret = 0;
> -
> - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_SRAO_MEM_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCG_STATUS MSR\n");
> -
> - ret = inject_mci_status(xc_handle, cpu_nr,
> - MCE_SRAO_MEM_BANK, MCi_STATUS_SRAO_MEM_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_STATUS MSR\n");
> -
> - ret = inject_mci_misc(xc_handle, cpu_nr,
> - MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_MISC MSR\n");
> -
> - gpfn = gaddr >> PAGE_SHIFT;
> - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn);
> - if (!mfn_valid(mfn))
> - err(xc_handle, "The MFN is not valid\n");
> - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
> - ret = inject_mci_addr(xc_handle, cpu_nr, MCE_SRAO_MEM_BANK, haddr);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_ADDR MSR\n");
> -
> - ret = flush_msr_inj(xc_handle);
> - if ( ret )
> - err(xc_handle, "Failed to inject MSR\n");
> - ret = inject_mce(xc_handle, cpu_nr);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCE error\n");
> -
> - return 0;
> -}
> -
> -static int inject_llc_ucna(xc_interface *xc_handle,
> - uint32_t cpu_nr,
> - uint32_t domain,
> - uint64_t gaddr)
> +static int inject(xc_interface *xc_handle, struct mce_info *mce,
> + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr)
> {
> uint64_t gpfn, mfn, haddr;
> int ret = 0;
>
> - ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_UCNA_LLC_VAL);
> + ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat);
> if ( ret )
> - err(xc_handle, "Failed to inject MCG_STATUS MSR\n");
> + err(xc_handle, "Failed to inject MCG_STATUS MSR");
>
> ret = inject_mci_status(xc_handle, cpu_nr,
> - CMCI_UCNA_LLC_BANK, MCi_STATUS_UCNA_LLC_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_STATUS MSR\n");
> + mce->bank, mce->mci_stat);
> + if (ret)
> + err(xc_handle, "Failed to inject MCi_STATUS MSR");
>
> ret = inject_mci_misc(xc_handle, cpu_nr,
> - CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_MISC MSR\n");
> + mce->bank, mce->mci_misc);
> + if (ret)
> + err(xc_handle, "Failed to inject MCi_MISC MSR");
>
> gpfn = gaddr >> PAGE_SHIFT;
> mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn);
> if (!mfn_valid(mfn))
> - err(xc_handle, "The MFN is not valid\n");
> + err(xc_handle, "The MFN is not valid");
> haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
> - ret = inject_mci_addr(xc_handle, cpu_nr, CMCI_UCNA_LLC_BANK, haddr);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCi_ADDR MSR\n");
> + ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, haddr);
> + if (ret)
> + err(xc_handle, "Failed to inject MCi_ADDR MSR");
>
> ret = flush_msr_inj(xc_handle);
> - if ( ret )
> - err(xc_handle, "Failed to inject MSR\n");
> - ret = inject_cmci(xc_handle, cpu_nr);
> - if ( ret )
> - err(xc_handle, "Failed to inject MCE error\n");
> + if (ret)
> + err(xc_handle, "Failed to inject MSR");
> + if (mce->cmci)
> + ret = inject_cmci(xc_handle, cpu_nr);
> + else
> + ret = inject_mce(xc_handle, cpu_nr);
> + if (ret)
> + err(xc_handle, "Failed to inject MCE error");
>
> return 0;
> }
> @@ -535,6 +485,8 @@ static struct option opts[] = {
>
> static void help(void)
> {
> + int i;
> +
> printf("Usage: xen-mceinj [OPTION]...\n"
> "\n"
> "Mandatory arguments to long options are mandatory"
> @@ -543,18 +495,17 @@ static void help(void)
> " -c, --cpu=CPU_ID target CPU\n"
> " -d, --domain=DomID target domain, the default is Xen itself\n"
> " -h, --help print this page\n"
> - " -p, --phyaddr physical address\n"
> - " -t, --type=error error type\n"
> - " 0 : MCE_SRAO_MEM\n"
> - " 1 : MCE_SRAO_LLC\n"
> - " 2 : CMCI_UCNA_LLC\n"
> - "\n"
> - );
> + " -p, --phyaddr=ADDR physical address\n"
> + " -t, --type=error error type\n");
> +
> + for (i = 0; i < MCE_TABLE_SIZE; i++)
> + printf(" %2d : %s\n",
> + i, mce_table[i].description);
> }
>
> int main(int argc, char *argv[])
> {
> - int type = MCE_SRAO_MEM;
> + int type = 0;
> int c, opt_index;
> uint32_t domid;
> xc_interface *xc_handle;
> @@ -584,17 +535,17 @@ int main(int argc, char *argv[])
> case 'c':
> cpu_nr = strtol(optarg, &optarg, 10);
> if ( strlen(optarg) != 0 )
> - err(xc_handle, "Please input a digit parameter for CPU\n");
> + err(xc_handle, "Please input a digit parameter for CPU");
> break;
> case 'd':
> domid = strtol(optarg, &optarg, 10);
> if ( strlen(optarg) != 0 )
> - err(xc_handle, "Please input a digit parameter for domain\n");
> + err(xc_handle, "Please input a digit parameter for domain");
> break;
> case 'p':
> gaddr = strtol(optarg, &optarg, 0);
> if ( strlen(optarg) != 0 )
> - err(xc_handle, "Please input correct page address\n");
> + err(xc_handle, "Please input correct page address");
> break;
> case 't':
> type = strtol(optarg, NULL, 0);
> @@ -610,7 +561,7 @@ int main(int argc, char *argv[])
> max_gpa = xs_get_dom_mem(domid);
> Lprintf("get domain %d max gpa is: 0x%lx \n", domid, max_gpa);
> if ( gaddr >= max_gpa )
> - err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx\n", max_gpa);
> + err(xc_handle, "Fail: gaddr exceeds max_gpa 0x%lx", max_gpa);
> }
> Lprintf("get gaddr of error inject is: 0x%lx \n", gaddr);
>
> @@ -618,7 +569,7 @@ int main(int argc, char *argv[])
> gpfn = gaddr >> PAGE_SHIFT;
> mfn = mca_gpfn_to_mfn(xc_handle, domid, gpfn);
> if (!mfn_valid(mfn))
> - err(xc_handle, "The MFN is not valid\n");
> + err(xc_handle, "The MFN is not valid");
> haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
> if ( domid == DOMID_XEN )
> Lprintf("Xen: mfn=0x%lx, haddr=0x%lx\n", mfn, haddr);
> @@ -629,22 +580,13 @@ int main(int argc, char *argv[])
> goto out;
> }
>
> - switch ( type )
> - {
> - case MCE_SRAO_MEM:
> - inject_mem_srao(xc_handle, cpu_nr, domid, gaddr);
> - break;
> - case MCE_SRAO_LLC:
> - inject_llc_srao(xc_handle, cpu_nr, domid, gaddr);
> - break;
> - case CMCI_UCNA_LLC:
> - inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr);
> - break;
> - default:
> - err(xc_handle, "Unsupported error type\n");
> - break;
> + if (type < 0 || type >= MCE_TABLE_SIZE) {
> + err(xc_handle, "Unsupported error type");
> + goto out;
> }
>
> + inject(xc_handle, &mce_table[type], cpu_nr, domid, gaddr);
> +
> out:
> xc_interface_close(xc_handle);
> return 0;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs
2014-05-14 13:30 [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs David Vrabel
2014-05-14 13:54 ` Egger, Christoph
@ 2014-06-23 14:11 ` David Vrabel
2014-06-23 16:26 ` Ian Jackson
1 sibling, 1 reply; 4+ messages in thread
From: David Vrabel @ 2014-06-23 14:11 UTC (permalink / raw)
To: David Vrabel, xen-devel
Cc: Liu Jinsong, Christoph Egger, Ian Jackson, Ian Campbell,
Stefano Stabellini
On 14/05/14 14:30, David Vrabel wrote:
> Make the set of MCEs that xen-mceinj can inject by data-driven instead
> of a whole pile of cut-and-paste functions.
>
> Add two new types of MCE: one for AMD CPUs and one fatal one (PCC
> set).
Ping?
This has been acked by Christoph, one of the MCA maintainers.
David
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs
2014-06-23 14:11 ` David Vrabel
@ 2014-06-23 16:26 ` Ian Jackson
0 siblings, 0 replies; 4+ messages in thread
From: Ian Jackson @ 2014-06-23 16:26 UTC (permalink / raw)
To: David Vrabel
Cc: xen-devel, Liu Jinsong, Christoph Egger, Ian Campbell,
Stefano Stabellini
David Vrabel writes ("Re: [Xen-devel] [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs"):
> On 14/05/14 14:30, David Vrabel wrote:
> > Make the set of MCEs that xen-mceinj can inject by data-driven instead
> > of a whole pile of cut-and-paste functions.
> >
> > Add two new types of MCE: one for AMD CPUs and one fatal one (PCC
> > set).
>
> Ping?
>
> This has been acked by Christoph, one of the MCA maintainers.
Did I miss you addressing Chrisoph's cleanup nit ?
He wrote:
One little cleanup nit below.
Other than that:
Acked-by: Christoph Egger <chegger@amazon.de>
...
malloc + memset = calloc(), please.
Also: strictly speaking it would be better to split out into a
separate patch the removal of the spurious newlines from the error
messages. Although I won't insist on that, you really ought to
mention it in the commit message!
Also can you please confirm in the commit message that the only
functional change in this patch is the removal of the spurious
newlines (and perhaps a change to the usage output). If that is _not_
the only functional change then you should explain what else is...
Thanks,
Ian.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-23 16:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-14 13:30 [PATCH] tools/mce: refactor xen-mceinj to ease injection of other MCEs David Vrabel
2014-05-14 13:54 ` Egger, Christoph
2014-06-23 14:11 ` David Vrabel
2014-06-23 16:26 ` Ian Jackson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).