From patchwork Tue Aug 16 20:33:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 597516 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b345:0:0:0:0 with SMTP id w5csp2702936maz; Tue, 16 Aug 2022 13:53:58 -0700 (PDT) X-Google-Smtp-Source: AA6agR70IHsDi8xM8kHQHkttdOR0HE64V/yIvfgkORnFdQPShEsmwxQLB/vDTIf261a1dGE2q2p/ X-Received: by 2002:ac8:5e0f:0:b0:344:6890:eac4 with SMTP id h15-20020ac85e0f000000b003446890eac4mr7349388qtx.611.1660683238169; Tue, 16 Aug 2022 13:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660683238; cv=none; d=google.com; s=arc-20160816; b=NXC3Ga/+/xNrEyYDSGQo+gx9phvbnaSLM3EK8ocgPOf3ZPCImVxlui0zCW93RfrHV5 h+ixamGcl6xj6cFpNepGz/idFAKDliJvsDt2Fm4rvTscdofj/0ar+NQYQ754KriwN/5l xyuuP+J4EIvUze30P8qUw5lEKkgGUsHLT07edqDCLn2THNF5Q1QgipOolX0LC4FXLfL3 S1GQOgPyELZes4dykgnFqupq77rr5x0OdjCM2TGXTCvGFgJhfFXrtcgIfIBh5PuHPZI6 Lj6iAZCwEg/vSRTDQNm0NME8G0EG+0F1bYXrfk9BukkhLvVDlJR1c1PVuNvzsvY/u6p6 WqcQ== 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:dkim-signature; bh=02+0PqV78M/uqtw50M+3MleQPnTNyfkwEaJtFvLiO+Q=; b=FGUAOsMUWwPWfgUFc7cZ/yw6eErTwcKvf7vuidep2azIxQq6gUSbt0G5LMLyzRumGl 4byhqsyobNdcdMeBYh1LRV5XmCxGSlB5qPLW4vY9lFKiHqOwYlyjbd8hjBi756ywxBP6 EJZOVTixjrjWbsAOXa6Kyx9T7lD9Udag9sfZ1fqnIQ1gGJfRBm6HgVDZBTAluxeLeyq/ 1busOiB1ZhmZXkgYhOZZa6DwDeqXA8jADEvJgn4/VNjCJleYEMizTo8JLGN4X1sCD116 AzAmqxDCB5KU6LWLF+ZKBud8skvYv4BdIFiv+Zli6435Ww2hOfdObeUjVxPWjhbe5jBU z0ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M3vLF9Hg; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 143-20020a370995000000b006b93e8f5e43si5920134qkj.121.2022.08.16.13.53.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Aug 2022 13:53:58 -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; dkim=pass header.i=@linaro.org header.s=google header.b=M3vLF9Hg; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oO3ZV-0001S9-Mv for patch@linaro.org; Tue, 16 Aug 2022 16:53:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO3Gs-0004tw-3b for qemu-devel@nongnu.org; Tue, 16 Aug 2022 16:34:45 -0400 Received: from mail-oi1-x235.google.com ([2607:f8b0:4864:20::235]:43934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oO3Go-0004ZK-Tr for qemu-devel@nongnu.org; Tue, 16 Aug 2022 16:34:41 -0400 Received: by mail-oi1-x235.google.com with SMTP id w196so13274201oiw.10 for ; Tue, 16 Aug 2022 13:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=02+0PqV78M/uqtw50M+3MleQPnTNyfkwEaJtFvLiO+Q=; b=M3vLF9HgNXhc/1766Egl1iCWJS9pBruT371vggXZsr7+1LxNvOBFaMOURr6r9pzH+q 4DvWZm1Q+mCvwP4QIsQM1u6xEeTWkkcY49XR6/YJo2Ny+ShjBQAcAdgiEMTxRvD9XIpq M0vwo8JT/U6p1jy3wbXy5fuWERXTjh4oxcIqz8neBPuktnYZz27wEsfZ761iUs2+So/w 7f20AlTumkYTZvAYs7RUDWrU5/W3HTpgPAqzHo+M1DWFODSRSLmp91SI3ingma+3Ns6S TFp4foK8WO1DkAjt8pDEWcfdR5pPdTz+PR1KWNUJe9pzDSyLa5phFCxmCF63/35ON7Nw kD/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=02+0PqV78M/uqtw50M+3MleQPnTNyfkwEaJtFvLiO+Q=; b=SkATlzAW9XrzeV95WPtpRkcAwV8xKZ0ZTNn6Q0enh79FVeOoa8c2mK3RElSdld4WqP pD7TciW7W5gzdOp/cEUPXKHTIyBynOJO2HvQb2HEk/OJ8y0Y/ClyjbVgswvVnBr1CEZ7 4FWQ83Sj0HyR7xeBBlP9CvtptmvjiaxMK6fPblHVuejawuioaUFSeNqI4CtmIjKz2xVy 5ZNHxieJmxJ6GuQiA25uXI29jl6T6YefpGFJRulEgVPx3wXrP+DGdL3+oYUX8wdjIqx6 LL7J2YYUcS6gKCoFBjr77Cr+XAEykYjvohcQgpLSySJms3fFPAtGdypNWzfO17iJW006 Jq3w== X-Gm-Message-State: ACgBeo1qZgJPkebTgJ4dGbT4efZh//9MV4zJHl5ftyAVnBCUbSdR4g3p eVC4B/TpFDbKDy8BEQn2UxbaRE0Nh7kLvg== X-Received: by 2002:a05:6808:3081:b0:343:56a3:cc23 with SMTP id bl1-20020a056808308100b0034356a3cc23mr153655oib.58.1660682077867; Tue, 16 Aug 2022 13:34:37 -0700 (PDT) Received: from stoup.. ([2605:ef80:80f6:61fa:9bc2:5095:d612:5e22]) by smtp.gmail.com with ESMTPSA id y23-20020a056870b01700b0010ef8ccde67sm2285220oae.13.2022.08.16.13.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 13:34:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, alex.bennee@linaro.org, iii@linux.ibm.com Subject: [PATCH v2 14/33] accel/tcg: Raise PROT_EXEC exception early Date: Tue, 16 Aug 2022 15:33:41 -0500 Message-Id: <20220816203400.161187-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220816203400.161187-1-richard.henderson@linaro.org> References: <20220816203400.161187-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::235; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x235.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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" We currently ignore PROT_EXEC on the initial lookup, and defer raising the exception until cpu_ld*_code(). It makes more sense to raise the exception early. Signed-off-by: Richard Henderson --- accel/tcg/cpu-exec.c | 2 +- accel/tcg/translate-all.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 7887af6f45..7b8977a0a4 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -222,7 +222,7 @@ static TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, desc.cflags = cflags; desc.trace_vcpu_dstate = *cpu->trace_dstate; desc.pc = pc; - phys_pc = get_page_addr_code(desc.env, pc); + phys_pc = get_page_addr_code_hostp(desc.env, pc, false, NULL); if (phys_pc == -1) { return NULL; } diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 596029b26d..a5ca424f13 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1343,7 +1343,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, assert_memory_lock(); qemu_thread_jit_write(); - phys_pc = get_page_addr_code(env, pc); + phys_pc = get_page_addr_code_hostp(env, pc, false, NULL); if (phys_pc == -1) { /* Generate a one-shot TB with 1 insn in it */