From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: Florian Weimer <fweimer@redhat.com>,
Thomas Huth <thuth@redhat.com>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
Stefano Brivio <sbrivio@redhat.com>,
qemu-s390x@nongnu.org, Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PATCH v2 09/28] s390x/tcg: MVCLU/MVCLE: Process max 4k bytes at a time
Date: Fri, 6 Sep 2019 09:57:31 +0200 [thread overview]
Message-ID: <20190906075750.14791-10-david@redhat.com> (raw)
In-Reply-To: <20190906075750.14791-1-david@redhat.com>
... and indicate cc=3 in case there is work remaining. Keep unicode
padding simple.
While reworking, properly wrap the addresses.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
target/s390x/mem_helper.c | 54 ++++++++++++++++++++++-----------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 947a4277f0..6d8ebd18fa 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -769,8 +769,8 @@ static inline uint32_t do_mvcl(CPUS390XState *env,
uint64_t *src, uint64_t *srclen,
uint16_t pad, int wordsize, uintptr_t ra)
{
- uint64_t len = MIN(*srclen, *destlen);
- uint32_t cc;
+ int len = MIN(*destlen, TARGET_PAGE_SIZE);
+ int i, cc;
if (*destlen == *srclen) {
cc = 0;
@@ -780,32 +780,40 @@ static inline uint32_t do_mvcl(CPUS390XState *env,
cc = 2;
}
- /* Copy the src array */
- fast_memmove(env, *dest, *src, len, ra);
- *src += len;
- *srclen -= len;
- *dest += len;
- *destlen -= len;
+ if (!*destlen) {
+ return cc;
+ }
- /* Pad the remaining area */
- if (wordsize == 1) {
- fast_memset(env, *dest, pad, *destlen, ra);
- *dest += *destlen;
- *destlen = 0;
+ /*
+ * Only perform one type of type of operation (move/pad) at a time.
+ * Process up to 4k bytes.
+ */
+ if (*srclen) {
+ /* Copy the src array */
+ len = MIN(len, *srclen);
+ *destlen -= len;
+ *srclen -= len;
+ fast_memmove(env, *dest, *src, len, ra);
+ *src = wrap_address(env, *src + len);
+ *dest = wrap_address(env, *dest + len);
+ } else if (wordsize == 1) {
+ /* Pad the remaining area */
+ *destlen -= len;
+ fast_memset(env, *dest, pad, len, ra);
+ *dest = wrap_address(env, *dest + len);
} else {
- /* If remaining length is odd, pad with odd byte first. */
- if (*destlen & 1) {
- cpu_stb_data_ra(env, *dest, pad & 0xff, ra);
- *dest += 1;
- *destlen -= 1;
- }
- /* The remaining length is even, pad using words. */
- for (; *destlen; *dest += 2, *destlen -= 2) {
- cpu_stw_data_ra(env, *dest, pad, ra);
+ /* The remaining length selects the padding byte. */
+ for (i = 0; i < len; (*destlen)--, i++) {
+ if (*destlen & 1) {
+ cpu_stb_data_ra(env, *dest, pad, ra);
+ } else {
+ cpu_stb_data_ra(env, *dest, pad >> 8, ra);
+ }
+ *dest = wrap_address(env, *dest + 1);
}
}
- return cc;
+ return *destlen ? 3 : cc;
}
/* move long */
--
2.21.0
next prev parent reply other threads:[~2019-09-06 8:03 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 7:57 [Qemu-devel] [PATCH v2 00/28] s390x/tcg: mem_helper: Fault-safe handling David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 01/28] s390x/tcg: Reset exception_index to -1 instead of 0 David Hildenbrand
2019-09-11 14:38 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 02/28] s390x/tcg: MVCL: Zero out unused bits of address David Hildenbrand
2019-09-11 14:40 ` Richard Henderson
2019-09-11 16:10 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 03/28] s390x/tcg: MVCL: Detect destructive overlaps David Hildenbrand
2019-09-11 14:42 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 04/28] s390x/tcg: MVCL: Process max 2k bytes at a time David Hildenbrand
2019-09-11 14:52 ` Richard Henderson
2019-09-11 15:07 ` Richard Henderson
2019-09-11 16:12 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 05/28] s390x/tcg: MVC: Increment the length once David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 06/28] s390x/tcg: MVC: Use is_destructive_overlap() David Hildenbrand
2019-09-11 14:54 ` Richard Henderson
2019-09-11 16:13 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 07/28] s390x/tcg: MVPG: Check for specification exceptions David Hildenbrand
2019-09-11 14:57 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 08/28] s390x/tcg: MVPG: Properly wrap the addresses David Hildenbrand
2019-09-11 14:58 ` Richard Henderson
2019-09-06 7:57 ` David Hildenbrand [this message]
2019-09-11 15:05 ` [Qemu-devel] [PATCH v2 09/28] s390x/tcg: MVCLU/MVCLE: Process max 4k bytes at a time Richard Henderson
2019-09-11 16:14 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 10/28] s390x/tcg: MVCS/MVCP: Check for special operation exceptions David Hildenbrand
2019-09-11 15:08 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 11/28] s390x/tcg: MVCS/MVCP: Properly wrap the length David Hildenbrand
2019-09-11 15:11 ` Richard Henderson
2019-09-11 16:15 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 12/28] s390x/tcg: MVST: Check for specification exceptions David Hildenbrand
2019-09-11 15:14 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 13/28] s390x/tcg: MVST: Fix storing back the addresses to registers David Hildenbrand
2019-09-11 15:18 ` Richard Henderson
2019-09-11 16:15 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 14/28] s390x/tcg: Always use MMU_USER_IDX for CONFIG_USER_ONLY David Hildenbrand
2019-09-11 15:19 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 15/28] s390x/tcg: Fault-safe memset David Hildenbrand
2019-09-11 15:29 ` Richard Henderson
2019-09-11 16:18 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 16/28] s390x/tcg: Fault-safe memmove David Hildenbrand
2019-09-11 21:11 ` Richard Henderson
2019-09-11 22:03 ` Richard Henderson
2019-09-13 12:37 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 17/28] s390x/tcg: MVCS/MVCP: Use access_memmove_idx() David Hildenbrand
2019-09-11 21:13 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 18/28] s390x/tcg: MVC: Fault-safe handling on destructive overlaps David Hildenbrand
2019-09-11 21:20 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 19/28] s390x/tcg: MVCLU: Fault-safe handling David Hildenbrand
2019-09-11 21:24 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 20/28] s390x/tcg: OC: " David Hildenbrand
2019-09-11 21:26 ` Richard Henderson
2019-09-16 12:01 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 21/28] s390x/tcg: XC: " David Hildenbrand
2019-09-11 21:29 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 22/28] s390x/tcg: NC: " David Hildenbrand
2019-09-11 21:32 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 23/28] s390x/tcg: MVCIN: " David Hildenbrand
2019-09-11 21:35 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 24/28] s390x/tcg: MVN: " David Hildenbrand
2019-09-11 21:37 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 25/28] s390x/tcg: MVZ: " David Hildenbrand
2019-09-11 21:38 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 26/28] s390x/tcg: MVST: " David Hildenbrand
2019-09-11 21:52 ` Richard Henderson
2019-09-16 10:39 ` David Hildenbrand
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 27/28] s390x/tcg: MVO: " David Hildenbrand
2019-09-11 22:09 ` Richard Henderson
2019-09-06 7:57 ` [Qemu-devel] [PATCH v2 28/28] tests/tcg: target/s390x: Test MVO David Hildenbrand
2019-09-11 11:11 ` [Qemu-devel] [qemu-s390x] [PATCH v2 00/28] s390x/tcg: mem_helper: Fault-safe handling David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190906075750.14791-10-david@redhat.com \
--to=david@redhat.com \
--cc=cohuck@redhat.com \
--cc=fweimer@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=sbrivio@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).