From nobody Fri Jun 17 19:40:41 2022 X-Original-To: dev-commits-src-branches@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 8FE0185D301; Fri, 17 Jun 2022 19:40:42 +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 4LPqCG0MNjz3hgL; Fri, 17 Jun 2022 19:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494842; 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=jVlbNwDefYkjhfakUIk2EqOBAGntCytln/1mltVXCBs=; b=qkFC08uwU6EhIBZ18ggbSuuWpj2t3rhQ42C5ZS7xHtlKSHzfBH9MR9Ps7882jo+FDbw8+T BHt8n/NVxBXuVcyobV2fEPXin4/p0Ri+nvkBML7g0dEU6LvL4kmZ2ptS7SJkJDRCaPqA3e zl0ySAtPpaVkjro2NVlJGoRHW6NcLpBclLaIP6PMZElwdGRRlXpvvhQxdSLevidAzblF5m CY/KZ2CB/wHMteRifS/YAIxQx1IplD5FrtfocTLxaziJTS+iXXi3GxZkXqKShHWSuMMTYq x5pxcAZoqkbsI8/TWdGwuGuxIIuHyrSawb+dtYU/uc2Ao/P+qBOxoVJMk2Mdsg== 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 7B5CA25D18; Fri, 17 Jun 2022 19:40:41 +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 25HJefR1026144; Fri, 17 Jun 2022 19:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJefpi026143; Fri, 17 Jun 2022 19:40:41 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:41 GMT Message-Id: <202206171940.25HJefpi026143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d30b87879ba4 - stable/13 - linux(4): Add AT_MINSIGSTKSZ to arm64 port List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d30b87879ba43e47d86b57d66a33e3edd3948110 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494842; 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=jVlbNwDefYkjhfakUIk2EqOBAGntCytln/1mltVXCBs=; b=PiAvB7jYXCGd8Sg0vExGaUMo/z6T0oV+ge8xNIcuO3rB26/Q5oTZpX+K7fI8qvFnYLUOgS lC6Hdf8p5kStyhBTkJpjIZlE3w2Sn93PnG930q++v2FuoUq2r0c63w4G9C36V6gFBSE4qo sYsinYeLkHjN5uxacT3C7EDjXEt0o/roR2D6QEYAlK8OEmTD3eN9kgXj52sdyUC8Q7LsV5 qJHluNbOncYVD4IOSneNBlwkYOD6DZJrqboP3y5eoaP6SLrHl49VuZI5dGvJEDoWVvyB4o SINowPV9OoQ2diaVoAszv9dR0wmJNlOwTOob8S4HifCkxdpdCykvBt74ogGDtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494842; a=rsa-sha256; cv=none; b=xag1oBLLd+T2uoqpJ2Kikmyy8G685qtaai3qrl78WvE1JNIZRlsmQXxDnnr0ljCoDfrwex co/Oj8/wxZUTpKxxLz7R/dW+AsX9PTKZWY6DYuR5vfg2a+DdWXElty/6v+8iJLerassr+Y rS6RCbnzJqfEEuLtlURhLp+mgl+FWdgqjtuI/gOGEKG2Hdd1kOk5NstvMYzHAssOG1aGFX oHd1wXriRvXiuWLRAFR9H1/jH2KvlPI22ARiuHx8rUSZGS1Sp5KsWDyKA/d4QNDG0W2tgb 6DHcuJAwxSjA+bc5JeDE5YvQrFQ8RTmdYspIB+LWyCscqi5EDDo1m8Lv8Pt+Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d30b87879ba43e47d86b57d66a33e3edd3948110 commit d30b87879ba43e47d86b57d66a33e3edd3948110 Author: Dmitry Chagin AuthorDate: 2022-05-15 18:12:03 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:23 +0000 linux(4): Add AT_MINSIGSTKSZ to arm64 port MFC after: 2 weeks (cherry picked from commit 390c9ea029fdd3fb2ce61fc6b48617f0f7cd8754) --- 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 9d452cbc796a..db508be41e3c 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -195,6 +195,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