From nobody Fri Dec 19 20:42:11 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C6CD14AD26; Wed, 13 Mar 2024 16:43:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348213; cv=none; b=UNulbj5dA5GA37soWpkWIcCWrNvruZU/q6xtItRnucMps8fqj35kR56YC3Nai0I+zKfhMrn+TU+KWSnvbhqJArNLDmwUoCvSdeVotakPictbbI01dPMit9WspHs5dr9Epooew0DciweWwbDYHFSKUS9hwvw+oPfZIqDCvoxcOz8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348213; c=relaxed/simple; bh=t8JjLrSBnpcqofryRsssp6nAlEA9Bh5ZWeeJ3QS4LoM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kr2ha2BWZwuhGxc0u/xpceJgEfRvblviDgDkV8gR0CKhnWpvcMFqvHBivMz3dHzNywxxAgJuRkK3xP/BjsI/HwOHQBImAAHZDy7lO8tQ5xqq/H5//gx6XkyskPFoFEXhODL1UgXtZiax0LsdsYwdk3EX5rn2lJ/Ob4TbE5jZr9M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XHGWpggE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XHGWpggE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DD8DC433A6; Wed, 13 Mar 2024 16:43:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710348213; bh=t8JjLrSBnpcqofryRsssp6nAlEA9Bh5ZWeeJ3QS4LoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XHGWpggEpUION2Otf+l+LJajRnpS+2Aku/OdjhmVxhEHm5lgeopWEIU9XU20VVsqb EFtUqKn/5xl284OAHHVRpT6OJhS37iA8NAFzcpjchk9Uf/c4B1FDZ8wkvu46WTbV52 UeDUMJEHBXtcBoImLOpbguMIx3ZFJx9efDRwr6S1NjQeRU14ZLm/VNKAKuVh0eOuqO sgkK9KzZbnl4YHeaRBzbVPB/r0Lk452sTKf/8e8npsSUphB9qfhrBMzZWTvzD9pKSg nlFRVw5O49b0672/VsDZwpK4Cj51g5AycS07L3H17lZ6DyFo0l/hd8VRKIIXLe222s WsJfUxqLRdpAw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oleg Nesterov , "Eric W . Biederman" , Andrew Morton , Sasha Levin Subject: [PATCH 5.15 60/76] getrusage: add the "signal_struct *sig" local variable Date: Wed, 13 Mar 2024 12:42:07 -0400 Message-ID: <20240313164223.615640-61-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313164223.615640-1-sashal@kernel.org> References: <20240313164223.615640-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.152-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.15.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.15.152-rc1 X-KernelTest-Deadline: 2024-03-15T16:42+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Oleg Nesterov [ Upstream commit c7ac8231ace9b07306d0299969e42073b189c70a ] No functional changes, cleanup/preparation. Link: https://lkml.kernel.org/r/20230909172554.GA20441@redhat.com Signed-off-by: Oleg Nesterov Cc: Eric W. Biederman Signed-off-by: Andrew Morton Stable-dep-of: daa694e41375 ("getrusage: move thread_group_cputime_adjusted= () outside of lock_task_sighand()") Signed-off-by: Sasha Levin --- kernel/sys.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/kernel/sys.c b/kernel/sys.c index 2efab44746356..0298992c1eb9b 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1764,6 +1764,7 @@ void getrusage(struct task_struct *p, int who, struct= rusage *r) unsigned long flags; u64 tgutime, tgstime, utime, stime; unsigned long maxrss =3D 0; + struct signal_struct *sig =3D p->signal; =20 memset((char *)r, 0, sizeof (*r)); utime =3D stime =3D 0; @@ -1771,7 +1772,7 @@ void getrusage(struct task_struct *p, int who, struct= rusage *r) if (who =3D=3D RUSAGE_THREAD) { task_cputime_adjusted(current, &utime, &stime); accumulate_thread_rusage(p, r); - maxrss =3D p->signal->maxrss; + maxrss =3D sig->maxrss; goto out; } =20 @@ -1781,15 +1782,15 @@ void getrusage(struct task_struct *p, int who, stru= ct rusage *r) switch (who) { case RUSAGE_BOTH: case RUSAGE_CHILDREN: - utime =3D p->signal->cutime; - stime =3D p->signal->cstime; - r->ru_nvcsw =3D p->signal->cnvcsw; - r->ru_nivcsw =3D p->signal->cnivcsw; - r->ru_minflt =3D p->signal->cmin_flt; - r->ru_majflt =3D p->signal->cmaj_flt; - r->ru_inblock =3D p->signal->cinblock; - r->ru_oublock =3D p->signal->coublock; - maxrss =3D p->signal->cmaxrss; + utime =3D sig->cutime; + stime =3D sig->cstime; + r->ru_nvcsw =3D sig->cnvcsw; + r->ru_nivcsw =3D sig->cnivcsw; + r->ru_minflt =3D sig->cmin_flt; + r->ru_majflt =3D sig->cmaj_flt; + r->ru_inblock =3D sig->cinblock; + r->ru_oublock =3D sig->coublock; + maxrss =3D sig->cmaxrss; =20 if (who =3D=3D RUSAGE_CHILDREN) break; @@ -1799,14 +1800,14 @@ void getrusage(struct task_struct *p, int who, stru= ct rusage *r) thread_group_cputime_adjusted(p, &tgutime, &tgstime); utime +=3D tgutime; stime +=3D tgstime; - r->ru_nvcsw +=3D p->signal->nvcsw; - r->ru_nivcsw +=3D p->signal->nivcsw; - r->ru_minflt +=3D p->signal->min_flt; - r->ru_majflt +=3D p->signal->maj_flt; - r->ru_inblock +=3D p->signal->inblock; - r->ru_oublock +=3D p->signal->oublock; - if (maxrss < p->signal->maxrss) - maxrss =3D p->signal->maxrss; + r->ru_nvcsw +=3D sig->nvcsw; + r->ru_nivcsw +=3D sig->nivcsw; + r->ru_minflt +=3D sig->min_flt; + r->ru_majflt +=3D sig->maj_flt; + r->ru_inblock +=3D sig->inblock; + r->ru_oublock +=3D sig->oublock; + if (maxrss < sig->maxrss) + maxrss =3D sig->maxrss; t =3D p; do { accumulate_thread_rusage(t, r); --=20 2.43.0