From patchwork Mon Oct 2 11:59:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1714033vqb; Mon, 2 Oct 2023 15:01:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHC3UINk4a+qEQUskYZpeS2k84ENSq9DEwHQ5gxZv3qPnmQ4yvadiWYviJTzxBSiDn6g1H5 X-Received: by 2002:a67:fa52:0:b0:452:e1f9:584c with SMTP id j18-20020a67fa52000000b00452e1f9584cmr11401383vsq.29.1696284081628; Mon, 02 Oct 2023 15:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284081; cv=none; d=google.com; s=arc-20160816; b=VlNLvJr3xDukJH+bar/oze4K3GRtwhnoPCOO0WDT1gY59Uc/8l1KyL+XUfJbiBYs6j SwB9sG8wtU9fA2zHGWm1jheYgcxOZvfJnjNVS4NmG/68pH1ZP3+Lar8u/IUtuf+Upscz YVIWA95UAgBgBec64QD1DN13WVy1behueICAVEdXQGFjeudDC+99eSbBJ1JTrexJYnHe oBw9zkdFuyYpv3W5aYNly9PAFTCUcQg2J3MVhFmJBrhhH3T7ixCfNZsTq25uT4gNojIZ QEdo4THZqFtjKdZwzsTxu42lKE/Rvz+oCYf0WGbH8BHHuTX/A2u8LGHOUpTZ2iHpZle4 wOXA== 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=L/ZIAb+b7ujT/LgRBtZ/7/iCkZfP4iPRPUCMdmlZuxA=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=Us0lgBO4aB5nIoDIXhPH/DPOuu0m6bCtMroFQnbfKm9nouP8wGig1pUMviOD3ESCn2 lS/ctY1M8PI5FzEGsjwxGx32fYEGOZ1xJ72T8/aRHSTcbrdK1Cj1CsdB9s9oFotGNmCf ZcynebvJi6aJejedONf9uz3lnVjd7k8iYhQYHJO54lukVYUwF3AN8BvYHNi9D30D0LXo NQANtMlyVFjuJoUSQxhVigJ+00QWYsHWDyGxhcAUKywoRJurNnllqVRRsCIOqFRzh+XA paWt6BzNlkh2A8KDz+zUqJku/+QSr/IgwBpXPGT/Nj+HnYR5AixokraPAcqrdEBkRXH2 WX7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GotJcce1; 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 a63-20020a639042000000b00577f65baa3dsi27004544pge.849.2023.10.02.15.01.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:01:21 -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=GotJcce1; 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 6724981067BE; Mon, 2 Oct 2023 05:00:07 -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 S236876AbjJBL7y (ORCPT + 18 others); Mon, 2 Oct 2023 07:59:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236840AbjJBL7n (ORCPT ); Mon, 2 Oct 2023 07:59:43 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1725D7 for ; Mon, 2 Oct 2023 04:59:40 -0700 (PDT) Message-ID: <20231002115902.271940980@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247979; 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=L/ZIAb+b7ujT/LgRBtZ/7/iCkZfP4iPRPUCMdmlZuxA=; b=GotJcce1G60jQoZRugDQiP6Yfc6kO/d2NZ1uYgSeFKssZQ+5krHSjiB3qNEMl9Of4Avuae gaUM7jSzU6177+3ziaryBYZ5jAfosSPOZixPKzV24PUqhvWjpOuIgHRMQ5ojKOToq0RX2z G+GX/drSIwQD9dEcBxbh5MnhdgQj/19QOX36ms0+TYAyAbbdPVX17xKvzMmKlDYcGtWnhU 82Mg4ihHKzcvpuwHMllO8uk3d+bl21slBL+H1f5h2eD6Rac+bF92Pxs+9uCGxdeDTEG/si izskW2ykRysH2fP2bDKO/rTFLcOlO/7LfZYhllCJ7dkX5k4sJuPATzfZlBmwPg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247979; 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=L/ZIAb+b7ujT/LgRBtZ/7/iCkZfP4iPRPUCMdmlZuxA=; b=ElxZ3wMlEzmtUAPwRQwyP4xuXPrZYckwj6+uQHI200WeRt4b2pNUFxMFICPqUEU7oHuF8V GDoYH4BkCGWUGlBA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 04/30] x86/microcode/intel: Simplify scan_microcode() References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:39 +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:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778682777060467805 X-GMAIL-MSGID: 1778682777060467805 Make it readable and comprehensible. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/intel.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -268,22 +268,16 @@ static void save_microcode_patch(void *d intel_ucode_patch = (struct microcode_intel *)p; } -/* - * Get microcode matching with BSP's model. Only CPUs with the same model as - * BSP can stay in the platform. - */ -static struct microcode_intel * -scan_microcode(void *data, size_t size, struct ucode_cpu_info *uci, bool save) +/* Scan CPIO for microcode matching the boot CPUs family, model, stepping */ +static struct microcode_intel *scan_microcode(void *data, size_t size, + struct ucode_cpu_info *uci, bool save) { struct microcode_header_intel *mc_header; struct microcode_intel *patch = NULL; u32 cur_rev = uci->cpu_sig.rev; unsigned int mc_size; - while (size) { - if (size < sizeof(struct microcode_header_intel)) - break; - + for (; size >= sizeof(struct microcode_header_intel); size -= mc_size, data += mc_size) { mc_header = (struct microcode_header_intel *)data; mc_size = get_totalsize(mc_header); @@ -291,27 +285,19 @@ scan_microcode(void *data, size_t size, intel_microcode_sanity_check(data, false, MC_HEADER_TYPE_MICROCODE) < 0) break; - size -= mc_size; - - if (!intel_find_matching_signature(data, uci->cpu_sig.sig, - uci->cpu_sig.pf)) { - data += mc_size; + if (!intel_find_matching_signature(data, uci->cpu_sig.sig, uci->cpu_sig.pf)) continue; - } /* BSP scan: Check whether there is newer microcode */ if (!save && cur_rev >= mc_header->rev) - goto next; + continue; /* Save scan: Check whether there is newer or matching microcode */ if (save && cur_rev != mc_header->rev) - goto next; + continue; patch = data; cur_rev = mc_header->rev; - -next: - data += mc_size; } if (size)