From patchwork Tue Sep 12 07:58:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 138140 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp366367vqx; Tue, 12 Sep 2023 05:22:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvsJhd1ymhh2H6vog/TC7dJoe5VLvTcqo3EXvTctLLAZnA/rb2MnUKYHGcDZyjDfhy/8Nx X-Received: by 2002:a17:90b:1805:b0:26d:20b8:445d with SMTP id lw5-20020a17090b180500b0026d20b8445dmr9753582pjb.9.1694521360312; Tue, 12 Sep 2023 05:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694521360; cv=none; d=google.com; s=arc-20160816; b=PoJ5jQ0kkVR+I52BxXQQhiVQBqqT/x96wuA+1l3PvWXhFa48QeovyFNWlKaJv/ShQI VDHFymNx82MdbGjU4sUKHs6bno0QRG0Yb1xLqSnUhxuU7rvJ/Tn6oh6eQYYHC6vNn7Z6 Ubtn+bMNlcokBbDziHwXIsCe/CfUp2Rnvbfvj90Vg6Rca7yt9V/E0zyKw2MDyMJEmjzS 566EDjzPXUJhohdyAT7IkMAw7dqVK1FvvHYMo/JKUYaSkguGuT/NfnsIZGSaOTGf5uaI 9LPGOcMt5kMpLVvn/t6zvcIE0OiE+ITeYYk7wY6SLHi09mICtGj/iL9laxswNOb9lrGN acCw== 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=KPQ747hpIr0GFPtwS8ofAyiGhdmmSNrNmfk+STn9gD4=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=GH8QK0p3qgxzlrF7woD+03iAVq0/utXomEqCPZfL757c96tVfAfScSmGZ+UmsW1Jpe hhgHdgcQYAxGgp5B2F2EcbcamKtc5zhUSLVu2bQkyppNQ99iF3FlfY10tnWj2Eaifw5D Ddm+AxYHMRxF19pSeD/fB4GAc8Vn+rqrkT8dJ8XqtYO1Mpsf1EXFjYuttChWcX5gGh+x ozNSdYSgsBFUc4cMiiC9Mp9LGFhNEd8RMVV3/Q+fA2p+nRglBBZapE+Mj/OhA2lIBoiU yAS7Jo73EA3PNhqjbI/O5ZJKAjNGriWnJxLYl6Mmr5hcPayFs3XpbeqsP8s0i9VQJXXb CvjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nupoqRkk; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id oa18-20020a17090b1bd200b002734f48cfd6si7942815pjb.155.2023.09.12.05.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 05:22:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nupoqRkk; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 1516F82AE67A; Tue, 12 Sep 2023 00:59:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232116AbjILH6v (ORCPT + 39 others); Tue, 12 Sep 2023 03:58:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232115AbjILH6h (ORCPT ); Tue, 12 Sep 2023 03:58:37 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC45F198D for ; Tue, 12 Sep 2023 00:58:05 -0700 (PDT) Message-ID: <20230912065501.592043301@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694505484; 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=KPQ747hpIr0GFPtwS8ofAyiGhdmmSNrNmfk+STn9gD4=; b=nupoqRkkIetoIHhWk6H9LzlH8Ne/sqhNyLvsyTVLCVLoZ4eXAX+jW4SRgsh2hJj2QOZrn3 e42tVNYYz7sjbsh4neSV1SA1oBx6K7absoHOn2e2Ni5xj4IYrwrLpB/pBfNRtUbksd2zn8 h/zHZjGsifAzAVA27pYZcAlv7ulSboghyJX7hN1m1KSzDeBFkItCuMLnXuDMhfjNdQ/Plu 0N9SYtPiVsAJdU4d2/5hIAOngZxprsdnz+23SWfA66Raw9bZLtaiRf/d6mwuHSlQt1D3YX 1PcPCLM0pHbtmin1KHFgJkTpS0FfpVaV8d51oB5hKhibVQP9m2mYHQ7PYvyAFg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694505484; 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=KPQ747hpIr0GFPtwS8ofAyiGhdmmSNrNmfk+STn9gD4=; b=2bD5uX3YOs6c2shQYU267D6hgBS7iSzQ+BPkoXbrdUnEV7jL9wwgAurfQLoEg5CZ6B5L7C WMZ2IbwqgdWp7GDg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V3 13/30] x86/microcode/intel: Rework intel_find_matching_signature() References: <20230912065249.695681286@linutronix.de> MIME-Version: 1.0 Date: Tue, 12 Sep 2023 09:58:04 +0200 (CEST) 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, 12 Sep 2023 00:59:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776834429542880910 X-GMAIL-MSGID: 1776834429542880910 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 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; }