qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 11196e: net/tap: Allocating Large sized array


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 11196e: net/tap: Allocating Large sized arrays to heap
Date: Thu, 02 Jun 2016 07:30:05 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 11196e95f0521fa6ba689c15f874ad9a2d99e158
      
https://github.com/qemu/qemu/commit/11196e95f0521fa6ba689c15f874ad9a2d99e158
  Author: Zhou Jie <address@hidden>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  net/tap: Allocating Large sized arrays to heap

net_init_tap has a huge stack usage of 8192 bytes approx.
Moving large arrays to heap to reduce stack usage.

Signed-off-by: Zhou Jie <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 3af9187fc6caaf415ab9c0c6d92c9678f65cb17f
      
https://github.com/qemu/qemu/commit/3af9187fc6caaf415ab9c0c6d92c9678f65cb17f
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M hw/net/mipsnet.c

  Log Message:
  -----------
  net: mipsnet: check packet length against buffer

When receiving packets over MIPSnet network device, it uses
receive buffer of size 1514 bytes. In case the controller
accepts large(MTU) packets, it could lead to memory corruption.
Add check to avoid it.

Reported by: Oleksandr Bazhaniuk <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: d30300f771bffc3964e86472e0c21607521a2e24
      
https://github.com/qemu/qemu/commit/d30300f771bffc3964e86472e0c21607521a2e24
  Author: Eduardo Habkost <address@hidden>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M include/net/net.h
    M net/net.c
    M vl.c

  Log Message:
  -----------
  net: vl: Move default_net to vl.c

All handling of defaults (default_* variables) is inside vl.c,
move default_net there too, so we can more easily refactor that
code later.

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 16a3df403b10c4ac347159e39005fd520b2648bb
      
https://github.com/qemu/qemu/commit/16a3df403b10c4ac347159e39005fd520b2648bb
  Author: Zhang Chen <address@hidden>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M include/net/net.h
    M net/filter-mirror.c
    M net/net.c
    M net/socket.c

  Log Message:
  -----------
  net/net: Add SocketReadState for reuse codes

This function is from net/socket.c, move it to net.c and net.h.
Add SocketReadState to make others reuse net_fill_rstate().
suggestion from jason.

v4:
 - move 'rs->finalize = finalize' to rs_init()

v3:
 - remove SocketReadState init callback
 - put finalize callback to net_fill_rstate()

v2:
 - rename ReadState to SocketReadState
 - add SocketReadState init and finalize callback

v1:
 - init patch

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Wen Congyang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 059a65f3ad506105ac9b5b0c7c31f8a0be0abbbc
      
https://github.com/qemu/qemu/commit/059a65f3ad506105ac9b5b0c7c31f8a0be0abbbc
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M include/hw/pci/pci.h

  Log Message:
  -----------
  pci: fix unaligned access in pci_xxx_quad()

Replace legacy cpu_to_le64w()/le64_to_cpup()
calls with stq_le_p()/ldq_le_p().

Motivation for this modification is that
follow up patches add utility function
pcie_dev_ser_num_init() for PCIe DSN
capability creation which uses
pci_set_quad() with a misaligned offset.

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 3bdfaabbcf0e91d16e90691cf8bd4a836c67279a
      
https://github.com/qemu/qemu/commit/3bdfaabbcf0e91d16e90691cf8bd4a836c67279a
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/pci/msix.c
    M include/hw/pci/msix.h

  Log Message:
  -----------
  msix: make msix_clr_pending() visible for clients

This function will be used by e1000e device code.

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 83f17ed278dc5a8b3f7f2c8765f17ed4302b74e8
      
https://github.com/qemu/qemu/commit/83f17ed278dc5a8b3f7f2c8765f17ed4302b74e8
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M include/hw/pci/pci_regs.h

  Log Message:
  -----------
  pci: Introduce define for PM capability version 1.1

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 6383292ac884f01be609f69d888f54c099af622e
      
https://github.com/qemu/qemu/commit/6383292ac884f01be609f69d888f54c099af622e
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/pci/pcie.c
    M include/hw/pci/pcie.h
    M include/hw/pci/pcie_regs.h

  Log Message:
  -----------
  pcie: Add support for PCIe CAP v1

Added support for PCIe CAP v1, while reusing some of the existing v2
infrastructure.

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: b56b9285e4b58a0b8fe8b011d48dbf7e2afba785
      
