From nobody Sat Oct 01 16:13:25 2022 X-Original-To: dev-commits-src-branches@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 4Mfsb93dvDz4cw0D; Sat, 1 Oct 2022 16:13:25 +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 4Mfsb933tSz3wrV; Sat, 1 Oct 2022 16:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664640805; 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=GFOFvFk4xu43HRm6Y6/bRKzitbrjPyG3JJXruDkHVx0=; b=aKb7mdZTJ4omdLb7Bz/Xbj9GaLBIlQhyYtmh29BmFIQz87MLCymR/XtTeBe8K7PXGQwbz7 VJkMRhMeuZflsbN0NPSCNUy33AIKau8/rcqGSNACR8S6UkaQxfra703pal/C8eL21sP5RT PvnCpGWg7C3ctpvhEiAZxlNLV2NSOYPL/7AqamVcMArj3hlEeeYXNbNgD7DDWhlmI8RInK YuYu7zNsT/gO970Ha3Wa7ssKZ138DZSII5St1rt3KzSDpmhoB5YAy7F34hMufFICbdTKMe G5O+zZd9LQo9syOprNrral3t/L1FphBQYCJjUnrxgZE+W9JdX7Hlb8Ha7EcalQ== 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 4Mfsb91h0bzb0d; Sat, 1 Oct 2022 16:13:25 +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 291GDPYi048930; Sat, 1 Oct 2022 16:13:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291GDP09048929; Sat, 1 Oct 2022 16:13:25 GMT (envelope-from git) Date: Sat, 1 Oct 2022 16:13:25 GMT Message-Id: <202210011613.291GDP09048929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 89669589ce9f - stable/13 - amd64: Ignore 1GB mappings in pmap_advise() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 89669589ce9fed473d3b95d385ebe45abb1dc878 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664640805; 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=GFOFvFk4xu43HRm6Y6/bRKzitbrjPyG3JJXruDkHVx0=; b=hhaUK3VqgFgv870C77zl6tCipffSWPgcvAesNIx3PKxRkROPqKXVmiGNsPev6f733x2S6J y9LMVLNeRruWUEvGyRKa0LIWYDY/e5eVI+5ZruRY66Fy0rbmKTcIp9kvuYSSONBnEnQq2y l8TpHCbP9HRA79jCA1AYpvEWhveFDQFXoRsrHHn3mQumeb1xU4AGdfGKA3lVNdlSPST/53 Ts1bgZ/1mVY0eiuOgI9Sp0c+jvzlhe2LZmY3dRtrZ8QZPbkWlQMyL+2ACX8KsqeJZKE5N7 h6NPwLhDO1Rp6athWB7OSpZQ8epJ1mnQrixQR3UI71ibjdaIJ1I79U1TGaQjSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664640805; a=rsa-sha256; cv=none; b=EXrYpqI6zXEZ4ktyTrShQkaFA9Ys/HZFZPADdqGVQCGuFFh00OUt9mhCTLsFoZhO52PTQL K04CFviM6mKqhlJmmCbqg1E1jIGVjtwV3R96NlHx4vS8F/VaTCuvtnkBRpsQE5FnbL8uMN VTOQx6XFnwupKVln5leprIENCPVYUrJ48jZ76sfzF/TzOUBN3rJkUr98PC94gvzzkqsbNd erzbc/4Lpb+8WaQ3whclIrdnXUhEeyToUmfD2a4Q2FTysMTUKPizXL3+FbFmfcpBnhoVYy oZN5xSI8wfCEkjx9Kwo+Sm+tXgvt1Qig85oy5aQd8b3guaTPnxrIwXMRRdp8OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=89669589ce9fed473d3b95d385ebe45abb1dc878 commit 89669589ce9fed473d3b95d385ebe45abb1dc878 Author: Mark Johnston AuthorDate: 2022-09-24 13:20:48 +0000 Commit: Mark Johnston CommitDate: 2022-10-01 15:34:19 +0000 amd64: Ignore 1GB mappings in pmap_advise() This assertion can be triggered by usermode since vm_map_madvise() doesn't force advice to be applied to an entire largepage mapping. I can't see any reason not to permit it, however, since MADV_DONTNEED and _FREE are advisory and we can simply do nothing when a 1GB mapping is encountered. Reviewed by: alc, kib (cherry picked from commit 4551cbbe9906812556501c541fef0d88b0398b27) --- sys/amd64/amd64/pmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index aa3774524023..6348f4c7acf0 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -8867,13 +8867,8 @@ pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice) pdpe = pmap_pml4e_to_pdpe(pml4e, sva); if ((*pdpe & PG_V) == 0) continue; - if ((*pdpe & PG_PS) != 0) { - KASSERT(va_next <= eva, - ("partial update of non-transparent 1G mapping " - "pdpe %#lx sva %#lx eva %#lx va_next %#lx", - *pdpe, sva, eva, va_next)); + if ((*pdpe & PG_PS) != 0) continue; - } va_next = (sva + NBPDR) & ~PDRMASK; if (va_next < sva)