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;