Message ID | 20241118193520.2312620-4-mjt@tls.msk.ru |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a05:6000:8b:b0:382:43a8:7b94 with SMTP id m11csp803036wrx; Mon, 18 Nov 2024 11:38:23 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUoJIyphuWUVSvZeSxLZ0u80aXKUu1x5zB9kmKJ0RzB3rgeC/RjcysCQI33x8D880xRU2oLNA==@linaro.org X-Google-Smtp-Source: AGHT+IEgWvVnm1/szdlzeOMa/7UptbeAF+XOQdxE+IAvTVf4hoCCvb+a+6a07BVo2lWPXt8SSF2s X-Received: by 2002:a05:6214:e61:b0:6d4:22fc:ce3e with SMTP id 6a1803df08f44-6d422fcd24fmr62542036d6.44.1731958703422; Mon, 18 Nov 2024 11:38:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731958703; cv=none; d=google.com; s=arc-20240605; b=KWToXHOvo6mKEe3aPNN6Lip/QSCqyuyjzMHlaUCwu9yzzhnU6Ykv9V/NhpffCSNAmU pJr4OVS/gLEOGxvhOltZWS3H6aqhs5b4s6/e8v+dmqSgAceTVPHb67ANzXSgoxGFZjQ2 ghcuVMGIdpZmvds8jt7616H2k31DqG96NcYGnYQ5+gZnCh1c3dylgUvJwoRaaD7S7obA Ktdx6FNmy+Zs300HAUaQ8uoo88Vsi/KlM7QhW99lv8QfaxWLcVSDuwCDbM9yce5VPApl XYMT40nwmR8w1V5eglJ8MnGo6Kt4M95fy1G9GES+1pnjOAKOkKL43jj512CGkNUBiREI C02A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=hsAhJ7yKKRMCogFt+pR3tGm3W2vo3yTT665gB9zWgEc=; fh=fA8wXgZkOijV3QzeJqIqYxlGqKQb9nNVVJRQwjQ6hao=; b=BEnZHBa5fT1lnR/xsw7PrcN9Btb68yE2SIFZSUovmaT9GSpuLsTr418DZUr13l23ll kdcfGLXM0SE2Uu5ccZ4tCl/QoqXcRENwVbP0tnWMKURoJAPiO/J0rMQ8s28shtFt60YJ yHSv+nWeItV/9P1wRXx2UxIMXTDRCd/Xb8tWjAMgGrgOMQgrMrSQiVJykHhq8v94XvCI fq/sw4uPXJ45G7ckmjotZhddGEcyRhP/F4sgFQjoTpWPQEHrGbQjR60qnnyrhLKJrHoc Q/1KB1pvNBMEDuQjyX1ORWgrL+3Y+Wlb4B+YuwP8YAV4Ki0/oAOFueYOtpSvBqewUBkB iMow==; dara=google.com 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d40dcbca41si71726386d6.388.2024.11.18.11.38.23 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Nov 2024 11:38:23 -0800 (PST) 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 <qemu-devel-bounces@nongnu.org>) id 1tD7XC-0006dh-7R; Mon, 18 Nov 2024 14:35:42 -0500 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 <mjt@tls.msk.ru>) id 1tD7X5-0006Z0-KY; Mon, 18 Nov 2024 14:35:35 -0500 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 <mjt@tls.msk.ru>) id 1tD7X1-0002gF-Sm; Mon, 18 Nov 2024 14:35:35 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 793D6A54E0; Mon, 18 Nov 2024 22:35: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 ED1D617359E; Mon, 18 Nov 2024 22:35:20 +0300 (MSK) Received: (nullmailer pid 2312679 invoked by uid 1000); Mon, 18 Nov 2024 19:35:20 -0000 From: Michael Tokarev <mjt@tls.msk.ru> To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson <richard.henderson@linaro.org>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Michael Tokarev <mjt@tls.msk.ru> Subject: [Stable-8.2.8 52/61] accel/tcg: Fix user-only probe_access_internal plugin check Date: Mon, 18 Nov 2024 22:35:07 +0300 Message-Id: <20241118193520.2312620-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <qemu-stable-8.2.8-20241118211929@cover.tls.msk.ru> References: <qemu-stable-8.2.8-20241118211929@cover.tls.msk.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org |
Series |
None
|
expand
|
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 68b252cb8e..e87848a5e2 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -794,7 +794,7 @@ static int probe_access_internal(CPUArchState *env, vaddr addr, if (guest_addr_valid_untagged(addr)) { int page_flags = page_get_flags(addr); if (page_flags & acc_flag) { - if ((acc_flag == PAGE_READ || acc_flag == PAGE_WRITE) + if (access_type != MMU_INST_FETCH && cpu_plugin_mem_cbs_enabled(env_cpu(env))) { return TLB_MMIO; }