CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Fri Oct 13 04:43:36 UTC 2023 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: ixl(4): limit receive frame size upto 9600 even if ETHERCAP_VLAN_MTU is enabled To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 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: yamaguchi Date: Fri Oct 13 04:43:36 UTC 2023 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: ixl(4): limit receive frame size upto 9600 even if ETHERCAP_VLAN_MTU is enabled To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 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/if_ixl.c diff -u src/sys/dev/pci/if_ixl.c:1.94 src/sys/dev/pci/if_ixl.c:1.95 --- src/sys/dev/pci/if_ixl.c:1.94 Fri Oct 13 02:22:20 2023 +++ src/sys/dev/pci/if_ixl.c Fri Oct 13 04:43:35 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ixl.c,v 1.94 2023/10/13 02:22:20 yamaguchi Exp $ */ +/* $NetBSD: if_ixl.c,v 1.95 2023/10/13 04:43:35 yamaguchi Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -74,7 +74,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.94 2023/10/13 02:22:20 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.95 2023/10/13 04:43:35 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -166,7 +166,8 @@ struct ixl_softc; /* defined */ #define IXL_MCLBYTES (MCLBYTES - ETHER_ALIGN) #define IXL_MTU_ETHERLEN ETHER_HDR_LEN \ - + ETHER_CRC_LEN + + ETHER_CRC_LEN \ + + ETHER_VLAN_ENCAP_LEN #if 0 #define IXL_MAX_MTU (9728 - IXL_MTU_ETHERLEN) #else @@ -3067,8 +3068,8 @@ ixl_rxr_config(struct ixl_softc *sc, str memset(&rxq, 0, sizeof(rxq)); rxmax = ifp->if_mtu + IXL_MTU_ETHERLEN; - if (ISSET(sc->sc_ec.ec_capenable, ETHERCAP_VLAN_MTU)) - rxmax += ETHER_VLAN_ENCAP_LEN; + if (!ISSET(sc->sc_ec.ec_capenable, ETHERCAP_VLAN_MTU)) + rxmax -= ETHER_VLAN_ENCAP_LEN; rxq.head = htole16(rxr->rxr_cons); rxq.base = htole64(IXL_DMA_DVA(&rxr->rxr_mem) / IXL_HMC_RXQ_BASE_UNIT);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Fri Oct 13 02:22:20 UTC 2023
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
ixl(4): added ETHERCAP_VLAN_MTU support
PR kern/57652
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 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/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.93 src/sys/dev/pci/if_ixl.c:1.94
--- src/sys/dev/pci/if_ixl.c:1.93 Wed Oct 11 07:44:53 2023
+++ src/sys/dev/pci/if_ixl.c Fri Oct 13 02:22:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.93 2023/10/11 07:44:53 rin Exp $ */
+/* $NetBSD: if_ixl.c,v 1.94 2023/10/13 02:22:20 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.93 2023/10/11 07:44:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.94 2023/10/13 02:22:20 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1322,6 +1322,7 @@ ixl_attach(device_t parent, device_t sel
#endif
ether_set_vlan_cb(&sc->sc_ec, ixl_vlan_cb);
sc->sc_ec.ec_capabilities |= ETHERCAP_JUMBO_MTU;
+ sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_HWTAGGING;
sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_HWFILTER;
@@ -3066,6 +3067,8 @@ ixl_rxr_config(struct ixl_softc *sc, str
memset(&rxq, 0, sizeof(rxq));
rxmax = ifp->if_mtu + IXL_MTU_ETHERLEN;
+ if (ISSET(sc->sc_ec.ec_capenable, ETHERCAP_VLAN_MTU))
+ rxmax += ETHER_VLAN_ENCAP_LEN;
rxq.head = htole16(rxr->rxr_cons);
rxq.base = htole64(IXL_DMA_DVA(&rxr->rxr_mem) / IXL_HMC_RXQ_BASE_UNIT);
@@ -5671,14 +5674,14 @@ ixl_ifflags_cb(struct ethercom *ec)
{
struct ifnet *ifp = &ec->ec_if;
struct ixl_softc *sc = ifp->if_softc;
- int rv, change;
+ int rv, change, reset_bits;
mutex_enter(&sc->sc_cfg_lock);
change = ec->ec_capenable ^ sc->sc_cur_ec_capenable;
-
- if (ISSET(change, ETHERCAP_VLAN_HWTAGGING)) {
- sc->sc_cur_ec_capenable ^= ETHERCAP_VLAN_HWTAGGING;
+ reset_bits = change & (ETHERCAP_VLAN_HWTAGGING | ETHERCAP_VLAN_MTU);
+ if (reset_bits != 0) {
+ sc->sc_cur_ec_capenable ^= reset_bits;
rv = ENETRESET;
goto out;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Fri Oct 13 02:22:20 UTC 2023 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: ixl(4): added ETHERCAP_VLAN_MTU support PR kern/57652 To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 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/kern
Module Name:src
Committed By: ad
Date: Thu Oct 12 23:51:06 UTC 2023
Modified Files:
src/sys/kern: kern_condvar.c
Log Message:
Comments.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_condvar.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/kern/kern_condvar.c
diff -u src/sys/kern/kern_condvar.c:1.58 src/sys/kern/kern_condvar.c:1.59
--- src/sys/kern/kern_condvar.c:1.58 Sun Oct 8 13:23:05 2023
+++ src/sys/kern/kern_condvar.c Thu Oct 12 23:51:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_condvar.c,v 1.58 2023/10/08 13:23:05 ad Exp $ */
+/* $NetBSD: kern_condvar.c,v 1.59 2023/10/12 23:51:05 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2019, 2020, 2023
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.58 2023/10/08 13:23:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.59 2023/10/12 23:51:05 ad Exp $");
#include
#include
@@ -451,8 +451,9 @@ cv_timedwaitbt_sig(kcondvar_t *cv, kmute
/*
* cv_signal:
*
- * Wake the highest priority LWP waiting on a condition variable.
- * Must be called with the interlocking mutex held.
+ * Wake the highest priority LWP waiting on a condition variable. Must
+ * be called with the interlocking mutex held or just after it has been
+ * released (so the awoken LWP will see the changed condition).
*/
void
cv_signal(kcondvar_t *cv)
@@ -460,8 +461,13 @@ cv_signal(kcondvar_t *cv)
KASSERT(cv_is_valid(cv));
- if (__predict_false(!LIST_EMPTY(CV_SLEEPQ(cv
+ if (__predict_false(!LIST_EMPTY(CV_SLEEPQ(cv {
+ /*
+ * Compiler turns into a tail call usually, i.e. jmp,
+ * because the arguments are the same and no locals.
+ */
cv_wakeup_one(cv);
+ }
}
/*
@@ -492,8 +498,9 @@ cv_wakeup_one(kcondvar_t *cv)
/*
* cv_broadcast:
*
- * Wake all LWPs waiting on a condition variable. Must be called
- * with the interlocking mutex held.
+ * Wake all LWPs waiting on a condition variable. Must be called with
+ * the interlocking mutex held or just after it has been released (so
+ * the awoken LWP will see the changed condition).
*/
void
cv_broadcast(kcondvar_t *cv)
@@ -501,8 +508,13 @@ cv_broadcast(kcondvar_t *cv)
KASSERT(cv_is_valid(cv));
- if (__predict_false(!LIST_EMPTY(CV_SLEEPQ(cv
+ if (__predict_false(!LIST_EMPTY(CV_SLEEPQ(cv {
+ /*
+ * Compiler turns into a tail call usually, i.e. jmp,
+ * because the arguments are the same and no locals.
+ */
cv_wakeup_all(cv);
+ }
}
/*
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Thu Oct 12 23:51:06 UTC 2023 Modified Files: src/sys/kern: kern_condvar.c Log Message: Comments. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_condvar.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: riastradh Date: Thu Oct 12 17:18:39 UTC 2023 Modified Files: src/crypto/external/bsd/heimdal: Makefile.inc src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile src/crypto/external/bsd/heimdal/sbin/hprop: Makefile src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile src/crypto/external/bsd/heimdal/sbin/kdc: Makefile src/crypto/external/bsd/heimdal/sbin/kstash: Makefile Log Message: heimdal: Make sure whatever uses libhdb also gets libsqlite3 & libm. Loose ends for static builds in the fix for PR lib/57406. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/heimdal/Makefile.inc cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: riastradh
Date: Thu Oct 12 17:18:39 UTC 2023
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
Log Message:
heimdal: Make sure whatever uses libhdb also gets libsqlite3 & libm.
Loose ends for static builds in the fix for PR lib/57406.
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.10 src/crypto/external/bsd/heimdal/Makefile.inc:1.11
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.10 Wed Oct 11 14:08:25 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc Thu Oct 12 17:18:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2023/10/11 14:08:25 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.11 2023/10/12 17:18:38 riastradh Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -24,6 +24,8 @@ DPLIBVERS= vers ${HEIMBASE}/lib/libvers
DPLIBWIND= wind ${HEIMBASE}/lib/libwind
KRB5LDADD= -lcrypto -lcrypt
KRB5DPADD= ${LIBCRYPTO} ${LIBCRYPT}
+HDBLDADD= -lsqlite3 -lm
+HDBDPADD= ${LIBSQLITE3} ${LIBM}
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.6
--- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5 Thu Jun 22 22:39:37 2023
+++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile Thu Oct 12 17:18:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${D
.include <${HEIMBASE}/Makefile.rules.inc>
.include
-LDADD+= ${KRB5LDADD}
-DPADD+= ${KRB5DPADD}
+LDADD+= ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.6
--- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.5 Thu Jun 22 22:39:37 2023
+++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile Thu Oct 12 17:18:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBHDB}
.include <${HEIMBASE}/Makefile.rules.inc>
.include
-LDADD+= ${KRB5LDADD}
-DPADD+= ${KRB5DPADD}
+LDADD+= ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${KRB5DPADD} ${HDBDPADD}
Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.6
--- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.5 Thu Jun 22
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Thu Oct 12 11:33:39 UTC 2023
Modified Files:
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/arm/include/arm32: pmap.h
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/iq80310: iq80310_machdep.c
src/sys/arch/evbarm/iq80321: iq80321_machdep.c
src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c
src/sys/arch/evbarm/iyonix: iyonix_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
Log Message:
Fix non-DIAGNOSTIC builds
To generate a diff of this commit:
cvs rdiff -u -r1.439 -r1.440 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/zaurus/zaurus/machdep.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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.439 src/sys/arch/arm/arm32/pmap.c:1.440
--- src/sys/arch/arm/arm32/pmap.c:1.439 Thu Apr 20 08:28:03 2023
+++ src/sys/arch/arm/arm32/pmap.c Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.439 2023/04/20 08:28:03 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.440 2023/10/12 11:33:37 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -193,7 +193,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.439 2023/04/20 08:28:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.440 2023/10/12 11:33:37 skrll Exp $");
#include
#include
@@ -7594,8 +7594,6 @@ pmap_pte_init_xscale(void)
void
xscale_setup_minidata(vaddr_t l1pt, vaddr_t va, paddr_t pa)
{
- extern vaddr_t xscale_minidata_clean_addr;
- extern vsize_t xscale_minidata_clean_size; /* already initialized */
pd_entry_t *pde = (pd_entry_t *) l1pt;
vsize_t size;
uint32_t auxctl;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.176 src/sys/arch/arm/include/arm32/pmap.h:1.177
--- src/sys/arch/arm/include/arm32/pmap.h:1.176 Wed Aug 2 15:57:21 2023
+++ src/sys/arch/arm/include/arm32/pmap.h Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.176 2023/08/02 15:57:21 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.177 2023/10/12 11:33:37 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -727,6 +727,15 @@ extern pt_entry_t pte_l2_s_proto;
extern void (*pmap_copy_page_func)(paddr_t, paddr_t);
extern void (*pmap_zero_page_func)(paddr_t);
+/*
+ * Global varaiables in cpufunc_asm_xscale.S supporting the Xscale
+ * cache clean/purge functions.
+ */
+extern vaddr_t xscale_minidata_clean_addr;
+extern vsize_t xscale_minidata_clean_size;
+extern vaddr_t xscale_cache_clean_addr;
+extern vsize_t xscale_cache_clean_size;
+
#endif /* !_LOCORE */
/*/
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.52 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.53
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.52 Thu Apr 20 08:28:03 2023
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Thu Oct 12 11:33:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.52 2023/04/20 08:28:03 skrll Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.53 2023/10/12 11:33:37 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.52 2023/04/20 08:28:03 skr
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Thu Oct 12 11:33:39 UTC 2023 Modified Files: src/sys/arch/arm/arm32: pmap.c src/sys/arch/arm/include/arm32: pmap.h src/sys/arch/evbarm/adi_brh: brh_machdep.c src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c src/sys/arch/evbarm/gumstix: gumstix_machdep.c src/sys/arch/evbarm/hdl_g: hdlg_machdep.c src/sys/arch/evbarm/iq80310: iq80310_machdep.c src/sys/arch/evbarm/iq80321: iq80321_machdep.c src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c src/sys/arch/evbarm/iyonix: iyonix_machdep.c src/sys/arch/evbarm/lubbock: lubbock_machdep.c src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c src/sys/arch/evbarm/nslu2: nslu2_machdep.c src/sys/arch/evbarm/viper: viper_machdep.c src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c src/sys/arch/iyonix/iyonix: iyonix_machdep.c src/sys/arch/zaurus/zaurus: machdep.c Log Message: Fix non-DIAGNOSTIC builds To generate a diff of this commit: cvs rdiff -u -r1.439 -r1.440 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.176 -r1.177 src/sys/arch/arm/include/arm32/pmap.h cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/adi_brh/brh_machdep.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/gumstix/gumstix_machdep.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/iq80310/iq80310_machdep.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/iq80321/iq80321_machdep.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iyonix/iyonix_machdep.c cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/lubbock/lubbock_machdep.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/nslu2/nslu2_machdep.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/viper/viper_machdep.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/iyonix/iyonix/iyonix_machdep.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/zaurus/zaurus/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/kern
> Date: Thu, 12 Oct 2023 17:06:02 +0900 > From: Rin Okuyama > > On Thu, Oct 5, 2023 at 5:39â¯AM Andrew Doran wrote: > > > > Module Name:src > > Committed By: ad > > Date: Wed Oct 4 20:39:35 UTC 2023 > > > > Modified Files: > > src/sys/kern: kern_rwlock.c kern_turnstile.c > > > > Log Message: > > Turnstiles: use the syncobj name for ps/top wmesg when sleeping since it's > > more informative than "tstile". > > Cool! Can I send a pull up request to netbsd-10? Not sure -- it would depend on this commit to introduce struct syncobj::sobj_name: https://mail-index.netbsd.org/source-changes/2023/07/17/msg146058.html This is a potential kernel ABI change. I didn't investigate to determine whether it would be safe to pull up.
Re: CVS commit: src/sys
> On 10. Oct 2023, at 20:58, Andrew Doran wrote: > > On Tue, Oct 10, 2023 at 06:00:57PM +0200, J. Hannken-Illjes wrote: > >>> cvs rdiff -u -r1.63 -r1.64 src/sys/kern/sys_select.c >> >> -sleepq_unsleep(l, false); >> +sleepq_remove(l->l_sleepq, l, true); >>} >> } >> mutex_spin_exit(lock); >> >> Looks like sleepq_remove() unlocks l->l_mutex == lock and >> then mutex_spin_exit(lock) will unlock an unlocked mutex. > > lock is held before the call to sleepq_remove() and this is also true at the > time: l->l_mutex == lock. > > After the call lock is still held, but now l->l_mutex != lock, because l has > changed state (e.g LSSLEEP -> LSRUN) which causes l_mutex to change in > concert. There is a rough overview here: > > https://nxr.netbsd.org/xref/src/sys/kern/kern_lwp.c#156 > > Did you encounter a problem? This is not true for RUMP. Hero you added sleepq_remove() as "sleepq_unsleep(l, true)". This will unlock l_mutex without changing. Just poking around and using sleepq_unsleep(l, false) here makes the NFS tests using rump_server pass. -- J. Hannken-Illjes - hann...@mailbox.org signature.asc Description: Message signed with OpenPGP
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Oct 12 08:06:13 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixv.c
Log Message:
ixgbe: Don't override the {ixgbe,ixv}_max_interrupt_rate global variable.
Fix a bug that changing hw.ix[gv]X.qY.interrupt_rate would change all
devices all queues default interrupt rate.
To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.190 -r1.191 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.342 src/sys/dev/pci/ixgbe/ixgbe.c:1.343
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.342 Thu Oct 12 05:50:55 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Oct 12 08:06:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.342 2023/10/12 05:50:55 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.343 2023/10/12 08:06:13 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.342 2023/10/12 05:50:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.343 2023/10/12 08:06:13 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3379,9 +3379,9 @@ ixgbe_sysctl_interrupt_rate_handler(SYSC
&& (reg < IXGBE_MIN_RSC_EITR_10G1G))
return EINVAL;
}
- ixgbe_max_interrupt_rate = rate;
+ sc->max_interrupt_rate = rate;
} else
- ixgbe_max_interrupt_rate = 0;
+ sc->max_interrupt_rate = 0;
ixgbe_eitr_write(sc, que->msix, reg);
return (0);
@@ -3486,6 +3486,7 @@ ixgbe_add_device_sysctls(struct ixgbe_so
aprint_error_dev(dev, "could not create sysctl\n");
sc->enable_aim = ixgbe_enable_aim;
+ sc->max_interrupt_rate = ixgbe_max_interrupt_rate;
if (sysctl_createv(log, 0, &rnode, &cnode, CTLFLAG_READWRITE,
CTLTYPE_BOOL, "enable_aim", SYSCTL_DESCR("Interrupt Moderation"),
NULL, 0, &sc->enable_aim, 0, CTL_CREATE, CTL_EOL) != 0)
@@ -4394,8 +4395,8 @@ ixgbe_configure_ivars(struct ixgbe_softc
struct ix_queue *que = sc->queues;
u32 newitr;
- if (ixgbe_max_interrupt_rate > 0)
- newitr = (400 / ixgbe_max_interrupt_rate) & 0x0FF8;
+ if (sc->max_interrupt_rate > 0)
+ newitr = (400 / sc->max_interrupt_rate) & 0x0FF8;
else {
/*
* Disable DMA coalescing if interrupt moderation is
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.92 src/sys/dev/pci/ixgbe/ixgbe.h:1.93
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.92 Fri Oct 6 14:48:08 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.h Thu Oct 12 08:06:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.92 2023/10/06 14:48:08 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.93 2023/10/12 08:06:13 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -499,6 +499,7 @@ struct ixgbe_softc {
/* Info about the interface */
int advertise; /* link speeds */
bool enable_aim; /* adaptive interrupt moderation */
+ int max_interrupt_rate;
int link_active; /* Use LINK_STATE_* value */
u16 max_frame_size;
u16 num_segs;
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.190 src/sys/dev/pci/ixgbe/ixv.c:1.191
--- src/sys/dev/pci/ixgbe/ixv.c:1.190 Thu Oct 12 03:43:55 2023
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Oct 12 08:06:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.190 2023/10/12 03:43:55 msaitoh Exp $ */
+/* $NetBSD: ixv.c,v 1.191 2023/10/12 08:06:13 msaitoh Exp $ */
/**
@@ -35,7 +35,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.190 2023/10/12 03:43:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.191 2023/10/12 08:06:13 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -550,6 +550,7 @@ ixv_attach(device_t parent, device_t dev
/* hw.ix defaults init */
sc->enable_aim = ixv_enable_aim;
+ sc->max_interrupt_rate = ixv_max_interrupt_rate;
sc->txrx_use_workqueue = ixv_txrx_workqueue;
@@ -2529,9 +2530,9 @@ ixv_sysctl_interrupt_rate_handler(SYSCTL
&& (reg < IXGBE_MIN_RSC_EITR_10G1G))
return EINVAL;
}
- ixv_max_interrupt_rate = rate;
+ sc->max_interrupt_rate = rate;
} else
- ixv_max_interrupt_rate = 0;
+ sc->max_interrupt_rate = 0;
ixv_eitr_write(sc, que->msix, reg);
return (0);
Re: CVS commit: src/sys/kern
Cool! Can I send a pull up request to netbsd-10? I've not yet observed deadlocks since this was committed, fortunately or unfortunately, although ;) Thanks, rin On Thu, Oct 5, 2023 at 5:39 AM Andrew Doran wrote: > > Module Name:src > Committed By: ad > Date: Wed Oct 4 20:39:35 UTC 2023 > > Modified Files: > src/sys/kern: kern_rwlock.c kern_turnstile.c > > Log Message: > Turnstiles: use the syncobj name for ps/top wmesg when sleeping since it's > more informative than "tstile". > > > To generate a diff of this commit: > cvs rdiff -u -r1.73 -r1.74 src/sys/kern/kern_rwlock.c > cvs rdiff -u -r1.51 -r1.52 src/sys/kern/kern_turnstile.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/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Oct 12 08:06:13 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixv.c
Log Message:
ixgbe: Don't override the {ixgbe,ixv}_max_interrupt_rate global variable.
Fix a bug that changing hw.ix[gv]X.qY.interrupt_rate would change all
devices all queues default interrupt rate.
To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.190 -r1.191 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
