From nobody Sat Aug 20 17:34:56 2022 X-Original-To: dev-commits-src-all@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 4M95Nd0Jq1z4Zpd2; Sat, 20 Aug 2022 17:34:57 +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 4M95Nc5MtLz3XKN; Sat, 20 Aug 2022 17:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661016896; 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=5+L6LZaOkNRk06L+0FvGjMTSUF2qpj8AQcWUdioiR/E=; b=IpCNAVCwcND/lelnGliyfz7TNm4hVAumo+Ic2FOyB4Wu5j8tq3ZzxxfNi7u1ta/SQu6mvG emeQkGXTP+tBUp3BC5sfA5H4z/Xl5P7OpXTQ8T8t8bpsANv7c/M8s8MMd7Qew30zla6kl+ T3fF0LfWvrEh5UisQ0Q8FtppTIWx5U/W15/EAAY3U8R/xBd5DCDvKVfLURDCQCNyJmmebw aKFAedzvohAgHmeIu1h2i6ZLap3DEoCGJZX65eGb7rQc0DahAtO4qgYP90gGmDVctQuJvW cDzT5Q81Zxhe1PpxVbtpwHtQlZG68abcevgR0d5iUFoDXqpyupA+4UH0AV696w== 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 4M95Nc4SSGzgYk; Sat, 20 Aug 2022 17:34:56 +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 27KHYuYR093392; Sat, 20 Aug 2022 17:34:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27KHYunj093391; Sat, 20 Aug 2022 17:34:56 GMT (envelope-from git) Date: Sat, 20 Aug 2022 17:34:56 GMT Message-Id: <202208201734.27KHYunj093391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cc29f221aaa2 - main - ksiginfo_alloc(): change to directly take M_WAITOK/NOWAIT flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc29f221aaa218297ee4948b92da53f6126bc658 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661016896; 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=5+L6LZaOkNRk06L+0FvGjMTSUF2qpj8AQcWUdioiR/E=; b=R2L35tnVdWTyOvnsgeVlrsYNvh4Jj6B/06HZ6/Y7ix7CB8rFKTJfFqpgnXdDxcmF3zdPZS 27tmRmlM/RfMjaqxTm9kgKqSvr1ytueq9Ejp5fZKQqNnXydzXae77QqQ5a4VMt6dtwy0FM c6RBSFiGCBe9kEaa4TsGjxcmTpayW1TwrCyzNKenkTVGjiO30mXikLiS8v4AC3VznRMoR4 aGOwedmg6SwVSAgzjBbm+W0dpBx1cCTiBQeotp+d832KX8jDwi54dXn8Fk0tlFhwjFuiRI 8JGne6jPrW9cV4bLxfYNZtOd1BICxohvR5nssizqNlLkWz/qx6CWt8TbSu99/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661016896; a=rsa-sha256; cv=none; b=w14qB06xk70EbTH6WjgECx5KYRb8fdD8AenJniVkIJJBJ+rWMXzF6llqaBqFcqtCuqY0lA 0xkCB0Z5/XsXd4qDOnPcbAyRvkOctyus8BhoUHQzn8cAUyEqetUWFsLZePCNHt/cD5JaYi JJxTAz39r/OO+CVpOvwV3u3W9ZhLFuZPD+Ew3+3e9ff2CO2BHCt27BoFi4SVWi6/nEZS2Q gv6NOFsk0DWH2XfCMVUDsm+ail4OYxPjC9zJqkErT69jO22XkBZ7nKjgpoMXHm7Vfb1Srj 2Q6rzA8ic87p4CQMNq4jgFKAeQanvL3RoAjbW9h1BMn/QcYHSW1DJ9En2HO0GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cc29f221aaa218297ee4948b92da53f6126bc658 commit cc29f221aaa218297ee4948b92da53f6126bc658 Author: Konstantin Belousov AuthorDate: 2022-08-17 16:57:20 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-20 17:33:17 +0000 ksiginfo_alloc(): change to directly take M_WAITOK/NOWAIT flags Also style, and remove unneeded cast. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D36207 --- sys/kern/kern_exit.c | 2 +- sys/kern/kern_sig.c | 13 ++++++------- sys/kern/kern_thread.c | 2 +- sys/sys/signalvar.h | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 68500c3b8721..4c3821ddfa72 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -498,7 +498,7 @@ exit1(struct thread *td, int rval, int signo) wakeup(q->p_reaper); for (; q != NULL; q = nq) { nq = LIST_NEXT(q, p_sibling); - ksi = ksiginfo_alloc(TRUE); + ksi = ksiginfo_alloc(M_WAITOK); PROC_LOCK(q); q->p_sigparent = SIGCHLD; diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 7780d4ce4a6c..27aff0998c90 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -365,14 +365,13 @@ sigqueue_start(void) } ksiginfo_t * -ksiginfo_alloc(int wait) +ksiginfo_alloc(int mwait) { - int flags; + MPASS(mwait == M_WAITOK || mwait == M_NOWAIT); - flags = M_ZERO | (wait ? M_WAITOK : M_NOWAIT); - if (ksiginfo_zone != NULL) - return ((ksiginfo_t *)uma_zalloc(ksiginfo_zone, flags)); - return (NULL); + if (ksiginfo_zone == NULL) + return (NULL); + return (uma_zalloc(ksiginfo_zone, mwait | M_ZERO)); } void @@ -513,7 +512,7 @@ sigqueue_add(sigqueue_t *sq, int signo, ksiginfo_t *si) if (p != NULL && p->p_pendingcnt >= max_pending_per_proc) { signal_overflow++; ret = EAGAIN; - } else if ((ksi = ksiginfo_alloc(0)) == NULL) { + } else if ((ksi = ksiginfo_alloc(M_NOWAIT)) == NULL) { signal_alloc_fail++; ret = EAGAIN; } else { diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 729b4bf45c25..a15488b29cb6 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -468,7 +468,7 @@ proc_linkup(struct proc *p, struct thread *td) { sigqueue_init(&p->p_sigqueue, p); - p->p_ksi = ksiginfo_alloc(1); + p->p_ksi = ksiginfo_alloc(M_WAITOK); if (p->p_ksi != NULL) { /* XXX p_ksi may be null if ksiginfo zone is not ready */ p->p_ksi->ksi_flags = KSI_EXT | KSI_INS; diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index 85538abeedf9..59b26105effd 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -384,7 +384,7 @@ int cursig(struct thread *td); void execsigs(struct proc *p); void gsignal(int pgid, int sig, ksiginfo_t *ksi); void killproc(struct proc *p, const char *why); -ksiginfo_t * ksiginfo_alloc(int wait); +ksiginfo_t *ksiginfo_alloc(int mwait); void ksiginfo_free(ksiginfo_t *ksi); int pksignal(struct proc *p, int sig, ksiginfo_t *ksi); void pgsigio(struct sigio **sigiop, int sig, int checkctty);