https://github.com/qemu/qemu/commit/b56b9285e4b58a0b8fe8b011d48dbf7e2afba785
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/pci/pcie.c
    M include/hw/pci/pcie.h

  Log Message:
  -----------
  pcie: Introduce function for DSN capability creation

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: a4b387e623f4e17bd4784cf76e3f8c15800365dc
      
https://github.com/qemu/qemu/commit/a4b387e623f4e17bd4784cf76e3f8c15800365dc
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/vmxnet3.c

  Log Message:
  -----------
  vmxnet3: Use generic function for DSN capability definition

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 0478d1ddaea3e6e1a19faa82f5bc2ef8f3300c42
      
https://github.com/qemu/qemu/commit/0478d1ddaea3e6e1a19faa82f5bc2ef8f3300c42
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M include/net/checksum.h

  Log Message:
  -----------
  net: Introduce Toeplitz hash calculator

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 6d1d4939a6477f15f69234b426aaaae52369f22b
      
https://github.com/qemu/qemu/commit/6d1d4939a6477f15f69234b426aaaae52369f22b
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M include/net/net.h

  Log Message:
  -----------
  net: Add macros for MAC address tracing

These macros will be used by future commits introducing
e1000e device emulation and by vmxnet3 tracing code.

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ab647872011205a18241ec1f8ce7dd57b7da9989
      
https://github.com/qemu/qemu/commit/ab647872011205a18241ec1f8ce7dd57b7da9989
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/vmxnet3.c
    M hw/net/vmxnet_debug.h

  Log Message:
  -----------
  vmxnet3: Use common MAC address tracing macros

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 605d52e62fc94ec28408890fc682d4bdd7d8a36c
      
https://github.com/qemu/qemu/commit/605d52e62fc94ec28408890fc682d4bdd7d8a36c
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M MAINTAINERS
    M hw/net/Makefile.objs
    A hw/net/net_rx_pkt.c
    A hw/net/net_rx_pkt.h
    A hw/net/net_tx_pkt.c
    A hw/net/net_tx_pkt.h
    M hw/net/vmxnet3.c
    R hw/net/vmxnet_rx_pkt.c
    R hw/net/vmxnet_rx_pkt.h
    R hw/net/vmxnet_tx_pkt.c
    R hw/net/vmxnet_tx_pkt.h
    M tests/Makefile

  Log Message:
  -----------
  net_pkt: Name vmxnet3 packet abstractions more generic

This patch drops "vmx" prefix from packet abstractions names
to emphasize the fact they are generic and not tied to any
specific network device.

These abstractions will be reused by e1000e emulation implementation
introduced by following patches so their names need generalization.

This patch (except renamed files, adjusted comments and changes in MAINTAINTERS)
was produced by:

git grep -lz 'vmxnet_tx_pkt' | xargs -0 perl -i'' -pE 
"s/vmxnet_tx_pkt/net_tx_pkt/g"
git grep -lz 'vmxnet_rx_pkt' | xargs -0 perl -i'' -pE 
"s/vmxnet_rx_pkt/net_rx_pkt/g"
git grep -lz 'VmxnetTxPkt' | xargs -0 perl -i'' -pE "s/VmxnetTxPkt/NetTxPkt/g"
git grep -lz 'VMXNET_TX_PKT' | xargs -0 perl -i'' -pE 
"s/VMXNET_TX_PKT/NET_TX_PKT/g"
git grep -lz 'VmxnetRxPkt' | xargs -0 perl -i'' -pE "s/VmxnetRxPkt/NetRxPkt/g"
git grep -lz 'VMXNET_RX_PKT' | xargs -0 perl -i'' -pE 
"s/VMXNET_RX_PKT/NET_RX_PKT/g"
sed -ie 's/VMXNET_/NET_/g' hw/net/vmxnet_rx_pkt.c
sed -ie 's/VMXNET_/NET_/g' hw/net/vmxnet_tx_pkt.c

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 66409b7c8bd0ebb075a6af8cbc7846fc0a95107d
      
https://github.com/qemu/qemu/commit/66409b7c8bd0ebb075a6af8cbc7846fc0a95107d
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/rtl8139.c
    M include/net/eth.h

  Log Message:
  -----------
  rtl8139: Move more TCP definitions to common header

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: eb700029c7836798046191d62d595363d92c84d4
      
