From nobody Thu Jun 5 23:56:37 2025 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 4bD1ZG1MHMz5x4dZ; Thu, 05 Jun 2025 23:56:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bD1ZF596lz3MgG; Thu, 05 Jun 2025 23:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749167797; 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=kxSTXhIoeyobAQLdT9UsCglL0paIHgM1LgJZjAAwENQ=; b=Lnvw7i6TW5lHRb0165BEtZjpz1shNuWUi5E0Ojg2BvuBRfLrZhPnH0gCmhguO3sjL/5qU1 kiP/hWbSnSL7WFtu8M/sfDwk3RI+K7MhFkkSuLnkgSwEevQCoLaQIPb+q9yHzvbzk7h6Bm z5KBcQZ8EHUtCq9JG5m3N6quC8r2Xg72Bz+5lDF3+uRosKfM+YVZ0MNjZUyVpP/E7tHmAV v6e/F8Jt6UIFc+U4tCAtxYfjhA7wi1ynoIIqj2+EvH83cyRbzmhKVdhALMoqQmUdnFsUJy A9AQRyNjworgysUm1ZcYYcXQGa/3xlW1HbWNQFku3teySl/PyfTTfDUbn9f1DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749167797; 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=kxSTXhIoeyobAQLdT9UsCglL0paIHgM1LgJZjAAwENQ=; b=WtAM2Qe0K2VSmNQFqalsPPWscfMh/DDgqzhlSfHUPJhzJm83KprLgu//Wu4McnPvVJfx58 4HUcoGvE12wbc9Ezcmqp4jIUYGObFlyEwvwS9kmb+w92fLzB8qKGl1JzNVOn3s5zLf138U o69qGxXhFrYc336QgEmXE7NXljqsm7UZEDsc7CkTgEXjYs1jSIJTUxvyEeN/5QrfmpLD9f 8tfrw5DGEuX7brKU8t0nymkO6nXEuh9kDT9xbHlaipr7O248pOo83/wM60TMqtcXCevaXk lmQMUuHgkocO1iOGqFvAarNuCAdPC5UcHwzLvFFIXuxyVzjUCo1zncYvuzvkPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749167797; a=rsa-sha256; cv=none; b=W1LudyOrP/G7S961/FClh3wHtUdckchhpuaJFcBQKzrbHuPaOS9EE4YAppZ6kBSipXrCEz 0n2Hl0J5sSExqDeaeDh2UwnRTEj7GL+24NI6iLLUzTAagHoESr+8OTz6qikMRUTVhidFjr tQNal/TFnNeiUA9hrMxz2cW3aB0/2SImTJHwwQNuaVMZ3dh6yr3arCvqGBbLPYqLgpEXgJ hs//6dd9mWXNZCa39ylOjP5NGulbnQgHLFcu+vdjQFEeayJjNwilo5PiFnPkY3kQRK4nuG LM1QKRAoZSzc3FPGveG6wyapg6/NosxN8M9lDG9EHFCz4qoVZk7k/ocLNbR8ow== 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 4bD1ZF4kcJzX1T; Thu, 05 Jun 2025 23:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 555NubSu007355; Thu, 5 Jun 2025 23:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555NubFi007352; Thu, 5 Jun 2025 23:56:37 GMT (envelope-from git) Date: Thu, 5 Jun 2025 23:56:37 GMT Message-Id: <202506052356.555NubFi007352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 934df0ca61bf - main - mman: Reserve two PROT_ for CHERI use 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 934df0ca61bfbb6bdedba8588457a3ffa2adde25 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=934df0ca61bfbb6bdedba8588457a3ffa2adde25 commit 934df0ca61bfbb6bdedba8588457a3ffa2adde25 Author: Brooks Davis AuthorDate: 2025-06-05 23:55:35 +0000 Commit: Brooks Davis CommitDate: 2025-06-05 23:55:35 +0000 mman: Reserve two PROT_ for CHERI use In CheriBSD we use two bits to control load and store of CHERI capabilities (pointers). In anticipation of merging CHERI support in time for FreeBSD 16, reserved these two bits to avoid the (low, but non-zero) risk of a flag day downstream. I've used PROT_CHERI0 and PROT_CHERI1 rather than their downstream name in hopes of avoiding the impression they do something today. Reviewed by: kevans, adrian Suggested by: kevans, adrian Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50621 --- sys/sys/mman.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/mman.h b/sys/sys/mman.h index 611c5b4e669f..ba478bc71c7c 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -53,6 +53,8 @@ #define PROT_WRITE 0x02 /* pages can be written */ #define PROT_EXEC 0x04 /* pages can be executed */ #if __BSD_VISIBLE +#define PROT_CHERI0 0x08 +#define PROT_CHERI1 0x10 #define _PROT_ALL (PROT_READ | PROT_WRITE | PROT_EXEC) #define PROT_EXTRACT(prot) ((prot) & _PROT_ALL)