From nobody Tue Jan 24 22:11:07 2023 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 4P1h4r06MZz3bf4r; Tue, 24 Jan 2023 22:11: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 4P1h4q5FYGz4MSb; Tue, 24 Jan 2023 22:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598267; 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=S3iUm/4qslheh2AY2gr08jjp5eF5Rnz1+1whl603YIM=; b=qoa2cB7WKn+bcvSNK13rkSHz7OUpoaDOmJLguwjRNczyzoftnrxht8pdtjsrWEIDHZ2ns8 ZaHwvIZd+qrdrRD+vBJdBHBb7NlwwzxWD63iViapCzkXdrXaOfKrsv1aXI45BdjiUi/kMN lGRuPt2HOHC3R4UGgb5gMEkvi/aVeUiJmyhjeAixgQaqLWMhcFkL6N6LqViFGDoVhjOJ8z XVOwo12L3xIz734KgilX+WE2IH5vYz8E8jUfJEbEWo3lfO03F+fu9g8KvPZa2GUtF5hBme QORafB5w8f7z8hTtopV76JxlovcQLt/XNPoQRshg1N2WV90bgjkxRIxnDssz/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598267; 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=S3iUm/4qslheh2AY2gr08jjp5eF5Rnz1+1whl603YIM=; b=t9PuOIGmoFwjmdXbOrJbiUmi0qfYPWpFS3AFnXTh8eHbgqzdlukGEQFT1ioTDTzCYTVyqf PuoAw9W34wnb0QKsj1WO4qVfK44c+NMnWNKOwkzl3UEBjkZbZmYbOJZgSCwlz0A6VyBfef SjTdMRyqf7eG5T9udkZwK+GnNSblIrnZs0TDzS7PanKHSDLPXZK8DDlSu9z/jrJKChmGx5 nLzdb+/eVH/GR69X4CVSnhMRB7lkzl9qKDOXBQXTFNQhU1SqxtGdfqYI6VBANnfHrU2hRM 6OEVma6rVGjRNaCT9lJ6uUzm0yWbjD4IMQTvpGJkBGOWoG7SL21P/tV44drYPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598267; a=rsa-sha256; cv=none; b=tMW5BQqunUKlSCnIcbie5lGZnCVwwZJ9GqjQq1wfT58XtXldeqCzbimSmv7VP9dN9TASd0 5r3m/6keg57M1JWzpZFKlO6x5Skpz7DvO/ldnRDkPeUUYpaPgo/vPzLIQa4jd2e0ZpTBlQ P5Ry9OHan974rdRyunCCjMNGh5CrI+Emt4J1uOlWGtscYeE1TiR7mLEiLROSvSvqpTYIjD PGvH/OVH0zfCuvlS3Jcy/yVfvcs77LABN8VukPK791duiXQDFhWy6QVJMyWV0uyx/pbpMq J/lWzzHuPIsRkg0t7Gu/LjZyv4kNqMjUi2lyTLN3CvimGH7QYKzK1jbQS8rk9Q== 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 4P1h4q4KPJzQFZ; Tue, 24 Jan 2023 22:11:07 +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 30OMB7uV083499; Tue, 24 Jan 2023 22:11:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMB7bR083498; Tue, 24 Jan 2023 22:11:07 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:07 GMT Message-Id: <202301242211.30OMB7bR083498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0d3b88bc5a8b - stable/13 - kboot: Pull in constants from Linux's mmap.h api 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d3b88bc5a8b45d9e0815126e12344dbbc689df7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d3b88bc5a8b45d9e0815126e12344dbbc689df7 commit 0d3b88bc5a8b45d9e0815126e12344dbbc689df7 Author: Warner Losh AuthorDate: 2022-06-28 16:43:42 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:25 +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 (cherry picked from commit 01c58e7e4fd830b736c2fdcee4965e135f6e6685) --- 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