From patchwork Mon Oct 2 11:59:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1716686vqb; Mon, 2 Oct 2023 15:05:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHEqBAe9VXJC+MbkglAo9tXZ2KY+2dZiGyLUTlzr21MXNIFLMOpGxl1tvetTNWEdoP3tDe X-Received: by 2002:a25:6f82:0:b0:d7f:3e2:dd99 with SMTP id k124-20020a256f82000000b00d7f03e2dd99mr11745215ybc.0.1696284352872; Mon, 02 Oct 2023 15:05:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284352; cv=none; d=google.com; s=arc-20160816; b=hElnCURQ8a8FdQNIJW/G4jxsqWp4aFxUzz2GL70gANZv22h77LxEJIRMxEQmwfgx0+ b88LijA68tKKlLAX6Zf81Jb0MMsFLxbz5GejgzcxsWLGFT08JtAQeCt29h+BYyEbK0fi L1gC2r5rqaLb7Wvz+i093J3DlqFF2LAiETz7DdDDgNpoTVCNqnTf+wuAqCvGxWMbDXny kFoMD5qqGSUJdWVRl3bvBleRjgKYSBGCv0NesfGAbCECuWNzsKU6kLU/448RM4v4jmIW HYv5bPjMjMeRWU3/eP+HLZEF8I4HhgiQKP6ZEUQhZKVOlKvENBOyAXk1JsMvgN6IxdST 0dVQ== 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=Dt8n5QYmGYdfIDIOWLtWGg2rbbk+X3h592xmkedM/uenP89CnzheZ1kqIT0ferjVYR peGYagTHGL2LdxsNzUm8+RUC+epOV0r28vYrOfC/sNy5HoFx996UZSr6DmMgx24j5/BR 1iggO68l6PW9tcp5/PpNo1AkgfOoH0/ikZ8Q0Hg/76vISyBFAFI2vff+QpKHYh4kkSpX a9fu/4167gNlVAXPIUya8p6QL/s1L7UTp7bcjlJaJeX8FPxVh9P0TJlqPfu7tCMD7Roq RV1mWU0NZBUijmQwkWEvw3EPUR6KgiAYyA65birDwYvRLSnav7jD26fvtSIgelYykKlX dfAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=M6WFIiYN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id v1-20020a654601000000b0056a290addadsi28819760pgq.787.2023.10.02.15.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:05:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=M6WFIiYN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 5F4F4810681F; Mon, 2 Oct 2023 05:00:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236870AbjJBL7w (ORCPT + 18 others); Mon, 2 Oct 2023 07:59:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236801AbjJBL7p (ORCPT ); Mon, 2 Oct 2023 07:59:45 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2640594 for ; Mon, 2 Oct 2023 04:59:42 -0700 (PDT) Message-ID: <20231002115902.330295409@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247980; 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=M6WFIiYNitNpNeVRWR4e9icGfTxfl7X7PJ2jb7IanJi0cImW7vVsz3SuuYrbRHb7j5VFEj 1oA6HUsSlSo8WHVRIrOZ4fJ8Zz1iGMqvn3lsoXBIaNBEn2gpPNwsbIwIS3sQbKnHbZzwuw LEELb4A4pN5AhS4xMNXPDN+xJxRtHo7h/OplLi37advCZdNFTjLMsLyCdekSAwu8rs36pI KJqy9IfNNM+3eQ33KyHkXD2VDO/yyGtHouiaI/fZRc2Qxl/NePqLf6/QTgX5UVweJ34dqG M/5TCmklfPQMQdDIvvWP0mwfC7bq3JVeiWKbeTvQWouvcjXyBkYHiF15tkWkMw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247980; 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=aX4n7L/Dl1IYk0IbL488R1dWdaCCNkUgifzHvj4/g5WfBv+2JAt1XyZ2fs7OHZat/5QN15 ElSAn0lduS5ezJBw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 05/30] x86/microcode/intel: Simplify and rename generic_load_microcode() References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:40 +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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778683061410403437 X-GMAIL-MSGID: 1778683061410403437 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);