From owner-svn-src-all@freebsd.org Fri Sep 4 12:52:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8662A3C13A4; Fri, 4 Sep 2020 12:52:17 +0000 (UTC) (envelope-from kib@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjcyT32MNz412H; Fri, 4 Sep 2020 12:52:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BA2BD00C; Fri, 4 Sep 2020 12:52:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084CqHqd097564; Fri, 4 Sep 2020 12:52:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084CqHmO097563; Fri, 4 Sep 2020 12:52:17 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009041252.084CqHmO097563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 4 Sep 2020 12:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365327 - head/tests/sys/kern X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/tests/sys/kern X-SVN-Commit-Revision: 365327 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 12:52:17 -0000 Author: kib Date: Fri Sep 4 12:52:16 2020 New Revision: 365327 URL: https://svnweb.freebsd.org/changeset/base/365327 Log: Fix kern_copyin test. Main part is that kern_copyin on amd64 after LA57 should query the top of UVA for correct operations. In fact it should started doing that after the workaround for AMD bug with IRET in the last user page was fixed by reducing UVA by a page. Also since we started calculating top of UVA, fix MIPS according to the comment. Reported by: lwhsu PR: 248933 Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D26312 Modified: head/tests/sys/kern/kern_copyin.c Modified: head/tests/sys/kern/kern_copyin.c ============================================================================== --- head/tests/sys/kern/kern_copyin.c Fri Sep 4 11:22:18 2020 (r365326) +++ head/tests/sys/kern/kern_copyin.c Fri Sep 4 12:52:16 2020 (r365327) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015 The FreeBSD Foundation + * Copyright (c) 2015, 2020 The FreeBSD Foundation * All rights reserved. * * This software was developed by Konstantin Belousov @@ -31,6 +31,8 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #include #include #include @@ -52,21 +54,54 @@ copyin_checker(uintptr_t uaddr, size_t len) return (ret == -1 ? errno : 0); } +#ifdef __amd64__ +static uintptr_t +get_maxuser_address(void) +{ + 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[3] = getpid(); + error = sysctl(mib, nitems(mib), &psstrings, &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); +} +#endif + #define FMAX ULONG_MAX ATF_TC_WITHOUT_HEAD(kern_copyin); ATF_TC_BODY(kern_copyin, tc) { char template[] = "copyin.XXXXXX"; + uintptr_t maxuser; -#ifdef __mips__ +#if defined(__mips__) /* * MIPS has different VM layout: the UVA map on mips ends the * highest mapped entry at the VM_MAXUSER_ADDRESS - PAGE_SIZE, * while all other arches map either stack or shared page up * to the VM_MAXUSER_ADDRESS. */ - atf_tc_skip("Platform is not supported."); + maxuser = VM_MAXUSER_ADDRESS - PAGE_SIZE; +#elif defined(__amd64__) + maxuser = get_maxuser_address(); + ATF_REQUIRE(maxuser != 0); +#else + maxuser = VM_MAXUSER_ADDRESS; #endif scratch_file = mkstemp(template); @@ -74,15 +109,15 @@ ATF_TC_BODY(kern_copyin, tc) unlink(template); ATF_CHECK(copyin_checker(0, 0) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 9) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 10) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 11) == EFAULT); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 1, 1) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 0) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 1) == EFAULT); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 2) == EFAULT); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS + 1, 0) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS + 1, 2) == EFAULT); + ATF_CHECK(copyin_checker(maxuser - 10, 9) == 0); + ATF_CHECK(copyin_checker(maxuser - 10, 10) == 0); + ATF_CHECK(copyin_checker(maxuser - 10, 11) == EFAULT); + ATF_CHECK(copyin_checker(maxuser - 1, 1) == 0); + ATF_CHECK(copyin_checker(maxuser, 0) == 0); + ATF_CHECK(copyin_checker(maxuser, 1) == EFAULT); + ATF_CHECK(copyin_checker(maxuser, 2) == EFAULT); + ATF_CHECK(copyin_checker(maxuser + 1, 0) == 0); + ATF_CHECK(copyin_checker(maxuser + 1, 2) == EFAULT); ATF_CHECK(copyin_checker(FMAX - 10, 9) == EFAULT); ATF_CHECK(copyin_checker(FMAX - 10, 10) == EFAULT); ATF_CHECK(copyin_checker(FMAX - 10, 11) == EFAULT);