From nobody Mon Jan 17 21:13:11 2022 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 EA0C51977111; Mon, 17 Jan 2022 21:13:14 +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 4Jd4Pj0ynSz3G1W; Mon, 17 Jan 2022 21:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642453993; 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=fvKFdoHjRrJm8ehIiq3PlFU3zMsBOkzC7QIGDVkvRN8=; b=n+QM0DFY0RUA8zVFFT6/c3rfPyPCpNe2cyWCXfkYTQyPQ13lPDXMhhISF2ZtPyhdxb+L4i 0EHa/4LFiDZ5q6KXv4fZrMQi+K1xnyPER9QGRik+7VzO5Ibxr9tSst9BDILRHG4bck33L8 e8jj5VFGeFoKEWgbCpIyBL0/KdH1mIXyf9Jku9rqnYUHIbjJTrPNVb/ZKYDEXVIGqJa1e+ dhHJsqJGxgQZfbIq9KwU0TRWfh42Dz+9JXDkJLwR4WO02HxKwQ3W1dH8VkNrUu7uB8yTby bGlRbMVcVJODOThwX6KUSbN4LwsSq+ZPk6jBAUf/K5bpR+uv40mgyAWNGmdihg== 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 086C814F75; Mon, 17 Jan 2022 21:13:12 +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 20HLDBfh007034; Mon, 17 Jan 2022 21:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HLDBqC007033; Mon, 17 Jan 2022 21:13:11 GMT (envelope-from git) Date: Mon, 17 Jan 2022 21:13:11 GMT Message-Id: <202201172113.20HLDBqC007033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6393594b0362 - main - copyin tests: Use the KERN_PROC_VM_LAYOUT sysctl to fetch layout info 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6393594b0362432de937e432908ea6dae79ae0a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642453993; 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=fvKFdoHjRrJm8ehIiq3PlFU3zMsBOkzC7QIGDVkvRN8=; b=tkc2mG17P7Tl1aax5p1S3RC7nMQYvzHNu5B9NEn3F25fdvZAaaEocBQKdqiMwSoy5T82rh G8lthPSAxeh5OIKubWQn4O5BZMj1PF/vUrQsDz/hf9GJyFLMcQDIBkdKyk2vn6Gcb4WCHY uJDDWymlLcnO6GvuEqfAnc37nUtUJQSGRjazvBmgtjt2fPBj6O7An6BfvdYe6CTqqo8zNN /G7DsjT7SM02xn+Kk6f+yjC8/j2eJjHLBPe4vnWLnl6NgMPBD6dLyBRCFbDJ7oMaO9D7Nw jeBPUzx4KbLwGw7IHOTZ2MGHE1k3Wr54mRJSP4Tsuq9WwgSxsvKDlhhMC0jKEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642453993; a=rsa-sha256; cv=none; b=GDkv4uYd7ZlVE4tk8Qx3uURmb6AkR5PuXJwZiS7P9CSUEk2cCJMbiWknz5EG3ET7CK26Lm in2V9LUOYPlTKUo2XXqTt16UCppck2XEYpwK2egFCxvNgbd4FEUT1NDPitTluHpU/bFMkd 3ySvdVTPLu+2RVXH0DMV5+1LHxO5x4CrmUlZ2FLrTPT+p2ka6/29mG0jl89vDKy53cT45g JJTWBYXdunSaPtKNsEt7TCybvr9Hk7h3l1HMPpYFIrhSRcSrWSxreXzlSKWNuHd9kLGEqI TtfVgmRlMi/Ibbpr6l/N1Nznf7b6tS3vhFeJGL2M8WDLuks6mndN/ePlj11aDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6393594b0362432de937e432908ea6dae79ae0a9 commit 6393594b0362432de937e432908ea6dae79ae0a9 Author: Mark Johnston AuthorDate: 2022-01-17 16:43:43 +0000 Commit: Mark Johnston CommitDate: 2022-01-17 21:12:43 +0000 copyin tests: Use the KERN_PROC_VM_LAYOUT sysctl to fetch layout info ... rather than using the KERN_PROC_PS_STRINGS value to derive the top of the user address space. Reviewed by: kib MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33708 --- tests/sys/kern/kern_copyin.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/sys/kern/kern_copyin.c b/tests/sys/kern/kern_copyin.c index eb1fea315b5a..de12753c8dcd 100644 --- a/tests/sys/kern/kern_copyin.c +++ b/tests/sys/kern/kern_copyin.c @@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include #include @@ -74,27 +76,20 @@ copyin_checker2(uintptr_t uaddr) static uintptr_t get_maxuser_address(void) { + struct kinfo_vm_layout kvm; size_t len; - uintptr_t psstrings; int error, mib[4]; mib[0] = CTL_KERN; mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PS_STRINGS; + mib[2] = KERN_PROC_VM_LAYOUT; mib[3] = getpid(); - len = sizeof(psstrings); - error = sysctl(mib, nitems(mib), &psstrings, &len, NULL, 0); + len = sizeof(kvm); + error = sysctl(mib, nitems(mib), &kvm, &len, NULL, 0); if (error != 0) return (0); - if (psstrings == PS_STRINGS_LA57) - return (VM_MAXUSER_ADDRESS_LA57); - if (psstrings == PS_STRINGS_LA48) - return (VM_MAXUSER_ADDRESS_LA48); - /* AMD LA48 with clipped UVA */ - if (psstrings == PS_STRINGS_LA48 - PAGE_SIZE) - return (VM_MAXUSER_ADDRESS_LA48 - PAGE_SIZE); - return (0); + return (kvm.kvm_max_user_addr); } #endif