From patchwork Wed Mar 25 19:58:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Terrell X-Patchwork-Id: 11458543 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E25421668 for ; Wed, 25 Mar 2020 19:58:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B825D2076F for ; Wed, 25 Mar 2020 19:58:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UryXJ7Oa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727328AbgCYT6k (ORCPT ); Wed, 25 Mar 2020 15:58:40 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42647 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727374AbgCYT6k (ORCPT ); Wed, 25 Mar 2020 15:58:40 -0400 Received: by mail-pf1-f193.google.com with SMTP id 22so1572316pfa.9; Wed, 25 Mar 2020 12:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=79XLjtK2BxTf3ojXuyfHVt7Lm1JSCHb9ORUodifbrgE=; b=UryXJ7OaT8/XpD2qr/cyxG9ADmo1bEAnGKZbERM1XCJMD71h5L/M/HBNh7G7pbXs0y 2swReh7WFcOD7UiuQia/431CIQWdOkLUoN7zs4H1ZnKJJH7G6MYfcG/U2SnnDIkCoJHj AO9MOJaP29yYD77zZFoiBAJOq4FCHz9SLf3cCQyk5PKon1gjvQ91Jlg0XuLlUo/Ebqb6 N84Itm6GRKuLny9sx3vdmF4Sc2wEsqPT6KGO5jNI4h4qqygktKbKOjQmHO6Xp3xOBu1v o5bQfiliktEE2VD0B+w9+zKyQo79PXWUrctdrPlulEcK4kv1aE90/XjgI9dsAZDIZ5jh YgQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=79XLjtK2BxTf3ojXuyfHVt7Lm1JSCHb9ORUodifbrgE=; b=Uum0mGr9YLLrv/RTZfe5MIfQyP0VWGxlElzZnQZEG3G2YGqAE3NOcrZzZEnkH78K7E MuWVrvAa6SMUSersh7dJ+9UsojSATF27GyByEyoXonW4Q1BWLqSbnUCplohQS4895mRI e96vIZQc9XM/NKCxhT4GsCDY3GDZyLOZ72SafRFJVHBawSZF5DGdodkVsR1pyyk0C+L8 mmkCXTGK3ev8id/jcb/V/Gj0o2BhyTM4Hh7lBgUkGCnhQC13nFTHt7tkZzY9k2beWCpk x0G24E6PDvqIU5QHawbJTYd4aGaGOfjt/VxkDz6/nTgH6JoRZNoci4OQAbq1ERXsrIB2 TtiQ== X-Gm-Message-State: ANhLgQ1OknYJE90pjDxUfpE/vjDOetegVXfVhhxUeIHbWnHtNDN5PQCU RFz8PGZgX1gwJ9sxX4pIyKw= X-Google-Smtp-Source: ADFU+vu555Ijyla3vq5rbH+TEvNY78T10BDSh+uHhKpwOMO2+DMz6lfcYgm/KpyPA3slwa3dwGSboQ== X-Received: by 2002:a63:7f18:: with SMTP id a24mr4723402pgd.178.1585166318139; Wed, 25 Mar 2020 12:58:38 -0700 (PDT) Received: from nickserv.localdomain (c-67-188-225-242.hsd1.ca.comcast.net. [67.188.225.242]) by smtp.gmail.com with ESMTPSA id d7sm19341374pfr.17.2020.03.25.12.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 12:58:37 -0700 (PDT) From: Nick Terrell To: Nick Terrell Cc: linux-kernel@vger.kernel.org, Chris Mason , linux-kbuild@vger.kernel.org, x86@kernel.org, gregkh@linuxfoundation.org, Petr Malat , Kees Cook , Kernel Team , Nick Terrell , Adam Borowski , Patrick Williams , rmikey@fb.com, mingo@kernel.org, Patrick Williams Subject: [PATCH v3 1/8] lib: prepare zstd for preboot environment Date: Wed, 25 Mar 2020 12:58:42 -0700 Message-Id: <20200325195849.407900-2-nickrterrell@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200325195849.407900-1-nickrterrell@gmail.com> References: <20200325195849.407900-1-nickrterrell@gmail.com> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Nick Terrell * Don't export symbols if ZSTD_PREBOOT is defined. * Remove a double definition of the CHECK_F macro when the zstd library is amalgamated. * Switch ZSTD_copy8() to __builtin_memcpy(), because in the preboot environment on x86 gcc can't inline `memcpy()` otherwise. * Limit the gcc hack in ZSTD_wildcopy() to the broken gcc version. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81388. These changes are necessary to get the build to work in the preboot environment, and to get reasonable performance. ZSTD_copy8() and ZSTD_wildcopy() are in the core of the zstd hot loop. So outlining these calls to memcpy(), and having an extra branch are very detrimental to performance. Signed-off-by: Nick Terrell --- lib/zstd/decompress.c | 2 ++ lib/zstd/fse_decompress.c | 9 +-------- lib/zstd/zstd_internal.h | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/zstd/decompress.c b/lib/zstd/decompress.c index 269ee9a796c1..73ded63278cf 100644 --- a/lib/zstd/decompress.c +++ b/lib/zstd/decompress.c @@ -2490,6 +2490,7 @@ size_t ZSTD_decompressStream(ZSTD_DStream *zds, ZSTD_outBuffer *output, ZSTD_inB } } +#ifndef ZSTD_PREBOOT EXPORT_SYMBOL(ZSTD_DCtxWorkspaceBound); EXPORT_SYMBOL(ZSTD_initDCtx); EXPORT_SYMBOL(ZSTD_decompressDCtx); @@ -2529,3 +2530,4 @@ EXPORT_SYMBOL(ZSTD_insertBlock); MODULE_LICENSE("Dual BSD/GPL"); MODULE_DESCRIPTION("Zstd Decompressor"); +#endif diff --git a/lib/zstd/fse_decompress.c b/lib/zstd/fse_decompress.c index a84300e5a013..0b353530fb3f 100644 --- a/lib/zstd/fse_decompress.c +++ b/lib/zstd/fse_decompress.c @@ -47,6 +47,7 @@ ****************************************************************/ #include "bitstream.h" #include "fse.h" +#include "zstd_internal.h" #include #include #include /* memcpy, memset */ @@ -60,14 +61,6 @@ enum { FSE_static_assert = 1 / (int)(!!(c)) }; \ } /* use only *after* variable declarations */ -/* check and forward error code */ -#define CHECK_F(f) \ - { \ - size_t const e = f; \ - if (FSE_isError(e)) \ - return e; \ - } - /* ************************************************************** * Templates ****************************************************************/ diff --git a/lib/zstd/zstd_internal.h b/lib/zstd/zstd_internal.h index 1a79fab9e13a..dac753397f86 100644 --- a/lib/zstd/zstd_internal.h +++ b/lib/zstd/zstd_internal.h @@ -127,7 +127,14 @@ static const U32 OF_defaultNormLog = OF_DEFAULTNORMLOG; * Shared functions to include for inlining *********************************************/ ZSTD_STATIC void ZSTD_copy8(void *dst, const void *src) { - memcpy(dst, src, 8); + /* + * zstd relies heavily on gcc being able to analyze and inline this + * memcpy() call, since it is called in a tight loop. Preboot mode + * is compiled in freestanding mode, which stops gcc from analyzing + * memcpy(). Use __builtin_memcpy() to tell gcc to analyze this as a + * regular memcpy(). + */ + __builtin_memcpy(dst, src, 8); } /*! ZSTD_wildcopy() : * custom version of memcpy(), can copy up to 7 bytes too many (8 bytes if length==0) */ @@ -137,13 +144,16 @@ ZSTD_STATIC void ZSTD_wildcopy(void *dst, const void *src, ptrdiff_t length) const BYTE* ip = (const BYTE*)src; BYTE* op = (BYTE*)dst; BYTE* const oend = op + length; - /* Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81388. +#if defined(GCC_VERSION) && GCC_VERSION >= 70000 && GCC_VERSION < 70200 + /* + * Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81388. * Avoid the bad case where the loop only runs once by handling the * special case separately. This doesn't trigger the bug because it * doesn't involve pointer/integer overflow. */ if (length <= 8) return ZSTD_copy8(dst, src); +#endif do { ZSTD_copy8(op, ip); op += 8;