From owner-svn-src-all@freebsd.org Mon Feb 17 01:06:19 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 6E8A6248143; Mon, 17 Feb 2020 01:06:19 +0000 (UTC) (envelope-from jeff@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) server-signature RSA-PSS (4096 bits) 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 48LQmC0vP6z4NBg; Mon, 17 Feb 2020 01:06:19 +0000 (UTC) (envelope-from jeff@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 142A12EBBC; Mon, 17 Feb 2020 01:06:19 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01H16IC6064406; Mon, 17 Feb 2020 01:06:18 GMT (envelope-from jeff@FreeBSD.org) Received: (from jeff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01H16IMK064405; Mon, 17 Feb 2020 01:06:18 GMT (envelope-from jeff@FreeBSD.org) Message-Id: <202002170106.01H16IMK064405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jeff set sender to jeff@FreeBSD.org using -f From: Jeff Roberson Date: Mon, 17 Feb 2020 01:06:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358010 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: jeff X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 358010 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.29 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: Mon, 17 Feb 2020 01:06:19 -0000 Author: jeff Date: Mon Feb 17 01:06:18 2020 New Revision: 358010 URL: https://svnweb.freebsd.org/changeset/base/358010 Log: UMA has become more particular about zone types. Use the right allocator calls in uma_zwait(). Modified: head/sys/vm/uma_core.c Modified: head/sys/vm/uma_core.c ============================================================================== --- head/sys/vm/uma_core.c Sun Feb 16 23:10:59 2020 (r358009) +++ head/sys/vm/uma_core.c Mon Feb 17 01:06:18 2020 (r358010) @@ -2944,10 +2944,13 @@ uma_zdestroy(uma_zone_t zone) void uma_zwait(uma_zone_t zone) { - void *item; - item = uma_zalloc_arg(zone, NULL, M_WAITOK); - uma_zfree(zone, item); + if ((zone->uz_flags & UMA_ZONE_SMR) != 0) + uma_zfree_smr(zone, uma_zalloc_smr(zone, M_WAITOK)); + else if ((zone->uz_flags & UMA_ZONE_PCPU) != 0) + uma_zfree_pcpu(zone, uma_zalloc_pcpu(zone, M_WAITOK)); + else + uma_zfree(zone, uma_zalloc(zone, M_WAITOK)); } void *