sync with OpenBSD -current
This commit is contained in:
parent
f21e607a91
commit
df63f5284d
GPG Key ID:
F42C07F07E2E35B7
|
|
@ -1 +1 @@
|
|||
# SecBSD 1.5-62ce95a: Tue Apr 16 00:00:00 UTC 2024 (Yatagarasu)
|
||||
# SecBSD 1.5-b8d3ce7: Fri Apr 19 00:00:00 UTC 2024 (Yatagarasu)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: bss_conn.c,v 1.40 2024/04/15 15:40:08 tb Exp $ */
|
||||
/* $OpenBSD: bss_conn.c,v 1.41 2024/04/19 09:54:36 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cpu.h,v 1.166 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: cpu.h,v 1.167 2024/04/19 10:22:50 mpi Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -53,7 +53,6 @@
|
|||
#include <sys/sched.h>
|
||||
#include <sys/sensors.h>
|
||||
#include <sys/srp.h>
|
||||
#include <uvm/uvm_percpu.h>
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
||||
|
|
@ -211,8 +210,6 @@ struct cpu_info {
|
|||
|
||||
#ifdef MULTIPROCESSOR
|
||||
struct srp_hazard ci_srp_hazards[SRP_HAZARD_NUM];
|
||||
#define __HAVE_UVM_PERCPU
|
||||
struct uvm_pmr_cache ci_uvm; /* [o] page cache */
|
||||
#endif
|
||||
|
||||
struct ksensordev ci_sensordev;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cpu.h,v 1.44 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: cpu.h,v 1.45 2024/04/19 10:22:50 mpi Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
|
||||
*
|
||||
|
|
@ -108,7 +108,6 @@ void arm32_vector_init(vaddr_t, int);
|
|||
#include <sys/device.h>
|
||||
#include <sys/sched.h>
|
||||
#include <sys/srp.h>
|
||||
#include <uvm/uvm_percpu.h>
|
||||
|
||||
struct cpu_info {
|
||||
struct device *ci_dev; /* Device corresponding to this CPU */
|
||||
|
|
@ -162,8 +161,6 @@ struct cpu_info {
|
|||
|
||||
#ifdef MULTIPROCESSOR
|
||||
struct srp_hazard ci_srp_hazards[SRP_HAZARD_NUM];
|
||||
#define __HAVE_UVM_PERCPU
|
||||
struct uvm_pmr_cache ci_uvm;
|
||||
volatile int ci_flags;
|
||||
|
||||
volatile int ci_ddb_paused;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cpu.h,v 1.186 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: cpu.h,v 1.187 2024/04/19 10:22:50 mpi Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -69,7 +69,6 @@
|
|||
#include <sys/sched.h>
|
||||
#include <sys/sensors.h>
|
||||
#include <sys/srp.h>
|
||||
#include <uvm/uvm_percpu.h>
|
||||
|
||||
struct intrsource;
|
||||
|
||||
|
|
@ -100,8 +99,6 @@ struct cpu_info {
|
|||
|
||||
#if defined(MULTIPROCESSOR)
|
||||
struct srp_hazard ci_srp_hazards[SRP_HAZARD_NUM];
|
||||
#define __HAVE_UVM_PERCPU
|
||||
struct uvm_pmr_cache ci_uvm;
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ufshcireg.h,v 1.4 2024/01/04 21:02:30 mglocker Exp $ */
|
||||
/* $OpenBSD: ufshcireg.h,v 1.5 2024/04/19 20:43:33 mglocker Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
|
||||
|
|
@ -362,4 +362,4 @@ struct ufshci_ucd {
|
|||
struct upiu_command cmd;
|
||||
struct upiu_response rsp;
|
||||
struct ufshci_ucd_prdt prdt[UFSHCI_UCD_PRDT_MAX_SEGS];
|
||||
};
|
||||
} __packed __aligned(128);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: in_pcb.c,v 1.301 2024/04/17 20:48:51 bluhm Exp $ */
|
||||
/* $OpenBSD: in_pcb.c,v 1.302 2024/04/19 10:13:58 bluhm Exp $ */
|
||||
/* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -592,7 +592,6 @@ in_pcbdetach(struct inpcb *inp)
|
|||
* points.
|
||||
*/
|
||||
sofree(so, 1);
|
||||
m_freem(inp->inp_options);
|
||||
if (inp->inp_route.ro_rt) {
|
||||
rtfree(inp->inp_route.ro_rt);
|
||||
inp->inp_route.ro_rt = NULL;
|
||||
|
|
@ -603,8 +602,10 @@ in_pcbdetach(struct inpcb *inp)
|
|||
ip6_freemoptions(inp->inp_moptions6);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
m_freem(inp->inp_options);
|
||||
ip_freemoptions(inp->inp_moptions);
|
||||
|
||||
}
|
||||
#if NPF > 0
|
||||
pf_remove_divert_state(inp);
|
||||
pf_inp_unlink(inp);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: in_pcb.h,v 1.156 2024/04/17 20:48:51 bluhm Exp $ */
|
||||
/* $OpenBSD: in_pcb.h,v 1.157 2024/04/19 10:13:58 bluhm Exp $ */
|
||||
/* $NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -157,8 +157,10 @@ struct inpcb {
|
|||
} inp_hu;
|
||||
#define inp_ip inp_hu.hu_ip
|
||||
#define inp_ipv6 inp_hu.hu_ipv6
|
||||
struct mbuf *inp_options; /* IP options */
|
||||
struct ip6_pktopts *inp_outputopts6; /* IP6 options for outgoing packets */
|
||||
union {
|
||||
struct mbuf *inp_options; /* IPv4 options */
|
||||
struct ip6_pktopts *inp_outputopts6; /* IPv6 options */
|
||||
};
|
||||
int inp_hops;
|
||||
union {
|
||||
struct ip_moptions *mou_mo;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: nfs_socket.c,v 1.147 2024/03/31 13:50:00 mvs Exp $ */
|
||||
/* $OpenBSD: nfs_socket.c,v 1.148 2024/04/19 06:50:37 ratchov Exp $ */
|
||||
/* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -1588,7 +1588,7 @@ nfsrv_rcv(struct socket *so, caddr_t arg, int waitflag)
|
|||
*/
|
||||
auio.uio_resid = 1000000000;
|
||||
flags = MSG_DONTWAIT;
|
||||
error = soreceive(so, &nam, &auio, &mp, NULL,
|
||||
error = soreceive(so, NULL, &auio, &mp, NULL,
|
||||
&flags, 0);
|
||||
if (error || mp == NULL) {
|
||||
if (error == EWOULDBLOCK)
|
||||
|
|
@ -1626,20 +1626,6 @@ nfsrv_rcv(struct socket *so, caddr_t arg, int waitflag)
|
|||
error = soreceive(so, &nam, &auio, &mp,
|
||||
NULL, &flags, 0);
|
||||
if (mp) {
|
||||
struct sockaddr_in *sin;
|
||||
|
||||
if (nam == NULL) {
|
||||
nfsstats.srv_errs++;
|
||||
m_freem(mp);
|
||||
continue;
|
||||
}
|
||||
if (in_nam2sin(nam, &sin) != 0 ||
|
||||
ntohs(sin->sin_port) >= IPPORT_RESERVED) {
|
||||
nfsstats.srv_errs++;
|
||||
m_freem(nam);
|
||||
m_freem(mp);
|
||||
continue;
|
||||
}
|
||||
m = nam;
|
||||
m->m_next = mp;
|
||||
if (slp->ns_recend)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: nfs_syscalls.c,v 1.123 2024/03/31 13:50:00 mvs Exp $ */
|
||||
/* $OpenBSD: nfs_syscalls.c,v 1.124 2024/04/19 06:50:37 ratchov Exp $ */
|
||||
/* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -251,18 +251,6 @@ nfssvc_addsock(struct file *fp, struct mbuf *mynam)
|
|||
m_freem(mynam);
|
||||
return (EINVAL);
|
||||
}
|
||||
if (mynam != NULL) {
|
||||
struct sockaddr_in *sin;
|
||||
error = in_nam2sin(mynam, &sin);
|
||||
if (error) {
|
||||
m_freem(mynam);
|
||||
return (error);
|
||||
}
|
||||
if (ntohs(sin->sin_port) >= IPPORT_RESERVED) {
|
||||
m_freem(mynam);
|
||||
return (ECONNREFUSED);
|
||||
}
|
||||
}
|
||||
|
||||
if (so->so_type == SOCK_STREAM)
|
||||
siz = NFS_MAXPACKET + sizeof (u_long);
|
||||
|
|
@ -323,6 +311,18 @@ nfssvc_addsock(struct file *fp, struct mbuf *mynam)
|
|||
return (0);
|
||||
}
|
||||
|
||||
static inline int nfssvc_checknam(struct mbuf *nam)
|
||||
{
|
||||
struct sockaddr_in *sin;
|
||||
|
||||
if (nam == NULL ||
|
||||
in_nam2sin(nam, &sin) != 0 ||
|
||||
ntohs(sin->sin_port) >= IPPORT_RESERVED) {
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Called by nfssvc() for nfsds. Just loops around servicing rpc requests
|
||||
* until it is killed by a signal.
|
||||
|
|
@ -402,6 +402,16 @@ loop:
|
|||
cacherep = nfsrv_getcache(nd, slp, &mreq);
|
||||
switch (cacherep) {
|
||||
case RC_DOIT:
|
||||
/*
|
||||
* Unless this is a null request (server ping), make
|
||||
* sure that the client is using a reserved source port.
|
||||
*/
|
||||
if (nd->nd_procnum != 0 && nfssvc_checknam(nd->nd_nam) == -1) {
|
||||
/* drop it */
|
||||
m_freem(nd->nd_mrep);
|
||||
m_freem(nd->nd_nam2);
|
||||
break;
|
||||
}
|
||||
error = (*(nfsrv3_procs[nd->nd_procnum]))(nd, slp, nfsd->nfsd_procp, &mreq);
|
||||
if (mreq == NULL) {
|
||||
if (nd != NULL) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uvm_page.c,v 1.175 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: uvm_page.c,v 1.176 2024/04/19 10:22:51 mpi Exp $ */
|
||||
/* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -877,11 +877,13 @@ uvm_pagerealloc_multi(struct uvm_object *obj, voff_t off, vsize_t size,
|
|||
* => only one of obj or anon can be non-null
|
||||
* => caller must activate/deactivate page if it is not wired.
|
||||
*/
|
||||
|
||||
struct vm_page *
|
||||
uvm_pagealloc(struct uvm_object *obj, voff_t off, struct vm_anon *anon,
|
||||
int flags)
|
||||
{
|
||||
struct vm_page *pg = NULL;
|
||||
struct vm_page *pg;
|
||||
struct pglist pgl;
|
||||
int pmr_flags;
|
||||
|
||||
KASSERT(obj == NULL || anon == NULL);
|
||||
|
|
@ -904,10 +906,13 @@ uvm_pagealloc(struct uvm_object *obj, voff_t off, struct vm_anon *anon,
|
|||
|
||||
if (flags & UVM_PGA_ZERO)
|
||||
pmr_flags |= UVM_PLA_ZERO;
|
||||
TAILQ_INIT(&pgl);
|
||||
if (uvm_pmr_getpages(1, 0, 0, 1, 0, 1, pmr_flags, &pgl) != 0)
|
||||
goto fail;
|
||||
|
||||
pg = TAILQ_FIRST(&pgl);
|
||||
KASSERT(pg != NULL && TAILQ_NEXT(pg, pageq) == NULL);
|
||||
|
||||
pg = uvm_pmr_cache_get(pmr_flags);
|
||||
if (pg == NULL)
|
||||
return NULL;
|
||||
uvm_pagealloc_pg(pg, obj, off, anon);
|
||||
KASSERT((pg->pg_flags & PG_DEV) == 0);
|
||||
if (flags & UVM_PGA_ZERO)
|
||||
|
|
@ -916,6 +921,9 @@ uvm_pagealloc(struct uvm_object *obj, voff_t off, struct vm_anon *anon,
|
|||
atomic_setbits_int(&pg->pg_flags, PG_CLEAN);
|
||||
|
||||
return pg;
|
||||
|
||||
fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1017,7 +1025,7 @@ void
|
|||
uvm_pagefree(struct vm_page *pg)
|
||||
{
|
||||
uvm_pageclean(pg);
|
||||
uvm_pmr_cache_put(pg);
|
||||
uvm_pmr_freepages(pg, 1);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uvm_pdaemon.c,v 1.112 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: uvm_pdaemon.c,v 1.113 2024/04/19 10:22:51 mpi Exp $ */
|
||||
/* $NetBSD: uvm_pdaemon.c,v 1.23 2000/08/20 10:24:14 bjh21 Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -262,8 +262,6 @@ uvm_pageout(void *arg)
|
|||
#if NDRM > 0
|
||||
drmbackoff(size * 2);
|
||||
#endif
|
||||
uvm_pmr_cache_drain();
|
||||
|
||||
/*
|
||||
* scan if needed
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
/* $OpenBSD: uvm_percpu.h,v 1.1 2024/04/17 13:12:58 mpi Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2024 Martin Pieuchot <mpi@openbsd.org>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef _UVM_UVM_PCPU_H_
|
||||
#define _UVM_UVM_PCPU_H_
|
||||
|
||||
struct vm_page;
|
||||
|
||||
/*
|
||||
* The number of pages per magazine should be large enough to get rid of the
|
||||
* contention in the pmemrange allocator during concurrent page faults and
|
||||
* small enough to limit fragmentation.
|
||||
*/
|
||||
#define UVM_PMR_CACHEMAGSZ 8
|
||||
|
||||
/*
|
||||
* Magazine
|
||||
*/
|
||||
struct uvm_pmr_cache_item {
|
||||
struct vm_page *upci_pages[UVM_PMR_CACHEMAGSZ];
|
||||
int upci_npages; /* # of pages in magazine */
|
||||
};
|
||||
|
||||
/*
|
||||
* Per-CPU cache of physical pages.
|
||||
*/
|
||||
struct uvm_pmr_cache {
|
||||
struct uvm_pmr_cache_item upc_magz[2]; /* magazines */
|
||||
int upc_actv; /* index of active magazine */
|
||||
|
||||
};
|
||||
|
||||
#endif /* _UVM_UVM_PCPU_H_ */
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
/* $OpenBSD: uvm_pmemrange.c,v 1.64 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: uvm_pmemrange.c,v 1.65 2024/04/19 10:22:51 mpi Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2024 Martin Pieuchot <mpi@openbsd.org>
|
||||
* Copyright (c) 2009, 2010 Ariane van der Steldt <ariane@stack.nl>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
|
|
@ -1262,28 +1261,6 @@ out:
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Acquire a single page.
|
||||
*
|
||||
* flags: UVM_PLA_* flags
|
||||
* result: returned page.
|
||||
*/
|
||||
struct vm_page *
|
||||
uvm_pmr_getone(int flags)
|
||||
{
|
||||
struct vm_page *pg;
|
||||
struct pglist pgl;
|
||||
|
||||
TAILQ_INIT(&pgl);
|
||||
if (uvm_pmr_getpages(1, 0, 0, 1, 0, 1, flags, &pgl) != 0)
|
||||
return NULL;
|
||||
|
||||
pg = TAILQ_FIRST(&pgl);
|
||||
KASSERT(pg != NULL && TAILQ_NEXT(pg, pageq) == NULL);
|
||||
|
||||
return pg;
|
||||
}
|
||||
|
||||
/*
|
||||
* Free a number of contig pages (invoked by uvm_page_init).
|
||||
*/
|
||||
|
|
@ -2213,133 +2190,3 @@ uvm_pagezero_thread(void *arg)
|
|||
yield();
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(MULTIPROCESSOR) && defined(__HAVE_UVM_PERCPU)
|
||||
int
|
||||
uvm_pmr_cache_alloc(struct uvm_pmr_cache_item *upci)
|
||||
{
|
||||
struct vm_page *pg;
|
||||
struct pglist pgl;
|
||||
int flags = UVM_PLA_NOWAIT|UVM_PLA_NOWAKE;
|
||||
int npages = UVM_PMR_CACHEMAGSZ;
|
||||
|
||||
KASSERT(upci->upci_npages == 0);
|
||||
|
||||
TAILQ_INIT(&pgl);
|
||||
if (uvm_pmr_getpages(npages, 0, 0, 1, 0, npages, flags, &pgl))
|
||||
return -1;
|
||||
|
||||
while ((pg = TAILQ_FIRST(&pgl)) != NULL) {
|
||||
TAILQ_REMOVE(&pgl, pg, pageq);
|
||||
upci->upci_pages[upci->upci_npages] = pg;
|
||||
upci->upci_npages++;
|
||||
}
|
||||
atomic_add_int(&uvmexp.percpucaches, npages);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct vm_page *
|
||||
uvm_pmr_cache_get(int flags)
|
||||
{
|
||||
struct uvm_pmr_cache *upc = &curcpu()->ci_uvm;
|
||||
struct uvm_pmr_cache_item *upci;
|
||||
struct vm_page *pg;
|
||||
|
||||
upci = &upc->upc_magz[upc->upc_actv];
|
||||
if (upci->upci_npages == 0) {
|
||||
unsigned int prev;
|
||||
|
||||
prev = (upc->upc_actv == 0) ? 1 : 0;
|
||||
upci = &upc->upc_magz[prev];
|
||||
if (upci->upci_npages == 0) {
|
||||
atomic_inc_int(&uvmexp.pcpmiss);
|
||||
if (uvm_pmr_cache_alloc(upci))
|
||||
return uvm_pmr_getone(flags);
|
||||
}
|
||||
/* Swap magazines */
|
||||
upc->upc_actv = prev;
|
||||
} else {
|
||||
atomic_inc_int(&uvmexp.pcphit);
|
||||
}
|
||||
|
||||
atomic_dec_int(&uvmexp.percpucaches);
|
||||
upci->upci_npages--;
|
||||
pg = upci->upci_pages[upci->upci_npages];
|
||||
|
||||
if (flags & UVM_PLA_ZERO)
|
||||
uvm_pagezero(pg);
|
||||
|
||||
return pg;
|
||||
}
|
||||
|
||||
void
|
||||
uvm_pmr_cache_free(struct uvm_pmr_cache_item *upci)
|
||||
{
|
||||
struct pglist pgl;
|
||||
unsigned int i;
|
||||
|
||||
TAILQ_INIT(&pgl);
|
||||
for (i = 0; i < upci->upci_npages; i++)
|
||||
TAILQ_INSERT_TAIL(&pgl, upci->upci_pages[i], pageq);
|
||||
|
||||
uvm_pmr_freepageq(&pgl);
|
||||
|
||||
atomic_sub_int(&uvmexp.percpucaches, upci->upci_npages);
|
||||
upci->upci_npages = 0;
|
||||
memset(upci->upci_pages, 0, sizeof(upci->upci_pages));
|
||||
}
|
||||
|
||||
void
|
||||
uvm_pmr_cache_put(struct vm_page *pg)
|
||||
{
|
||||
struct uvm_pmr_cache *upc = &curcpu()->ci_uvm;
|
||||
struct uvm_pmr_cache_item *upci;
|
||||
|
||||
upci = &upc->upc_magz[upc->upc_actv];
|
||||
if (upci->upci_npages >= UVM_PMR_CACHEMAGSZ) {
|
||||
unsigned int prev;
|
||||
|
||||
prev = (upc->upc_actv == 0) ? 1 : 0;
|
||||
upci = &upc->upc_magz[prev];
|
||||
if (upci->upci_npages > 0)
|
||||
uvm_pmr_cache_free(upci);
|
||||
|
||||
/* Swap magazines */
|
||||
upc->upc_actv = prev;
|
||||
KASSERT(upci->upci_npages == 0);
|
||||
}
|
||||
|
||||
upci->upci_pages[upci->upci_npages] = pg;
|
||||
upci->upci_npages++;
|
||||
atomic_inc_int(&uvmexp.percpucaches);
|
||||
}
|
||||
|
||||
void
|
||||
uvm_pmr_cache_drain(void)
|
||||
{
|
||||
struct uvm_pmr_cache *upc = &curcpu()->ci_uvm;
|
||||
|
||||
uvm_pmr_cache_free(&upc->upc_magz[0]);
|
||||
uvm_pmr_cache_free(&upc->upc_magz[1]);
|
||||
}
|
||||
|
||||
#else /* !(MULTIPROCESSOR && __HAVE_UVM_PERCPU) */
|
||||
|
||||
struct vm_page *
|
||||
uvm_pmr_cache_get(int flags)
|
||||
{
|
||||
return uvm_pmr_getone(flags);
|
||||
}
|
||||
|
||||
void
|
||||
uvm_pmr_cache_put(struct vm_page *pg)
|
||||
{
|
||||
uvm_pmr_freepages(pg, 1);
|
||||
}
|
||||
|
||||
void
|
||||
uvm_pmr_cache_drain(void)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uvm_pmemrange.h,v 1.15 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: uvm_pmemrange.h,v 1.16 2024/04/19 10:22:51 mpi Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009 Ariane van der Steldt <ariane@stack.nl>
|
||||
|
|
@ -147,9 +147,5 @@ void uvm_pmr_remove(struct uvm_pmemrange *,
|
|||
struct vm_page *uvm_pmr_extract_range(struct uvm_pmemrange *,
|
||||
struct vm_page *, paddr_t, paddr_t,
|
||||
struct pglist *);
|
||||
struct vm_page *uvm_pmr_cache_get(int);
|
||||
void uvm_pmr_cache_put(struct vm_page *);
|
||||
void uvm_pmr_cache_drain(void);
|
||||
|
||||
|
||||
#endif /* _UVM_UVM_PMEMRANGE_H_ */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uvmexp.h,v 1.13 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: uvmexp.h,v 1.14 2024/04/19 10:22:51 mpi Exp $ */
|
||||
|
||||
#ifndef _UVM_UVMEXP_
|
||||
#define _UVM_UVMEXP_
|
||||
|
|
@ -66,7 +66,7 @@ struct uvmexp {
|
|||
int zeropages; /* [F] number of zero'd pages */
|
||||
int reserve_pagedaemon; /* [I] # of pages reserved for pagedaemon */
|
||||
int reserve_kernel; /* [I] # of pages reserved for kernel */
|
||||
int percpucaches; /* [a] # of pages in per-CPU caches */
|
||||
int unused01; /* formerly anonpages */
|
||||
int vnodepages; /* XXX # of pages used by vnode page cache */
|
||||
int vtextpages; /* XXX # of pages used by vtext vnodes */
|
||||
|
||||
|
|
@ -101,8 +101,8 @@ struct uvmexp {
|
|||
int syscalls; /* system calls */
|
||||
int pageins; /* [p] pagein operation count */
|
||||
/* pageouts are in pdpageouts below */
|
||||
int pcphit; /* [a] # of pagealloc from per-CPU cache */
|
||||
int pcpmiss; /* [a] # of times a per-CPU cache was empty */
|
||||
int unused07; /* formerly obsolete_swapins */
|
||||
int unused08; /* formerly obsolete_swapouts */
|
||||
int pgswapin; /* pages swapped in */
|
||||
int pgswapout; /* pages swapped out */
|
||||
int forks; /* forks */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uvm.c,v 1.7 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: uvm.c,v 1.8 2024/04/19 10:22:51 mpi Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org>
|
||||
* Copyright (c) 2018 Kenneth R Westerback <krw@openbsd.org>
|
||||
|
|
@ -80,10 +80,11 @@ struct uvmline uvmline[] = {
|
|||
{ &uvmexp.zeropages, &last_uvmexp.zeropages, "zeropages",
|
||||
&uvmexp.pageins, &last_uvmexp.pageins, "pageins",
|
||||
&uvmexp.fltrelckok, &last_uvmexp.fltrelckok, "fltrelckok" },
|
||||
{ &uvmexp.percpucaches, &last_uvmexp.percpucaches, "percpucaches",
|
||||
{ &uvmexp.reserve_pagedaemon, &last_uvmexp.reserve_pagedaemon,
|
||||
"reserve_pagedaemon",
|
||||
&uvmexp.pgswapin, &last_uvmexp.pgswapin, "pgswapin",
|
||||
&uvmexp.fltanget, &last_uvmexp.fltanget, "fltanget" },
|
||||
{ NULL, NULL, NULL,
|
||||
{ &uvmexp.reserve_kernel, &last_uvmexp.reserve_kernel, "reserve_kernel",
|
||||
&uvmexp.pgswapout, &last_uvmexp.pgswapout, "pgswapout",
|
||||
&uvmexp.fltanretry, &last_uvmexp.fltanretry, "fltanretry" },
|
||||
{ NULL, NULL, NULL,
|
||||
|
|
@ -142,13 +143,13 @@ struct uvmline uvmline[] = {
|
|||
NULL, NULL, NULL },
|
||||
{ &uvmexp.pagesize, &last_uvmexp.pagesize, "pagesize",
|
||||
&uvmexp.pdpending, &last_uvmexp.pdpending, "pdpending",
|
||||
NULL, NULL, "Per-CPU Counters" },
|
||||
NULL, NULL, NULL },
|
||||
{ &uvmexp.pagemask, &last_uvmexp.pagemask, "pagemask",
|
||||
&uvmexp.pddeact, &last_uvmexp.pddeact, "pddeact",
|
||||
&uvmexp.pcphit, &last_uvmexp.pcphit, "pcphit" },
|
||||
NULL, NULL, NULL },
|
||||
{ &uvmexp.pageshift, &last_uvmexp.pageshift, "pageshift",
|
||||
NULL, NULL, NULL,
|
||||
&uvmexp.pcpmiss, &last_uvmexp.pcpmiss, "pcpmiss" }
|
||||
NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
field_def fields_uvm[] = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */
|
||||
/* $OpenBSD: vmstat.c,v 1.156 2024/04/17 13:12:58 mpi Exp $ */
|
||||
/* $OpenBSD: vmstat.c,v 1.157 2024/04/19 10:22:51 mpi Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1980, 1986, 1991, 1993
|
||||
|
|
@ -513,12 +513,7 @@ dosum(void)
|
|||
uvmexp.reserve_pagedaemon);
|
||||
(void)printf("%11u pages reserved for kernel\n",
|
||||
uvmexp.reserve_kernel);
|
||||
(void)printf("%11u pages in per-cpu caches\n",
|
||||
uvmexp.percpucaches);
|
||||
|
||||
/* per-cpu cache */
|
||||
(void)printf("%11u per-cpu cache hits\n", uvmexp.pcphit);
|
||||
(void)printf("%11u per-cpu cache misses\n", uvmexp.pcpmiss);
|
||||
/* swap */
|
||||
(void)printf("%11u swap pages\n", uvmexp.swpages);
|
||||
(void)printf("%11u swap pages in use\n", uvmexp.swpginuse);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: dhcpd.8,v 1.34 2023/10/05 18:46:14 mvs Exp $
|
||||
.\" $OpenBSD: dhcpd.8,v 1.35 2024/04/19 19:16:26 jmc Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1995, 1996 The Internet Software Consortium.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
.\" see ``http://www.isc.org/''. To learn more about Vixie
|
||||
.\" Enterprises, see ``http://www.vix.com''.
|
||||
.\"
|
||||
.Dd $Mdocdate: October 5 2023 $
|
||||
.Dd $Mdocdate: April 19 2024 $
|
||||
.Dt DHCPD 8
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -84,7 +84,7 @@ Each client is assigned a lease, which expires after an amount of time
|
|||
chosen by the administrator (by default, one day).
|
||||
When a leased IP address is assigned to a new hardware address,
|
||||
.Nm
|
||||
may delete the leased IP from certain
|
||||
may delete the leased address from certain
|
||||
.Xr pf 4
|
||||
tables.
|
||||
Before leases expire, the clients to which leases are assigned are expected
|
||||
|
|
|
|||
Loading…
Reference in New Issue