From patchwork Sat Nov 19 16:24:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 23286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp779994wrr; Sat, 19 Nov 2022 08:26:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf7S/FgBL0cLutKn5d/46TXrbtZ5eaFTl8Z1pFske6GsYDu1II/YYQy8qubk/weZrsIpYD+r X-Received: by 2002:a05:6a00:22ca:b0:56e:64c8:f222 with SMTP id f10-20020a056a0022ca00b0056e64c8f222mr12934299pfj.71.1668875160517; Sat, 19 Nov 2022 08:26:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668875160; cv=none; d=google.com; s=arc-20160816; b=LBrt0hRWHITX6cIIvmyzCwcC249tUH8a7dJDFwbm4WXJx4F4kRLT1SfDmdvYeB3xYx eK8YdZrs9s3rV9lx1zIZGqlGchA9gdYTgvdj2iF4QcImsGjkNuUWSrsUcLnBQS81/9MD VmxiMfX3zlCXkPv7/wQpiBIXQj78AzuFfscohI80yjqlRV7Svf1XeLzxYH34SUFCyvEn pJx6+c+nV3DbUzlceREahDvL3l7kgIGNZ7JYrpM37t17JSkqBU2EDKVilOOhDnMPC/Ae yJpMfDDurTY8DqeNJDYo/Q0juQ8BgTkRp2Ez9ixerd8wjOOD1ulpFv1n5wzCp/jKUYHj Hj3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=y85SXMqNVywsopsLacss/swAPpJRL4GCyhCe1FMYkxg=; b=DRguIJa1j5E0LxHjNy1MfJ8BGLX1QtmZlHAaCQzZBYceknH/CId9Z+NMmyM8AH/UuX JhKSKkEbkjt/JomP84uxZEZ36AF5MfxoK5oZZuNfqXQT2HQDPNWQ28axMTXO03wJd5mE hY3gr8wqVh1cihigULNmk3R22ze0tHJXkZFjR14oQR86HObGmPjvpzYSrAG+O1poKVLB Adb+zIsrwpXkBvNI7IkqXahlwWp8C2R4YtqVDbVPcnb2oYxsVddS+olAJG+NH7Hs1OV+ pYxrM19SPOIisAoSlb14lGPG3oNePbQUo+j+1i2HBE63GPJ6/FyGG7PHA5TjIV8lfAPp vFwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=V961SuXf; dkim=neutral (no key) header.i=@linutronix.de header.b=NZca6g8T; 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 i69-20020a638748000000b0047719d2a77fsi5563612pge.697.2022.11.19.08.25.47; Sat, 19 Nov 2022 08:26:00 -0800 (PST) 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=V961SuXf; dkim=neutral (no key) header.i=@linutronix.de header.b=NZca6g8T; 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 S234604AbiKSQY7 (ORCPT + 99 others); Sat, 19 Nov 2022 11:24:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234091AbiKSQYQ (ORCPT ); Sat, 19 Nov 2022 11:24:16 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CD7D53ECB; Sat, 19 Nov 2022 08:24:13 -0800 (PST) Date: Sat, 19 Nov 2022 16:24:10 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668875051; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y85SXMqNVywsopsLacss/swAPpJRL4GCyhCe1FMYkxg=; b=V961SuXfZEiXXCb6RE8iiSS0Z0B6U7lboAB8Ftmo3KnkQWCGRxjR1YzfJMm4mdZcuyb/+W TqpI43iR5rTFjLjvX9ZJbVfoHS5gGpJR/kMza/QzDhCA0nqHX6ceet1ZyuOP5meouSpW43 tnq8dbfKUhEcm41ODo4otGqVrUSxzF480UjWNhQJkpGTdFxyEoOqkAhBq0wSLnwdQgg4jK 8XfwiNTkrm8gdBMVr74zp3zRTxcW2incbcCUNvWsbgxWGkNw/Bce+lHSlLrvxtgXaaekmG +uInwjIsrPSmx5gXihLlokY2vKJphzhEnuMlRH9UQgNLF4ZeHWL9t35mQROrvg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668875051; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y85SXMqNVywsopsLacss/swAPpJRL4GCyhCe1FMYkxg=; b=NZca6g8T2d8sKb6scuna2T6rmPdcxi3tir8UWCunMcHVKWRRo/EDM2RjrkJ5IWyibYkdt5 mukpf21m/JaDH8CA== From: "tip-bot2 for Jithu Joseph" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/microcode] x86/microcode/intel: Reuse find_matching_signature() Cc: Jithu Joseph , Borislav Petkov , Tony Luck , Ashok Raj , Sohil Mehta , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221117035935.4136738-6-jithu.joseph@intel.com> References: <20221117035935.4136738-6-jithu.joseph@intel.com> MIME-Version: 1.0 Message-ID: <166887505019.4906.12287352480309171663.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749714495743433170?= X-GMAIL-MSGID: =?utf-8?q?1749942440189431471?= The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 716f380275866350ee44447b3c7c999f39c3178d Gitweb: https://git.kernel.org/tip/716f380275866350ee44447b3c7c999f39c3178d Author: Jithu Joseph AuthorDate: Wed, 16 Nov 2022 19:59:24 -08:00 Committer: Borislav Petkov CommitterDate: Fri, 18 Nov 2022 21:50:01 +01:00 x86/microcode/intel: Reuse find_matching_signature() IFS uses test images provided by Intel that can be regarded as firmware. An IFS test image carries microcode header with an extended signature table. Reuse find_matching_signature() for verifying if the test image header or the extended signature table indicate whether that image is fit to run on a system. No functional changes. Signed-off-by: Jithu Joseph Signed-off-by: Borislav Petkov Reviewed-by: Tony Luck Reviewed-by: Ashok Raj Reviewed-by: Sohil Mehta Link: https://lore.kernel.org/r/20221117035935.4136738-6-jithu.joseph@intel.com --- arch/x86/include/asm/cpu.h | 1 +- arch/x86/kernel/cpu/intel.c | 29 +++++++++++++++++- arch/x86/kernel/cpu/microcode/intel.c | 44 ++++---------------------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index b472ef7..e853440 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -95,5 +95,6 @@ static inline bool intel_cpu_signatures_match(unsigned int s1, unsigned int p1, } extern u64 x86_read_arch_cap_msr(void); +int intel_find_matching_signature(void *mc, unsigned int csig, int cpf); #endif /* _ASM_X86_CPU_H */ diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index beb8ca5..c7331ec 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -215,6 +215,35 @@ int intel_cpu_collect_info(struct ucode_cpu_info *uci) } EXPORT_SYMBOL_GPL(intel_cpu_collect_info); +/* + * Returns 1 if update has been found, 0 otherwise. + */ +int intel_find_matching_signature(void *mc, unsigned int csig, int cpf) +{ + struct microcode_header_intel *mc_hdr = mc; + struct extended_sigtable *ext_hdr; + struct extended_signature *ext_sig; + int i; + + if (intel_cpu_signatures_match(csig, cpf, mc_hdr->sig, mc_hdr->pf)) + return 1; + + /* Look for ext. headers: */ + if (get_totalsize(mc_hdr) <= get_datasize(mc_hdr) + MC_HEADER_SIZE) + return 0; + + ext_hdr = mc + 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; + ext_sig++; + } + return 0; +} +EXPORT_SYMBOL_GPL(intel_find_matching_signature); + static void early_init_intel(struct cpuinfo_x86 *c) { u64 misc_enable; diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 8c35c70..c77ec1b 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -48,34 +48,6 @@ static int llc_size_per_core; /* * Returns 1 if update has been found, 0 otherwise. */ -static int find_matching_signature(void *mc, unsigned int csig, int cpf) -{ - struct microcode_header_intel *mc_hdr = mc; - struct extended_sigtable *ext_hdr; - struct extended_signature *ext_sig; - int i; - - if (intel_cpu_signatures_match(csig, cpf, mc_hdr->sig, mc_hdr->pf)) - return 1; - - /* Look for ext. headers: */ - if (get_totalsize(mc_hdr) <= get_datasize(mc_hdr) + MC_HEADER_SIZE) - return 0; - - ext_hdr = mc + 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; - ext_sig++; - } - return 0; -} - -/* - * 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; @@ -83,7 +55,7 @@ static int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev if (mc_hdr->rev <= new_rev) return 0; - return find_matching_signature(mc, csig, cpf); + return intel_find_matching_signature(mc, csig, cpf); } static struct ucode_patch *memdup_patch(void *data, unsigned int size) @@ -117,7 +89,7 @@ static void save_microcode_patch(struct ucode_cpu_info *uci, void *data, unsigne sig = mc_saved_hdr->sig; pf = mc_saved_hdr->pf; - if (find_matching_signature(data, sig, pf)) { + if (intel_find_matching_signature(data, sig, pf)) { prev_found = true; if (mc_hdr->rev <= mc_saved_hdr->rev) @@ -149,7 +121,7 @@ static void save_microcode_patch(struct ucode_cpu_info *uci, void *data, unsigne if (!p) return; - if (!find_matching_signature(p->data, uci->cpu_sig.sig, uci->cpu_sig.pf)) + if (!intel_find_matching_signature(p->data, uci->cpu_sig.sig, uci->cpu_sig.pf)) return; /* @@ -286,8 +258,8 @@ scan_microcode(void *data, size_t size, struct ucode_cpu_info *uci, bool save) size -= mc_size; - if (!find_matching_signature(data, uci->cpu_sig.sig, - uci->cpu_sig.pf)) { + if (!intel_find_matching_signature(data, uci->cpu_sig.sig, + uci->cpu_sig.pf)) { data += mc_size; continue; } @@ -652,9 +624,9 @@ static struct microcode_intel *find_patch(struct ucode_cpu_info *uci) if (phdr->rev <= uci->cpu_sig.rev) continue; - if (!find_matching_signature(phdr, - uci->cpu_sig.sig, - uci->cpu_sig.pf)) + if (!intel_find_matching_signature(phdr, + uci->cpu_sig.sig, + uci->cpu_sig.pf)) continue; return iter->data;