~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/kernel/tsacct.c

Version: ~ [ linux-6.11.5 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.58 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.114 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.169 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.228 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.284 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.322 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.9 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /kernel/tsacct.c (Version linux-6.11.5) and /kernel/tsacct.c (Version linux-5.3.18)


  1 // SPDX-License-Identifier: GPL-2.0-or-later        1 // SPDX-License-Identifier: GPL-2.0-or-later
  2 /*                                                  2 /*
  3  * tsacct.c - System accounting over taskstats      3  * tsacct.c - System accounting over taskstats interface
  4  *                                                  4  *
  5  * Copyright (C) Jay Lan,       <jlan@sgi.com>      5  * Copyright (C) Jay Lan,       <jlan@sgi.com>
  6  */                                                 6  */
  7                                                     7 
  8 #include <linux/kernel.h>                           8 #include <linux/kernel.h>
  9 #include <linux/sched/signal.h>                     9 #include <linux/sched/signal.h>
 10 #include <linux/sched/mm.h>                        10 #include <linux/sched/mm.h>
 11 #include <linux/sched/cputime.h>                   11 #include <linux/sched/cputime.h>
 12 #include <linux/tsacct_kern.h>                     12 #include <linux/tsacct_kern.h>
 13 #include <linux/acct.h>                            13 #include <linux/acct.h>
 14 #include <linux/jiffies.h>                         14 #include <linux/jiffies.h>
 15 #include <linux/mm.h>                              15 #include <linux/mm.h>
 16                                                    16 
 17 /*                                                 17 /*
 18  * fill in basic accounting fields                 18  * fill in basic accounting fields
 19  */                                                19  */
 20 void bacct_add_tsk(struct user_namespace *user     20 void bacct_add_tsk(struct user_namespace *user_ns,
 21                    struct pid_namespace *pid_n     21                    struct pid_namespace *pid_ns,
 22                    struct taskstats *stats, st     22                    struct taskstats *stats, struct task_struct *tsk)
 23 {                                                  23 {
 24         const struct cred *tcred;                  24         const struct cred *tcred;
 25         u64 utime, stime, utimescaled, stimesc     25         u64 utime, stime, utimescaled, stimescaled;
 26         u64 now_ns, delta;                     !!  26         u64 delta;
 27         time64_t btime;                        << 
 28                                                    27 
 29         BUILD_BUG_ON(TS_COMM_LEN < TASK_COMM_L     28         BUILD_BUG_ON(TS_COMM_LEN < TASK_COMM_LEN);
 30                                                    29 
 31         /* calculate task elapsed time in nsec     30         /* calculate task elapsed time in nsec */
 32         now_ns = ktime_get_ns();               !!  31         delta = ktime_get_ns() - tsk->start_time;
 33         /* store whole group time first */     << 
 34         delta = now_ns - tsk->group_leader->st << 
 35         /* Convert to micro seconds */             32         /* Convert to micro seconds */
 36         do_div(delta, NSEC_PER_USEC);              33         do_div(delta, NSEC_PER_USEC);
 37         stats->ac_tgetime = delta;             << 
 38         delta = now_ns - tsk->start_time;      << 
 39         do_div(delta, NSEC_PER_USEC);          << 
 40         stats->ac_etime = delta;                   34         stats->ac_etime = delta;
 41         /* Convert to seconds for btime (note  !!  35         /* Convert to seconds for btime */
 42         btime = ktime_get_real_seconds() - div !!  36         do_div(delta, USEC_PER_SEC);
 43         stats->ac_btime = clamp_t(time64_t, bt !!  37         stats->ac_btime = get_seconds() - delta;
 44         stats->ac_btime64 = btime;             !!  38         if (thread_group_leader(tsk)) {
 45                                                << 
 46         if (tsk->flags & PF_EXITING)           << 
 47                 stats->ac_exitcode = tsk->exit     39                 stats->ac_exitcode = tsk->exit_code;
 48         if (thread_group_leader(tsk) && (tsk-> !!  40                 if (tsk->flags & PF_FORKNOEXEC)
 49                 stats->ac_flag |= AFORK;       !!  41                         stats->ac_flag |= AFORK;
                                                   >>  42         }
 50         if (tsk->flags & PF_SUPERPRIV)             43         if (tsk->flags & PF_SUPERPRIV)
 51                 stats->ac_flag |= ASU;             44                 stats->ac_flag |= ASU;
 52         if (tsk->flags & PF_DUMPCORE)              45         if (tsk->flags & PF_DUMPCORE)
 53                 stats->ac_flag |= ACORE;           46                 stats->ac_flag |= ACORE;
 54         if (tsk->flags & PF_SIGNALED)              47         if (tsk->flags & PF_SIGNALED)
 55                 stats->ac_flag |= AXSIG;           48                 stats->ac_flag |= AXSIG;
 56         stats->ac_nice   = task_nice(tsk);         49         stats->ac_nice   = task_nice(tsk);
 57         stats->ac_sched  = tsk->policy;            50         stats->ac_sched  = tsk->policy;
 58         stats->ac_pid    = task_pid_nr_ns(tsk,     51         stats->ac_pid    = task_pid_nr_ns(tsk, pid_ns);
 59         stats->ac_tgid   = task_tgid_nr_ns(tsk << 
 60         rcu_read_lock();                           52         rcu_read_lock();
 61         tcred = __task_cred(tsk);                  53         tcred = __task_cred(tsk);
 62         stats->ac_uid    = from_kuid_munged(us     54         stats->ac_uid    = from_kuid_munged(user_ns, tcred->uid);
 63         stats->ac_gid    = from_kgid_munged(us     55         stats->ac_gid    = from_kgid_munged(user_ns, tcred->gid);
 64         stats->ac_ppid   = pid_alive(tsk) ?        56         stats->ac_ppid   = pid_alive(tsk) ?
 65                 task_tgid_nr_ns(rcu_dereferenc     57                 task_tgid_nr_ns(rcu_dereference(tsk->real_parent), pid_ns) : 0;
 66         rcu_read_unlock();                         58         rcu_read_unlock();
 67                                                    59 
 68         task_cputime(tsk, &utime, &stime);         60         task_cputime(tsk, &utime, &stime);
 69         stats->ac_utime = div_u64(utime, NSEC_     61         stats->ac_utime = div_u64(utime, NSEC_PER_USEC);
 70         stats->ac_stime = div_u64(stime, NSEC_     62         stats->ac_stime = div_u64(stime, NSEC_PER_USEC);
 71                                                    63 
 72         task_cputime_scaled(tsk, &utimescaled,     64         task_cputime_scaled(tsk, &utimescaled, &stimescaled);
 73         stats->ac_utimescaled = div_u64(utimes     65         stats->ac_utimescaled = div_u64(utimescaled, NSEC_PER_USEC);
 74         stats->ac_stimescaled = div_u64(stimes     66         stats->ac_stimescaled = div_u64(stimescaled, NSEC_PER_USEC);
 75                                                    67 
 76         stats->ac_minflt = tsk->min_flt;           68         stats->ac_minflt = tsk->min_flt;
 77         stats->ac_majflt = tsk->maj_flt;           69         stats->ac_majflt = tsk->maj_flt;
 78                                                    70 
 79         strscpy_pad(stats->ac_comm, tsk->comm) !!  71         strncpy(stats->ac_comm, tsk->comm, sizeof(stats->ac_comm));
 80 }                                                  72 }
 81                                                    73 
 82                                                    74 
 83 #ifdef CONFIG_TASK_XACCT                           75 #ifdef CONFIG_TASK_XACCT
 84                                                    76 
 85 #define KB 1024                                    77 #define KB 1024
 86 #define MB (1024*KB)                               78 #define MB (1024*KB)
 87 #define KB_MASK (~(KB-1))                          79 #define KB_MASK (~(KB-1))
 88 /*                                                 80 /*
 89  * fill in extended accounting fields              81  * fill in extended accounting fields
 90  */                                                82  */
 91 void xacct_add_tsk(struct taskstats *stats, st     83 void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
 92 {                                                  84 {
 93         struct mm_struct *mm;                      85         struct mm_struct *mm;
 94                                                    86 
 95         /* convert pages-nsec/1024 to Mbyte-us     87         /* convert pages-nsec/1024 to Mbyte-usec, see __acct_update_integrals */
 96         stats->coremem = p->acct_rss_mem1 * PA     88         stats->coremem = p->acct_rss_mem1 * PAGE_SIZE;
 97         do_div(stats->coremem, 1000 * KB);         89         do_div(stats->coremem, 1000 * KB);
 98         stats->virtmem = p->acct_vm_mem1 * PAG     90         stats->virtmem = p->acct_vm_mem1 * PAGE_SIZE;
 99         do_div(stats->virtmem, 1000 * KB);         91         do_div(stats->virtmem, 1000 * KB);
100         mm = get_task_mm(p);                       92         mm = get_task_mm(p);
101         if (mm) {                                  93         if (mm) {
102                 /* adjust to KB unit */            94                 /* adjust to KB unit */
103                 stats->hiwater_rss   = get_mm_     95                 stats->hiwater_rss   = get_mm_hiwater_rss(mm) * PAGE_SIZE / KB;
104                 stats->hiwater_vm    = get_mm_     96                 stats->hiwater_vm    = get_mm_hiwater_vm(mm)  * PAGE_SIZE / KB;
105                 mmput(mm);                         97                 mmput(mm);
106         }                                          98         }
107         stats->read_char        = p->ioac.rcha     99         stats->read_char        = p->ioac.rchar & KB_MASK;
108         stats->write_char       = p->ioac.wcha    100         stats->write_char       = p->ioac.wchar & KB_MASK;
109         stats->read_syscalls    = p->ioac.sysc    101         stats->read_syscalls    = p->ioac.syscr & KB_MASK;
110         stats->write_syscalls   = p->ioac.sysc    102         stats->write_syscalls   = p->ioac.syscw & KB_MASK;
111 #ifdef CONFIG_TASK_IO_ACCOUNTING                  103 #ifdef CONFIG_TASK_IO_ACCOUNTING
112         stats->read_bytes       = p->ioac.read    104         stats->read_bytes       = p->ioac.read_bytes & KB_MASK;
113         stats->write_bytes      = p->ioac.writ    105         stats->write_bytes      = p->ioac.write_bytes & KB_MASK;
114         stats->cancelled_write_bytes = p->ioac    106         stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes & KB_MASK;
115 #else                                             107 #else
116         stats->read_bytes       = 0;              108         stats->read_bytes       = 0;
117         stats->write_bytes      = 0;              109         stats->write_bytes      = 0;
118         stats->cancelled_write_bytes = 0;         110         stats->cancelled_write_bytes = 0;
119 #endif                                            111 #endif
120 }                                                 112 }
121 #undef KB                                         113 #undef KB
122 #undef MB                                         114 #undef MB
123                                                   115 
124 static void __acct_update_integrals(struct tas    116 static void __acct_update_integrals(struct task_struct *tsk,
125                                     u64 utime,    117                                     u64 utime, u64 stime)
126 {                                                 118 {
127         u64 time, delta;                          119         u64 time, delta;
128                                                   120 
129         if (!likely(tsk->mm))                     121         if (!likely(tsk->mm))
130                 return;                           122                 return;
131                                                   123 
132         time = stime + utime;                     124         time = stime + utime;
133         delta = time - tsk->acct_timexpd;         125         delta = time - tsk->acct_timexpd;
134                                                   126 
135         if (delta < TICK_NSEC)                    127         if (delta < TICK_NSEC)
136                 return;                           128                 return;
137                                                   129 
138         tsk->acct_timexpd = time;                 130         tsk->acct_timexpd = time;
139         /*                                        131         /*
140          * Divide by 1024 to avoid overflow, a    132          * Divide by 1024 to avoid overflow, and to avoid division.
141          * The final unit reported to userspac    133          * The final unit reported to userspace is Mbyte-usecs,
142          * the rest of the math is done in xac    134          * the rest of the math is done in xacct_add_tsk.
143          */                                       135          */
144         tsk->acct_rss_mem1 += delta * get_mm_r    136         tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm) >> 10;
145         tsk->acct_vm_mem1 += delta * READ_ONCE !! 137         tsk->acct_vm_mem1 += delta * tsk->mm->total_vm >> 10;
146 }                                                 138 }
147                                                   139 
148 /**                                               140 /**
149  * acct_update_integrals - update mm integral     141  * acct_update_integrals - update mm integral fields in task_struct
150  * @tsk: task_struct for accounting               142  * @tsk: task_struct for accounting
151  */                                               143  */
152 void acct_update_integrals(struct task_struct     144 void acct_update_integrals(struct task_struct *tsk)
153 {                                                 145 {
154         u64 utime, stime;                         146         u64 utime, stime;
155         unsigned long flags;                      147         unsigned long flags;
156                                                   148 
157         local_irq_save(flags);                    149         local_irq_save(flags);
158         task_cputime(tsk, &utime, &stime);        150         task_cputime(tsk, &utime, &stime);
159         __acct_update_integrals(tsk, utime, st    151         __acct_update_integrals(tsk, utime, stime);
160         local_irq_restore(flags);                 152         local_irq_restore(flags);
161 }                                                 153 }
162                                                   154 
163 /**                                               155 /**
164  * acct_account_cputime - update mm integral a    156  * acct_account_cputime - update mm integral after cputime update
165  * @tsk: task_struct for accounting               157  * @tsk: task_struct for accounting
166  */                                               158  */
167 void acct_account_cputime(struct task_struct *    159 void acct_account_cputime(struct task_struct *tsk)
168 {                                                 160 {
169         __acct_update_integrals(tsk, tsk->utim    161         __acct_update_integrals(tsk, tsk->utime, tsk->stime);
170 }                                                 162 }
171                                                   163 
172 /**                                               164 /**
173  * acct_clear_integrals - clear the mm integra    165  * acct_clear_integrals - clear the mm integral fields in task_struct
174  * @tsk: task_struct whose accounting fields a    166  * @tsk: task_struct whose accounting fields are cleared
175  */                                               167  */
176 void acct_clear_integrals(struct task_struct *    168 void acct_clear_integrals(struct task_struct *tsk)
177 {                                                 169 {
178         tsk->acct_timexpd = 0;                    170         tsk->acct_timexpd = 0;
179         tsk->acct_rss_mem1 = 0;                   171         tsk->acct_rss_mem1 = 0;
180         tsk->acct_vm_mem1 = 0;                    172         tsk->acct_vm_mem1 = 0;
181 }                                                 173 }
182 #endif                                            174 #endif
183                                                   175 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php