From patchwork Wed Feb 21 08:20:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774504 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp314016wrw; Wed, 21 Feb 2024 07:39:05 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUut6FRu3ima8MYxg8H9yWNI0XlGbs3L3/hNYBvDNUZJ/WGoSV+mVFxFguaKPQRvd1nYRYODLzGbODgICfUQAFL X-Google-Smtp-Source: AGHT+IFXgVTGZYt+nHF6jOy8khCIJRImwdpWVslSnAi/cL4RJZX1qY55ETk1QLqpXRVArZQHV9nK X-Received: by 2002:ad4:5aa7:0:b0:68f:52a9:3b24 with SMTP id u7-20020ad45aa7000000b0068f52a93b24mr12315471qvg.29.1708529944816; Wed, 21 Feb 2024 07:39:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708529944; cv=none; d=google.com; s=arc-20160816; b=Yms7GeJAQ8EDczLGgCesxF/eFC2JAbimIvVuVYvn1+c2v6d43l+glzgaOXVw3RkFaw RpkU7PGWk4BehpaB1MHlP1WzxyoRuWT9wBfRfpBFtM2LA/bpAop0vf+XcHhNl2XVxhoE IBVn5XkQ4kvX/tjV3LJ1MWjVd1RT4j8HQN3bqqpHz11LUuJF3m4Q8c9LJwDbJMXfsD88 eN7oezTPIO/UFjeXk/vBUQPVTmxCRGFsH5YtWsqnQoAvb8x/QXmZ8aJKladpNOzq6v7v CPgKSEAUUI8BMtcwlDSeCUMYd1vj4VEqkhSsufaaOESLk74maCNz7ATMYEkmbVBAVSe3 zHoA== 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=yv0BD+Ug+EgvrOiu9lwsUUkCZCpTGD6AU2cNOfdrNSU=; fh=OKuLB2HSwWuh27MwgB2c3Bd7RFVGc3aSQ8373fc2R0A=; b=ZKcnbiv6zB1CqsL3q+0YApj6PCRu96U3eZfYzaa+t0WJBA309SZ8NmHHbAdkTndGdG 7CWBFcOwd7p//70+HUhAJbPmBWMZU1Coi0MhAzQ4W3OjgkAXeednBhWtnS2dIuuaX1qJ wu3iOj6YW7NNcMPjaj6RKSRfSkZHSc0w2BqmVwwPMw6WNO2T9I+4iirtSnyqL7UfBhXk FPZYapKH8RNFzgR8Tz05wnvXajkPxLDUZAOm+osykoghpXt+U1ryXETg1B1WhUi04MDW dg5TPOk6xdgGSZdkjYPspkzbB9ZwA+k8T9bv5qgpyCBfy41RR8wuPnhOW+e3Qr/H46rM OzNA==; 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 r5-20020ad45765000000b0068f4b1bb583si10054881qvx.455.2024.02.21.07.39.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Feb 2024 07:39:04 -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 1rcoco-00075y-OQ; Wed, 21 Feb 2024 10:35:11 -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 1rcoXd-0004O8-R5; Wed, 21 Feb 2024 10:29:50 -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 1rchuT-0002om-CM; Wed, 21 Feb 2024 03:24:59 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E22944F3EA; 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 AD105860C9; Wed, 21 Feb 2024 11:21:01 +0300 (MSK) Received: (nullmailer pid 2142121 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 44/60] target/arm: Handle mte in do_ldrq, do_ldro Date: Wed, 21 Feb 2024 11:20:32 +0300 Message-Id: <20240221082058.2141850-44-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 These functions "use the standard load helpers", but fail to clean_data_tbi or populate mtedesc. Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Tested-by: Gustavo Romero Message-id: 20240207025210.8837-6-richard.henderson@linaro.org Signed-off-by: Peter Maydell (cherry picked from commit 623507ccfcfebb0f10229ae5de3f85a27fb615a7) Signed-off-by: Michael Tokarev diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 508f7b6bbd..ada05aa530 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -4861,8 +4861,13 @@ static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) unsigned vsz = vec_full_reg_size(s); TCGv_ptr t_pg; int poff; + uint32_t desc; /* Load the first quadword using the normal predicated load helpers. */ + if (!s->mte_active[0]) { + addr = clean_data_tbi(s, addr); + } + poff = pred_full_reg_offset(s, pg); if (vsz > 16) { /* @@ -4886,7 +4891,8 @@ static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) gen_helper_gvec_mem *fn = ldr_fns[s->mte_active[0]][s->be_data == MO_BE][dtype][0]; - fn(tcg_env, t_pg, addr, tcg_constant_i32(simd_desc(16, 16, zt))); + desc = make_svemte_desc(s, 16, 1, dtype_msz(dtype), false, zt); + fn(tcg_env, t_pg, addr, tcg_constant_i32(desc)); /* Replicate that first quadword. */ if (vsz > 16) { @@ -4929,6 +4935,7 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) unsigned vsz_r32; TCGv_ptr t_pg; int poff, doff; + uint32_t desc; if (vsz < 32) { /* @@ -4941,6 +4948,9 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) } /* Load the first octaword using the normal predicated load helpers. */ + if (!s->mte_active[0]) { + addr = clean_data_tbi(s, addr); + } poff = pred_full_reg_offset(s, pg); if (vsz > 32) { @@ -4965,7 +4975,8 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) gen_helper_gvec_mem *fn = ldr_fns[s->mte_active[0]][s->be_data == MO_BE][dtype][0]; - fn(tcg_env, t_pg, addr, tcg_constant_i32(simd_desc(32, 32, zt))); + desc = make_svemte_desc(s, 32, 1, dtype_msz(dtype), false, zt); + fn(tcg_env, t_pg, addr, tcg_constant_i32(desc)); /* * Replicate that first octaword.