From patchwork Tue May 23 10:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 684892 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1628943wrt; Tue, 23 May 2023 03:17:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7GqfXBknuhVIIWMkw6GBw5PjOKvyOEBAyTAXX68VQjtWN5+Emiu45U2F8I1AeBYFgqmBB5 X-Received: by 2002:a05:620a:8e06:b0:75b:23a1:8e2f with SMTP id re6-20020a05620a8e0600b0075b23a18e2fmr3186577qkn.0.1684837059249; Tue, 23 May 2023 03:17:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684837059; cv=none; d=google.com; s=arc-20160816; b=gwuODPXTacBI7aqszMUZRsRl8+7SruEOCI5EVVxRQCHUCd56q+cG95xKYoiBIcrsUx YdaBMt7B+NerQ7w0CgfmBtp6SaZdy41/jU6qiw/KWcDzYw87iqIsZurgW47unnbJJFuP AlWPAhd/xo7cdkIWcJV3Dg+yqxjCjOw62UtilOP7HT9phGyzs/BTBOfF8YG3Eut4XcBt OzpJdd+4Rg6H64GLdXk90TX8fpGy1I2I0EFdnTw2MlMvoB/THmrydoy5+qkINhn6lmzD JJXO+R7AiDkOJYK6LdxQEbgXNjIlGcsjSxk+UMcJSVukSczfOCxo2XkBCKNDld3hOx4/ OcYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=+M6+lIDWutzz9+9Yru3wC3NtZIauCeeyFrskgHHtPts=; b=dBzD18rVmS626LmxjRN02HCeSxpYG5ppzjjk98X0HGHZUE4XT6sQ9uOXU6VC8FowCK ehhZROHpBxS0srTov8GpJU07Mw0nIOjR2UlGax+GOJMw+dSkzpQLxsSiF0nRBwzp2OMG dT5dERBAQZnMuXsMsurrrqmTXJmfGg+Pw2sLzJ62w9Aw58AMIt+Y+SvJGEJHazwRY69o GJwI5c7Xqv/IlFFQV36/E0fLOp++5kGPdDJLLQoFT8xtSPMjMzLFhl03vJXHNIPpd2ZS MU6esJaxK++BLc8PspC56RZFdNpONeBYHZK0BZulAoBfgJw5XnUtWa/VgzTpwWKYu4OA ZNrw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g14-20020a05620a108e00b0075b1a33db48si2071856qkk.177.2023.05.23.03.17.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 May 2023 03:17:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1P4A-0006xO-IJ; Tue, 23 May 2023 06:16:31 -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 1q1P3s-0006pP-To; Tue, 23 May 2023 06:16:16 -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 1q1P3q-0001vB-UG; Tue, 23 May 2023 06:16:12 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C40737CFD; Tue, 23 May 2023 13:15:51 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 07B0E728D; Tue, 23 May 2023 13:15:51 +0300 (MSK) Received: (nullmailer pid 85523 invoked by uid 1000); Tue, 23 May 2023 10:15:48 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Peter Maydell , Michael Tokarev Subject: [Stable-8.0.1 47/59] target/arm: Fix vd == vm overlap in sve_ldff1_z Date: Tue, 23 May 2023 13:15:07 +0300 Message-Id: <20230523101536.85424-11-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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, 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson If vd == vm, copy vm to scratch, so that we can pre-zero the output and still access the gather indicies. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1612 Signed-off-by: Richard Henderson Message-id: 20230504104232.1877774-1-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell (cherry picked from commit a6771f2f5cbfbf312e2fb5b1627f38a6bf6321d0) Signed-off-by: Michael Tokarev diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index ccf5e5beca..0097522470 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -6727,6 +6727,7 @@ void sve_ldff1_z(CPUARMState *env, void *vd, uint64_t *vg, void *vm, intptr_t reg_off; SVEHostPage info; target_ulong addr, in_page; + ARMVectorReg scratch; /* Skip to the first true predicate. */ reg_off = find_next_active(vg, 0, reg_max, esz); @@ -6736,6 +6737,11 @@ void sve_ldff1_z(CPUARMState *env, void *vd, uint64_t *vg, void *vm, return; } + /* Protect against overlap between vd and vm. */ + if (unlikely(vd == vm)) { + vm = memcpy(&scratch, vm, reg_max); + } + /* * Probe the first element, allowing faults. */