From nobody Tue Feb 10 21:40:22 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169425546212078.36371435251931; Sat, 9 Sep 2023 03:31:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qevCC-0006wr-6M; Sat, 09 Sep 2023 06:28:08 -0400 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 1qevC2-0006rn-Q5; Sat, 09 Sep 2023 06:27:59 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qevC0-0004OH-5m; Sat, 09 Sep 2023 06:27:58 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0F03C20494; Sat, 9 Sep 2023 13:28:44 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 14D4D26CF2; Sat, 9 Sep 2023 13:27:53 +0300 (MSK) Received: (nullmailer pid 346616 invoked by uid 1000); Sat, 09 Sep 2023 10:27:53 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Ilya Leoshkevich , Claudio Fontana , David Hildenbrand , Thomas Huth , Michael Tokarev Subject: [Stable-8.1.1 01/34] target/s390x: Fix the "ignored match" case in VSTRS Date: Sat, 9 Sep 2023 13:26:54 +0300 Message-Id: <20230909102747.346522-1-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1694255463871100007 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich Currently the emulation of VSTRS recognizes partial matches in presence of \0 in the haystack, which, according to PoP, is not correct: If the ZS flag is one and a zero byte was detected in the second operand, then there can not be a partial match ... Add a check for this. While at it, fold a number of explicitly handled special cases into the generic logic. Cc: qemu-stable@nongnu.org Reported-by: Claudio Fontana Closes: https://lists.gnu.org/archive/html/qemu-devel/2023-08/msg00633.html Fixes: 1d706f314191 ("target/s390x: vxeh2: vector string search") Signed-off-by: Ilya Leoshkevich Message-Id: <20230804233748.218935-3-iii@linux.ibm.com> Tested-by: Claudio Fontana Acked-by: David Hildenbrand Signed-off-by: Thomas Huth (cherry picked from commit 791b2b6a930273db694b9ba48bbb406e78715927) Signed-off-by: Michael Tokarev diff --git a/target/s390x/tcg/vec_string_helper.c b/target/s390x/tcg/vec_st= ring_helper.c index 9b85becdfb..a19f429768 100644 --- a/target/s390x/tcg/vec_string_helper.c +++ b/target/s390x/tcg/vec_string_helper.c @@ -474,9 +474,9 @@ DEF_VSTRC_CC_RT_HELPER(32) static int vstrs(S390Vector *v1, const S390Vector *v2, const S390Vector *v= 3, const S390Vector *v4, uint8_t es, bool zs) { - int substr_elen, substr_0, str_elen, i, j, k, cc; + int substr_elen, i, j, k, cc; int nelem =3D 16 >> es; - bool eos =3D false; + int str_leftmost_0; =20 substr_elen =3D s390_vec_read_element8(v4, 7) >> es; =20 @@ -498,47 +498,20 @@ static int vstrs(S390Vector *v1, const S390Vector *v2= , const S390Vector *v3, } =20 /* If ZS, look for eos in the searched string. */ + str_leftmost_0 =3D nelem; if (zs) { for (k =3D 0; k < nelem; k++) { if (s390_vec_read_element(v2, k, es) =3D=3D 0) { - eos =3D true; + str_leftmost_0 =3D k; break; } } - str_elen =3D k; - } else { - str_elen =3D nelem; } =20 - substr_0 =3D s390_vec_read_element(v3, 0, es); - - for (k =3D 0; ; k++) { - for (; k < str_elen; k++) { - if (s390_vec_read_element(v2, k, es) =3D=3D substr_0) { - break; - } - } - - /* If we reached the end of the string, no match. */ - if (k =3D=3D str_elen) { - cc =3D eos; /* no match (with or without zero char) */ - goto done; - } - - /* If the substring is only one char, match. */ - if (substr_elen =3D=3D 1) { - cc =3D 2; /* full match */ - goto done; - } - - /* If the match begins at the last char, we have a partial match. = */ - if (k =3D=3D str_elen - 1) { - cc =3D 3; /* partial match */ - goto done; - } - + cc =3D str_leftmost_0 =3D=3D nelem ? 0 : 1; /* No match. */ + for (k =3D 0; k < nelem; k++) { i =3D MIN(nelem, k + substr_elen); - for (j =3D k + 1; j < i; j++) { + for (j =3D k; j < i; j++) { uint32_t e2 =3D s390_vec_read_element(v2, j, es); uint32_t e3 =3D s390_vec_read_element(v3, j - k, es); if (e2 !=3D e3) { @@ -546,9 +519,16 @@ static int vstrs(S390Vector *v1, const S390Vector *v2,= const S390Vector *v3, } } if (j =3D=3D i) { - /* Matched up until "end". */ - cc =3D i - k =3D=3D substr_elen ? 2 : 3; /* full or partial ma= tch */ - goto done; + /* All elements matched. */ + if (k > str_leftmost_0) { + cc =3D 1; /* Ignored match. */ + k =3D nelem; + } else if (i - k =3D=3D substr_elen) { + cc =3D 2; /* Full match. */ + } else { + cc =3D 3; /* Partial match. */ + } + break; } } =20 --=20 2.39.2