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

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



# gpg: Signature made Tue Jul  7 13:38:13 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  rocker: tests: don't need to specify master/self when setting vlans
  rocker: mark copy-to-cpu pkts as forwarding offloaded
  rocker: return -1 when dropping packet on ingress
  rocker: fix missing break statements
  rocker: fix misplaced break statement
  rocker: don't queue receive pkts when port is disabled
  vmxnet3: Fix incorrect small packet padding
  e1000: flush packets when link comes up
  rocker: fix memory leak

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents aeb72188 849729bb

docs/specs/rocker.txt

+4 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ The TLVs for Rx descriptor buffer are: 
				  (1 << 5): TCP packet

				  (1 << 6): UDP packet

				  (1 << 7): TCP/UDP csum good

				  (1 << 8): Offload forward

	RX_CSUM		2	IP calculated checksum:

				  IPv4: IP payload csum

				  IPv6: header and payload csum
@@ -645,6 +646,9 @@ The TLVs for Rx descriptor buffer are: 
	RX_FRAG_MAX_LEN	2	Packet maximum fragment length

	RX_FRAG_LEN	2	Actual packet fragment length after receive



Offload forward RX_FLAG indicates the device has already forwarded the packet

so the host CPU should not also forward the packet.



Possible status return codes in descriptor on completion are:



	DESC_COMP_ERR	reason

hw/net/e1000.c

+3 −0
Original line number Diff line number Diff line
@@ -185,6 +185,9 @@ e1000_link_up(E1000State *s) 
{

    s->mac_reg[STATUS] |= E1000_STATUS_LU;

    s->phy_reg[PHY_STATUS] |= MII_SR_LINK_STATUS;



    /* E1000_STATUS_LU is tested by e1000_can_receive() */

    qemu_flush_queued_packets(qemu_get_queue(s->nic));

}



static bool

hw/net/rocker/rocker.c

+9 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ World *rocker_get_world(Rocker *r, enum rocker_world_type type) 


RockerSwitch *qmp_query_rocker(const char *name, Error **errp)

{

    RockerSwitch *rocker = g_malloc0(sizeof(*rocker));

    RockerSwitch *rocker;

    Rocker *r;



    r = rocker_find(name);
@@ -106,6 +106,7 @@ RockerSwitch *qmp_query_rocker(const char *name, Error **errp) 
        return NULL;

    }



    rocker = g_new0(RockerSwitch, 1);

    rocker->name = g_strdup(r->name);

    rocker->id = r->switch_id;

    rocker->ports = r->fp_ports;
@@ -192,11 +193,13 @@ static int tx_consume(Rocker *r, DescInfo *info) 
        if (!tlvs[ROCKER_TLV_TX_L3_CSUM_OFF]) {

            return -ROCKER_EINVAL;

        }

        break;

    case ROCKER_TX_OFFLOAD_TSO:

        if (!tlvs[ROCKER_TLV_TX_TSO_MSS] ||

            !tlvs[ROCKER_TLV_TX_TSO_HDR_LEN]) {

            return -ROCKER_EINVAL;

        }

        break;

    }



    if (tlvs[ROCKER_TLV_TX_L3_CSUM_OFF]) {
@@ -600,7 +603,7 @@ static DescRing *rocker_get_rx_ring_by_pport(Rocker *r, 
}



int rx_produce(World *world, uint32_t pport,

               const struct iovec *iov, int iovcnt)

               const struct iovec *iov, int iovcnt, uint8_t copy_to_cpu)

{

    Rocker *r = world_rocker(world);

    PCIDevice *dev = (PCIDevice *)r;
@@ -643,6 +646,10 @@ int rx_produce(World *world, uint32_t pport, 
        goto out;

    }



    if (copy_to_cpu) {

        rx_flags |= ROCKER_RX_FLAGS_FWD_OFFLOAD;

    }



    /* XXX calc rx flags/csum */



    tlv_size = rocker_tlv_total_size(sizeof(uint16_t)) + /* flags */

hw/net/rocker/rocker.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int rocker_event_link_changed(Rocker *r, uint32_t pport, bool link_up); 
int rocker_event_mac_vlan_seen(Rocker *r, uint32_t pport, uint8_t *addr,

                               uint16_t vlan_id);

int rx_produce(World *world, uint32_t pport,

               const struct iovec *iov, int iovcnt);

               const struct iovec *iov, int iovcnt, uint8_t copy_to_cpu);

int rocker_port_eg(Rocker *r, uint32_t pport,

                   const struct iovec *iov, int iovcnt);

hw/net/rocker/rocker_fp.c

+10 −8
Original line number Diff line number Diff line
@@ -125,18 +125,21 @@ int fp_port_eg(FpPort *port, const struct iovec *iov, int iovcnt) 
    return ROCKER_OK;

}



static int fp_port_can_receive(NetClientState *nc)

{

    FpPort *port = qemu_get_nic_opaque(nc);



    return port->enabled;

}



static ssize_t fp_port_receive_iov(NetClientState *nc, const struct iovec *iov,

                                   int iovcnt)

{

    FpPort *port = qemu_get_nic_opaque(nc);



    /* If the port is disabled, we want to drop this pkt

     * now rather than queing it for later.  We don't want

     * any stale pkts getting into the device when the port

     * transitions to enabled.

     */



    if (!port->enabled) {

        return -1;

    }



    return world_ingress(port->world, port->pport, iov, iovcnt);

}
@@ -165,7 +168,6 @@ static void fp_port_set_link_status(NetClientState *nc) 
static NetClientInfo fp_port_info = {

    .type = NET_CLIENT_OPTIONS_KIND_NIC,

    .size = sizeof(NICState),

    .can_receive = fp_port_can_receive,

    .receive = fp_port_receive,

    .receive_iov = fp_port_receive_iov,

    .cleanup = fp_port_cleanup,