From nobody Fri Jul 15 18:04:08 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 4Lkzkw5wdFz4TGmb; Fri, 15 Jul 2022 18:04:08 +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 4Lkzkw5N2hz3SHw; Fri, 15 Jul 2022 18:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908248; 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=bHgpfyuNyIWztKkCo/bt+ePto7teigXors2e67y59AY=; b=vLnbAb4ErInOdcuAsnKEJR+s58mcMMjxnq0ABnTfrKEoAj6/UlOyFcWuH3/jhYcBB1YhxP 9Y5+8Zl/XXCN5AiJwNecJs/jnZFrjIgeXOP5WjGJ5MfOq/Fw3Mh5uyD/IJvXrKBl6r0CPT eFV16kS46NrrWuh0EveTi/9qfFPOh9BiOrX43l3IFLQl+6xtd8qfeqzcIeitrYa0XaV5pU s91bO1RPZF5Te5C/Ozo7VonYIzszb9uDyDywjbIk4V2Jvp+VLzo/IQe7WX7EzZgv/u/4s3 7945YkejSVtCtsw66caxK9oXAbJJqPhkWGs1y6Qy8l8A8EEDSHQ5AyNFQACp3A== 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 4Lkzkw4GKHzrpQ; Fri, 15 Jul 2022 18:04:08 +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 26FI48LF060434; Fri, 15 Jul 2022 18:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FI48Io060433; Fri, 15 Jul 2022 18:04:08 GMT (envelope-from git) Date: Fri, 15 Jul 2022 18:04:08 GMT Message-Id: <202207151804.26FI48Io060433@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 01c58e7e4fd8 - main - kboot: Pull in constants from Linux's mmap.h api 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01c58e7e4fd830b736c2fdcee4965e135f6e6685 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908248; 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=bHgpfyuNyIWztKkCo/bt+ePto7teigXors2e67y59AY=; b=DFIk5HS/Fhlf/v8XkxEVU85CQSbFALA6oCTrXJjGQPrW64u9xZSl10LGsP/DC2iwMeJEGT Jsd8fV6dWcRfosKMuPVkbEUwby5N373iMnhmbsH2+YTWrVI5ggBZnsFIQwcZLpSiW4IDsT gJXN1aytHgZy7M728p8sQqmXkUfbkCNZTS9Ix9ZJGBox/KmB3uh4GuZ9+4NZNqD0maO0X2 IbCm7U7Gu769kS3xFPs8FB8GKq9mWAJfuVDNGnyzN2FMa2Tvd2mRQUWMPF5VGB8BIt5IgM wztVVezzYogVGf9DA9fLjkK0v3pwkfYTAiXMTlvYEGWARrXt596Qz4dE8f8IZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657908248; a=rsa-sha256; cv=none; b=j9S9kguB4eWbjX8KKGU48oQOcWcr402jvAhTsyRPSe+erApN57QiQR/BvryKpBlP2lHxHV EL8W+FMLh+kn7OLmbPda0lLRZIeKHBHf2GkPX6hYEn0957yP8Kd9fFP4CQDiKLE6Z/zDnA yRnkJEx6tBU3WxhmrSfZGEG0qOIuQX3dIsvxuc+pfAD8iI12C3Lgm6Hbt/PDPrU8WOnD2D Ya6YVitTo65Gf+tuEpFECH0OYnxJyyv3ocOFotvYPUvx8cN2TAxCa1O5iK40zfWob7LBNO MudD0H/TI5+HXENYUOf+VV21QSxLrg8o/7viDLzovFpDy8CnbMz6EPNp82me5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=01c58e7e4fd830b736c2fdcee4965e135f6e6685 commit 01c58e7e4fd830b736c2fdcee4965e135f6e6685 Author: Warner Losh AuthorDate: 2022-06-28 16:43:42 +0000 Commit: Warner Losh CommitDate: 2022-07-15 18:00:51 +0000 kboot: Pull in constants from Linux's mmap.h api Define the usual #defines for mmap(2) (with HOST_ prepended) and use them instead of hard coding constants. Sponsored by: Netflix --- stand/kboot/host_syscall.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index 061f82b062b0..b867cd9f0d99 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -86,7 +86,20 @@ struct host_timeval { long tv_usec; }; -#define HOST_AT_FDCWD -100 /* Relative to current directory */ +/* + * Must match Linux's values see linux/tools/include/uapi/asm-generic/mman-common.h + * and linux/tools/include/linux/mman.h + * + * And pre-pend HOST_ here. + */ +#define HOST_PROT_READ 0x1 +#define HOST_PROT_WRITE 0x2 +#define HOST_PROT_EXEC 0x4 + +#define HOST_MAP_SHARED 0x01 +#define HOST_MAP_PRIVATE 0x02 +#define HOST_MAP_FIXED 0x10 +#define HOST_MAP_ANONYMOUS 0x20 /* Mount flags from uapi */ #define MS_RELATIME (1 << 21) @@ -147,6 +160,8 @@ ssize_t host_write(int fd, const void *buf, size_t nbyte); /* * Wrappers / one-liners */ -#define host_getmem(size) host_mmap(0, size, 3 /* RW */, 0x22 /* ANON */, -1, 0); +#define host_getmem(size) \ + host_mmap(0, size, HOST_PROT_READ | HOST_PROT_WRITE, \ + HOST_MAP_PRIVATE | HOST_MAP_ANONYMOUS, -1, 0); #endif