CVS commit: src/sys/dev/pci
Module Name:src
Committed By: skrll
Date: Fri Sep 16 03:55:53 UTC 2022
Modified Files:
src/sys/dev/pci: if_aq.c
Log Message:
Some MP improvements
- Remove use of IFF_OACTIVE
- Remove use of if_timer and provide an MP safe multiqueue watchdog
- Sprinkle some lock assertions.
Tested by ryo@. Thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_aq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.32 src/sys/dev/pci/if_aq.c:1.33
--- src/sys/dev/pci/if_aq.c:1.32 Thu Sep 8 07:05:42 2022
+++ src/sys/dev/pci/if_aq.c Fri Sep 16 03:55:53 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aq.c,v 1.32 2022/09/08 07:05:42 skrll Exp $ */
+/* $NetBSD: if_aq.c,v 1.33 2022/09/16 03:55:53 skrll Exp $ */
/**
* aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.32 2022/09/08 07:05:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.33 2022/09/16 03:55:53 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_aq.h"
@@ -854,6 +854,9 @@ struct aq_txring {
int txr_index;
kmutex_t txr_mutex;
bool txr_active;
+ bool txr_stopping;
+ bool txr_sending;
+ time_t txr_lastsent;
pcq_t *txr_pcq;
void *txr_softint;
@@ -878,6 +881,7 @@ struct aq_rxring {
kmutex_t rxr_mutex;
bool rxr_active;
bool rxr_discarding;
+ bool rxr_stopping;
struct mbuf *rxr_receiving_m; /* receiving jumboframe */
struct mbuf *rxr_receiving_m_last; /* last mbuf of jumboframe */
@@ -934,10 +938,12 @@ struct aq_firmware_ops {
#define AQ_LOCK(sc) mutex_enter(&(sc)->sc_mutex);
#define AQ_UNLOCK(sc) mutex_exit(&(sc)->sc_mutex);
+#define AQ_LOCKED(sc) KASSERT(mutex_owned(&(sc)->sc_mutex));
/* lock for FW2X_MPI_{CONTROL,STATE]_REG read-modify-write */
#define AQ_MPI_LOCK(sc) mutex_enter(&(sc)->sc_mpi_mutex);
#define AQ_MPI_UNLOCK(sc) mutex_exit(&(sc)->sc_mpi_mutex);
+#define AQ_MPI_LOCKED(sc) KASSERT(mutex_owned(&(sc)->sc_mpi_mutex));
struct aq_softc {
@@ -1018,6 +1024,15 @@ struct aq_softc {
int sc_ec_capenable; /* last ec_capenable */
unsigned short sc_if_flags; /* last if_flags */
+ bool sc_tx_sending;
+ bool sc_stopping;
+
+ struct workqueue *sc_reset_wq;
+ struct work sc_reset_work;
+ volatile unsigned sc_reset_pending;
+
+ bool sc_trigger_reset;
+
#ifdef AQ_EVENT_COUNTERS
aq_hw_stats_s_t sc_statistics[2];
int sc_statistics_idx;
@@ -1059,13 +1074,14 @@ static void aq_ifmedia_status(struct ifn
static int aq_vlan_cb(struct ethercom *ec, uint16_t vid, bool set);
static int aq_ifflags_cb(struct ethercom *);
static int aq_init(struct ifnet *);
+static int aq_init_locked(struct ifnet *);
static void aq_send_common_locked(struct ifnet *, struct aq_softc *,
struct aq_txring *, bool);
static int aq_transmit(struct ifnet *, struct mbuf *);
static void aq_deferred_transmit(void *);
static void aq_start(struct ifnet *);
static void aq_stop(struct ifnet *, int);
-static void aq_watchdog(struct ifnet *);
+static void aq_stop_locked(struct ifnet *, bool);
static int aq_ioctl(struct ifnet *, unsigned long, void *);
static int aq_txrx_rings_alloc(struct aq_softc *);
@@ -1076,6 +1092,10 @@ static void aq_tx_pcq_free(struct aq_sof
static void aq_initmedia(struct aq_softc *);
static void aq_enable_intr(struct aq_softc *, bool, bool);
+static void aq_handle_reset_work(struct work *, void *);
+static void aq_unset_stopping_flags(struct aq_softc *);
+static void aq_set_stopping_flags(struct aq_softc *);
+
#if NSYSMON_ENVSYS > 0
static void aq_temp_refresh(struct sysmon_envsys *, envsys_data_t *);
#endif
@@ -1119,6 +1139,12 @@ static int fw2x_get_stats(struct aq_soft
static int fw2x_get_temperature(struct aq_softc *, uint32_t *);
#endif
+#ifndef AQ_WATCHDOG_TIMEOUT
+#define AQ_WATCHDOG_TIMEOUT 5
+#endif
+static int aq_watchdog_timeout = AQ_WATCHDOG_TIMEOUT;
+
+
static const struct aq_firmware_ops aq_fw1x_ops = {
.reset = fw1x_reset,
.set_mode = fw1x_set_mode,
@@ -1370,9 +1396,20 @@ aq_attach(device_t parent, device_t self
if (error != 0)
goto attach_failure;
- callout_init(>sc_tick_ch, 0);
+ callout_init(>sc_tick_ch, CALLOUT_MPSAFE);
callout_setfunc(>sc_tick_ch, aq_tick, sc);
+ char wqname[MAXCOMLEN];
+ snprintf(wqname, sizeof(wqname), "%sReset", device_xname(sc->sc_dev));
+ error = workqueue_create(>sc_reset_wq, wqname,
+ aq_handle_reset_work, sc, PRI_SOFTNET, IPL_SOFTCLOCK,
+ WQ_MPSAFE);
+ if (error) {
+ aprint_error_dev(sc->sc_dev,
+ "unable to create reset workqueue\n");
+ goto attach_failure;
+ }
+
sc->sc_intr_moderation_enable = CONFIG_INTR_MODERATION_ENABLE;
if (sc->sc_msix && (sc->sc_nqueues > 1))
@@ -1423,7 +1460,7 @@ aq_attach(device_t parent, device_t self
ifp->if_transmit = aq_transmit;
ifp->if_start = aq_start;
ifp->if_stop = aq_stop;
- ifp->if_watchdog = aq_watchdog;
+
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Sep 16 03:55:53 UTC 2022 Modified Files: src/sys/dev/pci: if_aq.c Log Message: Some MP improvements - Remove use of IFF_OACTIVE - Remove use of if_timer and provide an MP safe multiqueue watchdog - Sprinkle some lock assertions. Tested by ryo@. Thanks. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_aq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Fri Sep 16 03:12:03 UTC 2022
Modified Files:
src/sys/dev/pci: files.pci if_ixl.c
Log Message:
Add ALWAYS_TXDEFER option to ixl(4), too.
To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/if_ixl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.443 src/sys/dev/pci/files.pci:1.444
--- src/sys/dev/pci/files.pci:1.443 Fri Sep 16 03:10:12 2022
+++ src/sys/dev/pci/files.pci Fri Sep 16 03:12:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.443 2022/09/16 03:10:12 knakahara Exp $
+# $NetBSD: files.pci,v 1.444 2022/09/16 03:12:03 knakahara Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -1166,7 +1166,7 @@ file dev/pci/qat/qat_d15xx.c qat
device ixl: ether, ifnet, arp
attach ixl at pci
file dev/pci/if_ixl.c ixl
-defflag opt_if_ixl.h IXL_DEBUG
+defflag opt_if_ixl.h IXL_DEBUG IXL_ALWAYS_TXDEFER
defparam opt_if_ixl.h IXL_STATS_INTERVAL_MSEC
IXL_QUEUE_NUM
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.87 src/sys/dev/pci/if_ixl.c:1.88
--- src/sys/dev/pci/if_ixl.c:1.87 Sun Aug 28 07:54:03 2022
+++ src/sys/dev/pci/if_ixl.c Fri Sep 16 03:12:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.87 2022/08/28 07:54:03 skrll Exp $ */
+/* $NetBSD: if_ixl.c,v 1.88 2022/09/16 03:12:03 knakahara Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.87 2022/08/28 07:54:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.88 2022/09/16 03:12:03 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2883,6 +2883,11 @@ ixl_transmit(struct ifnet *ifp, struct m
return ENOBUFS;
}
+#ifdef IXL_ALWAYS_TXDEFER
+ kpreempt_disable();
+ softint_schedule(txr->txr_si);
+ kpreempt_enable();
+#else
if (mutex_tryenter(>txr_lock)) {
ixl_tx_common_locked(ifp, txr, true);
mutex_exit(>txr_lock);
@@ -2891,6 +2896,7 @@ ixl_transmit(struct ifnet *ifp, struct m
softint_schedule(txr->txr_si);
kpreempt_enable();
}
+#endif
return 0;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: knakahara Date: Fri Sep 16 03:12:03 UTC 2022 Modified Files: src/sys/dev/pci: files.pci if_ixl.c Log Message: Add ALWAYS_TXDEFER option to ixl(4), too. To generate a diff of this commit: cvs rdiff -u -r1.443 -r1.444 src/sys/dev/pci/files.pci cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/if_ixl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Fri Sep 16 03:10:12 UTC 2022
Modified Files:
src/sys/dev/pci: files.pci if_vmx.c
Log Message:
Add ALWAYS_TXDEFER option to vmx(4), too.
To generate a diff of this commit:
cvs rdiff -u -r1.442 -r1.443 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_vmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.442 src/sys/dev/pci/files.pci:1.443
--- src/sys/dev/pci/files.pci:1.442 Fri Sep 16 03:05:51 2022
+++ src/sys/dev/pci/files.pci Fri Sep 16 03:10:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.442 2022/09/16 03:05:51 knakahara Exp $
+# $NetBSD: files.pci,v 1.443 2022/09/16 03:10:12 knakahara Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -1186,6 +1186,7 @@ filedev/pci/xmm7360.c
device vmx: ether, ifnet, arp
attach vmx at pci
file dev/pci/if_vmx.c vmx
+defflag opt_if_vmx.h VMXNET3_ALWAYS_TXDEFER
# Realtek RTL8125 2.5GBASE-T Ethernet
device rge: ether, ifnet, arp, mii
Index: src/sys/dev/pci/if_vmx.c
diff -u src/sys/dev/pci/if_vmx.c:1.9 src/sys/dev/pci/if_vmx.c:1.10
--- src/sys/dev/pci/if_vmx.c:1.9 Wed Jul 6 06:32:50 2022
+++ src/sys/dev/pci/if_vmx.c Fri Sep 16 03:10:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.9 2022/07/06 06:32:50 msaitoh Exp $ */
+/* $NetBSD: if_vmx.c,v 1.10 2022/09/16 03:10:12 knakahara Exp $ */
/* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */
/*
@@ -19,7 +19,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.9 2022/07/06 06:32:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.10 2022/09/16 03:10:12 knakahara Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_if_vmx.h"
+#endif
#include
#include
@@ -3286,6 +3290,11 @@ vmxnet3_transmit(struct ifnet *ifp, stru
return ENOBUFS;
}
+#ifdef VMXNET3_ALWAYS_TXDEFER
+ kpreempt_disable();
+ softint_schedule(txq->vxtxq_si);
+ kpreempt_enable();
+#else
if (VMXNET3_TXQ_TRYLOCK(txq)) {
vmxnet3_transmit_locked(ifp, txq);
VMXNET3_TXQ_UNLOCK(txq);
@@ -3294,6 +3303,7 @@ vmxnet3_transmit(struct ifnet *ifp, stru
softint_schedule(txq->vxtxq_si);
kpreempt_enable();
}
+#endif
return 0;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: knakahara Date: Fri Sep 16 03:10:12 UTC 2022 Modified Files: src/sys/dev/pci: files.pci if_vmx.c Log Message: Add ALWAYS_TXDEFER option to vmx(4), too. To generate a diff of this commit: cvs rdiff -u -r1.442 -r1.443 src/sys/dev/pci/files.pci cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Fri Sep 16 03:05:52 UTC 2022
Modified Files:
src/sys/dev/pci: files.pci
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe_netbsd.h
Log Message:
ixg(4) add an option for Tx to use deferred softint regardless of whether can
get txq lock or not.
That imporve (7%) and stabilize throughput. But that can cause
latency degradation, so off by default.
ok'ed by msaitoh@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.441 -r1.442 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.441 src/sys/dev/pci/files.pci:1.442
--- src/sys/dev/pci/files.pci:1.441 Wed Sep 7 06:37:04 2022
+++ src/sys/dev/pci/files.pci Fri Sep 16 03:05:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.441 2022/09/07 06:37:04 martin Exp $
+# $NetBSD: files.pci,v 1.442 2022/09/16 03:05:51 knakahara Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -665,6 +665,7 @@ file dev/pci/ixgbe/ixgbe_phy.c ixg | ixv
file dev/pci/ixgbe/ixgbe_vf.c ixg | ixv
file dev/pci/ixgbe/if_bypass.c ixg | ixv
file dev/pci/ixgbe/if_fdir.c ixg | ixv
+defflag opt_if_ixg.h IXGBE_ALWAYS_TXDEFER
# This appears to be the driver for virtual instances of i82599.
device ixv: ether, ifnet, arp, mii, mii_phy
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.99 src/sys/dev/pci/ixgbe/ix_txrx.c:1.100
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.99 Sun Aug 7 09:37:47 2022
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Fri Sep 16 03:05:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.99 2022/08/07 09:37:47 andvar Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.100 2022/09/16 03:05:51 knakahara Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.99 2022/08/07 09:37:47 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.100 2022/09/16 03:05:51 knakahara Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -250,6 +250,11 @@ ixgbe_mq_start(struct ifnet *ifp, struct
IXGBE_EVC_ADD(>pcq_drops, 1);
return ENOBUFS;
}
+#ifdef IXGBE_ALWAYS_TXDEFER
+ kpreempt_disable();
+ softint_schedule(txr->txr_si);
+ kpreempt_enable();
+#else
if (IXGBE_TX_TRYLOCK(txr)) {
ixgbe_mq_start_locked(ifp, txr);
IXGBE_TX_UNLOCK(txr);
@@ -279,6 +284,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
kpreempt_enable();
}
}
+#endif
return (0);
} /* ixgbe_mq_start */
Index: src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.16 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.17
--- src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.16 Tue Jan 25 03:40:29 2022
+++ src/sys/dev/pci/ixgbe/ixgbe_netbsd.h Fri Sep 16 03:05:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_netbsd.h,v 1.16 2022/01/25 03:40:29 msaitoh Exp $ */
+/* $NetBSD: ixgbe_netbsd.h,v 1.17 2022/09/16 03:05:51 knakahara Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,6 +31,10 @@
#ifndef _IXGBE_NETBSD_H
#define _IXGBE_NETBSD_H
+#ifdef _KERNEL_OPT
+#include "opt_if_ixg.h"
+#endif
+
#if 0 /* Enable this if you don't want to use TX multiqueue function */
#define IXGBE_LEGACY_TX 1
#endif
CVS commit: src/sys/dev/pci
Module Name:src Committed By: knakahara Date: Fri Sep 16 03:05:52 UTC 2022 Modified Files: src/sys/dev/pci: files.pci src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe_netbsd.h Log Message: ixg(4) add an option for Tx to use deferred softint regardless of whether can get txq lock or not. That imporve (7%) and stabilize throughput. But that can cause latency degradation, so off by default. ok'ed by msaitoh@n.o. To generate a diff of this commit: cvs rdiff -u -r1.441 -r1.442 src/sys/dev/pci/files.pci cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/nvmm
Hi Taylor, Thanks for updating NVMM! Would it be a good idea to sync our code with DragonBSDs? AFAICS they kept the code compiling for NetBSD too. To have a common code base? With regards, Reinoud On Tue, Sep 13, 2022 at 08:10:04PM +, Taylor R Campbell wrote: > Module Name: src > Committed By: riastradh > Date: Tue Sep 13 20:10:04 UTC 2022 > > Modified Files: > src/sys/dev/nvmm: nvmm.c nvmm_internal.h > src/sys/dev/nvmm/x86: nvmm_x86_vmx.c > > Log Message: > nvmm(4): Add suspend/resume support. > > New MD nvmm_impl callbacks: > > - .suspend_interrupt forces all VMs on all physical CPUs to exit. > - .vcpu_suspend suspends an individual vCPU on a machine. > - .machine_suspend suspends an individual machine. > - .suspend suspends the whole system. > - .resume resumes the whole system. > - .machine_resume resumes an individual machine. > - .vcpu_resume resumes an indidivudal vCPU on a machine. > > Suspending nvmm: > > 1. causes new VM operations (ioctl and close) to block until resumed, > 2. uses .suspend_interrupt to interrupt any concurrent and force them >to return early, and then > 3. uses the various suspend callbacks to suspend all vCPUs, machines, >and the whole system -- all vCPUs before the machine they're on, >and all machines before the system. > > Resuming nvmm does the reverse of (3) -- resume system, resume each > machine and then the vCPUs on that machine -- and then unblocks > operations. > > Implemented only for x86-vmx for now: > > - suspend_interrupt triggers a TLB IPI to cause VM exits; > - vcpu_suspend issues VMCLEAR to force any in-CPU state to be written > to memory; > - machine_suspend does nothing; > - suspend does VMXOFF on all CPUs; > - resume does VMXON on all CPUs; > - machine_resume does nothing; and > - vcpu_resume just marks each vCPU as valid but inactive so > subsequent use will clear it and load it with vmptrld. > > x86-svm left as an exercise for the reader. > > > To generate a diff of this commit: > cvs rdiff -u -r1.46 -r1.47 src/sys/dev/nvmm/nvmm.c > cvs rdiff -u -r1.20 -r1.21 src/sys/dev/nvmm/nvmm_internal.h > cvs rdiff -u -r1.84 -r1.85 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Thu Sep 15 18:00:36 UTC 2022 Modified Files: src/bin/sh: sh.1 Log Message: Correct spelling of terminal (it doesn't have a 2nd m). To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Thu Sep 15 18:00:36 UTC 2022 Modified Files: src/bin/sh: sh.1 Log Message: Correct spelling of terminal (it doesn't have a 2nd m). To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.244 src/bin/sh/sh.1:1.245 --- src/bin/sh/sh.1:1.244 Fri Aug 19 13:37:03 2022 +++ src/bin/sh/sh.1 Thu Sep 15 18:00:36 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: sh.1,v 1.244 2022/08/19 13:37:03 kre Exp $ +.\" $NetBSD: sh.1,v 1.245 2022/09/15 18:00:36 kre Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -392,7 +392,7 @@ or given at invocation of .Nm ) , and standard input and standard error refer to -terminmal type devices. +terminal type devices. .It Fl L Em local_lineno When set, before a function is defined, causes the variable
CVS commit: src/usr.bin/make
Module Name:src Committed By: uwe Date: Thu Sep 15 14:49:37 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make(1): fix and simplify optional negation on conditional To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.346 src/usr.bin/make/make.1:1.347 --- src/usr.bin/make/make.1:1.346 Thu Sep 15 14:39:33 2022 +++ src/usr.bin/make/make.1 Thu Sep 15 14:49:36 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.346 2022/09/15 14:39:33 uwe Exp $ +.\" $NetBSD: make.1,v 1.347 2022/09/15 14:49:36 uwe Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -1903,40 +1903,41 @@ exits immediately. .El .Ss Conditionals The directives for conditionals are: +.ds maybenot Oo Ic \&! Oc Ns .Bl -tag -width Ds -.It Ic \&.if Oo \&! Oc Ns Ar expression Op Ar operator expression No ... +.It Ic .if \*[maybenot] Ar expression Op Ar operator expression No ... Test the value of an expression. -.It Ic .ifdef Oo \&! Oc Ns Ar variable Op Ar operator variable No ... +.It Ic .ifdef \*[maybenot] Ar variable Op Ar operator variable No ... Test the value of a variable. -.It Ic .ifndef Oo \&! Oc Ns Ar variable Op Ar operator variable No ... +.It Ic .ifndef \*[maybenot] Ar variable Op Ar operator variable No ... Test the value of a variable. -.It Ic .ifmake Oo \&! Oc Ns Ar target Op Ar operator target No ... +.It Ic .ifmake \*[maybenot] Ar target Op Ar operator target No ... Test the target being requested. -.It Ic .ifnmake Oo \&! Oc Ns Ar target Op Ar operator target No ... +.It Ic .ifnmake \*[maybenot] Ar target Op Ar operator target No ... Test the target being requested. .It Ic .else Reverse the sense of the last conditional. -.It Ic .elif Oo \&! Oc Ns Ar expression Op Ar operator expression No ... +.It Ic .elif \*[maybenot] Ar expression Op Ar operator expression No ... A combination of .Sq Ic .else followed by .Sq Ic .if . -.It Ic .elifdef Oo \&! Oc Ns Ar variable Op Ar operator variable No ... +.It Ic .elifdef \*[maybenot] Ar variable Op Ar operator variable No ... A combination of .Sq Ic .else followed by .Sq Ic .ifdef . -.It Ic .elifndef Oo \&! Oc Ns Ar variable Op Ar operator variable No ... +.It Ic .elifndef \*[maybenot] Ar variable Op Ar operator variable No ... A combination of .Sq Ic .else followed by .Sq Ic .ifndef . -.It Ic .elifmake Oo \&! Oc Ns Ar target Op Ar operator target No ... +.It Ic .elifmake \*[maybenot] Ar target Op Ar operator target No ... A combination of .Sq Ic .else followed by .Sq Ic .ifmake . -.It Ic .elifnmake Oo \&! Oc Ns Ar target Op Ar operator target No ... +.It Ic .elifnmake \*[maybenot] Ar target Op Ar operator target No ... A combination of .Sq Ic .else followed by
CVS commit: src/usr.bin/make
Module Name:src Committed By: uwe Date: Thu Sep 15 14:49:37 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make(1): fix and simplify optional negation on conditional To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: uwe
Date: Thu Sep 15 14:39:33 UTC 2022
Modified Files:
src/usr.bin/make: make.1
Log Message:
make(1): use .Dl for one-line literal display
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/usr.bin/make/make.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.345 src/usr.bin/make/make.1:1.346
--- src/usr.bin/make/make.1:1.345 Wed Sep 14 20:39:23 2022
+++ src/usr.bin/make/make.1 Thu Sep 15 14:39:33 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.345 2022/09/14 20:39:23 rillig Exp $
+.\" $NetBSD: make.1,v 1.346 2022/09/15 14:39:33 uwe Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -1148,9 +1148,7 @@ iterations of the loop rather than a spa
For example, in case of an error,
.Nm
prints the variable names and their values using:
-.Bd -literal -offset indent
-${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@}
-.Ed
+.Dl ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@}
.It Va .OBJDIR
A path to the directory where the targets are built.
Its value is determined by trying to
CVS commit: src/usr.bin/make
Module Name:src Committed By: uwe Date: Thu Sep 15 14:39:33 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make(1): use .Dl for one-line literal display To generate a diff of this commit: cvs rdiff -u -r1.345 -r1.346 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86
Module Name:src Committed By: msaitoh Date: Thu Sep 15 14:34:22 UTC 2022 Modified Files: src/sys/arch/x86/include: cpu_ucode.h src/sys/arch/x86/x86: cpu_ucode_intel.c Log Message: Verify checksum of the extended signature table. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/include/cpu_ucode.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/x86/cpu_ucode_intel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: msaitoh
Date: Thu Sep 15 14:34:22 UTC 2022
Modified Files:
src/sys/arch/x86/include: cpu_ucode.h
src/sys/arch/x86/x86: cpu_ucode_intel.c
Log Message:
Verify checksum of the extended signature table.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/include/cpu_ucode.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/x86/cpu_ucode_intel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/cpu_ucode.h
diff -u src/sys/arch/x86/include/cpu_ucode.h:1.4 src/sys/arch/x86/include/cpu_ucode.h:1.5
--- src/sys/arch/x86/include/cpu_ucode.h:1.4 Sat Mar 17 15:56:32 2018
+++ src/sys/arch/x86/include/cpu_ucode.h Thu Sep 15 14:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode.h,v 1.4 2018/03/17 15:56:32 christos Exp $ */
+/* $NetBSD: cpu_ucode.h,v 1.5 2022/09/15 14:34:22 msaitoh Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -69,17 +69,16 @@ struct intel1_ucode_header {
uint32_t uh_reserved[3];
};
-struct intel1_ucode_proc_signature {
- uint32_t ups_signature;
- uint32_t ups_proc_flags;
- uint32_t ups_checksum;
-};
-
struct intel1_ucode_ext_table {
uint32_t uet_count;
uint32_t uet_checksum;
uint32_t uet_reserved[3];
- struct intel1_ucode_proc_signature uet_proc_sig[1];
+};
+
+struct intel1_ucode_proc_signature {
+ uint32_t ups_signature;
+ uint32_t ups_proc_flags;
+ uint32_t ups_checksum;
};
#endif
Index: src/sys/arch/x86/x86/cpu_ucode_intel.c
diff -u src/sys/arch/x86/x86/cpu_ucode_intel.c:1.19 src/sys/arch/x86/x86/cpu_ucode_intel.c:1.20
--- src/sys/arch/x86/x86/cpu_ucode_intel.c:1.19 Thu Sep 15 01:30:56 2022
+++ src/sys/arch/x86/x86/cpu_ucode_intel.c Thu Sep 15 14:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_intel.c,v 1.19 2022/09/15 01:30:56 msaitoh Exp $ */
+/* $NetBSD: cpu_ucode_intel.c,v 1.20 2022/09/15 14:34:22 msaitoh Exp $ */
/*
* Copyright (c) 2012, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_intel.c,v 1.19 2022/09/15 01:30:56 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_intel.c,v 1.20 2022/09/15 14:34:22 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_xen.h"
@@ -111,8 +111,10 @@ static int
cpu_ucode_intel_verify(struct cpu_ucode_softc *sc,
struct intel1_ucode_header *buf)
{
+ struct intel1_ucode_ext_table *ehdr;
uint32_t data_size, total_size, payload_size, ext_size;
uint32_t sum;
+ uint32_t *p;
int i;
if ((buf->uh_header_ver != 1) || (buf->uh_loader_rev != 1))
@@ -143,21 +145,32 @@ cpu_ucode_intel_verify(struct cpu_ucode_
if (payload_size > sc->sc_blobsize)
return EINVAL;
- /*
- * Verify checksum of update data and header. Exclude extended
- * signature.
- */
+ /* Verify checksum of update data and header(s). */
sum = 0;
- for (i = 0; i < (payload_size / sizeof(uint32_t)); i++) {
- sum += *((uint32_t *)buf + i);
- }
+ p = (uint32_t *)buf;
+ for (i = 0; i < (payload_size / sizeof(uint32_t)); i++)
+ sum += p[i];
if (sum != 0)
return EINVAL;
- /* Extended table size. Ignored for now. */
ext_size = total_size - payload_size;
- if (ext_size > 0)
- printf("This image has extended signature table.\n");
+ if (ext_size > 0) {
+ /* This image has extended signature table. */
+ ehdr = (struct intel1_ucode_ext_table *)
+ ((uint8_t *)buf + sizeof(struct intel1_ucode_header) +
+ data_size);
+ payload_size =
+ sizeof(struct intel1_ucode_ext_table) +
+ sizeof(struct intel1_ucode_proc_signature) *
+ ehdr->uet_count;
+
+ sum = 0;
+ p = (uint32_t *)ehdr;
+ for (i = 0; i < (payload_size / sizeof(uint32_t)); i++)
+ sum += p[i];
+ if (sum != 0)
+ return EINVAL;
+ }
return 0;
}
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src
Committed By: rin
Date: Thu Sep 15 14:25:28 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c
Log Message:
fnm{add,sub}{,s}: Do not negate NaN.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/powerpc/fpu/fpu_emu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.57 src/sys/arch/powerpc/fpu/fpu_emu.c:1.58
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.57 Thu Sep 15 14:24:00 2022
+++ src/sys/arch/powerpc/fpu/fpu_emu.c Thu Sep 15 14:25:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emu.c,v 1.57 2022/09/15 14:24:00 rin Exp $ */
+/* $NetBSD: fpu_emu.c,v 1.58 2022/09/15 14:25:28 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.57 2022/09/15 14:24:00 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.58 2022/09/15 14:25:28 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -738,7 +738,8 @@ fpu_execute(struct trapframe *tf, struct
fpu_explode(fe, >fe_f2, type, FR(rb));
fp = fpu_sub(fe);
/* Negate */
-fp->fp_sign ^= 1;
+if (!ISNAN(fp))
+ fp->fp_sign ^= 1;
break;
case OPC59_FNMADDS:
FPU_EMU_EVCNT_INCR(fnmadd);
@@ -750,7 +751,8 @@ fpu_execute(struct trapframe *tf, struct
fpu_explode(fe, >fe_f2, type, FR(rb));
fp = fpu_add(fe);
/* Negate */
-fp->fp_sign ^= 1;
+if (!ISNAN(fp))
+ fp->fp_sign ^= 1;
break;
default:
return (NOTFPU);
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src
Committed By: rin
Date: Thu Sep 15 14:25:28 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c
Log Message:
fnm{add,sub}{,s}: Do not negate NaN.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/powerpc/fpu/fpu_emu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src
Committed By: rin
Date: Thu Sep 15 14:24:00 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c
Log Message:
fpu_execute(): Use FR() macro. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/fpu/fpu_emu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.56 src/sys/arch/powerpc/fpu/fpu_emu.c:1.57
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.56 Fri Sep 9 14:35:27 2022
+++ src/sys/arch/powerpc/fpu/fpu_emu.c Thu Sep 15 14:24:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emu.c,v 1.56 2022/09/09 14:35:27 rin Exp $ */
+/* $NetBSD: fpu_emu.c,v 1.57 2022/09/15 14:24:00 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.56 2022/09/09 14:35:27 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.57 2022/09/15 14:24:00 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -429,7 +429,7 @@ fpu_execute(struct trapframe *tf, struct
DPRINTF(FPE_INSN,
("fpu_execute: Store DBL at %p\n",
(void *)addr));
-if (copyout(>fpreg[rt], (void *)addr, size)) {
+if (copyout((rt), (void *)addr, size)) {
fe->fe_addr = addr;
return (FAULT);
}
@@ -439,7 +439,7 @@ fpu_execute(struct trapframe *tf, struct
FPU_EMU_EVCNT_INCR(fpload);
DPRINTF(FPE_INSN, ("fpu_execute: Load from %p\n",
(void *)addr));
- if (copyin((const void *)addr, >fpreg[rt], size)) {
+ if (copyin((const void *)addr, (rt), size)) {
fe->fe_addr = addr;
return (FAULT);
}
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src Committed By: rin Date: Thu Sep 15 14:24:00 UTC 2022 Modified Files: src/sys/arch/powerpc/fpu: fpu_emu.c Log Message: fpu_execute(): Use FR() macro. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/fpu/fpu_emu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src
Committed By: martin
Date: Thu Sep 15 11:35:06 UTC 2022
Modified Files:
src/bin/csh: csh.c extern.h set.c
Log Message:
Fix the build for variants that do not define EDIT.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/bin/csh/csh.c
cvs rdiff -u -r1.33 -r1.34 src/bin/csh/extern.h
cvs rdiff -u -r1.39 -r1.40 src/bin/csh/set.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/csh.c
diff -u src/bin/csh/csh.c:1.55 src/bin/csh/csh.c:1.56
--- src/bin/csh/csh.c:1.55 Wed Sep 14 17:06:16 2022
+++ src/bin/csh/csh.c Thu Sep 15 11:35:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.c,v 1.55 2022/09/14 17:06:16 christos Exp $ */
+/* $NetBSD: csh.c,v 1.56 2022/09/15 11:35:06 martin Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-__RCSID("$NetBSD: csh.c,v 1.55 2022/09/14 17:06:16 christos Exp $");
+__RCSID("$NetBSD: csh.c,v 1.56 2022/09/15 11:35:06 martin Exp $");
#endif
#endif /* not lint */
@@ -1139,7 +1139,9 @@ process(int catch)
pnote();
if (intty && prompt && evalvec == 0) {
mailchk();
+#ifdef EDIT
updateediting();
+#endif
/*
* If we are at the end of the input buffer then we are going to
* read fresh stuff. Otherwise, we are rereading input and don't
Index: src/bin/csh/extern.h
diff -u src/bin/csh/extern.h:1.33 src/bin/csh/extern.h:1.34
--- src/bin/csh/extern.h:1.33 Wed Sep 14 16:15:51 2022
+++ src/bin/csh/extern.h Thu Sep 15 11:35:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.33 2022/09/14 16:15:51 christos Exp $ */
+/* $NetBSD: extern.h,v 1.34 2022/09/15 11:35:06 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -291,7 +291,9 @@ void unsetv(Char *);
void setNS(Char *);
void shift(Char **, struct command *);
void plist(struct varent *);
+#ifdef EDIT
void updateediting(void);
+#endif
/*
* time.c
Index: src/bin/csh/set.c
diff -u src/bin/csh/set.c:1.39 src/bin/csh/set.c:1.40
--- src/bin/csh/set.c:1.39 Wed Sep 14 16:15:51 2022
+++ src/bin/csh/set.c Thu Sep 15 11:35:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: set.c,v 1.39 2022/09/14 16:15:51 christos Exp $ */
+/* $NetBSD: set.c,v 1.40 2022/09/15 11:35:06 martin Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: set.c,v 1.39 2022/09/14 16:15:51 christos Exp $");
+__RCSID("$NetBSD: set.c,v 1.40 2022/09/15 11:35:06 martin Exp $");
#endif
#endif /* not lint */
@@ -59,9 +59,9 @@ static void unsetv1(struct varent *);
static void exportpath(Char **);
static void balance(struct varent *, int, int);
+#ifdef EDIT
static int wantediting;
-#ifdef EDIT
static const char *
alias_text(void *dummy __unused, const char *name)
{
@@ -555,6 +555,7 @@ unset(Char **v, struct command *t)
#endif
}
+#ifdef EDIT
extern int insource;
void
updateediting(void)
@@ -590,6 +591,7 @@ updateediting(void)
}
editing = wantediting;
}
+#endif
void
unset1(Char *v[], struct varent *head)
CVS commit: src/bin/csh
Module Name:src Committed By: martin Date: Thu Sep 15 11:35:06 UTC 2022 Modified Files: src/bin/csh: csh.c extern.h set.c Log Message: Fix the build for variants that do not define EDIT. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/bin/csh/csh.c cvs rdiff -u -r1.33 -r1.34 src/bin/csh/extern.h cvs rdiff -u -r1.39 -r1.40 src/bin/csh/set.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: skrll Date: Thu Sep 15 06:44:18 UTC 2022 Modified Files: src/sys/uvm/pmap: pmap.c Log Message: whitespace - remove spaces before tabs To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/uvm/pmap/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: skrll
Date: Thu Sep 15 06:44:18 UTC 2022
Modified Files:
src/sys/uvm/pmap: pmap.c
Log Message:
whitespace - remove spaces before tabs
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/uvm/pmap/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.66 src/sys/uvm/pmap/pmap.c:1.67
--- src/sys/uvm/pmap/pmap.c:1.66 Mon Sep 12 07:38:32 2022
+++ src/sys/uvm/pmap/pmap.c Thu Sep 15 06:44:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.66 2022/09/12 07:38:32 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.67 2022/09/15 06:44:18 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.66 2022/09/12 07:38:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.67 2022/09/15 06:44:18 skrll Exp $");
/*
* Manages physical address maps.
@@ -253,7 +253,7 @@ u_int pmap_page_colormask;
#define PAGE_IS_MANAGED(pa) (pmap_initialized && uvm_pageismanaged(pa))
#define PMAP_IS_ACTIVE(pm) \
- ((pm) == pmap_kernel() || \
+ ((pm) == pmap_kernel() || \
(pm) == curlwp->l_proc->p_vmspace->vm_map.pmap)
/* Forward function declarations */
@@ -290,7 +290,7 @@ struct pool_allocator pmap_pv_page_alloc
#define pmap_tlb_miss_lock_enter() pmap_md_tlb_miss_lock_enter()
#define pmap_tlb_miss_lock_exit() pmap_md_tlb_miss_lock_exit()
#else
-kmutex_t pmap_tlb_miss_lock __cacheline_aligned;
+kmutex_t pmap_tlb_miss_lock __cacheline_aligned;
static void
pmap_tlb_miss_lock_init(void)
@@ -1369,7 +1369,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
if (resident) {
if (pte_to_paddr(opte) != pa) {
KASSERT(!is_kernel_pmap_p);
- const pt_entry_t rpte = pte_nv_entry(false);
+ const pt_entry_t rpte = pte_nv_entry(false);
pmap_addr_range_check(pmap, va, va + NBPG, __func__);
pmap_pte_process(pmap, va, va + NBPG, pmap_pte_remove,
@@ -1870,7 +1870,7 @@ pmap_pvlist_check(struct vm_page_md *mdp
colors, VM_PAGEMD_UNCACHED_P(mdpg));
#endif
} else {
- KASSERT(pv->pv_next == NULL);
+ KASSERT(pv->pv_next == NULL);
}
#endif /* DEBUG */
}
