From patchwork Tue Aug 14 18:17:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 144212 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4710770ljj; Tue, 14 Aug 2018 11:41:34 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw0YcG+SGMUqvV8KoeYEhLxN05V6Y1AGgqksVyPzq9u3myoPgy6OWD0A2RYh5yzupL7YPRd X-Received: by 2002:a37:7946:: with SMTP id u67-v6mr20387575qkc.283.1534272094276; Tue, 14 Aug 2018 11:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534272094; cv=none; d=google.com; s=arc-20160816; b=vXRkfqpCmGiOZy48kT03AM/CmDoesvvARVzwrLbnEiwUlVxS3egNnFObXijqlw3JCa xVdbeA3e+WyvNpNkAEme6RYU24fpzUBTeUtRDbQ8ZeW2vAtpxgPfZWoFSPAj/VgD1aWT aswArsfREkwPuk+WJjG94X35sbSAJ/QW0iBUog0epscfwL1OWSQNNTVIM/DVZrXKgoOk Mr7uMW2SS36lWWgX2rTzj1UySNLczC/F6xKw0OfSlTzivnL9c6YPfrETdWusWhLBUP5a RnGiDgJbtnY3SxedH3VQxsFwzisrmQKDuMMAM9mURcuuA7QJ4NTZC1+HB6tUYbabDANy 1jMg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=wIaz5Shttn+IxSZo5Ogvl+twTkrWemh71cBbvWBBh8o=; b=CNpbfOTmWi8v5mrczpVlROQBLGhSWQw8SsTurookAr1QF4Y5l2lTw7WZ/ZB/F9XYK3 66fAWdmXCsY9h5tXerhYPuOtDe5MewYm6/bEc/If/2E2rRb2BKRRVCheDaLZlVtS+SDi 20cxlOw8+Y3gOS/JBdBG7EttI2BcBxprOZwbAu8mRoH+JKjeBWXOipKAHZ+5fYSzeg/K MAryDTEDbHZIVGv5YfIrlmL30NTQ5SX4uYFCB870teyBzXDyGiCSmkPT9v9mFWDx3TjG 3VnN2uSXBiUi01dUJp8oABHQfSTYXZBfY0kUKf+PWCciAZib2t2QMOZ25OedT7ekvxCL o/Aw== ARC-Authentication-Results: i=1; mx.google.com; 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 n10-v6si7537465qki.138.2018.08.14.11.41.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Aug 2018 11:41:34 -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; 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]:45709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpeG5-0004Ac-O8 for patch@linaro.org; Tue, 14 Aug 2018 14:41:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpdur-0004QP-Qr for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:21:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpdtj-0006Xu-UR for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:19:37 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:44402) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpdtj-0006Wd-9d for qemu-devel@nongnu.org; Tue, 14 Aug 2018 14:18:27 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fpdth-00079k-QY for qemu-devel@nongnu.org; Tue, 14 Aug 2018 19:18:25 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2018 19:17:37 +0100 Message-Id: <20180814181815.23348-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814181815.23348-1-peter.maydell@linaro.org> References: <20180814181815.23348-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 07/45] accel/tcg: Handle get_page_addr_code() returning -1 in tb_check_watchpoint() 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When we support execution from non-RAM MMIO regions, get_page_addr_code() will return -1 to indicate that there is no RAM at the requested address. Handle this in tb_check_watchpoint() -- if the exception happened for a PC which doesn't correspond to RAM then there is no need to invalidate any TBs, because the one-instruction TB will not have been cached. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Tested-by: Cédric Le Goater Message-id: 20180710160013.26559-4-peter.maydell@linaro.org --- accel/tcg/translate-all.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.18.0 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 1571987113b..ff7d0145f46 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2121,7 +2121,9 @@ void tb_check_watchpoint(CPUState *cpu) cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); addr = get_page_addr_code(env, pc); - tb_invalidate_phys_range(addr, addr + 1); + if (addr != -1) { + tb_invalidate_phys_range(addr, addr + 1); + } } }