From nobody Mon Feb 9 18:48:20 2026 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=1680623599; cv=none; d=zohomail.com; s=zohoarc; b=YUxuBpY+OQvHwTWeOOgKtQu5q3G5Sx9Swid6vtgQl0yq4ZE0GSupTAXTvDUEw8hDTrgKCQW81+2awsNgriS1Bs/APN5yo6fWHbwuO+/e+mEMQdg13YQrWFCgynnxynvcvMmSJ/rQ4RPmlMzhCuRPZ7cyjVWOhu6I42YUY+ZqsOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680623599; h=Content-Type:Content-Transfer-Encoding:Cc: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=ZDfd7ct7wzbilubUOyiCb11C3SBKGvBqjiC3GyKJqDQ=; b=E4HNLqkhYecMdISLqecpQAebApuhC/OVASHtqMYOU3vrE6xJNKPhDD22SkSra7Fx2RCcJJtYHld+BtyGPaFv6GZM2w4L2WjfTW5RF0XJo5PheSWr1BltvAlwV/+BgPUGCxVY8G4P382NLCk75Z4haagFLWKviSl5Dz52sGgWklM= 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 1680623599046926.701974383898; Tue, 4 Apr 2023 08:53:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjixQ-0006yE-6k; Tue, 04 Apr 2023 11:52:28 -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 1pjixO-0006vA-Bi for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:26 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjixM-0004uu-LD for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:26 -0400 Received: by mail-pl1-x62a.google.com with SMTP id c18so31693792ple.11 for ; Tue, 04 Apr 2023 08:52:24 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:1d41:7730:d7dd:6f41]) by smtp.gmail.com with ESMTPSA id nl5-20020a17090b384500b00233ccd04a15sm11562013pjb.24.2023.04.04.08.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 08:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680623543; 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=ZDfd7ct7wzbilubUOyiCb11C3SBKGvBqjiC3GyKJqDQ=; b=dWt3W6DngnlilRvCb2mSTe/G1dSM9sYrKAy4oRRQhiFU0qcO9ETq63DXVE38RrqAZd ZvKs2F66d3Ig/6JeVntGqlvY68cW5muWC+yMmvzwn6xXw6bKl7byAEa3zvEFYBSeOeq0 Ivc53INaiZN0/yjbCLSxyjYcQhf0Unk5vRpOEx5JuRHYKoCMRywGnDtTzvrYWBGzx7wG fV83I+kAVZ/O5tFcglz74eUVnmTCu5/q77B92kCgZ15FqSYk21K5iqgaQexL+9ES43kw rLINDoIz9UQA0pLVAf4sLpUV34hx7OtFcahZpTGg8hr+4xGLxoLjA2Q8wyX7nwfJJ8wp e1Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680623543; 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=ZDfd7ct7wzbilubUOyiCb11C3SBKGvBqjiC3GyKJqDQ=; b=BzUGMkPi6H7RomZ7Tlr8zqezD/EysZEzgirrcf5REELBPmfeIVSKuMq0rgFlI+KRtp VGm9ifaADvv8KRR4TzE+QMFy6FF+0faPwRjyDu/MzXlY1Ean/z8rDUAujWX+kst+7CTw yl3IepLPpZYHUvRUtcz0TbOXNO/Svqs6x/bU2Rp+dCcCzqwdAIUy5Jvj+tXQ4NkVMxY8 lWICrriCElS4mWg/RX0rL5I8elIbtHwFsxi86NFD9NB8SnjBpJnBfGwMY7NMdvMNDpIJ pNuzbChA6JWZoLXW+hsui3yHBHcVxbZ6oY69/Yb9fZ2q/m2j2j5CSsLIxZOcr0Z+OpXG /qBw== X-Gm-Message-State: AAQBX9ewPl7iQdLFbbdy6+/6gntpXRDdkpiucDr1fUI9wlpXpxW+5Jz/ kKzMJPuVFj3gX/TfvmfLCnmdxhF/07K/d9V1aWc= X-Google-Smtp-Source: AKy350ZMRNI7eykQEgXMDtx1ot3ZTl7QoW9Lk+TjKhuZJfnQmZ+GvxY+v7jEaOwTund9tP51JdX7Cw== X-Received: by 2002:a17:90b:1647:b0:237:50b6:7835 with SMTP id il7-20020a17090b164700b0023750b67835mr3288422pjb.20.1680623542822; Tue, 04 Apr 2023 08:52:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 1/4] Revert "linux-user/arm: Take more care allocating commpage" Date: Tue, 4 Apr 2023 08:52:17 -0700 Message-Id: <20230404155220.1572650-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404155220.1572650-1-richard.henderson@linaro.org> References: <20230404155220.1572650-1-richard.henderson@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=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680623601279100003 This reverts commit 4f5c67f8df7f26e559509c68c45e652709edd23f. This exposes bugs in target_mmap et al with respect to overflow with the final page of the guest address space. To be fixed in the next development cycle. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- linux-user/elfload.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b96b3e566b..f1370a7a8b 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -423,32 +423,12 @@ enum { =20 static bool init_guest_commpage(void) { - ARMCPU *cpu =3D ARM_CPU(thread_cpu); - abi_ptr want =3D HI_COMMPAGE & TARGET_PAGE_MASK; - abi_ptr addr; + abi_ptr commpage =3D HI_COMMPAGE & -qemu_host_page_size; + void *want =3D g2h_untagged(commpage); + void *addr =3D mmap(want, qemu_host_page_size, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0); =20 - /* - * M-profile allocates maximum of 2GB address space, so can never - * allocate the commpage. Skip it. - */ - if (arm_feature(&cpu->env, ARM_FEATURE_M)) { - return true; - } - - /* - * If reserved_va does not cover the commpage, we get an assert - * in page_set_flags. Produce an intelligent error instead. - */ - if (reserved_va !=3D 0 && want + TARGET_PAGE_SIZE - 1 > reserved_va) { - error_report("Allocating guest commpage: -R 0x%" PRIx64 " too smal= l", - (uint64_t)reserved_va + 1); - exit(EXIT_FAILURE); - } - - addr =3D target_mmap(want, TARGET_PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0); - - if (addr =3D=3D -1) { + if (addr =3D=3D MAP_FAILED) { perror("Allocating guest commpage"); exit(EXIT_FAILURE); } @@ -457,12 +437,15 @@ static bool init_guest_commpage(void) } =20 /* Set kernel helper versions; rest of page is 0. */ - put_user_u32(5, 0xffff0ffcu); + __put_user(5, (uint32_t *)g2h_untagged(0xffff0ffcu)); =20 - if (target_mprotect(addr, qemu_host_page_size, PROT_READ | PROT_EXEC))= { + if (mprotect(addr, qemu_host_page_size, PROT_READ)) { perror("Protecting guest commpage"); exit(EXIT_FAILURE); } + + page_set_flags(commpage, commpage | ~qemu_host_page_mask, + PAGE_READ | PAGE_EXEC | PAGE_VALID); return true; } =20 --=20 2.34.1 From nobody Mon Feb 9 18:48:20 2026 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=1680623581; cv=none; d=zohomail.com; s=zohoarc; b=OGt247sw62J+2cHfCRROy2Rt6LeZKVfsB+EKXuL85zXs7KEFcmsBeBMx5DO6NXOzpILLelygXjbLjASb4XZtf4nS7YXhOt1M0eE7Gqxo5UHw8ealc4OutUJeJ2/+v5MEvHSmzGFDLho1U5AQmeI73/1WpwYMS+u//69E24eCpTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680623581; h=Content-Type:Content-Transfer-Encoding:Cc: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=d+WZ/JeLd2TCORRW5pywaUIN6+48/A6dV/BPHE6Q81A=; b=khpizAHwXhVQSmHPVzbqLx39pIvJpu9j0zf6zH68SZXIw++ADA+yEjd5zRrGTRqpa6ZjQOQF1R4mwspeAFH43coXN1cOGmj85QmvcBJIihabZ0NFit0JukAeONEzHEQPgdd0Hx7/IQDo013Cwpy7PPOxkMglrgT1nKXokICTS10= 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 1680623581458640.7400705921918; Tue, 4 Apr 2023 08:53:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjixW-0007JH-CY; Tue, 04 Apr 2023 11:52:34 -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 1pjixO-0006x0-Te for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:26 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjixN-0004uz-9l for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:26 -0400 Received: by mail-pj1-x102a.google.com with SMTP id lr16-20020a17090b4b9000b0023f187954acso34412612pjb.2 for ; Tue, 04 Apr 2023 08:52:24 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:1d41:7730:d7dd:6f41]) by smtp.gmail.com with ESMTPSA id nl5-20020a17090b384500b00233ccd04a15sm11562013pjb.24.2023.04.04.08.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 08:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680623544; 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=d+WZ/JeLd2TCORRW5pywaUIN6+48/A6dV/BPHE6Q81A=; b=vAOqESGyqSb9Oz923Ox8+oDJXp4cheQBEX2f/gtiyfJeew0KTfqfNhqe+VPdO2goLG zbmE6SHLdxmG73liTort4X1KCIq7F2lkcYKy6+eO00ytW8H13yEgADKHfzs1QqMgpCDY 346UNhC9nf+EgEtCXt1Wi8X4WrLEw7/pN3ph3CpmGsBvacmZm2dumM0TCuW3fxFdoO+P WA8ULvH5BjIkAjJvgKynBh+9c7ztuuPtjYqBtwasToBn/HGhC304RVKWYAnClQLp/aDN ckis4w5A8kL9oGAXGUVFsXdEPkxywQcl7GgrelSr4gR+rG9i0+nBr5GZMm3gSxhpSIPu yWxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680623544; 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=d+WZ/JeLd2TCORRW5pywaUIN6+48/A6dV/BPHE6Q81A=; b=u20MVjDctMy2Ib9vk6rDHHy51ypDjIe7g/NRIxwZ0+ft8eZOkVm5/u7bK25VQbNmPu Q43pdOhYWKlnA2lRSvT58QPOitmZP1Y6+dNvlFX+dav1CklA9WPjIm9GSiC8kr1fPTWh xYJKq+ddpnc3lQMXnksW3ZonO8twTyiBdn2CVUSJaPXB6voIWxXle783RA0znf1oNvmw mYk5mKmpVRnaehY29LjArsHNWeUc7pZppIiCtwIk6WnHtku4dFDYCX6AcQ5cJl6qbs1j ZaU2+7l9zIXcckE4JyNJ2uxLi7dF2nmpUhuHtvw9H7dfnEN9hcAPfzOmP1m9onGSTqJQ pZZA== X-Gm-Message-State: AAQBX9fa3UvcJ2EkJl/ja54H3At4ZXQSbr4dT8Y29i09hsDDSPKqea9/ DaKIWuTexc6smUZcGZ85iRQuIZzXlj2LGjrLEtE= X-Google-Smtp-Source: AKy350YdfIFwbt95tO3PWmEoondKIJ5PtbFCR6Y3Km9qbeBoh5sFVwGKICDj3PaYLGMHFZ/fuUFs9Q== X-Received: by 2002:a17:90b:1e0b:b0:23b:45be:a15a with SMTP id pg11-20020a17090b1e0b00b0023b45bea15amr3116757pjb.25.1680623543826; Tue, 04 Apr 2023 08:52:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Weiwei Li , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Junqiang Wang Subject: [PULL 2/4] accel/tcg: Fix overwrite problems of tcg_cflags Date: Tue, 4 Apr 2023 08:52:18 -0700 Message-Id: <20230404155220.1572650-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404155220.1572650-1-richard.henderson@linaro.org> References: <20230404155220.1572650-1-richard.henderson@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=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680623583018100003 From: Weiwei Li CPUs often set CF_PCREL in tcg_cflags before qemu_init_vcpu(), in which tcg_cflags will be overwrited by tcg_cpu_init_cflags(). Fixes: 4be790263ffc ("accel/tcg: Replace `TARGET_TB_PCREL` with `CF_PCREL`") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: Weiwei Li Signed-off-by: Junqiang Wang Message-Id: <20230331150609.114401-6-liweiwei@iscas.ac.cn> Signed-off-by: Richard Henderson --- accel/tcg/tcg-accel-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index af35e0d092..58c8e64096 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -59,7 +59,7 @@ void tcg_cpu_init_cflags(CPUState *cpu, bool parallel) =20 cflags |=3D parallel ? CF_PARALLEL : 0; cflags |=3D icount_enabled() ? CF_USE_ICOUNT : 0; - cpu->tcg_cflags =3D cflags; + cpu->tcg_cflags |=3D cflags; } =20 void tcg_cpus_destroy(CPUState *cpu) --=20 2.34.1 From nobody Mon Feb 9 18:48:20 2026 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=1680623557; cv=none; d=zohomail.com; s=zohoarc; b=K9byYjF/V+eGR9P58vPPYh879b0fYl2lwvJuJo6FtBSONdIYpuyyb/XTBvpSHddAfRDD7o9ieBY1ELpAzGRfPMVrkGa7oNMq8OovJRHiG9R6bOQF8BRXQS6o/hK+sDRwdtMswh5XEb8MILOf9sZX4IYUo0gV1isJY+GGC6MD3dU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680623557; h=Content-Transfer-Encoding:Cc: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=9R9GD6a5x0X5fiS0AURv/OzVq7uoVBoB3Uzt4Bd3ql4=; b=bsPGnamLuLe9J8R8F6weUm32VvKk5TDzmXezTkoWq3fVP5aWSIvmSW9IzXDnMtvPEUKZynRJc+/1PivptvGfonzBgeRtNh0c10ArOAAuJE8YIGBwVGLrlf5jDVNGIS0GTzkiTcXUWeTiFLtUK2vd0/dIoZgCYoWV0SjYTaYXu7s= 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 1680623557461375.2692217219858; Tue, 4 Apr 2023 08:52:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjixS-00074q-Fz; Tue, 04 Apr 2023 11:52:30 -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 1pjixP-0006y0-L7 for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:28 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjixO-0004vC-1V for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:27 -0400 Received: by mail-pj1-x102f.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so34438782pjb.0 for ; Tue, 04 Apr 2023 08:52:25 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:1d41:7730:d7dd:6f41]) by smtp.gmail.com with ESMTPSA id nl5-20020a17090b384500b00233ccd04a15sm11562013pjb.24.2023.04.04.08.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 08:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680623544; 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=9R9GD6a5x0X5fiS0AURv/OzVq7uoVBoB3Uzt4Bd3ql4=; b=vaFmB4pI4RYzmPInFTyXNrF+lN3ZDl5LPHXVm8Kw6qJ8Jc+O4tkio0h/1Sq5alpkAD Kv7qohpQiOirSR38gsoh+5+1seWeTtdqUhO7Y3AWiABn7s2p1uFKG0XIbaOkCoVd7h7Z taR99dmyTIwfSd5hFoRHjfT+tHvO7iGzzBgWz+3eLgnVQd+/4Dj4YLMzO2uNXGH8bxoD TUHpc2psVUosnjYGE+Y76srWxptMgaFA84ryPaElBzP86tPdEhGxhQfgXAt6HuBpvTta hVEtMKHHpbg69bINzBwJWh8Bkq/kVscsITEHZSxRI8EEbUo17rumkaPeCh12acCt0Z8L bJCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680623544; 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=9R9GD6a5x0X5fiS0AURv/OzVq7uoVBoB3Uzt4Bd3ql4=; b=TC+OkdZZDE3vN7q1HeseSQOE1Auf2Owtm8wgy4IM0Xtfb2OqP4LGJAnkX6d/snAYce iyKjlYJ0Qf/ty38YrAZHljrtgJsW7/TTOkvKRpMAApa28fWExKxJ8tez4K+gkDqe/8u9 aW0jOBjxWqlGx/ozIDmGEGBrxOHpGJFow3AY8SBhb78CXTwiQSNh4Ec3iE5UCMut5p6X ZKAJhoQPN5x+/vBFhS/nUOw3ZrYDj2uMdUZGFsOZd8FSrAC8zNJWZtwIvYvXehDwQHVW GiPPL2ZIimPcqfXEV3UJCughIi5bLvg3m7z/B/oOy/3KrNOcK0lU9kMF8CDLSAaVsaTB vWaQ== X-Gm-Message-State: AAQBX9fQ5tl073fTYvdCnVPvqYzu7zOXhLwIFT1mOSc4HeNBUPfQ1DzU fXTBuXwyQHc0C0suJzS565U6Wq/JAoufWSU9MyU= X-Google-Smtp-Source: AKy350ZRfsWaOl8HhM/MPdo99FN3pm93qKKUUpslUyI0oPJzEvR8mvPAf++CwbCglMh5f0frOqJmYA== X-Received: by 2002:a17:90b:4d0e:b0:23f:7464:ae55 with SMTP id mw14-20020a17090b4d0e00b0023f7464ae55mr3483187pjb.0.1680623544547; Tue, 04 Apr 2023 08:52:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Weiwei Li Subject: [PULL 3/4] accel/tcg: Fix jump cache set in cpu_exec_loop Date: Tue, 4 Apr 2023 08:52:19 -0700 Message-Id: <20230404155220.1572650-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404155220.1572650-1-richard.henderson@linaro.org> References: <20230404155220.1572650-1-richard.henderson@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=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680623558919100001 Content-Type: text/plain; charset="utf-8" Assign pc and use store_release to assign tb. Fixes: 2dd5b7a1b91 ("accel/tcg: Move jmp-cache `CF_PCREL` checks to caller") Reported-by: Weiwei Li Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- accel/tcg/cpu-exec.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index c815f2dbfd..8370c92c05 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -257,7 +257,7 @@ static inline TranslationBlock *tb_lookup(CPUState *cpu= , target_ulong pc, =20 if (cflags & CF_PCREL) { /* Use acquire to ensure current load of pc from jc. */ - tb =3D qatomic_load_acquire(&jc->array[hash].tb); + tb =3D qatomic_load_acquire(&jc->array[hash].tb); =20 if (likely(tb && jc->array[hash].pc =3D=3D pc && @@ -272,7 +272,7 @@ static inline TranslationBlock *tb_lookup(CPUState *cpu= , target_ulong pc, return NULL; } jc->array[hash].pc =3D pc; - /* Use store_release on tb to ensure pc is written first. */ + /* Ensure pc is written first. */ qatomic_store_release(&jc->array[hash].tb, tb); } else { /* Use rcu_read to ensure current load of pc from *tb. */ @@ -971,18 +971,27 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc) =20 tb =3D tb_lookup(cpu, pc, cs_base, flags, cflags); if (tb =3D=3D NULL) { + CPUJumpCache *jc; uint32_t h; =20 mmap_lock(); tb =3D tb_gen_code(cpu, pc, cs_base, flags, cflags); mmap_unlock(); + /* * We add the TB in the virtual pc hash table * for the fast lookup */ h =3D tb_jmp_cache_hash_func(pc); - /* Use the pc value already stored in tb->pc. */ - qatomic_set(&cpu->tb_jmp_cache->array[h].tb, tb); + jc =3D cpu->tb_jmp_cache; + if (cflags & CF_PCREL) { + jc->array[h].pc =3D pc; + /* Ensure pc is written first. */ + qatomic_store_release(&jc->array[h].tb, tb); + } else { + /* Use the pc value already stored in tb->pc. */ + qatomic_set(&jc->array[h].tb, tb); + } } =20 #ifndef CONFIG_USER_ONLY --=20 2.34.1 From nobody Mon Feb 9 18:48:20 2026 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=1680623590; cv=none; d=zohomail.com; s=zohoarc; b=b8S8BbPXhnc/iVq6wglNkYrSW/kxKRySc8GmYa2vApRioYUGL7pbdXmikx2qecetOsRkCDbTlDW0lHMk/X1rkuGdp950AUpN89k7ZYmUr2IW7MwymrCH543CNqf0/FhzA5e1LQysbZOmfqhJZC5zWWtk/QrVgfeeXh9NO4QpqQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680623590; h=Content-Type:Content-Transfer-Encoding:Cc: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=1FfqWjRKCkyAB/lxL8k5+KsN14fs9T5Mf//4IwBSq1A=; b=kqOysUJL6jMdylC+fjCGByMp4sfb7dy7BLwsZlc08+cK2+sv9BMYSKL6GvHq1VxcNd4a6mCQpd2acusnKZsm3Mi38cqd5+g5qsoaPrSFG3nExpH8t+qUajapGNhZpJHmbbk9RtllbM+Q5b7P7GBIYy9IHv3RTVu/5ZWsGlliUKc= 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 1680623590732612.3669632442018; Tue, 4 Apr 2023 08:53:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjixT-00078C-8q; Tue, 04 Apr 2023 11:52:31 -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 1pjixQ-0006zT-UX for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:29 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjixO-0004vL-LU for qemu-devel@nongnu.org; Tue, 04 Apr 2023 11:52:28 -0400 Received: by mail-pl1-x631.google.com with SMTP id le6so31691549plb.12 for ; Tue, 04 Apr 2023 08:52:26 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:1d41:7730:d7dd:6f41]) by smtp.gmail.com with ESMTPSA id nl5-20020a17090b384500b00233ccd04a15sm11562013pjb.24.2023.04.04.08.52.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 08:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680623545; 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=1FfqWjRKCkyAB/lxL8k5+KsN14fs9T5Mf//4IwBSq1A=; b=MEneH7qFHc1kNUK51ifWTR7Uz6F65lBO4c/xrKj9r4D+sauYJB1tjOIl6lAJYc80qg UY4n/OVKceMfwzjPVDKlAvyB+ja8lZtctpRA+VZP7BKruaDj65XvtUaNZOaAIAtGjRyL f/oBUgRy86oa2kRuD/iC8nlSRY6KAMMbdSORXgEALgTYiDNc+aUJ3ThwoqtEpQ8l+h7g 9VJYZDxLJVwM9SnDnBgDB5PWCruRTYriBWCCFHtBKnx0o0mFWfqb7MZRcdqUSnzDHr/Z kupt5PH+cS2yQjLekh0x6sxt+w8cB6drcthyeX8rO5pDcMFegrByObhMZvrN7zK2l5up FGcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680623545; 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=1FfqWjRKCkyAB/lxL8k5+KsN14fs9T5Mf//4IwBSq1A=; b=lFY4VdRDTDoBGYnJpy0ddB7NN5um2EQYvL33Nch8ZMBTdJPbImFRBxFSbhs63Hxr/v udU+ARHShpw1j3pRcVvnFCmLaPAQPtgv1Bru+KmhzdO8q3lFw+28/S9Khw/6SMhT0vFV 6G6ogOWQmpZ8l+L1HhJMG2omvoI7ZTCOtbaVSoMpxgYRcU51W3HnaTjA7t+dQIlgfRqC 6o53XKqh8E1kFlbf9JfHOpMo7plSHmXD24pTsebK1bQaAxixjXRnQyJKJaJEylzX4xZR SZDfXXrE+ftJKnpsZZIWhUz4VlkxGMK7zc5TYLKdeTlkC5ioUiBGR6z6dRqk/jNB0czF IIwA== X-Gm-Message-State: AAQBX9c07bzUuMNBgCB6dyy+Fi0BMCJZOPNCRs0JIHn6tZBSXxQNlTAL nk3JdrcGPARFsUEM04GimHTJgSJV07X3mF0K/5A= X-Google-Smtp-Source: AKy350Y/9iZM5GZ52mnphvj98pjM7xmt+b7cvpoWXNvzGioGhNh0rfYKzBmMZTgyFniOoeM8C1j25w== X-Received: by 2002:a17:90a:bc85:b0:237:752f:1af0 with SMTP id x5-20020a17090abc8500b00237752f1af0mr3380674pjr.29.1680623545340; Tue, 04 Apr 2023 08:52:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 4/4] tcg/sparc64: Disable direct linking for goto_tb Date: Tue, 4 Apr 2023 08:52:20 -0700 Message-Id: <20230404155220.1572650-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404155220.1572650-1-richard.henderson@linaro.org> References: <20230404155220.1572650-1-richard.henderson@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=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680623593199100001 Something is wrong with this code, and also wrong with gdb on the sparc systems to which I have access, so I cannot debug it either. Disable for now, so the release is not broken. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- tcg/sparc64/tcg-target.c.inc | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc index ccc4144f7c..694f2b9dd4 100644 --- a/tcg/sparc64/tcg-target.c.inc +++ b/tcg/sparc64/tcg-target.c.inc @@ -1445,12 +1445,12 @@ static void tcg_out_goto_tb(TCGContext *s, int whic= h) { ptrdiff_t off =3D tcg_tbrel_diff(s, (void *)get_jmp_target_addr(s, whi= ch)); =20 - /* Direct branch will be patched by tb_target_set_jmp_target. */ + /* Load link and indirect branch. */ set_jmp_insn_offset(s, which); - tcg_out32(s, CALL); - /* delay slot */ - tcg_debug_assert(check_fit_ptr(off, 13)); tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TB, TCG_REG_TB, off); + tcg_out_arithi(s, TCG_REG_G0, TCG_REG_TB, 0, JMPL); + /* delay slot */ + tcg_out_nop(s); set_jmp_reset_offset(s, which); =20 /* @@ -1469,28 +1469,6 @@ static void tcg_out_goto_tb(TCGContext *s, int which) void tb_target_set_jmp_target(const TranslationBlock *tb, int n, uintptr_t jmp_rx, uintptr_t jmp_rw) { - uintptr_t addr =3D tb->jmp_target_addr[n]; - intptr_t br_disp =3D (intptr_t)(addr - jmp_rx) >> 2; - tcg_insn_unit insn; - - br_disp >>=3D 2; - if (check_fit_ptr(br_disp, 19)) { - /* ba,pt %icc, addr */ - insn =3D deposit32(INSN_OP(0) | INSN_OP2(1) | INSN_COND(COND_A) - | BPCC_ICC | BPCC_PT, 0, 19, br_disp); - } else if (check_fit_ptr(br_disp, 22)) { - /* ba addr */ - insn =3D deposit32(INSN_OP(0) | INSN_OP2(2) | INSN_COND(COND_A), - 0, 22, br_disp); - } else { - /* The code_gen_buffer can't be larger than 2GB. */ - tcg_debug_assert(check_fit_ptr(br_disp, 30)); - /* call addr */ - insn =3D deposit32(CALL, 0, 30, br_disp); - } - - qatomic_set((uint32_t *)jmp_rw, insn); - flush_idcache_range(jmp_rx, jmp_rw, 4); } =20 static void tcg_out_op(TCGContext *s, TCGOpcode opc, --=20 2.34.1