From patchwork Wed May 3 07:20:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678681 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp910290wrs; Wed, 3 May 2023 00:28:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6iesTMNy4Ml1912bQs5kwTOFxJQpRD4Log+Ucb2qeY7aVrN6SSC/07lx+/41pzra9Mgnom X-Received: by 2002:a05:6214:5084:b0:61a:943c:11fd with SMTP id kk4-20020a056214508400b0061a943c11fdmr9372635qvb.4.1683098896688; Wed, 03 May 2023 00:28:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683098896; cv=none; d=google.com; s=arc-20160816; b=bU8u1nrGc2P4DHxE1mE75K7coYqGFFrYDuAf5PqHLEtLwQVtMDQnGx9FqW8KOk8CMw zkrMFtd8BeR8Q8QhYN+GPIG9ZHkCNgX3erOirf6XTFIJ+nazqmLw1TYrlEeSlafpUTnm 5+vHMP6DN2U3yzLVUCAm6ZqFN8jbRVpzXxm5KfGKAg95EOGxLsq4ElWUSOodr98DcBao 0bnlyQK6CSL9I/F2VEnuk3RRBNNA0M1litdppJQp7/bEK59N8VgY6ugzMHw4a6gefbjb jE2aGAkeTA2p8HOSI1sHjindvsvp7b+VfH1Ar3xs/i0usDUR0ZgKJUj4jhAMEb9PRyVX AKQg== 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=lK51qYTnNnXJZN0e/9Jj4Bv1cCHWx7/0IfdphjJpI60=; b=KlcXwEujIjbInHcBx21q4hv1FLVbOuAN+pt6MPS9rBFcCSgmMjoSZXu+UgSCzYRtGx COIqARPPe2UmYeYGGKKoWGCGE7Xo7zQAR2Qo6662Trgy7JuzPzlGiiUE36xbZaWYLpfy rbi75yLcwakkf7gtF4xD2SPtabX/s6JQO0S25XEJtDpfuDTwToMm0CnE53x74EWreR/B cW8kEuc2igpN/S9j7C6NAo3OLQ09CicN5oXX8TZJdvJxJrVLqtIyhd0vwRhl6VHV2opf AeQ0pLfeHRPi3io3qD1coKU8Co8atFMoeMbDUfZ7wd7wwI2az7S/2n3UKpYb4UBX8Ive A46Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oh2uZrao; 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 e9-20020ac84e49000000b003d5b00b13cesi11081184qtw.772.2023.05.03.00.28.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:28:16 -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=oh2uZrao; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pu6pF-0007cH-06; Wed, 03 May 2023 03:22:57 -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 1pu6oq-0006pC-Qp for qemu-devel@nongnu.org; Wed, 03 May 2023 03:22:40 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6ok-0007H9-UH for qemu-devel@nongnu.org; Wed, 03 May 2023 03:22:29 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f37a36b713so7181955e9.1 for ; Wed, 03 May 2023 00:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683098545; x=1685690545; 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=lK51qYTnNnXJZN0e/9Jj4Bv1cCHWx7/0IfdphjJpI60=; b=oh2uZrao4qUWQXDvSAzsI8MYUGGfVwb30UHMjoIRPMhmaYLZ25Da7qleJfSwH6sk04 vPBAlXQHLlV51WcMyFiEGGfTwXMfZHSX7//L7lU/VAUT/tzfOjgc5ZxW87g++nhD0wnV TbSXVz9k5MPW/2tOFrGa+Ya4obOePdTHaUlUgUdsC+YMh1LL/msHggH8GnG09JRCSbj7 PqLGBS5NJRWumvWhQFf5UfbhfE6L8Hm1bQSIKAVo2PFMXgVcwQt3SH8rPID7XNOmnMpg WivpDaZfUEMDiT2fjF8y4Qqs9Lr0PyYD5zOvfh7kdOXjg3KN+7CQlgZEAZQekepoCUab GapQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683098545; x=1685690545; 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=lK51qYTnNnXJZN0e/9Jj4Bv1cCHWx7/0IfdphjJpI60=; b=NnqQRL32z7PtIUsA+JFMyUgYkgHWAL/dKUV/dMHJVSBdH+ksJBfM5IAAiTOK2fqlzc 7kE3Vwk0X01kJ/S7wGennnUm9KFs3E/a+rPAIV7aWyiUOVsgApllN3X7PtFASu/SDC4a BAMpOTTMhfmR24TDk2U+wwZ9ntisjlLeFBPgdphED7xrSVyNMkH1iW6hvuYYAeXUI72r /vx0KlbfmTBROCfvhbR9taGeZCkjF5TZpbR356I/vdfxB9I++d9ZyIUGjlerFdRztzXK ZmidLjX5yDi+hJj6AgH6YmWQkEHILZJf3sa7+PSvxU4sgGFoVsIYVoSzWTmkjYBwC7AY I2Zw== X-Gm-Message-State: AC+VfDwQqQHvLmMOGcNO7ay3iTcuaAF34Wl5yGWd6wHUh+yTsfYmWS4P 9bRn78NAJo1D/c1umvxOn9D2MKHKQLZi4JMK4h5kNg== X-Received: by 2002:a1c:7502:0:b0:3f2:5028:a558 with SMTP id o2-20020a1c7502000000b003f25028a558mr13760327wmc.0.1683098544765; Wed, 03 May 2023 00:22:24 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id t4-20020a7bc3c4000000b003f1745c7df3sm962789wmj.23.2023.05.03.00.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:22:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng, Weiwei Li , Junqiang Wang , LIU Zhiwei Subject: [PULL v2 02/12] accel/tcg: Uncache the host address for instruction fetch when tlb size < 1 Date: Wed, 3 May 2023 08:20:48 +0100 Message-Id: <20230503072221.1746802-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072221.1746802-1-richard.henderson@linaro.org> References: <20230503072221.1746802-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x330.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=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: Weiwei Li When PMP entry overlap part of the page, we'll set the tlb_size to 1, which will make the address in tlb entry set with TLB_INVALID_MASK, and the next access will again go through tlb_fill.However, this way will not work in tb_gen_code() => get_page_addr_code_hostp(): the TLB host address will be cached, and the following instructions can use this host address directly which may lead to the bypass of PMP related check. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1542. Signed-off-by: Weiwei Li Signed-off-by: Junqiang Wang Reviewed-by: LIU Zhiwei Reviewed-by: Richard Henderson Message-Id: <20230422130329.23555-6-liweiwei@iscas.ac.cn> --- accel/tcg/cputlb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index e984a98dc4..efa0cb67c9 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1696,6 +1696,11 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, target_ulong addr, if (p == NULL) { return -1; } + + if (full->lg_page_size < TARGET_PAGE_BITS) { + return -1; + } + if (hostp) { *hostp = p; }