From nobody Sat Feb 7 06:40:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568644003; cv=none; d=zoho.com; s=zohoarc; b=D+nmXjfW62kcUXxgNUphT3kIdXUeu0PwN3mjGN8pSk+5ICl+ilNN2M5dexXUtjblLfQNeD1aHyDxCRUXu36/WeEWFpuzL9QTmsIxbDzleoNwGsZKSHR6MTyGrx0IjO4G4hPdJo9tYVOy/85/CjpMlptpkX8jbIIMRG4uM5gqmYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568644003; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=j4Ucf9/O7jI8Wpyx7hlpIEMLuMrio//kwKCQfzwxBkM=; b=KTyEsrK93skwZB6kpMJN7bFlPJZfeuWjAepVJQPhhGWOPxaRyaDfmXTs5sB0RWVd7aRsJYYI4+QE1UpyGcSglAc1HGWuyOARxHV/fEjJuY0TAbyX70UCXDM9zvUvQsyruZ/h1mEOpNHJ1J1PokT0l1TLsZf2eu7UVWxrxEqm+5E= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568644003377469.64308329950086; Mon, 16 Sep 2019 07:26:43 -0700 (PDT) Received: from localhost ([::1]:35106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9rxh-0006B4-Am for importer@patchew.org; Mon, 16 Sep 2019 10:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46330) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9rXJ-0003dZ-5r for qemu-devel@nongnu.org; Mon, 16 Sep 2019 09:59:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9rXH-0000Xh-Rv for qemu-devel@nongnu.org; Mon, 16 Sep 2019 09:59:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41280) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i9rXH-0000XD-Lk; Mon, 16 Sep 2019 09:59:23 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C966F308620E; Mon, 16 Sep 2019 13:59:22 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-103.ams2.redhat.com [10.36.117.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id A417F104C529; Mon, 16 Sep 2019 13:59:20 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 15:57:59 +0200 Message-Id: <20190916135806.1269-23-david@redhat.com> In-Reply-To: <20190916135806.1269-1-david@redhat.com> References: <20190916135806.1269-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 16 Sep 2019 13:59:22 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 22/29] s390x/tcg: XC: Fault-safe handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Weimer , Thomas Huth , David Hildenbrand , =?UTF-8?q?Dan=20Hor=C3=A1k?= , Cornelia Huck , Richard Henderson , Stefano Brivio , qemu-s390x@nongnu.org, Cole Robinson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We can process a maximum of 256 bytes, crossing two pages. While at it, increment the length once. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/mem_helper.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 0574c31d9a..a2118a82e3 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -349,14 +349,19 @@ static uint32_t do_helper_xc(CPUS390XState *env, uint= 32_t l, uint64_t dest, uint64_t src, uintptr_t ra) { const int mmu_idx =3D cpu_mmu_index(env, false); - S390Access desta; + S390Access srca1, srca2, desta; uint32_t i; uint8_t c =3D 0; =20 HELPER_LOG("%s l %d dest %" PRIx64 " src %" PRIx64 "\n", __func__, l, dest, src); =20 - desta =3D access_prepare(env, dest, l + 1, MMU_DATA_STORE, mmu_idx, ra= ); + /* XC always processes one more byte than specified - maximum is 256 */ + l++; + + srca1 =3D access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); + srca2 =3D access_prepare(env, dest, l, MMU_DATA_LOAD, mmu_idx, ra); + desta =3D access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); =20 /* xor with itself is the same as memset(0) */ if (src =3D=3D dest) { @@ -364,11 +369,12 @@ static uint32_t do_helper_xc(CPUS390XState *env, uint= 32_t l, uint64_t dest, return 0; } =20 - for (i =3D 0; i <=3D l; i++) { - uint8_t x =3D cpu_ldub_data_ra(env, src + i, ra); - x ^=3D cpu_ldub_data_ra(env, dest + i, ra); + for (i =3D 0; i < l; i++) { + const uint8_t x =3D access_get_byte(env, &srca1, i, ra) ^ + access_get_byte(env, &srca2, i, ra); + c |=3D x; - cpu_stb_data_ra(env, dest + i, x, ra); + access_set_byte(env, &desta, i, x, ra); } return c !=3D 0; } --=20 2.21.0