tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

getrusage: add the "signal_struct *sig" local variable

No functional changes, cleanup/preparation.

Link: https://lkml.kernel.org/r/20230909172554.GA20441@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Oleg Nesterov and committed by
Andrew Morton c7ac8231 e5ecf29c

+19 -18
+19 -18
kernel/sys.c
··· 1786 1786 unsigned long flags; 1787 1787 u64 tgutime, tgstime, utime, stime; 1788 1788 unsigned long maxrss = 0; 1789 + struct signal_struct *sig = p->signal; 1789 1790 1790 1791 memset((char *)r, 0, sizeof (*r)); 1791 1792 utime = stime = 0; ··· 1794 1793 if (who == RUSAGE_THREAD) { 1795 1794 task_cputime_adjusted(current, &utime, &stime); 1796 1795 accumulate_thread_rusage(p, r); 1797 - maxrss = p->signal->maxrss; 1796 + maxrss = sig->maxrss; 1798 1797 goto out; 1799 1798 } 1800 1799 ··· 1804 1803 switch (who) { 1805 1804 case RUSAGE_BOTH: 1806 1805 case RUSAGE_CHILDREN: 1807 - utime = p->signal->cutime; 1808 - stime = p->signal->cstime; 1809 - r->ru_nvcsw = p->signal->cnvcsw; 1810 - r->ru_nivcsw = p->signal->cnivcsw; 1811 - r->ru_minflt = p->signal->cmin_flt; 1812 - r->ru_majflt = p->signal->cmaj_flt; 1813 - r->ru_inblock = p->signal->cinblock; 1814 - r->ru_oublock = p->signal->coublock; 1815 - maxrss = p->signal->cmaxrss; 1806 + utime = sig->cutime; 1807 + stime = sig->cstime; 1808 + r->ru_nvcsw = sig->cnvcsw; 1809 + r->ru_nivcsw = sig->cnivcsw; 1810 + r->ru_minflt = sig->cmin_flt; 1811 + r->ru_majflt = sig->cmaj_flt; 1812 + r->ru_inblock = sig->cinblock; 1813 + r->ru_oublock = sig->coublock; 1814 + maxrss = sig->cmaxrss; 1816 1815 1817 1816 if (who == RUSAGE_CHILDREN) 1818 1817 break; ··· 1822 1821 thread_group_cputime_adjusted(p, &tgutime, &tgstime); 1823 1822 utime += tgutime; 1824 1823 stime += tgstime; 1825 - r->ru_nvcsw += p->signal->nvcsw; 1826 - r->ru_nivcsw += p->signal->nivcsw; 1827 - r->ru_minflt += p->signal->min_flt; 1828 - r->ru_majflt += p->signal->maj_flt; 1829 - r->ru_inblock += p->signal->inblock; 1830 - r->ru_oublock += p->signal->oublock; 1831 - if (maxrss < p->signal->maxrss) 1832 - maxrss = p->signal->maxrss; 1824 + r->ru_nvcsw += sig->nvcsw; 1825 + r->ru_nivcsw += sig->nivcsw; 1826 + r->ru_minflt += sig->min_flt; 1827 + r->ru_majflt += sig->maj_flt; 1828 + r->ru_inblock += sig->inblock; 1829 + r->ru_oublock += sig->oublock; 1830 + if (maxrss < sig->maxrss) 1831 + maxrss = sig->maxrss; 1833 1832 t = p; 1834 1833 do { 1835 1834 accumulate_thread_rusage(t, r);