From patchwork Thu Aug 10 18:37:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 134198 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp647776vqi; Thu, 10 Aug 2023 12:50:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ3+e1bYi53tnRiKZflnt2YWLu9swF8JTyWPmQhE3+d4NkuLjNwSP7nGo1iAWSfrLAIsXh X-Received: by 2002:a2e:9b45:0:b0:2b6:a22b:42dc with SMTP id o5-20020a2e9b45000000b002b6a22b42dcmr2888ljj.16.1691697044420; Thu, 10 Aug 2023 12:50:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691697044; cv=none; d=google.com; s=arc-20160816; b=NxA+5YH75/P/7d6Y1Q9Zt89W+BJHnzhgfsH49dpFwYhDmnCnm1SCGjQ/IGHfaah5o9 GQ+D4XQ5deWFaauENJ9FN7neE1migCsucQ49Xgr0jt+KtKNfNGqpigQrqNirJW79Rmsc okXyqutNnVE7i/5lSst0wAJU3bYvkpDbhdpPUmN1QynvMErkFaRqorErCltRj45BU7ZL RfT131JKiNtFq0m0+QufVqoDRskWR3lw54QDTr251Sin6ZOJ+H0asmfD81j7tpDrTUhY LvZpMDpFFaXlF7owYGriP2+vzobsEGCFaq4V7BJYZVaBA0/0v6bkBVmJjsKOZI9+zbb7 slDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=uWV1AnK66aJ45IpQqDrjl0snIk0PFjfM1jJpRITU7kE=; fh=Vp72a/EEov1VOHpGPkCjAnDQEmhhYrQPa+PSfT8H2jQ=; b=jaQ9MFBA3dHf2EjR42oW/3qjQTWfvey4DiTL+sdJXS7OSVRAGXhP7FLyWQ9QaN6yCX O6LZEC3zs9j4wb6za+joNN54m58HaGyH5YA4ICMbQq4BCGfS7vapt7TSQj9TMgXhdAPT LFcde6UEpZDmGHBa7+lZsqWcP2AtFG/QNrVbCgP0UseYURulyvttOnBAsdYPAUEziADP Lj+rRBi3nVGaK/KfZ9ufoopkzAr0yZXzp+jK1qVAKr6r2ieJYcn6jAcnEU6FQfkDJ4vP g9gdcZqT2ktq6Vq5J4yC+IZRBG7o2LgOSNHQKuSVU6mwQR1tOIBL2s3OH3lzxt1AyIO+ wBzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VjB4d83+; dkim=neutral (no key) header.i=@linutronix.de header.b=ehzq3ip8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b13-20020a1709065e4d00b0099a1f78de48si1975299eju.638.2023.08.10.12.50.19; Thu, 10 Aug 2023 12:50:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VjB4d83+; dkim=neutral (no key) header.i=@linutronix.de header.b=ehzq3ip8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235870AbjHJSiP (ORCPT + 99 others); Thu, 10 Aug 2023 14:38:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235865AbjHJSiB (ORCPT ); Thu, 10 Aug 2023 14:38:01 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0068A3585 for ; Thu, 10 Aug 2023 11:37:45 -0700 (PDT) Message-ID: <20230810160805.655551122@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691692664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=uWV1AnK66aJ45IpQqDrjl0snIk0PFjfM1jJpRITU7kE=; b=VjB4d83+qGsxayaMcW67CC34Wp6v6LB8yGlMmcmxPaQgML0Q3Lo0U+qvSjxL1NqG4AqgTP A8RMQa3Hu9Snq/tvUkQ4wep/EQVW8YesFYze+3RTidOaMIjvDo2laC3bqWzpcy+Tm+FUk3 79pUjSFLA1qVBPAep0EWdjeuPUxZ7fqTYiXMwTqvKmn2i7s8pxWqWLNOgPT4Ee+Csrc/zN Q1QnU0l/L+RqjbR74s1bBpOBVNSTWZrzJ4XTmSUgoakpv1+ZVjXxlEMkiBzSPJToSBqhH5 u1FiibSmDEj9pFnsmrkgtZmGQ+G5Tip9NbkV3UUBMEPeT5EVq/BkGobBC5xU+w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691692664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=uWV1AnK66aJ45IpQqDrjl0snIk0PFjfM1jJpRITU7kE=; b=ehzq3ip81m4NMQ0v9I9XcNeXSz6ZsjWKcGdMVYeLNkghzKJ/yjWj7B3X/N4sRNWvDvv4H3 tisIObZBOnSoWvAw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , Ashok Raj , Arjan van de Ven Subject: [patch 12/30] x86/microcode/intel: Simplify and rename generic_load_microcode() References: <20230810153317.850017756@linutronix.de> MIME-Version: 1.0 Date: Thu, 10 Aug 2023 20:37:43 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773872919781055140 X-GMAIL-MSGID: 1773872919781055140 so it becomes less obfuscated and rename it because there is nothing generic about it. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/intel.c | 47 ++++++++++++---------------------- 1 file changed, 17 insertions(+), 30 deletions(-) --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -212,19 +212,6 @@ int intel_microcode_sanity_check(void *m } EXPORT_SYMBOL_GPL(intel_microcode_sanity_check); -/* - * Returns 1 if update has been found, 0 otherwise. - */ -static int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev) -{ - struct microcode_header_intel *mc_hdr = mc; - - if (mc_hdr->rev <= new_rev) - return 0; - - return intel_find_matching_signature(mc, csig, cpf); -} - static void save_microcode_patch(void *data, unsigned int size) { struct microcode_header_intel *p; @@ -617,14 +604,12 @@ static enum ucode_state apply_microcode_ return ret; } -static enum ucode_state generic_load_microcode(int cpu, struct iov_iter *iter) +static enum ucode_state read_ucode_intel(int cpu, struct iov_iter *iter) { struct ucode_cpu_info *uci = ucode_cpu_info + cpu; unsigned int curr_mc_size = 0, new_mc_size = 0; - enum ucode_state ret = UCODE_OK; - int new_rev = uci->cpu_sig.rev; + int cur_rev = uci->cpu_sig.rev; u8 *new_mc = NULL, *mc = NULL; - unsigned int csig, cpf; while (iov_iter_count(iter)) { struct microcode_header_intel mc_header; @@ -641,6 +626,7 @@ static enum ucode_state generic_load_mic pr_err("error! Bad data in microcode data file (totalsize too small)\n"); break; } + data_size = mc_size - sizeof(mc_header); if (data_size > iov_iter_count(iter)) { pr_err("error! Bad data in microcode data file (truncated file?)\n"); @@ -663,16 +649,17 @@ static enum ucode_state generic_load_mic break; } - csig = uci->cpu_sig.sig; - cpf = uci->cpu_sig.pf; - if (has_newer_microcode(mc, csig, cpf, new_rev)) { - vfree(new_mc); - new_rev = mc_header.rev; - new_mc = mc; - new_mc_size = mc_size; - mc = NULL; /* trigger new vmalloc */ - ret = UCODE_NEW; - } + if (cur_rev >= mc_header.rev) + continue; + + if (!intel_find_matching_signature(mc, uci->cpu_sig.sig, uci->cpu_sig.pf)) + continue; + + vfree(new_mc); + cur_rev = mc_header.rev; + new_mc = mc; + new_mc_size = mc_size; + mc = NULL; } vfree(mc); @@ -692,9 +679,9 @@ static enum ucode_state generic_load_mic save_microcode_patch(new_mc, new_mc_size); pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n", - cpu, new_rev, uci->cpu_sig.rev); + cpu, cur_rev, uci->cpu_sig.rev); - return ret; + return UCODE_NEW; } static bool is_blacklisted(unsigned int cpu) @@ -743,7 +730,7 @@ static enum ucode_state request_microcod kvec.iov_base = (void *)firmware->data; kvec.iov_len = firmware->size; iov_iter_kvec(&iter, ITER_SOURCE, &kvec, 1, firmware->size); - ret = generic_load_microcode(cpu, &iter); + ret = read_ucode_intel(cpu, &iter); release_firmware(firmware);