From patchwork Mon Oct 2 11:59: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: 147347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1515161vqb; Mon, 2 Oct 2023 08:47:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzOLUM+1lNp6CYyBSkjekPsnAHpncTUPc/PfCPT7yUhL5whrnud5eff9FCVmEcMSKXg4Ry X-Received: by 2002:a05:6300:808c:b0:140:324c:124c with SMTP id ap12-20020a056300808c00b00140324c124cmr9233997pzc.62.1696261653382; Mon, 02 Oct 2023 08:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696261653; cv=none; d=google.com; s=arc-20160816; b=NXzInn2KFO/yEqr8KPSmFwlrDN9m+4KsH5F/q5OvTetKJ9DiXzYeQdKMWCCWa655U1 ux3so/0mXxlE0u7+KsZXPI2+5lwr6hA/rmfkF+ZwulqhrU2ydR9FhAWaUurKZqX+Suao +WgCXbv9ei4+quxfXYtbRqFGZZ17MrHx0d5YAJE4ucEFtPRK8pII5YigaXaIG+X+UCXc 1FfO8kmpnXhWyfLMquGAH86HYDJ5KUuSAEz34MUSNed3ClBiXGFHPpJAT6qSK1+8jchh W4+4lD7WdRsXuBHPnDUsEi7JiKrckzA/XcEB+60MNmrj7l/7zein+xWjbAk9PBBwXbbR OFDQ== 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=zPYr0Ydgl25/awrI3nekKS7noAl2zorfqWbbUsVIQD4=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=k0ZKkclD6Aekux5JRIX5qZ+aackysEjLGaKO/+tNoVYwEAwwKOmd5KjCY5g0lZhr8u 5CNmcF1ndDCn0CYQVeTA+/rrTV0IGsp+57rmzbLCzIEc4GJRrtvcyPnpy1iHlHtKwq1V BfpjGLKANkScEwVj+bTdOgL4TiO1wFQFcgthwWOIBFbqsGEODpuZYa+PhxnpL0snnq02 3dRzyD3lwxZqySL7V41NPUFq5iJu9o3n+EeaSc8DXTC+b+Ftl4IIZyGjajHaoKikp/pW BgusHRiIrBPPIbMzEGVgKkhukxT0+SnUlTkjFgdVF8NM2XokXnDfADfw1qxyXcFX2NgX p1Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=yn2ol6kB; 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:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id x24-20020a056a000bd800b00690d42e3347si24934751pfu.157.2023.10.02.08.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 08:47:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=yn2ol6kB; 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:4 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 howler.vger.email (Postfix) with ESMTP id C9B37803986C; Mon, 2 Oct 2023 05:00:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236885AbjJBMAF (ORCPT + 18 others); Mon, 2 Oct 2023 08:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236857AbjJBL77 (ORCPT ); Mon, 2 Oct 2023 07:59:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14801D7 for ; Mon, 2 Oct 2023 04:59:47 -0700 (PDT) Message-ID: <20231002115902.564323243@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247985; 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=zPYr0Ydgl25/awrI3nekKS7noAl2zorfqWbbUsVIQD4=; b=yn2ol6kBePK92/CVO9nMPwtwkEEsQY3Ykf51fmhVz3y95uid0YFOPj2S5ujFBTuUOYkvzr ImvJGNWM4VNKTgwzrpRYneOdQGi1ftAsPMqiCf3Zf2bQsmr0mHPd3hS744XUe8bcV9JpiF 7BCHv52nmpt+ZYSH/gp27y3l5Xibzi/QCcggbqYflKVmXeFKdymn7vll3a6DyFGZsL3IF+ 3Vme0ebx3s4wtRhYuLNIwaBrBKJ1tTYB75W9wdc4ixb52Q/pYIR9TV5Pyd9uoH+lRsjzf3 X4k+s8Nu4jUKIb5c1VFOlo3a8gfxeU/+hnobjQVKCTei5wp8SNJKRksmXwQtTA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247985; 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=zPYr0Ydgl25/awrI3nekKS7noAl2zorfqWbbUsVIQD4=; b=AKn2Ahc995IbJqR7HuqRbyxXslTXz1k/SMqOD4rUDC+9032YVQFBzw0+mmU4uxuekS4Xb/ hLznSzMLPQSqpwCw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 09/30] x86/microcode/intel: Switch to kvmalloc() References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59: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 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 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778659259558478519 X-GMAIL-MSGID: 1778659259558478519 From: Thomas Gleixner Microcode blobs are getting larger and might soon reach the kmalloc() limit. Switch over kvmalloc(). Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/intel.c | 48 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) --- --- 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 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 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_ 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_ 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_microcod 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; }