From nobody Sat Sep 03 01:29:19 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 4MKHHz5qPdz4bw5c; Sat, 3 Sep 2022 01:29:19 +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 4MKHHz5Clnz3Mnj; Sat, 3 Sep 2022 01:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662168559; 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=zsRQ7zlyb6MVkLGccwF//S+2MeIBewwC61A/LFQN9vs=; b=H1Qws4rI6ZtH9m3MffzFsr8N/F/09BLnE/WaaWNhXMoQ8nm5QXTc07nw7rgGw4NOKMliMt 7qWjZcPAW5NTGrWmbg2GTStaK6trxPDUmLsYnn0QrS24+Jb6ajKkIqFZThkMsl85aDQ0IT +PrQmp/zzGF02YhUL6HCoH6lqLPXz95nnibHBepAIx7WTABGahXDkY3ju4U260VMBcdCru NCF7dGQF8HXE4DTi/71cRaDRaL9ZXmYCfq2ZPxBBUBLJ6FEe8hfOH/48xq9BL2Hd83TA1s LrCE+2CQX7OzYzvEJ9uXmn0K7XyXiUXgMk9n+3fWSXR4BqBcc2Eznh2oVK4CNQ== 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 4MKHHz3zj9z10L1; Sat, 3 Sep 2022 01:29:19 +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 2831TJ0G002544; Sat, 3 Sep 2022 01:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2831TJPa002543; Sat, 3 Sep 2022 01:29:19 GMT (envelope-from git) Date: Sat, 3 Sep 2022 01:29:19 GMT Message-Id: <202209030129.2831TJPa002543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5dedfeb5b3e1 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5dedfeb5b3e1dd96a72f4e96d599d39f8f83862c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662168559; 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=zsRQ7zlyb6MVkLGccwF//S+2MeIBewwC61A/LFQN9vs=; b=m/sIKitqfpKHvb+IIfxJkwDqgNcZtqw29x9wVqIMGe9GjVgOY9dbc25Q7N63IUBm4TrKHu AlNgroxxIbeonNsd0iI/5kX8mnhzzGONIJ7xu055ElDqp7sSThoXiSq1+g1s1CEVC4rU29 4lAw5qa9ZIcEZMqJH0Iey3A2+4fkIa+Fh2lYmAoS09n+l03rOammUfV9KTY/VLlmCsMCYG 8JUPvKvp7Ff4Z+6q11wIfqNsrYZjANf+RT1XO6khQvP0MUmDhl75cqvB5tonTNO7EnhwIK zffdbHnevGwj4IkbenN2kCa5wVrXV9kmk6hXzJJkilqRmCwvVuMUl1b5A7izfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662168559; a=rsa-sha256; cv=none; b=lkfWy4EnIFr3twLTrp3ReIzATmpAu2O9SAlLzcnUEpEhNzzzpuIGbD9ID0s4SGPQ06H0g1 PX/PmRVPNn3CkE4PyQ+4kOEWrmd6UBHOdMDk9XybshCc5g/Fa6f+oSQwunKJpsvcwl1E44 I4yvbSfdptvTJcjpbAOkypSR4eiPvSNKimKWv4JsnJwXs8D8LWvCr5Q3m5zoG2qIbfy90+ acNhuwEKvDsl+GkxWsYKWtXZKHps0vtVFx8A2RMhIazMeMK/HsjnFFppo2nVWFypAq+HoY mo3+yw6JalXua+Sfhtg7YUmSqZZOga1OK5QL5TJVjF/2pjVChqLSTm8AE5+cDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5dedfeb5b3e1dd96a72f4e96d599d39f8f83862c commit 5dedfeb5b3e1dd96a72f4e96d599d39f8f83862c Author: Konstantin Belousov AuthorDate: 2022-08-17 16:57:20 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-03 01:17:35 +0000 ksiginfo_alloc(): change to directly take M_WAITOK/NOWAIT flags (cherry picked from commit cc29f221aaa218297ee4948b92da53f6126bc658) --- sys/kern/kern_exit.c | 2 +- sys/kern/kern_sig.c | 17 +++++++---------- sys/kern/kern_thread.c | 2 +- sys/sys/signalvar.h | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index da60159fa391..ca32f318c0cf 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -503,7 +503,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 994cbb3f2af9..54d2ed857c07 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -288,16 +288,13 @@ sigqueue_start(void) } ksiginfo_t * -ksiginfo_alloc(int wait) +ksiginfo_alloc(int mwait) { - int flags; - - flags = M_ZERO; - if (! wait) - flags |= M_NOWAIT; - if (ksiginfo_zone != NULL) - return ((ksiginfo_t *)uma_zalloc(ksiginfo_zone, flags)); - return (NULL); + MPASS(mwait == M_WAITOK || mwait == M_NOWAIT); + + if (ksiginfo_zone == NULL) + return (NULL); + return (uma_zalloc(ksiginfo_zone, mwait | M_ZERO)); } void @@ -438,7 +435,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 f7abb9f6f1fe..28de25d1ba18 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 d43dd4a44190..70f4f1bdaa50 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -385,7 +385,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);