Commit a01b1e9a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Fri 06 Jan 2017 02:55:49 GMT
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  fsl_etsec: Fix Tx BD ring wrapping handling
  rtl8139: correctly handle PHY reset
  record/replay: add network support

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e92fbc75 7e354ed4

docs/replay.txt

+14 −0
Original line number Diff line number Diff line
@@ -195,3 +195,17 @@ Queue is flushed at checkpoints and information about processed requests 
is recorded to the log. In replay phase the queue is matched with

events read from the log. Therefore block devices requests are processed

deterministically.



Network devices

---------------



Record and replay for network interactions is performed with the network filter.

Each backend must have its own instance of the replay filter as follows:

 -netdev user,id=net1 -device rtl8139,netdev=net1

 -object filter-replay,id=replay,netdev=net1



Replay network filter is used to record and replay network packets. While

recording the virtual machine this filter puts all packets coming from

the outer world into the log. In replay mode packets from the log are

injected into the network device. All interactions with network backend

in replay mode are disabled.

hw/net/fsl_etsec/rings.c

+9 −10
Original line number Diff line number Diff line
@@ -358,12 +358,13 @@ void etsec_walk_tx_ring(eTSEC *etsec, int ring_nbr) 
        /* Save flags before BD update */

        bd_flags = bd.flags;



        if (bd_flags & BD_TX_READY) {

            process_tx_bd(etsec, &bd);

        if (!(bd_flags & BD_TX_READY)) {

            break;

        }



        process_tx_bd(etsec, &bd);

        /* Write back BD after update */

        write_buffer_descriptor(etsec, bd_addr, &bd);

        }



        /* Wrap or next BD */

        if (bd_flags & BD_WRAP) {
@@ -371,12 +372,10 @@ void etsec_walk_tx_ring(eTSEC *etsec, int ring_nbr) 
        } else {

            bd_addr += sizeof(eTSEC_rxtx_bd);

        }

    } while (TRUE);



    } while (bd_addr != ring_base);



    bd_addr = ring_base;



    /* Save the Buffer Descriptor Pointers to current bd */

    /* Save the Buffer Descriptor Pointers to last bd that was not

     * succesfully closed */

    etsec->regs[TBPTR0 + ring_nbr].value = bd_addr;



    /* Set transmit halt THLTx */

hw/net/rtl8139.c

+21 −13
Original line number Diff line number Diff line
@@ -1205,6 +1205,20 @@ static void rtl8139_reset_rxring(RTL8139State *s, uint32_t bufferSize) 
    s->RxBufAddr = 0;

}



static void rtl8139_reset_phy(RTL8139State *s)

{

    s->BasicModeStatus  = 0x7809;

    s->BasicModeStatus |= 0x0020; /* autonegotiation completed */

    /* preserve link state */

    s->BasicModeStatus |= qemu_get_queue(s->nic)->link_down ? 0 : 0x04;



    s->NWayAdvert    = 0x05e1; /* all modes, full duplex */

    s->NWayLPAR      = 0x05e1; /* all modes, full duplex */

    s->NWayExpansion = 0x0001; /* autonegotiation supported */



    s->CSCR = CSCR_F_LINK_100 | CSCR_HEART_BIT | CSCR_LD;

}



static void rtl8139_reset(DeviceState *d)

{

    RTL8139State *s = RTL8139(d);
@@ -1256,25 +1270,14 @@ static void rtl8139_reset(DeviceState *d) 
    s->Config3 = 0x1; /* fast back-to-back compatible */

    s->Config5 = 0x0;



    s->CSCR = CSCR_F_LINK_100 | CSCR_HEART_BIT | CSCR_LD;



    s->CpCmd   = 0x0; /* reset C+ mode */

    s->cplus_enabled = 0;





//    s->BasicModeCtrl = 0x3100; // 100Mbps, full duplex, autonegotiation

//    s->BasicModeCtrl = 0x2100; // 100Mbps, full duplex

    s->BasicModeCtrl = 0x1000; // autonegotiation



    s->BasicModeStatus  = 0x7809;

    //s->BasicModeStatus |= 0x0040; /* UTP medium */

    s->BasicModeStatus |= 0x0020; /* autonegotiation completed */

    /* preserve link state */

    s->BasicModeStatus |= qemu_get_queue(s->nic)->link_down ? 0 : 0x04;



    s->NWayAdvert    = 0x05e1; /* all modes, full duplex */

    s->NWayLPAR      = 0x05e1; /* all modes, full duplex */

    s->NWayExpansion = 0x0001; /* autonegotiation supported */

    rtl8139_reset_phy(s);



    /* also reset timer and disable timer interrupt */

    s->TCTR = 0;
@@ -1469,7 +1472,7 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val) 
    DPRINTF("BasicModeCtrl register write(w) val=0x%04x\n", val);



    /* mask unwritable bits */

    uint32_t mask = 0x4cff;

    uint32_t mask = 0xccff;



    if (1 || !rtl8139_config_writable(s))

    {
@@ -1479,6 +1482,11 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val) 
        mask |= 0x0100;

    }



    if (val & 0x8000) {

        /* Reset PHY */

        rtl8139_reset_phy(s);

    }



    val = SET_MASKED(val, mask, s->BasicModeCtrl);



    s->BasicModeCtrl = val;

include/sysemu/replay.h

+12 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ enum ReplayCheckpoint { 
};

typedef enum ReplayCheckpoint ReplayCheckpoint;



typedef struct ReplayNetState ReplayNetState;



extern ReplayMode replay_mode;



/* Replay process control functions */
@@ -137,4 +139,14 @@ void replay_char_read_all_save_error(int res); 
/*! Writes character read_all execution result into the replay log. */

void replay_char_read_all_save_buf(uint8_t *buf, int offset);



/* Network */



/*! Registers replay network filter attached to some backend. */

ReplayNetState *replay_register_net(NetFilterState *nfs);

/*! Unregisters replay network filter. */

void replay_unregister_net(ReplayNetState *rns);

/*! Called to write network packet to the replay log. */

void replay_net_packet_event(ReplayNetState *rns, unsigned flags,

                             const struct iovec *iov, int iovcnt);



#endif

net/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ common-obj-y += filter-mirror.o 
common-obj-y += colo-compare.o

common-obj-y += colo.o

common-obj-y += filter-rewriter.o

common-obj-y += filter-replay.o