From patchwork Sat Aug 12 19:59:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 134968 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1904950vqi; Sat, 12 Aug 2023 14:33:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdWWpqpRJTaN4C0TFL28GDyDRMTLVLeASGMrqY3exohC0Elr5t8FOqucrV0krcR1w4DKMJ X-Received: by 2002:a05:6a00:1996:b0:687:9909:3c78 with SMTP id d22-20020a056a00199600b0068799093c78mr6861253pfl.0.1691876012304; Sat, 12 Aug 2023 14:33:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691876012; cv=none; d=google.com; s=arc-20160816; b=o14ZDjjmJzGA8768Esqg/77pEywZhm9QIUPAw2VwJZEuDwZMWKaPkV/ZapmxbtAToJ 3ZoYTGVeD2B9XRne/UJEEYnS9iqezJymszMjOq8/lYqsphru1+/xodYGh/S7aw7cGqFc tRz8QAGNPMZmksfQTXQRr8xoS6Y93MN1C+ACRw9HVRLaBjnohB+QZs3ziMPCJ0MEFqy7 lEyZbBANpl5lxhYzb/j6Dqt63c92OrWrlDeZr7wu0hOVj4BGcELqEFOhlYJwKRhlfMGK FLAEo0A5zMhmHCsmn9GW75pla1AkGE2kq2yZbG0CNGQSIotJ2fXUwKU9g4Kjs/fCqeZS 0pWQ== 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=rDI1ykgeaxeUMJlpq0aKo/7WMXntCc7/NJHkM9TFISc=; fh=yVae3u0BRTnDkPuniOcxLkA1wgvMDfOA8XxNsc4ELm4=; b=byBWULI3wHY5naYPy+hNAZNOSecYULR3aB89YYS8s+8uBg2WQm+h8cMpQoyI+m7wbF rNqbroHK3oXtqqmfdWyyhxXsr3YCjnwz6tLQcX3xONQ+qQIF6UDOsZ/3ugK7z56U9Xgz 5S4r5hw/MJRZ/mJzVet+3x2PquSsZrA5mdbKhYiywfhQSuo9d8z9ZjIe2/9a6HVwonlU k7EO3iLyiGNlcqXB00cn2WuXQgSygywx/VuaWTRO9iyF7ukyNW50It62BzHYMjTjWrUP 2p837YAPuP0ZGpXzgrARRhD425RfigTReYfa6OYvLCK0akaWMB2WYdlTdmXWWsyXBvtB Gt9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ESEHMgas; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=LWFB0AQX; 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 fj11-20020a056a003a0b00b006875cd0ce87si5544426pfb.396.2023.08.12.14.33.19; Sat, 12 Aug 2023 14:33:32 -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=ESEHMgas; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=LWFB0AQX; 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 S231161AbjHLUGa (ORCPT + 99 others); Sat, 12 Aug 2023 16:06:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230523AbjHLUG1 (ORCPT ); Sat, 12 Aug 2023 16:06:27 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D92291BD1 for ; Sat, 12 Aug 2023 13:05:59 -0700 (PDT) Message-ID: <20230812195728.708313227@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691870348; 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=rDI1ykgeaxeUMJlpq0aKo/7WMXntCc7/NJHkM9TFISc=; b=ESEHMgas6zDqDY1Q70SV3AEf1kfnaElwEZ7nZVWCQ2jwa+IUQMfl1AJmpWBsKVA/CAO3qx +65QuC0aPiePqdwsKp0Nje52wp+8XJ/VGyPc3LtxBUyMzicyAP/5m95if+ww2FIWkuhT7A ALJFmn3HgVT2vB+cBUCTSrBChYCMFIHxxJVSgPnMgsukOgcg1gRDHo+SwUI6sj1Bhoca06 +JAGWDQCmwLhOxPcgr9HCUOMP5tNxL4Pgli+NStl99Ub8hnrycayEMfBAnktVhjILQ95I/ +7ZTQ2V5mJ427wOes8RFCm86u+u3g2uLwRv9BvIq7ILg/c4LhDabHu8eHOW1OQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691870348; 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=rDI1ykgeaxeUMJlpq0aKo/7WMXntCc7/NJHkM9TFISc=; b=LWFB0AQXcLWH4U6txqX5zCIBRJOxtLsNjIsAHcf0vltZm1PZBY/VM3UFXL8zJ0sPOpmZEM e9vD35QS7SIJkyBQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , Ashok Raj , Arjan van de Ven , Nikolay Borisov Subject: [patch V2 20/37] x86/microcode/intel: Rework intel_find_matching_signature() References: <20230812194003.682298127@linutronix.de> MIME-Version: 1.0 Date: Sat, 12 Aug 2023 21:59:07 +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,URIBL_BLOCKED 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: 1774060581280116344 X-GMAIL-MSGID: 1774060581280116344 Take a cpu_signature argument and work from there. Move the match() helper next to the callsite as there is no point for having it in a header. Signed-off-by: Thomas Gleixner --- V2: New patch --- arch/x86/include/asm/cpu.h | 16 +--------------- arch/x86/kernel/cpu/microcode/intel.c | 31 +++++++++++++++++++------------ drivers/platform/x86/intel/ifs/load.c | 2 +- 3 files changed, 21 insertions(+), 28 deletions(-) --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -77,22 +77,8 @@ struct cpu_signature; void intel_collect_cpu_info(struct cpu_signature *sig); -static inline bool intel_cpu_signatures_match(unsigned int s1, unsigned int p1, - unsigned int s2, unsigned int p2) -{ - if (s1 != s2) - return false; - - /* Processor flags are either both 0 ... */ - if (!p1 && !p2) - return true; - - /* ... or they intersect. */ - return p1 & p2; -} - extern u64 x86_read_arch_cap_msr(void); -int intel_find_matching_signature(void *mc, unsigned int csig, int cpf); +bool intel_find_matching_signature(void *mc, struct cpu_signature *sig); int intel_microcode_sanity_check(void *mc, bool print_err, int hdr_type); extern struct cpumask cpus_stop_mask; --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -82,29 +82,36 @@ void intel_collect_cpu_info(struct cpu_s } EXPORT_SYMBOL_GPL(intel_collect_cpu_info); -/* - * Returns 1 if update has been found, 0 otherwise. - */ -int intel_find_matching_signature(void *mc, unsigned int csig, int cpf) +static inline bool cpu_signatures_match(struct cpu_signature *s1, unsigned int sig2, + unsigned int pf2) +{ + if (s1->sig != sig2) + return false; + + /* Processor flags are either both 0 or they intersect. */ + return ((!s1->pf && !pf2) || (s1->pf & pf2)); +} + +bool intel_find_matching_signature(void *mc, struct cpu_signature *sig) { struct microcode_header_intel *mc_hdr = mc; - struct extended_sigtable *ext_hdr; struct extended_signature *ext_sig; + struct extended_sigtable *ext_hdr; int i; - if (intel_cpu_signatures_match(csig, cpf, mc_hdr->sig, mc_hdr->pf)) - return 1; + if (cpu_signatures_match(sig, mc_hdr->sig, mc_hdr->pf)) + return true; /* Look for ext. headers: */ if (get_totalsize(mc_hdr) <= intel_microcode_get_datasize(mc_hdr) + MC_HEADER_SIZE) - return 0; + return false; ext_hdr = mc + intel_microcode_get_datasize(mc_hdr) + MC_HEADER_SIZE; ext_sig = (void *)ext_hdr + EXT_HEADER_SIZE; for (i = 0; i < ext_hdr->count; i++) { - if (intel_cpu_signatures_match(csig, cpf, ext_sig->sig, ext_sig->pf)) - return 1; + if (cpu_signatures_match(sig, ext_sig->sig, ext_sig->pf)) + return true; ext_sig++; } return 0; @@ -272,7 +279,7 @@ static __init struct microcode_intel *sc intel_microcode_sanity_check(data, false, MC_HEADER_TYPE_MICROCODE) < 0) break; - if (!intel_find_matching_signature(data, uci->cpu_sig.sig, uci->cpu_sig.pf)) + if (!intel_find_matching_signature(data, &uci->cpu_sig)) continue; /* Check whether there is newer microcode */ @@ -583,7 +590,7 @@ static enum ucode_state read_ucode_intel if (cur_rev >= mc_header.rev) continue; - if (!intel_find_matching_signature(mc, uci->cpu_sig.sig, uci->cpu_sig.pf)) + if (!intel_find_matching_signature(mc, &uci->cpu_sig)) continue; kvfree(new_mc); --- a/drivers/platform/x86/intel/ifs/load.c +++ b/drivers/platform/x86/intel/ifs/load.c @@ -242,7 +242,7 @@ static int image_sanity_check(struct dev intel_collect_cpu_info(&sig); - if (!intel_find_matching_signature((void *)data, sig.sig, sig.pf)) { + if (!intel_find_matching_signature((void *)data, &sig)) { dev_err(dev, "cpu signature, processor flags not matching\n"); return -EINVAL; }