From owner-svn-src-head@freebsd.org Tue Dec 15 19:38:17 2020 Return-Path: Delivered-To: svn-src-head@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 58B3D4BFF71; Tue, 15 Dec 2020 19:38:17 +0000 (UTC) (envelope-from bdrewery@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 4CwT7s22Dpz4mNY; Tue, 15 Dec 2020 19:38:17 +0000 (UTC) (envelope-from bdrewery@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 389AE196A6; Tue, 15 Dec 2020 19:38:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BFJcHKR064672; Tue, 15 Dec 2020 19:38:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BFJcG5X064671; Tue, 15 Dec 2020 19:38:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <202012151938.0BFJcG5X064671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 15 Dec 2020 19:38:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368673 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 368673 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2020 19:38:17 -0000 Author: bdrewery Date: Tue Dec 15 19:38:16 2020 New Revision: 368673 URL: https://svnweb.freebsd.org/changeset/base/368673 Log: Revert r368523 which fixed contig allocs waiting forever. This needs to account for empty NUMA domains or domains which do not satisfy the requested range. Discussed with: markj Modified: head/sys/vm/vm_kern.c Modified: head/sys/vm/vm_kern.c ============================================================================== --- head/sys/vm/vm_kern.c Tue Dec 15 18:51:11 2020 (r368672) +++ head/sys/vm/vm_kern.c Tue Dec 15 19:38:16 2020 (r368673) @@ -264,15 +264,9 @@ kmem_alloc_attr_domainset(struct domainset *ds, vm_siz { struct vm_domainset_iter di; vm_offset_t addr; - int domain, iflags; + int domain; - /* - * Do not allow the domainset iterator to override wait flags. The - * contiguous memory allocator defines special semantics for M_WAITOK - * that do not match the iterator's implementation. - */ - iflags = (flags & ~M_WAITOK) | M_NOWAIT; - vm_domainset_iter_policy_init(&di, ds, &domain, &iflags); + vm_domainset_iter_policy_init(&di, ds, &domain, &flags); do { addr = kmem_alloc_attr_domain(domain, size, flags, low, high, memattr); @@ -352,15 +346,9 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_s { struct vm_domainset_iter di; vm_offset_t addr; - int domain, iflags; + int domain; - /* - * Do not allow the domainset iterator to override wait flags. The - * contiguous memory allocator defines special semantics for M_WAITOK - * that do not match the iterator's implementation. - */ - iflags = (flags & ~M_WAITOK) | M_NOWAIT; - vm_domainset_iter_policy_init(&di, ds, &domain, &iflags); + vm_domainset_iter_policy_init(&di, ds, &domain, &flags); do { addr = kmem_alloc_contig_domain(domain, size, flags, low, high, alignment, boundary, memattr);