From: Borislav Petkov <bp@alien8.de>
To: Tony Luck <tony.luck@intel.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Smita Koralahalli Channabasappa
<smita.koralahallichannabasappa@amd.com>,
Wei Huang <wei.huang2@amd.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
patches@lists.linux.dev
Subject: Re: [PATCH 1/5] x86/ras: Merge Intel and AMD ppin_init() functions
Date: Tue, 18 Jan 2022 21:02:41 +0100 [thread overview]
Message-ID: <YecY/Ri6hvJGqNTT@zn.tnic> (raw)
In-Reply-To: <20220107225442.1690165-2-tony.luck@intel.com>
On Fri, Jan 07, 2022 at 02:54:38PM -0800, Tony Luck wrote:
Make that subject prefix "x86/cpu" please. Same for patches 2 and 3.
Patch 4 is probably topology/sysfs - at least this is what past patches
say. If you're not sure about the prefix, use git log on the files
you're touching.
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index 0083464de5e3..a1e29c0844d1 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -88,6 +88,80 @@ EXPORT_SYMBOL_GPL(get_llc_id);
> /* L2 cache ID of each logical CPU */
> DEFINE_PER_CPU_READ_MOSTLY(u16, cpu_l2c_id) = BAD_APICID;
>
> +static struct ppin_info {
> + int feature;
> + int msr_ppin_ctl;
> + int msr_ppin;
That thing is unused in this patch and only accessed in patch 3. Please
add it there.
> +} ppin_info[] = {
> + [X86_VENDOR_INTEL] = {
> + .feature = X86_FEATURE_INTEL_PPIN,
> + .msr_ppin_ctl = MSR_PPIN_CTL,
> + .msr_ppin = MSR_PPIN
> + },
> + [X86_VENDOR_AMD] = {
X86_VENDOR_AMD is index 2 not 1 so ppin_info[1] is empty.
I wouldn't mind swapping the numbers here in a pre-patch:
#define X86_VENDOR_CYRIX 1
#define X86_VENDOR_AMD 2
nothing would depend on those naked numbers, right? :)
> + .feature = X86_FEATURE_AMD_PPIN,
> + .msr_ppin_ctl = MSR_AMD_PPIN_CTL,
> + .msr_ppin = MSR_AMD_PPIN
> + },
> +};
> +
> +static const struct x86_cpu_id ppin_cpuids[] = {
> + X86_MATCH_VENDOR_FEATURE(AMD, X86_FEATURE_AMD_PPIN, &ppin_info[X86_VENDOR_AMD]),
X86_MATCH_FEATURE() I guess.
> + /* Legacy models without CPUID enumeration */
> + X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &ppin_info[X86_VENDOR_INTEL]),
> + X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &ppin_info[X86_VENDOR_INTEL]),
> +
> + {}
> +};
> +
> +static void ppin_init(struct cpuinfo_x86 *c)
> +{
> + const struct x86_cpu_id *id;
> + unsigned long long val;
> + struct ppin_info *info;
> +
> + id = x86_match_cpu(ppin_cpuids);
> + if (!id)
> + return;
> +
> + /*
> + * Testing the prescence of the MSR is not enough. Need to check
Unknown word [prescence] in comment.
Suggestions: ['presence', 'prescience', 'putrescence', 'prepubescence', 'excrescence', 'concrescence']
> + * that the PPIN_CTL allows reading of the PPIN.
> + */
> + info = (struct ppin_info *)id->driver_data;
> +
> + if (rdmsrl_safe(info->msr_ppin_ctl, &val))
> + goto clear_ppin;
> +
> + if ((val & 3UL) == 1UL) {
> + /* PPIN locked in disabled mode */
> + goto clear_ppin;
> + }
> +
> + /* If PPIN is disabled, try to enable */
> + if (!(val & 2UL)) {
> + wrmsrl_safe(info->msr_ppin_ctl, val | 2UL);
> + rdmsrl_safe(info->msr_ppin_ctl, &val);
> + }
> +
> + /* Is the enable bit set? */
> + if (val & 2UL) {
> + set_cpu_cap(c, info->feature);
> + return;
> + }
> +
> +clear_ppin:
> + clear_cpu_cap(c, info->feature);
> +}
> +
> /* correctly size the local cpu masks */
> void __init setup_cpu_local_masks(void)
> {
> @@ -1655,6 +1729,8 @@ static void identify_cpu(struct cpuinfo_x86 *c)
> c->x86_capability[i] |= boot_cpu_data.x86_capability[i];
> }
>
> + ppin_init(c);
I can't say that I'm crazy about all those miscellaneous
feature-initializing functions sprinkled allround here but I don't have
a better idea ... yet.
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2022-01-18 20:02 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 22:54 [PATCH 0/5] PPIN (Protected Processor Inventory Number) updates Tony Luck
2022-01-07 22:54 ` [PATCH 1/5] x86/ras: Merge Intel and AMD ppin_init() functions Tony Luck
2022-01-18 20:02 ` Borislav Petkov [this message]
2022-01-18 21:03 ` Luck, Tony
2022-01-18 21:15 ` Borislav Petkov
2022-01-07 22:54 ` [PATCH 2/5] x86/ras: X86_FEATURE_INTEL_PPIN finally has a CPUID bit Tony Luck
2022-01-20 13:32 ` Borislav Petkov
2022-01-07 22:54 ` [PATCH 3/5] x86/ras: Read/save PPIN MSR during initialization Tony Luck
2022-01-07 22:54 ` [PATCH 4/5] x86/sysfs: Add format parameter to macro defining "show" functions for proc Tony Luck
2022-01-20 13:32 ` Borislav Petkov
2022-01-07 22:54 ` [PATCH 5/5] x86/sysfs: Add PPIN in sysfs under cpu topology Tony Luck
2022-01-20 13:35 ` Borislav Petkov
2022-01-20 18:01 ` Luck, Tony
2022-01-20 22:48 ` Borislav Petkov
2022-01-21 17:47 ` [PATCH v2 0/6] PPIN (Protected Processor Inventory Number) updates Tony Luck
2022-01-21 17:47 ` [PATCH v2 1/6] x86/cpu: Add Xeon Icelake-D to list of CPUs that support PPIN Tony Luck
2022-01-25 17:55 ` [tip: x86/urgent] " tip-bot2 for Tony Luck
2022-01-21 17:47 ` [PATCH v2 2/6] x86/cpu: Merge Intel and AMD ppin_init() functions Tony Luck
2022-01-27 10:22 ` Borislav Petkov
2022-01-27 16:52 ` Luck, Tony
2022-01-21 17:47 ` [PATCH v2 3/6] x86/cpu: X86_FEATURE_INTEL_PPIN finally has a CPUID bit Tony Luck
2022-01-21 17:47 ` [PATCH v2 4/6] x86/cpu: Read/save PPIN MSR during initialization Tony Luck
2022-01-21 17:47 ` [PATCH v2 5/6] topology/sysfs: Add format parameter to macro defining "show" functions for proc Tony Luck
2022-01-31 11:34 ` Greg Kroah-Hartman
2022-01-21 17:47 ` [PATCH v2 6/6] topology/sysfs: Add PPIN in sysfs under cpu topology Tony Luck
2022-01-31 11:35 ` Greg Kroah-Hartman
2022-01-31 12:31 ` [PATCH v2 0/6] PPIN (Protected Processor Inventory Number) updates Borislav Petkov
2022-01-31 17:23 ` Luck, Tony
2022-01-31 18:18 ` Borislav Petkov
2022-01-31 18:49 ` Luck, Tony
2022-01-31 19:10 ` Borislav Petkov
2022-01-31 19:29 ` Luck, Tony
2022-01-31 21:58 ` Borislav Petkov
2022-01-31 22:03 ` Luck, Tony
2022-04-06 22:01 ` [PATCH] topology/sysfs: Hide PPIN on systems that do not support it Tony Luck
2022-04-25 22:46 ` Andrew Morton
2022-04-25 22:56 ` Luck, Tony
2022-01-31 23:01 ` [PATCH v3 0/5] PPIN (Protected Processor Inventory Number) updates Tony Luck
2022-01-31 23:01 ` [PATCH v3 1/5] x86/cpu: Merge Intel and AMD ppin_init() functions Tony Luck
2022-02-02 6:31 ` [tip: x86/cpu] " tip-bot2 for Tony Luck
2022-01-31 23:01 ` [PATCH v3 2/5] x86/cpu: X86_FEATURE_INTEL_PPIN finally has a CPUID bit Tony Luck
2022-02-02 6:31 ` [tip: x86/cpu] " tip-bot2 for Tony Luck
2022-01-31 23:01 ` [PATCH v3 3/5] x86/cpu: Read/save PPIN MSR during initialization Tony Luck
2022-02-02 6:31 ` [tip: x86/cpu] " tip-bot2 for Tony Luck
2022-01-31 23:01 ` [PATCH v3 4/5] topology/sysfs: Add format parameter to macro defining "show" functions for proc Tony Luck
2022-02-02 6:31 ` [tip: x86/cpu] " tip-bot2 for Tony Luck
2022-01-31 23:01 ` [PATCH v3 5/5] topology/sysfs: Add PPIN in sysfs under cpu topology Tony Luck
2022-02-02 6:31 ` [tip: x86/cpu] " tip-bot2 for Tony Luck
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=YecY/Ri6hvJGqNTT@zn.tnic \
--to=bp@alien8.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@lists.linux.dev \
--cc=smita.koralahallichannabasappa@amd.com \
--cc=thomas.lendacky@amd.com \
--cc=tony.luck@intel.com \
--cc=wei.huang2@amd.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).