From patchwork Mon Oct 9 12:29:52 2023 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: 150048 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1833411vqo; Mon, 9 Oct 2023 05:31:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbEXamoD3FaAGuG/bpnETY1uNolm7CPp7SIoP+A08mtwsDsu8b2A4Pe5LVRKvK1JekVNBd X-Received: by 2002:a05:6a00:22c9:b0:690:2ecd:a593 with SMTP id f9-20020a056a0022c900b006902ecda593mr19451341pfj.26.1696854710573; Mon, 09 Oct 2023 05:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696854710; cv=none; d=google.com; s=arc-20160816; b=rhRbZAruz4NkHH6T3R71aTMGOKhGI6Jh5Xq4HQS/vXJ0dTfUbsoPr7/uEvIhgbNFqo LgS5aTdVqeZ1EkyoPipy83bBtJZZ9DutzFAQOqAT8T7IBwS4NtWg/WjnbCBkat3hdwEn rE8y3w65JbKftb0PXhLGN47d0kGXdjSaJOMcTlm687BxjwMxQx45hPc2WZW0u1PEuSvI k1xnK8HxoMDRIRCz1I5ayMeEYF3fj6BlMbA4g0isSq29yQulVf7ZRLzaGhu01d/GwQV8 7dHsVOEyIwAgY9Zq2BCv3GNvPxNyl9kQzQRTS4o01harLiBVB3LP9lSkujnbFfPcr/xx dI4A== 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=pttXjpWl3jzW5bQcJhPqWVtpoWavvPgn8eEPBEe7IBo=; fh=LWlv3U+xZ3+vQt4tlJRIlKl5VzN7iFjjE/bzRmlxKDA=; b=QZTIazGkJfAPLb3RJJSxAdGq5WTjGvvgqLGA94rCgQ0+EdCW+kL5Hh4Bc8FqqOmpMK /szE4UE0KLdv1ROomMRjY5P29dmgutFKrpdsW2LAjJGBNwCBLiXhDc0qKFZQjcxG0/gS zg6hekK4Uzo1gCnyv4zHnJtByBCXn7TDm65S/LiP/iXkQnaAISrx/eT+q3URDrRDC50G SMnYs0zxz6cOBcTit2UcIBArWc0rFz0taQT7sDDVcmqI1vn36LBJO+5kSyR4QlOd+4Rl nGBM92+w8T8RqVzut7Yg9TRRAnxWYq6qFUKZ1rlHMJYqXQaYyQ2xsid+Qxc/C4K4cDg0 ZumA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=t95xfaid; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 u21-20020a056a00099500b0068a68054661si7631985pfg.71.2023.10.09.05.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 05:31:50 -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=t95xfaid; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 86743801BB78; Mon, 9 Oct 2023 05:31:39 -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 S1376548AbjJIMa4 (ORCPT + 18 others); Mon, 9 Oct 2023 08:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376417AbjJIM36 (ORCPT ); Mon, 9 Oct 2023 08:29:58 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC7D4B4; Mon, 9 Oct 2023 05:29:54 -0700 (PDT) Date: Mon, 09 Oct 2023 12:29:52 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696854593; 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=pttXjpWl3jzW5bQcJhPqWVtpoWavvPgn8eEPBEe7IBo=; b=t95xfaidBX8oSrIqVMB0h98eBx7dlYytSX+/ohSxj+bt93gOpGRUh/JXzdMs2pH71JAPU6 8IM2akeQfNnJRi2IT8jCotdXUT3Gknuxo7JXC35jQo+/IiIsd7r4B2R9Hmxw+sdCi/AKrd qb3gudk6OKMkyjQdVsqP8/UJodvKxkD248XB8DyqcYk5spQjMjo2Rzw/58k+56ANwU+dT5 Ume/nfgziuYwkZLZZ6m6iSvGxc/Lk90wd225+qbrxZfpffSVao0r/S22uBflFmQU+BnJ+4 xPgioH+gMLlLI+bkQ3S3dZHI+MNx02O+3l/rZO4WWvxSkLPhn9tZG/bS5yNzVA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696854593; 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=pttXjpWl3jzW5bQcJhPqWVtpoWavvPgn8eEPBEe7IBo=; b=JQXz9XRXBy3tBPIMfIz9DIOi/ToqvLQrQKBA+zD3AV+fk96xyyHzxBsbGbBVA86nH0F4sR XrYII4r5CGyBBeAg== From: "tip-bot2 for Thomas Gleixner" 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: Switch to kvmalloc() Cc: Thomas Gleixner , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231002115902.564323243@linutronix.de> References: <20231002115902.564323243@linutronix.de> MIME-Version: 1.0 Message-ID: <169685459297.3135.18256614388166316816.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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 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]); Mon, 09 Oct 2023 05:31:39 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778659259558478519 X-GMAIL-MSGID: 1779281124745103770 The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 2ef5bac8c869ac24f51c94df1ae6d23c7679d905 Gitweb: https://git.kernel.org/tip/2ef5bac8c869ac24f51c94df1ae6d23c7679d905 Author: Thomas Gleixner AuthorDate: Mon, 02 Oct 2023 13:59:45 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 03 Oct 2023 15:59:30 +02:00 x86/microcode/intel: Switch to kvmalloc() Microcode blobs are getting larger and might soon reach the kmalloc() limit. Switch over kvmalloc(). Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231002115902.564323243@linutronix.de --- arch/x86/kernel/cpu/microcode/intel.c | 48 +++++++++++++------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 2d88929..f06889e 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -243,7 +242,7 @@ EXPORT_SYMBOL_GPL(intel_microcode_sanity_check); static void update_ucode_pointer(struct microcode_intel *mc) { - kfree(ucode_patch_va); + kvfree(ucode_patch_va); /* * Save the virtual address for early loading and for eventual free @@ -254,11 +253,14 @@ static void update_ucode_pointer(struct microcode_intel *mc) static void save_microcode_patch(struct microcode_intel *patch) { + unsigned int size = get_totalsize(&patch->hdr); struct microcode_intel *mc; - mc = kmemdup(patch, get_totalsize(&patch->hdr), GFP_KERNEL); + mc = kvmemdup(patch, size, GFP_KERNEL); if (mc) update_ucode_pointer(mc); + else + pr_err("Unable to allocate microcode memory size: %u\n", size); } /* Scan blob for microcode matching the boot CPUs family, model, stepping */ @@ -530,36 +532,34 @@ static enum ucode_state parse_microcode_blobs(int cpu, struct iov_iter *iter) if (!copy_from_iter_full(&mc_header, sizeof(mc_header), iter)) { pr_err("error! Truncated or inaccessible header in microcode data file\n"); - break; + goto fail; } mc_size = get_totalsize(&mc_header); if (mc_size < sizeof(mc_header)) { pr_err("error! Bad data in microcode data file (totalsize too small)\n"); - break; + goto fail; } - data_size = mc_size - sizeof(mc_header); if (data_size > iov_iter_count(iter)) { pr_err("error! Bad data in microcode data file (truncated file?)\n"); - break; + goto fail; } /* For performance reasons, reuse mc area when possible */ if (!mc || mc_size > curr_mc_size) { - vfree(mc); - mc = vmalloc(mc_size); + kvfree(mc); + mc = kvmalloc(mc_size, GFP_KERNEL); if (!mc) - break; + goto fail; curr_mc_size = mc_size; } memcpy(mc, &mc_header, sizeof(mc_header)); data = mc + sizeof(mc_header); if (!copy_from_iter_full(data, data_size, iter) || - intel_microcode_sanity_check(mc, true, MC_HEADER_TYPE_MICROCODE) < 0) { - break; - } + intel_microcode_sanity_check(mc, true, MC_HEADER_TYPE_MICROCODE) < 0) + goto fail; if (cur_rev >= mc_header.rev) continue; @@ -567,24 +567,26 @@ static enum ucode_state parse_microcode_blobs(int cpu, struct iov_iter *iter) if (!intel_find_matching_signature(mc, uci->cpu_sig.sig, uci->cpu_sig.pf)) continue; - vfree(new_mc); + kvfree(new_mc); cur_rev = mc_header.rev; new_mc = mc; mc = NULL; } - vfree(mc); - - if (iov_iter_count(iter)) { - vfree(new_mc); - return UCODE_ERROR; - } + if (iov_iter_count(iter)) + goto fail; + kvfree(mc); if (!new_mc) return UCODE_NFOUND; ucode_patch_late = (struct microcode_intel *)new_mc; return UCODE_NEW; + +fail: + kvfree(mc); + kvfree(new_mc); + return UCODE_ERROR; } static bool is_blacklisted(unsigned int cpu) @@ -643,9 +645,9 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device) static void finalize_late_load(int result) { if (!result) - save_microcode_patch(ucode_patch_late); - - vfree(ucode_patch_late); + update_ucode_pointer(ucode_patch_late); + else + kvfree(ucode_patch_late); ucode_patch_late = NULL; }