From patchwork Fri Aug 4 18:53:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 710229 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp150439rwb; Fri, 4 Aug 2023 11:55:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECc1qn8aTlDj79Vxq68QR18r9zlYwRnokvFoKYu2fCcNAoYiHFnAJ6aRagH6Ndslx5xk77 X-Received: by 2002:a05:622a:5c9:b0:403:ce1f:fd51 with SMTP id d9-20020a05622a05c900b00403ce1ffd51mr3885829qtb.55.1691175337400; Fri, 04 Aug 2023 11:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691175337; cv=none; d=google.com; s=arc-20160816; b=CruIjamJ9mAK9V5J/Mvu76oVywLlDZaM1gwRUWvAwcH0Bo9EO3wP96uV6QVL1hz6V/ 6YBHyIJK1sFqOx2Yxmx9dFF0pE2t9MZtHPZ2Q7GtHCIU/fPhJ2tPL31r5Ef8CS/ST23d 5DwycqVA9S8jbdT0d1lmJycY5w23E3Cob3eJlayOqxulwP6cmGSZ2XN23kBtsplK8z9V 8x4+RRuCdDgRxhndvKnhIBfYCQAXhL0D47VtwRngIETkv3Nv8kMyTEzXZmzEaMw7UJJ/ bpfXonpoaeyHgz2CK8aOVjduSPOcDFjvdO5Ol5v22LphxYTbTIjkcaYfKWkjTaX4adrX A0LA== 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=jb8hMv+PxnuJ4RcH2a/HmuRT8tZY7Jhx8I49sjpWcww=; fh=q8kquewWrepzqmq3nHS+hJTfjGAHzh7HW/o6ooL2YMw=; b=nu5BRs046kx5gL6SU0BQpo6ttAF/LifCRQSFV4UaNsoRJaS3mN4NbcoTGHqcNqsNQW wtzVWaK8Bu33qHwzwrrsITU6GRA6RTVLTOVqrFqo58D3d1ICVv1oJ0w5Mmr8Zx+K/q0W wP0J+3opQvh9tn+RURhhS3qsMBrAO81VXTR8WY5lDbslH834qfRDof26RTjtUAe5aGbf Sq/r72LVXqe7JhWlaORWZbO9jHPIPvb+t2suECPl6aWI5pzIU2Axgdigrnin/LjDSTUC 50weqAqnFicI6Q7B6bEwoPxDWbKE3CbUyNRZWo++PuUw6M/cWnf5w0exe23oY1hzmDas 1InA== 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 n1-20020ac85b41000000b004032cbfb5absi1659078qtw.603.2023.08.04.11.55.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 11:55:37 -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; 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 1qRzw9-0002F0-1n; Fri, 04 Aug 2023 14:54:09 -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 1qRzw4-0002D7-M9; Fri, 04 Aug 2023 14:54:04 -0400 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 1qRzw2-00084g-Ly; Fri, 04 Aug 2023 14:54:04 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 5882818405; Fri, 4 Aug 2023 21:54:17 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id B21301B87D; Fri, 4 Aug 2023 21:53:56 +0300 (MSK) Received: (nullmailer pid 1874200 invoked by uid 1000); Fri, 04 Aug 2023 18:53:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Auger , Michael Tokarev Subject: [Stable-7.2.5 16/36] hw/arm/smmu: Handle big-endian hosts correctly Date: Fri, 4 Aug 2023 21:53:29 +0300 Message-Id: <20230804185350.1874133-3-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 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: Peter Maydell The implementation of the SMMUv3 has multiple places where it reads a data structure from the guest and directly operates on it without doing a guest-to-host endianness conversion. Since all SMMU data structures are little-endian, this means that the SMMU doesn't work on a big-endian host. In particular, this causes the Avocado test machine_aarch64_virt.py:Aarch64VirtMachine.test_alpine_virt_tcg_gic_max to fail on an s390x host. Add appropriate byte-swapping on reads and writes of guest in-memory data structures so that the device works correctly on big-endian hosts. As part of this we constrain queue_read() to operate only on Cmd structs and queue_write() on Evt structs, because in practice these are the only data structures the two functions are used with, and we need to know what the data structure is to be able to byte-swap its parts correctly. Signed-off-by: Peter Maydell Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Message-id: 20230717132641.764660-1-peter.maydell@linaro.org Cc: qemu-stable@nongnu.org (cherry picked from commit c6445544d4cea2628fbad3bad09f3d3a03c749d3) Signed-off-by: Michael Tokarev diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index e09b9c13b7..bbca3a8db3 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -193,8 +193,7 @@ static int get_pte(dma_addr_t baseaddr, uint32_t index, uint64_t *pte, dma_addr_t addr = baseaddr + index * sizeof(*pte); /* TODO: guarantee 64-bit single-copy atomicity */ - ret = dma_memory_read(&address_space_memory, addr, pte, sizeof(*pte), - MEMTXATTRS_UNSPECIFIED); + ret = ldq_le_dma(&address_space_memory, addr, pte, MEMTXATTRS_UNSPECIFIED); if (ret != MEMTX_OK) { info->type = SMMU_PTW_ERR_WALK_EABT; diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index daa80e9c7b..ce7091ff8e 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -98,20 +98,34 @@ static void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) trace_smmuv3_write_gerrorn(toggled & pending, s->gerrorn); } -static inline MemTxResult queue_read(SMMUQueue *q, void *data) +static inline MemTxResult queue_read(SMMUQueue *q, Cmd *cmd) { dma_addr_t addr = Q_CONS_ENTRY(q); + MemTxResult ret; + int i; - return dma_memory_read(&address_space_memory, addr, data, q->entry_size, - MEMTXATTRS_UNSPECIFIED); + ret = dma_memory_read(&address_space_memory, addr, cmd, sizeof(Cmd), + MEMTXATTRS_UNSPECIFIED); + if (ret != MEMTX_OK) { + return ret; + } + for (i = 0; i < ARRAY_SIZE(cmd->word); i++) { + le32_to_cpus(&cmd->word[i]); + } + return ret; } -static MemTxResult queue_write(SMMUQueue *q, void *data) +static MemTxResult queue_write(SMMUQueue *q, Evt *evt_in) { dma_addr_t addr = Q_PROD_ENTRY(q); MemTxResult ret; + Evt evt = *evt_in; + int i; - ret = dma_memory_write(&address_space_memory, addr, data, q->entry_size, + for (i = 0; i < ARRAY_SIZE(evt.word); i++) { + cpu_to_le32s(&evt.word[i]); + } + ret = dma_memory_write(&address_space_memory, addr, &evt, sizeof(Evt), MEMTXATTRS_UNSPECIFIED); if (ret != MEMTX_OK) { return ret; @@ -290,7 +304,7 @@ static void smmuv3_init_regs(SMMUv3State *s) static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, SMMUEventInfo *event) { - int ret; + int ret, i; trace_smmuv3_get_ste(addr); /* TODO: guarantee 64-bit single-copy atomicity */ @@ -303,6 +317,9 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, event->u.f_ste_fetch.addr = addr; return -EINVAL; } + for (i = 0; i < ARRAY_SIZE(buf->word); i++) { + le32_to_cpus(&buf->word[i]); + } return 0; } @@ -312,7 +329,7 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid, CD *buf, SMMUEventInfo *event) { dma_addr_t addr = STE_CTXPTR(ste); - int ret; + int ret, i; trace_smmuv3_get_cd(addr); /* TODO: guarantee 64-bit single-copy atomicity */ @@ -325,6 +342,9 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid, event->u.f_ste_fetch.addr = addr; return -EINVAL; } + for (i = 0; i < ARRAY_SIZE(buf->word); i++) { + le32_to_cpus(&buf->word[i]); + } return 0; } @@ -406,7 +426,7 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste, return -EINVAL; } if (s->features & SMMU_FEATURE_2LVL_STE) { - int l1_ste_offset, l2_ste_offset, max_l2_ste, span; + int l1_ste_offset, l2_ste_offset, max_l2_ste, span, i; dma_addr_t l1ptr, l2ptr; STEDesc l1std; @@ -430,6 +450,9 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste, event->u.f_ste_fetch.addr = l1ptr; return -EINVAL; } + for (i = 0; i < ARRAY_SIZE(l1std.word); i++) { + le32_to_cpus(&l1std.word[i]); + } span = L1STD_SPAN(&l1std); From patchwork Fri Aug 4 18:53:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 710230 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp151485rwb; Fri, 4 Aug 2023 11:58:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHiVsvnjUsKd5ZBwys2eTXUcl19H/kX995phUUWA+zPZ9gN6uKsNSDHwKMvmZRRa3KV7Vjo X-Received: by 2002:ac8:57cc:0:b0:40f:da50:4dbf with SMTP id w12-20020ac857cc000000b0040fda504dbfmr4028365qta.1.1691175509870; Fri, 04 Aug 2023 11:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691175509; cv=none; d=google.com; s=arc-20160816; b=GOD/5YYcXjUlfrkGQYZ+b8+JYTMgB5V6aIuJ8gX5LqEfNWnvfopST0VMTJdzDnp3Zp OBsFIxdd4RZSjML3cCzYcpFdvAYRwLVSd5Sr1ObKzyxeYJq5/l6HcrIbUvkJYHMFztAN jecy8t7qv9BLGmt0nYU3jjzU8+scJ39iAEFs2Kk3q2bYJZQJxxPDYpsYDVNE1aIG5EVv Jx/zgbT3yPyqQCEYB1vP5l5hnSuzkHtkdrJD4CTPIpPysCCvncpCvy5jkIhAsA6zGfc0 +wNFkDWd7SdfvdboimBJQXGpYHJ+6G2THof1z7ng7gQCDHoT45IJUsMhQ2cWGJMrC8mQ mB2Q== 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=pVICECu1I/rnvfMA8aVWonA9Y/aTmJviri4Tz3V537s=; fh=+twXHueQny8msdLYk4HIx2SowV0ZnuRfIAxEj9lDJjg=; b=F3Ty0okU5BYwadqva/p0X8ZhivodzfS62wzOW5j+T+AcWdeAF2oSj2nbAoWYIzWWds TbJ8IOh2WJWbhPSrLGX7TSlS5CJkoMXqsf8VpwiFC7q1BUiB7LmaMc1T3CFRAq+HiwK6 aYAu8WTfjusHAEBF8Y7w4Fk6js+jTd3NAPohWTgw2DdfjnphprDGKMoh6Myf5LrXId68 AlAH64ZZfzatO7cR12x5zxkPg3r61loJ3yjBJsZoqs6zxYV3KyKFLE6fY//zuZ4vkP58 GsK7oEWJezRIgcwx/U9BV6uU2Clbww+3onBOv69JKbPihtamcBgAeLxHzDNAr0IvEYUM KDUg== 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 20-20020ac85954000000b003fff01022f8si1679524qtz.520.2023.08.04.11.58.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 11:58:29 -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; 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 1qRzwA-0002FZ-L8; Fri, 04 Aug 2023 14:54:10 -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 1qRzw8-0002Eg-4R; Fri, 04 Aug 2023 14:54:08 -0400 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 1qRzw6-00086m-2d; Fri, 04 Aug 2023 14:54:07 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 90A7718407; Fri, 4 Aug 2023 21:54:17 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 22B451B87E; Fri, 4 Aug 2023 21:53:57 +0300 (MSK) Received: (nullmailer pid 1874203 invoked by uid 1000); Fri, 04 Aug 2023 18:53:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , Michael Tokarev Subject: [Stable-7.2.5 17/36] target/arm: Avoid writing to constant TCGv in trans_CSEL() Date: Fri, 4 Aug 2023 21:53:30 +0300 Message-Id: <20230804185350.1874133-4-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 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: Peter Maydell In commit 0b188ea05acb5 we changed the implementation of trans_CSEL() to use tcg_constant_i32(). However, this change was incorrect, because the implementation of the function sets up the TCGv_i32 rn and rm to be either zero or else a TCG temp created in load_reg(), and these TCG temps are then in both cases written to by the emitted TCG ops. The result is that we hit a TCG assertion: qemu-system-arm: ../../tcg/tcg.c:4455: tcg_reg_alloc_mov: Assertion `!temp_readonly(ots)' failed. (or on a non-debug build, just produce a garbage result) Adjust the code so that rn and rm are always writeable temporaries whether the instruction is using the special case "0" or a normal register as input. Cc: qemu-stable@nongnu.org Fixes: 0b188ea05acb5 ("target/arm: Use tcg_constant in trans_CSEL") Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20230727103906.2641264-1-peter.maydell@linaro.org (cherry picked from commit 2b0d656ab6484cae7f174e194215a6d50343ecd2) Signed-off-by: Michael Tokarev (Mjt: context fixup in target/arm/tcg/translate.c) diff --git a/target/arm/translate.c b/target/arm/translate.c index a06da05640..9cf4a6819e 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9030,7 +9030,7 @@ static bool trans_IT(DisasContext *s, arg_IT *a) /* v8.1M CSEL/CSINC/CSNEG/CSINV */ static bool trans_CSEL(DisasContext *s, arg_CSEL *a) { - TCGv_i32 rn, rm, zero; + TCGv_i32 rn, rm; DisasCompare c; if (!arm_dc_feature(s, ARM_FEATURE_V8_1M)) { @@ -9048,16 +9048,17 @@ static bool trans_CSEL(DisasContext *s, arg_CSEL *a) } /* In this insn input reg fields of 0b1111 mean "zero", not "PC" */ - zero = tcg_constant_i32(0); + rn = tcg_temp_new_i32(); + rm = tcg_temp_new_i32(); if (a->rn == 15) { - rn = zero; + tcg_gen_movi_i32(rn, 0); } else { - rn = load_reg(s, a->rn); + load_reg_var(s, rn, a->rn); } if (a->rm == 15) { - rm = zero; + tcg_gen_movi_i32(rm, 0); } else { - rm = load_reg(s, a->rm); + load_reg_var(s, rm, a->rm); } switch (a->op) { @@ -9077,7 +9078,7 @@ static bool trans_CSEL(DisasContext *s, arg_CSEL *a) } arm_test_cc(&c, a->fcond); - tcg_gen_movcond_i32(c.cond, rn, c.value, zero, rn, rm); + tcg_gen_movcond_i32(c.cond, rn, c.value, tcg_constant_i32(0), rn, rm); arm_free_cc(&c); store_reg(s, a->rd, rn); From patchwork Fri Aug 4 18:53:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 710227 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp150099rwb; Fri, 4 Aug 2023 11:54:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0WOZJmDEiir/byTZmt4PYgV1N/7w3rirMfiL1PuBPZYGlbhagZvm+4ncGK9UwIlHllsTX X-Received: by 2002:a05:620a:3847:b0:762:3a20:7719 with SMTP id po7-20020a05620a384700b007623a207719mr2227337qkn.18.1691175289809; Fri, 04 Aug 2023 11:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691175289; cv=none; d=google.com; s=arc-20160816; b=sJsxqL6vXdUIyEzMGVxdBF/Jy2F4dwC5JWvxKJAT5ipUT81dDpnf/moa8rzcq0x8DQ ZxIX8UfY7r/sJrGcRpWgaQ02HDoDJoPsZnpDXakdxBAQBxlVDCgYycfzeykXem915qPX 8reKZHErfRcpXHYz+tbSn0LltSgRBwGxYCxTsWIBuGfv6lTtmyqS6fzMaHPwKaCw/iMM vmhFUKFd7/30z1E5sV2aTYRKgQZ+fiqwGABDxfVAUoLdT9tptS/az87Mj+wq3CRHPR0C u9a41/6hfCMRRAMooSAGCGSjW0I4yhFI5hb3Y4aQ1CrK4QqOeECiSHLQgRae8kc3K+92 p0EQ== 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=Nm6q8y6T7lw2wqevqXLXIZp5fz8iHt4wB+aVg/PlpZg=; fh=L4rfWCYvgJSPl2MlAyDx7JRNwJ2TCiSBvmAQuo2o+WM=; b=zyQ3M1ufqK9u4W9t7ghRLfNd1QMdnfLkc6+9n/9AnDbRbkS4qm1ZSGn80RWWCLJPzN bG1Y81wLn7Rf2cZNAs7iumHAMgFXduFOAJHUueL/5+1Jw4UDElhuyPwOnrUd8FTcwg3r 3LcOrxyukOERIsw3CdIYFWyZK0AxX3vILiUPA3DqCKWLjCW6cdjmBXGsbIMlHChg8xEw HKSgKoDQZdeN1t11/OlIKwMtBekz+/Ep5fPjCoQIObl2773as9pbgYsLdAeSqX0nHXd7 cSL/ZOYn3/ftBMMwUGs4P929XKVlkEtxeoT98CD9O3aHCwl87SGv21bGD77XwVb0pISe Hd9g== 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 h12-20020a05620a400c00b00765a5168fcdsi1754411qko.528.2023.08.04.11.54.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 11:54:49 -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; 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 1qRzwC-0002GW-Od; Fri, 04 Aug 2023 14:54:12 -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 1qRzwB-0002G7-I8; Fri, 04 Aug 2023 14:54:11 -0400 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 1qRzw9-00087T-Fi; Fri, 04 Aug 2023 14:54:11 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B4BC218408; Fri, 4 Aug 2023 21:54:17 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 5DCB91B87F; Fri, 4 Aug 2023 21:53:57 +0300 (MSK) Received: (nullmailer pid 1874206 invoked by uid 1000); Fri, 04 Aug 2023 18:53:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-7.2.5 18/36] target/ppc: Disable goto_tb with architectural singlestep Date: Fri, 4 Aug 2023 21:53:31 +0300 Message-Id: <20230804185350.1874133-5-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 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 The change to use translator_use_goto_tb went too far, as the CF_SINGLE_STEP flag managed by the translator only handles gdb single stepping and not the architectural single stepping modeled in DisasContext.singlestep_enabled. Fixes: 6e9cc373ec5 ("target/ppc: Use translator_use_goto_tb") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1795 Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 2e718e665706d5fcc3e3501bda26f277f055ed85) Signed-off-by: Michael Tokarev diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 1de7eca9c4..90f749a728 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -4327,6 +4327,9 @@ static void pmu_count_insns(DisasContext *ctx) static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) { + if (unlikely(ctx->singlestep_enabled)) { + return false; + } return translator_use_goto_tb(&ctx->base, dest); } From patchwork Fri Aug 4 18:53:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 710228 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp150245rwb; Fri, 4 Aug 2023 11:55:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYklT1wdtOkvcgOnDEtipOm3sNgzfQfhi+Zzd7xlQxwNCycLsDgxssbmUjRlRezVZOAkze X-Received: by 2002:a05:620a:2908:b0:767:3a10:d6de with SMTP id m8-20020a05620a290800b007673a10d6demr3902381qkp.58.1691175309401; Fri, 04 Aug 2023 11:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691175309; cv=none; d=google.com; s=arc-20160816; b=PJEVfZVQooPuL0X7n7fGRgmq/dmy1KTL+QZkKzQ9MT07OWGsGiec46uaJoPyTHjJsr 08d1TEdPi0IgdEguuGod1gglNq1I0sVM0RLzpWOrEZPyVE0LC1Q6u4R6EngtqNG9+hoQ li7vQK1UjkTmCWq/7dQs0kgYJeM8wvWdjpal+BeoHh4xmjcynoBFLNjLecBRMFFt9tQw +T+B/o2nQXtOTNzzZtR12dPJdTSpuGOeu+iOA4dJHyLf3J1RGfkdwMJdlzntaL+aYgQ3 9waZWFYKNefHtVIZmgEPmsNIsv8c6MmQ6G+kJjmLk62Nk58PYedXUa+ClMl07R6a29i4 R7jQ== 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=9fiCF5UaU6EI/8JS6k4doJY/R5/IwkT4vbtxTGm9W9s=; fh=N0pzpkMrBzgxwu1Zqyrxxf8KeOW94Gy2VyKYyB2OHBY=; b=mHlouDTe1I2kHmqJihoM2L3LerZ1/GSvsQ0NX37nPQI6x4Rqlq+Q6UwwrMu4FnNO2g rj3mdFxgLko/Q+wUPcHfM6+iTtBCQWvHXL+n1mm0KnQFS9kcxRZGqSdAfH2RlEVRaueC DNopN3q+nuahqfaQsmEf41Rg3OEULRTVXxhes/wpC/z/WuN4Rjd6ewVIsFV1GPxkSWmB 4TJ7jcT/+OWK1THQh4YN4/7DpsUZuQQ+kqUzbvEmH80RgbxfZzzmi+I6L5nwUvbofOCO LT3EdpEJ9pDZtnQ/aDhtCrfoLO10ihK8xUTABk3PIN8+HX9/fNFlzjnuR9H7+nQok/2r CbiA== 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 j14-20020a05622a038e00b0040399b08195si1661382qtx.738.2023.08.04.11.55.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 11:55:09 -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; 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 1qRzwl-0002Pz-Da; Fri, 04 Aug 2023 14:54:51 -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 1qRzwi-0002PI-BY; Fri, 04 Aug 2023 14:54:44 -0400 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 1qRzwg-0008AS-RV; Fri, 04 Aug 2023 14:54:44 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id A47AC18410; Fri, 4 Aug 2023 21:54:19 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 3CF781B887; Fri, 4 Aug 2023 21:53:59 +0300 (MSK) Received: (nullmailer pid 1874230 invoked by uid 1000); Fri, 04 Aug 2023 18:53:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-7.2.5 26/36] target/m68k: Fix semihost lseek offset computation Date: Fri, 4 Aug 2023 21:53:39 +0300 Message-Id: <20230804185350.1874133-13-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 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: Peter Maydell The arguments for deposit64 are (value, start, length, fieldval); this appears to have thought they were (value, fieldval, start, length). Reorder the parameters to match the actual function. Cc: qemu-stable@nongnu.org Fixes: 950272506d ("target/m68k: Use semihosting/syscalls.h") Reported-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230801154519.3505531-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé (cherry picked from commit 8caaae7319a5f7ca449900c0e6bfcaed78fa3ae2) Signed-off-by: Michael Tokarev diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index 87b1314925..7a88205ce7 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -165,7 +165,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr) GET_ARG64(2); GET_ARG64(3); semihost_sys_lseek(cs, m68k_semi_u64_cb, arg0, - deposit64(arg2, arg1, 32, 32), arg3); + deposit64(arg2, 32, 32, arg1), arg3); break; case HOSTED_RENAME: