From patchwork Fri Jun 15 19:43:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 138770 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1257190lji; Fri, 15 Jun 2018 12:59:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKmQC50aC2AU6b0HZM/jgmLHCmPaGnS5K+0IY59FurJBBWQctblrEWn2o2yQrdHYHU1WloT X-Received: by 2002:a37:4cd5:: with SMTP id z204-v6mr2697800qka.302.1529092773143; Fri, 15 Jun 2018 12:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529092773; cv=none; d=google.com; s=arc-20160816; b=STUM/Rx76N7xlLDiaM9YNNQfcN0gCXm/W8w6yAvpMFc8OPITpKldZ9dgVyggt5pr51 5Yojq+1g64DFqk90eBr2bUojhg+XUCGb/tuO/87AUY6b9sA6QK0KFflyHZQiHemeSSp7 iNrDOJTjdfxyXPFrEHaA7aLU5OvnxtpKTNedLHGH6IdhgD/WfsFx/bAwTMQniGdCy4y7 ioBkTEaELhrIvjt4DB9chDOngwaov7t2uKKXGelD2E10RE5tr5kcWfZg6kd/iL64qmQK nRHURSvK9JLF8CmhkDechYdyvCnWDo3MwmmkY2g0Tjo1dVuSN6+1iyu/uWzC3lr4XywH I62w== 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:arc-authentication-results; bh=ShUlIMM0KTqpBxnqZKpmUtzBtiivBcjvXZG919nAn2g=; b=jsL6OSTewBDU8x4+Ol2gZrMXeHwZctPJebPxh39j94MRSqtWLHgJZ7Omog9X1YwWPc ih575d7+NC2wDfyqpHAtYprvuah6JgWS8wB4DYT8Qpod7zLIndVcu3MbOBWXkzEXgO9y 2r2IYpPoIFiEmJRURP5kf5a2lJ8h+3Kwx1oNYQCWePsdIItPHPnDwOACACxGmlOzzxeZ 3S74TCu7PlYuhOpUJZKEQQ09M1Sg3mK8CMQpPrL0sGpiwNkfTuwqfctslmJ5iY3pRGrj NIYcwVTgDGnoflyI/wYXRgGpg5cod9lLGCsYL1RHpdTST6LFC1g/jaZcqAbgaalus2EQ R6hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hzSrR46m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 1-v6si7136412qtm.251.2018.06.15.12.59.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 12:59:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hzSrR46m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:49037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuse-0003xF-Ij for patch@linaro.org; Fri, 15 Jun 2018 15:59:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTudw-0000Ql-QD for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:44:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTudv-0002YA-Oe for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:44:20 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:45856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTudv-0002Xv-I3 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:44:19 -0400 Received: by mail-pf0-x243.google.com with SMTP id a22-v6so5321841pfo.12 for ; Fri, 15 Jun 2018 12:44:19 -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=ShUlIMM0KTqpBxnqZKpmUtzBtiivBcjvXZG919nAn2g=; b=hzSrR46mvfqF17i20lCdDa7GnPxu9G9ym7CsFtKfG2r1YK99SdkEwJroBagYNPb4YS PV0A3ucl8lZod8TbHFXLVb9oOfYXy1FLWj8EuQ1NiTy3xUCWh2XHKZd1FOXW7bdxGT2T PAs4zBl2E1n4FT0kxc25LyU4yjHvTW1+MjAu8= 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=ShUlIMM0KTqpBxnqZKpmUtzBtiivBcjvXZG919nAn2g=; b=eDJA/rmXvPhrJ+b2lk0CQcP9onfXrvDt0dRSbwiR/D2kj/UuclB/8Ydpc/zF1i6OG0 75ABLX7j1brJxn1T0D86xwkc3ZGhQFffKJrrK4WxTiB07VlM06m+2m3JyEUL7v2Xk/ay tzeGXVh5b4vvZIIvwAy7VzC9fudk8GYoJwZ47Vwjmwdrb4DwIEFZL1vyEfAlrZKU3pgf DO2fWk6lYh8OWRgyDpwSg2EusQspqUOYhk7PUaZU34wSk3jHtZr+e1dvqiLXm4R4moi4 uQ6hCnDgzUZkj1oVoDZRdEX2h+SazNKOBDGRAAxFrFH3ukIyf631LtaY6wjUUM8Flyt7 BxWQ== X-Gm-Message-State: APt69E1ymx1I87PFUtxB23dVQ9EzbPt+taGBjyc/kRe5VxLOEPxz0lzP GQC9maUs2Uqlk/uPW2rUddnsxqlNv1o= X-Received: by 2002:a62:8a83:: with SMTP id o3-v6mr3424471pfk.12.1529091858272; Fri, 15 Jun 2018 12:44:18 -0700 (PDT) Received: from cloudburst.twiddle.net (rrcs-173-198-77-219.west.biz.rr.com. [173.198.77.219]) by smtp.gmail.com with ESMTPSA id 29-v6sm14038360pfj.14.2018.06.15.12.44.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:44:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 15 Jun 2018 09:43:45 -1000 Message-Id: <20180615194354.12489-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194354.12489-1-richard.henderson@linaro.org> References: <20180615194354.12489-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PULL v2 10/19] translate-all: move tb_invalidate_phys_page_range up in the file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, "Emilio G. Cota" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" This greatly simplifies next commit's diff. Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 77 ++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 38 deletions(-) -- 2.17.1 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index f32904d4a3..83bb40fb20 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1363,44 +1363,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, return tb; } -/* - * Invalidate all TBs which intersect with the target physical address range - * [start;end[. NOTE: start and end may refer to *different* physical pages. - * 'is_cpu_write_access' should be true if called from a real cpu write - * access: the virtual CPU will exit the current TB if code is modified inside - * this TB. - * - * Called with mmap_lock held for user-mode emulation, grabs tb_lock - * Called with tb_lock held for system-mode emulation - */ -static void tb_invalidate_phys_range_1(tb_page_addr_t start, tb_page_addr_t end) -{ - tb_page_addr_t next; - - for (next = (start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; - start < end; - start = next, next += TARGET_PAGE_SIZE) { - tb_page_addr_t bound = MIN(next, end); - - tb_invalidate_phys_page_range(start, bound, 0); - } -} - -#ifdef CONFIG_SOFTMMU -void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end) -{ - assert_tb_locked(); - tb_invalidate_phys_range_1(start, end); -} -#else -void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end) -{ - assert_memory_lock(); - tb_lock(); - tb_invalidate_phys_range_1(start, end); - tb_unlock(); -} -#endif /* * Invalidate all TBs which intersect with the target physical address range * [start;end[. NOTE: start and end must refer to the *same* physical page. @@ -1500,6 +1462,45 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, #endif } +/* + * Invalidate all TBs which intersect with the target physical address range + * [start;end[. NOTE: start and end may refer to *different* physical pages. + * 'is_cpu_write_access' should be true if called from a real cpu write + * access: the virtual CPU will exit the current TB if code is modified inside + * this TB. + * + * Called with mmap_lock held for user-mode emulation, grabs tb_lock + * Called with tb_lock held for system-mode emulation + */ +static void tb_invalidate_phys_range_1(tb_page_addr_t start, tb_page_addr_t end) +{ + tb_page_addr_t next; + + for (next = (start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; + start < end; + start = next, next += TARGET_PAGE_SIZE) { + tb_page_addr_t bound = MIN(next, end); + + tb_invalidate_phys_page_range(start, bound, 0); + } +} + +#ifdef CONFIG_SOFTMMU +void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end) +{ + assert_tb_locked(); + tb_invalidate_phys_range_1(start, end); +} +#else +void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end) +{ + assert_memory_lock(); + tb_lock(); + tb_invalidate_phys_range_1(start, end); + tb_unlock(); +} +#endif + #ifdef CONFIG_SOFTMMU /* len must be <= 8 and start must be a multiple of len. * Called via softmmu_template.h when code areas are written to with