From patchwork Tue Oct 10 15:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 150838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp271944vqb; Tue, 10 Oct 2023 08:09:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGtuHUMSY9hHDgdBoo7PpK2QKAlhM8kG5G5O59r2qmla5tZjl0A83TwFIcLn5PiXaYttBv X-Received: by 2002:a05:6a00:14c8:b0:68f:dcc1:4bef with SMTP id w8-20020a056a0014c800b0068fdcc14befmr25146691pfu.7.1696950556329; Tue, 10 Oct 2023 08:09:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696950556; cv=none; d=google.com; s=arc-20160816; b=KTHvhz2iZKPHnaHEZ43eg2aam7+iAzxaLqnjIb0pyOSsh1R3ZqQxiWWqoY9v0Ca9EN Nq9B+BYb884ZLgurxK7Rk4cGavxxMaemfjzLgnuaRCRPRFNeAZv3GMNCBKgvaAqc78FP csyOWPs0szfZV/jgJYdLcrKETAAV5BBfKg64pOzUy7QL79qr1PJR16mYH2KLbFr5aQcI wtZnngXyzFwMCpFAMkpD9vjdoJdMy6rzbuS19KMZIwcs/AZnEnwipAOCYgTUnRLRbk0Q g1KFtzyaHyvzRiGdbcL9izS+635g79LQWWD9oUPVvTi10fvTT/0BKv5uQMQ3YG9shHhV BHnA== 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=/dRmcfKTBD1nPb/bBtlpyqt18JVyxAdIVX4toDGASiY=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=GCQQcpqT+A0F6qxjKlJ5YN8pIFI8JTcqBhGqVUIk6d7LzeYn/30PP0JoT7h5koxceL BDXBh2i/yzqA3bjgYxeJ93bP5i2VPtFrucPfcl1bUdWKDSGpVBwpnAvIsZo/zqkvCf5d LuVgBQZkUfXLcNq+A6iBHppwGnuW7iqljdRCwD1yzTUv/Mhqlx7nVTvjJDKV0bDN8+bQ yOMdqQVNPiEfHB63X9TjCjsus9gEu/sjFyUCPOdWDxM4ZqUALBLfEEoqu9xLlI0zgPwk 6HEYB2XgMCFMlFzTw1DALGX2eM/mv2Q+Ia6wKh5SP0cTG9j4bo+bxjnXHK3sejb6cxI2 5F/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DzcjhKje; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id x27-20020a056a00189b00b0068e47f319d9si10126153pfh.280.2023.10.10.08.09.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 08:09:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DzcjhKje; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 2F0C68167DA1; Tue, 10 Oct 2023 08:09:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233381AbjJJPI4 (ORCPT + 20 others); Tue, 10 Oct 2023 11:08:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233294AbjJJPIv (ORCPT ); Tue, 10 Oct 2023 11:08:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E8F9B7 for ; Tue, 10 Oct 2023 08:08:45 -0700 (PDT) Message-ID: <20231010150702.433454320@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696950522; 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=/dRmcfKTBD1nPb/bBtlpyqt18JVyxAdIVX4toDGASiY=; b=DzcjhKjec/HHmzId8VVPKDDwwFMm/I+4Yd/trZfPPuxIgG+eObrHAnLgf0/u2vF2ZJoSJ1 xqqmNksAUH2KKabDwfwHcceeYK9fDzwvc7QxQqOxkR4LtLQRq6c9gdpOKVspbQq7nEZYPV h58lNiXIQGpkHkmBi5T/lVX+phVETaWnmodWj7dstXfMboi1lk7SyBiyoZQb6/xvgwJ7Sl 66XmQFXS0wnfJPjLAuK14jws7qITYQ/URCZyTF82JJFyLQRXQLPcsWU6mmZrWGBwvKVETF Dic3its1C/wUQpG88IbFXkXOP4kFsWZ1ItzKRXREtZWzlgD1skc4S6K55IugAg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696950522; 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=/dRmcfKTBD1nPb/bBtlpyqt18JVyxAdIVX4toDGASiY=; b=IGTbKaraLoDpbolKmIG2d1HTGDgUpBWIx+aPe56XLk/PWuYYQEMayKIqnWQR1A4s8uUGdu DN/k2H6kz754k4BQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch 1/5] x86/microcode/amd: Use correct per CPU ucode_cpu_info References: <20231010145130.987300357@linutronix.de> MIME-Version: 1.0 Date: Tue, 10 Oct 2023 17:08:41 +0200 (CEST) X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Tue, 10 Oct 2023 08:09:10 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779381626905443552 X-GMAIL-MSGID: 1779381626905443552 find_blobs_in_containers() is invoked on every CPU but overwrites uncoditionally ucode_cpu_info of CPU0. Fix this by using the proper CPU data and move the assignment into the call site apply_ucode_from_containers() so that the function can be reused. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/amd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -503,9 +503,6 @@ static void find_blobs_in_containers(uns if (!get_builtin_microcode(&cp, x86_family(cpuid_1_eax))) cp = find_microcode_in_initrd(ucode_path); - /* Needed in load_microcode_amd() */ - ucode_cpu_info->cpu_sig.sig = cpuid_1_eax; - *ret = cp; } @@ -513,6 +510,9 @@ static void apply_ucode_from_containers( { struct cpio_data cp = { }; + /* Needed in load_microcode_amd() */ + ucode_cpu_info[smp_processor_id()].cpu_sig.sig = cpuid_1_eax; + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return; From patchwork Tue Oct 10 15:08:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 150837 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp271896vqb; Tue, 10 Oct 2023 08:09:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrGU1AQqqik+89lfCDYdtlvlCQagVLyIvZL51Hk6QUg0bt2/TkQPCuwBrQ3O9g4Qd3IzVn X-Received: by 2002:a17:902:e881:b0:1c4:4c10:6ae3 with SMTP id w1-20020a170902e88100b001c44c106ae3mr21458480plg.23.1696950552981; Tue, 10 Oct 2023 08:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696950552; cv=none; d=google.com; s=arc-20160816; b=hLfWfCn0MAPKPJebrbqwB27HHDdUuxbNC0DzRRTijUMgr110J5tGWaaTlBiHtVFb5b BEVYhgfxO/0L0Fim43+uln+UDjJ3WdF/2OBbIAblXJWDVos59dzKkbnq+H3JBC8OOm5s qv1/f2LfybRo8iGdg2LEO3fjD0rpTLxDSMwa6Zqnqjov76gJ1MG5ksjBaBL/WBLUGcTn X7v/Omw233083Io4PkHuxK9x/bVEjCPEa/epYebh80KdnxfJLvI4pD3rF2XUCgXVGMfm 3K6LTy/oucr03Yg+8qs2QCFHwJGZ1TrbdtnoyrkrGnwEh6Zhx5cgXcPKoSR1eyvcTkZF dzGA== 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=/T+TzF884nNOcfjx73gfiSU4BbvmUfK//JWS9uWIFHE=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=GSqbI3E3qdqD5+U/rezBeAbWZuFHBNQtbw36YTwjY9/t9qV2mHxb+AyqcqML3OTx2o uZ7s/QtmrSxiOE0B62CuHW7B1xbYtIsJqNk8I9XbRO+igXwv8rCLh9YptjqvAeOEGFSb RghqctemTXv8lVWtX34hYKeKys3h1W5YC2JL9TaplbUYi0oXAzzEXj9mhSnsXPE6mVml 9NapdhWp4IEMXKlh8zzojln+Ei4kMFlI7XsJHHJhg94XFxCFDqNtJGoOKBx+9cL2FEOL KaS5kpKGrr4xVQdJPbMjQc9PPeAO9Gtno7dHEHTU3UYvJjvbdDIUJuQSIZ0PJeB7Q+e0 gx0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=UjYOvh2V; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id g17-20020a170902d1d100b001c6240dec44si11371030plb.389.2023.10.10.08.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 08:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=UjYOvh2V; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 0E84881FD9EF; Tue, 10 Oct 2023 08:09:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233313AbjJJPIw (ORCPT + 20 others); Tue, 10 Oct 2023 11:08:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232771AbjJJPIu (ORCPT ); Tue, 10 Oct 2023 11:08:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05F3DB6 for ; Tue, 10 Oct 2023 08:08:45 -0700 (PDT) Message-ID: <20231010150702.495139089@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696950523; 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=/T+TzF884nNOcfjx73gfiSU4BbvmUfK//JWS9uWIFHE=; b=UjYOvh2VC6Qb27nBg0v5biPxpMwuhhQtZW6sc/vHworpZJWFUmmL1xs9xvUH5Q7bHov+Zo O3EJUgZCFv6JsmVenu4muN+hwxmC85oC3XUv7fkZsVczJLGNIMfk1XTDS0pAMdjAN7Yvij OmZnp1tPOnaS1iQ1qsXgvKxViMY08SlnC8qIpY+RQSOeM/GpF+JH/VCXfZroj0Z/A7ORnV gxPx0OCySchgvDvdY76I/W01PuvoDGvhoNOObe6g4yNn9jI/umpJBw+PU7RqG8zBxC1EAt 3d1JcXusqK36cWnu+DJ1uAUOVNSRfeDI9+0AUki/3WHM/zX62Xra6CAiklthbA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696950523; 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=/T+TzF884nNOcfjx73gfiSU4BbvmUfK//JWS9uWIFHE=; b=Npgb09TuRPXz3VxOCdmN5TGC1qv8YH6pOzkUvF9voFqfDFS3bOjGpYBkfQhKqzucwwSUlV LhtveAMaQLv5t4AA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch 2/5] x86/microcode/amd: Cache builtin microcode too References: <20231010145130.987300357@linutronix.de> MIME-Version: 1.0 Date: Tue, 10 Oct 2023 17:08:43 +0200 (CEST) X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Tue, 10 Oct 2023 08:09:09 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779381622971381231 X-GMAIL-MSGID: 1779381622971381231 save_microcode_in_initrd_amd() fails to cache builtin microcode and only scans initrd. Use find_blobs_in_containers() instead which covers both. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -533,7 +533,7 @@ int __init save_microcode_in_initrd_amd( enum ucode_state ret; struct cpio_data cp; - cp = find_microcode_in_initrd(ucode_path); + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return -EINVAL; From patchwork Tue Oct 10 15:08:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 150836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp271875vqb; Tue, 10 Oct 2023 08:09:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEf3fZOaZTrPFXUGvgKuuCHt4D6sm6HRK9zVYYAgJE6Z1MtA7vVvfqx8hzxVw9yQSYNchbS X-Received: by 2002:a17:902:ec8c:b0:1bf:6ad7:2286 with SMTP id x12-20020a170902ec8c00b001bf6ad72286mr11107841plg.43.1696950552162; Tue, 10 Oct 2023 08:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696950552; cv=none; d=google.com; s=arc-20160816; b=usPYET5NdtIy7kdSZwWmL0kCTFAD3vE9t66G6/llAHCpnCVmtfTPHpdoyVmtI2XaNy dr6WlrJdizzHnbu1hKofyb3hp/W+F+/gGO16Essq7cpfUg1Xr9qsB9HIiolSyc/koff7 Hg/3G5yVYkKT2JRuTzOVhaH9SaKpMv/eUaiF90w8Cu5P+R87CqswrxoIgiV7f59JiGL9 jjBcUOqJkPq7XUIgEsloQ97yBVgJjXkO6Oxndv76tU8X1JnHhZWecVxrOp2FyQcii8a4 lw5Q+qKdIhVXbaOn4er1nt8BQC0PQDgRe/qVdWpMFRJubp06mxWuYpbCd4V50krygC2F jLKA== 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=g/Yygr9A2Il7UvnXxciW5CWUkAO8Yu2F0f5qpSzvguA=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=cf3+rt7KlprKy90Xx5CBIsVCYbLcqy5d2ao79Nhbj1EeDFT64K16YlA5tctTwTrgb6 j70J7NoNYRcyHe7ZeW/zyfXhKHcNvQVrW0RQ92ue1t7kvmCkcAmLtZOZJVtsE/MxaNDb TL9bldQq4AGSHAxTvZJCDqbS6aZeVJ7xmKsMu0uubwgiA2gg2GgdIS5fdnpQRZ97pgp0 DJ00YPXIgV0hInhit9fD5+Um0phiD0CUF3Hsj0hfGRch04GIA0yEvAHmh+yBbey9el62 N71OcONz+334WqPU/1CA48lazXFG045hEORCk2EZwdnRr8hqbafl9XyWottZZ5eSaesS KZjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=144ei3Nn; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u8-20020a1709026e0800b001c60de17b5esi11655452plk.118.2023.10.10.08.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 08:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=144ei3Nn; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 106508024567; Tue, 10 Oct 2023 08:09:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233408AbjJJPI6 (ORCPT + 20 others); Tue, 10 Oct 2023 11:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233293AbjJJPIv (ORCPT ); Tue, 10 Oct 2023 11:08:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 643FCB8 for ; Tue, 10 Oct 2023 08:08:46 -0700 (PDT) Message-ID: <20231010150702.551141238@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696950524; 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=g/Yygr9A2Il7UvnXxciW5CWUkAO8Yu2F0f5qpSzvguA=; b=144ei3NnW+bCXOx31fsFaFPjODLcJ4BuZdguAbxZW8FQayQc/LZ65jfFRGFxy9LSHIJnrM BFo+VFyKc1EkoNbJd7wIk8cAkw93McVCL9JOqnXwSbjrZcI2prCs6fb/4hi4kiXY55IAeP QS5MhbJA/3SW9UOyxP44jFQpMoIQmI39ZdfT2F3xQrPEDAeaECqfQGRdR5wBDOd6lX6rlN iDSgal6RFT9Oyyw0z4G7PgIQ2idJRBZ4ZTYEBKtcc/s1I9pma+SASf9ZZlGVFRjJj6pJkq q/0vESVJ6N3jTrC1iRXCbnp8zjd+56hFP44f5YLtVC2fpmguHFllgpakwWFEvQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696950524; 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=g/Yygr9A2Il7UvnXxciW5CWUkAO8Yu2F0f5qpSzvguA=; b=XkO1cBpyl7r/ik0f1fyWT5d2N0ZgKCx1IcXv18nXfhCEIR4nrDbwDs4gRdkcdMMSz1BVYS DDs0KgiruzBzwfCQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch 3/5] x86/microcode/amd: Cache builtin/initrd microcode early References: <20231010145130.987300357@linutronix.de> MIME-Version: 1.0 Date: Tue, 10 Oct 2023 17:08:44 +0200 (CEST) X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Tue, 10 Oct 2023 08:09:08 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779381622239991736 X-GMAIL-MSGID: 1779381622239991736 There is no reason to scan builtin/initrd microcode on each AP. Cache the builtin/initrd microcode in an early initcall so that the early AP loader can utilize the cache. The existing fs initcall which invoked save_microcode_in_initrd_amd() is still required to maintain the initrd_gone flag. Rename it accordingly. This will be removed once the AP loader code is converted to use the cache. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/amd.c | 8 +++++++- arch/x86/kernel/cpu/microcode/core.c | 20 ++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -527,12 +527,17 @@ void load_ucode_amd_early(unsigned int c static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size); -int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax) +static int __init save_microcode_in_initrd(void) { + unsigned int cpuid_1_eax = native_cpuid_eax(1); + struct cpuinfo_x86 *c = &boot_cpu_data; struct cont_desc desc = { 0 }; enum ucode_state ret; struct cpio_data cp; + if (c->x86_vendor != X86_VENDOR_AMD || c->x86 < 0x10) + return 0; + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return -EINVAL; @@ -549,6 +554,7 @@ int __init save_microcode_in_initrd_amd( return 0; } +early_initcall(save_microcode_in_initrd); /* * a small, trivial cache of per-family ucode patches --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -185,24 +185,13 @@ void load_ucode_ap(void) } } -static int __init save_microcode_in_initrd(void) +/* Temporary workaround until find_microcode_in_initrd() is __init */ +static int __init mark_initrd_gone(void) { - struct cpuinfo_x86 *c = &boot_cpu_data; - int ret = -EINVAL; - - switch (c->x86_vendor) { - case X86_VENDOR_AMD: - if (c->x86 >= 0x10) - ret = save_microcode_in_initrd_amd(cpuid_eax(1)); - break; - default: - break; - } - initrd_gone = true; - - return ret; + return 0; } +fs_initcall(mark_initrd_gone); struct cpio_data find_microcode_in_initrd(const char *path) { @@ -895,5 +884,4 @@ static int __init microcode_init(void) return error; } -fs_initcall(save_microcode_in_initrd); late_initcall(microcode_init); From patchwork Tue Oct 10 15:08:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 150835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp271803vqb; Tue, 10 Oct 2023 08:09:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXUr2Oo/dEprIx6bt1+eeU0YqCR6j0ekdK3+TKbk4OZ3JlFaIuNqBXjMUXWeXsJiZRUhNQ X-Received: by 2002:a05:6358:e49e:b0:15c:e2c9:d1ca with SMTP id by30-20020a056358e49e00b0015ce2c9d1camr22553533rwb.1.1696950546868; Tue, 10 Oct 2023 08:09:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696950546; cv=none; d=google.com; s=arc-20160816; b=MvdwumXNlK25WXRHtLSlM/GevvdzqKnWT6tObiU2ZFZEo04S+LFP3Aj4nWD1yKmaAd re9zUOq/IwlHPZfmzytfrS7u8XK2/MISjFw6lQilCw+GaD5LOFrdmg4gaONDTSb6mj3B Vay8udFfIR9Zd9NDxvsr7KxB9YqKgVehMrDxs7UohTgyU1kYAyS2BfubK2jdtx2VsZba HnEJ3/QQ1Zi1PB74WpFS2rF4CJcxvViPT4oGdK4722mwl7eCF2kyxIGdkGEt4AjulDuF 5HeVPdgJYB8h690x+4DYsFYNposEyMpRgCYmNksHnY6C6FOtVddnEaKUz72xEDpUAbA1 +isw== 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=t0IcpvLhad8KFsm8A/vXcS685lwQ2BubUPwtUH49A0A=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=EpxYtKjQfChQioR5kmldMx4o7NhnpKhj7omPzUCdTN3o6EbYQmNv6mO7L1AGoF9XIY tY958XsZMqp9K6EYML6fdtUhjggE83IdDLLwnKmJn4DAOeO8PhbAhLoUWqpoj+f7yMAR jo7jXEwWrErRiCMUFOQyh0u+eRE98uz36BlrbcPam4PwNGi1e8OoMUOMGjh/2PYYDboP 5YrCJ39J9Kfhgn1c9e4Zf85ZAXamyYRLTmLHk1FNNjNPn8vEbMugbhXMNEUvVWfQNx6k +SR8M4YpTuAPZ7QguJWbjrIBaYQugJg2Yw/rzlf6kUp94QNxVkICtbq902uWFbE2t8ye Jmww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YeLPjQGz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NkF8O8yd; 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 k37-20020a634b65000000b005652bd27e80si12000584pgl.588.2023.10.10.08.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 08:09:06 -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=YeLPjQGz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NkF8O8yd; 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 7D22680417DB; Tue, 10 Oct 2023 08:09:03 -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 S233341AbjJJPIy (ORCPT + 20 others); Tue, 10 Oct 2023 11:08:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233240AbjJJPIu (ORCPT ); Tue, 10 Oct 2023 11:08:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7267D93 for ; Tue, 10 Oct 2023 08:08:47 -0700 (PDT) Message-ID: <20231010150702.606691031@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696950525; 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=t0IcpvLhad8KFsm8A/vXcS685lwQ2BubUPwtUH49A0A=; b=YeLPjQGzO30pqfs82S6WkphU4cPRx9OxHauEEpFZAEsberhwcFY2WbiV//Z/WLUvM7+D3w q5H6iiOf+zXGMTiqvihrBchAF7Yih6fHlPJlvsRAB9hbi5UGLLpjTrUz/hFhekh2rcFZLQ knUGZj+9RUcNbcZUud5vKbIvdd1Pey+JH8q0CuFVz0dop+8lK6Xh5QojLjz2BYC3jBHfe5 pj/epnmqP63XcAdirJdlPCvrWVCBGjyNbI0vquMUfaieDtGXQFaxDN2Ytl/5nZyUPXFzw8 9wJ0P9jabCz0nYy08Zl8MARJIpOdVNHELTkZRQTiJbavwu1qyD3oSbeDn3jPeg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696950525; 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=t0IcpvLhad8KFsm8A/vXcS685lwQ2BubUPwtUH49A0A=; b=NkF8O8ydvZvVzah70iFyiWGa/+4tmn/Pn9r0lhEnV78FI9SD0U8zSau/8SB8etkOzhIx2O Y778RGSRJhE1WUAQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch 4/5] x86/microcode/amd: Use cached microcode for AP load References: <20231010145130.987300357@linutronix.de> MIME-Version: 1.0 Date: Tue, 10 Oct 2023 17:08:45 +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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 10 Oct 2023 08:09:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779381616525152662 X-GMAIL-MSGID: 1779381616525152662 Now that the microcode cache is initialized before the APs are brought up, there is no point to scan builtin/initrd microcode during AP loading. Convert the AP loader to utilize the cache, which in turn makes the CPU hotplug callback which applies the microcode after initrd/builtin is gone obsolete as the early loading during late hotplug operations including the resume path depends now only on the cache. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/amd.c | 20 +++++++++++--------- arch/x86/kernel/cpu/microcode/core.c | 15 ++------------- arch/x86/kernel/cpu/microcode/internal.h | 2 -- 3 files changed, 13 insertions(+), 24 deletions(-) --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -496,7 +496,7 @@ static bool get_builtin_microcode(struct return false; } -static void find_blobs_in_containers(unsigned int cpuid_1_eax, struct cpio_data *ret) +static void __init find_blobs_in_containers(unsigned int cpuid_1_eax, struct cpio_data *ret) { struct cpio_data cp; @@ -506,12 +506,12 @@ static void find_blobs_in_containers(uns *ret = cp; } -static void apply_ucode_from_containers(unsigned int cpuid_1_eax) +void __init load_ucode_amd_bsp(unsigned int cpuid_1_eax) { struct cpio_data cp = { }; /* Needed in load_microcode_amd() */ - ucode_cpu_info[smp_processor_id()].cpu_sig.sig = cpuid_1_eax; + ucode_cpu_info[0].cpu_sig.sig = cpuid_1_eax; find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) @@ -520,11 +520,6 @@ static void apply_ucode_from_containers( early_apply_microcode(cpuid_1_eax, cp.data, cp.size); } -void load_ucode_amd_early(unsigned int cpuid_1_eax) -{ - return apply_ucode_from_containers(cpuid_1_eax); -} - static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size); static int __init save_microcode_in_initrd(void) @@ -608,7 +603,6 @@ static struct ucode_patch *find_patch(un struct ucode_cpu_info *uci = ucode_cpu_info + cpu; u16 equiv_id; - equiv_id = find_equiv_id(&equiv_table, uci->cpu_sig.sig); if (!equiv_id) return NULL; @@ -710,6 +704,14 @@ static enum ucode_state apply_microcode_ return ret; } +void load_ucode_amd_ap(unsigned int cpuid_1_eax) +{ + unsigned int cpu = smp_processor_id(); + + ucode_cpu_info[cpu].cpu_sig.sig = cpuid_1_eax; + apply_microcode_amd(cpu); +} + static size_t install_equiv_cpu_table(const u8 *buf, size_t buf_size) { u32 equiv_tbl_len; --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -159,7 +159,7 @@ void __init load_ucode_bsp(void) if (intel) load_ucode_intel_bsp(); else - load_ucode_amd_early(cpuid_1_eax); + load_ucode_amd_bsp(cpuid_1_eax); } void load_ucode_ap(void) @@ -178,7 +178,7 @@ void load_ucode_ap(void) break; case X86_VENDOR_AMD: if (x86_family(cpuid_1_eax) >= 0x10) - load_ucode_amd_early(cpuid_1_eax); + load_ucode_amd_ap(cpuid_1_eax); break; default: break; @@ -789,15 +789,6 @@ static struct syscore_ops mc_syscore_ops .resume = microcode_bsp_resume, }; -static int mc_cpu_starting(unsigned int cpu) -{ - enum ucode_state err = microcode_ops->apply_microcode(cpu); - - pr_debug("%s: CPU%d, err: %d\n", __func__, cpu, err); - - return err == UCODE_ERROR; -} - static int mc_cpu_online(unsigned int cpu) { struct ucode_cpu_info *uci = ucode_cpu_info + cpu; @@ -870,8 +861,6 @@ static int __init microcode_init(void) } register_syscore_ops(&mc_syscore_ops); - cpuhp_setup_state_nocalls(CPUHP_AP_MICROCODE_LOADER, "x86/microcode:starting", - mc_cpu_starting, NULL); cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/microcode:online", mc_cpu_online, mc_cpu_down_prep); --- a/arch/x86/kernel/cpu/microcode/internal.h +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -95,7 +95,6 @@ extern bool initrd_gone; #ifdef CONFIG_CPU_SUP_AMD void load_ucode_amd_bsp(unsigned int family); void load_ucode_amd_ap(unsigned int family); -void load_ucode_amd_early(unsigned int cpuid_1_eax); int save_microcode_in_initrd_amd(unsigned int family); void reload_ucode_amd(unsigned int cpu); struct microcode_ops *init_amd_microcode(void); @@ -103,7 +102,6 @@ void exit_amd_microcode(void); #else /* CONFIG_CPU_SUP_AMD */ static inline void load_ucode_amd_bsp(unsigned int family) { } static inline void load_ucode_amd_ap(unsigned int family) { } -static inline void load_ucode_amd_early(unsigned int family) { } static inline int save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; } static inline void reload_ucode_amd(unsigned int cpu) { } static inline struct microcode_ops *init_amd_microcode(void) { return NULL; } From patchwork Tue Oct 10 15:08:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 150839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp272081vqb; Tue, 10 Oct 2023 08:09:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHS/g20jd7MfzLU5/W+DhfCylwHfHFLtp2iPm4P1YAADj3vv/1kl7MjJSuy4o5VYfZZJQO X-Received: by 2002:a05:6a00:234a:b0:68f:b5a1:12bf with SMTP id j10-20020a056a00234a00b0068fb5a112bfmr21578745pfj.29.1696950566074; Tue, 10 Oct 2023 08:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696950566; cv=none; d=google.com; s=arc-20160816; b=immLwVEuNQaoo2/1coMPVf5wC9NhL10RWSe1KxvTlIDoseGfo7o4zDfdspsnKPPX/i 6OissM0hhq6YNAwR6AhQ58Jd/N2p2rTSsZdkJSpAn8rW96MSBXca4PrrkKP+dQ9J46RD hlrSSmrDFgHSJ31BSK4oTLSS6Ji+F8wuWhcva9ZiOPbEO3Z+T95yavoLxK6KfRNDad7e bmqUos/5YIhl14FnIkDvAwErAPXasDa4tYlTtBE9JQpAuUGFdzuLgqGJN0uuNt7GrdQt 5YxkDpnqNnqTZe3ga9vURNdJc38ggxSzexzQllFVB9c/n/G29Vne2nETyGei3KldAUlK ezUA== 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=IhNNCBkZDu722mghkA1YDoOAV6ExbYvs7YIlqtUCfyk=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=iZ3l5ohVjbZf3ZoXo44oH1xt0f74RuQBeFIqzMSJ3zBFY/6Hl0tjeyIwnqNZTEIGsh WfUE+pXM18YcTGN/aFmZtUCeCKG7nllO/BOGTkyWGOVsSbXAg8DA4CzRSbXaL+cogINm +suBlP8Tzc22yPpb29aoRVpvFy5CpHv+x0UiNHA2tDOFBkHoPNN1YgRWoWjq0B3w6qJv 7TdnUP49/neqk5c0BzmuldDNLFogHniSVDqUfWmtNzfytSU90hhfilax/a3nZXZSFW7E 6hW3F39OxB+BWQeCqwEvyMmVk528b+3IJ5aYc9p0xSlUHi4uihRGEV3TT0aFRXBI4bem ksag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zaJ0NwOR; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id x5-20020a654145000000b00569362d6cebsi1097028pgp.2.2023.10.10.08.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 08:09:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zaJ0NwOR; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 8A7B48026905; Tue, 10 Oct 2023 08:09:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233293AbjJJPJE (ORCPT + 20 others); Tue, 10 Oct 2023 11:09:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231865AbjJJPIw (ORCPT ); Tue, 10 Oct 2023 11:08:52 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0424993 for ; Tue, 10 Oct 2023 08:08:51 -0700 (PDT) Message-ID: <20231010150702.662293885@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696950527; 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=IhNNCBkZDu722mghkA1YDoOAV6ExbYvs7YIlqtUCfyk=; b=zaJ0NwORFtKCxUHt5o1b0JpRAPX6MwX3ZtWXdl623+w4GTIkYBD748069YKSx65upHVmid pyuZO9de3oYgj1KWaDRFCNuHFGKdVwlk2rlibB0D8oI7zUYSTXxtGdy7Rvq8o2MuxW9vvV Yk7ybfCRKSJpY6mPW6zkcIdzutFi6FRujyctmb+UpEojZd+nwr8YCfpmRS160zBWFRMXuR dkGSADxOEAh1E5VbSGqZP3AE7D/2KltmP4HeUjTlYBkHdw1zDNMHy6DqU7VlWnsGSjZS9L L/Ciq7BcpmSlxqHadMgDrjMKU8STpDF7lZdKW/SnqsWZKMMDU69Bsy8LahYOXw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696950527; 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=IhNNCBkZDu722mghkA1YDoOAV6ExbYvs7YIlqtUCfyk=; b=puecydyczdwg+Ys1hOCfWLBsA4EvL5lna9tjhjl5OfmCwNvjyGnouT60LL8OpuwT85CR3z hBvj7RoEALTbxuCw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch 5/5] x86/microcode: Mop up early loading leftovers References: <20231010145130.987300357@linutronix.de> MIME-Version: 1.0 Date: Tue, 10 Oct 2023 17:08:46 +0200 (CEST) X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Tue, 10 Oct 2023 08:09:21 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779381636761942126 X-GMAIL-MSGID: 1779381636761942126 Get rid of the initrd_gone hack which was required to keep find_microcode_in_initrd() functional after init. As find_microcode_in_initrd() is now only used during init, mark it accordingly. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/core.c | 17 +---------------- arch/x86/kernel/cpu/microcode/internal.h | 2 -- 2 files changed, 1 insertion(+), 18 deletions(-) --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -49,8 +49,6 @@ static bool dis_ucode_ldr = true; bool force_minrev = IS_ENABLED(CONFIG_MICROCODE_LATE_FORCE_MINREV); module_param(force_minrev, bool, S_IRUSR | S_IWUSR); -bool initrd_gone; - /* * Synchronization. * @@ -185,15 +183,7 @@ void load_ucode_ap(void) } } -/* Temporary workaround until find_microcode_in_initrd() is __init */ -static int __init mark_initrd_gone(void) -{ - initrd_gone = true; - return 0; -} -fs_initcall(mark_initrd_gone); - -struct cpio_data find_microcode_in_initrd(const char *path) +struct cpio_data __init find_microcode_in_initrd(const char *path) { #ifdef CONFIG_BLK_DEV_INITRD unsigned long start = 0; @@ -224,12 +214,7 @@ struct cpio_data find_microcode_in_initr * has the virtual address of the beginning of the initrd. It also * possibly relocates the ramdisk. In either case, initrd_start contains * the updated address so use that instead. - * - * initrd_gone is for the hotplug case where we've thrown out initrd - * already. */ - if (initrd_gone) - return (struct cpio_data){ NULL, 0, "" }; if (initrd_start) start = initrd_start; --- a/arch/x86/kernel/cpu/microcode/internal.h +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -90,8 +90,6 @@ static inline unsigned int x86_cpuid_fam return x86_family(eax); } -extern bool initrd_gone; - #ifdef CONFIG_CPU_SUP_AMD void load_ucode_amd_bsp(unsigned int family); void load_ucode_amd_ap(unsigned int family);