~ [ 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-4.4.302)


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

~ [ 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