From patchwork Tue Sep 12 07:57:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 138038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp270773vqx; Tue, 12 Sep 2023 02:03:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8XwSmkqnGUfVSWjgSSO7ED3tHKlBuQsnkqeUKL31fBWYBx+ZGFCUxN7nhWAjSxBJsQYyM X-Received: by 2002:a05:6a20:9489:b0:151:991c:84b6 with SMTP id hs9-20020a056a20948900b00151991c84b6mr9511778pzb.59.1694509413786; Tue, 12 Sep 2023 02:03:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694509413; cv=none; d=google.com; s=arc-20160816; b=uKFVWEP4X7+76XpLw6Q0sC0eEDn5t1yC01lnMN7crGRi29Ffl2zAv6qQv5ZkDWbBli QouGUgoh77zVtNUKTVJJKu/snDfvEN6tcU0xsW41J/HJQkfiZOg+im98zu92b+IP/g1N ZWZvsqATo7wdQ5NQ/f/yFb1IgzNLgQqnoKMQ7Sl4pl1u9b3tZZ0nhmNdIFJj5dUY209m ilI0TwATVmFmnItd0KaHh4ooKkzugtn9eh9rKoUB/CoRvrQbBi1LEnbS5TPxQyYMBJPy R15162Jw5upAsQ8hyxSWHLAR4SjSo7UAY0ksxUgKE3ZS4IGfbOGjPxt5ENl6tmybnPAa Lpaw== 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=CN2QFAx6JB0LSmuYjwWY54K/mbyCNDPxFixGJ6298Ak=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=tstBLX35syxFrdQFIelswJKSIZ31dtNcgf+/D5pgD4Rn0gGh2rRPVyW2dbcSCYyIxi bwxQ50wdMPZw7ZGEQeAoXKMaQiCnPzqxv2h0DruNENPOQ423KYJY+v8+1ufBZZsG9LrG 585kcxP8bV9xK+gtd/FGas3dTy49TrvCZ3oHd53MJU7/cYkjjzWVJpYNQZIeN5AfppR0 WHGJ4PH1EPm33kYIFx5rS1DOGOoF2AQnPGs0vwACnIU431d1g3+UrDQc7lozeMjZlYrv 2P8BTDnhE18BDnfNQZ3UYLot/DidTkUIoWD+5VQ5RVSDl68ClgaUNKRCrYxOhK4MC8Ue XqgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=uAr8WVy1; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id q22-20020a637516000000b0055793097dbesi4399798pgc.469.2023.09.12.02.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 02:03:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=uAr8WVy1; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id C5BB081D6D8E; Tue, 12 Sep 2023 00:58:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231953AbjILH6L (ORCPT + 39 others); Tue, 12 Sep 2023 03:58:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231840AbjILH55 (ORCPT ); Tue, 12 Sep 2023 03:57:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5241110C7 for ; Tue, 12 Sep 2023 00:57:53 -0700 (PDT) Message-ID: <20230912065501.070512232@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694505471; 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=CN2QFAx6JB0LSmuYjwWY54K/mbyCNDPxFixGJ6298Ak=; b=uAr8WVy1xauXNH5nuhSyal+A8QHgW32mnXLnA8qqj9qnC/tW9q7qyPd+kr64cS8xNJF9pO SdClBiuM/6yKRIXuoqQpL37qxmzZ3PRxQKEqrn9873CQUSPZA/UOcjbqF2PbvZ+3eUUny7 YhPFv6ByF/mMmiklzweM+2SaiQsewpJ6Srb6g0uSjovyiOXxU22nkAC6ojDxf0UDJB3flZ hwiuOqfqe+eIBAMRbjJ71EETLbzn9PmmB/fd81uPfCrp1XKXkb3UD8ryBxq8L7XG2baqkW KXqKfSE/9l5J+kzo1KI5m2jy72nZwN9S17rZUN9h/DJDqMg+ZuEQhz7UA3IDGg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694505471; 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=CN2QFAx6JB0LSmuYjwWY54K/mbyCNDPxFixGJ6298Ak=; b=6nRRBNKGK0sJ+MDapmUWy//UBZFo5Reef+ccpmE7+rXMuOYlFA9VWYhObWgDhqNvxqSnBA kr4oMi2/mD8HJTCA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V3 05/30] x86/microcode/intel: Simplify and rename generic_load_microcode() References: <20230912065249.695681286@linutronix.de> MIME-Version: 1.0 Date: Tue, 12 Sep 2023 09:57:51 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 12 Sep 2023 00:58:28 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776821903017320193 X-GMAIL-MSGID: 1776821903017320193 so it becomes less obfuscated and rename it because there is nothing generic about it. Signed-off-by: Thomas Gleixner --- V3: Rename to parse_microcode_blobs() - Borislav --- 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 @@ -240,19 +240,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; @@ -561,14 +548,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 parse_microcode_blobs(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; @@ -585,6 +570,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"); @@ -607,16 +593,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); @@ -636,9 +623,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) @@ -687,7 +674,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 = parse_microcode_blobs(cpu, &iter); release_firmware(firmware);