From nobody Mon Jun 16 15:12:30 2025 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 4bLYQQ5Fk3z5q6Np; Mon, 16 Jun 2025 15:12:30 +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 4bLYQQ3x3Bz3cmd; Mon, 16 Jun 2025 15:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086750; 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=NTYWCMu5m12RMkQrHbgbo9yPOJdOd5+w95Y8/eWz+90=; b=KyFz5TpYFZ2DMHBmwjDh23v41klndBJk5NCfoBOmnFb5a29zMuzU821TMVe/ee10RDkcH8 4zM5J+C03MmtuwQvLzM+357qeIDVlx03/aM+E5wI/Plh590own7jU9L8t3Q7NCtoTclexs z3How8+OOxlN6GJl4jTo2NHcGAOkO316F2UgN7l274IKM/pPgMqwHoHv/65R6LSEvbCJiu X/+M+d9LqZzx0lC+KYQQyMn7D2ujIK2UmwfmkkZF22W5eyaneXrDS0ft9zjMsAoXeLSb6Z lXsnr80MbBa9cCPJkUsaEa9oIU7T+uvddBVhWFUr16FCCgWaV0EnLaOtenchrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086750; 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=NTYWCMu5m12RMkQrHbgbo9yPOJdOd5+w95Y8/eWz+90=; b=ASIrVPjcc9Vjp8FpVQ4WoYoqCj5OL6Wp0Un0vhQbttS3Q1ssa2RCe4/TxwA54x34d63ElO Xyeao6HtaMshwVjOY8UqLrc0mf3bL2BLa6O5ZnRO9iyQNSJ9qOxwXTa7xQc74UTF14ZGKA pOFy3XgGZJMvQzoXWr8I3WM6JVIAN2NuxVDK1mqauhJ3dyThmjPtWh9ilcBUR25ULgnZC2 rhdwnIRhqUS7Gx2N6zod9ZRByNGDZA0LlcNhrdqr+gC1I9qAVLoH6+0J7j5UZexUTKCrzq wVPasb1z648Gx3c5uO11Q79gMBikzmb8XvepNwlLQnaGdPwSdgY3iv7RVBbOOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750086750; a=rsa-sha256; cv=none; b=eQFlloLXAAFgY/tMqRpTBsZfhO2kFcGRcKYMTtXhoV+xPRtQJPcHbNJkrnBTJkikWv3TXX Y7vM7999x2ZeKwAEJg2kzZMrJFlP2NiZ+dc3xC0ZsscFYHWDgS6Vrobr5P53J1sGvlygVt qApCu3KCDcUciuNxXK1CnLD/nBxBZPvvIFdjvalWHk1hBlR4IiVI47TSn2y9eOc9/vBnow BOBmadvp23XDZQUzBX1PCj4lqt7GYsbZVgSRrZQHVfms6De2gk3rf4eppZFyrWhW8uIxbE yNhX7euXvM9s1vKUOeknaJL9L1zLcrV7Sj7OcbI5G1s2x8doKz8NwdJ74MEOxw== 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 4bLYQQ3WkNz12cR; Mon, 16 Jun 2025 15:12:30 +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 55GFCUtF057578; Mon, 16 Jun 2025 15:12:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GFCU3t057575; Mon, 16 Jun 2025 15:12:30 GMT (envelope-from git) Date: Mon, 16 Jun 2025 15:12:30 GMT Message-Id: <202506161512.55GFCU3t057575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3d8f65fbf8f5 - main - vm/vm_mmap.c: use EXTERROR() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d8f65fbf8f5922d369f1509863f9c9a1adca26f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8f65fbf8f5922d369f1509863f9c9a1adca26f commit 3d8f65fbf8f5922d369f1509863f9c9a1adca26f Author: Konstantin Belousov AuthorDate: 2025-06-14 13:54:19 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 15:12:05 +0000 vm/vm_mmap.c: use EXTERROR() Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50845 --- sys/vm/vm_mmap.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 9ba2ec426d7f..46fd212df299 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -192,12 +192,12 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) check_fp_fn = mrp->mr_check_fp_fn; if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) { - return (SET_ERROR0(EINVAL, "unknown PROT bits")); + return (EXTERROR(EINVAL, "unknown PROT bits")); } max_prot = PROT_MAX_EXTRACT(prot); prot = PROT_EXTRACT(prot); if (max_prot != 0 && (max_prot & prot) != prot) { - return (SET_ERROR0(ENOTSUP, "prot is not subset of max_prot")); + return (EXTERROR(ENOTSUP, "prot is not subset of max_prot")); } p = td->td_proc; @@ -230,7 +230,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (!SV_CURPROC_FLAG(SV_AOUT)) { if ((len == 0 && p->p_osrel >= P_OSREL_MAP_ANON) || ((flags & MAP_ANON) != 0 && (fd != -1 || pos != 0))) { - return (SET_ERROR2(EINVAL, + return (EXTERROR(EINVAL, "offset not zero/fd not -1 for MAP_ANON", fd, pos)); } @@ -242,7 +242,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (flags & MAP_STACK) { if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != (PROT_READ | PROT_WRITE))) { - return (SET_ERROR1(EINVAL, "MAP_STACK with prot < rw", + return (EXTERROR(EINVAL, "MAP_STACK with prot < rw", prot)); } flags |= MAP_ANON; @@ -252,23 +252,23 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | MAP_PREFAULT_READ | MAP_GUARD | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0) { - return (SET_ERROR0(EINVAL, "reserved flag set")); + return (EXTERROR(EINVAL, "reserved flag set")); } if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) { - return (SET_ERROR0(EINVAL, "EXCL without FIXED")); + return (EXTERROR(EINVAL, "EXCL without FIXED")); } if ((flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) { - return (SET_ERROR0(EINVAL, "both SHARED and PRIVATE set")); + return (EXTERROR(EINVAL, "both SHARED and PRIVATE set")); } if (prot != PROT_NONE && (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) { - return (SET_ERROR1(EINVAL, "invalid prot", prot)); + return (EXTERROR(EINVAL, "invalid prot", prot)); } if ((flags & MAP_GUARD) != 0 && (prot != PROT_NONE || fd != -1 || pos != 0 || (flags & ~(MAP_FIXED | MAP_GUARD | MAP_EXCL | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0)) { - return (SET_ERROR0(EINVAL, "GUARD with wrong parameters")); + return (EXTERROR(EINVAL, "GUARD with wrong parameters")); } /* @@ -290,7 +290,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (align != 0 && align != MAP_ALIGNED_SUPER && (align >> MAP_ALIGNMENT_SHIFT >= sizeof(void *) * NBBY || align >> MAP_ALIGNMENT_SHIFT < PAGE_SHIFT)) { - return (SET_ERROR1(EINVAL, "bad alignment", align)); + return (EXTERROR(EINVAL, "bad alignment", align)); } /* @@ -305,17 +305,17 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) */ addr -= pageoff; if ((addr & PAGE_MASK) != 0) { - return (SET_ERROR1(EINVAL, "fixed mapping not aligned", + return (EXTERROR(EINVAL, "fixed mapping not aligned", addr)); } /* Address range must be all in user VM space. */ if (!vm_map_range_valid(&vms->vm_map, addr, addr + size)) { - SET_ERROR0(EINVAL, "mapping outside vm_map"); + EXTERROR(EINVAL, "mapping outside vm_map"); return (EINVAL); } if (flags & MAP_32BIT && addr + size > MAP_32BIT_MAX_ADDR) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "fixed 32bit mapping does not fit into 4G")); } } else if (flags & MAP_32BIT) { @@ -384,7 +384,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) goto done; if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 && p->p_osrel >= P_OSREL_MAP_FSTRICT) { - SET_ERROR0(EINVAL, "neither SHARED nor PRIVATE req"); + EXTERROR(EINVAL, "neither SHARED nor PRIVATE req"); error = EINVAL; goto done; } @@ -1314,7 +1314,7 @@ vm_mmap_vnode(struct thread *td, vm_size_t objsize, vm_pager_update_writecount(obj, 0, objsize); } } else { - error = SET_ERROR0(EINVAL, "non-reg file"); + error = EXTERROR(EINVAL, "non-reg file"); goto done; } if ((error = VOP_GETATTR(vp, &va, cred))) @@ -1405,7 +1405,7 @@ vm_mmap_cdev(struct thread *td, vm_size_t objsize, vm_prot_t prot, (prot & VM_PROT_WRITE) != 0) return (EACCES); if ((flags & (MAP_PRIVATE | MAP_COPY)) != 0) { - return (SET_ERROR0(EINVAL, "cdev mapping must be shared")); + return (EXTERROR(EINVAL, "cdev mapping must be shared")); } /* @@ -1432,7 +1432,7 @@ vm_mmap_cdev(struct thread *td, vm_size_t objsize, vm_prot_t prot, obj = vm_pager_allocate(OBJT_DEVICE, cdev, objsize, prot, *foff, td->td_ucred); if (obj == NULL) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "cdev driver does not support mmap")); } *objp = obj; @@ -1452,7 +1452,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, boolean_t writecounted; if (size == 0) { - return (SET_ERROR0(EINVAL, "zero-sized req")); + return (EXTERROR(EINVAL, "zero-sized req")); } size = round_page(size); @@ -1479,7 +1479,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, handle, &foff, &object, &writecounted); break; default: - error = SET_ERROR1(EINVAL, "unsupported backing obj type", + error = EXTERROR(EINVAL, "unsupported backing obj type", handle_type); break; } @@ -1562,7 +1562,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, * exec). */ if ((foff & PAGE_MASK) != 0) { - return (SET_ERROR1(EINVAL, "offset not page-aligned", foff)); + return (EXTERROR(EINVAL, "offset not page-aligned", foff)); } if ((flags & MAP_FIXED) == 0) { @@ -1570,7 +1570,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, *addr = round_page(*addr); } else { if (*addr != trunc_page(*addr)) { - return (SET_ERROR1(EINVAL, + return (EXTERROR(EINVAL, "non-fixed mapping address not aligned", *addr)); } fitit = false; @@ -1578,11 +1578,11 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, if (flags & MAP_ANON) { if (object != NULL) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "anon mapping backed by an object")); } if (foff != 0) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "anon mapping with non-zero offset")); } docow = 0; @@ -1604,7 +1604,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, docow |= MAP_WRITECOUNT; if (flags & MAP_STACK) { if (object != NULL) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "stack mapping backed by an object")); } docow |= MAP_STACK_AREA; @@ -1686,6 +1686,6 @@ vm_mmap_to_errno(int rv) } if ((curthread->td_pflags2 & (TDP2_UEXTERR | TDP2_EXTERR)) == TDP2_UEXTERR) - SET_ERROR1(error, "mach error", rv); + EXTERROR(error, "mach error", rv); return (error); }