From nobody Sat Mar 26 01:11:47 2022 X-Original-To: dev-commits-src-main@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 38ED81A3D34F; Sat, 26 Mar 2022 01:11:48 +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 4KQLX35vRMz3tvC; Sat, 26 Mar 2022 01:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648257108; 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=Un8r21ikYadY30+uiExgAl7JmxtLSuR5cpc5vihDEtI=; b=B9T4xwNPeXbo/eggq7aU6ctG/dcaRshIjpruTEnp7jaP3ocpjodyxU7QD2UcDfxrhDlUA9 zLXUEiSveQ7Q0Qcz+CwFZmHKEl9Kpwt2Edmjap1JZRzyynOBn5wDlpCcH/zuQJDCpeRiDU V9SysN0tvmaRPPNRgWy+cCs3+RKQInrzpjMj3J9STGR47HfvW+nxKe+NLTN8L6Ul9dHR4O 01+NhXLIYMrqLvSjb85PQnqssWAm5f2iLQFtRYEUEmKNPj0FX09QlH7OIZXkdKBk/Lhh5x T/fjx4BB8tfNqsWlYoMEwWdXOrweXI/xlMAOgmHRam1KYIIA9Vc74XoEdg9ARw== 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 8A0FA175BA; Sat, 26 Mar 2022 01:11:47 +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 22Q1BlAq063750; Sat, 26 Mar 2022 01:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22Q1BlR4063749; Sat, 26 Mar 2022 01:11:47 GMT (envelope-from git) Date: Sat, 26 Mar 2022 01:11:47 GMT Message-Id: <202203260111.22Q1BlR4063749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 490b09f24006 - main - uma_zalloc_domain: call uma_zalloc_debug in multi-domain path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 490b09f240065d7ef61f68ec1bf134d729cfad28 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648257108; 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=Un8r21ikYadY30+uiExgAl7JmxtLSuR5cpc5vihDEtI=; b=SshZib9+KCCI9vNAgJJoqK8O+Nu1zd4bGTH3dgv9Bj5C7MOUUoSYoP6txlOnDsBctN78uO qghlOD+jQNdwshGxXn6QPY/ZYlrlYU0tK+JkqmUVk5F4r2BMQXeQ89MQ18BWzN1eoPM4s3 XlTWNWsz2p4Zb2P44kci+nqwwEG8BVKgeB1+MMd6CpuxBcC32HqTXUQyGWOY/FFS64F0Bh f5ymuzDWbOxc+yHstWe5Rm3nlgKMSKtYuu2p2yYZdwE/QyCPDFuLk+dwLDm5QceR0cNt/B wKy1gCTHpZxMIXDtjJ5dhLO3AIC0iuHrzwcA9S5tH3AIYHsrPDTzW7t+KZ5s4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648257108; a=rsa-sha256; cv=none; b=ouJBsEvPHR8NtVB+na0G7bkhxs1XVFm4dOuVPMgvTEvLYlSSb4I9sGM0/4pK7A14Rx86TP qFrD0qAuXQOX//ObZdRp5sTcvw54Q+SnLuQxy/5NZtbonmr3y7BZEWh07gT1At0ZTXTWOA zdvRE+sbSUaSKyKQjmprSDeU3P+4e53Fwv3X/t6tS+MeS8IauiqRS1BWPh9rbqFDtts5aK owC4OOyvSDLcVlnVb3bl3TwQSzp0QqUXRrqjtSeJiUO83U/0SGFvq00xnkJjg1IPkK89dt TfQftgllkIm9ZwEqSFgOiLCR+4e5XkJ0XtXQRLzlrrPplaa0lPOsaalAIJpWqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=490b09f240065d7ef61f68ec1bf134d729cfad28 commit 490b09f240065d7ef61f68ec1bf134d729cfad28 Author: Eric van Gyzen AuthorDate: 2022-03-07 17:12:15 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-26 01:10:38 +0000 uma_zalloc_domain: call uma_zalloc_debug in multi-domain path It was only called in the non-NUMA and single-domain paths. Some of its assertions were duplicated in uma_zalloc_domain, but some things were missed, especially memguard. Reviewed by: markj, rstone MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D34472 --- sys/vm/uma_core.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 9fd2fd5e5d03..77182e460a54 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -3816,12 +3816,6 @@ uma_zalloc_domain(uma_zone_t zone, void *udata, int domain, int flags) CTR4(KTR_UMA, "uma_zalloc_domain zone %s(%p) domain %d flags %d", zone->uz_name, zone, domain, flags); - if (flags & M_WAITOK) { - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "uma_zalloc_domain: zone \"%s\"", zone->uz_name); - } - KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(), - ("uma_zalloc_domain: called with spinlock or critical section held")); KASSERT((zone->uz_flags & UMA_ZONE_SMR) == 0, ("uma_zalloc_domain: called with SMR zone.")); #ifdef NUMA @@ -3831,6 +3825,11 @@ uma_zalloc_domain(uma_zone_t zone, void *udata, int domain, int flags) if (vm_ndomains == 1) return (uma_zalloc_arg(zone, udata, flags)); +#ifdef UMA_ZALLOC_DEBUG + if (uma_zalloc_debug(zone, &item, udata, flags) == EJUSTRETURN) + return (item); +#endif + /* * Try to allocate from the bucket cache before falling back to the keg. * We could try harder and attempt to allocate from per-CPU caches or