https://github.com/qemu/qemu/commit/eb700029c7836798046191d62d595363d92c84d4
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/net_rx_pkt.c
    M hw/net/net_rx_pkt.h
    M hw/net/net_tx_pkt.c
    M hw/net/net_tx_pkt.h
    M include/net/checksum.h
    M include/net/eth.h
    M net/checksum.c
    M net/eth.c
    M trace-events

  Log Message:
  -----------
  net_pkt: Extend packet abstraction as required by e1000e functionality

This patch extends the TX/RX packet abstractions with features that will
be used by the e1000e device implementation.

Changes are:

  1. Support iovec lists for RX buffers
  2. Deeper RX packets parsing
  3. Loopback option for TX packets
  4. Extended VLAN headers handling
  5. RSS processing for RX packets

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 111710107dc6041de871af437214d32d1db088d1
      
https://github.com/qemu/qemu/commit/111710107dc6041de871af437214d32d1db088d1
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/net_tx_pkt.c
    M hw/net/net_tx_pkt.h
    M hw/net/vmxnet3.c

  Log Message:
  -----------
  vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*

To make this device and network packets
abstractions ready for IOMMU.

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 06e7fa0ad7a0977d741e485c6f2366c8535648fd
      
https://github.com/qemu/qemu/commit/06e7fa0ad7a0977d741e485c6f2366c8535648fd
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/e1000_regs.h

  Log Message:
  -----------
  e1000_regs: Add definitions for Intel 82574-specific bits

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 093454e21d4f6799bb2e549394cd918da1530569
      
https://github.com/qemu/qemu/commit/093454e21d4f6799bb2e549394cd918da1530569
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M MAINTAINERS
    M hw/net/Makefile.objs
    M hw/net/e1000.c
    A hw/net/e1000x_common.c
    A hw/net/e1000x_common.h
    M trace-events

  Log Message:
  -----------
  e1000: Move out code that will be reused in e1000e

Code that will be shared moved to a separate files.

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 6f3fbe4ed06a54b14716e619f1053c073fddae49
      
https://github.com/qemu/qemu/commit/6f3fbe4ed06a54b14716e619f1053c073fddae49
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M MAINTAINERS
    M default-configs/pci.mak
    M hw/net/Makefile.objs
    M hw/net/e1000_regs.h
    A hw/net/e1000e.c
    A hw/net/e1000e_core.c
    A hw/net/e1000e_core.h
    M trace-events

  Log Message:
  -----------
  net: Introduce e1000e device emulation

This patch introduces emulation for the Intel 82574 adapter, AKA e1000e.

This implementation is derived from the e1000 emulation code, and
utilizes the TX/RX packet abstractions that were initially developed for
the vmxnet3 device. Although some parts of the introduced code may be
shared with e1000, the differences are substantial enough so that the
only shared resources for the two devices are the definitions in
hw/net/e1000_regs.h.

Similarly to vmxnet3, the new device uses virtio headers for task
offloads (for backends that support virtio extensions). Usage of
virtio headers may be forcibly disabled via a boolean device property
"vnet" (which is enabled by default). In such case task offloads
will be performed in software, in the same way it is done on
backends that do not support virtio headers.

The device code is split into two parts:

  1. hw/net/e1000e.c: QEMU-specific code for a network device;
  2. hw/net/e1000e_core.[hc]: Device emulation according to the spec.

The new device name is e1000e.

Intel specifications for the 82574 controller are available at:
http://www.intel.com/content/dam/doc/datasheet/82574l-gbe-controller-datasheet.pdf

Throughput measurement results (iperf2):
           Fedora 22 guest, TCP, RX
    4 ++------------------------------------------+
      |                                           |
      |                           X   X   X   X   X
  3.5 ++          X   X   X   X                   |
      |       X                                   |
      |                                           |
    3 ++                                          |
G     |   X                                       |
b     |                                           |
/ 2.5 ++                                          |
s     |                                           |
      |                                           |
    2 ++                                          |
      |                                           |
      |                                           |
  1.5 X+                                          |
      |                                           |
      +   +   +   +   +   +   +   +   +   +   +   +
    1 ++--+---+---+---+---+---+---+---+---+---+---+
     32  64  128 256 512  1   2   4   8  16  32  64
      B   B   B   B   B   KB  KB  KB  KB KB  KB  KB
                 Buffer size
          Fedora 22 guest, TCP, TX
  18 ++-------------------------------------------+
     |                        X                   |
  16 ++                           X   X   X   X   X
     |                   X                        |
  14 ++                                           |
     |                                            |
  12 ++                                           |
