Print this page
6583 remove whole-process swapping

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/os/cpu.c
          +++ new/usr/src/uts/common/os/cpu.c
↓ open down ↓ 293 lines elided ↑ open up ↑
 294  294          { "iowait",             KSTAT_DATA_UINT64 },
 295  295  };
 296  296  
 297  297  static struct cpu_vm_stats_ks_data {
 298  298          kstat_named_t pgrec;
 299  299          kstat_named_t pgfrec;
 300  300          kstat_named_t pgin;
 301  301          kstat_named_t pgpgin;
 302  302          kstat_named_t pgout;
 303  303          kstat_named_t pgpgout;
 304      -        kstat_named_t swapin;
 305      -        kstat_named_t pgswapin;
 306      -        kstat_named_t swapout;
 307      -        kstat_named_t pgswapout;
 308  304          kstat_named_t zfod;
 309  305          kstat_named_t dfree;
 310  306          kstat_named_t scan;
 311  307          kstat_named_t rev;
 312  308          kstat_named_t hat_fault;
 313  309          kstat_named_t as_fault;
 314  310          kstat_named_t maj_fault;
 315  311          kstat_named_t cow_fault;
 316  312          kstat_named_t prot_fault;
 317  313          kstat_named_t softlock;
↓ open down ↓ 8 lines elided ↑ open up ↑
 326  322          kstat_named_t fspgin;
 327  323          kstat_named_t fspgout;
 328  324          kstat_named_t fsfree;
 329  325  } cpu_vm_stats_ks_data_template = {
 330  326          { "pgrec",              KSTAT_DATA_UINT64 },
 331  327          { "pgfrec",             KSTAT_DATA_UINT64 },
 332  328          { "pgin",               KSTAT_DATA_UINT64 },
 333  329          { "pgpgin",             KSTAT_DATA_UINT64 },
 334  330          { "pgout",              KSTAT_DATA_UINT64 },
 335  331          { "pgpgout",            KSTAT_DATA_UINT64 },
 336      -        { "swapin",             KSTAT_DATA_UINT64 },
 337      -        { "pgswapin",           KSTAT_DATA_UINT64 },
 338      -        { "swapout",            KSTAT_DATA_UINT64 },
 339      -        { "pgswapout",          KSTAT_DATA_UINT64 },
 340  332          { "zfod",               KSTAT_DATA_UINT64 },
 341  333          { "dfree",              KSTAT_DATA_UINT64 },
 342  334          { "scan",               KSTAT_DATA_UINT64 },
 343  335          { "rev",                KSTAT_DATA_UINT64 },
 344  336          { "hat_fault",          KSTAT_DATA_UINT64 },
 345  337          { "as_fault",           KSTAT_DATA_UINT64 },
 346  338          { "maj_fault",          KSTAT_DATA_UINT64 },
 347  339          { "cow_fault",          KSTAT_DATA_UINT64 },
 348  340          { "prot_fault",         KSTAT_DATA_UINT64 },
 349  341          { "softlock",           KSTAT_DATA_UINT64 },
↓ open down ↓ 2325 lines elided ↑ open up ↑
2675 2667                           * we'll take the very occasional hit here instead.
2676 2668                           */
2677 2669                          if (tp->t_state == TS_ONPROC) {
2678 2670                                  cpu_surrender(tp);
2679 2671                          } else if (tp->t_state == TS_RUN) {
2680 2672                                  cpu_t *ocp = tp->t_cpu;
2681 2673  
2682 2674                                  (void) dispdeq(tp);
2683 2675                                  setbackdq(tp);
2684 2676                                  /*
2685      -                                 * Either on the bound CPU's disp queue now,
2686      -                                 * or swapped out or on the swap queue.
     2677 +                                 * On the bound CPU's disp queue now.
2687 2678                                   */
2688 2679                                  ASSERT(tp->t_disp_queue == cp->cpu_disp ||
2689      -                                    tp->t_weakbound_cpu == ocp ||
2690      -                                    (tp->t_schedflag & (TS_LOAD | TS_ON_SWAPQ))
2691      -                                    != TS_LOAD);
     2680 +                                    tp->t_weakbound_cpu == ocp);
2692 2681                          }
2693 2682                  }
2694 2683          }
2695 2684  
2696 2685          /*
2697 2686           * Our binding has changed; set TP_CHANGEBIND.
2698 2687           */
2699 2688          tp->t_proc_flag |= TP_CHANGEBIND;
2700 2689          aston(tp);
2701 2690  
↓ open down ↓ 582 lines elided ↑ open up ↑
3284 3273          cvskd = ksp->ks_data;
3285 3274  
3286 3275          bcopy(&cpu_vm_stats_ks_data_template, ksp->ks_data,
3287 3276              sizeof (cpu_vm_stats_ks_data_template));
3288 3277          cvskd->pgrec.value.ui64 = cvs->pgrec;
3289 3278          cvskd->pgfrec.value.ui64 = cvs->pgfrec;
3290 3279          cvskd->pgin.value.ui64 = cvs->pgin;
3291 3280          cvskd->pgpgin.value.ui64 = cvs->pgpgin;
3292 3281          cvskd->pgout.value.ui64 = cvs->pgout;
3293 3282          cvskd->pgpgout.value.ui64 = cvs->pgpgout;
3294      -        cvskd->swapin.value.ui64 = cvs->swapin;
3295      -        cvskd->pgswapin.value.ui64 = cvs->pgswapin;
3296      -        cvskd->swapout.value.ui64 = cvs->swapout;
3297      -        cvskd->pgswapout.value.ui64 = cvs->pgswapout;
3298 3283          cvskd->zfod.value.ui64 = cvs->zfod;
3299 3284          cvskd->dfree.value.ui64 = cvs->dfree;
3300 3285          cvskd->scan.value.ui64 = cvs->scan;
3301 3286          cvskd->rev.value.ui64 = cvs->rev;
3302 3287          cvskd->hat_fault.value.ui64 = cvs->hat_fault;
3303 3288          cvskd->as_fault.value.ui64 = cvs->as_fault;
3304 3289          cvskd->maj_fault.value.ui64 = cvs->maj_fault;
3305 3290          cvskd->cow_fault.value.ui64 = cvs->cow_fault;
3306 3291          cvskd->prot_fault.value.ui64 = cvs->prot_fault;
3307 3292          cvskd->softlock.value.ui64 = cvs->softlock;
↓ open down ↓ 106 lines elided ↑ open up ↑
3414 3399          cso->cpu_syswait.iowait         = CPU_STATS(cp, sys.iowait);
3415 3400          cso->cpu_syswait.swap           = 0;
3416 3401          cso->cpu_syswait.physio         = 0;
3417 3402  
3418 3403          cso->cpu_vminfo.pgrec           = CPU_STATS(cp, vm.pgrec);
3419 3404          cso->cpu_vminfo.pgfrec          = CPU_STATS(cp, vm.pgfrec);
3420 3405          cso->cpu_vminfo.pgin            = CPU_STATS(cp, vm.pgin);
3421 3406          cso->cpu_vminfo.pgpgin          = CPU_STATS(cp, vm.pgpgin);
3422 3407          cso->cpu_vminfo.pgout           = CPU_STATS(cp, vm.pgout);
3423 3408          cso->cpu_vminfo.pgpgout         = CPU_STATS(cp, vm.pgpgout);
3424      -        cso->cpu_vminfo.swapin          = CPU_STATS(cp, vm.swapin);
3425      -        cso->cpu_vminfo.pgswapin        = CPU_STATS(cp, vm.pgswapin);
3426      -        cso->cpu_vminfo.swapout         = CPU_STATS(cp, vm.swapout);
3427      -        cso->cpu_vminfo.pgswapout       = CPU_STATS(cp, vm.pgswapout);
3428 3409          cso->cpu_vminfo.zfod            = CPU_STATS(cp, vm.zfod);
3429 3410          cso->cpu_vminfo.dfree           = CPU_STATS(cp, vm.dfree);
3430 3411          cso->cpu_vminfo.scan            = CPU_STATS(cp, vm.scan);
3431 3412          cso->cpu_vminfo.rev             = CPU_STATS(cp, vm.rev);
3432 3413          cso->cpu_vminfo.hat_fault       = CPU_STATS(cp, vm.hat_fault);
3433 3414          cso->cpu_vminfo.as_fault        = CPU_STATS(cp, vm.as_fault);
3434 3415          cso->cpu_vminfo.maj_fault       = CPU_STATS(cp, vm.maj_fault);
3435 3416          cso->cpu_vminfo.cow_fault       = CPU_STATS(cp, vm.cow_fault);
3436 3417          cso->cpu_vminfo.prot_fault      = CPU_STATS(cp, vm.prot_fault);
3437 3418          cso->cpu_vminfo.softlock        = CPU_STATS(cp, vm.softlock);
↓ open down ↓ 14 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX