From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELuNgJnmqzOmk/QqbsKR+U0sqoywgq0t0ol3paaMsJV4I0GzLOt/gDgoPpDi2CblvmlLHUqn ARC-Seal: i=1; a=rsa-sha256; t=1520955576; cv=none; d=google.com; s=arc-20160816; b=IEEUGPlSdetzg5dKhQxxF/NeuDB65HEC+HJJgu/MYEu8Tgp+x+NRydCUJ8PkF8bzJa 2l3U1/XAIbt9FiUwdjRnIYP4zMxjMgJjjiUNBM22H+VB84/bs3gs070rPO1if3Rp0yza NMNuNkmIuDgSGKpwAyXu5itzimz1ABH+RU5hqIvzL2Ijv4uBz2byD9VDp7BXiGQVH0qf YEG0J+P/qIdIlMCSteYDXDBgwh6Cd70+KWJquKbCwNzus09PtV+ueehOu3xYwqjVMZzh mtCutFpSRlH9bmRzjMTFQiFVtbhXc8pM2YRNs10TIy3uy/ISAJyIct3A79tOYUYFutmu 0W6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=oIv8HMfPf4qQ3jNd9URjgwsUlFVDkAG9jbkQXazshwY=; b=Yv44z958Rrr2fN3yLKqaoHfmN0Yo6bFbSqDTXSoxiXnFkGiqWwwlFQX+ijlDRCpwO5 nkHj8yd8EmDOxy7PYEwfptploin9mM8lv/w7KPy7ibWeSU2kUaUZiRZMRjRjA+dkKQCh ARAQ3UFvm9lr6GbxD2d36mVn+dzRRtms3+OyT82SPrqyUHkEKAfqW0HnbCHR/tV+pyan sy1psT2+CHKHgCAGeJTeOAEpLcrmBUF/DuWlpAavW6WrBNjzvtofPtHDWjlQAK7yJzbA zLyrg1OAWFnRFluJfPmVPqzkTaQL052bxiwnR1IICrOnq+pnDiAY3xzNnD8gwEptFhHx 8flA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tony Luck , Borislav Petkov , Thomas Gleixner , Yazen Ghannam , linux-edac Subject: [PATCH 4.14 097/140] x86/MCE: Save microcode revision in machine check records Date: Tue, 13 Mar 2018 16:25:00 +0100 Message-Id: <20180313152504.677367862@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180313152458.201155692@linuxfoundation.org> References: <20180313152458.201155692@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1594836936296543222?= X-GMAIL-MSGID: =?utf-8?q?1594837513932339888?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tony Luck commit fa94d0c6e0f3431523f5701084d799c77c7d4a4f upstream. Updating microcode used to be relatively rare. Now that it has become more common we should save the microcode version in a machine check record to make sure that those people looking at the error have this important information bundled with the rest of the logged information. [ Borislav: Simplify a bit. ] Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Cc: Yazen Ghannam Cc: linux-edac Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20180301233449.24311-1-tony.luck@intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/uapi/asm/mce.h | 1 + arch/x86/kernel/cpu/mcheck/mce.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) --- a/arch/x86/include/uapi/asm/mce.h +++ b/arch/x86/include/uapi/asm/mce.h @@ -30,6 +30,7 @@ struct mce { __u64 synd; /* MCA_SYND MSR: only valid on SMCA systems */ __u64 ipid; /* MCA_IPID MSR: only valid on SMCA systems */ __u64 ppin; /* Protected Processor Inventory Number */ + __u32 microcode;/* Microcode revision */ }; #define MCE_GET_RECORD_LEN _IOR('M', 1, int) --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -131,6 +131,8 @@ void mce_setup(struct mce *m) if (this_cpu_has(X86_FEATURE_INTEL_PPIN)) rdmsrl(MSR_PPIN, m->ppin); + + m->microcode = boot_cpu_data.microcode; } DEFINE_PER_CPU(struct mce, injectm); @@ -263,7 +265,7 @@ static void __print_mce(struct mce *m) */ pr_emerg(HW_ERR "PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x microcode %x\n", m->cpuvendor, m->cpuid, m->time, m->socketid, m->apicid, - cpu_data(m->extcpu).microcode); + m->microcode); } static void print_mce(struct mce *m) From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.14,097/140] x86/MCE: Save microcode revision in machine check records From: Greg Kroah-Hartman Message-Id: <20180313152504.677367862@linuxfoundation.org> Date: Tue, 13 Mar 2018 16:25:00 +0100 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tony Luck , Borislav Petkov , Thomas Gleixner , Yazen Ghannam , linux-edac List-ID: NC4xNC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBUb255IEx1Y2sg PHRvbnkubHVja0BpbnRlbC5jb20+Cgpjb21taXQgZmE5NGQwYzZlMGYzNDMxNTIzZjU3MDEwODRk Nzk5Yzc3YzdkNGE0ZiB1cHN0cmVhbS4KClVwZGF0aW5nIG1pY3JvY29kZSB1c2VkIHRvIGJlIHJl bGF0aXZlbHkgcmFyZS4gTm93IHRoYXQgaXQgaGFzIGJlY29tZQptb3JlIGNvbW1vbiB3ZSBzaG91 bGQgc2F2ZSB0aGUgbWljcm9jb2RlIHZlcnNpb24gaW4gYSBtYWNoaW5lIGNoZWNrCnJlY29yZCB0 byBtYWtlIHN1cmUgdGhhdCB0aG9zZSBwZW9wbGUgbG9va2luZyBhdCB0aGUgZXJyb3IgaGF2ZSB0 aGlzCmltcG9ydGFudCBpbmZvcm1hdGlvbiBidW5kbGVkIHdpdGggdGhlIHJlc3Qgb2YgdGhlIGxv Z2dlZCBpbmZvcm1hdGlvbi4KClsgQm9yaXNsYXY6IFNpbXBsaWZ5IGEgYml0LiBdCgpTaWduZWQt b2ZmLWJ5OiBUb255IEx1Y2sgPHRvbnkubHVja0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEJv cmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogVGhvbWFzIEdsZWl4bmVy IDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNjOiBZYXplbiBHaGFubmFtIDx5YXplbi5naGFubmFtQGFt ZC5jb20+CkNjOiBsaW51eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KQ2M6IHN0 YWJsZUB2Z2VyLmtlcm5lbC5vcmcKTGluazogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgw MzAxMjMzNDQ5LjI0MzExLTEtdG9ueS5sdWNrQGludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBHcmVn IEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGFyY2gveDg2 L2luY2x1ZGUvdWFwaS9hc20vbWNlLmggIHwgICAgMSArCiBhcmNoL3g4Ni9rZXJuZWwvY3B1L21j aGVjay9tY2UuYyB8ICAgIDQgKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyks IDEgZGVsZXRpb24oLSkKCgoKLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQg dGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LWVkYWMiIGluCnRoZSBib2R5IG9mIGEgbWVzc2Fn ZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0 dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAoKLS0tIGEvYXJjaC94ODYv aW5jbHVkZS91YXBpL2FzbS9tY2UuaAorKysgYi9hcmNoL3g4Ni9pbmNsdWRlL3VhcGkvYXNtL21j ZS5oCkBAIC0zMCw2ICszMCw3IEBAIHN0cnVjdCBtY2UgewogCV9fdTY0IHN5bmQ7CS8qIE1DQV9T WU5EIE1TUjogb25seSB2YWxpZCBvbiBTTUNBIHN5c3RlbXMgKi8KIAlfX3U2NCBpcGlkOwkvKiBN Q0FfSVBJRCBNU1I6IG9ubHkgdmFsaWQgb24gU01DQSBzeXN0ZW1zICovCiAJX191NjQgcHBpbjsJ LyogUHJvdGVjdGVkIFByb2Nlc3NvciBJbnZlbnRvcnkgTnVtYmVyICovCisJX191MzIgbWljcm9j b2RlOy8qIE1pY3JvY29kZSByZXZpc2lvbiAqLwogfTsKIAogI2RlZmluZSBNQ0VfR0VUX1JFQ09S RF9MRU4gICBfSU9SKCdNJywgMSwgaW50KQotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVj ay9tY2UuYworKysgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2UuYwpAQCAtMTMxLDYg KzEzMSw4IEBAIHZvaWQgbWNlX3NldHVwKHN0cnVjdCBtY2UgKm0pCiAKIAlpZiAodGhpc19jcHVf aGFzKFg4Nl9GRUFUVVJFX0lOVEVMX1BQSU4pKQogCQlyZG1zcmwoTVNSX1BQSU4sIG0tPnBwaW4p OworCisJbS0+bWljcm9jb2RlID0gYm9vdF9jcHVfZGF0YS5taWNyb2NvZGU7CiB9CiAKIERFRklO RV9QRVJfQ1BVKHN0cnVjdCBtY2UsIGluamVjdG0pOwpAQCAtMjYzLDcgKzI2NSw3IEBAIHN0YXRp YyB2b2lkIF9fcHJpbnRfbWNlKHN0cnVjdCBtY2UgKm0pCiAJICovCiAJcHJfZW1lcmcoSFdfRVJS ICJQUk9DRVNTT1IgJXU6JXggVElNRSAlbGx1IFNPQ0tFVCAldSBBUElDICV4IG1pY3JvY29kZSAl eFxuIiwKIAkJbS0+Y3B1dmVuZG9yLCBtLT5jcHVpZCwgbS0+dGltZSwgbS0+c29ja2V0aWQsIG0t PmFwaWNpZCwKLQkJY3B1X2RhdGEobS0+ZXh0Y3B1KS5taWNyb2NvZGUpOworCQltLT5taWNyb2Nv ZGUpOwogfQogCiBzdGF0aWMgdm9pZCBwcmludF9tY2Uoc3RydWN0IG1jZSAqbSkK