From nobody Sun May 15 18:12:31 2022 X-Original-To: dev-commits-src-main@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 909B81AE9658; Sun, 15 May 2022 18:12:32 +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 4L1Vpl5gvTz3vjy; Sun, 15 May 2022 18:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652638351; 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=pVZPi0zMx+f0X2LO1BP5sMW5HpjFJMH17sfS0wIXWGI=; b=Waye8y5fuRvrWtURlLqWUixVkDuXSFH3h55aqLMCsW6mN4vLY5T7W6Y5bfsa9W5ZckNTT4 G5deVaid091Cl5fkxU6n40sTAXTm9FayVkUxvjtHSgog5iXche2hnwBhUX8Ie4sm7rcMsD g4RAUWz9NWkk6pE4DgPhFonPZyRgGnVjGaeMzr6PSpLJW02Jp5AQaCVAfzFjNgMxs7/LOq 9pV41Hu+WJ9VYlMdWLYpI0fr6piDOx2XuV+l8BXRjHRDbHe7w9PelaXOse9JisiM/Y8JSd nvh+U1DPyd3W+CBWENvcOTeSMi0+SFJfoCdUYys1YvanQVhlu32HqipsUC4b5w== 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 7895A10E03; Sun, 15 May 2022 18:12:31 +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 24FICVjY082696; Sun, 15 May 2022 18:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24FICV90082695; Sun, 15 May 2022 18:12:31 GMT (envelope-from git) Date: Sun, 15 May 2022 18:12:31 GMT Message-Id: <202205151812.24FICV90082695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 390c9ea029fd - main - linux(4): Add AT_MINSIGSTKSZ to arm64 port List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 390c9ea029fdd3fb2ce61fc6b48617f0f7cd8754 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652638351; 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=pVZPi0zMx+f0X2LO1BP5sMW5HpjFJMH17sfS0wIXWGI=; b=ay+pTgb+CctyoGdV5VXE1JqiviYWrUSu1KgxnVecItWK1ZSuZYlQchwnQRyM/QgnbiXzVx G3M2K+s9E7u9KgvrZkju8EFlNSN/6IR3SmciaOfJKkcDM3OxZv60KsUjezu7eYZeY3JtcW CMAClr3LhmGXHdGml0ul+KUKenRRCQZgHsXE4BR10ynwf43RCOIcU1q4RrurQdinVUvGiY o7RZ+39pE2Z5CReyawBodJoPopRtyDw4w0e1k/5JAoAeqj2BXeqPs0K/6ER9vcmRVnKSoD g0fuURcUTlIFp6Y7Kz6wWyLmEj+R/0yhLz5DikIx0qjaWU2T8BAKVP6hgNESqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652638351; a=rsa-sha256; cv=none; b=J1u0O3yfZ4w+ma4D1bul6VB5StwFRRb5pAQ0l1q9+6QqMtU+7L8v0vcIgvy+L1DCssowo7 kFCtAlq6jZlDWFU7YOCWK79lG429l7SHF7bQ7Di/0BipzHrSHWA1X259MGPU2lDLi2yrnj O8vezfs43dRXh1F7L8rhgZxTTPP90dB9uEvJqhhuUyOCOtovhyXS29XOuriWSRVZ1AM3c4 XMkeGIhCdrtyqkvWQqbDc7R0cRDnuKmGyTQfJe0VGg7fhjdteYUTsKcCgYfyKD4MgMpm8j IVdvJwEQxP+xvbaZhHzgbIJqtAcCrKNWcnt4t/fQRAMTATDizpmmg1wuwybocg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=390c9ea029fdd3fb2ce61fc6b48617f0f7cd8754 commit 390c9ea029fdd3fb2ce61fc6b48617f0f7cd8754 Author: Dmitry Chagin AuthorDate: 2022-05-15 18:12:03 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-15 18:12:03 +0000 linux(4): Add AT_MINSIGSTKSZ to arm64 port MFC after: 2 weeks --- sys/arm64/linux/linux.h | 5 +---- sys/arm64/linux/linux_sigframe.h | 2 ++ sys/arm64/linux/linux_sysvec.c | 1 + sys/compat/linux/linux_misc.h | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index dafec928c7e4..bf6e092f3bf8 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -81,7 +81,7 @@ typedef struct { #define l_fd_set fd_set /* Miscellaneous */ -#define LINUX_AT_COUNT 20 +#define LINUX_AT_COUNT 21 struct l___sysctl_args { @@ -163,9 +163,6 @@ struct l_newstat { #define LINUX_SIG_UNBLOCK 1 #define LINUX_SIG_SETMASK 2 -/* sigaltstack */ -#define LINUX_MINSIGSTKSZ 5664 /* sigframe */ - typedef void (*l_handler_t)(l_int); typedef struct { diff --git a/sys/arm64/linux/linux_sigframe.h b/sys/arm64/linux/linux_sigframe.h index d0d870e51375..3b125efc8781 100644 --- a/sys/arm64/linux/linux_sigframe.h +++ b/sys/arm64/linux/linux_sigframe.h @@ -81,4 +81,6 @@ struct l_sigframe { ucontext_t uc; }; +#define LINUX_MINSIGSTKSZ roundup(sizeof(struct l_sigframe), 16) + #endif /* _ARM64_LINUX_SIGFRAME_H_ */ diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 461a00bf5b33..e82539b9c5b1 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -197,6 +197,7 @@ linux_copyout_auxargs(struct image_params *imgp, uintptr_t base) issetugid = p->p_flag & P_SUGID ? 1 : 0; AUXARGS_ENTRY(pos, LINUX_AT_SYSINFO_EHDR, linux_vdso_base); + AUXARGS_ENTRY(pos, LINUX_AT_MINSIGSTKSZ, LINUX_MINSIGSTKSZ); AUXARGS_ENTRY(pos, LINUX_AT_HWCAP, *imgp->sysent->sv_hwcap); AUXARGS_ENTRY(pos, AT_PAGESZ, args->pagesz); AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, stclohz); diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h index 0f134fc62e72..7a8073539e87 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -95,6 +95,10 @@ #define LINUX_AT_RANDOM_LEN 16 /* size of random bytes */ +#ifndef LINUX_AT_MINSIGSTKSZ +#define LINUX_AT_MINSIGSTKSZ 51 /* min stack size required by the kernel */ +#endif + /* Linux sets the i387 to extended precision. */ #if defined(__i386__) || defined(__amd64__) #define __LINUX_NPXCW__ 0x37f