From nobody Mon Feb 9 23:08:18 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=1680324721; cv=none; d=zohomail.com; s=zohoarc; b=KyB4W5RJokjGRqfaos2XsgBSltFdC8Vsc0soSoeBVMVXpVmaWAXmDkFnAyCZPUvxPxsa4fF7wdYlzo3emYX4N1rWa2TUpHfYg9q4LZMEw4TA9G9ELxfZDiLRs38+ucTT18pUK458hQ5L125dwIPj9QwyBE/W3zQ4IhxrU1y9ej0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680324721; 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=kiULY7hI3dkf5M/9do5JIhSCZ7Y5eX3RA+ervNTgBK8=; b=KyumhyhfJNPFOzqXvxEDv8HbJ/g/V+w+wR1+kpQ/WD6uRjhvDsjSaFcUshevEMUYwDaj/09XHEzxPKMfzUKY9XYkLAgkkMbz18wBL7nl0YwqGWBBbh6QBC3YbGuyYCna7gEqm6WFp4J1+o6eHdWoU1relwoK7LtB7KuWllWsDJs= 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 1680324721916197.2227105155921; Fri, 31 Mar 2023 21:52:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piTCw-0003rt-24; Sat, 01 Apr 2023 00:51:18 -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 1piTCr-0003qh-RZ for qemu-devel@nongnu.org; Sat, 01 Apr 2023 00:51:13 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piTCo-0003Nz-8c for qemu-devel@nongnu.org; Sat, 01 Apr 2023 00:51:13 -0400 Received: by mail-pj1-x1032.google.com with SMTP id p13-20020a17090a284d00b0023d2e945aebso10093630pjf.0 for ; Fri, 31 Mar 2023 21:51:09 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:b714:1fce:85fa:2fc7]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm2360122pld.236.2023.03.31.21.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 21:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680324668; 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=kiULY7hI3dkf5M/9do5JIhSCZ7Y5eX3RA+ervNTgBK8=; b=UDg0lR/0pRSWX6TCc3shno0pfhNggxNqN1QEDq07xnQw6ZMGtnLm/mv734ZFMtgDIN avPhobF60hxnm6SzZBWxZJetWN1ZzkcW6qbdzyHERDeNxD3IXGJ+a0glO2Xruq2p7kCC ZbV2S+ceF3WZs984DjTuByQrA5Ct0Su72tOQNkZoGmZeajPJJ6mval0KTJXhM0yyHgfa p1F7XOtdOnIGlwz9rONx3jYmZlHIi9s8ocw7nx8tKIyALxBeHjS09oD9ILwSiMDGd9HO 1tLihRcpCiNVq808H1/BQQm73EHJ1v+i2T0LMDHYRoxELogXK8YHRqkBFV8CZ92CEJTo fEtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680324668; 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=kiULY7hI3dkf5M/9do5JIhSCZ7Y5eX3RA+ervNTgBK8=; b=otlSPiaFEpRMcwyYVVgnUqa3dM10htTDANmVkb6C6L5An3DESa6JTDTfKRmcd76xl+ ovGUbc4REUYPQhABCb0a4mDwIdk1QNF7xrpihf+kygEGtCNcJI2GSXypD3RY7GP3Y3Va xdMfK7AZpcHKn/G+okBlIXVv1Z9GJL8OMa4lTxAaOaRtIy+FAyB8hUNelXwrWB4MkwDg j/BmHj9kLDcVQpO5ZSrGXY1QiyMa41L/YfpviqF/n/mASLeoEw30LfPBdmhQwbQl7YA3 ftScGaQNtsJ9vQHugt/pL7sKHIWFu6jlSAZzk2TSrQu0u3pIdRE2iyLMUYOcPB3zXAgT ypNw== X-Gm-Message-State: AAQBX9cKpU1UY577KHR4d02CMQlV63ZOm3kek5otWllMKTQhoZvUqpPB HkqkV5ebwZgP+Djv/jnwY/B1EOPCWjlmHztfNek= X-Google-Smtp-Source: AKy350Z3T2czxAI5nsXIehd/nCxwowz67PSCQGMy0Kqu80pmKpsVwRRXTqVp2gj6tK179xAhDomdUw== X-Received: by 2002:a17:903:1d1:b0:1a1:ad5e:bdbb with SMTP id e17-20020a17090301d100b001a1ad5ebdbbmr38676830plh.36.1680324668564; Fri, 31 Mar 2023 21:51:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org Subject: [PATCH 1/3] Revert "linux-user/arm: Take more care allocating commpage" Date: Fri, 31 Mar 2023 21:51:04 -0700 Message-Id: <20230401045106.3885562-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230401045106.3885562-1-richard.henderson@linaro.org> References: <20230401045106.3885562-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::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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: 1680324723011100002 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 23:08:18 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=1680324735; cv=none; d=zohomail.com; s=zohoarc; b=JHWHBnIPLAr0GKMcH9JWekjg430m+6qWOez2K3/tXptUOJZv6tNSKlNP4EPChcW+xydgFopv8/Ta/eEJGO+Q/ZXm7F9Cuj452BLOjq4SjCEmP9MC9MjUs/YYPi5TZttSiDwi4cnMgeL/1F6v087B6b9hOJSsZcI41xz1FdPfCqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680324735; 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=EH536+i2nk5iE4kCFR7uLvByCyKiD9xDAloG6x5h4Xs=; b=iJyqRxC5nFIzqFWyPt60b14dd1dZWnvBUThiHInTQ+8yvxlljsDDUtd9tuufYofBs8sSF45Nc5OiHnKutO5qTk+YGtOXYLCdZSQAe5xps5SmepuVBO7x+1YkA2i5BijP4lan3k2gQzWGLMtific63LrEM66ZdM0c4qtHrzo/hxc= 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 1680324735913874.8838312544198; Fri, 31 Mar 2023 21:52:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piTCt-0003r9-Kw; Sat, 01 Apr 2023 00:51:15 -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 1piTCr-0003qQ-2o for qemu-devel@nongnu.org; Sat, 01 Apr 2023 00:51:13 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piTCo-0003O7-Rh for qemu-devel@nongnu.org; Sat, 01 Apr 2023 00:51:12 -0400 Received: by mail-pj1-x1036.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so25608113pjz.1 for ; Fri, 31 Mar 2023 21:51:10 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:b714:1fce:85fa:2fc7]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm2360122pld.236.2023.03.31.21.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 21:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680324669; 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=EH536+i2nk5iE4kCFR7uLvByCyKiD9xDAloG6x5h4Xs=; b=XfOQwyPq6UAPn29ky+taPVmxqZeIW0yAqk+0/ho5bXOKn2FtGZcPFB29VCvvvq3mm6 hFm/bIc7CIg1rEDPMEBQx/VR2NH4J2Ji8S34/ISPveNRI0Gx/Zd57qH8ePAya+79sJqD LhoMv1jKwlgq2QnK2i6w7PnV0sKt9yPyPQY13vrwizvLDmRH3boRW+me+WiWFwqGaF7/ m7SfB+Oz0ZuPVgFSs1jA4IAuC8VXpXWIGN0Onhf0xRuzbNVFt3dQOen/SgcyiH0o5zJC 309KafILezBuVt2arNfcDyUQdg5aRR17Qw5vX/EGiwwUkoVuNpD8l9sMCs0Ld1J+6o9E 8dKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680324669; 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=EH536+i2nk5iE4kCFR7uLvByCyKiD9xDAloG6x5h4Xs=; b=HgbdF4SAyJGf6RDCKscyHq2jPLn5JigZywoW77csjaJ//ekBB6Jq8DJswVHYm/JSRw iBb33EfPeEDQAmpGj4l+dts232ZuEor24HeSsS9Ok9P1EfRFs629AmeL4UADKkmw0zbS 3JBP6rcTPuCKSJzeoLKMjHqOos2ezxKGEIMQRg65QLK4RPRSVYvWApwhwaCins05MUWD nw0hvx1bW3QdFLxl4oQlwqYvvqoqj3qy4SZV+vsMAQwxHI/VNgd5jC8q9o0olZY0h64K Gv0mDH4+tiOCXXHJoKpY5P6zT6pCo8v2xMq4OVe9NTm8ToF2AxVHHZfYjkFbsU4HuxXX k80w== X-Gm-Message-State: AAQBX9c2EvsZ2XFgFR3jVq1wFE4jTUDqqKmuqqZXEnJ/FsWH6wGO9APt 5dQi7UZN+LOO89WBmtwgWnuQyBHAN9OCIi1yZ5I= X-Google-Smtp-Source: AKy350Y/8Tqj4sd70nckM/eunkK6rc9laNO3qaLbxd4NBxXMqm/B3kBqZy/pyk0F9HqRynond1FwHg== X-Received: by 2002:a17:90b:3b4a:b0:23f:1868:94fa with SMTP id ot10-20020a17090b3b4a00b0023f186894famr32745919pjb.36.1680324669445; Fri, 31 Mar 2023 21:51:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, Weiwei Li , Junqiang Wang Subject: [PATCH 2/3] accel/tcg: Fix overwrite problems of tcg_cflags Date: Fri, 31 Mar 2023 21:51:05 -0700 Message-Id: <20230401045106.3885562-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230401045106.3885562-1-richard.henderson@linaro.org> References: <20230401045106.3885562-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::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.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: 1680324737044100001 Content-Type: text/plain; charset="utf-8" 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: 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 23:08:18 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=1680324739; cv=none; d=zohomail.com; s=zohoarc; b=e/bvKO1H0hNGaeAV56cpyVpSr3mLiUFZnCe9R+JoqAW9zoQJV+ASSnPX4cS8w1Yvy9QC4dkSkmf05EybeHAvbWK7hArnK9e4eyRzUcmZjBdU+Jgn9FGHveH4ILDFSo2jvEzvyb0hxjnBpDllfP5lnu/pJAL4sQk0MmJfYyE5RgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680324739; 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=5bGxmCesttnNxUtKHDP3pWQs68ofrrfygUflIUG0Pek=; b=ebflZfwpBv1caahj5ajTpxzdTrM7IdzI9Io4DLhZfy3OyTwL65ZXip0H0DVV1ryaF8d8mCI7I8SfXGlfhSNHcj9VlAnoUs9DhOFLH/yoihA/wzEbCs4RlSIhQ6KyWkk7QiOuHfjp8dyJsKiNxfICkGsU+IKipPMTRDHQdtnGWCQ= 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 1680324739040600.5881183529741; Fri, 31 Mar 2023 21:52:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piTCs-0003r4-TU; Sat, 01 Apr 2023 00:51:14 -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 1piTCr-0003qY-E1 for qemu-devel@nongnu.org; Sat, 01 Apr 2023 00:51:13 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piTCp-0003PJ-L2 for qemu-devel@nongnu.org; Sat, 01 Apr 2023 00:51:13 -0400 Received: by mail-pl1-x636.google.com with SMTP id u10so23318833plz.7 for ; Fri, 31 Mar 2023 21:51:11 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:b714:1fce:85fa:2fc7]) by smtp.gmail.com with ESMTPSA id a17-20020a170902ee9100b001a24cded097sm2360122pld.236.2023.03.31.21.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 21:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680324670; 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=5bGxmCesttnNxUtKHDP3pWQs68ofrrfygUflIUG0Pek=; b=t/izS8NMP7K+fItsIFZdOqlV+fhWYjouDJCX21+WtsH8jm1BAjOvd9xLUaU908Ktq6 xtx1RShsy5Vxjz0nXL81Jc1k3qzPPotq4gNwn2/WZD7Twl5xv2ss3+4dwrBRDjjX7pkG uFTDLuaPU8n9A+2MT08cxsdC928n+eGWFnkSJXG6QgYNBXnDMxzhnW16AK+RRJ+CVIJD M3qLZXalnzfWoboYVRJBRwkgiX6z0FVQxuRhBd5P0w++2CJdTofcOZr31Q18z9EWH2yp CoJ267vkVpIdEPFIwf2/iFwP8ycHAaAAFx1y9lj9bJwPFWKUhyNsRZIQXzU/7DWDeRDq OoEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680324670; 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=5bGxmCesttnNxUtKHDP3pWQs68ofrrfygUflIUG0Pek=; b=BtRlHDLV5mV9jo1msP4Camto/JgAr4j/qdLYFgeGek2Y3+N/75JSJgbCLVXJfn7h+/ BAFpy68aEAg3JvMCFt9l2vyDWDYYqHsgPYxIMhiWnr94BTim5xf9UEmqK4xgNLlbgyZs F8C8N8JEN3nqOPSBzLkvnAynCPCNSMT64nNaE1/SmeW1J4PCLPH+YD7PI4e3VHvqBIB8 6mxL/9CRbEqVVn2qQ8LvPYgt0r0srG44mwL3K9l1CPxNKPJS1LMPGVE30a/lG8FRNzTD H/u510dTxaHWGKfxCCFPEv1qFKUMYezbg9192f1AquW3Jj3BF0/A5g7mreZ1rF1H4WOM IcAQ== X-Gm-Message-State: AAQBX9dN42NHFb4EahbdHlar3Wr95jQtZ57IE92cJgwgUGBYBcbEQG7s EzzjqOEmVUW0DmCJDv/43v9k5dGHvZlx2ZxdWsQ= X-Google-Smtp-Source: AKy350bhMJvj/jNPox5UtLhzjSED9Z/Hh0Ocy0Lw/4derAMyOG3929bEq7oeHQ6ryo5NKYNIoShwBg== X-Received: by 2002:a17:903:2290:b0:1a1:a727:a802 with SMTP id b16-20020a170903229000b001a1a727a802mr13180560plh.19.1680324670262; Fri, 31 Mar 2023 21:51:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, Weiwei Li Subject: [PATCH 3/3] accel/tcg: Fix jump cache set in cpu_exec_loop Date: Fri, 31 Mar 2023 21:51:06 -0700 Message-Id: <20230401045106.3885562-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230401045106.3885562-1-richard.henderson@linaro.org> References: <20230401045106.3885562-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::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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: 1680324740609100001 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 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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