From nobody Wed May 1 18:11:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555670333; cv=none; d=zoho.com; s=zohoarc; b=RgHJWAIjn5jhq/c6tkSlekkTI6XFSLf6FCpGjz7vmoEsLQFPzlM3cXrcYcqrwRpP/RUHmGiZn6wuULGv68RRYwlyArLfZJs/CAec9bYNd8jMjibVkKlrRIsey8lNCFk+glIjKM2PlSP90lNBu6/qjp8CMaZl6+E5/1lq62i61Fg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555670333; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=28jotbghOsTkOfUxXEzjb4qLbJLpTPn+3ztFJ/xHkAk=; b=jKCCBukfyaRQdObVs0DdlhS0BWeiRWlYtcLGsBNYAaKpyLjz+iAkEaQ6bzxzmqcP5qNKijfBnsNoXT9nWqt6zyXo7pUxSWpZCL2vI7HhGq5vqLsj2v7k5f67n7pK5GDIEbbsEmRv69IjK6teujjXKszjYhl7CSuu7GGczbOIL74= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555670333006640.7131768899553; Fri, 19 Apr 2019 03:38:53 -0700 (PDT) Received: from localhost ([127.0.0.1]:54581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHQup-0001QL-H7 for importer@patchew.org; Fri, 19 Apr 2019 06:38:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHQtv-00017G-4B for qemu-devel@nongnu.org; Fri, 19 Apr 2019 06:37:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHQtu-0006F7-0J for qemu-devel@nongnu.org; Fri, 19 Apr 2019 06:37:47 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:33864) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHQtr-0006DO-2D for qemu-devel@nongnu.org; Fri, 19 Apr 2019 06:37:44 -0400 Received: by mail-ed1-x543.google.com with SMTP id a6so4151366edv.1 for ; Fri, 19 Apr 2019 03:37:41 -0700 (PDT) Received: from localhost.localdomain (ip-217-103-128-141.ip.prioritytelecom.net. [217.103.128.141]) by smtp.gmail.com with ESMTPSA id w4sm1193568eds.86.2019.04.19.03.37.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Apr 2019 03:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=28jotbghOsTkOfUxXEzjb4qLbJLpTPn+3ztFJ/xHkAk=; b=Q6GYNFnL1QZyYxki3AS02nRuIHLEO1ioFIwZq/8oBn5nelBDB4wvr63roG7z81HPEv i0dwnmddNKfR1x0kJp10JJv4/br4D5vTMEAbnPOkZy60VXQdaDnxAojtNWqqHks3Cxo/ eH62yCPXSjlEQyVheSTQPVk1R5HrczA3axccIvD7Ox1X0uWu/bhbAVjkZuCOS8yoW3VZ 4rubrlsaE7s0LMhImq+3GjvwHfbob9p7tgR51c+ghPwOXr25PUQY8bfFfC/pzXTTkk4K 4dwABLN5+6fXpdLXC4KtCLh0GJW1m/0uOlBhdMUrWSwn8XPlY8+kK7u0hU+AqB5z/xce curw== 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:mime-version :content-transfer-encoding; bh=28jotbghOsTkOfUxXEzjb4qLbJLpTPn+3ztFJ/xHkAk=; b=tuQ/ovS5lTyy0dXek5aqKHEzwXuAVAST0gs4A1gCdeRfQd9wHBHRZLZsVl4U3LyARS 3Xyqzxw7KQ5xgp5yuCYJ0CdVhPcKErOASsgHhOJdqkRSPVSxOUrejghjljKrd1G3iU48 Gdxqocd1Bq3ziD0JMgj/t9ONjyy6emfDepFAG8+wqd7cJXFSyJ+Mhbam4+8TVRosTev/ 6qLkKNzHNYhQFendVq9pUcxMhzzjfjZw5vOR/lRPaj3Pg0aLuV1K4z2BBlt9Jx2rzBWL GKLuJDq3Pe8mT+M4+n9bY4DcLR7o5cE2h9YcTLUD5GLfad6AOMGv/1PhTxKEwHNsikuy UIeQ== X-Gm-Message-State: APjAAAV++NAa0XfqbVt6oHWsFFkXbdXmNOf+Bjbz06zvdUfYwbuKs1Qz h4PGwN8Y3Mk74vHAc22+gZptK86rWrH76A== X-Google-Smtp-Source: APXvYqxc4B4xYHTU1hVyJJKItrVIJ88u4cz+vJgumVtr19ZXZAOKXQJSFIAajpCgPYKjPflS7b72xg== X-Received: by 2002:a50:8866:: with SMTP id c35mr1946031edc.132.1555670260574; Fri, 19 Apr 2019 03:37:40 -0700 (PDT) From: Shahab Vahedi To: qemu-devel@nongnu.org (open list:Overall) Date: Fri, 19 Apr 2019 12:37:22 +0200 Message-Id: <20190419103722.17062-1-shahab.vahedi@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::543 Subject: [Qemu-devel] [PATCH] cputlb: Fix io_readx() to respect the access_type 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: Shahab Vahedi , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This change adapts io_readx() to its input access_type. Currently io_readx() treats any memory access as a read, although it has an input argument "MMUAccessType access_type". This results in: 1) Calling the tlb_fill() only with MMU_DATA_LOAD 2) Considering only entry->addr_read as the tlb_addr Buglink: https://bugs.launchpad.net/qemu/+bug/1825359 Signed-off-by: Shahab Vahedi --- accel/tcg/cputlb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 88cc8389e9..0daac0e806 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -878,10 +878,13 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBE= ntry *iotlbentry, CPUTLBEntry *entry; target_ulong tlb_addr; =20 - tlb_fill(cpu, addr, size, MMU_DATA_LOAD, mmu_idx, retaddr); + tlb_fill(cpu, addr, size, access_type, mmu_idx, retaddr); =20 entry =3D tlb_entry(env, mmu_idx, addr); - tlb_addr =3D entry->addr_read; + tlb_addr =3D + (access_type =3D=3D MMU_DATA_LOAD ) ? entry->addr_read : + (access_type =3D=3D MMU_DATA_STORE) ? entry->addr_write : + entry->addr_code; if (!(tlb_addr & ~(TARGET_PAGE_MASK | TLB_RECHECK))) { /* RAM access */ uintptr_t haddr =3D addr + entry->addend; --=20 2.21.0