Skip to content

Commit

Permalink
x86/microcode: Clarify the late load logic
Browse files Browse the repository at this point in the history
reload_store() is way too complicated. Split the inner workings out and
make the following enhancements:

 - Taint the kernel only when the microcode was actually updated. If. e.g.
   the rendezvous fails, then nothing happened and there is no reason for
   tainting.

 - Return useful error codes

Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Reviewed-by: Nikolay Borisov <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
KAGA-KOKO authored and bp3tk0v committed Oct 24, 2023
1 parent 634ac23 commit 6f059e6
Showing 1 changed file with 19 additions and 22 deletions.
41 changes: 19 additions & 22 deletions arch/x86/kernel/cpu/microcode/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@ static int microcode_reload_late(void)
pr_info("Reload succeeded, microcode revision: 0x%x -> 0x%x\n",
old, boot_cpu_data.microcode);
microcode_check(&prev_info);
add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);
} else {
pr_info("Reload failed, current microcode revision: 0x%x\n",
boot_cpu_data.microcode);
}

return ret;
}

Expand Down Expand Up @@ -399,40 +399,37 @@ static bool ensure_cpus_are_online(void)
return true;
}

static int ucode_load_late_locked(void)
{
if (!ensure_cpus_are_online())
return -EBUSY;

switch (microcode_ops->request_microcode_fw(0, &microcode_pdev->dev)) {
case UCODE_NEW:
return microcode_reload_late();
case UCODE_NFOUND:
return -ENOENT;
default:
return -EBADFD;
}
}

static ssize_t reload_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t size)
{
enum ucode_state tmp_ret = UCODE_OK;
int bsp = boot_cpu_data.cpu_index;
unsigned long val;
ssize_t ret = 0;
ssize_t ret;

ret = kstrtoul(buf, 0, &val);
if (ret || val != 1)
return -EINVAL;

cpus_read_lock();

if (!ensure_cpus_are_online()) {
ret = -EBUSY;
goto put;
}

tmp_ret = microcode_ops->request_microcode_fw(bsp, &microcode_pdev->dev);
if (tmp_ret != UCODE_NEW)
goto put;

ret = microcode_reload_late();
put:
ret = ucode_load_late_locked();
cpus_read_unlock();

if (ret == 0)
ret = size;

add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);

return ret;
return ret ? : size;
}

static DEVICE_ATTR_WO(reload);
Expand Down

0 comments on commit 6f059e6

Please sign in to comment.