From patchwork Wed Aug 28 23:16:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172512 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1422226ily; Wed, 28 Aug 2019 16:23:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyNqkNVYRVtpfkVCsJU1F1SfGtS0Zq2INaURkkMr1k8p787hIy9d8PaaxFyLdwQa9Oqn+gE X-Received: by 2002:a17:906:881:: with SMTP id n1mr5625757eje.68.1567034630926; Wed, 28 Aug 2019 16:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567034630; cv=none; d=google.com; s=arc-20160816; b=chVs2rymNvVteOuI910jyyNZdeoavN8oXo+YhHIdAgYgDmu9+gnt7feYkIpMNqU21R /ExphstOUkjZTOY8+VtCDHeWr+bA31b6Tn8yL8KTx4gqZz7YysqpTzzsLKU787zX02uY WbN4ZNPg9P774cnnxigQ1g56NaFqVCn5NoODGPNeCd7m1yFTH4JH69O5yHf9CaknLBRU J1vGV6GILtt4aojheiftX1b3BKpShFOz1kwSohq6s5KjvRC18xrAhYprK//Afyd8CP26 wneYIIrHsnkB0xfVNpc0py9+UKOhsm5P8SmCtBniNCM8dxymtsQxLBNm6l1p/fRKm6Nm 6pVQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=JQUPutWQvF8Cc5oeNW7RTy29F84wJ8I1Hnzwo9VUtUk=; b=Z1aDPlS3gk1afTgK8jZRnY4VhJOL8tPQdIld4MfI3dMpuAVGus52aIQbp/dngv1AWn uhe+UAAWdLuCf3qXRPp5PacZ0xmGj8QNVwmFJUSQbD9ZpAzvdw6EKgzI6JdeQ9hUZu/b oOq8XLcXHgpNwzCbItiftkRlVWati+bwZs3I75l7ycgWGYI8z0psJxSPkFXWamfKjSie 3VEclJ+qqxlUMqrpD8WdW3BocXwbsDMzzJBNzqr0DWkMi5N0uSHvoqJcfL8oQXzTpBwz zb5Vs8D1zHqRtkoxTMGRFx8P7F52KN32Vc8Ejec0rtXf9Mq8hvJCURHBLEILiiL0nlhy TJzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zpyDqQQT; 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 k1si77982eda.86.2019.08.28.16.23.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 16:23:50 -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=zpyDqQQT; 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]:43678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i37I5-00030W-SO for patch@linaro.org; Wed, 28 Aug 2019 19:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52376) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i37BZ-0004IU-QO for qemu-devel@nongnu.org; Wed, 28 Aug 2019 19:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i37BY-0008Hz-R4 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 19:17:05 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:41132) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i37BY-0008Hp-Ll for qemu-devel@nongnu.org; Wed, 28 Aug 2019 19:17:04 -0400 Received: by mail-pf1-x42a.google.com with SMTP id 196so735836pfz.8 for ; Wed, 28 Aug 2019 16:17:04 -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; bh=JQUPutWQvF8Cc5oeNW7RTy29F84wJ8I1Hnzwo9VUtUk=; b=zpyDqQQTi4XvJgPrR7M/XbhQyAuuDVR95eHWkhVnKf0Gm4EaXYZTmXCWkLk8kAQjom TrPjQdli2V5LD+lnFioB/iO3N199HEMY+FZ9/Fy/qLonyqP9v9YAw/zgtAQk3uZhd0+w gOzRSGQqoDX141zTJl+x7p+6z7Gbz2S/TJrMGJlAvVBTMXnPw1ynwbzButLqYEvhQcus +gt7pTaYtcHw2tMXPeAOAcPSwCC2gpryuZI2h5AQz2MUQHuoA2tsJqPd6xUj9EWUUZvC QrEZwwRyzSpmpZ17yzN4o9Hk7pc6Uhc7/zrHIMvqiU2WuiWBLMcM1yj472oTeDigyHXC +B5Q== 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; bh=JQUPutWQvF8Cc5oeNW7RTy29F84wJ8I1Hnzwo9VUtUk=; b=cFMzAVTHJTmHPwBdvhIXCB1O3Gy/YH7M2n84LlkHdQ3tUHuW1WVajaLbM1JzByBNBF DC28u6xRFyA/5lzQJt4m6ytbsayecSn/qsoxtsy34N726+VvMIEe36f3YphFD5EJSaMs 8NMlQSBTlsZ+pO4auAu78QXkdYkJ+nUMWMJy/HxMBT76ocVVP75wiwonfdIMUUg+59Rm lnngag1eiDEpPO6yr1v0w8ivUFklnfCyEKrwy9zqiL8JkRgpRe47S0seiMgWFFWmhHDd 8i1AcbgAPSxCzCqOYKo6/aiC5VJCqQ4EGbRAQtuZ71SmoTsFXVVlxPo34sYSd2o9EVFH NQQQ== X-Gm-Message-State: APjAAAXIMVj1OnMO0NYfBhEZqFhsYjx0F0B6DzBTLkyrs+egmZeGaJv9 fvxyYnMP0G69vYVrRQjAr8s9W6pCUsk= X-Received: by 2002:a63:1743:: with SMTP id 3mr5406212pgx.435.1567034223098; Wed, 28 Aug 2019 16:17:03 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id s5sm485197pfm.97.2019.08.28.16.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 16:17:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 16:16:51 -0700 Message-Id: <20190828231651.17176-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828231651.17176-1-richard.henderson@linaro.org> References: <20190828231651.17176-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42a Subject: [Qemu-devel] [PATCH v2 8/8] tcg: Check for watchpoints in probe_write() 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: david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand Let size > 0 indicate a promise to write to those bytes. Check for write watchpoints in the probed range. Suggested-by: Richard Henderson Signed-off-by: David Hildenbrand Message-Id: <20190823100741.9621-10-david@redhat.com> [rth: Recompute index after tlb_fill; check TLB_WATCHPOINT.] Signed-off-by: Richard Henderson --- accel/tcg/cputlb.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 9a9a626938..010c4c6e3c 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1086,13 +1086,24 @@ void probe_write(CPUArchState *env, target_ulong addr, int size, int mmu_idx, { uintptr_t index = tlb_index(env, mmu_idx, addr); CPUTLBEntry *entry = tlb_entry(env, mmu_idx, addr); + target_ulong tlb_addr = tlb_addr_write(entry); - if (!tlb_hit(tlb_addr_write(entry), addr)) { - /* TLB entry is for a different page */ + if (unlikely(!tlb_hit(tlb_addr, addr))) { if (!VICTIM_TLB_HIT(addr_write, addr)) { tlb_fill(env_cpu(env), addr, size, MMU_DATA_STORE, mmu_idx, retaddr); + /* TLB resize via tlb_fill may have moved the entry. */ + index = tlb_index(env, mmu_idx, addr); + entry = tlb_entry(env, mmu_idx, addr); } + tlb_addr = tlb_addr_write(entry); + } + + /* Handle watchpoints. */ + if ((tlb_addr & TLB_WATCHPOINT) && size > 0) { + cpu_check_watchpoint(env_cpu(env), addr, size, + env_tlb(env)->d[mmu_idx].iotlb[index].attrs, + BP_MEM_WRITE, retaddr); } }