From patchwork Tue Oct 17 21:23:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 154543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4406263vqb; Tue, 17 Oct 2023 14:24:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFSwWt3VZ8nZMIBuOF3cgB1mO5bwgSDnsGwZjHPxaX4dPNhBxzNY/4cx2HEGm0lm89NRqGV X-Received: by 2002:a05:6a21:819b:b0:163:ab09:195d with SMTP id pd27-20020a056a21819b00b00163ab09195dmr3485578pzb.0.1697577861795; Tue, 17 Oct 2023 14:24:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697577861; cv=none; d=google.com; s=arc-20160816; b=iVDhiyYlPJWJ3wpMz3zj05rtYASwYK0VI1tdVoIzNqufzI8znuzUnimYDPt5Nqukh0 7IqLaxR6fs+6gd7CdV5Ey7oR87x2fTPSQmyIOk56F/ibqqLafF/fYJzhnBv8pcoH7ori zTNoY1iQO6PzTBS/SrY4pQhsMAFWMr9gyR4MJwpa2HpjJaHqovjr5cN59ox15p2VHJch s8+vktTTgHLmOP4laItjB1MDtOqeRV8qj9PvrZiTH86aCXt/UyOWGiWgBc4kfAwOpIOA X1eSQkEQ1sRMr6MHRBy4ji6SZ31boOT8bPARQlfEt1xzQZ+iOExFN+koF1aODKMgMBbT 7GDw== 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=MMJwAlnufnTugbYH0GLX9Hz32sw/PBeSLlENs5I63nk=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=SNsT9r3WylwmeN2N4bz6ifBc4ciTBNFx3ETrlHKLDwfvQW4V0d5v6699Okjg5xT89P sDzZciPCuKro5vAKbqzimoDojGKdeAFJ6Vg3HIgsDcaeCD7ZBGAzjWUc78eAjjys4bmG PiqU63pa3Mias9Qo8Q4GTpt6Y1ept0xa2R3aHM3Ur0Neyl68q24r/In/heFhfMdLBjeG RECcPpzcluoMtw86LG3uWdHVFz1VNLSQFBOjUWguBzTbHyjVWmeBgr02moHtcVCI3jRy Tc2uQI1oFlN6nD8BtEEH13sM0DVF9qA8lGgFTO42rfZ44MOfKEEQHfqx4wbkJXnxs6WX N4lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2Hglo9c1; dkim=neutral (no key) header.i=@linutronix.de; 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 q140-20020a632a92000000b00565335587absi596937pgq.802.2023.10.17.14.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 14:24: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=2Hglo9c1; dkim=neutral (no key) header.i=@linutronix.de; 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 21E1180FC738; Tue, 17 Oct 2023 14:24:21 -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 S1344032AbjJQVYA (ORCPT + 21 others); Tue, 17 Oct 2023 17:24:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344105AbjJQVXs (ORCPT ); Tue, 17 Oct 2023 17:23:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10F6F11D for ; Tue, 17 Oct 2023 14:23:37 -0700 (PDT) Message-ID: <20231017211722.460700412@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697577815; 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=MMJwAlnufnTugbYH0GLX9Hz32sw/PBeSLlENs5I63nk=; b=2Hglo9c1PLdOTSD57ZVWf9U/zrM+Vz78bpt1XFMcPMlNHak5HDf5l0IFKvghQsP41RNojf 6YOWYOdcEif8zjTX1S/ReY/hFcVVp7/Bp7geSR0wg65XOnCbQMZLQYX8VYxDMNJsi/zPQk SzR7YTmmGU3jawnrEHbOnyQFoUaJ3JpmCfs2EJYwRqcWqP9O2rTNMuBJnp1f/DYs3vEWYH eVbCu8mVAbOWqlcdC7Md42u1teZkIXjR/9UKowl7tUebfoxF5wtSHDKMv6IdArNCTTP4Aq juXbvO680MIRSbaXpbG+ecQREeXaP6VXT7ScJIfXtdumSchxCH+fIosPL9DoNg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697577815; 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=MMJwAlnufnTugbYH0GLX9Hz32sw/PBeSLlENs5I63nk=; b=pS4ATg72qi8K5z7pkvXoNXj7coalzBHoTl3hv7371cMZEgmz48Mr8kbvZN3k1veeE/EAsU lYbeyFqWEp8/3tBA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch V5 09/39] x86/microcode/intel: Simplify scan_microcode() References: <20231017200758.877560658@linutronix.de> MIME-Version: 1.0 Date: Tue, 17 Oct 2023 23:23:35 +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]); Tue, 17 Oct 2023 14:24:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780039404349859633 X-GMAIL-MSGID: 1780039404349859633 From: Thomas Gleixner 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(-) --- diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 1f45f5c44246..24dd4835d544 100644 --- 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 *data, unsigned int size) 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 CPU's 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, struct ucode_cpu_info *uci, bool save) 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)