Print this page
Revert "OS-8005 bhyve memory pressure needs to target ARC better (#354)"
This reverts commit a6033573eedd94118d2b9e65f45deca0bf4b42f7.

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/bhyve/bhyverun.c
          +++ new/usr/src/cmd/bhyve/bhyverun.c
↓ open down ↓ 1574 lines elided ↑ open up ↑
1575 1575  
1576 1576          memflags = 0;
1577 1577          if (get_config_bool_default("memory.wired", false))
1578 1578                  memflags |= VM_MEM_F_WIRED;
1579 1579          if (get_config_bool_default("memory.guest_in_core", false))
1580 1580                  memflags |= VM_MEM_F_INCORE;
1581 1581          vm_set_memflags(ctx, memflags);
1582 1582  #ifdef  __FreeBSD__
1583 1583          err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
1584 1584  #else
1585      -        err = vm_arc_resv(ctx, memsize);
1586      -        if (err != 0) {
1587      -                (void) fprintf(stderr, "Could not shrink ARC: %s\n",
1588      -                    strerror(err));
1589      -                exit(4);
1590      -        }
1591      -
1592 1585          do {
1593 1586                  errno = 0;
1594 1587                  err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
1595 1588                  error = errno;
1596 1589                  if (err != 0 && error == ENOMEM) {
1597 1590                          (void) fprintf(stderr, "Unable to allocate memory "
1598 1591                              "(%llu), retrying in 1 second\n", memsize);
1599 1592                          sleep(1);
1600 1593                  }
1601 1594          } while (error == ENOMEM);
↓ open down ↓ 157 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX