From patchwork Thu Mar 24 01:09:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 553895 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp3959856mag; Wed, 23 Mar 2022 18:10:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6iMf/J7s6rmSfurAOcZIdN9zHRus3crSzNXo90YKXaUnFnN5BKZ1UR6NqE246LrnBGLua X-Received: by 2002:a37:9e43:0:b0:67b:312d:50e0 with SMTP id h64-20020a379e43000000b0067b312d50e0mr1909041qke.549.1648084218986; Wed, 23 Mar 2022 18:10:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648084218; cv=none; d=google.com; s=arc-20160816; b=nmwzxWQstHR1WpfBlZ9s1fNlflACB+oN+Nslc0V9P9RqVXEAurD3EG0J24dcY53sbC LWRIc04VnyC9OoZYMM7/VDYKVvBWeroCA5OYvhCX1J8XJxTaxftuaL9B9pjR3h2I9nLL XTo4ahu0SKmsE0uQ8DiKlW850408zaWbN6vvDdj54Q6TQdwmuZcplaLEvEd677aSV98B E2KNu78f9guWlpIwXDUk2vukm8IefUQ+XBKzlbZ1CnOsp4hLscWLwzVJRw774WSVcYQI zb2HSmu/8gmVaq7QAybqdimI1sxlknnQ+Yzqt72wWebU47UrZ23eXnLSFpVuc8+jPlb2 GeZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=b0XKP2Ef+y53BYCyKyPTqHJgjZoQgNcIIQRNIQlhHOk=; b=OSMrIyeWwTUgsxUCSAmzeE54a+rCneYIJnSSfZEWyVqpL747NxAS7ocx5P6Vmc9+ez UDTxGQbbAmVGFvRxBhlA4+sWdz0EMTKDPj4ir1mcJtNAXzKkNjHILLibLvl7rQ+RI1uv O8EpSguqrdt6XFkf3HcSjXMhUMR8GDk6W/Z/CLJ3P7g9w57k9Bd+O+Pl9XEAkmFcmzlq QAy8t6UukW4ntLcM64BuTp2KB0qEuuesgLcw0fDVgZQxSZhXs+sBIcHqGICAiNXxhxLl qO2DjMZaZr/svb1F6bEBp+49I3b4usH4qk75SIWy145/57gnELRtR77rwPbK2a1K4i79 oxhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nCLWiAnd; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j9-20020a05620a288900b0067e4be23917si5162162qkp.348.2022.03.23.18.10.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Mar 2022 18:10:18 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=nCLWiAnd; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXBzW-0007Tl-9I for patch@linaro.org; Wed, 23 Mar 2022 21:10:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXByr-0007TZ-J8 for qemu-devel@nongnu.org; Wed, 23 Mar 2022 21:09:37 -0400 Received: from [2607:f8b0:4864:20::435] (port=41521 helo=mail-pf1-x435.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXByp-0006Ne-Mg for qemu-devel@nongnu.org; Wed, 23 Mar 2022 21:09:37 -0400 Received: by mail-pf1-x435.google.com with SMTP id p8so2768683pfh.8 for ; Wed, 23 Mar 2022 18:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b0XKP2Ef+y53BYCyKyPTqHJgjZoQgNcIIQRNIQlhHOk=; b=nCLWiAndUMLOf6iYZz8g2ICfLrwOSgVcaHysSnav0I1r/lHeCCey7l2WWiP7Yj5NN7 Z4MoCwV4KbNy5Aezqy+c1MLcNCZQ0acCz6sLnfhQ6MuCxv0vxq9KEVEUzVBcABc8yo/l vXT9ExSKPqmtUH4OfWP28gxE9JjUQfBprtESJ2v7jdHFXmC2adqVY4Zeky5HKBAaccCZ n/cmTEVFJmGuQsMS0xoe8C8JNLSHwMh4kUpSrbV0Z/jucwr16VAshHjEstKAKOsb0iNN nqiHoOSCdXU+bsEwJSn+JTiIlCqqnzxrbBCKmAuVTIvXfFCMICldcLVc4om3G/hQcQ9G Qqrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b0XKP2Ef+y53BYCyKyPTqHJgjZoQgNcIIQRNIQlhHOk=; b=SWwAuQvJuOoS9h3nqTcpiIjNEMv4wiOyxbldp8T49OjQsOQHx6AgMlFXBe1GrdU7GR HFr5PIkDr2iPr97udT32VNaJx5muja5AJ67CZayMEFf/H/TG4HPLrVdOuL4PXshsHeH4 I2UP7XBdGqBlIb470OZTPwkv+VwnVg6YFbe8gG1IVy31GhPzqxioLjdF4aBi0OLcG5cf VRV8PIFPNnaCvzulUv/Ul6KVlwugG2MDVMveJPLJt4XR9xHaKAWBopaK151gunZhc/KQ T3L5N9CmIAXMPlohQJE1eBAuvq6SBYO+hAgP4AfrWklK/JAjeNa/CgqMsWCe3YueYJSR /qwg== X-Gm-Message-State: AOAM530yzBD/B9MYsjWABdY92bfwJ2ledACcR1gOD5/WdCnJgXEJJib0 1BeYClAZZxIUAkFLTf2s4l0cDT8d6kNyCQ== X-Received: by 2002:a63:443:0:b0:383:f97d:a16b with SMTP id 64-20020a630443000000b00383f97da16bmr2040613pge.297.1648084174037; Wed, 23 Mar 2022 18:09:34 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id d5-20020a056a0024c500b004fae56b2921sm1009532pfv.167.2022.03.23.18.09.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 18:09:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] target/arm: Fix sve_ld1_z and sve_st1_z vs MMIO Date: Wed, 23 Mar 2022 18:09:32 -0700 Message-Id: <20220324010932.190428-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::435 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Both of these functions missed handling the TLB_MMIO flag during the conversion to handle MTE. Fixes: 10a85e2c8ab6 ("target/arm: Reuse sve_probe_page for gather loads") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/925 Signed-off-by: Richard Henderson --- target/arm/sve_helper.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 07be55b7e1..d45d088615 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -6734,7 +6734,11 @@ void sve_ld1_z(CPUARMState *env, void *vd, uint64_t *vg, void *vm, if (mtedesc && arm_tlb_mte_tagged(&info.attrs)) { mte_check(env, mtedesc, addr, retaddr); } - host_fn(&scratch, reg_off, info.host); + if (unlikely(info.flags & TLB_MMIO)) { + tlb_fn(env, &scratch, reg_off, addr, retaddr); + } else { + host_fn(&scratch, reg_off, info.host); + } } else { /* Element crosses the page boundary. */ sve_probe_page(&info2, false, env, addr + in_page, 0, @@ -7112,7 +7116,9 @@ void sve_st1_z(CPUARMState *env, void *vd, uint64_t *vg, void *vm, if (likely(in_page >= msize)) { sve_probe_page(&info, false, env, addr, 0, MMU_DATA_STORE, mmu_idx, retaddr); - host[i] = info.host; + if (!(info.flags & TLB_MMIO)) { + host[i] = info.host; + } } else { /* * Element crosses the page boundary.