From nobody Sat Mar 26 01:11:42 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 628181A3D2C1; Sat, 26 Mar 2022 01:11:43 +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 4KQLWz1kXMz3v4t; Sat, 26 Mar 2022 01:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648257103; 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=mQUzAMXt3VKxMujvNjW44UM7g1nvjP7iVmzKRLmHD7Y=; b=Ec9pcDwEVyfZuGWlNZdXuu41i2dgZNqfTZnv3T2bsKxyOWSAu3UKdewp29/gk/P7lPSDlT 16gzB5tfINwBzHWujtnNjFL+Qn5CIMLp5k29DoKe8BQNNE2wklrVXFBEvTa7yCvF+RWazX NUq5/AyOp7dNPFI5IDaUEUpBe8ZYXsZR3d/rIxzr+tnIZE/S2bNQbPL12rU5uTF0IEbuWJ VvjmX0UPt1KaFaqJ0QTa35Ho4ikitjPHq3STF87Ve4xzcrLzUIlYmPge3VORmR7O22Afnt ERko4HFHcWefeoO8cTlaFKYHoUQ5XatkKkIje2Pgg4pmL86Glb1EUr+BYUgAmg== 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 09AA2176E9; Sat, 26 Mar 2022 01:11:43 +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 22Q1Bghk063654; Sat, 26 Mar 2022 01:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22Q1BgmE063653; Sat, 26 Mar 2022 01:11:42 GMT (envelope-from git) Date: Sat, 26 Mar 2022 01:11:42 GMT Message-Id: <202203260111.22Q1BgmE063653@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: 863070bbf602 - main - ksiginfo_alloc: pass M_WAITOK or M_NOWAIT to uma_zalloc 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: 863070bbf602e2d1046c36e9185a59c4a2f3928c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648257103; 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=mQUzAMXt3VKxMujvNjW44UM7g1nvjP7iVmzKRLmHD7Y=; b=HnjDl/8MDe4oP28w9mpEsFlhaeIPW++zj1z78g+Zb3roLsnJ3dlQkPf0LZDVGKSHaftuEg pNMrJq0bnVsVFp61tg9Kvo5xYSq8WJFV0eDwgexKyjM6t7dotP8/rkY1WR5OzlvyqCx0dg BydNuxNS7xiduIcVyWiEVGwWsdubN6LdH0AGtcEY66aL1xZ2XWsugIkRKGIffyMLbPGAiB UNNm0+eqExJTCscUbTGzaM7kxYyNaU1VE+kz48iANSpX1G3jMMYsYfMzrKSTIBgzHAvuAS gHKAM+Ku+QiLTg1VgKhGIOd9EV7RhHSqcGppZgzY6ZLVSdk1k+uiWmSWnDsvJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648257103; a=rsa-sha256; cv=none; b=FWLY7JVU3vULO5+5Qo3WLgCFDfWHaPqty1Hucb/GeF/4cKb4K0JHDSwVos3OFVcRHo+xLj mm8PAU17qVsu29v2G+yt5Fxbzu91Gu0CFyUm/XizvdL5mxnmUA2/dlyC4oB5JBLq7Ry1Ok V+QBgdXiZhTsQuQCXH+7h8FDkbIqi7v3ts0ma3UWRApCuewtJBo3MtXZw4pO1HlCXYK/Cq AJTfpWV3QmwTC46W6UcPGqJUFHVHZ4CjG/jphqKMkJPACzUvZUMu7JKyEzhOflh4RTgl72 O1rEldur50bGITVqYpcgWwKzzhTo/mX7CVxq25y1WTGXv4M2OGXrtyss67xqrg== 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=863070bbf602e2d1046c36e9185a59c4a2f3928c commit 863070bbf602e2d1046c36e9185a59c4a2f3928c Author: Eric van Gyzen AuthorDate: 2022-03-04 21:01:06 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-26 01:10:37 +0000 ksiginfo_alloc: pass M_WAITOK or M_NOWAIT to uma_zalloc It expects exactly one of those flags. A future commit will assert this. Reviewed by: rstone MFC after: 1 month Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D34451 --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index b1a70bda3e55..1b6464a4a0cc 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -292,9 +292,7 @@ ksiginfo_alloc(int wait) { int flags; - flags = M_ZERO; - if (! wait) - flags |= M_NOWAIT; + flags = M_ZERO | (wait ? M_WAITOK : M_NOWAIT); if (ksiginfo_zone != NULL) return ((ksiginfo_t *)uma_zalloc(ksiginfo_zone, flags)); return (NULL);