G    |               X                            |
b 10 ++                                           |
/    |                                            |
s  8 ++                                           |
     |                                            |
   6 ++          X                                |
     |                                            |
   4 ++                                           |
     |       X                                    |
   2 ++  X                                        |
     X   +   +   +   +   +    +   +   +   +   +   +
   0 ++--+---+---+---+---+----+---+---+---+---+---+
    32  64  128 256 512  1    2   4   8  16  32  64
     B   B   B   B   B   KB   KB  KB  KB KB  KB  KB
                 Buffer size
           Fedora 22 guest, UDP, RX
    3 ++------------------------------------------+
      |                                           X
      |                                           |
  2.5 ++                                          |
      |                                           |
      |                                           |
    2 ++                                 X        |
G     |                                           |
b     |                                           |
/ 1.5 ++                                          |
s     |                         X                 |
      |                                           |
    1 ++                                          |
      |                                           |
      |                 X                         |
  0.5 ++                                          |
      |        X                                  |
      X        +        +       +        +        +
    0 ++-------+--------+-------+--------+--------+
     32       64       128     256      512       1
      B        B         B       B        B      KB
                 Datagram size
           Fedora 22 guest, UDP, TX
    1 ++------------------------------------------+
      |                                           X
  0.9 ++                                          |
      |                                           |
  0.8 ++                                          |
  0.7 ++                                          |
      |                                           |
G 0.6 ++                                          |
b     |                                           |
/ 0.5 ++                                          |
s     |                                  X        |
  0.4 ++                                          |
      |                                           |
  0.3 ++                                          |
  0.2 ++                        X                 |
      |                                           |
  0.1 ++                X                         |
      X        X        +       +        +        +
    0 ++-------+--------+-------+--------+--------+
     32       64       128     256      512       1
      B        B         B       B        B      KB
                 Datagram size
         Windows 2012R2 guest, TCP, RX
  3.2 ++------------------------------------------+
      |                                   X       |
    3 ++                                          |
      |                                           |
  2.8 ++                                          |
      |                                           |
  2.6 ++                              X           |
G     |   X                   X   X           X   X
b 2.4 ++      X       X                           |
/     |                                           |
s 2.2 ++                                          |
      |                                           |
    2 ++                                          |
      |           X       X                       |
  1.8 ++                                          |
      |                                           |
  1.6 X+                                          |
      +   +   +   +   +   +   +   +   +   +   +   +
  1.4 ++--+---+---+---+---+---+---+---+---+---+---+
     32  64  128 256 512  1   2   4   8  16  32  64
      B   B   B   B   B   KB  KB  KB  KB KB  KB  KB
                 Buffer size
        Windows 2012R2 guest, TCP, TX
  14 ++-------------------------------------------+
     |                                            |
     |                                        X   X
  12 ++                                           |
     |                                            |
  10 ++                                           |
     |                                            |
G    |                                            |
b  8 ++                                           |
/    |                                    X       |
s  6 ++                                           |
     |                                            |
     |                                            |
   4 ++                               X           |
     |                                            |
   2 ++                                           |
     |           X   X            X               |
     +   X   X   +   +   X    X   +   +   +   +   +
   0 X+--+---+---+---+---+----+---+---+---+---+---+
    32  64  128 256 512  1    2   4   8  16  32  64
     B   B   B   B   B   KB   KB  KB  KB KB  KB  KB
                 Buffer size
         Windows 2012R2 guest, UDP, RX
  1.6 ++------------------------------------------X
      |                                           |
  1.4 ++                                          |
      |                                           |
  1.2 ++                                          |
      |                                  X        |
      |                                           |
G   1 ++                                          |
b     |                                           |
/ 0.8 ++                                          |
s     |                                           |
  0.6 ++                        X                 |
      |                                           |
  0.4 ++                                          |
      |                 X                         |
      |                                           |
  0.2 ++       X                                  |
      X        +        +       +        +        +
    0 ++-------+--------+-------+--------+--------+
     32       64       128     256      512       1
      B        B         B       B        B      KB
                 Datagram size
         Windows 2012R2 guest, UDP, TX
  0.6 ++------------------------------------------+
      |                                           X
      |                                           |
  0.5 ++                                          |
      |                                           |
      |                                           |
  0.4 ++                                          |
