From patchwork Fri Jun 14 17:11:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 166904 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2357353ilk; Fri, 14 Jun 2019 11:00:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqznZJnEv4b+G/Pn29w28ao39mwbOl+UAUFgipkypgI/pkZEq6TVS8G/zPcj8AXAVJRUJwUP X-Received: by 2002:a37:6652:: with SMTP id a79mr58499345qkc.60.1560535215610; Fri, 14 Jun 2019 11:00:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560535215; cv=none; d=google.com; s=arc-20160816; b=nMDCSiCpiQzP8tdUNR5rLFAFxF1QJOHBL/Im9R+ZV3c3vy4/FylbGdvIC5+tcNkjAs vw2m+Ri7Zq1IiB233kdnhi0SoRqJQjxDQts567L0yxOfbhqPLVrh6NIegewrrfwd2yi5 7W1gFSdwqyt8bNYcLYGpoA2Q6FSE/Jjb3LBGsdlKogmYNlMKL4vxjisfM9N6zH4zPUw8 WedQ5LvPT7oI3ZinURb1MonO3vrafV9J+vhx4s7tYp46vxwLFOO3y0F6YYofJBrwEOtc ywfTnhB9s6pxivQKdbZC7toNIkP+RYIrqcJx96bf8NCBZQy2zG5BeYI7+sjWq9jP8F+V Ahzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=wTzsgKyezzklLe62p3Xhjbs91VZGkyagGHfvJN+obus=; b=GdALJ3DGuxuTsmxng4TSYn/0MAw8RsQNRiysHvosrzkCRa1OWxG56mcmLa8eECrSq2 H1qqqaN1ZBirmgNzOemfGSikKpy+uzscSShj8QR6rr/vQOLNs1bX6uQKpKfV+BpIpgu9 8ZkHxduknARcJ/q4aneRN6DgjgFy5qXE8dod5Y0RKiV8E2wW3epG/9wNnQYnkXozxmjG +wT+7qQVlfkrOiDf8gysw6d8Zx6/hxfvqWrlxSRm3zBBgF0wmbl4b2m8J4evmCRoRpHu lqDzaj8HIQwpi21YnTcUNwvRszyTZSsYLSVPR2nGAyf22xNcAnGpg4wZxeRaIPx6C4dM z/hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xylxhynK; 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=fail (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 o79si2269428qka.13.2019.06.14.11.00.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jun 2019 11:00:15 -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=fail header.i=@linaro.org header.s=google header.b=xylxhynK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbqUp-0004Xd-3f for patch@linaro.org; Fri, 14 Jun 2019 14:00:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58596) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbpqh-0005aq-3s for qemu-devel@nongnu.org; Fri, 14 Jun 2019 13:18:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbpqe-00076Y-50 for qemu-devel@nongnu.org; Fri, 14 Jun 2019 13:18:46 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbpqd-0006iJ-NR for qemu-devel@nongnu.org; Fri, 14 Jun 2019 13:18:43 -0400 Received: by mail-wr1-x444.google.com with SMTP id n4so3355415wrs.3 for ; Fri, 14 Jun 2019 10:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wTzsgKyezzklLe62p3Xhjbs91VZGkyagGHfvJN+obus=; b=xylxhynKuTsGMmspgASfMRRvc1v7UD0zd4h0c+eo3PIbebB7xn9FAaJXh8JnwvYJmD 6HGmlmqRAJHss5vahRw/8MOJuhVBDwsfPTl04eytddPGkRQWqNJIhUzjW12rQSPMx5BF nkkzkvv7R7PHXhMOvf+tDaluFvtL5YXX4OETt9/x/+PObGv8Lq1mNDQ51VRQUMjciiWE No2huPuf57BqHupDU/mi56IjMO999bkKvMEPxGAbTjJEswWoJKGnBRtjQTQodr4+BrX1 423VUIT2YIqAmK95Tcd5NlB2NWrwnGdAiB/TLX3JjuKet0XUUAJNaeTJgcrOOJ0D5JRC OyPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wTzsgKyezzklLe62p3Xhjbs91VZGkyagGHfvJN+obus=; b=pAgk5Ein5hYdfg7kzFBjc3Y9zhKqILtgyS1ZdrNJCepKdCSoR3aUCCafncswfYzsVJ 1Q6uEc5uNeBI5CNKcC1b/tdBQsyU/w5ambTW1ZDmkc0DSnwAx7OSFxz/NoSgkd6brwP8 DobKJT16TD37ji3LOEj86wlBN8adOxZOUi+fLV7h9O0cMnVGXoIkiZ+sJrecqXGv7IWw ToN52kY+I/QhgMPE9GtxX4gG+lCmPDHHZ0hXu3TggI7WpFnb1QBnXy5/lFQskBU7vnTc p8OKIlU/8iNMVu34Bg+H80BjXbxcrX4eke6DMjOhXWjRLdrlMNjhWm749otUIjOcFLrg oLdg== X-Gm-Message-State: APjAAAXTx+nIZdMka0K/175noDIzvWNPlsDSgRxYvQKKqNQ80PrrUX8y ADb1BhtF4hjaFyd8gujhQjX/ow== X-Received: by 2002:a5d:4ec1:: with SMTP id s1mr13199824wrv.19.1560532712075; Fri, 14 Jun 2019 10:18:32 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g19sm4416496wmg.10.2019.06.14.10.18.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 14 Jun 2019 10:18:29 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F3FE1FF9B; Fri, 14 Jun 2019 18:12:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 14 Jun 2019 18:11:21 +0100 Message-Id: <20190614171200.21078-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614171200.21078-1-alex.bennee@linaro.org> References: <20190614171200.21078-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v3 11/50] cputlb: document get_page_addr_code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Emilio G. Cota" , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Suggested-by: Alex Bennée Signed-off-by: Emilio G. Cota --- accel/tcg/cputlb.c | 5 ----- include/exec/exec-all.h | 24 +++++++++++++++++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index bb9897b25a..3237ff4def 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1015,11 +1015,6 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, victim_tlb_hit(env, mmu_idx, index, offsetof(CPUTLBEntry, TY), \ (ADDR) & TARGET_PAGE_MASK) -/* NOTE: this function can trigger an exception */ -/* NOTE2: the returned address is not exactly the physical address: it - * is actually a ram_addr_t (in system mode; the user mode emulation - * version of this function returns a guest virtual address). - */ tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr) { uintptr_t mmu_idx = cpu_mmu_index(env, true); diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 16034ee651..8b1c3d5b9d 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -480,7 +480,15 @@ void mmap_lock(void); void mmap_unlock(void); bool have_mmap_lock(void); -static inline tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) +/** + * get_page_addr_code() - user-mode version + * @env: CPUArchState + * @addr: guest virtual address of guest code + * + * Returns @addr. + */ +static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, + target_ulong addr) { return addr; } @@ -488,8 +496,18 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong static inline void mmap_lock(void) {} static inline void mmap_unlock(void) {} -/* cputlb.c */ -tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr); +/** + * get_page_addr_code() - full-system version + * @env: CPUArchState + * @addr: guest virtual address of guest code + * + * If we cannot translate and execute from the entire RAM page, or if + * the region is not backed by RAM, returns -1. Otherwise, returns the + * ram_addr_t corresponding to the guest code at @addr. + * + * Note: this function can trigger an exception. + */ +tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr); void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length); void tlb_set_dirty(CPUState *cpu, target_ulong vaddr);