From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLMaX-0001tW-03 for qemu-devel@nongnu.org; Thu, 07 Jul 2016 23:36:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLMaS-0005RO-RL for qemu-devel@nongnu.org; Thu, 07 Jul 2016 23:36:23 -0400 Received: from ozlabs.org ([103.22.144.67]:50197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLMaS-0005Qm-85 for qemu-devel@nongnu.org; Thu, 07 Jul 2016 23:36:20 -0400 Date: Fri, 8 Jul 2016 13:27:27 +1000 From: David Gibson Message-ID: <20160708032727.GX14675@voom.fritz.box> References: <1467934423-5997-1-git-send-email-andrew.smirnov@gmail.com> <1467934423-5997-2-git-send-email-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="D+UG5SQJKkIYNVx0" Content-Disposition: inline In-Reply-To: <1467934423-5997-2-git-send-email-andrew.smirnov@gmail.com> Subject: Re: [Qemu-devel] [PATCH 1/9] Avoid needless calls to address_space_rw() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andrey Smirnov Cc: qemu-devel@nongnu.org --D+UG5SQJKkIYNVx0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 07, 2016 at 04:33:35PM -0700, Andrey Smirnov wrote: > Avoid calling address_space_rw() when direction of the transfer is > constant and known at compile time and replace them with explicit calls > to address_space_read()/address_space_write(). >=20 > Signed-off-by: Andrey Smirnov Reviewed-by: David Gibson > --- > dma-helpers.c | 4 ++-- > exec.c | 10 +++++----- > hw/net/dp8393x.c | 56 ++++++++++++++++++++++++++++----------------------= ------ > 3 files changed, 35 insertions(+), 35 deletions(-) >=20 > diff --git a/dma-helpers.c b/dma-helpers.c > index b521d84..96a6d6e 100644 > --- a/dma-helpers.c > +++ b/dma-helpers.c > @@ -28,8 +28,8 @@ int dma_memory_set(AddressSpace *as, dma_addr_t addr, u= int8_t c, dma_addr_t len) > memset(fillbuf, c, FILLBUF_SIZE); > while (len > 0) { > l =3D len < FILLBUF_SIZE ? len : FILLBUF_SIZE; > - error |=3D address_space_rw(as, addr, MEMTXATTRS_UNSPECIFIED, > - fillbuf, l, true); > + error |=3D address_space_write(as, addr, MEMTXATTRS_UNSPECIFIED, > + fillbuf, l); > len -=3D l; > addr +=3D l; > } > diff --git a/exec.c b/exec.c > index 0122ef7..93611f1 100644 > --- a/exec.c > +++ b/exec.c > @@ -3224,7 +3224,7 @@ uint32_t address_space_ldub(AddressSpace *as, hwadd= r addr, > uint8_t val; > MemTxResult r; > =20 > - r =3D address_space_rw(as, addr, attrs, &val, 1, 0); > + r =3D address_space_read(as, addr, attrs, &val, 1); > if (result) { > *result =3D r; > } > @@ -3474,7 +3474,7 @@ void address_space_stb(AddressSpace *as, hwaddr add= r, uint32_t val, > uint8_t v =3D val; > MemTxResult r; > =20 > - r =3D address_space_rw(as, addr, attrs, &v, 1, 1); > + r =3D address_space_write(as, addr, attrs, &v, 1); > if (result) { > *result =3D r; > } > @@ -3582,7 +3582,7 @@ void address_space_stq(AddressSpace *as, hwaddr add= r, uint64_t val, > { > MemTxResult r; > val =3D tswap64(val); > - r =3D address_space_rw(as, addr, attrs, (void *) &val, 8, 1); > + r =3D address_space_write(as, addr, attrs, (void *) &val, 8); > if (result) { > *result =3D r; > } > @@ -3593,7 +3593,7 @@ void address_space_stq_le(AddressSpace *as, hwaddr = addr, uint64_t val, > { > MemTxResult r; > val =3D cpu_to_le64(val); > - r =3D address_space_rw(as, addr, attrs, (void *) &val, 8, 1); > + r =3D address_space_write(as, addr, attrs, (void *) &val, 8); > if (result) { > *result =3D r; > } > @@ -3603,7 +3603,7 @@ void address_space_stq_be(AddressSpace *as, hwaddr = addr, uint64_t val, > { > MemTxResult r; > val =3D cpu_to_be64(val); > - r =3D address_space_rw(as, addr, attrs, (void *) &val, 8, 1); > + r =3D address_space_write(as, addr, attrs, (void *) &val, 8); > if (result) { > *result =3D r; > } > diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c > index 0fa652c..2849542 100644 > --- a/hw/net/dp8393x.c > +++ b/hw/net/dp8393x.c > @@ -203,9 +203,9 @@ static void dp8393x_do_load_cam(dp8393xState *s) > =20 > while (s->regs[SONIC_CDC] & 0x1f) { > /* Fill current entry */ > - address_space_rw(&s->as, > + address_space_read(&s->as, > (s->regs[SONIC_URRA] << 16) | s->regs[SONIC_CDP], > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > s->cam[index][0] =3D data[1 * width] & 0xff; > s->cam[index][1] =3D data[1 * width] >> 8; > s->cam[index][2] =3D data[2 * width] & 0xff; > @@ -222,9 +222,9 @@ static void dp8393x_do_load_cam(dp8393xState *s) > } > =20 > /* Read CAM enable */ > - address_space_rw(&s->as, > + address_space_read(&s->as, > (s->regs[SONIC_URRA] << 16) | s->regs[SONIC_CDP], > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > s->regs[SONIC_CE] =3D data[0 * width]; > DPRINTF("load cam done. cam enable mask 0x%04x\n", s->regs[SONIC_CE]= ); > =20 > @@ -242,9 +242,9 @@ static void dp8393x_do_read_rra(dp8393xState *s) > /* Read memory */ > width =3D (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; > size =3D sizeof(uint16_t) * 4 * width; > - address_space_rw(&s->as, > + address_space_read(&s->as, > (s->regs[SONIC_URRA] << 16) | s->regs[SONIC_RRP], > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > =20 > /* Update SONIC registers */ > s->regs[SONIC_CRBA0] =3D data[0 * width]; > @@ -360,9 +360,9 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) > (s->regs[SONIC_UTDA] << 16) | s->regs[SONIC_CTDA]); > size =3D sizeof(uint16_t) * 6 * width; > s->regs[SONIC_TTDA] =3D s->regs[SONIC_CTDA]; > - address_space_rw(&s->as, > + address_space_read(&s->as, > ((s->regs[SONIC_UTDA] << 16) | s->regs[SONIC_TTDA]) + sizeof= (uint16_t) * width, > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > tx_len =3D 0; > =20 > /* Update registers */ > @@ -386,18 +386,18 @@ static void dp8393x_do_transmit_packets(dp8393xStat= e *s) > if (tx_len + len > sizeof(s->tx_buffer)) { > len =3D sizeof(s->tx_buffer) - tx_len; > } > - address_space_rw(&s->as, > + address_space_read(&s->as, > (s->regs[SONIC_TSA1] << 16) | s->regs[SONIC_TSA0], > - MEMTXATTRS_UNSPECIFIED, &s->tx_buffer[tx_len], len, 0); > + MEMTXATTRS_UNSPECIFIED, &s->tx_buffer[tx_len], len); > tx_len +=3D len; > =20 > i++; > if (i !=3D s->regs[SONIC_TFC]) { > /* Read next fragment details */ > size =3D sizeof(uint16_t) * 3 * width; > - address_space_rw(&s->as, > + address_space_read(&s->as, > ((s->regs[SONIC_UTDA] << 16) | s->regs[SONIC_TTDA]) = + sizeof(uint16_t) * (4 + 3 * i) * width, > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > s->regs[SONIC_TSA0] =3D data[0 * width]; > s->regs[SONIC_TSA1] =3D data[1 * width]; > s->regs[SONIC_TFS] =3D data[2 * width]; > @@ -429,16 +429,16 @@ static void dp8393x_do_transmit_packets(dp8393xStat= e *s) > /* Write status */ > data[0 * width] =3D s->regs[SONIC_TCR] & 0x0fff; /* status */ > size =3D sizeof(uint16_t) * width; > - address_space_rw(&s->as, > + address_space_write(&s->as, > (s->regs[SONIC_UTDA] << 16) | s->regs[SONIC_TTDA], > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 1); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > =20 > if (!(s->regs[SONIC_CR] & SONIC_CR_HTX)) { > /* Read footer of packet */ > size =3D sizeof(uint16_t) * width; > - address_space_rw(&s->as, > + address_space_read(&s->as, > ((s->regs[SONIC_UTDA] << 16) | s->regs[SONIC_TTDA]) + si= zeof(uint16_t) * (4 + 3 * s->regs[SONIC_TFC]) * width, > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > s->regs[SONIC_CTDA] =3D data[0 * width] & ~0x1; > if (data[0 * width] & 0x1) { > /* EOL detected */ > @@ -701,8 +701,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, co= nst uint8_t * buf, > /* Are we still in resource exhaustion? */ > size =3D sizeof(uint16_t) * 1 * width; > address =3D ((s->regs[SONIC_URDA] << 16) | s->regs[SONIC_CRDA]) = + sizeof(uint16_t) * 5 * width; > - address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, > - (uint8_t *)data, size, 0); > + address_space_read(&s->as, address, MEMTXATTRS_UNSPECIFIED, > + (uint8_t *)data, size); > if (data[0 * width] & 0x1) { > /* Still EOL ; stop reception */ > return -1; > @@ -721,11 +721,11 @@ static ssize_t dp8393x_receive(NetClientState *nc, = const uint8_t * buf, > /* Put packet into RBA */ > DPRINTF("Receive packet at %08x\n", (s->regs[SONIC_CRBA1] << 16) | s= ->regs[SONIC_CRBA0]); > address =3D (s->regs[SONIC_CRBA1] << 16) | s->regs[SONIC_CRBA0]; > - address_space_rw(&s->as, address, > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)buf, rx_len, 1); > + address_space_write(&s->as, address, > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)buf, rx_len); > address +=3D rx_len; > - address_space_rw(&s->as, address, > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)&checksum, 4, 1); > + address_space_write(&s->as, address, > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)&checksum, 4); > rx_len +=3D 4; > s->regs[SONIC_CRBA1] =3D address >> 16; > s->regs[SONIC_CRBA0] =3D address & 0xffff; > @@ -753,23 +753,23 @@ static ssize_t dp8393x_receive(NetClientState *nc, = const uint8_t * buf, > data[3 * width] =3D s->regs[SONIC_TRBA1]; /* pkt_ptr1 */ > data[4 * width] =3D s->regs[SONIC_RSC]; /* seq_no */ > size =3D sizeof(uint16_t) * 5 * width; > - address_space_rw(&s->as, (s->regs[SONIC_URDA] << 16) | s->regs[SONIC= _CRDA], > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 1); > + address_space_write(&s->as, (s->regs[SONIC_URDA] << 16) | s->regs[SO= NIC_CRDA], > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > =20 > /* Move to next descriptor */ > size =3D sizeof(uint16_t) * width; > - address_space_rw(&s->as, > + address_space_read(&s->as, > ((s->regs[SONIC_URDA] << 16) | s->regs[SONIC_CRDA]) + sizeof(uin= t16_t) * 5 * width, > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size); > s->regs[SONIC_LLFA] =3D data[0 * width]; > if (s->regs[SONIC_LLFA] & 0x1) { > /* EOL detected */ > s->regs[SONIC_ISR] |=3D SONIC_ISR_RDE; > } else { > data[0 * width] =3D 0; /* in_use */ > - address_space_rw(&s->as, > + address_space_write(&s->as, > ((s->regs[SONIC_URDA] << 16) | s->regs[SONIC_CRDA]) + sizeof= (uint16_t) * 6 * width, > - MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, sizeof(uint16_t), 1= ); > + MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, sizeof(uint16_t)); > s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; > s->regs[SONIC_ISR] |=3D SONIC_ISR_PKTRX; > s->regs[SONIC_RSC] =3D (s->regs[SONIC_RSC] & 0xff00) | (((s->reg= s[SONIC_RSC] & 0x00ff) + 1) & 0x00ff); --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --D+UG5SQJKkIYNVx0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXfx2eAAoJEGw4ysog2bOShwQP/iR7QzsE3y7eN//ff784ODum pUwGKLSEL5ovFITlMFQLGPHvq/zcMzb0UDxzvkfJrgutpXdMytc/uFusWo8hUGBu y4TKk3xTHTLQblqnQSEFEDvqu+/UizQrhEvfodcKYkLrqg9/yi57LsHI6c+P/JBM fxMp2O3ho1cDL6cc6KgY3bIOIDF98gnznl9YFXEtF9OVJq1QPuZ6MF0NFJPm72JS LtnhABsjQCDu56PJpsNds+fBs+0l44EbPktooLha9K23QQ25qQ+9SmJSA3u0RxOz E8i0pFGRe8Q/G0YhUM2fkfH2RHU7UVU0dPHFEHEWAZIUr+uZNHOqdckG3dMFZXbu AOIZA7RuJyFOPptgXn+xvbFWzqvnBFNOi2abUDOvAUHoaVQiCr3q5FbmnhUjI3cd gWnnu9rzEMmVah6qe+knohJDvi1pYnPkU3WgwnQq56BiPXv8xrdHaJRJ1ME0XoOK b+3PtieRM22FhCst2VsAB9qwNOUjgFEKO0mlbUGL7oNX02zEliK1bNzQF67YVV2L cp7T8bwdx65eamZ+Z+drxJi2Kn+gNbxVcg39wKHk7wh5IlJ01qQLdF5Uct+cx5ZF b9wkyvyKBgiRiLomYXeJeupC7xJt4AReKG30EuVo61XzXwA2JmjNH4DA7BKf08By wRFEcO9B9q93pKYdNNBs =Ise9 -----END PGP SIGNATURE----- --D+UG5SQJKkIYNVx0--