G     |                                           |
b     |                                           |
/ 0.3 ++                                 X        |
s     |                                           |
      |                                           |
  0.2 ++                                          |
      |                                           |
      |                         X                 |
  0.1 ++                                          |
      |                 X                         |
      X        X        +       +        +        +
    0 ++-------+--------+-------+--------+--------+
     32       64       128     256      512       1
      B        B         B       B        B      KB
                 Datagram size

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 7c375e229456cc06ceb7daf55353d3ad636bdc2f
      
https://github.com/qemu/qemu/commit/7c375e229456cc06ceb7daf55353d3ad636bdc2f
  Author: Dmitry Fleytman <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M tests/Makefile
    A tests/e1000e-test.c

  Log Message:
  -----------
  e1000e: Introduce qtest for e1000e device

Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 50dbce6538d10c8ec9c346fdc0ff76906ae48ebe
      
https://github.com/qemu/qemu/commit/50dbce6538d10c8ec9c346fdc0ff76906ae48ebe
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M net/checksum.c

  Log Message:
  -----------
  net: improve UDP/TCP checksum computation.

 * based on Eth, UDP, TCP struct present in eth.h instead of hardcoded
   indexes and sizes.
 * based on various macros present in eth.h.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ade6bad111f74e0e0a8f48de8c8955e7b70be7e3
      
https://github.com/qemu/qemu/commit/ade6bad111f74e0e0a8f48de8c8955e7b70be7e3
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M net/checksum.c

  Log Message:
  -----------
  net: handle optional VLAN header in checksum computation.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 4816dc168b5745708eba4c005f5e8771623ee405
      
https://github.com/qemu/qemu/commit/4816dc168b5745708eba4c005f5e8771623ee405
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/imx_fec.c

  Log Message:
  -----------
  i.MX: Fix FEC code for MDIO operation selection

According to the FEC chapter of i.MX25 reference manual

When writing the MMFR register, bit 29 and 28 select the requested operation.
 * 10 means read operation with valid MII mgmt frame
 * 11 means read operation with non compliant MII mgmt frame
 * 01 means write operation with valid MII mgmt frame
 * 00 means write operation with non compliant MII mgmt frame

So while bit 28 does change beween read/write for valid MII mgmt frame, the
mening is inverted for non compliant MII mgmt frame.

Bit 29 on the other hand means read/write whatever the type of mgmt frame
involved.

So this patch change the operation selection from bit 28 to bit 29 as it is
more generic.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: b413643a5cdac809a1374481c990387b732f9e60
      
https://github.com/qemu/qemu/commit/b413643a5cdac809a1374481c990387b732f9e60
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/imx_fec.c

  Log Message:
  -----------
  i.MX: Fix FEC code for MDIO address selection

According to the FEC chapter of i.MX25 reference manual

When writing to MMFR register, the MDIO device and adress are selected by
bit 27 to 23 and bit 22 to 18 respectively. This is a total of 10 bits
that need to be used by the Phy chip/address decoding function.

This patch fixes the number of bits used from 9 to 10.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ccdb81d3274d281d770703417257bd40bcdf4c0e
      
https://github.com/qemu/qemu/commit/ccdb81d3274d281d770703417257bd40bcdf4c0e
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/imx_fec.c

  Log Message:
  -----------
  i.MX: Fix FEC code for ECR register reset value.

According to the FEC chapter of i.MX25 reference manual ECR register is
initialized at 0xf0000000 at reset time.

We fix the value.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ff4b325f5e1d68cd089e71edcaa3fe3432ca18dc
      
https://github.com/qemu/qemu/commit/ff4b325f5e1d68cd089e71edcaa3fe3432ca18dc
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/imx_fec.c

  Log Message:
  -----------
  i.MX: reset TX/RX descriptors when FEC is disabled.

According to the FEC chapter of i.MX25 reference manual

RX adn TX descriptors are reseted when the FEC device is disabled through ECR.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 1bb3c37182399c618485aefe158ea1f94182c67b
      
https://github.com/qemu/qemu/commit/1bb3c37182399c618485aefe158ea1f94182c67b
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/imx_fec.c
    M include/hw/net/imx_fec.h

  Log Message:
  -----------
  i.MX: Rename i.MX FEC defines to ENET_XXX

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: db0de35268066108c693db52db24e89581878dd4
      
https://github.com/qemu/qemu/commit/db0de35268066108c693db52db24e89581878dd4
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/net/imx_fec.c
    M include/hw/net/imx_fec.h

  Log Message:
  -----------
  i.MX: move FEC device to a register array structure.

This is to prepare for the ENET Gb device of the i.MX6.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: a699b410d7120dd67bc6c9beae44868780866f09
      
https://github.com/qemu/qemu/commit/a699b410d7120dd67bc6c9beae44868780866f09
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/arm/fsl-imx25.c
    M hw/net/imx_fec.c
    M include/hw/net/imx_fec.h

  Log Message:
  -----------
  Add ENET/Gbps Ethernet support to FEC device

The ENET device (present in i.MX6) is "derived" from FEC and backward
compatible with it.

This patch adds the necessary support of the added feature in the ENET
device to allow Linux to use it (on supported processors).

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 517b5e9a175fe7d47cc0fab6c2310241fd33c115
      
https://github.com/qemu/qemu/commit/517b5e9a175fe7d47cc0fab6c2310241fd33c115
  Author: Jean-Christophe Dubois <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M hw/arm/fsl-imx6.c
    M include/hw/arm/fsl-imx6.h

  Log Message:
  -----------
  Add ENET device to i.MX6 SOC.

This adds the ENET device to the i.MX6 SOC.

This was tested by booting Linux on an Qemu i.MX6 instance and accessing
the internet from the linux guest.

Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Jean-Christophe Dubois <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 2c107d7684f9e3c4db4780d0756bbf35b06aec07
      
https://github.com/qemu/qemu/commit/2c107d7684f9e3c4db4780d0756bbf35b06aec07
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M MAINTAINERS
    M default-configs/pci.mak
    M hw/arm/fsl-imx25.c
    M hw/arm/fsl-imx6.c
    M hw/net/Makefile.objs
    M hw/net/e1000.c
    M hw/net/e1000_regs.h
    A hw/net/e1000e.c
    A hw/net/e1000e_core.c
    A hw/net/e1000e_core.h
    A hw/net/e1000x_common.c
    A hw/net/e1000x_common.h
    M hw/net/imx_fec.c
    M hw/net/mipsnet.c
    A hw/net/net_rx_pkt.c
    A hw/net/net_rx_pkt.h
    A hw/net/net_tx_pkt.c
    A hw/net/net_tx_pkt.h
    M hw/net/rtl8139.c
    M hw/net/vmxnet3.c
    M hw/net/vmxnet_debug.h
    R hw/net/vmxnet_rx_pkt.c
    R hw/net/vmxnet_rx_pkt.h
    R hw/net/vmxnet_tx_pkt.c
    R hw/net/vmxnet_tx_pkt.h
    M hw/pci/msix.c
    M hw/pci/pcie.c
    M include/hw/arm/fsl-imx6.h
    M include/hw/net/imx_fec.h
    M include/hw/pci/msix.h
    M include/hw/pci/pci.h
    M include/hw/pci/pci_regs.h
    M include/hw/pci/pcie.h
    M include/hw/pci/pcie_regs.h
    M include/net/checksum.h
    M include/net/eth.h
    M include/net/net.h
    M net/checksum.c
    M net/eth.c
    M net/filter-mirror.c
    M net/net.c
    M net/socket.c
    M net/tap.c
    M tests/Makefile
    A tests/e1000e-test.c
    M trace-events
    M vl.c

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

# gpg: Signature made Thu 02 Jun 2016 07:23:18 BST using RSA key ID 398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>"
# 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: (31 commits)
  Add ENET device to i.MX6 SOC.
  Add ENET/Gbps Ethernet support to FEC device
  i.MX: move FEC device to a register array structure.
  i.MX: Rename i.MX FEC defines to ENET_XXX
  i.MX: reset TX/RX descriptors when FEC is disabled.
  i.MX: Fix FEC code for ECR register reset value.
  i.MX: Fix FEC code for MDIO address selection
  i.MX: Fix FEC code for MDIO operation selection
  net: handle optional VLAN header in checksum computation.
  net: improve UDP/TCP checksum computation.
  e1000e: Introduce qtest for e1000e device
  net: Introduce e1000e device emulation
  e1000: Move out code that will be reused in e1000e
  e1000_regs: Add definitions for Intel 82574-specific bits
  vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*
  net_pkt: Extend packet abstraction as required by e1000e functionality
  rtl8139: Move more TCP definitions to common header
  net_pkt: Name vmxnet3 packet abstractions more generic
  vmxnet3: Use common MAC address tracing macros
  net: Add macros for MAC address tracing
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/cbd614870fce...2c107d7684f9

reply via email to

[Prev in Thread] Current Thread [Next in Thread]