From: Borislav Petkov <bp@suse.de> To: "Ghannam, Yazen" <Yazen.Ghannam@amd.com> Cc: Johannes Hirte <johannes.hirte@datenkhaos.de>, "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "tony.luck@intel.com" <tony.luck@intel.com>, "x86@kernel.org" <x86@kernel.org> Subject: [PATCH 2/2] x86/MCE/AMD: Read MCx_MISC block addresses on any CPU Date: Thu, 17 May 2018 20:31:44 +0200 [thread overview] Message-ID: <20180517183144.GB24312@pd.tnic> (raw) In-Reply-To: <CY4PR12MB1557F564AF25A4F2306C7DE4F8910@CY4PR12MB1557.namprd12.prod.outlook.com> From: Borislav Petkov <bp@suse.de> We used rdmsr_safe_on_cpu() to make sure we're reading the proper CPU's MISC block addresses. However, that caused trouble with CPU hotplug due to the _on_cpu() helper issuing an IPI while IRQs are disabled. But we don't have to do that: the block addresses are the same on any CPU so we can read them on any CPU. (What practically happens is, we read them on the BSP and cache them, and for later reads, we service them from the cache). Suggested-by: Yazen Ghannam <Yazen.Ghannam@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index c8e038800591..f591b01930db 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -436,8 +436,7 @@ static void deferred_error_interrupt_enable(struct cpuinfo_x86 *c) wrmsr(MSR_CU_DEF_ERR, low, high); } -static u32 smca_get_block_address(unsigned int cpu, unsigned int bank, - unsigned int block) +static u32 smca_get_block_address(unsigned int bank, unsigned int block) { u32 low, high; u32 addr = 0; @@ -456,13 +455,13 @@ static u32 smca_get_block_address(unsigned int cpu, unsigned int bank, * For SMCA enabled processors, BLKPTR field of the first MISC register * (MCx_MISC0) indicates presence of additional MISC regs set (MISC1-4). */ - if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_CONFIG(bank), &low, &high)) + if (rdmsr_safe(MSR_AMD64_SMCA_MCx_CONFIG(bank), &low, &high)) goto out; if (!(low & MCI_CONFIG_MCAX)) goto out; - if (!rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_MISC(bank), &low, &high) && + if (!rdmsr_safe(MSR_AMD64_SMCA_MCx_MISC(bank), &low, &high) && (low & MASK_BLKPTR_LO)) addr = MSR_AMD64_SMCA_MCx_MISCy(bank, block - 1); @@ -471,7 +470,7 @@ static u32 smca_get_block_address(unsigned int cpu, unsigned int bank, return addr; } -static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 high, +static u32 get_block_address(u32 current_addr, u32 low, u32 high, unsigned int bank, unsigned int block) { u32 addr = 0, offset = 0; @@ -480,7 +479,7 @@ static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 hi return addr; if (mce_flags.smca) - return smca_get_block_address(cpu, bank, block); + return smca_get_block_address(bank, block); /* Fall back to method we used for older processors: */ switch (block) { @@ -558,7 +557,7 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) smca_configure(bank, cpu); for (block = 0; block < NR_BLOCKS; ++block) { - address = get_block_address(cpu, address, low, high, bank, block); + address = get_block_address(address, low, high, bank, block); if (!address) break; @@ -1175,7 +1174,7 @@ static int allocate_threshold_blocks(unsigned int cpu, unsigned int bank, if (err) goto out_free; recurse: - address = get_block_address(cpu, address, low, high, bank, ++block); + address = get_block_address(address, low, high, bank, ++block); if (!address) return 0; -- 2.17.0.391.g1f1cddd558b5 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg) --
WARNING: multiple messages have this Message-ID (diff)
From: Boris Petkov <bp@suse.de> To: "Ghannam, Yazen" <Yazen.Ghannam@amd.com> Cc: Johannes Hirte <johannes.hirte@datenkhaos.de>, "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "tony.luck@intel.com" <tony.luck@intel.com>, "x86@kernel.org" <x86@kernel.org> Subject: [2/2] x86/MCE/AMD: Read MCx_MISC block addresses on any CPU Date: Thu, 17 May 2018 20:31:44 +0200 [thread overview] Message-ID: <20180517183144.GB24312@pd.tnic> (raw) From: Borislav Petkov <bp@suse.de> We used rdmsr_safe_on_cpu() to make sure we're reading the proper CPU's MISC block addresses. However, that caused trouble with CPU hotplug due to the _on_cpu() helper issuing an IPI while IRQs are disabled. But we don't have to do that: the block addresses are the same on any CPU so we can read them on any CPU. (What practically happens is, we read them on the BSP and cache them, and for later reads, we service them from the cache). Suggested-by: Yazen Ghannam <Yazen.Ghannam@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index c8e038800591..f591b01930db 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -436,8 +436,7 @@ static void deferred_error_interrupt_enable(struct cpuinfo_x86 *c) wrmsr(MSR_CU_DEF_ERR, low, high); } -static u32 smca_get_block_address(unsigned int cpu, unsigned int bank, - unsigned int block) +static u32 smca_get_block_address(unsigned int bank, unsigned int block) { u32 low, high; u32 addr = 0; @@ -456,13 +455,13 @@ static u32 smca_get_block_address(unsigned int cpu, unsigned int bank, * For SMCA enabled processors, BLKPTR field of the first MISC register * (MCx_MISC0) indicates presence of additional MISC regs set (MISC1-4). */ - if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_CONFIG(bank), &low, &high)) + if (rdmsr_safe(MSR_AMD64_SMCA_MCx_CONFIG(bank), &low, &high)) goto out; if (!(low & MCI_CONFIG_MCAX)) goto out; - if (!rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_MISC(bank), &low, &high) && + if (!rdmsr_safe(MSR_AMD64_SMCA_MCx_MISC(bank), &low, &high) && (low & MASK_BLKPTR_LO)) addr = MSR_AMD64_SMCA_MCx_MISCy(bank, block - 1); @@ -471,7 +470,7 @@ static u32 smca_get_block_address(unsigned int cpu, unsigned int bank, return addr; } -static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 high, +static u32 get_block_address(u32 current_addr, u32 low, u32 high, unsigned int bank, unsigned int block) { u32 addr = 0, offset = 0; @@ -480,7 +479,7 @@ static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 hi return addr; if (mce_flags.smca) - return smca_get_block_address(cpu, bank, block); + return smca_get_block_address(bank, block); /* Fall back to method we used for older processors: */ switch (block) { @@ -558,7 +557,7 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) smca_configure(bank, cpu); for (block = 0; block < NR_BLOCKS; ++block) { - address = get_block_address(cpu, address, low, high, bank, block); + address = get_block_address(address, low, high, bank, block); if (!address) break; @@ -1175,7 +1174,7 @@ static int allocate_threshold_blocks(unsigned int cpu, unsigned int bank, if (err) goto out_free; recurse: - address = get_block_address(cpu, address, low, high, bank, ++block); + address = get_block_address(address, low, high, bank, ++block); if (!address) return 0;
next prev parent reply other threads:[~2018-05-17 18:32 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-01 18:48 [PATCH 1/3] x86/MCE/AMD: Redo function to get SMCA bank type Yazen Ghannam 2018-02-01 18:48 ` [1/3] " Yazen Ghannam 2018-02-01 18:48 ` [PATCH 2/3] x86/MCE/AMD, EDAC/mce_amd: Enumerate Reserved " Yazen Ghannam 2018-02-01 18:48 ` [2/3] " Yazen Ghannam 2018-02-08 15:15 ` [PATCH 2/3] " Borislav Petkov 2018-02-08 15:15 ` [2/3] " Borislav Petkov 2018-02-14 16:28 ` [PATCH 2/3] " Ghannam, Yazen 2018-02-14 16:28 ` [2/3] " Yazen Ghannam 2018-02-01 18:48 ` [PATCH 3/3] x86/MCE/AMD: Get address from already initialized block Yazen Ghannam 2018-02-01 18:48 ` [3/3] " Yazen Ghannam 2018-02-08 15:26 ` [PATCH 3/3] " Borislav Petkov 2018-02-08 15:26 ` [3/3] " Borislav Petkov 2018-04-14 0:42 ` [PATCH 3/3] " Johannes Hirte 2018-04-14 0:42 ` [3/3] " Johannes Hirte 2018-04-16 11:56 ` [PATCH 3/3] " Johannes Hirte 2018-04-16 11:56 ` [3/3] " Johannes Hirte 2018-04-17 13:31 ` [PATCH 3/3] " Ghannam, Yazen 2018-04-17 13:31 ` [3/3] " Yazen Ghannam 2018-05-15 9:39 ` [PATCH 3/3] " Johannes Hirte 2018-05-15 9:39 ` [3/3] " Johannes Hirte 2018-05-16 22:46 ` [PATCH 3/3] " Borislav Petkov 2018-05-16 22:46 ` [3/3] " Boris Petkov 2018-05-17 6:49 ` [PATCH 3/3] " Johannes Hirte 2018-05-17 6:49 ` [3/3] " Johannes Hirte 2018-05-17 10:41 ` [PATCH 3/3] " Borislav Petkov 2018-05-17 10:41 ` [3/3] " Boris Petkov 2018-05-17 13:04 ` [PATCH 3/3] " Ghannam, Yazen 2018-05-17 13:04 ` [3/3] " Yazen Ghannam 2018-05-17 13:44 ` [PATCH 3/3] " Borislav Petkov 2018-05-17 13:44 ` [3/3] " Boris Petkov 2018-05-17 14:05 ` [PATCH 3/3] " Ghannam, Yazen 2018-05-17 14:05 ` [3/3] " Yazen Ghannam 2018-05-17 18:30 ` [PATCH 1/2] x86/MCE/AMD: Cache SMCA MISC block addresses Borislav Petkov 2018-05-17 18:30 ` [1/2] " Boris Petkov 2018-05-17 18:31 ` Borislav Petkov [this message] 2018-05-17 18:31 ` [2/2] x86/MCE/AMD: Read MCx_MISC block addresses on any CPU Boris Petkov 2018-05-17 19:29 ` [PATCH 3/3] x86/MCE/AMD: Get address from already initialized block Johannes Hirte 2018-05-17 19:29 ` [3/3] " Johannes Hirte 2018-05-17 19:33 ` [PATCH 3/3] " Borislav Petkov 2018-05-17 19:33 ` [3/3] " Boris Petkov 2018-05-19 13:21 ` [tip:ras/urgent] x86/MCE/AMD: Cache SMCA MISC block addresses tip-bot for Borislav Petkov 2018-02-08 15:04 ` [PATCH 1/3] x86/MCE/AMD: Redo function to get SMCA bank type Borislav Petkov 2018-02-08 15:04 ` [1/3] " Borislav Petkov 2018-02-14 16:38 ` [PATCH 1/3] " Ghannam, Yazen 2018-02-14 16:38 ` [1/3] " Yazen Ghannam 2018-02-14 19:35 ` [PATCH 1/3] " Borislav Petkov 2018-02-14 19:35 ` [1/3] " Boris Petkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180517183144.GB24312@pd.tnic \ --to=bp@suse.de \ --cc=Yazen.Ghannam@amd.com \ --cc=johannes.hirte@datenkhaos.de \ --cc=linux-edac@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tony.luck@intel.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.