From nobody Fri Nov 1 08:20:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1708007371; cv=none; d=zohomail.com; s=zohoarc; b=UGNuGvO408Af2Q/fLn7/o2sBBtlHz8R+MryrKEEnz/YIJhzEDwmvxc9ydlO5xv4uEljhNQEL2C9FhJZyYtE06NFqMyxTN28MlLaauHqtymBWjWfW+1GhtkWiGbqEa95wboDiaA8309/ioU2t0SZCO3uq6xaEN6MEry8TJSBSmfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708007371; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=WmM2iVBJ9qxRSKbEVFSl3kkI5hTrO2s9SxIwaSVibFw=; b=AiG6PSeBfyYucBunSPdL1SrGaM+6DdfQSAM1PuU0Mpz/iqupi08+EnVQ+PIiaewPIoJpMJYuI+GF0uSzCtcFnFFZxaQsOzZKvVgEbF539P+AT0mjSmiMDFS/SE12NjYw4fklASh7NFyXnATMXt8YeeYxD1c6JVflXObNFPJHQl4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17080073713602.6429282863946355; Thu, 15 Feb 2024 06:29:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1racjt-00046U-0L; Thu, 15 Feb 2024 09:29:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1racjr-0003zw-Ti for qemu-devel@nongnu.org; Thu, 15 Feb 2024 09:29:23 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1racjp-0001r6-RR for qemu-devel@nongnu.org; Thu, 15 Feb 2024 09:29:23 -0500 Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4TbHRL75gGz67KdR; Thu, 15 Feb 2024 22:25:50 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id BA184140D1D; Thu, 15 Feb 2024 22:29:18 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 15 Feb 2024 14:29:18 +0000 To: Paolo Bonzini , Peter Xu , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , CC: Subject: [PATCH 2/3] physmem: Factor out body of flatview_read/write_continue() loop Date: Thu, 15 Feb 2024 14:28:16 +0000 Message-ID: <20240215142817.1904-3-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240215142817.1904-1-Jonathan.Cameron@huawei.com> References: <20240215142817.1904-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.247.231] X-ClientProxiedBy: lhrpeml100002.china.huawei.com (7.191.160.241) To lhrpeml500005.china.huawei.com (7.191.163.240) Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1708007373398100003 Content-Type: text/plain; charset="utf-8" This code will be reused for the address_space_cached accessors shortly. Also reduce scope of result variable now we aren't directly calling this in the loop. Signed-off-by: Jonathan Cameron Reviewed-by: Peter Xu --- system/physmem.c | 165 ++++++++++++++++++++++++++++------------------- 1 file changed, 98 insertions(+), 67 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 39b5ac751e..74f92bb3b8 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2677,6 +2677,54 @@ static bool flatview_access_allowed(MemoryRegion *mr= , MemTxAttrs attrs, return false; } =20 +static MemTxResult flatview_write_continue_step(hwaddr addr, + MemTxAttrs attrs, + const uint8_t *buf, + hwaddr len, hwaddr addr1, + hwaddr *l, MemoryRegion *m= r) +{ + if (!flatview_access_allowed(mr, attrs, addr1, *l)) { + return MEMTX_ACCESS_ERROR; + } + + if (!memory_access_is_direct(mr, true)) { + uint64_t val; + MemTxResult result; + bool release_lock =3D prepare_mmio_access(mr); + + *l =3D memory_access_size(mr, *l, addr1); + /* XXX: could force current_cpu to NULL to avoid + potential bugs */ + + /* + * Assure Coverity (and ourselves) that we are not going to OVERRUN + * the buffer by following ldn_he_p(). + */ +#ifdef QEMU_STATIC_ANALYSIS + assert((*l =3D=3D 1 && len >=3D 1) || + (*l =3D=3D 2 && len >=3D 2) || + (*l =3D=3D 4 && len >=3D 4) || + (*l =3D=3D 8 && len >=3D 8)); +#endif + val =3D ldn_he_p(buf, *l); + result =3D memory_region_dispatch_write(mr, addr1, val, + size_memop(*l), attrs); + if (release_lock) { + bql_unlock(); + } + + return result; + } else { + /* RAM case */ + uint8_t *ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, l, = false); + + memmove(ram_ptr, buf, *l); + invalidate_and_set_dirty(mr, addr1, *l); + + return MEMTX_OK; + } +} + /* Called within RCU critical section. */ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, @@ -2688,42 +2736,9 @@ static MemTxResult flatview_write_continue(FlatView = *fv, hwaddr addr, const uint8_t *buf =3D ptr; =20 for (;;) { - if (!flatview_access_allowed(mr, attrs, addr1, l)) { - result |=3D MEMTX_ACCESS_ERROR; - /* Keep going. */ - } else if (!memory_access_is_direct(mr, true)) { - uint64_t val; - bool release_lock =3D prepare_mmio_access(mr); - - l =3D memory_access_size(mr, l, addr1); - /* XXX: could force current_cpu to NULL to avoid - potential bugs */ - - /* - * Assure Coverity (and ourselves) that we are not going to OV= ERRUN - * the buffer by following ldn_he_p(). - */ -#ifdef QEMU_STATIC_ANALYSIS - assert((l =3D=3D 1 && len >=3D 1) || - (l =3D=3D 2 && len >=3D 2) || - (l =3D=3D 4 && len >=3D 4) || - (l =3D=3D 8 && len >=3D 8)); -#endif - val =3D ldn_he_p(buf, l); - result |=3D memory_region_dispatch_write(mr, addr1, val, - size_memop(l), attrs); - if (release_lock) { - bql_unlock(); - } - =20 - } else { - /* RAM case */ - uint8_t *ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1,= &l, - false); - memmove(ram_ptr, buf, l); - invalidate_and_set_dirty(mr, addr1, l); - } + result |=3D flatview_write_continue_step(addr, attrs, buf, len, ad= dr1, &l, + mr); =20 len -=3D l; buf +=3D l; @@ -2757,6 +2772,52 @@ static MemTxResult flatview_write(FlatView *fv, hwad= dr addr, MemTxAttrs attrs, addr1, l, mr); } =20 +static MemTxResult flatview_read_continue_step(hwaddr addr, + MemTxAttrs attrs, uint8_t *= buf, + hwaddr len, hwaddr addr1, + hwaddr *l, + MemoryRegion *mr) +{ + if (!flatview_access_allowed(mr, attrs, addr1, *l)) { + return MEMTX_ACCESS_ERROR; + } + + if (!memory_access_is_direct(mr, false)) { + /* I/O case */ + uint64_t val; + MemTxResult result; + bool release_lock =3D prepare_mmio_access(mr); + + *l =3D memory_access_size(mr, *l, addr1); + result =3D memory_region_dispatch_read(mr, addr1, &val, + size_memop(*l), attrs); + + /* + * Assure Coverity (and ourselves) that we are not going to OVERRUN + * the buffer by following stn_he_p(). + */ +#ifdef QEMU_STATIC_ANALYSIS + assert((*l =3D=3D 1 && len >=3D 1) || + (*l =3D=3D 2 && len >=3D 2) || + (*l =3D=3D 4 && len >=3D 4) || + (*l =3D=3D 8 && len >=3D 8)); +#endif + stn_he_p(buf, *l, val); + + if (release_lock) { + bql_unlock(); + } + return result; + } else { + /* RAM case */ + uint8_t *ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1, l, = false); + + memcpy(buf, ram_ptr, *l); + + return MEMTX_OK; + } +} + /* Called within RCU critical section. */ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, MemTxAttrs attrs, void *ptr, @@ -2768,38 +2829,8 @@ MemTxResult flatview_read_continue(FlatView *fv, hwa= ddr addr, =20 fuzz_dma_read_cb(addr, len, mr); for (;;) { - if (!flatview_access_allowed(mr, attrs, addr1, l)) { - result |=3D MEMTX_ACCESS_ERROR; - /* Keep going. */ - } else if (!memory_access_is_direct(mr, false)) { - /* I/O case */ - uint64_t val; - bool release_lock =3D prepare_mmio_access(mr); - - l =3D memory_access_size(mr, l, addr1); - result |=3D memory_region_dispatch_read(mr, addr1, &val, - size_memop(l), attrs); - - /* - * Assure Coverity (and ourselves) that we are not going to OV= ERRUN - * the buffer by following stn_he_p(). - */ -#ifdef QEMU_STATIC_ANALYSIS - assert((l =3D=3D 1 && len >=3D 1) || - (l =3D=3D 2 && len >=3D 2) || - (l =3D=3D 4 && len >=3D 4) || - (l =3D=3D 8 && len >=3D 8)); -#endif - stn_he_p(buf, l, val); - if (release_lock) { - bql_unlock(); - } - } else { - /* RAM case */ - uint8_t *ram_ptr =3D qemu_ram_ptr_length(mr->ram_block, addr1,= &l, - false); - memcpy(buf, ram_ptr, l); - } + result |=3D flatview_read_continue_step(addr, attrs, buf, + len, addr1, &l, mr); =20 len -=3D l; buf +=3D l; --=20 2.39.2