[BACK]Return to if_xennet_xenbus.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / xen / xen

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/arch/xen/xen/if_xennet_xenbus.c between version 1.96 and 1.97

version 1.96, 2020/03/26 18:50:16 version 1.97, 2020/03/27 18:37:30
Line 61 
Line 61 
  *   *
  * For TX:   * For TX:
  * Purpose is to transmit packets to the outside. The start of day is in   * Purpose is to transmit packets to the outside. The start of day is in
  * xennet_start() (default output routine of xennet) that schedules a softint,   * xennet_start() (output routine of xennet) scheduled via a softint.
  * xennet_softstart(). xennet_softstart() generates the requests associated   * xennet_start() generates the requests associated
  * to the TX mbufs queued (see altq(9)).   * to the TX mbufs queued (see altq(9)).
  * The backend's responses are processed by xennet_tx_complete(), called   * The backend's responses are processed by xennet_tx_complete(), called
  * from xennet_softstart()   * from xennet_start()
  *   *
  * for RX:   * for RX:
  * Purpose is to process the packets received from the outside. RX buffers   * Purpose is to process the packets received from the outside. RX buffers
Line 190  struct xennet_xenbus_softc {
Line 190  struct xennet_xenbus_softc {
         netif_rx_front_ring_t sc_rx_ring;          netif_rx_front_ring_t sc_rx_ring;
   
         unsigned int sc_evtchn;          unsigned int sc_evtchn;
         void *sc_softintr;  
         struct intrhand *sc_ih;          struct intrhand *sc_ih;
   
         grant_ref_t sc_tx_ring_gntref;          grant_ref_t sc_tx_ring_gntref;
Line 243  static void xennet_hex_dump(const unsign
Line 242  static void xennet_hex_dump(const unsign
 static int  xennet_init(struct ifnet *);  static int  xennet_init(struct ifnet *);
 static void xennet_stop(struct ifnet *, int);  static void xennet_stop(struct ifnet *, int);
 static void xennet_reset(struct xennet_xenbus_softc *);  static void xennet_reset(struct xennet_xenbus_softc *);
 static void xennet_softstart(void *);  
 static void xennet_start(struct ifnet *);  static void xennet_start(struct ifnet *);
 static int  xennet_ioctl(struct ifnet *, u_long, void *);  static int  xennet_ioctl(struct ifnet *, u_long, void *);
 static void xennet_watchdog(struct ifnet *);  static void xennet_watchdog(struct ifnet *);
Line 396  xennet_xenbus_attach(device_t parent, de
Line 394  xennet_xenbus_attach(device_t parent, de
   
         IFQ_SET_READY(&ifp->if_snd);          IFQ_SET_READY(&ifp->if_snd);
         if_attach(ifp);          if_attach(ifp);
           if_deferred_start_init(ifp, NULL);
         ether_ifattach(ifp, sc->sc_enaddr);          ether_ifattach(ifp, sc->sc_enaddr);
         sc->sc_softintr = softint_establish(SOFTINT_NET, xennet_softstart, sc);  
         if (sc->sc_softintr == NULL)  
                 panic("%s: can't establish soft interrupt",  
                         device_xname(self));  
   
         /* alloc shared rings */          /* alloc shared rings */
         tx_ring = (void *)uvm_km_alloc(kernel_map, PAGE_SIZE, 0,          tx_ring = (void *)uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
Line 481  xennet_xenbus_detach(device_t self, int 
Line 476  xennet_xenbus_detach(device_t self, int 
         xengnt_revoke_access(sc->sc_rx_ring_gntref);          xengnt_revoke_access(sc->sc_rx_ring_gntref);
         uvm_km_free(kernel_map, (vaddr_t)sc->sc_rx_ring.sring, PAGE_SIZE,          uvm_km_free(kernel_map, (vaddr_t)sc->sc_rx_ring.sring, PAGE_SIZE,
             UVM_KMF_WIRED);              UVM_KMF_WIRED);
         softint_disestablish(sc->sc_softintr);  
         splx(s0);          splx(s0);
   
         pmf_device_deregister(self);          pmf_device_deregister(self);
Line 930  xennet_rx_free_req(struct xennet_rxreq *
Line 924  xennet_rx_free_req(struct xennet_rxreq *
   
 /*  /*
  * Process responses associated to the TX mbufs sent previously through   * Process responses associated to the TX mbufs sent previously through
  * xennet_softstart()   * xennet_start()
  * Called at splsoftnet.   * Called at splsoftnet.
  */   */
 static void  static void
Line 999  xennet_handler(void *arg)
Line 993  xennet_handler(void *arg)
                 return 1;                  return 1;
   
         /* Poke Tx queue if we run out of Tx buffers earlier */          /* Poke Tx queue if we run out of Tx buffers earlier */
         mutex_enter(&sc->sc_tx_lock);          if_schedule_deferred_start(ifp);
         if (SLIST_EMPTY(&sc->sc_txreq_head))  
                 softint_schedule(sc->sc_softintr);  
         mutex_exit(&sc->sc_tx_lock);  
   
         rnd_add_uint32(&sc->sc_rnd_source, sc->sc_tx_ring.req_prod_pvt);          rnd_add_uint32(&sc->sc_rnd_source, sc->sc_tx_ring.req_prod_pvt);
   
Line 1141  again:
Line 1132  again:
 }  }
   
 /*  /*
  * The output routine of a xennet interface   * The output routine of a xennet interface. Prepares mbufs for TX,
  * Called at splnet.   * and notify backend when finished.
    * Called at splsoftnet.
  */   */
 void  void
 xennet_start(struct ifnet *ifp)  xennet_start(struct ifnet *ifp)
 {  {
         struct xennet_xenbus_softc *sc = ifp->if_softc;          struct xennet_xenbus_softc *sc = ifp->if_softc;
   
         DPRINTFN(XEDB_FOLLOW, ("%s: xennet_start()\n", device_xname(sc->sc_dev)));  
   
         rnd_add_uint32(&sc->sc_rnd_source, sc->sc_tx_ring.req_prod_pvt);  
   
         /*  
          * The Xen communication channel is much more efficient if we can  
          * schedule batch of packets for domain0. To achieve this, we  
          * schedule a soft interrupt, and just return. This way, the network  
          * stack will enqueue all pending mbufs in the interface's send queue  
          * before it is processed by xennet_softstart().  
          */  
         softint_schedule(sc->sc_softintr);  
         return;  
 }  
   
 /*  
  * Prepares mbufs for TX, and notify backend when finished  
  * Called at splsoftnet  
  */  
 void  
 xennet_softstart(void *arg)  
 {  
         struct xennet_xenbus_softc *sc = arg;  
         struct ifnet *ifp = &sc->sc_ethercom.ec_if;  
         struct mbuf *m, *new_m;          struct mbuf *m, *new_m;
         netif_tx_request_t *txreq;          netif_tx_request_t *txreq;
         RING_IDX req_prod;          RING_IDX req_prod;
Line 1184  xennet_softstart(void *arg)
Line 1151  xennet_softstart(void *arg)
         if ((ifp->if_flags & IFF_RUNNING) == 0)          if ((ifp->if_flags & IFF_RUNNING) == 0)
                 return;                  return;
   
           rnd_add_uint32(&sc->sc_rnd_source, sc->sc_tx_ring.req_prod_pvt);
   
         xennet_tx_complete(sc);          xennet_tx_complete(sc);
   
         mutex_enter(&sc->sc_tx_lock);          mutex_enter(&sc->sc_tx_lock);
Legend:
Removed from v.1.96  
changed lines
  Added in v.1.97
CVSweb <webmaster@jp.NetBSD.org>