x86/microcode/AMD: Rename a couple of functions
Subsystems (2)
Borislav Petkov
maintainerPATCH 1/2 x86/microcode/AMD: Rename a couple of functions
From: Borislav Petkov <[email protected]>
- Rename apply_microcode_early_amd() to early_apply_microcode():
simplify the name so that it is clear what it does and when does it do it.
- Rename __load_ucode_amd() to find_blobs_in_containers(): the new name actually explains what it does.
Document some.
No functional changes.
--- arch/x86/kernel/cpu/microcode/amd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +7 -7
@@ -414,8 +414,7 @@ static int __apply_microcode_amd(struct microcode_amd *mc)* * Returns true if container found (sets @desc), false otherwise. */ -static bool -apply_microcode_early_amd (u32 cpuid_1_eax,void *ucode,size_t size,bool save_patch) +static bool early_apply_microcode (u32 cpuid_1_eax,void *ucode,size_t size,bool save_patch) {struct cont_desc desc = {0 };u8 (*patch)[PATCH_MAX_SIZE ];
@@ -481,7 +480,7 @@ static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family)return false; } -static void __load_ucode_amd (unsigned int cpuid_1_eax,struct cpio_data *ret) +static void find_blobs_in_containers (unsigned int cpuid_1_eax,struct cpio_data *ret) {struct ucode_cpu_info *uci;struct cpio_data cp;
@@ -511,11 +510,11 @@ void __init load_ucode_amd_bsp(unsigned int cpuid_1_eax) {struct cpio_data cp = { }; -__load_ucode_amd (cpuid_1_eax, &cp); +find_blobs_in_containers (cpuid_1_eax, &cp);if (!(cp.data && cp.size))return ; -apply_microcode_early_amd (cpuid_1_eax, cp.data, cp.size, true); +early_apply_microcode (cpuid_1_eax, cp.data, cp.size, true); }void load_ucode_amd_ap (unsigned int cpuid_1_eax)
@@ -546,11 +545,11 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax) } } -__load_ucode_amd (cpuid_1_eax, &cp); +find_blobs_in_containers (cpuid_1_eax, &cp);if (!(cp.data && cp.size))return ; -apply_microcode_early_amd (cpuid_1_eax, cp.data, cp.size, false); +early_apply_microcode (cpuid_1_eax, cp.data, cp.size, false); } static enum ucode_state
@@ -816,6 +815,7 @@ static int verify_and_add_patch(u8 family, u8 *fw, unsigned int leftover,return 0 ; } +/* Scan the blob in @data and add microcode patches to the cache. */ static enum ucode_state __load_microcode_amd (u8 family,const u8 *data,size_t size) {
Signature · 1 line
2.35.1
Borislav Petkov
maintainerPATCH 2/2 x86/microcode/AMD: Handle multiple glued containers properly
From: Borislav Petkov <[email protected]>
It can happen that - especially during testing - the microcode blobs of all families are all glued together in the initrd. The current code doesn't check whether the current container matched a microcode patch and continues to the next one, which leads to save_microcode_in_initrd_amd() to look at the next and thus wrong one:
microcode: parse_container: ucode: 0xffff88807e9d9082
microcode: verify_patch: buf: 0xffff88807e9d90ce, buf_size: 26428
microcode: verify_patch: proc_id: 0x8082, patch_fam: 0x17, this family: 0x17
microcode: verify_patch: buf: 0xffff88807e9d9d56, buf_size: 23220
microcode: verify_patch: proc_id: 0x8012, patch_fam: 0x17, this family: 0x17
microcode: parse_container: MATCH: eq_id: 0x8012, patch proc_rev_id: 0x8012
<-- matching patch found
microcode: verify_patch: buf: 0xffff88807e9da9de, buf_size: 20012
microcode: verify_patch: proc_id: 0x8310, patch_fam: 0x17, this family: 0x17
microcode: verify_patch: buf: 0xffff88807e9db666, buf_size: 16804
microcode: Invalid type field (0x414d44) in container file section header.
microcode: Patch section fail
<-- checking chokes on the microcode magic value of the next container.
microcode: parse_container: saving container 0xffff88807e9d9082
microcode: save_microcode_in_initrd_amd: scanned containers, data: 0xffff88807e9d9082, size: 9700a
and now if there's a next (and last container) it'll use that in save_microcode_in_initrd_amd() and not find a proper patch, ofc.
Fix that by moving the out: label up, before the desc->mc check which jots down the pointer of the matching patch and is used to signal to the caller that it has found a matching patch in the current container.
--- arch/x86/kernel/cpu/microcode/amd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +4 -3
@@ -330,8 +330,9 @@ static size_t parse_container(u8 *ucode, size_t size, struct cont_desc *desc) ret =verify_patch (x86_family (desc->cpuid_1_eax), buf, size, &patch_size, true);if (ret <0 ) {/* -* Patch verification failed, skip to the next -* container, if there's one: +* Patch verification failed, skip to the next container, if +* there is one. Before exit, check whether that container has +* found a patch already. If so, use it. */ goto out; }else if (ret >0 ) {
@@ -350,6 +351,7 @@ static size_t parse_container(u8 *ucode, size_t size, struct cont_desc *desc) size -= patch_size +SECTION_HDR_SIZE ; } +out:/* * If we have found a patch (desc->mc), it means we're looking at the * container which has a patch for this CPU so return 0 to mean, @ucode
@@ -364,7 +366,6 @@ static size_t parse_container(u8 *ucode, size_t size, struct cont_desc *desc)return 0 ; } -out:return orig_size - size; }
Signature · 1 line
2.35.1
[tip: x86/microcode] x86/microcode/AMD: Handle multiple glued containers properly
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: ba73e369b706a853cdafa60570854fecec9f9fdd Gitweb: https://git.kernel.org/tip/ba73e369b706a853cdafa60570854fecec9f9fdd Author: Borislav Petkov <[email protected]> AuthorDate: Mon, 19 Dec 2022 22:06:56 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 26 Dec 2022 06:41:05 +01:00
x86/microcode/AMD: Handle multiple glued containers properly
It can happen that - especially during testing - the microcode blobs of all families are all glued together in the initrd. The current code doesn't check whether the current container matched a microcode patch and continues to the next one, which leads to save_microcode_in_initrd_amd() to look at the next and thus wrong one:
microcode: parse_container: ucode: 0xffff88807e9d9082
microcode: verify_patch: buf: 0xffff88807e9d90ce, buf_size: 26428
microcode: verify_patch: proc_id: 0x8082, patch_fam: 0x17, this family: 0x17
microcode: verify_patch: buf: 0xffff88807e9d9d56, buf_size: 23220
microcode: verify_patch: proc_id: 0x8012, patch_fam: 0x17, this family: 0x17
microcode: parse_container: MATCH: eq_id: 0x8012, patch proc_rev_id: 0x8012
<-- matching patch found
microcode: verify_patch: buf: 0xffff88807e9da9de, buf_size: 20012
microcode: verify_patch: proc_id: 0x8310, patch_fam: 0x17, this family: 0x17
microcode: verify_patch: buf: 0xffff88807e9db666, buf_size: 16804
microcode: Invalid type field (0x414d44) in container file section header.
microcode: Patch section fail
<-- checking chokes on the microcode magic value of the next container.
microcode: parse_container: saving container 0xffff88807e9d9082
microcode: save_microcode_in_initrd_amd: scanned containers, data: 0xffff88807e9d9082, size: 9700a
and now if there's a next (and last container) it'll use that in save_microcode_in_initrd_amd() and not find a proper patch, ofc.
Fix that by moving the out: label up, before the desc->mc check which jots down the pointer of the matching patch and is used to signal to the caller that it has found a matching patch in the current container.
--- arch/x86/kernel/cpu/microcode/amd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +4 -3
@@ -330,8 +330,9 @@ static size_t parse_container(u8 *ucode, size_t size, struct cont_desc *desc) ret =verify_patch (x86_family (desc->cpuid_1_eax), buf, size, &patch_size, true);if (ret <0 ) {/* -* Patch verification failed, skip to the next -* container, if there's one: +* Patch verification failed, skip to the next container, if +* there is one. Before exit, check whether that container has +* found a patch already. If so, use it. */ goto out; }else if (ret >0 ) {
@@ -350,6 +351,7 @@ skip: size -= patch_size +SECTION_HDR_SIZE ; } +out:/* * If we have found a patch (desc->mc), it means we're looking at the * container which has a patch for this CPU so return 0 to mean, @ucode
@@ -364,7 +366,6 @@ skip:return 0 ; } -out:return orig_size - size; }
The following commit has been merged into the x86/microcode branch of tip:
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: 61de9b7036f26448a1916291c456f62dd6bf07ea Gitweb: https://git.kernel.org/tip/61de9b7036f26448a1916291c456f62dd6bf07ea Author: Borislav Petkov <[email protected]> AuthorDate: Mon, 19 Dec 2022 22:06:55 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 26 Dec 2022 06:30:31 +01:00
x86/microcode/AMD: Rename a couple of functions
- Rename apply_microcode_early_amd() to early_apply_microcode():
simplify the name so that it is clear what it does and when does it do it.
- Rename __load_ucode_amd() to find_blobs_in_containers(): the new name actually explains what it does.
Document some.
No functional changes.
--- arch/x86/kernel/cpu/microcode/amd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +7 -7
@@ -414,8 +414,7 @@ static int __apply_microcode_amd(struct microcode_amd *mc)* * Returns true if container found (sets @desc), false otherwise. */ -static bool -apply_microcode_early_amd (u32 cpuid_1_eax,void *ucode,size_t size,bool save_patch) +static bool early_apply_microcode (u32 cpuid_1_eax,void *ucode,size_t size,bool save_patch) {struct cont_desc desc = {0 };u8 (*patch)[PATCH_MAX_SIZE ];
@@ -481,7 +480,7 @@ static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family)return false; } -static void __load_ucode_amd (unsigned int cpuid_1_eax,struct cpio_data *ret) +static void find_blobs_in_containers (unsigned int cpuid_1_eax,struct cpio_data *ret) {struct ucode_cpu_info *uci;struct cpio_data cp;
@@ -511,11 +510,11 @@ void __init load_ucode_amd_bsp(unsigned int cpuid_1_eax) {struct cpio_data cp = { }; -__load_ucode_amd (cpuid_1_eax, &cp); +find_blobs_in_containers (cpuid_1_eax, &cp);if (!(cp.data && cp.size))return ; -apply_microcode_early_amd (cpuid_1_eax, cp.data, cp.size, true); +early_apply_microcode (cpuid_1_eax, cp.data, cp.size, true); }void load_ucode_amd_ap (unsigned int cpuid_1_eax)
@@ -546,11 +545,11 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax) } } -__load_ucode_amd (cpuid_1_eax, &cp); +find_blobs_in_containers (cpuid_1_eax, &cp);if (!(cp.data && cp.size))return ; -apply_microcode_early_amd (cpuid_1_eax, cp.data, cp.size, false); +early_apply_microcode (cpuid_1_eax, cp.data, cp.size, false); } static enum ucode_state
@@ -816,6 +815,7 @@ static int verify_and_add_patch(u8 family, u8 *fw, unsigned int leftover,return 0 ; } +/* Scan the blob in @data and add microcode patches to the cache. */ static enum ucode_state __load_microcode_amd (u8 family,const u8 *data,size_t size) {