From nobody Tue Nov 15 12:38:04 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NBQgx1dbTz4d7tX; Tue, 15 Nov 2022 12:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NBQgx17C7z4Nb5; Tue, 15 Nov 2022 12:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668515885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzqSTrS+i6R1Pa+BYOfmL8DKJorrFz4SCt7hP3di0qA=; b=Ms1MBPV63iSWxQX2LHFoa7qWiBz/zXV/ZPsRyN2dc+YeEtWbHebfyoEHCDyi+m+OHZHhDY sE5nnsaWIrjjNTub/wodEgJ9c8DgbrSydMD6u7RC5Z0F/QjOuPYxuc1nKE5zBDUGizaLRq uSGvqE6eJWfOfZFwHuU5mbmnZ8S4/i+JCLcinBN7IdMmrZwZ74yCAko/qeu9DGxDIvJK0L 97RPt61PlrteaIoNkJQ/EMs6U3q9H6bxr8X+juGVimXfwKVaP+nuJbwVth9JvDph21Btmj QZ2qZaB4Zvxe9Km/0Jom2i8hjye0lkkLDairlcLGMCdgIaRC4jKSgehqRj6nAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668515885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzqSTrS+i6R1Pa+BYOfmL8DKJorrFz4SCt7hP3di0qA=; b=vP793qUDHm/FJ4D2L6SRJwrPtpAGgxxKcG6B5g4GlwWVTWpxMWPTYX5VAOA0u/d+cmap5z J1TZ/5YKrHRrwI9WSlywCsVMq9zPGKKfgFvO2xzKEtNRb6jY9evf96kcEZmHPfS7MpstkW 9fDs1MgAnFXpBk5Ge3pn+9Hkd35DEtgSBpGjNcTvwi28Od5yjL5G+m68qDsl7ao2kiCWcU YPNBg9i2gQ2eaVFK2e4tK5MfCKjD3R73WpeRnW6urE+BIMf3CBIdW7YslWoYPynFia8H2+ yGyoaJQUE634iOOsJw/w13XUg8pdIfJy2Sg5TfkALBHxCG1dVc4Xkc0N7ZkXVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668515885; a=rsa-sha256; cv=none; b=gau9Onn2yZB5FpARSdIRB1W2RNLYDvUUWxzuCc9e4QOQ9b5lgL25icRGXPU3veiLRVfPuD lh8gC5thQgaoJgq40iLLN7OUVGBPH3Csqah0sNj1XqeVgCrzg53ibiVsPvcwUbPSUYMvKo kjr22YgFnXoTivOH6JLw1r43CkNHbNec9akzqABWIGtowe8TOaML3VVpaMYt2yORvN2phc opNcuIOoSeZy1HKXeDWEEOGW5A0l2/Ol/aXDhctzHBZZFF/L84g7CbeBRxYFAI5Uv7CJ6m uTJzc3fUqZA5+t359uLQDnqu433v5Wl48/IxkrT4Wai2RsJPIfwW/+IHblidlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NBQgx0BRpzN47; Tue, 15 Nov 2022 12:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AFCc4qE087522; Tue, 15 Nov 2022 12:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFCc4G0087521; Tue, 15 Nov 2022 12:38:04 GMT (envelope-from git) Date: Tue, 15 Nov 2022 12:38:04 GMT Message-Id: <202211151238.2AFCc4G0087521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ba2bbac4c15a - main - Revert "Check alignment of fp in unwind_frame" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba2bbac4c15aa296e36308d98ff5ef5c767f64aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ba2bbac4c15aa296e36308d98ff5ef5c767f64aa commit ba2bbac4c15aa296e36308d98ff5ef5c767f64aa Author: Andrew Turner AuthorDate: 2022-11-15 12:32:59 +0000 Commit: Andrew Turner CommitDate: 2022-11-15 12:33:39 +0000 Revert "Check alignment of fp in unwind_frame" Fix the build as is_aligned doesn't exist in FreeBSD. This reverts commit 40e0fa10f58d90744c2857b57adf0ddbce1a1e1c. --- sys/arm64/arm64/unwind.c | 3 +-- sys/riscv/riscv/unwind.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/unwind.c b/sys/arm64/arm64/unwind.c index 81431e109494..470b64c00540 100644 --- a/sys/arm64/arm64/unwind.c +++ b/sys/arm64/arm64/unwind.c @@ -41,8 +41,7 @@ unwind_frame(struct thread *td, struct unwind_state *frame) fp = frame->fp; - if (!is_aligned(fp, sizeof(fp)) || - !kstack_contains(td, fp, sizeof(fp) * 2)) + if (!kstack_contains(td, fp, sizeof(uintptr_t) * 2)) return (false); /* FP to previous frame (X29) */ diff --git a/sys/riscv/riscv/unwind.c b/sys/riscv/riscv/unwind.c index a66ffebcdc35..9efb1fef9451 100644 --- a/sys/riscv/riscv/unwind.c +++ b/sys/riscv/riscv/unwind.c @@ -47,8 +47,7 @@ unwind_frame(struct thread *td, struct unwind_state *frame) fp = frame->fp; - if (!is_aligned(fp, sizeof(fp)) || - !kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2)) + if (!kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2)) return (false); frame->sp = fp;