From patchwork Tue Nov 19 06:04:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 844262 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:8b:b0:382:43a8:7b94 with SMTP id m11csp1004620wrx; Mon, 18 Nov 2024 22:05:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWvD0/3Z/KHelE7E0XznYH2PRTVKufhmktRkaSuYUmDG8GmG3Rnc1DDORMUot1+dVIy65bRrg==@linaro.org X-Google-Smtp-Source: AGHT+IGjGQ+m21tz7KMW/0VTsHYHEUmUrpQ/ihcVFFHlkTd6FrJSBJj583zQ9O4OnphSW+Hbu5VN X-Received: by 2002:a05:622a:1f8b:b0:463:59fc:db8a with SMTP id d75a77b69052e-46363eb5e1cmr236791711cf.53.1731996346401; Mon, 18 Nov 2024 22:05:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731996346; cv=none; d=google.com; s=arc-20240605; b=Y/5To/S75U0oolkLXMhoJ/SvZqvLN1REbMuzSl/keot4xrYE/dM/0Q7748mBQn/dwR CHLabAhgslu61O72UuGfNY5OgZiGIZJLRhoB5yFeL37UYhmvifU2ijtvJ/jkgt1gg3FZ wpdnCuDr1umIVSHIxXaSpSDy7We6RhChRvO0eCPRk5nmCv3GtdeqMxmO+MypfnUyukw2 aqc2HGNDtVFviTAkcH7z3UybDznzwAHCJWbvU+BlEWZJ3M4WA1+PG5Y86dAwz+2MiwrB wT8He03JGZQEsCJN5wWgFJAAFToYhlnBZmvfNiKxf0oicA51Z5CegIGMOLk1MdIkxyuE Srew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=ryfPCxQDpaxjS2fHlNrwjXtZsuVX3ytr+Z4Yp1zzVmw=; fh=xJ1URYKcMN3TM0/XAv5v+aCN+5tIbzAdcfBx5UNgoLw=; b=DhEo1+OtNOrCe+6A9wEDL1JVhKXmhoOioVhk/cMbwESRe2fdGEOLO0R4NlFF03hiPR sMwHKiGCtGnLE5TUBJo0vB5J9yrt30DQ2PNQDgc/J5aa2kfgZu+Hk/0Sp5QYkUC/6qzv oeG32qjwlypPZlM4TOlrlW9niBn+EWgMI5+7s0HEHIC3Iyzrn2Yulp9HuI34r1samJmQ 9NFJCwXC3xGy9i9gx9Tx1yoSj6pOFChUumE3jPwZ58KxMCVt0X1ec+vCdSFHISJe0hLN NBozuO3ICHbWjDuxXAWTokuOtZ9Gv4vLbAh5WEei5/tyvX0Q8vY25aWm7y/Q08blVhfL KLBQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-46392c617f2si14623631cf.575.2024.11.18.22.05.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Nov 2024 22:05:46 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDHM1-00019P-Al; Tue, 19 Nov 2024 01:04:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDHLz-00017s-C1; Tue, 19 Nov 2024 01:04:47 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDHLx-0004fu-JZ; Tue, 19 Nov 2024 01:04:47 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1426AA6269; Tue, 19 Nov 2024 09:04:15 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 3C3641738DE; Tue, 19 Nov 2024 09:04:19 +0300 (MSK) Received: (nullmailer pid 2368951 invoked by uid 1000); Tue, 19 Nov 2024 06:04:18 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , Michael Tokarev Subject: [Stable-9.1.2 66/72] tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() Date: Tue, 19 Nov 2024 09:04:07 +0300 Message-Id: <20241119060418.2368866-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In simd_desc() we create a SIMD descriptor from various pieces including an arbitrary data value from the caller. We try to sanitize these to make sure everything will fit: the 'data' value needs to fit in the SIMD_DATA_BITS (== 22) sized field. However we do that sanitizing with: tcg_debug_assert(data == sextract32(data, 0, SIMD_DATA_BITS)); This works for the case where the data is supposed to be considered as a signed integer (which can then be returned via simd_data()). However, some callers want to treat the data value as unsigned. Specifically, for the Arm SVE operations, make_svemte_desc() assembles a data value as a collection of fields, and it needs to use all 22 bits. Currently if MTE is enabled then its MTEDESC SIZEM1 field may have the most significant bit set, and then it will trip this assertion. Loosen the assertion so that we only check that the data value will fit into the field in some way, either as a signed or as an unsigned value. This means we will fail to detect some kinds of bug in the callers, but we won't spuriously assert for intentional use of the data field as unsigned. Cc: qemu-stable@nongnu.org Fixes: db432672dc50e ("tcg: Add generic vector expanders") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2601 Signed-off-by: Peter Maydell Message-ID: <20241115172515.1229393-1-peter.maydell@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson (cherry picked from commit 8377e3fb854d126ba10e61cb6b60885af8443ad4) Signed-off-by: Michael Tokarev diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 78ee1ced80..97e4df221a 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -88,7 +88,20 @@ uint32_t simd_desc(uint32_t oprsz, uint32_t maxsz, int32_t data) uint32_t desc = 0; check_size_align(oprsz, maxsz, 0); - tcg_debug_assert(data == sextract32(data, 0, SIMD_DATA_BITS)); + + /* + * We want to check that 'data' will fit into SIMD_DATA_BITS. + * However, some callers want to treat the data as a signed + * value (which they can later get back with simd_data()) + * and some want to treat it as an unsigned value. + * So here we assert only that the data will fit into the + * field in at least one way. This means that some invalid + * values from the caller will not be detected, e.g. if the + * caller wants to handle the value as a signed integer but + * incorrectly passes us 1 << (SIMD_DATA_BITS - 1). + */ + tcg_debug_assert(data == sextract32(data, 0, SIMD_DATA_BITS) || + data == extract32(data, 0, SIMD_DATA_BITS)); oprsz = (oprsz / 8) - 1; maxsz = (maxsz / 8) - 1;