From patchwork Wed Feb 21 08:20:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774505 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp316119wrw; Wed, 21 Feb 2024 07:43:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXcHfWwcXa2TdqEMIqcafdd7LlhrSNA+ccUNi9leXvorg3o+BRt3KbdIYilZ8LmYPaFkP/uy0b5B/HIDe2iSDjV X-Google-Smtp-Source: AGHT+IEyS2LvIJAQhnaSzrdGcjQpupAlCW77ZKDgx4Q2wPR7871o29Havn+Prt4Je8Lpx20MwwQi X-Received: by 2002:a05:622a:513:b0:42c:6005:19a6 with SMTP id l19-20020a05622a051300b0042c600519a6mr19735916qtx.54.1708530236885; Wed, 21 Feb 2024 07:43:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708530236; cv=none; d=google.com; s=arc-20160816; b=KS+oHk+BAE2lBJOtiCjBWkYcTWa2ISjOqDZlB6AiGY51DOgug2KL+45xV8ukunAcfP O8wVgFId8clXqaZTHMq8D2vALL4KnLq9KUGy0BwXR7U+KevA1IlIStPx6iNyiwFFv/QO K6CcqYbv9MxQzObgW2hZACXC+HaCFScbFGu6que/yIPKHYrtif4/0kztSFCVtlJ3Z1Y5 jJlLjXvMcT1iHJdhWkzwDzPnrbg2WJTSEIM+uyXsle0uXn+lOMZfp4TnSzBTNbdO9Rxx 26KgoU55L680IzKqKV5wSLxcs52uGUxzFAejSF3h8Axko1S+EG47yK6rzJwY1HPNgTiC +nfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=x64wPEWmu8HhEkkOO0BiVfIq6/epYwljLq7uBWLVzCQ=; fh=OKuLB2HSwWuh27MwgB2c3Bd7RFVGc3aSQ8373fc2R0A=; b=bA2Hhm0eU011JcigiybKrLbN6LmYI4zK+CdEcTPAukUxtdo/6c2nFW52d+GCwDhP/x TjzG8SNx/ewaYDW0Mky3yQHE/Kww7DaFN3HdyDk9z4MDs3CaJ+gAtzO9f3gKXmFnscOI jNXhjLP/BDOc2HWfeUM0MLulWh2hTL7Uetoy5gxz4SIvdxjSdoVmprC2V8I/PiLa7iSj fBEKWWX6ULRZnOCpD8usiRd22PpvOD3taUa/ZVwHczhra9z6vfzBFT0ufKpBlR+B6gjG 5HDEtgWs/C/Ng1i6elnQFI4zCoeZiPm/OWsNFir4Uohtxgbdu2Rl21Azfz2cuy2A3AoQ O6Zg==; 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 h2-20020ac87142000000b0042deb612e75si10564007qtp.420.2024.02.21.07.43.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Feb 2024 07:43:56 -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 1rcoZk-0003hx-9G; Wed, 21 Feb 2024 10:32:00 -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 1rcoOS-0002DX-Kq; Wed, 21 Feb 2024 10:20:20 -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 1rchuQ-0002g6-Cq; Wed, 21 Feb 2024 03:24:55 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C00764F3E8; Wed, 21 Feb 2024 11:21:22 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 8B2BB860C7; Wed, 21 Feb 2024 11:21:01 +0300 (MSK) Received: (nullmailer pid 2142115 invoked by uid 1000); Wed, 21 Feb 2024 08:20:58 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Peter Maydell , Gustavo Romero , Michael Tokarev Subject: [Stable-8.2.2 42/60] target/arm: Adjust and validate mtedesc sizem1 Date: Wed, 21 Feb 2024 11:20:30 +0300 Message-Id: <20240221082058.2141850-42-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: Richard Henderson When we added SVE_MTEDESC_SHIFT, we effectively limited the maximum size of MTEDESC. Adjust SIZEM1 to consume the remaining bits (32 - 10 - 5 - 12 == 5). Assert that the data to be stored fits within the field (expecting 8 * 4 - 1 == 31, exact fit). Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Tested-by: Gustavo Romero Message-id: 20240207025210.8837-4-richard.henderson@linaro.org Signed-off-by: Peter Maydell (cherry picked from commit b12a7671b6099a26ce5d5ab09701f151e21c112c) Signed-off-by: Michael Tokarev diff --git a/target/arm/internals.h b/target/arm/internals.h index 143d57c0fe..8342f4651f 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1273,7 +1273,7 @@ FIELD(MTEDESC, TBI, 4, 2) FIELD(MTEDESC, TCMA, 6, 2) FIELD(MTEDESC, WRITE, 8, 1) FIELD(MTEDESC, ALIGN, 9, 3) -FIELD(MTEDESC, SIZEM1, 12, SIMD_DATA_BITS - 12) /* size - 1 */ +FIELD(MTEDESC, SIZEM1, 12, SIMD_DATA_BITS - SVE_MTEDESC_SHIFT - 12) /* size - 1 */ bool mte_probe(CPUARMState *env, uint32_t desc, uint64_t ptr); uint64_t mte_check(CPUARMState *env, uint32_t desc, uint64_t ptr, uintptr_t ra); diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 7108938251..a88e523cba 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -4443,17 +4443,18 @@ static void do_mem_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr, { unsigned vsz = vec_full_reg_size(s); TCGv_ptr t_pg; + uint32_t sizem1; int desc = 0; assert(mte_n >= 1 && mte_n <= 4); + sizem1 = (mte_n << dtype_msz(dtype)) - 1; + assert(sizem1 <= R_MTEDESC_SIZEM1_MASK >> R_MTEDESC_SIZEM1_SHIFT); if (s->mte_active[0]) { - int msz = dtype_msz(dtype); - desc = FIELD_DP32(desc, MTEDESC, MIDX, get_mem_index(s)); desc = FIELD_DP32(desc, MTEDESC, TBI, s->tbid); desc = FIELD_DP32(desc, MTEDESC, TCMA, s->tcma); desc = FIELD_DP32(desc, MTEDESC, WRITE, is_write); - desc = FIELD_DP32(desc, MTEDESC, SIZEM1, (mte_n << msz) - 1); + desc = FIELD_DP32(desc, MTEDESC, SIZEM1, sizem1); desc <<= SVE_MTEDESC_SHIFT; } else { addr = clean_data_tbi(s, addr);