From nobody Sat Nov 15 14:09:43 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455301; cv=none; d=zohomail.com; s=zohoarc; b=feNKSZd7LbEcOyUNHYbMalKAUQXta8f6UVUaS+XGlJbtaPn/T3a0m+KL/bmpryjHtsn4+Xdpsm1/4aCgYRwq9YRr/qPYu2AZ6G5xSTxutEG7nLrWj2e28PafoJz4/MqpJGvfqy8gjRbSSO7lFTUY/P1k7xrs+u8/0a+5MgiPI60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455301; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gYbMvV6JPX7BYsIi9SkdULx5qyOjMhaqmvcgcL63Ea0=; b=fgIrFs7b7efGhigkSSDyP5gpajIXhqL9hmK8TqnOctl9yxC9vUGKOw1r1dIzC8rnIuNptNseLivxXSjKI13fmX7DZfMSyAEH1nJrFVV8hkCngwXQV1eMNr+UhiPmJsprYlMmfFeLOsNu96/Vzx/JZ/5R4MLmkxFloiofpaZTz4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175145530133077.09942426083626; Wed, 2 Jul 2025 04:21:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvWC-0007gh-LG; Wed, 02 Jul 2025 07:20:48 -0400 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 1uWvW1-0007fT-2u; Wed, 02 Jul 2025 07:20:37 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVu-0002QH-DO; Wed, 02 Jul 2025 07:20:36 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-313154270bbso4542196a91.2; Wed, 02 Jul 2025 04:20:29 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-318c1523351sm14112844a91.48.2025.07.02.04.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455228; x=1752060028; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gYbMvV6JPX7BYsIi9SkdULx5qyOjMhaqmvcgcL63Ea0=; b=nFmHCkRfeImCW3nsygA0Da4YlmQi3JXCgQP1Sk09Sv+dZ/s33PkbZSoE1gX4ZFl0cY QQRFBYsoCwmyGAdIDvQT7gy3gKEeS/15JZKxglhj+GhZ5y+E9IvndBcSZUwWo8sv4B+p lDElaxsLiPkI8eWYU05Z4J4dqQ6zp9BQrbrEdq329nrjK56yznvAPDL48SOlFTAtVWHG RpKHuDh0zwOPGUTsPLxxmjHEB8/FE8BE/P0YiDP9F8laTcfjBVn/1gzno/XRm82D9Fup Z9tkZ1wr4wUZ7Y4/Rjh3oAkXBMgknp9a4mmQDFIO7jp2iiA9nxbJkmqP7F80JYKW9gfn RzYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455228; x=1752060028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gYbMvV6JPX7BYsIi9SkdULx5qyOjMhaqmvcgcL63Ea0=; b=VKk0ZzT00nkN7PYZNChbdOxcZgmGSJzaDrbdUw3edg5B/3MDCpgbH4oBCGwuYuBLjc WV0gM8eg2Wn2jVB2DYSyYyRFnxVcu3qrDlQ/CfRq8DWX0k80BEdQ9RKlUMC6y0D6tr8W P3ptYH8iDsW/yKov0MGXf1sg+9ee8MzRIgfbgZ/fMB8YAM00ufKDou9/kKRUAzvakQQW L7o6YD+8L5AR1RYD53wZuZZXAW93a5vCJqeqD/dHSELAugWpZG26Roai+DXj7xOmSrnt UqwGUPhto/U8U3wWRsU1bBU4CQE0VV/6BvNeV6fb9rT6pauOpSS/4mk9ZBkDGbUZQQxR cWIQ== X-Forwarded-Encrypted: i=1; AJvYcCWlN0Xkg0SSz3vcQni754keKnSX3GQc/RLAa0qH35mTJG5GtBiDivUeqHktnTnygSyoPb9But30WQ==@nongnu.org X-Gm-Message-State: AOJu0YzLQDEOlpkz4NC+/H6EpkUNnObQYGCcyY0oHfzmxXDhy4tS1cyP T27zynKPDGyUJtpDwJ/h1Xt9cWfE+d+b1edHw2oHRAVo+pJvCJt4NErCY8W92hXV9Wg= X-Gm-Gg: ASbGncu9kljFpxUKxwOJKqSYsS+nRbel9ZgPKDTE5+G7WNPzS18U/yogbY/5oBmJ7rW qMxhAf5FVyQko30UhuDuqruCrispF8w3U7RlW2WQxyAaoZ3hvH0V3EOVda8RRTML/wRA2RSmhfp PcJiYG595NYFbVBAYJVC+2YM3hTH3wu1fNV3DAWwWbQvgFPNzfmzUitIzneeW4LNJlmemQItxeO loqkTf6FfVmqWMaodO48KKux0tPkygU9f98mT7hpMUx9ezOWMKC4si6/DDEhO2Uq0yQYu7Xcvtx pSkfYWUKXcOG9/7uSBce1nGc9P9njQOXzbDgngCIjdMBFbz2lQTyYYaaTIkaBtduggGC5nJEZvE K+4Bc0Vcu4Cu2tPCdvya7Ja8x7UAvPsWzDJUDkfUUvmE= X-Google-Smtp-Source: AGHT+IHiMWYmbZyMZtX0xulkDr4xsdvCrF6PuP7DaF6nPS5ARutjhg1ezFQdmGkAYufW1HiKdrNWKA== X-Received: by 2002:a17:90b:1fcf:b0:311:d28a:73ef with SMTP id 98e67ed59e1d1-31a90b480f7mr4532578a91.10.1751455227934; Wed, 02 Jul 2025 04:20:27 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 07/12] target/arm: Fix VSTR_SG helper store alignment checks Date: Wed, 2 Jul 2025 20:49:49 +0930 Message-ID: <20250702111954.128563-8-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pj1-x102e.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455303372116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the store operations in the VSTR_SG instructions. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 0d609668b5..60e61ee538 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -245,7 +245,7 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) } =20 /* We know here TYPE is unsigned so always the same as the offset type */ -#define DO_VSTR_SG(OP, STTYPE, ESIZE, TYPE, ADDRFN, WB) \ +#define DO_VSTR_SG(OP, MFLAG, STTYPE, ESIZE, TYPE, ADDRFN, WB) \ void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, \ uint32_t base) \ { \ @@ -255,13 +255,15 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) uint16_t eci_mask =3D mve_eci_mask(env); \ unsigned e; \ uint32_t addr; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE, eci_mask >>= =3D ESIZE) { \ if (!(eci_mask & 1)) { \ continue; \ } \ addr =3D ADDRFN(base, m[H##ESIZE(e)]); \ if (mask & 1) { \ - cpu_##STTYPE##_data_ra(env, addr, d[H##ESIZE(e)], GETPC())= ; \ + cpu_##STTYPE##_mmu(env, addr, d[H##ESIZE(e)], oi, GETPC())= ; \ } \ if (WB) { \ m[H##ESIZE(e)] =3D addr; \ @@ -314,6 +316,8 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) uint16_t eci_mask =3D mve_eci_mask(env); \ unsigned e; \ uint32_t addr; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (e =3D 0; e < 16 / 4; e++, mask >>=3D 4, eci_mask >>=3D 4) { = \ if (!(eci_mask & 1)) { \ continue; \ @@ -321,7 +325,7 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) addr =3D ADDRFN(base, m[H4(e & ~1)]); \ addr +=3D 4 * (e & 1); \ if (mask & 1) { \ - cpu_stl_data_ra(env, addr, d[H4(e)], GETPC()); \ + cpu_stl_mmu(env, addr, d[H4(e)], oi, GETPC()); \ } \ if (WB && (e & 1)) { \ m[H4(e & ~1)] =3D addr - 4; \ @@ -357,22 +361,22 @@ DO_VLDR_SG(vldrw_sg_os_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, ADDR_ADD_OSW, false) DO_VLDR64_SG(vldrd_sg_os_ud, ADDR_ADD_OSD, false) =20 -DO_VSTR_SG(vstrb_sg_ub, stb, 1, uint8_t, ADDR_ADD, false) -DO_VSTR_SG(vstrb_sg_uh, stb, 2, uint16_t, ADDR_ADD, false) -DO_VSTR_SG(vstrb_sg_uw, stb, 4, uint32_t, ADDR_ADD, false) -DO_VSTR_SG(vstrh_sg_uh, stw, 2, uint16_t, ADDR_ADD, false) -DO_VSTR_SG(vstrh_sg_uw, stw, 4, uint32_t, ADDR_ADD, false) -DO_VSTR_SG(vstrw_sg_uw, stl, 4, uint32_t, ADDR_ADD, false) +DO_VSTR_SG(vstrb_sg_ub, MO_UB, stb, 1, uint8_t, ADDR_ADD, false) +DO_VSTR_SG(vstrb_sg_uh, MO_UB, stb, 2, uint16_t, ADDR_ADD, false) +DO_VSTR_SG(vstrb_sg_uw, MO_UB, stb, 4, uint32_t, ADDR_ADD, false) +DO_VSTR_SG(vstrh_sg_uh, MO_TEUW, stw, 2, uint16_t, ADDR_ADD, false) +DO_VSTR_SG(vstrh_sg_uw, MO_TEUW, stw, 4, uint32_t, ADDR_ADD, false) +DO_VSTR_SG(vstrw_sg_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD, false) DO_VSTR64_SG(vstrd_sg_ud, ADDR_ADD, false) =20 -DO_VSTR_SG(vstrh_sg_os_uh, stw, 2, uint16_t, ADDR_ADD_OSH, false) -DO_VSTR_SG(vstrh_sg_os_uw, stw, 4, uint32_t, ADDR_ADD_OSH, false) -DO_VSTR_SG(vstrw_sg_os_uw, stl, 4, uint32_t, ADDR_ADD_OSW, false) +DO_VSTR_SG(vstrh_sg_os_uh, MO_TEUW, stw, 2, uint16_t, ADDR_ADD_OSH, false) +DO_VSTR_SG(vstrh_sg_os_uw, MO_TEUW, stw, 4, uint32_t, ADDR_ADD_OSH, false) +DO_VSTR_SG(vstrw_sg_os_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD_OSW, false) DO_VSTR64_SG(vstrd_sg_os_ud, ADDR_ADD_OSD, false) =20 DO_VLDR_SG(vldrw_sg_wb_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, = ADDR_ADD, true) DO_VLDR64_SG(vldrd_sg_wb_ud, ADDR_ADD, true) -DO_VSTR_SG(vstrw_sg_wb_uw, stl, 4, uint32_t, ADDR_ADD, true) +DO_VSTR_SG(vstrw_sg_wb_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD, true) DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true) =20 /* --=20 2.48.1