From patchwork Mon Oct 2 11:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147258 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1381064vqb; Mon, 2 Oct 2023 05:13:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1DNyzsTPgOWDyXG2bfBaZf6p3PTG5cFgfKLVo+bGpvvOhroWFbJO1FXums40LNJXw8QK1 X-Received: by 2002:a9d:4f15:0:b0:6c0:a95b:44e4 with SMTP id d21-20020a9d4f15000000b006c0a95b44e4mr11403485otl.38.1696248793527; Mon, 02 Oct 2023 05:13:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696248793; cv=none; d=google.com; s=arc-20160816; b=V5B/vmj111VUO9Oe7poP9KeCbIkeUQHhmWnV2SlmEaA+ibzHsd0W2/DVIBHcJDSI3U DxCdG7eKWr6U6e0XJblr75L7JxL6h8FjiolNQrFWmS0r3zpLY/oIxkUCeKUfKHAMxTGP N7pGhXDUDhbbM7VOMDUBOFCfFl/4W9GmCzRA7sTe3cidtsBL6eMV5skFLlhQPfJqXKDn hdLGqK2APz/qBbOslnW16vgxzApzn5jCafJvbAXagmjX1Q3p3zJcq32YGXMZamK+bVdv tZRCaTRMLYniar51CXddpiGVrBYzVwueB7L+mPWJAtVEJsjxCfOvoudjtneW4xynE+CN qSqA== 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=Edjc5SXneM2Y7YATZhugxt5CD7O42zD0vvyDzGON3Qo=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=yqBjkDN1+fKZSTdHI63Qn3TFF4PmLoC8bDy6QXYQOZZki4ze6t4f9BJwX6BxQ76/GR Uv2GRVNR1CaRrxT3SpuixfEZ2/SY8JpKOlMnPVubdvqenMYqNt+x7SGZhLHxAuke9yT0 NyqEFA9UQSZ58WQyXMMqcl9/IPqtMseJaA5zo6hqW07Z4ApskQnn/lqhY5DthTHwE6es H297UdE40xQf8aTRDKSDkCHn2ZanXEZ07ZYgwyHUHm1K5f6MpVReV/ofJXcNqZwX4OOp 3q9Zwt1rffdmUX2lBsXUExGB+GdnQH+cpT3fW7ozuvn40nLwFByyBhuJoUy+qCnBUaNW qzDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FYWBqoSY; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id g123-20020a636b81000000b005775a4a2960si27022859pgc.261.2023.10.02.05.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:13:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FYWBqoSY; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 5504C8030D13; Mon, 2 Oct 2023 05:00:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236897AbjJBMAY (ORCPT + 18 others); Mon, 2 Oct 2023 08:00:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236914AbjJBMAA (ORCPT ); Mon, 2 Oct 2023 08:00:00 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D5861AE for ; Mon, 2 Oct 2023 04:59:52 -0700 (PDT) Message-ID: <20231002115902.797820205@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247990; 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=Edjc5SXneM2Y7YATZhugxt5CD7O42zD0vvyDzGON3Qo=; b=FYWBqoSY5GXWUA06qH9KUcKD01kDPSrjc80iVMpJrUfvNQEP/c+ZB3FgehcCdrXTzy1ElL 1n9Yh1UKCYr8UhVFAmA2pnUoArRGg9g1NziyayhhBCj0MRzVAk8bR5nFMkj41fjwEIlHuy UpNWvNjhb/E3nLXwRvL3G/NkjX0zHtxEvSpKTKvjYARyUjA3TBiWU8hZgPKVIiE064o7uM PAVZZ5hQyC/S4cQC0VdRgLrQHi/2IhtD5KytwArIYpeHkk6Zwn0VOtB+/wqY5ZswTYcc49 LOZhux9cHgACTKuNoQaEuR1nke17mqkcyYQE8kxcRrT0qMQmDU1VKZdbKZwRIw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247990; 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=Edjc5SXneM2Y7YATZhugxt5CD7O42zD0vvyDzGON3Qo=; b=k/iqOT8qBEo9Y7t90O1resES/FxwmjKxD73vqLztEXcR+99XCAF05HAcDqOfdLEHuMa+cu QqHIucSVXLyxw2AA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 13/30] x86/microcode/intel: Rework intel_find_matching_signature() References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:50 +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 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778645774834782418 X-GMAIL-MSGID: 1778645774834782418 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; @@ -265,7 +272,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 */ @@ -502,7 +509,7 @@ static enum ucode_state parse_microcode_ 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; }