Received: by 2002:a19:5205:0:0:0:0:0 with SMTP id m5csp4974875lfb; Tue, 31 Aug 2021 05:18:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkDJRKrh4Ogg0XJugw7/VpF3CoPGXuKxrn2mZVy3iasTBOLNWrroXSBpCTzYzlk720PLRN X-Received: by 2002:a17:906:f11:: with SMTP id z17mr31348839eji.385.1630412286191; Tue, 31 Aug 2021 05:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630412286; cv=none; d=google.com; s=arc-20160816; b=F1I7uXcKj2VfHEpYjpFiaXb0LOrmujppQS1MV054FIYT084JbG9Oh3rpT+xG2BRUEd 1W9Zb9oFpHSd7jLxnPAygN+Wb+u9PJlkw/FUR/6Auc48RuT1fzET22lGfos1YAO2Mq9a 3N9KG936q1u+/lkZ6Efpic6exMUhafvHetrxaBJLAOvH449Ydsd1+ULlYJ8moSthJF3x Fsc7gcPNRzlX1gfaZBkKc3nFFliUDHu54ZtjO2BI4nAWBW3GX/DpRnqGNjTUFaCaheUY JM60DzezidDI9CMqjPZpGvnO7DXL1ytWtTtFFpmdxZa9/hJW5AFOhaNohLVI8aut6slD Usiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Df/cS+Kk2RDhFNkjyLEWK9DtQT8M40JsvdVaLc7r9J8=; b=aJwMBH6Lrrs6nzoD2y1/fzrDpiBoXDmVR9XUPZe1DOSu1IXTlSv3vd1DKwgIbnjguM xO51QwQAA+TQLPO0lx9XUZ+2gY1MYXjpOy8/TmIihVV7POpUFNF6K+bHbEpL/O/JpTs4 NFL8xl4SOOxo9vLjMyp3JXLTCdiqyNzAoXgflHG3p67tg9shxnOA5C//PSgq/kWvht5m fBnGRTK7tHbv7m+isgfWmwbUfOgYbZWiF8OChFJKPioD5pUYAqfM6s0/6pnm5TRg1WOF Z1deDQ3CQqILPEMmHEoswbzBZH8grIq91wt9htJpH2QFHBPAzqG08GSyz7Us7j6pwyJk gYFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GChTyPXR; spf=pass (google.com: domain of kraxel@redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=kraxel@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [216.205.24.124]) by mx.google.com with ESMTPS id m4si20751106eja.677.2021.08.31.05.18.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Aug 2021 05:18:06 -0700 (PDT) Received-SPF: pass (google.com: domain of kraxel@redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GChTyPXR; spf=pass (google.com: domain of kraxel@redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=kraxel@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630412285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Df/cS+Kk2RDhFNkjyLEWK9DtQT8M40JsvdVaLc7r9J8=; b=GChTyPXR8eRh340cc+ET0uFsKeLOaYfIAIoPpU8jlm93aILx5+Dxv9ImqJNasduhHIDYlW wYdkXGkZJtkFGRJojcuAass+x9Hq75vZn9UeC3FhjG0vY1JgJ7YJ74OCOBbvyTKSZqElZq gBnTP3PBnr3C8CuEFVccuZ3e4HhOPP0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-469-cYZepCxIMVyGkTckoaK2fw-1; Tue, 31 Aug 2021 08:18:03 -0400 X-MC-Unique: cYZepCxIMVyGkTckoaK2fw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F1A392509; Tue, 31 Aug 2021 12:18:00 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08C61104B4C2; Tue, 31 Aug 2021 12:17:53 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4AE3718009D9; Tue, 31 Aug 2021 14:15:46 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Laurent Vivier , Peter Xu , Peter Maydell , Marcel Apfelbaum , Cornelia Huck , qemu-ppc@nongnu.org, Bastian Koppelmann , Thomas Huth , Eduardo Habkost , qemu-riscv@nongnu.org, David Gibson , Aleksandar Rikalo , Stafford Horne , Huacai Chen , Halil Pasic , Palmer Dabbelt , Bin Meng , Mahmoud Mandour , Max Filippov , Alexandre Iooss , Greg Kurz , "Edgar E. Iglesias" , Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Paolo Bonzini , Alistair Francis , qemu-s390x@nongnu.org, Christian Borntraeger , Jiaxun Yang , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PATCH 17/29] tcg: drop tb_invalidate_phys_page_range() Date: Tue, 31 Aug 2021 14:15:33 +0200 Message-Id: <20210831121545.2874233-18-kraxel@redhat.com> In-Reply-To: <20210831121545.2874233-1-kraxel@redhat.com> References: <20210831121545.2874233-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-TUID: B4ThJfOpJkKV tb_invalidate_phys_range() can be used instead. Signed-off-by: Gerd Hoffmann --- include/exec/translate-all.h | 1 - accel/tcg/translate-all.c | 25 ------------------------- cpu.c | 4 ++-- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/include/exec/translate-all.h b/include/exec/translate-all.h index a557b4e2bb9e..f313542cdae1 100644 --- a/include/exec/translate-all.h +++ b/include/exec/translate-all.h @@ -29,7 +29,6 @@ void page_collection_unlock(struct page_collection *set); void tb_invalidate_phys_page_fast(struct page_collection *pages, tb_page_addr_t start, int len, uintptr_t retaddr); -void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end); void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr); #ifdef CONFIG_USER_ONLY diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 57bb921bd3ba..3a3a60575141 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1768,31 +1768,6 @@ tb_invalidate_phys_page_range__locked(struct page_collection *pages, #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. - * '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 - */ -void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end) -{ - struct page_collection *pages; - PageDesc *p; - - assert_memory_lock(); - - p = page_find(start >> TARGET_PAGE_BITS); - if (p == NULL) { - return; - } - pages = page_collection_lock(start, end); - tb_invalidate_phys_page_range__locked(pages, p, start, end, 0); - page_collection_unlock(pages); -} - /* * Invalidate all TBs which intersect with the target physical address range * [start;end[. NOTE: start and end may refer to *different* physical pages. diff --git a/cpu.c b/cpu.c index e8baec294b06..b8ac817cb3fd 100644 --- a/cpu.c +++ b/cpu.c @@ -222,7 +222,7 @@ const char *parse_cpu_option(const char *cpu_option) void tb_invalidate_phys_addr(tb_page_addr_t addr) { mmap_lock(); - tb_invalidate_phys_page_range(addr, addr + 1); + tb_invalidate_phys_range(addr, addr + 1); mmap_unlock(); } #else @@ -243,7 +243,7 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs) return; } ram_addr = memory_region_get_ram_addr(mr) + addr; - tb_invalidate_phys_page_range(ram_addr, ram_addr + 1); + tb_invalidate_phys_range(ram_addr, ram_addr + 1); } #endif -- 2.31.1