From nobody Mon Apr 29 07:04:59 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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=1555745123; cv=none; d=zoho.com; s=zohoarc; b=RxohiilUqv4MRswoietM+pn+aZqYX35MFtBCKy5Avf6hNfZlIsoUGekXGMa8ZQGESRg0TWfYl2USoRzbgPZ8I7nAg5byz7EEocG4xGsUZqvpbNNOcwUoiGrfiuEUsUkzCSHHE3hM0y0Qo3CoLARHVmztQK3sWVAIK3KH1vHXiqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555745123; 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=1gKIOZ+EXCFm3CByrF/iqwgRHqRDMVkQpp4q3TfVLv4=; b=PPxqCrPUX0ctP35cGzMXt6TUQlUlVib2UxeBlQa3jL7C7PXMDy9Sc+W3Z2W5tY/3RA9dfVNvcno5KJJHP48QqwskVZ23DAd2amzMrbwsdeLNYpPWd6gSF2O9sEuu5g4yS4mBlbcO39zJMwqw1vmEyonvrFIBBdjl97x6AALYDOc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 1555745123522863.3724847940781; Sat, 20 Apr 2019 00:25:23 -0700 (PDT) Received: from localhost ([127.0.0.1]:37946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHkN1-0006L6-MW for importer@patchew.org; Sat, 20 Apr 2019 03:25:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHkMA-00062C-5T for qemu-devel@nongnu.org; Sat, 20 Apr 2019 03:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHkM9-0000xr-12 for qemu-devel@nongnu.org; Sat, 20 Apr 2019 03:24:14 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:44351) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHkM8-0000x3-OI for qemu-devel@nongnu.org; Sat, 20 Apr 2019 03:24:12 -0400 Received: by mail-ed1-x544.google.com with SMTP id i13so5955246edf.11 for ; Sat, 20 Apr 2019 00:24:12 -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 p91sm924635edd.44.2019.04.20.00.24.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Apr 2019 00:24:09 -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=1gKIOZ+EXCFm3CByrF/iqwgRHqRDMVkQpp4q3TfVLv4=; b=C9kU0ONf7xFphzkpjo9vnfYm/Rsu+njlvONktZ5eeS8gEBxSD4rk3Nc8/xlDm2MjL1 k9vuh5ZJaJiNSfEIrrD3RRQDqLJDSsMh/w6ny249kJNiqd2308sRK8l4/Ew6V7tNUpoD /NKiXpQFv3MpnhtFsYVvydp/iCkmSTXM6Mxws2kxy/wS5d6LekaP4NkXrNFjTr6gbKE4 bjAezq8VUJw5cpj6MLh++39MpokoGYsuZWbWH90XWzRFbZnGMxQieEXNXLAGwt7lZlQS csnWV1g05QIGH+ABI2IJP/X7TUuHi/PPfQHGhc2pD8kFxwb5+TmavIMWOojHUs/uDHvF CnTQ== 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=1gKIOZ+EXCFm3CByrF/iqwgRHqRDMVkQpp4q3TfVLv4=; b=GT5OSaLSU0UVtM4riE93TiNe1mSNsrLsPOWgS2IcUKcwws8vWkZMAoQGU3GCfVG6qf vycoiO+g/yq42bxUEOxXJ+XXF0LiSmfhfg4Y9rijTKFoQwYnI770PLfPPOKyhISRXIM9 LaEi2FdjU365cm5I6J3jECdxSeC4zVEhbnCnDs/7Z2x78b8sgepIu17NmYcOsyEdL1/1 8NhJKgTfY0OcWhqu9cHeAARO+lJJUpxTaRWw6hDxhwhccS34K0hYAcdUBtk60kNFWror xkLB4+EIXaRAMHIZgdUPJAqMAa6K9PHi1fkBc4KG7dFe+dFgwg9jyBx2vgSEiyDUXBJp Zcxg== X-Gm-Message-State: APjAAAWHX1Clypq259AOO+qkWkFqc2wf3ngvOOVtFQK09kkF5Qr41n0U +jQsWWzP1ghBrU5FXUVNTnccdrlxCLA= X-Google-Smtp-Source: APXvYqxKfCPbP8XezfacX6Ul3Ou3Q7/sq2Edp7ckqoJKzcosJsFzNJVHmCm1X4QdFdqlaIpzxyGMeQ== X-Received: by 2002:a17:906:348d:: with SMTP id g13mr3857557ejb.114.1555745050575; Sat, 20 Apr 2019 00:24:10 -0700 (PDT) From: Shahab Vahedi To: qemu-devel@nongnu.org (open list:Overall) Date: Sat, 20 Apr 2019 09:22:37 +0200 Message-Id: <20190420072236.12347-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::544 Subject: [Qemu-devel] [PATCH v3] 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 , =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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 Reviewed-by: Richard Henderson --- Changelog: v3 - Only handle read/fetch. There must be no write access. v2 - Extra space before closing parenthesis is removed v1 - Initial submit accel/tcg/cputlb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 88cc8389e9..6d50fcc52d 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -868,6 +868,9 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEnt= ry *iotlbentry, bool locked =3D false; MemTxResult r; =20 + /* Only support for reading/fetching IO */ + assert(access_type =3D=3D MMU_DATA_LOAD || access_type =3D=3D MMU_INST= _FETCH); + if (recheck) { /* * This is a TLB_RECHECK access, where the MMU protection @@ -878,10 +881,11 @@ 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 : entry->addr_code; if (!(tlb_addr & ~(TARGET_PAGE_MASK | TLB_RECHECK))) { /* RAM access */ uintptr_t haddr =3D addr + entry->addend; --=20 2.21.0