From patchwork Mon Sep 23 22:59:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174234 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3407864ill; Mon, 23 Sep 2019 16:11:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDuM6p03aXBBFrLi0Q5regPEDbX4JysOC7Gww3bK/qprzXoFm0b+Xw9lYYkKkUenIQYY0v X-Received: by 2002:a17:906:e0c2:: with SMTP id gl2mr1934459ejb.157.1569280317130; Mon, 23 Sep 2019 16:11:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569280317; cv=none; d=google.com; s=arc-20160816; b=m9A6fSULJZQzO3/EnRLFBmtRGUVH+ya/+CASmaStycMwFmz5SSjfKzkTlXZcRmiJoQ YHq/DJ0dOJUfNXF+yv56Qw4zmie7E3lCwIqaQGFK2eWYjfLT9Xwtc9ueTiNuS2OFtkg4 5U1M/eiub/pb3ynMy61z0vx+3inn+NFYAYg0yqarZCsqzXhiATHv1KRrqAf9ib45lrSt 6QswJcUAPONbQH2nWH264nuUve629Xnrh8YCvuiRkEbbLm6PR6bV2MkUXi0SoKW+L4HD wh4J2EFHppwrFdiFZKvMhrAo7MlPPM1PupB0Z1QQUl+j+seEe87rSiM9pHdCYJqlEye+ qbiA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Z4fsQyjcOSp3U9YW2COSXHromnUnZCH6RDomXXmObRw=; b=yvE07upoXyWEIg+ymmx+z8MT2hbKtV5mJIPUGUVGLExhW37yZjfvZM/VKSnMaob31w +ZuQtiw5LZSm3UyQ9ZNJCj4YTnXV/0DoLSymFauOGFh9qdw1EAgyeyKzZ3J+/+quzB1k GSqtDHzuYp+Ahc8GB5xqIriquAxqiqn/2zCTrNvDhk7iwZpdReSsibro9OrgJnsX1uW0 8XpQ0VwTs65IMl8X+HivKHCRmcby3r5PAXUDaRajxF0AsKBaYAoS8JgpymSoZebZJ8Tp /ny/mwJNh83zZq6XioY6wF7mdbiW7SrDsAmBryzqw6awmvAE5NMsjHxbMgY7pU4G/AXn EZxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="eQS98y/x"; 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 p39si7298036eda.416.2019.09.23.16.11.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Sep 2019 16:11:57 -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="eQS98y/x"; 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]:37158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCXUp-0006GT-Qu for patch@linaro.org; Mon, 23 Sep 2019 19:11:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35800) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCXJe-0005aP-Rg for qemu-devel@nongnu.org; Mon, 23 Sep 2019 19:00:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCXJc-00084a-WF for qemu-devel@nongnu.org; Mon, 23 Sep 2019 19:00:22 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:46080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCXJc-00083S-NV for qemu-devel@nongnu.org; Mon, 23 Sep 2019 19:00:20 -0400 Received: by mail-pg1-x542.google.com with SMTP id a3so8866196pgm.13 for ; Mon, 23 Sep 2019 16:00: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=Z4fsQyjcOSp3U9YW2COSXHromnUnZCH6RDomXXmObRw=; b=eQS98y/xBy3Oc/KtVKeGFQ7UGXjjt/Ek8TMuDTKXa5zNYbpSjDCn6BHefK9x5U+lVd h4qGAm02aS+vATpeck6e3Sk3JwpYlpshtidTSdjDcPix/Vg+UrhoRIH8D79zF24UHSM/ jeOllPlk3FOjoqoac70erAXhpkcRKfk2dk0WSPpAnlTFoytf8raBHM/kgy0R94GScnIO yBR62STPIdQpHSR2xEJ0ARHs9Q09NIVAYZpVdgAQHdKy74gHSqNLm/XvfS1KECNOE448 LRYY04+vxqjpt1PCHI4nEv5DQKc+1rK4NHIMJCi3jpNTpfJ2i5/tYtSpckkRfibbKnz4 VL9Q== 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=Z4fsQyjcOSp3U9YW2COSXHromnUnZCH6RDomXXmObRw=; b=afkFQdpBb3aSsN5JWcRiKRAU35Cay5wdsPzmGWsFoakOBK0uDy4MZWhTaOqy2VAD1S hkJBD8MwF/7YaXit4q/+/sxc3FFjqsG/xYUPneGXINPRtKA9q+MU406R6P/ufFOO6nYt cGVF+ERtIpA8a8BzxI1O1puvIq2jcQ01ZMgz/60v4/Rz2ebqvmb3wsapeuBpE3RvouNU 4kDicdduKhQpoA7PDxOO6T4kOB6EEJlX+lyBznyOMcJEJpLUndaBsGgrEPUcXWO5ELku MewjrJU3jK5t5roDJZrWLLq3UcnlTZ38BQxqQNKB1AImp9wrVGXTN6G0HfO4O4Jk/TmW 7A1A== X-Gm-Message-State: APjAAAXxisJ4QegyCwih6aIoVVpnhAwPtHX4KhhyeIqs6HFewo9lmsso 3GsT874taQ2Wbe5WckW+KtBNXmj59TQ= X-Received: by 2002:a62:7684:: with SMTP id r126mr2170607pfc.26.1569279618689; Mon, 23 Sep 2019 16:00:18 -0700 (PDT) Received: from localhost.localdomain ([12.206.46.59]) by smtp.gmail.com with ESMTPSA id 74sm11674810pfy.78.2019.09.23.16.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 16:00:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 07/16] exec: Adjust notdirty tracing Date: Mon, 23 Sep 2019 15:59:55 -0700 Message-Id: <20190923230004.9231-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190923230004.9231-1-richard.henderson@linaro.org> References: <20190923230004.9231-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:4864:20::542 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: pbonzini@redhat.com, alex.bennee@linaro.org, stefanha@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The memory_region_tb_read tracepoint is unreachable, since notdirty is supposed to apply only to writes. The memory_region_tb_write tracepoint is mis-named, because notdirty is not only used for TB invalidation. It is also used for e.g. VGA RAM updates and migration. Replace memory_region_tb_write with memory_notdirty_write_access, and place it in memory_notdirty_write_prepare where it can catch all of the instances. Add memory_notdirty_set_dirty to log when we no longer intercept writes to a page. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- exec.c | 3 +++ memory.c | 4 ---- trace-events | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/exec.c b/exec.c index 8b998974f8..5f2587b621 100644 --- a/exec.c +++ b/exec.c @@ -2755,6 +2755,8 @@ void memory_notdirty_write_prepare(NotDirtyInfo *ndi, ndi->size = size; ndi->pages = NULL; + trace_memory_notdirty_write_access(mem_vaddr, ram_addr, size); + assert(tcg_enabled()); if (!cpu_physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) { ndi->pages = page_collection_lock(ram_addr, ram_addr + size); @@ -2779,6 +2781,7 @@ void memory_notdirty_write_complete(NotDirtyInfo *ndi) /* we remove the notdirty callback only if the code has been flushed */ if (!cpu_physical_memory_is_clean(ndi->ram_addr)) { + trace_memory_notdirty_set_dirty(ndi->mem_vaddr); tlb_set_dirty(ndi->cpu, ndi->mem_vaddr); } } diff --git a/memory.c b/memory.c index b9dd6b94ca..57c44c97db 100644 --- a/memory.c +++ b/memory.c @@ -438,7 +438,6 @@ static MemTxResult memory_region_read_accessor(MemoryRegion *mr, /* Accesses to code which has previously been translated into a TB show * up in the MMIO path, as accesses to the io_mem_notdirty * MemoryRegion. */ - trace_memory_region_tb_read(get_cpu_index(), addr, tmp, size); } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) { hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, size); @@ -465,7 +464,6 @@ static MemTxResult memory_region_read_with_attrs_accessor(MemoryRegion *mr, /* Accesses to code which has previously been translated into a TB show * up in the MMIO path, as accesses to the io_mem_notdirty * MemoryRegion. */ - trace_memory_region_tb_read(get_cpu_index(), addr, tmp, size); } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) { hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, size); @@ -490,7 +488,6 @@ static MemTxResult memory_region_write_accessor(MemoryRegion *mr, /* Accesses to code which has previously been translated into a TB show * up in the MMIO path, as accesses to the io_mem_notdirty * MemoryRegion. */ - trace_memory_region_tb_write(get_cpu_index(), addr, tmp, size); } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) { hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, size); @@ -515,7 +512,6 @@ static MemTxResult memory_region_write_with_attrs_accessor(MemoryRegion *mr, /* Accesses to code which has previously been translated into a TB show * up in the MMIO path, as accesses to the io_mem_notdirty * MemoryRegion. */ - trace_memory_region_tb_write(get_cpu_index(), addr, tmp, size); } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) { hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr); trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, size); diff --git a/trace-events b/trace-events index 823a4ae64e..20821ba545 100644 --- a/trace-events +++ b/trace-events @@ -52,14 +52,14 @@ dma_map_wait(void *dbs) "dbs=%p" find_ram_offset(uint64_t size, uint64_t offset) "size: 0x%" PRIx64 " @ 0x%" PRIx64 find_ram_offset_loop(uint64_t size, uint64_t candidate, uint64_t offset, uint64_t next, uint64_t mingap) "trying size: 0x%" PRIx64 " @ 0x%" PRIx64 ", offset: 0x%" PRIx64" next: 0x%" PRIx64 " mingap: 0x%" PRIx64 ram_block_discard_range(const char *rbname, void *hva, size_t length, bool need_madvise, bool need_fallocate, int ret) "%s@%p + 0x%zx: madvise: %d fallocate: %d ret: %d" +memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned size) "0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u" +memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64 # memory.c memory_region_ops_read(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size %u" memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size %u" memory_region_subpage_read(int cpu_index, void *mr, uint64_t offset, uint64_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx64" size %u" memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, uint64_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx64" size %u" -memory_region_tb_read(int cpu_index, uint64_t addr, uint64_t value, unsigned size) "cpu %d addr 0x%"PRIx64" value 0x%"PRIx64" size %u" -memory_region_tb_write(int cpu_index, uint64_t addr, uint64_t value, unsigned size) "cpu %d addr 0x%"PRIx64" value 0x%"PRIx64" size %u" memory_region_ram_device_read(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size %u" memory_region_ram_device_write(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size %u" flatview_new(void *view, void *root) "%p (root %p)"