filt_timerexpire: do not iterate over the interval

[kib]

Summary

User-supplied data might make this loop too time-consuming. Divide directly, and handle both the possibility that we were woken up earlier, and arithmetic overflows/underflows from the calculation.

Reported by: pho

[markj]

sys/kern/kern_event.c

742

This case represents the timer firing early - why do we adjust anything here?

[kib]

sys/kern/kern_event.c

742

Because it is activating knote, which was done before too.

[kib]

Skip activation for the case now <= kc_next, and do not increment data.

sys/kern/kern_event.c

if (error != E_OK)
                 return (EIO);
 
         sc->sc_ifnet->if_drv_flags &= ~IFF_DRV_RUNNING;
 
         return (0);
 }
 
 static int
-dtsec_if_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
+dtsec_if_ioctl(if_t ifp, u_long command, caddr_t data)
 {
         struct dtsec_softc *sc;
         struct ifreq *ifr;
         int error;
 
-        sc = ifp->if_softc;
+        sc = if_getsoftc(ifp);
         ifr = (struct ifreq *)data;
         error = 0;
 
         /* Basic functionality to achieve media status reports */
         switch (command) {
         case SIOCSIFMTU:
                 DTSEC_LOCK(sc);
                 if (dtsec_set_mtu(sc, ifr->ifr_mtu))
-                        ifp->if_mtu = ifr->ifr_mtu;
+                        if_setmtu(ifp, ifr->ifr_mtu);
                 else
                         error = EINVAL;
                 DTSEC_UNLOCK(sc);
                 break;
         case SIOCSIFFLAGS:
                 DTSEC_LOCK(sc);
 
                 if (sc->sc_ifnet->if_flags & IFF_UP)

 dtsec_if_init_locked(struct dtsec_softc *sc)
 {
         int error;
 
         DTSEC_LOCK_ASSERT(sc);
 
         /* Set MAC address */
         error = FM_MAC_ModifyMacAddr(sc->sc_mach,
-            (t_EnetAddr *)IF_LLADDR(sc->sc_ifnet));
+            (t_EnetAddr *)if_getlladdr(sc->sc_ifnet));
         if (error != E_OK) {
                 device_printf(sc->sc_dev, "couldn't set MAC address.\n");
                 goto err;
         }
 
         /* Start MII polling */
         if (sc->sc_mii)
                 callout_reset(&sc->sc_tick_callout, hz, dtsec_if_tick, sc);
dtsec_if_init(void *data)
         sc = data;
 
         DTSEC_LOCK(sc);
         dtsec_if_init_locked(sc);
         DTSEC_UNLOCK(sc);
 }
 
 static void
-dtsec_if_start(struct ifnet *ifp)
+dtsec_if_start(if_t ifp)
 {
         struct dtsec_softc *sc;
 
-        sc = ifp->if_softc;
+        sc = if_getsoftc(ifp);
         DTSEC_LOCK(sc);
         sc->sc_start_locked(sc);
         DTSEC_UNLOCK(sc);
 }
 
 static void
-dtsec_if_watchdog(struct ifnet *ifp)
+dtsec_if_watchdog(if_t ifp)
 {
         /* TODO */
 }
 /** @} */
 
 
 /**
  * @group IFmedia routines.
  * @{
  */
 static int
-dtsec_ifmedia_upd(struct ifnet *ifp)
+dtsec_ifmedia_upd(if_t ifp)
 {
-        struct dtsec_softc *sc = ifp->if_softc;
+        struct dtsec_softc *sc = if_getsoftc(ifp);
 
         DTSEC_LOCK(sc);
         mii_mediachg(sc->sc_mii);
         DTSEC_UNLOCK(sc);
 
         return (0);
 }
 
 static void
-dtsec_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
+dtsec_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr)
 {
-        struct dtsec_softc *sc = ifp->if_softc;
+        struct dtsec_softc *sc = if_getsoftc(ifp);
 
         DTSEC_LOCK(sc);
 
         mii_pollstat(sc->sc_mii);
 
         ifmr->ifm_active = sc->sc_mii->mii_media_active;
         ifmr->ifm_status = sc->sc_mii->mii_media_status;
 

 }
 
 int
 dtsec_attach(device_t dev)
 {
         struct dtsec_softc *sc;
         device_t parent;
         int error;
-        struct ifnet *ifp;
+        if_t ifp;
 
         sc = device_get_softc(dev);
 
         parent = device_get_parent(dev);
         sc->sc_dev = dev;
         sc->sc_mac_mdio_irq = NO_IRQ;
 
         /* Check if MallocSmart allocator is ready */
dtsec_attach(device_t dev)
         /* Create network interface for upper layers */
         ifp = sc->sc_ifnet = if_alloc(IFT_ETHER);
         if (ifp == NULL) {
                 device_printf(sc->sc_dev, "if_alloc() failed.\n");
                 dtsec_detach(dev);
                 return (ENOMEM);
         }
 
-        ifp->if_softc = sc;
-        ifp->if_mtu = ETHERMTU;        /* TODO: Configure */
-        ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST;
-        ifp->if_init = dtsec_if_init;
-        ifp->if_start = dtsec_if_start;
-        ifp->if_ioctl = dtsec_if_ioctl;
-        ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+        if_setsoftc(ifp, sc);
 
+        if_setflags(ifp, IFF_SIMPLEX | IFF_BROADCAST);
+        if_setinitfn(ifp, dtsec_if_init);
+        if_setstartfn(ifp, dtsec_if_start);
+        if_setioctlfn(ifp, dtsec_if_ioctl);
+        if_setsendqlen(ifp, IFQ_MAXLEN);
+
         if (sc->sc_phy_addr >= 0)
                 if_initname(ifp, device_get_name(sc->sc_dev),
                     device_get_unit(sc->sc_dev));
         else
                 if_initname(ifp, "dtsec_phy", device_get_unit(sc->sc_dev));
 
         /* TODO */
 #if 0
-        IFQ_SET_MAXLEN(&ifp->if_snd, TSEC_TX_NUM_DESC - 1);
-        ifp->if_snd.ifq_drv_maxlen = TSEC_TX_NUM_DESC - 1;
-        IFQ_SET_READY(&ifp->if_snd);
+        if_setsendqlen(ifp, TSEC_TX_NUM_DESC - 1);
+        if_setsendqready(ifp);
 #endif
-        ifp->if_capabilities = IFCAP_JUMBO_MTU; /* TODO: HWCSUM */
-        ifp->if_capenable = ifp->if_capabilities;
+
+        if_setcapenable(ifp, if_getcapabilities(ifp));
 
         /* Attach PHY(s) */
         error = mii_attach(sc->sc_dev, &sc->sc_mii_dev, ifp, dtsec_ifmedia_upd,
             dtsec_ifmedia_sts, BMSR_DEFCAPMASK, sc->sc_phy_addr,
             MII_OFFSET_ANY, 0);
         if (error) {
                 device_printf(sc->sc_dev, "attaching PHYs failed: %d\n", error);
                 dtsec_detach(sc->sc_dev);