From nobody Wed Oct 29 11:33:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525165886278269.40525335691143; Tue, 1 May 2018 02:11:26 -0700 (PDT) Received: from localhost ([::1]:36924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDRJl-0003Vd-DD for importer@patchew.org; Tue, 01 May 2018 05:11:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDR8X-0003Xl-OR for qemu-devel@nongnu.org; Tue, 01 May 2018 04:59:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDR8W-0007sL-G5 for qemu-devel@nongnu.org; Tue, 01 May 2018 04:59:49 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:41388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDR8W-0007rX-6q for qemu-devel@nongnu.org; Tue, 01 May 2018 04:59:48 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fDR8V-0007PX-4G; Tue, 01 May 2018 09:59:47 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 1 May 2018 09:59:36 +0100 Message-Id: <20180501085939.6201-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180501085939.6201-1-peter.maydell@linaro.org> References: <20180501085939.6201-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [RFC PATCH v2 09/12] Make flatview_translate() take a MemTxAttrs argument 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: Paolo Bonzini , Eric Auger , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As part of plumbing MemTxAttrs down to the IOMMU translate method, add MemTxAttrs as an argument to flatview_translate(); all its callers now have attrs available. Signed-off-by: Peter Maydell --- include/exec/memory.h | 7 ++++--- exec.c | 17 +++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 7c461b9718..bd50424804 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1914,7 +1914,8 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSp= ace *as, hwaddr addr, */ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat, - hwaddr *len, bool is_write); + hwaddr *len, bool is_write, + MemTxAttrs attrs); =20 static inline MemoryRegion *address_space_translate(AddressSpace *as, hwaddr addr, hwaddr *x= lat, @@ -1922,7 +1923,7 @@ static inline MemoryRegion *address_space_translate(A= ddressSpace *as, MemTxAttrs attrs) { return flatview_translate(address_space_to_flatview(as), - addr, xlat, len, is_write); + addr, xlat, len, is_write, attrs); } =20 /* address_space_access_valid: check for validity of accessing an address @@ -2024,7 +2025,7 @@ MemTxResult address_space_read(AddressSpace *as, hwad= dr addr, rcu_read_lock(); fv =3D address_space_to_flatview(as); l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, false); + mr =3D flatview_translate(fv, addr, &addr1, &l, false, attrs); if (len =3D=3D l && memory_access_is_direct(mr, false)) { ptr =3D qemu_map_ram_ptr(mr->ram_block, addr1); memcpy(buf, ptr, len); diff --git a/exec.c b/exec.c index 0eef4702a5..41f7a7f5c4 100644 --- a/exec.c +++ b/exec.c @@ -583,7 +583,8 @@ iotlb_fail: =20 /* Called from RCU critical section */ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat, - hwaddr *plen, bool is_write) + hwaddr *plen, bool is_write, + MemTxAttrs attrs) { MemoryRegion *mr; MemoryRegionSection section; @@ -3117,7 +3118,7 @@ static MemTxResult flatview_write_continue(FlatView *= fv, hwaddr addr, } =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, true); + mr =3D flatview_translate(fv, addr, &addr1, &l, true, attrs); } =20 return result; @@ -3133,7 +3134,7 @@ static MemTxResult flatview_write(FlatView *fv, hwadd= r addr, MemTxAttrs attrs, MemTxResult result =3D MEMTX_OK; =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, true); + mr =3D flatview_translate(fv, addr, &addr1, &l, true, attrs); result =3D flatview_write_continue(fv, addr, attrs, buf, len, addr1, l, mr); =20 @@ -3204,7 +3205,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwad= dr addr, } =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, false); + mr =3D flatview_translate(fv, addr, &addr1, &l, false, attrs); } =20 return result; @@ -3219,7 +3220,7 @@ static MemTxResult flatview_read(FlatView *fv, hwaddr= addr, MemoryRegion *mr; =20 l =3D len; - mr =3D flatview_translate(fv, addr, &addr1, &l, false); + mr =3D flatview_translate(fv, addr, &addr1, &l, false, attrs); return flatview_read_continue(fv, addr, attrs, buf, len, addr1, l, mr); } @@ -3433,7 +3434,7 @@ static bool flatview_access_valid(FlatView *fv, hwadd= r addr, int len, =20 while (len > 0) { l =3D len; - mr =3D flatview_translate(fv, addr, &xlat, &l, is_write); + mr =3D flatview_translate(fv, addr, &xlat, &l, is_write, attrs); if (!memory_access_is_direct(mr, is_write)) { l =3D memory_access_size(mr, l, addr); /* When our callers all have attrs we'll pass them through her= e */ @@ -3482,7 +3483,7 @@ flatview_extend_translation(FlatView *fv, hwaddr addr, =20 len =3D target_len; this_mr =3D flatview_translate(fv, addr, &xlat, - &len, is_write); + &len, is_write, attrs); if (this_mr !=3D mr || xlat !=3D base + done) { return done; } @@ -3515,7 +3516,7 @@ void *address_space_map(AddressSpace *as, l =3D len; rcu_read_lock(); fv =3D address_space_to_flatview(as); - mr =3D flatview_translate(fv, addr, &xlat, &l, is_write); + mr =3D flatview_translate(fv, addr, &xlat, &l, is_write, attrs); =20 if (!memory_access_is_direct(mr, is_write)) { if (atomic_xchg(&bounce.in_use, true)) { --=20 2.17.0