From patchwork Fri Jun 28 05:08:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 808143 Delivered-To: patch@linaro.org Received: by 2002:adf:fe0a:0:b0:362:4979:7f74 with SMTP id n10csp194998wrr; Thu, 27 Jun 2024 22:22:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUux/3MdYRzRmuJ9kBjXlYRXJE65203Ou32CSxWvADhtSFnsh2GIbQs3IX4RUqAmOLxo7SzYeB/y6mRkAOqFVZC X-Google-Smtp-Source: AGHT+IEijxgQTEcOLKopP0y723rp/AIqJAwQCwvGK1+U5VJ9nkQUgey1pv0DNaI+Dbr53WqDNwcM X-Received: by 2002:ac8:5786:0:b0:441:581b:c113 with SMTP id d75a77b69052e-444d91aa4a2mr173240941cf.27.1719552152632; Thu, 27 Jun 2024 22:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719552152; cv=none; d=google.com; s=arc-20160816; b=vWBO6STuHf+ziy9BRmoDKfUXKv+NwUWvh3DL+q0VWDnGvMNo/6PnCo5hCqKoTZ/N3s sKg3dW/JVajRVruhJI3WUuFduT+Tdbawo1KduXHri9ZQ2UKrTbMcGRdhws5Wnyp9zH4N ncTjYJG/Ei8dwrAG7joSrFtLe8AEes6TyE8KbilXxumYbhZ7lcf2U6nNu9gHtouKWHaB wX+EQbHzdfGvKZ1RXuGdNOp+inm6v2QtzhlKchAvIhBv4mzvRL6BeN1oQQZC6k3RNw/M 4hiJTYcsZK1gGl0v4H22G+ihWUbTK+IpVe1VZNWfVXNyI3MCTn8bH0UhTy09xXc2/31h dgvw== 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:dkim-signature; bh=4TUFa5RFEE0mlvWgiU9FcmbW/faCfrest43wgdD9lPk=; fh=fQSRkfw+DkTHa5KQssXieneufL+rl3wPoA2jkVIsZpk=; b=NKP8zDnu7/+ueDq6kBwNOVh5VQyztq3b45t+jL5YRVGbdnD5m0TMPmli9bdKtl9lhk 3YY7xkAyht+r35QBPaAxyXww08BZ3vE75RuLx/JK8kWr1hjE4J8b62jBZS0k3oURlJoN FF3X6JxdAwuEBIPhdlthmiYbPjj1/SZayfdfr7v4KWjUsyJQVXQYIMP3gfSze4YGXTbG Skg8qVUjPko5dL/MczrfBBhZSg2/MAK/0RT8y6ZkAd51f6yOjThQqj1ET7A8U+2U+DP6 JFT1PDNPqKve4Pf1HPIQ1AQ181GuBVsX3nbmlvS+9/4+1zVH0bRY3TwxGIuUVD99LGO2 z9aQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VNQHBiuO; 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 d75a77b69052e-446514b922bsi11596931cf.530.2024.06.27.22.22.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Jun 2024 22:22:32 -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=VNQHBiuO; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sN42p-0003GH-H7; Fri, 28 Jun 2024 01:21:11 -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 1sN42o-0003G5-Rv for qemu-devel@nongnu.org; Fri, 28 Jun 2024 01:21:10 -0400 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sN42l-0008D7-He for qemu-devel@nongnu.org; Fri, 28 Jun 2024 01:21:10 -0400 Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-375f5c3ddb1so1121485ab.1 for ; Thu, 27 Jun 2024 22:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719552065; x=1720156865; 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=4TUFa5RFEE0mlvWgiU9FcmbW/faCfrest43wgdD9lPk=; b=VNQHBiuON1gUNpJRthIe+yg9Qt0QjasWUew7+7eGsGOssBNzF8IDHCF/Gam3GtzlIs 1zQWm8EEh0DKTh7MsB588YwZ56fuTAWMdYuQV4xCKXnq9ln8A6ncRZ0qQo0GxEjyxTnZ MyqCliQiMcnp1ODcrEVtB/GdYU0CWqKFXa8jx2OiUvsWj8G665GxlpOTLnHgavPHr5GJ OJnhAYhDwYYcbVsJEDataLzZm7medSjn7SfPJqZt/2JZWsHiwUUduI1iYiH4eMX+otO0 3FbBE0rDd8VZcFUP+dUIa36AGgquqGZgNyTZuNBAcKBvWZhTEWMr1cJzm4WR6bpgDKtY nFSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719552065; x=1720156865; 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=4TUFa5RFEE0mlvWgiU9FcmbW/faCfrest43wgdD9lPk=; b=HDtE8iNYIfxEt48KHTaoQRAzzeSWsH2XMmdFKSfqCI084iji5IlgXBx9esK9lcydT7 kJiSB1ARg8G4K91adJnLhM6k8GgSmxVt4Sihv0sLfqVacBIbH1tiMOxeLxLqYNGmGoVi gnyhpiw09/kcVyF8hMWKLb0xVXxEHNBT8TAKEcFkATT6bvxk4gxvN6PDZgTd+i1OCxSp mncGlzlJZVhWrjOkccHCSk9+YDDcmAOzH7aj3nkfeYGAQIzG3SEevIXkNTZOx8GAuBVU SJhNwxzUT0uYoMCkyYpPP9pAISbQ34N7rJG+PZ1RR9qGzQw5DPnaMhP8Ih5pjhNvaEDi RZ5A== X-Gm-Message-State: AOJu0Yx43gXeeJKBTZVw8hzEhDZ5V+l0dNO08cFfvAlda7q1j1D/OHS3 nmuvrgqjIPjMfe6YnKU7QZyubjAUO61JHk4PXHbjWwuGLhgvuONJTr1nRUqgTavhor9mEqbmMsv t X-Received: by 2002:a92:c54c:0:b0:379:86a8:e42e with SMTP id e9e14a558f8ab-37986a8e56amr51904945ab.0.1719552065546; Thu, 27 Jun 2024 22:21:05 -0700 (PDT) Received: from amd.. ([2804:7f0:b401:391e:3e7c:3fff:fe7a:e83b]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-72c6b2a16cdsm423932a12.46.2024.06.27.22.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 22:21:05 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, philmd@linaro.org, alex.bennee@linaro.org, richard.henderson@linaro.org Cc: peter.maydell@linaro.org, gustavo.romero@linaro.org Subject: [PATCH v6 04/11] target/arm: Fix exception case in allocation_tag_mem_probe Date: Fri, 28 Jun 2024 05:08:43 +0000 Message-Id: <20240628050850.536447-5-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240628050850.536447-1-gustavo.romero@linaro.org> References: <20240628050850.536447-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::130; envelope-from=gustavo.romero@linaro.org; helo=mail-il1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, 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 If page in 'ptr_access' is inaccessible and probe is 'true' allocation_tag_mem_probe should not throw an exception, but currently it does, so fix it. Signed-off-by: Gustavo Romero Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson --- target/arm/tcg/mte_helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 037ac6dd60..a50d576294 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -96,6 +96,9 @@ static uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx, assert(!(probe && ra)); if (!(flags & (ptr_access == MMU_DATA_STORE ? PAGE_WRITE_ORG : PAGE_READ))) { + if (probe) { + return NULL; + } cpu_loop_exit_sigsegv(env_cpu(env), ptr, ptr_access, !(flags & PAGE_VALID), ra); }