From nobody Wed May 15 00:13:22 2024 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1618223621; cv=none; d=zohomail.com; s=zohoarc; b=dsfnjPvek4RYgFtUhjZW0B4WDbXQSrlRVS/qZvyVUna6ujpCvROs4eON1Vhb2sGjUDfpfkcBKTRPr8QKrgtOw1I324PhCHkYHypvsgrHmm/VzvvlSWKN69XSUF7NzQTf5I9ISXu8jFmbSsIEEA7RBXYUWoSFq701vLJ11nhcWVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618223621; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xlfjf/uSOBy2ns+mImu3cJYZVqSzF2h27OuzEQHXbV8=; b=OcKx8mjfe5PYV9KzsrFoYZtWqeUuZd07hXvanE6ya9fsi7DeYHZdI4HLP7aS6KjIeZn8aiiRn/BTYxfWN37oGWsI7BSHKICAGQ8Se5MiQxxDfZWQl4G6OyYpplWyv1hIWA0Jr28bsCexYSR7r8ZyU9rGbSRdNjhXjsZBkuIp5EM= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161822362116780.92491657652295; Mon, 12 Apr 2021 03:33:41 -0700 (PDT) Received: from localhost ([::1]:48666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVtsy-0007qN-0k for importer@patchew.org; Mon, 12 Apr 2021 06:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVtrK-0006cb-DO for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:31:59 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:44710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVtrI-0000Fq-60 for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:31:58 -0400 Received: by mail-wm1-x332.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so6555582wmi.3 for ; Mon, 12 Apr 2021 03:31:55 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d2sm16878651wrq.26.2021.04.12.03.31.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 03:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Xlfjf/uSOBy2ns+mImu3cJYZVqSzF2h27OuzEQHXbV8=; b=TYx5pXp9d3FgrYZ1FMp9MtsKnDOkX5tSR2+v+jPf74Bq9ZXgNH6IGKS4mZ90NhhYoq ip2RNeSIjlApNsh1ZRIApF2apx1zTRyFVWUrdFgAdGoLoMcc/Q+DT/PhRJi/H1yA5ap+ Rcf0TG1jQcq54ox+ClLTDcM+P9i5xrWvIJuXGw1oPGIQiG8ksrZ3ZC4vGMWU+agC6j/0 ktKNWXPWklx6ZtNwEfnzIkGvTvjN2Gnvu0kFGqV2qAjDTTofitPzbahOClOAjB9cwKR9 CyGUL+YmTO1kRg5WmMdlgj5/G9K8fRE16B8ZrloghoMLVgUkOk3rDegNE0Auj8ZRP/e6 4SVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xlfjf/uSOBy2ns+mImu3cJYZVqSzF2h27OuzEQHXbV8=; b=k0USeO+W1Ekm52oFqpAFkq8GYvvwwgKHzaTjsBPdhsJU+zapArXKYOqx2TXnM0t+z+ kI4fpAT6P2yRAbC0Iy4XukjxzrMeY8i6BpnSLxBlMn29V8Tck6ukwUXTrcvxLrm41kLH 2YD0TLfIoneaOAoZ6v7EoVR9bF+p6fsO2Z9q6VgbW4UoFdjZNBxVW4jhXWzSUPMiEM6A KXLvXs66Omm36PtmjbGG4i6c1+Fr41mbJdonVvtPbPm6giMrCRKjLVqfqXlastBG2LsG eGydmopDwUiuLSn/tgzC1c4j/UNKR1sNTiUJLjJOL4ph4m+Cev8NCMWqMD9Z6RUGkeIv GKWg== X-Gm-Message-State: AOAM533Jg5zxBu0Gl92pCfLbKGKgnevf2GUVH9s4EHPWpFE0V/8c/ctE KktsAC4ZqK9ULrH0qdgxd+/Vhb2VRWADQO42 X-Google-Smtp-Source: ABdhPJzz4yI6utU8kXVd0h39LrTnNfOT78YqowoufeSAC8+P0PZZLxIlFoOQwSdrL8ysZfv2RQOiCA== X-Received: by 2002:a7b:c20c:: with SMTP id x12mr11775145wmi.51.1618223514326; Mon, 12 Apr 2021 03:31:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 1/5] hw/arm/virt-acpi-build: Fix GSIV values of the {GERR, Sync} interrupts Date: Mon, 12 Apr 2021 11:31:48 +0100 Message-Id: <20210412103152.28433-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210412103152.28433-1-peter.maydell@linaro.org> References: <20210412103152.28433-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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.23 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" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Zenghui Yu The GSIV values in SMMUv3 IORT node are not correct as they don't match the SMMUIrq enumeration, which describes the IRQ<->PIN mapping used by our emulated vSMMU. Fixes: a703b4f6c1ee ("hw/arm/virt-acpi-build: Add smmuv3 node in IORT table= ") Signed-off-by: Zenghui Yu Acked-by: Eric Auger Message-id: 20210402084731.93-1-yuzenghui@huawei.com Signed-off-by: Peter Maydell --- hw/arm/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index f5a2b2d4cb5..60fe2e65a76 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -292,8 +292,8 @@ build_iort(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) smmu->flags =3D cpu_to_le32(ACPI_IORT_SMMU_V3_COHACC_OVERRIDE); smmu->event_gsiv =3D cpu_to_le32(irq); smmu->pri_gsiv =3D cpu_to_le32(irq + 1); - smmu->gerr_gsiv =3D cpu_to_le32(irq + 2); - smmu->sync_gsiv =3D cpu_to_le32(irq + 3); + smmu->sync_gsiv =3D cpu_to_le32(irq + 2); + smmu->gerr_gsiv =3D cpu_to_le32(irq + 3); =20 /* Identity RID mapping covering the whole input RID range */ idmap =3D &smmu->id_mapping_array[0]; --=20 2.20.1 From nobody Wed May 15 00:13:22 2024 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1618223622; cv=none; d=zohomail.com; s=zohoarc; b=XPD6qdPC6iHsr1ycyyNyk5doQvvACvbD0/AdBW8qer0Z+AR3ua4j8Zbsdk7fOalLs7KacOG4qe3vCVhSBvXXBQuvgwTwMcicPKJS0XNmY65Yxiy99Jdff88GUTFh2mZGo+mLMIlpPMJCfq0GCIjjmCNJBMxCHxCUC49PEsezmtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618223622; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9+bh8eVoMeOAJ6lrKtP7/rJGWDFxQo0M/ATCBKga2/g=; b=Mp53+WJajo81bcTDssvseLIk6zUQVIARRa35kfqXrTVSd6nxaJ5AohuKzm5mgo6kH1XK2ZoHjQ5N6kt9zJwK9UA7O59mLbfNlOfz2Mpxq2hBVLxCG6RcuUkxG5HEMf8SfR/8RNsdDqmGvPHt9fAQ044XAM8TkM8xhTPHbXUOeoc= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618223622097406.31775376460257; Mon, 12 Apr 2021 03:33:42 -0700 (PDT) Received: from localhost ([::1]:48772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVtsz-0007sx-0Z for importer@patchew.org; Mon, 12 Apr 2021 06:33:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVtrM-0006dV-1S for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:32:00 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:52846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVtrI-0000GU-B8 for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:31:59 -0400 Received: by mail-wm1-x32b.google.com with SMTP id y204so5095998wmg.2 for ; Mon, 12 Apr 2021 03:31:55 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d2sm16878651wrq.26.2021.04.12.03.31.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 03:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9+bh8eVoMeOAJ6lrKtP7/rJGWDFxQo0M/ATCBKga2/g=; b=yyaHmiiUIpTITKA4nBFBtOrKKVDMiv7KTikHRufqxuLDh7T4+uo6dI+7Lo1UB0g39l sMfn599ARc2Rs3hGd71boUBZJN1qGLkQFHOWL6CIk/hxXJvKWz6eWwJjRS/qGcVuGqmy 7gxUksX2PveHpwLYZ2N0bg+OSnIU/QjqN31Ei9ZuUPnFEoCaxCfEfMG4XFQps17eikBZ hOVFU7F8qeyI+OUeIYhAsvJmecfuSVAZh8t5nY+DRuz9XX0KTnVUpsrI5f5kD0/r7PkL 8wIgxgvQ5yUwTPJNoQOU4wMSsPl4qjWlhdtqIbryYR9eIQyYJxqo3qOnlmx4EG2l1Q9b T7+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9+bh8eVoMeOAJ6lrKtP7/rJGWDFxQo0M/ATCBKga2/g=; b=XIHHGneshCPuNxkCUYg3zgLjLFSpDQUdXyS8f0sHUQizooV6Z5hh+kRHfOYkEY/Ebd 6XaUksbidchnuhMqz/HEV8nDHFnfeZphHjCAPYXmorgbHdpli2GWERxGsZvQHrQpDHYH gyCYUSOGRQm2Mu02BWv37Ku5x0BIlVmmFtadUWf/xkeDbaZBJd6wWivRKlukCn5ihgrp cUx06ToSaZItzQNtfWsLMqEGF38MOrlg4IiG62JOUJ9HyBPVXZpCP86EyUpX5WBnSOI4 BazhXAKhzLeHcj27hRGXXeoh+PtlyVbfIudG1uzD/5j8hGVLlK3RosO9zl7NkOBV+FmA WtMg== X-Gm-Message-State: AOAM532TsRV3h0sWiRgoA2v8MLztPkVH+aP0BF3C/yU41lhVmwqIoQn4 SEohbO9kJ+BmzeNziq90xTpV/iG8ruXrq9tX X-Google-Smtp-Source: ABdhPJx2ZW1+o1UFMeMdOHlIUFh/nj6AK6FKSqIClsPgnki6VyAjVY9xIP9a04j7RdLGaFH4PcD+LA== X-Received: by 2002:a1c:2587:: with SMTP id l129mr25800038wml.135.1618223515098; Mon, 12 Apr 2021 03:31:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 2/5] hw/arm/smmuv3: Emulate CFGI_STE_RANGE for an aligned range of StreamIDs Date: Mon, 12 Apr 2021 11:31:49 +0100 Message-Id: <20210412103152.28433-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210412103152.28433-1-peter.maydell@linaro.org> References: <20210412103152.28433-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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.23 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" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Zenghui Yu In emulation of the CFGI_STE_RANGE command, we now take StreamID as the start of the invalidation range, regardless of whatever the Range is, whilst the spec clearly states that - "Invalidation is performed for an *aligned* range of 2^(Range+1) StreamIDs." - "The bottom Range+1 bits of the StreamID parameter are IGNORED, aligning the range to its size." Take CFGI_ALL (where Range =3D=3D 31) as an example, if there are some rand= om bits in the StreamID field, we'll fail to perform the full invalidation but get a strange range (e.g., SMMUSIDRange=3D{.start=3D1, .end=3D0}) instead. = Rework the emulation a bit to get rid of the discrepancy with the spec. Signed-off-by: Zenghui Yu Acked-by: Eric Auger Message-id: 20210402100449.528-1-yuzenghui@huawei.com Signed-off-by: Peter Maydell --- hw/arm/smmuv3.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 3b87324ce22..87056125357 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -980,16 +980,20 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) } case SMMU_CMD_CFGI_STE_RANGE: /* same as SMMU_CMD_CFGI_ALL */ { - uint32_t start =3D CMD_SID(&cmd); + uint32_t sid =3D CMD_SID(&cmd), mask; uint8_t range =3D CMD_STE_RANGE(&cmd); - uint64_t end =3D start + (1ULL << (range + 1)) - 1; - SMMUSIDRange sid_range =3D {start, end}; + SMMUSIDRange sid_range; =20 if (CMD_SSEC(&cmd)) { cmd_error =3D SMMU_CERROR_ILL; break; } - trace_smmuv3_cmdq_cfgi_ste_range(start, end); + + mask =3D (1ULL << (range + 1)) - 1; + sid_range.start =3D sid & ~mask; + sid_range.end =3D sid_range.start + mask; + + trace_smmuv3_cmdq_cfgi_ste_range(sid_range.start, sid_range.en= d); g_hash_table_foreach_remove(bs->configs, smmuv3_invalidate_ste, &sid_range); break; --=20 2.20.1 From nobody Wed May 15 00:13:22 2024 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1618223927; cv=none; d=zohomail.com; s=zohoarc; b=TvHL85+HbH1QgdFzfKEV7pvYZS5L55BjuYLpBtzj/9GL70DQQXMWw/aTwFaZ4vKircg0aSdPcdh2AtE8WUIPQPHH/Srvt5SdUxSDpdQ+9bOgvklzO1cmBq0EKoW15MBUd6VYVbr0nM3YRscum6OpqXCMQFa8NEbOyuSb6v4zOP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618223927; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WFLJbGhE1omvnPeejul3ZahtYgEU6PZGKxsRZGCHWNM=; b=RZz/K1900AfPwOL/5BUiWsT9+MyBerEB/20dAVte6VF0XZJTr4iQtNhG+F3Uqx9JkgVDLw3y+uZjhM7seO1mxtBUUPB2scyTlumjaIc0wkmp6AVFiTf9qp7KWuwheRJ0tQdant0bmV4OuydGVo5cLVTtjDKvIaKaF/BvRF4yLI4= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618223927426457.74333733558467; Mon, 12 Apr 2021 03:38:47 -0700 (PDT) Received: from localhost ([::1]:32798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVtxu-0004QY-40 for importer@patchew.org; Mon, 12 Apr 2021 06:38:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVtrN-0006dq-9S for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:32:01 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:42701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVtrJ-0000GX-17 for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:32:01 -0400 Received: by mail-wr1-x42a.google.com with SMTP id p6so5638851wrn.9 for ; Mon, 12 Apr 2021 03:31:56 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d2sm16878651wrq.26.2021.04.12.03.31.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 03:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WFLJbGhE1omvnPeejul3ZahtYgEU6PZGKxsRZGCHWNM=; b=pAD706xVHuk+aXwxiv2xa6iyV0rSBlBFOlChgP7eohjTBo8RMvqg5rnYG8EwWtgd7x /LsnvWbCOW7sk2kfEO0NmsKecepfhZxu/IXHwTnd99WWsCEOPfgJAj/IYxyp5JNasLbC OgwLGV6BW8u+XVCQkRRGxVH0CRzwnC4bMNJ8GIOS1DrI4hbhKQ4Dto0VlEUl0ypCEBPv 59DbpUj8tQb+yCIWMGxqQ2pwjot/NSqtZl8od1YmLthDV9l5LXO9do0wkvW1Qpc4ZYk4 lB63ZtNqbM1qICT3SFNXmu8O9+gqz6duXlWhd51ei2GD6NCtVKm74NFvc3Lmxml2QdQC /v4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WFLJbGhE1omvnPeejul3ZahtYgEU6PZGKxsRZGCHWNM=; b=bosUQ+pvE7ghg5YlvOMjin4Ts6c+qjjsSB1FhRyTeMiallsI7xOLGju/Amz/+JjJAy qzHDPliXXF6k3nU5hzLvsLkIOh4TKfmwQ0U7lflkpiT0imrdbLXxhu7fydIuIBk1aoF9 ReLUqkJfQmMOPGIcqFP+Ela3deLph0/sFFl0gnnqE96ZPK9mjnhcvxhbt1r0++eLFgZk NA3qRNWxRpb8UlATLsuYQ9FyJlJwW3gB1QNp5P82+pVvFXqwloMGemahky0C2gXzMEll beg8y2i0ehJKKSMUDSEmVd8w1WH/Df01l01qHKP5sAx/IEahE5goonRHacBOfhLv/XT2 cm4Q== X-Gm-Message-State: AOAM531RZv/p9m8YUelrHuml11ew86oeEY38HqG34nth/jyd9FQx28Rw DNMINREzsyM7P6SSedk2atyedaksRsXLHPk5 X-Google-Smtp-Source: ABdhPJw2DVe0bGXFHY95xq/aXhT4e3oaPgrBm2HExgMZ6pGhF2Om1uTEt7NUedq7WorJRCvvqnlh3A== X-Received: by 2002:a05:6000:1449:: with SMTP id v9mr7045567wrx.295.1618223515716; Mon, 12 Apr 2021 03:31:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 3/5] accel/tcg: Preserve PAGE_ANON when changing page permissions Date: Mon, 12 Apr 2021 11:31:50 +0100 Message-Id: <20210412103152.28433-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210412103152.28433-1-peter.maydell@linaro.org> References: <20210412103152.28433-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.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.23 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" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Richard Henderson Using mprotect() to change PROT_* does not change the MAP_ANON previously set with mmap(). Our linux-user version of MTE only works with MAP_ANON pages, so losing PAGE_ANON caused MTE to stop working. Reported-by: Stephen Long Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Signed-off-by: Peter Maydell --- tests/tcg/aarch64/mte.h | 3 ++- accel/tcg/translate-all.c | 9 +++++-- tests/tcg/aarch64/mte-6.c | 43 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/Makefile.target | 2 +- 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 tests/tcg/aarch64/mte-6.c diff --git a/tests/tcg/aarch64/mte.h b/tests/tcg/aarch64/mte.h index 141cef522ce..0805676b116 100644 --- a/tests/tcg/aarch64/mte.h +++ b/tests/tcg/aarch64/mte.h @@ -48,7 +48,8 @@ static void enable_mte(int tcf) } } =20 -static void *alloc_mte_mem(size_t size) +static void * alloc_mte_mem(size_t size) __attribute__((unused)); +static void * alloc_mte_mem(size_t size) { void *p =3D mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_MTE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index f32df8b2404..ba6ab09790e 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2714,6 +2714,8 @@ void page_set_flags(target_ulong start, target_ulong = end, int flags) a missing call to h2g_valid. */ assert(end - 1 <=3D GUEST_ADDR_MAX); assert(start < end); + /* Only set PAGE_ANON with new mappings. */ + assert(!(flags & PAGE_ANON) || (flags & PAGE_RESET)); assert_memory_lock(); =20 start =3D start & TARGET_PAGE_MASK; @@ -2737,11 +2739,14 @@ void page_set_flags(target_ulong start, target_ulon= g end, int flags) p->first_tb) { tb_invalidate_phys_page(addr, 0); } - if (reset_target_data && p->target_data) { + if (reset_target_data) { g_free(p->target_data); p->target_data =3D NULL; + p->flags =3D flags; + } else { + /* Using mprotect on a page does not change MAP_ANON. */ + p->flags =3D (p->flags & PAGE_ANON) | flags; } - p->flags =3D flags; } } =20 diff --git a/tests/tcg/aarch64/mte-6.c b/tests/tcg/aarch64/mte-6.c new file mode 100644 index 00000000000..60d51d18be5 --- /dev/null +++ b/tests/tcg/aarch64/mte-6.c @@ -0,0 +1,43 @@ +#include "mte.h" + +void pass(int sig, siginfo_t *info, void *uc) +{ + assert(info->si_code =3D=3D SEGV_MTESERR); + exit(0); +} + +int main(void) +{ + enable_mte(PR_MTE_TCF_SYNC); + + void *brk =3D sbrk(16); + if (brk =3D=3D (void *)-1) { + perror("sbrk"); + return 2; + } + + if (mprotect(brk, 16, PROT_READ | PROT_WRITE | PROT_MTE)) { + perror("mprotect"); + return 2; + } + + int *p1, *p2; + long excl =3D 1; + + asm("irg %0,%1,%2" : "=3Dr"(p1) : "r"(brk), "r"(excl)); + asm("gmi %0,%1,%0" : "+r"(excl) : "r"(p1)); + asm("irg %0,%1,%2" : "=3Dr"(p2) : "r"(brk), "r"(excl)); + asm("stg %0,[%0]" : : "r"(p1)); + + *p1 =3D 0; + + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction =3D pass; + sa.sa_flags =3D SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + + *p2 =3D 0; + + abort(); +} diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index 56e48f4b34f..05b2622bfc9 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -37,7 +37,7 @@ AARCH64_TESTS +=3D bti-2 =20 # MTE Tests ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_MTE),) -AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 +AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 mte-6 mte-%: CFLAGS +=3D -march=3Darmv8.5-a+memtag endif =20 --=20 2.20.1 From nobody Wed May 15 00:13:22 2024 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1618223863; cv=none; d=zohomail.com; s=zohoarc; b=RpmpTEHbOB1yT9nKnjLqQszgU8p/93JB2+oCdA2+WML/mjdO22NNzPmlo89jjSyFD6b0ZnadBS9bhNX4fg09W2zBYNDhIAKGNEnpq/5zIcnHd8UL8lF5091uAkv+3+C0JqHz8RDNiFYCOi9kIXCTi8fRNC/T3xiYWhjedNNHbIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618223863; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MjfoM0Tks4eQc7j9h/yQNaMry9uJE+PRMj4/Mx8eY0c=; b=HZ3MGeVl4jAcsBN4x/RxvuaqVTJj8ruNXw0brESMX10es3WZ6fpig/Ol8krWXrS+nmwvFzy3+nizHtjP3QJqgnF5cbFTo5j53uBjgck9epB9ZBDauy0zG+O2IwK+e4VQXl9vVoNMDU9i4jQKKAa70d2u02qAuiN10zijGrOjH6Q= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618223863055835.7006114050881; Mon, 12 Apr 2021 03:37:43 -0700 (PDT) Received: from localhost ([::1]:58414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVtwr-0003Nb-OW for importer@patchew.org; Mon, 12 Apr 2021 06:37:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVtrN-0006dh-4X for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:32:01 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVtrK-0000Gs-0U for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:32:00 -0400 Received: by mail-wr1-x42c.google.com with SMTP id p6so5638878wrn.9 for ; Mon, 12 Apr 2021 03:31:57 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d2sm16878651wrq.26.2021.04.12.03.31.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 03:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MjfoM0Tks4eQc7j9h/yQNaMry9uJE+PRMj4/Mx8eY0c=; b=d8qwOd2E11UeRyOfUjp+TYmZSWJu0RjP8b2Wpl+cWC1+NOM+FrnEz+kmySLUPIZobz NGvxXtZM2RRHj/V0ueNt7JfwNOvpwD5nvlbmEowB/0hXDhrc4p8TFob8EjHqOjqBB3xg kjthSK5ZzSD5ux/SHkd/ib3h+z5fNiBsPvApcVv1knKVFCIQPwyiFjMD523KLAwSyuHx oKsTI4380ntufhDwwzSqSYbWAgD+fxHgIFyUEwtIPcO9wxxoGcdsvGm2y5zia0KTfohP K+BD9E4ia352q8Yn0ieCZbmlhO9l2OllOAQHUY7RAzqwyumk4QEqZUV1ozXCtET09jTE hspw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MjfoM0Tks4eQc7j9h/yQNaMry9uJE+PRMj4/Mx8eY0c=; b=kuYMFKnjTpZC5O1pECGuVD2nbbazp+596zspAfW9M21g3/QQUQ3bEAOSRxlAwmbAew hmyf6NkpHuo/dMh5mBUSvmfr8bZQjPhUnDndJ97xINOSzjeaTIEk9Qs8YUSHtAmwtBSe VLOv/+BptCwxgufMdqj0NNFddCY5zJoZleu1BWtzFVdbsnqKGhN/woJk/Wu+ZO1/D7uc CmDJKvBj0Ua34Ra7aOBCvEn7EwkyJuxA4xZVXQdmVI3CCPEyr3yvhoqR9JTuXB9iIwmm 2pdXFTqaevRGpWblFGN2r5AXfFiXsv70Sl3/MW7bxlzICaWZr9z6QLbCFtSsqyU81wy2 L9Sg== X-Gm-Message-State: AOAM532jtIouA6Fl0ydzGZVe9H/+SjBV+KywcPBQeI5FpCbjEb6156EP Ah8msUDd6117e0ro9ji3trygZ4EKwWoaDSVk X-Google-Smtp-Source: ABdhPJzyR2XI/qpQv5/r7/6Imrm3KdKPhPukAxEaaiNIZqe9Ua0Fx8yqlysmkoA4XCiXJTyY7s7cHA== X-Received: by 2002:adf:f48e:: with SMTP id l14mr30606885wro.257.1618223516396; Mon, 12 Apr 2021 03:31:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 4/5] target/arm: Check PAGE_WRITE_ORG for MTE writeability Date: Mon, 12 Apr 2021 11:31:51 +0100 Message-Id: <20210412103152.28433-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210412103152.28433-1-peter.maydell@linaro.org> References: <20210412103152.28433-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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.23 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" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Richard Henderson We can remove PAGE_WRITE when (internally) marking a page read-only because it contains translated code. This can be triggered by tests/tcg/aarch64/bti-2, after having serviced SIGILL trampolines on the stack. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Peter Maydell --- target/arm/mte_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 0bbb9ec3463..8be17e1b707 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -83,7 +83,7 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, int = ptr_mmu_idx, uint8_t *tags; uintptr_t index; =20 - if (!(flags & (ptr_access =3D=3D MMU_DATA_STORE ? PAGE_WRITE : PAGE_RE= AD))) { + if (!(flags & (ptr_access =3D=3D MMU_DATA_STORE ? PAGE_WRITE_ORG : PAG= E_READ))) { /* SIGSEGV */ arm_cpu_tlb_fill(env_cpu(env), ptr, ptr_size, ptr_access, ptr_mmu_idx, false, ra); --=20 2.20.1 From nobody Wed May 15 00:13:22 2024 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1618223765; cv=none; d=zohomail.com; s=zohoarc; b=aYypiDj6zoEEZhaIQRFHJJdtMevjs912BhFk+FCyOj2gjgB4srx9BE9rftAkqOJM/nIMNM38aPOZ50FpNC1noSMsLSwMXghbYKvpdJxpPxHcq6UT/CgXoeatAELYVjFlnVMmdlh4Bg+qDm+9S4ottxTlS1PhvmYfBFC5WcHvx7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618223765; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oWU1kygVLo7ldjo0ixVCnQHyf6wt0Q/JBWtp1dEHIcY=; b=UGMZrcNFCGjsUoIpwuRMwgHUnG4NT+t7A28wty8F8p5sf9uECZ/CQy/x9n+GGNHUSGVoY43Y0K8sF4v5b56xfEryfBijvcgtKh4Ho4SjilwsfhLAAQt6JK6VzWNwqshDT+jP75BLuUkGxC4aufirn4l9ailBQ/8SZSrw+hhtrLs= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618223765328914.3681359009714; Mon, 12 Apr 2021 03:36:05 -0700 (PDT) Received: from localhost ([::1]:54368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVtvI-0001gW-8a for importer@patchew.org; Mon, 12 Apr 2021 06:36:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVtrM-0006df-UD for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:32:01 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43794) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVtrK-0000HW-A1 for qemu-devel@nongnu.org; Mon, 12 Apr 2021 06:32:00 -0400 Received: by mail-wr1-x42f.google.com with SMTP id x7so12343231wrw.10 for ; Mon, 12 Apr 2021 03:31:57 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d2sm16878651wrq.26.2021.04.12.03.31.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 03:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=oWU1kygVLo7ldjo0ixVCnQHyf6wt0Q/JBWtp1dEHIcY=; b=M0zUzmlrVzdDo6LFgoTlKyQosEUwF8epA6BoRuWX6dC2RkefqzpkFDyDd0z6/Gvyl+ UL4KGmbMvkTwxh5omIkvJgY3tMq+Eo0BOhR6tnEPcabhckBfvEYYEI9TicoDvQAlY5Hp j2vAU4TFWZv5RPYzUUKzC3OiX8GL51MoFMM/DGXPP8Qr/a5X+y13k2AuXdaea1E+ftI3 TeUIGCvFuPxyFkikHoY2bEBT6fVaLSKxDsSboxpr+Z017NSx/iZI8JFa0uDpQufTA/5O lpmO5aehGgL0Y8jT+Ic/3uVkuvi4sOeGPYOykirXqFP/yoc37CbVwqUsDfP2aPbduh9c +IVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oWU1kygVLo7ldjo0ixVCnQHyf6wt0Q/JBWtp1dEHIcY=; b=MFcpWBHRb60/JwDhA3Lu2DxcwJn9emtZp5pkOi7As8LpZf7owmApufouUcd2XWIEv+ 4KC7aMFB4l18kE5XnS8QbQun3Sa+4rpkzA0CSvmi+Qqic9JWbOm3GTe2/UTkU7E0xjSH +vwR1aJdEtT5gxmsJiEVruaWsHM0LmmxgTFJSG/lycIxcQtuoFE/ZRJgbfbQQOJAZ2GX o+loIoQ/Jspxs5hctln240MxsNsnzaynv/fNhZoskhi29u8+52Vo4VL9tHWVObENrLfY 6Wd2w32s2OVp0OnrepQ8zs6MEHRmP3emnVYWOHj9ayeyLC+CjzXRtVy2p2KNba4gUeIT 2VGA== X-Gm-Message-State: AOAM531XH9IpQFwu9pGQoZMHkB4gj4Og3jEzIHL/qo8MflNlSlGUByGi Iq6F4MWRX0KVlfEaO0UkAIn2Yc08OI3riaX6 X-Google-Smtp-Source: ABdhPJwgg+YFaMA2IZsd5fWHPoK2GaySQCKshuw++By2xy2m8AjBt1RDL1ZQudNJ/n6SYutYUWgcXg== X-Received: by 2002:adf:ea48:: with SMTP id j8mr22772623wrn.365.1618223516980; Mon, 12 Apr 2021 03:31:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 5/5] exec: Fix overlap of PAGE_ANON and PAGE_TARGET_1 Date: Mon, 12 Apr 2021 11:31:52 +0100 Message-Id: <20210412103152.28433-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210412103152.28433-1-peter.maydell@linaro.org> References: <20210412103152.28433-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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.23 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" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Richard Henderson Unfortuately, the elements of PAGE_* were not in numerical order and so PAGE_ANON was added to an "unused" bit. As an arbitrary choice, move PAGE_TARGET_{1,2} together. Cc: Laurent Vivier Fixes: 26bab757d41b ("linux-user: Introduce PAGE_ANON") Buglink: https://bugs.launchpad.net/bugs/1922617 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Tested-by: Nathan Chancellor Signed-off-by: Peter Maydell --- include/exec/cpu-all.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index d76b0b9e02d..32cfb634c6a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -268,8 +268,8 @@ extern intptr_t qemu_host_page_mask; #define PAGE_RESERVED 0x0100 #endif /* Target-specific bits that will be used via page_get_flags(). */ -#define PAGE_TARGET_1 0x0080 -#define PAGE_TARGET_2 0x0200 +#define PAGE_TARGET_1 0x0200 +#define PAGE_TARGET_2 0x0400 =20 #if defined(CONFIG_USER_ONLY) void page_dump(FILE *f); --=20 2.20.1