From patchwork Fri Mar 19 13:27:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 42687 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 99976386F478; Fri, 19 Mar 2021 13:27:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99976386F478 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1616160478; bh=97x6e71f8hWoJMXhjTp29JJd7IUPx/CZU05NY04Jmhk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=bbjyvstmGmrzdoE53Caxc58tbsdYDXO+gZlO9QZkn1tfJWCqZLshOPCzBdITATcc3 mZ6KbkDB3mrGZjtqJqj10srHEeyy9isyMYNq+CDptTTkkIYtxTYycCdiXMBaUyfVT+ 8NZyUhwDumgZmOPWc9ViVBabpBUpPU9gInBCuGFM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by sourceware.org (Postfix) with ESMTPS id E4DAB386F479 for ; Fri, 19 Mar 2021 13:27:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E4DAB386F479 Received: by mail-pg1-x529.google.com with SMTP id u19so3681481pgh.10 for ; Fri, 19 Mar 2021 06:27:55 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=97x6e71f8hWoJMXhjTp29JJd7IUPx/CZU05NY04Jmhk=; b=i8osshLQZ1SuvO3rk3mlIKY6pbWk1qQX76oB4MqiOKU8cT4Xt8qe7L8iV+3qbjF1lg kRGSzhTN02YjatiOuXuqePi4HyR42eVe1x7Z/yLuMgjt9u65KVDUVj1Q58r3lK5BSXaA F/t7u2bFk37Gkt5HJf77RQdPjxnCnc1njU/catxcL0o5sZYo7NETJ0z5QuDK3TueUH7t 6Ts7Xgssw7tOJZI5Kjxk0A6Ece+uCKKih66JxVnvf1ODoK9pnAsagRhSUXZHaQ3XMutS DPn7DhLwT8VO0i4auMtjbME6NXnC8YSq9FGIirgmhrYbnY5zzBYozD0+sst1fcObwTnq qxgg== X-Gm-Message-State: AOAM532Wj1ZMF4Spsqtbwrjr/jt+/6fKxrvl6/cLjKZpAOXb4D2TWATc ARDDwX7LWRDgXpVcA53I/W1N6HgBbkc= X-Google-Smtp-Source: ABdhPJwYtBRHScmvE6hLKQHX8As8il+XhXvJt7Ji6dAn8GkFS/nJhJrRjnVuXofpo5Dp3EU6f/CYeg== X-Received: by 2002:a63:cd01:: with SMTP id i1mr3645875pgg.262.1616160475123; Fri, 19 Mar 2021 06:27:55 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.56.38.37]) by smtp.gmail.com with ESMTPSA id mz11sm5650804pjb.6.2021.03.19.06.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 06:27:54 -0700 (PDT) Received: from gnu-cfl-2.?040none?041 (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 52E6F1A03FE; Fri, 19 Mar 2021 06:27:52 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] x86: Disable OSXSAVE related features [BZ #27605] Date: Fri, 19 Mar 2021 06:27:51 -0700 Message-Id: <20210319132751.3845006-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3036.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" If OSXSAVE is disabled by glibc tunables, disable features which depend on OSXSAVE. --- sysdeps/x86/cpu-features.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index d7248cbb45..804e9a879b 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -654,6 +654,46 @@ no_cpuid: #if HAVE_TUNABLES TUNABLE_GET (hwcaps, tunable_val_t *, TUNABLE_CALLBACK (set_hwcaps)); + + if (!CPU_FEATURE_USABLE_P (cpu_features, OSXSAVE)) + { + /* These features are usable only if OSXSAVE is usable. */ + cpu_features->xsave_state_size = 0; + CPU_FEATURE_UNSET (cpu_features, AVX); + CPU_FEATURE_UNSET (cpu_features, AVX2); + CPU_FEATURE_UNSET (cpu_features, AVX_VNNI); + CPU_FEATURE_UNSET (cpu_features, FMA); + CPU_FEATURE_UNSET (cpu_features, VAES); + CPU_FEATURE_UNSET (cpu_features, VPCLMULQDQ); + CPU_FEATURE_UNSET (cpu_features, XOP); + CPU_FEATURE_UNSET (cpu_features, F16C); + CPU_FEATURE_UNSET (cpu_features, AVX512F); + CPU_FEATURE_UNSET (cpu_features, AVX512CD); + CPU_FEATURE_UNSET (cpu_features, AVX512ER); + CPU_FEATURE_UNSET (cpu_features, AVX512PF); + CPU_FEATURE_UNSET (cpu_features, AVX512VL); + CPU_FEATURE_UNSET (cpu_features, AVX512DQ); + CPU_FEATURE_UNSET (cpu_features, AVX512BW); + CPU_FEATURE_UNSET (cpu_features, AVX512_4FMAPS); + CPU_FEATURE_UNSET (cpu_features, AVX512_4VNNIW); + CPU_FEATURE_UNSET (cpu_features, AVX512_BITALG); + CPU_FEATURE_UNSET (cpu_features, AVX512_IFMA); + CPU_FEATURE_UNSET (cpu_features, AVX512_VBMI); + CPU_FEATURE_UNSET (cpu_features, AVX512_VBMI2); + CPU_FEATURE_UNSET (cpu_features, AVX512_VNNI); + CPU_FEATURE_UNSET (cpu_features, AVX512_VPOPCNTDQ); + CPU_FEATURE_UNSET (cpu_features, AVX512_VP2INTERSECT); + CPU_FEATURE_UNSET (cpu_features, AVX512_BF16); + CPU_FEATURE_UNSET (cpu_features, AVX512_FP16); + CPU_FEATURE_UNSET (cpu_features, AMX_BF16); + CPU_FEATURE_UNSET (cpu_features, AMX_TILE); + CPU_FEATURE_UNSET (cpu_features, AMX_INT8); + CPU_FEATURE_UNSET (cpu_features, XSAVE); + CPU_FEATURE_UNSET (cpu_features, XSAVEOPT); + CPU_FEATURE_UNSET (cpu_features, XSAVEC); + CPU_FEATURE_UNSET (cpu_features, XGETBV_ECX_1); + CPU_FEATURE_UNSET (cpu_features, XFD); + } #elif defined SHARED /* Reuse dl_platform, dl_hwcap and dl_hwcap_mask for x86. The glibc.cpu.hwcap_mask tunable is initialized already, so no