From patchwork Wed Feb 21 08:20:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774497 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp145419wrw; Wed, 21 Feb 2024 00:22:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUmAgDaJUB3zQx4B/BPKd0nmxYtCzdiArLQ8eUuqtz/MzTpGwrYZj4djePCxTTp7kSTzayRlvzfZrfZVYVgagrO X-Google-Smtp-Source: AGHT+IHEVLG4o4qI9F2JVNSOEuXMDWQM2CkYD+M44Thu/go29bkoPxS/j0/gFpnFhzzJMa6ahf7N X-Received: by 2002:a05:620a:a14:b0:783:68a2:db8b with SMTP id i20-20020a05620a0a1400b0078368a2db8bmr18207757qka.65.1708503738463; Wed, 21 Feb 2024 00:22:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708503738; cv=none; d=google.com; s=arc-20160816; b=e6pscKqsQg5AQHZMZRFfK6+Ky5/imlSN41f3XoPZpQlGcuDlFH0aQ1vjj+7AP8P+2E 3O5E5Nz3EECAn0oqrl8o/a2KcbtVNJ+eoRtd8N5fHFfnP6Aebyd3p9vGrsPdVyndhMxK q/1IGpgBWtPpc7muHUQFUUPAln6XzrlfXWbey9Lb/Kar450Zzz204leGI+ccfDiyFB/+ lvznTG7S3pAxjcxI/fvOi+z0oIRwuHObNIlOuPQHDzOBzNTXvJ1gtXdfj9S58FAG5VSg xVMzrqFOB6YwN022Xix4fHHNS6xe8IvqPy1wASLCunLw2DaIEU+Qxwqc9Oz5ndzaPenC zpFg== 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=xhVI2j16G5mRdtkS7+DiEyZ+6Vf6OF5toH1O9+QqUJA=; fh=fA8wXgZkOijV3QzeJqIqYxlGqKQb9nNVVJRQwjQ6hao=; b=Rhrj99FqKgxia1Tq+wUH/6hYnGUzYp+W71fNCmpgBGtYozZbjM9nfAvEtYd1+GAdky 3nDyKeuUhMa6Xi6S3agRiSXaydmyisjkx5rtyf0YDYUhj1SbhyvjFLErhC9pC0Y0GwCe xTAxkK0MIWqPV+tE0KxDYFTLm6CNNpzkdHXEscfHByC6QpTv6fIFMVP/17T/ozesXagp hP5yNnndDY854LvoxIh1njk/K+8Rvqf5UKpCiINZOdcu5mWmvoQXbN75t2QiKEKGADuW lwzABP9f5uqAIHfNhoZLWt/j8omInSY8rIe/tUFsoAYzcRc/Q5Gwy/F32gSt1AbzTnyX IrfQ==; dara=google.com 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 ay44-20020a05620a17ac00b0078776ed9eadsi3699410qkb.502.2024.02.21.00.22.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Feb 2024 00:22:18 -0800 (PST) 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 1rchrW-0001kp-25; Wed, 21 Feb 2024 03:21:55 -0500 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 1rchrO-0001Zx-0y; Wed, 21 Feb 2024 03:21:46 -0500 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 1rchrL-0002CO-Nb; Wed, 21 Feb 2024 03:21:45 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B7F8A4F3CB; Wed, 21 Feb 2024 11:21:20 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 83886860AA; Wed, 21 Feb 2024 11:20:59 +0300 (MSK) Received: (nullmailer pid 2142025 invoked by uid 1000); Wed, 21 Feb 2024 08:20:58 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev Subject: [Stable-8.2.2 13/60] linux-user/aarch64: Add padding before __kernel_rt_sigreturn Date: Wed, 21 Feb 2024 11:20:01 +0300 Message-Id: <20240221082058.2141850-13-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 Without this padding, an unwind through the signal handler will pick up the unwind info for the preceding syscall. This fixes gcc's 30_threads/thread/native_handle/cancel.cc. Cc: qemu-stable@nongnu.org Fixes: ee95fae075c6 ("linux-user/aarch64: Add vdso") Resolves: https://linaro.atlassian.net/browse/GNU-974 Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Message-Id: <20240202034427.504686-1-richard.henderson@linaro.org> (cherry picked from commit 6400be014f80e4c2c246eb8be709ea3a96428233) Signed-off-by: Michael Tokarev diff --git a/linux-user/aarch64/vdso-be.so b/linux-user/aarch64/vdso-be.so index 6084f3d1a7..808206ade8 100755 Binary files a/linux-user/aarch64/vdso-be.so and b/linux-user/aarch64/vdso-be.so differ diff --git a/linux-user/aarch64/vdso-le.so b/linux-user/aarch64/vdso-le.so index 947d534ec1..941aaf2993 100755 Binary files a/linux-user/aarch64/vdso-le.so and b/linux-user/aarch64/vdso-le.so differ diff --git a/linux-user/aarch64/vdso.S b/linux-user/aarch64/vdso.S index 34d3a9ebd2..a0ac1487b0 100644 --- a/linux-user/aarch64/vdso.S +++ b/linux-user/aarch64/vdso.S @@ -63,7 +63,11 @@ vdso_syscall __kernel_clock_getres, __NR_clock_getres * For now, elide the unwind info for __kernel_rt_sigreturn and rely on * the libgcc fallback routine as we have always done. This requires * that the code sequence used be exact. + * + * Add a nop as a spacer to ensure that unwind does not pick up the + * unwind info from the preceding syscall. */ + nop __kernel_rt_sigreturn: /* No BTI C insn here -- we arrive via RET. */ mov x8, #__NR_rt_sigreturn