* [Qemu-devel] [PULL 0/3] Net patches @ 2015-08-14 15:02 Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 1/3] net/vmxnet3: Fix incorrect debug message Stefan Hajnoczi ` (3 more replies) 0 siblings, 4 replies; 19+ messages in thread From: Stefan Hajnoczi @ 2015-08-14 15:02 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi The following changes since commit e95edefbd0559e1d0aa09549641b5d9af1f96fac: Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into staging (2015-08-03 17:33:35 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git tags/net-pull-request for you to fetch changes up to 8887f84c54f6e74124544d1700a205e5b6821b3d: tests: test rx recovery from cont (2015-08-04 09:41:28 +0100) ---------------------------------------------------------------- ---------------------------------------------------------------- Dana Rubin (1): net/vmxnet3: Fix incorrect debug message Jason Wang (2): tests: introduce basic pci test for virtio-net tests: test rx recovery from cont hw/net/vmxnet3.c | 4 +- tests/Makefile | 2 +- tests/virtio-net-test.c | 237 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 233 insertions(+), 10 deletions(-) -- 2.4.3 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 1/3] net/vmxnet3: Fix incorrect debug message 2015-08-14 15:02 [Qemu-devel] [PULL 0/3] Net patches Stefan Hajnoczi @ 2015-08-14 15:02 ` Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 2/3] tests: introduce basic pci test for virtio-net Stefan Hajnoczi ` (2 subsequent siblings) 3 siblings, 0 replies; 19+ messages in thread From: Stefan Hajnoczi @ 2015-08-14 15:02 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Dana Rubin, Stefan Hajnoczi, Shmulik Ladkani From: Dana Rubin <dana.rubin@ravellosystems.com> From: Dana Rubin <dana.rubin@ravellosystems.com> In commit 80da311d81, "net/vmxnet3: Fix RX TCP/UDP checksum on partially summed packets" a debug message was introduced in vmxnet3_rx_need_csum_calculate() for an unlikely input condition. The message accidentally printed 'len' variable instead of 'pkt_len'. Fix, providing the correct argument. Signed-off-by: Dana Rubin <dana.rubin@ravellosystems.com> Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> Message-id: 1438109090-18957-1-git-send-email-shmulik.ladkani@ravellosystems.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- hw/net/vmxnet3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 59b06b8..071feeb 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -927,9 +927,9 @@ static void vmxnet3_rx_need_csum_calculate(struct VmxnetRxPkt *pkt, /* Validate packet len: csum_start + scum_offset + length of csum field */ if (pkt_len < (vhdr->csum_start + vhdr->csum_offset + 2)) { - VMW_PKPRN("packet len:%d < csum_start(%d) + csum_offset(%d) + 2, " + VMW_PKPRN("packet len:%lu < csum_start(%d) + csum_offset(%d) + 2, " "cannot calculate checksum", - len, vhdr->csum_start, vhdr->csum_offset); + pkt_len, vhdr->csum_start, vhdr->csum_offset); return; } -- 2.4.3 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 2/3] tests: introduce basic pci test for virtio-net 2015-08-14 15:02 [Qemu-devel] [PULL 0/3] Net patches Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 1/3] net/vmxnet3: Fix incorrect debug message Stefan Hajnoczi @ 2015-08-14 15:02 ` Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 3/3] tests: test rx recovery from cont Stefan Hajnoczi 2015-08-18 16:06 ` [Qemu-devel] [PULL 0/3] Net patches Peter Maydell 3 siblings, 0 replies; 19+ messages in thread From: Stefan Hajnoczi @ 2015-08-14 15:02 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Jason Wang, Stefan Hajnoczi From: Jason Wang <jasowang@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Message-id: 1437117954-16342-1-git-send-email-jasowang@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- tests/Makefile | 2 +- tests/virtio-net-test.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 179 insertions(+), 8 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 7494582..5271123 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -381,7 +381,7 @@ tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y) tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y) -tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y) +tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y) $(libqos-virtio-obj-y) tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y) tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y) tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index ea7478c..b37dd3e 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -10,20 +10,192 @@ #include <glib.h> #include <string.h> #include "libqtest.h" +#include "qemu-common.h" +#include "qemu/sockets.h" #include "qemu/osdep.h" -#include "libqos/pci.h" +#include "qemu/iov.h" +#include "libqos/pci-pc.h" +#include "libqos/virtio.h" +#include "libqos/virtio-pci.h" +#include "libqos/malloc.h" +#include "libqos/malloc-pc.h" +#include "libqos/malloc-generic.h" +#include "qemu/bswap.h" +#include "hw/virtio/virtio-net.h" #define PCI_SLOT_HP 0x06 +#define PCI_SLOT 0x04 +#define PCI_FN 0x00 -/* Tests only initialization so far. TODO: Replace with functional tests */ -static void pci_nop(void) +#define QVIRTIO_NET_TIMEOUT_US (30 * 1000 * 1000) +#define VNET_HDR_SIZE sizeof(struct virtio_net_hdr_mrg_rxbuf) + +static void test_end(void) +{ + qtest_end(); +} + +#ifndef _WIN32 + +static QVirtioPCIDevice *virtio_net_pci_init(QPCIBus *bus, int slot) +{ + QVirtioPCIDevice *dev; + + dev = qvirtio_pci_device_find(bus, QVIRTIO_NET_DEVICE_ID); + g_assert(dev != NULL); + g_assert_cmphex(dev->vdev.device_type, ==, QVIRTIO_NET_DEVICE_ID); + + qvirtio_pci_device_enable(dev); + qvirtio_reset(&qvirtio_pci, &dev->vdev); + qvirtio_set_acknowledge(&qvirtio_pci, &dev->vdev); + qvirtio_set_driver(&qvirtio_pci, &dev->vdev); + + return dev; +} + +static QPCIBus *pci_test_start(int socket) { + char *cmdline; + + cmdline = g_strdup_printf("-netdev socket,fd=%d,id=hs0 -device " + "virtio-net-pci,netdev=hs0", socket); + qtest_start(cmdline); + g_free(cmdline); + + return qpci_init_pc(); +} + +static void driver_init(const QVirtioBus *bus, QVirtioDevice *dev) +{ + uint32_t features; + + features = qvirtio_get_features(bus, dev); + features = features & ~(QVIRTIO_F_BAD_FEATURE | + QVIRTIO_F_RING_INDIRECT_DESC | + QVIRTIO_F_RING_EVENT_IDX); + qvirtio_set_features(bus, dev, features); + + qvirtio_set_driver_ok(bus, dev); +} + +static void rx_test(const QVirtioBus *bus, QVirtioDevice *dev, + QGuestAllocator *alloc, QVirtQueue *vq, + int socket) +{ + uint64_t req_addr; + uint32_t free_head; + char test[] = "TEST"; + char buffer[64]; + int len = htonl(sizeof(test)); + struct iovec iov[] = { + { + .iov_base = &len, + .iov_len = sizeof(len), + }, { + .iov_base = test, + .iov_len = sizeof(test), + }, + }; + int ret; + + req_addr = guest_alloc(alloc, 64); + + free_head = qvirtqueue_add(vq, req_addr, 64, true, false); + qvirtqueue_kick(bus, dev, vq, free_head); + + ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); + g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); + + qvirtio_wait_queue_isr(bus, dev, vq, QVIRTIO_NET_TIMEOUT_US); + memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); + g_assert_cmpstr(buffer, ==, "TEST"); + + guest_free(alloc, req_addr); +} + +static void tx_test(const QVirtioBus *bus, QVirtioDevice *dev, + QGuestAllocator *alloc, QVirtQueue *vq, + int socket) +{ + uint64_t req_addr; + uint32_t free_head; + uint32_t len; + char buffer[64]; + int ret; + + req_addr = guest_alloc(alloc, 64); + memwrite(req_addr + VNET_HDR_SIZE, "TEST", 4); + + free_head = qvirtqueue_add(vq, req_addr, 64, false, false); + qvirtqueue_kick(bus, dev, vq, free_head); + + qvirtio_wait_queue_isr(bus, dev, vq, QVIRTIO_NET_TIMEOUT_US); + guest_free(alloc, req_addr); + + ret = qemu_recv(socket, &len, sizeof(len), 0); + g_assert_cmpint(ret, ==, sizeof(len)); + len = ntohl(len); + + ret = qemu_recv(socket, buffer, len, 0); + g_assert_cmpstr(buffer, ==, "TEST"); +} + +static void send_recv_test(const QVirtioBus *bus, QVirtioDevice *dev, + QGuestAllocator *alloc, QVirtQueue *rvq, + QVirtQueue *tvq, int socket) +{ + rx_test(bus, dev, alloc, rvq, socket); + tx_test(bus, dev, alloc, tvq, socket); +} + +static void pci_basic(gconstpointer data) +{ + QVirtioPCIDevice *dev; + QPCIBus *bus; + QVirtQueuePCI *tx, *rx; + QGuestAllocator *alloc; + void (*func) (const QVirtioBus *bus, + QVirtioDevice *dev, + QGuestAllocator *alloc, + QVirtQueue *rvq, + QVirtQueue *tvq, + int socket) = data; + int sv[2], ret; + + ret = socketpair(PF_UNIX, SOCK_STREAM, 0, sv); + g_assert_cmpint(ret, !=, -1); + + bus = pci_test_start(sv[1]); + dev = virtio_net_pci_init(bus, PCI_SLOT); + + alloc = pc_alloc_init(); + rx = (QVirtQueuePCI *)qvirtqueue_setup(&qvirtio_pci, &dev->vdev, + alloc, 0); + tx = (QVirtQueuePCI *)qvirtqueue_setup(&qvirtio_pci, &dev->vdev, + alloc, 1); + + driver_init(&qvirtio_pci, &dev->vdev); + func(&qvirtio_pci, &dev->vdev, alloc, &rx->vq, &tx->vq, sv[0]); + + /* End test */ + close(sv[0]); + guest_free(alloc, tx->vq.desc); + pc_alloc_uninit(alloc); + qvirtio_pci_device_disable(dev); + g_free(dev); + qpci_free_pc(bus); + test_end(); } +#endif static void hotplug(void) { + qtest_start("-device virtio-net-pci"); + qpci_plug_device_test("virtio-net-pci", "net1", PCI_SLOT_HP, NULL); qpci_unplug_acpi_device_test("net1", PCI_SLOT_HP); + + test_end(); } int main(int argc, char **argv) @@ -31,13 +203,12 @@ int main(int argc, char **argv) int ret; g_test_init(&argc, &argv, NULL); - qtest_add_func("/virtio/net/pci/nop", pci_nop); +#ifndef _WIN32 + qtest_add_data_func("/virtio/net/pci/basic", send_recv_test, pci_basic); +#endif qtest_add_func("/virtio/net/pci/hotplug", hotplug); - qtest_start("-device virtio-net-pci"); ret = g_test_run(); - qtest_end(); - return ret; } -- 2.4.3 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 3/3] tests: test rx recovery from cont 2015-08-14 15:02 [Qemu-devel] [PULL 0/3] Net patches Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 1/3] net/vmxnet3: Fix incorrect debug message Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 2/3] tests: introduce basic pci test for virtio-net Stefan Hajnoczi @ 2015-08-14 15:02 ` Stefan Hajnoczi 2015-08-18 16:06 ` [Qemu-devel] [PULL 0/3] Net patches Peter Maydell 3 siblings, 0 replies; 19+ messages in thread From: Stefan Hajnoczi @ 2015-08-14 15:02 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Jason Wang, Stefan Hajnoczi From: Jason Wang <jasowang@redhat.com> Rx should be recovered after cont. Signed-off-by: Jason Wang <jasowang@redhat.com> Message-id: 1437117954-16342-2-git-send-email-jasowang@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- tests/virtio-net-test.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index b37dd3e..982d77a 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -140,6 +140,49 @@ static void tx_test(const QVirtioBus *bus, QVirtioDevice *dev, g_assert_cmpstr(buffer, ==, "TEST"); } +static void rx_stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev, + QGuestAllocator *alloc, QVirtQueue *vq, + int socket) +{ + uint64_t req_addr; + uint32_t free_head; + char test[] = "TEST"; + char buffer[64]; + int len = htonl(sizeof(test)); + struct iovec iov[] = { + { + .iov_base = &len, + .iov_len = sizeof(len), + }, { + .iov_base = test, + .iov_len = sizeof(test), + }, + }; + int ret; + + req_addr = guest_alloc(alloc, 64); + + free_head = qvirtqueue_add(vq, req_addr, 64, true, false); + qvirtqueue_kick(bus, dev, vq, free_head); + + qmp("{ 'execute' : 'stop'}"); + + ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); + g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); + + /* We could check the status, but this command is more importantly to + * ensure the packet data gets queued in QEMU, before we do 'cont'. + */ + qmp("{ 'execute' : 'query-status'}"); + qmp("{ 'execute' : 'cont'}"); + + qvirtio_wait_queue_isr(bus, dev, vq, QVIRTIO_NET_TIMEOUT_US); + memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); + g_assert_cmpstr(buffer, ==, "TEST"); + + guest_free(alloc, req_addr); +} + static void send_recv_test(const QVirtioBus *bus, QVirtioDevice *dev, QGuestAllocator *alloc, QVirtQueue *rvq, QVirtQueue *tvq, int socket) @@ -148,6 +191,13 @@ static void send_recv_test(const QVirtioBus *bus, QVirtioDevice *dev, tx_test(bus, dev, alloc, tvq, socket); } +static void stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev, + QGuestAllocator *alloc, QVirtQueue *rvq, + QVirtQueue *tvq, int socket) +{ + rx_stop_cont_test(bus, dev, alloc, rvq, socket); +} + static void pci_basic(gconstpointer data) { QVirtioPCIDevice *dev; @@ -205,6 +255,8 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); #ifndef _WIN32 qtest_add_data_func("/virtio/net/pci/basic", send_recv_test, pci_basic); + qtest_add_data_func("/virtio/net/pci/rx_stop_cont", + stop_cont_test, pci_basic); #endif qtest_add_func("/virtio/net/pci/hotplug", hotplug); -- 2.4.3 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2015-08-14 15:02 [Qemu-devel] [PULL 0/3] Net patches Stefan Hajnoczi ` (2 preceding siblings ...) 2015-08-14 15:02 ` [Qemu-devel] [PULL 3/3] tests: test rx recovery from cont Stefan Hajnoczi @ 2015-08-18 16:06 ` Peter Maydell 3 siblings, 0 replies; 19+ messages in thread From: Peter Maydell @ 2015-08-18 16:06 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: QEMU Developers On 14 August 2015 at 16:02, Stefan Hajnoczi <stefanha@redhat.com> wrote: > The following changes since commit e95edefbd0559e1d0aa09549641b5d9af1f96fac: > > Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into staging (2015-08-03 17:33:35 +0100) > > are available in the git repository at: > > git://github.com/stefanha/qemu.git tags/net-pull-request > > for you to fetch changes up to 8887f84c54f6e74124544d1700a205e5b6821b3d: > > tests: test rx recovery from cont (2015-08-04 09:41:28 +0100) > > ---------------------------------------------------------------- > Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 0/3] Net patches @ 2017-03-14 8:02 Jason Wang 2017-03-14 15:00 ` Peter Maydell 0 siblings, 1 reply; 19+ messages in thread From: Jason Wang @ 2017-03-14 8:02 UTC (permalink / raw) To: peter.maydell, qemu-devel; +Cc: Jason Wang The following changes since commit 5bac3c39c82e149515c10643acafd1d292433775: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2017-03-13 15:08:01 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to adb560f7fc92903f52071086a46422be1e3f4640: hw/net: implement MIB counters in mcf_fec driver (2017-03-14 15:39:55 +0800) ---------------------------------------------------------------- - fix e100e memory regions leaks during cleanup - fix fec MIB counters - fix COLO trace print ---------------------------------------------------------------- Greg Ungerer (1): hw/net: implement MIB counters in mcf_fec driver Paolo Bonzini (1): e1000e: correctly tear down MSI-X memory regions Zhang Chen (1): COLO-compare: Fix trace_event print bug hw/net/e1000e.c | 2 +- hw/net/mcf_fec.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++ net/colo-compare.c | 33 +++++++++++---- 3 files changed, 141 insertions(+), 9 deletions(-) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2017-03-14 8:02 Jason Wang @ 2017-03-14 15:00 ` Peter Maydell 0 siblings, 0 replies; 19+ messages in thread From: Peter Maydell @ 2017-03-14 15:00 UTC (permalink / raw) To: Jason Wang; +Cc: QEMU Developers On 14 March 2017 at 09:02, Jason Wang <jasowang@redhat.com> wrote: > The following changes since commit 5bac3c39c82e149515c10643acafd1d292433775: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2017-03-13 15:08:01 +0000) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to adb560f7fc92903f52071086a46422be1e3f4640: > > hw/net: implement MIB counters in mcf_fec driver (2017-03-14 15:39:55 +0800) > > ---------------------------------------------------------------- > - fix e100e memory regions leaks during cleanup > - fix fec MIB counters > - fix COLO trace print > ---------------------------------------------------------------- > Greg Ungerer (1): > hw/net: implement MIB counters in mcf_fec driver > > Paolo Bonzini (1): > e1000e: correctly tear down MSI-X memory regions > > Zhang Chen (1): > COLO-compare: Fix trace_event print bug > > hw/net/e1000e.c | 2 +- > hw/net/mcf_fec.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > net/colo-compare.c | 33 +++++++++++---- > 3 files changed, 141 insertions(+), 9 deletions(-) Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 0/3] Net patches @ 2017-01-06 3:32 Jason Wang 2017-01-06 15:13 ` Peter Maydell 0 siblings, 1 reply; 19+ messages in thread From: Jason Wang @ 2017-01-06 3:32 UTC (permalink / raw) To: peter.maydell, stefanha, qemu-devel; +Cc: Jason Wang The following changes since commit e92fbc753df4fab9ee524b5ea07a51bee8b6bae4: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-01-05 12:44:23 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 7e354ed4df9787ff95cdb189374739e476be4f9a: fsl_etsec: Fix Tx BD ring wrapping handling (2017-01-06 10:38:21 +0800) ---------------------------------------------------------------- - network support for record/replay ---------------------------------------------------------------- Andrey Smirnov (1): fsl_etsec: Fix Tx BD ring wrapping handling Hervé Poussineau (1): rtl8139: correctly handle PHY reset Pavel Dovgalyuk (1): record/replay: add network support docs/replay.txt | 14 +++++++ hw/net/fsl_etsec/rings.c | 19 +++++---- hw/net/rtl8139.c | 34 ++++++++++------ include/sysemu/replay.h | 12 ++++++ net/Makefile.objs | 1 + net/filter-replay.c | 92 ++++++++++++++++++++++++++++++++++++++++++ replay/Makefile.objs | 1 + replay/replay-events.c | 11 +++++ replay/replay-internal.h | 10 +++++ replay/replay-net.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ replay/replay.c | 2 +- vl.c | 3 +- 12 files changed, 276 insertions(+), 25 deletions(-) create mode 100644 net/filter-replay.c create mode 100644 replay/replay-net.c ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2017-01-06 3:32 Jason Wang @ 2017-01-06 15:13 ` Peter Maydell 0 siblings, 0 replies; 19+ messages in thread From: Peter Maydell @ 2017-01-06 15:13 UTC (permalink / raw) To: Jason Wang; +Cc: Stefan Hajnoczi, QEMU Developers On 6 January 2017 at 03:32, Jason Wang <jasowang@redhat.com> wrote: > The following changes since commit e92fbc753df4fab9ee524b5ea07a51bee8b6bae4: > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-01-05 12:44:23 +0000) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to 7e354ed4df9787ff95cdb189374739e476be4f9a: > > fsl_etsec: Fix Tx BD ring wrapping handling (2017-01-06 10:38:21 +0800) > > ---------------------------------------------------------------- > > - network support for record/replay > > ---------------------------------------------------------------- > Andrey Smirnov (1): > fsl_etsec: Fix Tx BD ring wrapping handling > > Hervé Poussineau (1): > rtl8139: correctly handle PHY reset > > Pavel Dovgalyuk (1): > record/replay: add network support Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 0/3] Net patches @ 2016-12-05 9:52 Jason Wang 2016-12-05 10:42 ` no-reply 2016-12-05 14:35 ` Stefan Hajnoczi 0 siblings, 2 replies; 19+ messages in thread From: Jason Wang @ 2016-12-05 9:52 UTC (permalink / raw) To: peter.maydell, stefanha, qemu-devel; +Cc: Jason Wang The following changes since commit bd8ef5060dd2124a54578241da9a572faf7658dd: Merge remote-tracking branch 'dgibson/tags/ppc-for-2.8-20161201' into staging (2016-12-01 13:39:29 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 18766d28848f2a4c309e78c6706b872f2cb32786: fsl_etsec: Fix various small problems in hexdump code (2016-12-05 17:45:14 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Andrey Smirnov (2): fsl_etsec: Pad short payloads with zeros fsl_etsec: Fix various small problems in hexdump code Prasad J Pandit (1): net: mcf: check receive buffer size register value hw/net/fsl_etsec/etsec.c | 4 ++-- hw/net/fsl_etsec/rings.c | 7 +++++++ hw/net/mcf_fec.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2016-12-05 9:52 Jason Wang @ 2016-12-05 10:42 ` no-reply 2016-12-05 14:35 ` Stefan Hajnoczi 1 sibling, 0 replies; 19+ messages in thread From: no-reply @ 2016-12-05 10:42 UTC (permalink / raw) To: jasowang; +Cc: famz, peter.maydell, stefanha, qemu-devel Hi, Your series seems to have some coding style problems. See output below for more information: Subject: [Qemu-devel] [PULL 0/3] Net patches Type: series Message-id: 1480931523-5769-1-git-send-email-jasowang@redhat.com === TEST SCRIPT BEGIN === #!/bin/bash BASE=base n=1 total=$(git log --oneline $BASE.. | wc -l) failed=0 # Useful git options git config --local diff.renamelimit 0 git config --local diff.renames True commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..." if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then failed=1 echo fi n=$((n+1)) done exit $failed === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' 18cd9a6 fsl_etsec: Fix various small problems in hexdump code 947509b fsl_etsec: Pad short payloads with zeros e2362ab net: mcf: check receive buffer size register value === OUTPUT BEGIN === Checking PATCH 1/3: net: mcf: check receive buffer size register value... Checking PATCH 2/3: fsl_etsec: Pad short payloads with zeros... ERROR: braces {} are necessary for all arms of this statement #33: FILE: hw/net/fsl_etsec/rings.c:481: + if (etsec->rx_buffer_len < 60) [...] total: 1 errors, 0 warnings, 13 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Checking PATCH 3/3: fsl_etsec: Fix various small problems in hexdump code... === OUTPUT END === Test command exited with code: 1 --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@freelists.org ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2016-12-05 9:52 Jason Wang 2016-12-05 10:42 ` no-reply @ 2016-12-05 14:35 ` Stefan Hajnoczi 2016-12-06 2:32 ` Jason Wang 1 sibling, 1 reply; 19+ messages in thread From: Stefan Hajnoczi @ 2016-12-05 14:35 UTC (permalink / raw) To: Jason Wang; +Cc: peter.maydell, qemu-devel [-- Attachment #1: Type: text/plain, Size: 707 bytes --] On Mon, Dec 05, 2016 at 05:52:00PM +0800, Jason Wang wrote: > The following changes since commit bd8ef5060dd2124a54578241da9a572faf7658dd: > > Merge remote-tracking branch 'dgibson/tags/ppc-for-2.8-20161201' into staging (2016-12-01 13:39:29 +0000) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to 18766d28848f2a4c309e78c6706b872f2cb32786: > > fsl_etsec: Fix various small problems in hexdump code (2016-12-05 17:45:14 +0800) > > ---------------------------------------------------------------- Please resend with the coding style violation fixed. See the patchew email for details. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 455 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2016-12-05 14:35 ` Stefan Hajnoczi @ 2016-12-06 2:32 ` Jason Wang 0 siblings, 0 replies; 19+ messages in thread From: Jason Wang @ 2016-12-06 2:32 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: peter.maydell, qemu-devel On 2016年12月05日 22:35, Stefan Hajnoczi wrote: > On Mon, Dec 05, 2016 at 05:52:00PM +0800, Jason Wang wrote: >> The following changes since commit bd8ef5060dd2124a54578241da9a572faf7658dd: >> >> Merge remote-tracking branch 'dgibson/tags/ppc-for-2.8-20161201' into staging (2016-12-01 13:39:29 +0000) >> >> are available in the git repository at: >> >> https://github.com/jasowang/qemu.git tags/net-pull-request >> >> for you to fetch changes up to 18766d28848f2a4c309e78c6706b872f2cb32786: >> >> fsl_etsec: Fix various small problems in hexdump code (2016-12-05 17:45:14 +0800) >> >> ---------------------------------------------------------------- > Please resend with the coding style violation fixed. See the patchew > email for details. V2 posted. Thanks ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 0/3] Net patches @ 2016-08-09 7:34 Jason Wang 2016-08-09 10:14 ` Peter Maydell 0 siblings, 1 reply; 19+ messages in thread From: Jason Wang @ 2016-08-09 7:34 UTC (permalink / raw) To: qemu-devel, peter.maydell; +Cc: Jason Wang The following changes since commit 53279c76cf071fed07a336948d37c72e3613e0b7: Update version for v2.7.0-rc2 release (2016-08-08 17:26:11 +0100) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to a0d1cbdacff5df4ded16b753b38fdd9da6092968: hw/net: Fix a heap overflow in xlnx.xps-ethernetlite (2016-08-09 15:27:18 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Li Qiang (1): net: vmxnet3: check for device_active before write Prasad J Pandit (1): net: check fragment length during fragmentation chaojianhu (1): hw/net: Fix a heap overflow in xlnx.xps-ethernetlite hw/net/net_tx_pkt.c | 2 +- hw/net/vmxnet3.c | 4 ++++ hw/net/xilinx_ethlite.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2016-08-09 7:34 Jason Wang @ 2016-08-09 10:14 ` Peter Maydell 0 siblings, 0 replies; 19+ messages in thread From: Peter Maydell @ 2016-08-09 10:14 UTC (permalink / raw) To: Jason Wang; +Cc: QEMU Developers On 9 August 2016 at 08:34, Jason Wang <jasowang@redhat.com> wrote: > The following changes since commit 53279c76cf071fed07a336948d37c72e3613e0b7: > > Update version for v2.7.0-rc2 release (2016-08-08 17:26:11 +0100) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to a0d1cbdacff5df4ded16b753b38fdd9da6092968: > > hw/net: Fix a heap overflow in xlnx.xps-ethernetlite (2016-08-09 15:27:18 +0800) > > ---------------------------------------------------------------- > > ---------------------------------------------------------------- Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 0/3] Net patches @ 2015-09-15 12:02 Stefan Hajnoczi 2015-09-15 13:04 ` Peter Maydell 0 siblings, 1 reply; 19+ messages in thread From: Stefan Hajnoczi @ 2015-09-15 12:02 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, qemu-stable, Stefan Hajnoczi The following changes since commit 2752e5bedb26fa0c7291f810f9f534b688b2f1d2: qapi: Fix cgen() for Python older than 2.7 (2015-09-14 18:02:59 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git tags/net-pull-request for you to fetch changes up to 737d2b3c41d59eb8f94ab7eb419b957938f24943: net: avoid infinite loop when receiving packets(CVE-2015-5278) (2015-09-15 12:51:14 +0100) ---------------------------------------------------------------- This net pull request contains security fixes for qemu.git/master. The patches should also be applied to stable trees. The ne2000 NIC model has QEMU memory corruption issue. Both ne2000 and e1000 have an infinite loop. Please see the patches for CVE numbers and details on the bugs. ---------------------------------------------------------------- P J P (3): e1000: Avoid infinite loop in processing transmit descriptor (CVE-2015-6815) net: add checks to validate ring buffer pointers(CVE-2015-5279) net: avoid infinite loop when receiving packets(CVE-2015-5278) hw/net/e1000.c | 3 ++- hw/net/ne2000.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) -- 2.4.3 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Net patches 2015-09-15 12:02 Stefan Hajnoczi @ 2015-09-15 13:04 ` Peter Maydell 0 siblings, 0 replies; 19+ messages in thread From: Peter Maydell @ 2015-09-15 13:04 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: QEMU Developers, qemu-stable On 15 September 2015 at 13:02, Stefan Hajnoczi <stefanha@redhat.com> wrote: > The following changes since commit 2752e5bedb26fa0c7291f810f9f534b688b2f1d2: > > qapi: Fix cgen() for Python older than 2.7 (2015-09-14 18:02:59 +0100) > > are available in the git repository at: > > git://github.com/stefanha/qemu.git tags/net-pull-request > > for you to fetch changes up to 737d2b3c41d59eb8f94ab7eb419b957938f24943: > > net: avoid infinite loop when receiving packets(CVE-2015-5278) (2015-09-15 12:51:14 +0100) > > ---------------------------------------------------------------- > This net pull request contains security fixes for qemu.git/master. The patches > should also be applied to stable trees. > > The ne2000 NIC model has QEMU memory corruption issue. Both ne2000 and e1000 > have an infinite loop. > > Please see the patches for CVE numbers and details on the bugs. > > ---------------------------------------------------------------- Applied to master, thanks. -- PMM ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 0/3] Net patches @ 2014-01-13 7:43 Stefan Hajnoczi 0 siblings, 0 replies; 19+ messages in thread From: Stefan Hajnoczi @ 2014-01-13 7:43 UTC (permalink / raw) To: qemu-devel; +Cc: Anthony Liguori Note this is my first signed pull request, using the PGP key that I provided at KVM Forum 2013. The following changes since commit dd089c0a1e928fb80ba8a37983c1b0e9232d1c8b: Merge remote-tracking branch 'pmaydell/tags/pull-cocoa-20140112' into staging (2014-01-12 17:50:52 -0800) are available in the git repository at: git://github.com/stefanha/qemu.git tags/net-for-anthony for you to fetch changes up to 7a78fa0536db7fe5d95ea598386dbb4eaa9ea7d1: Fix lan9118 buffer length handling (2014-01-13 13:44:28 +0800) ---------------------------------------------------------------- Net subsystem patch queue ---------------------------------------------------------------- Hani Benhabiles (1): net: Use g_strdup_printf instead of snprintf. Roy Franz (2): Fix lan9118 TX "CMD A" handling Fix lan9118 buffer length handling hw/net/lan9118.c | 6 +++--- net/net.c | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) -- 1.8.4.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 0/3] Net patches @ 2012-08-10 13:27 Stefan Hajnoczi 0 siblings, 0 replies; 19+ messages in thread From: Stefan Hajnoczi @ 2012-08-10 13:27 UTC (permalink / raw) To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi Paolo's fixes to resume rx when buffers have been replenished on e1000 and xen_nic. virtio-net does not have this bug. The following changes since commit 3d1d9652978ac5a32a0beb4bdf6065ca39440d89: handle device help before accelerator set up (2012-08-09 19:53:01 +0000) are available in the git repository at: git://github.com/stefanha/qemu.git net for you to fetch changes up to 4247561bbeacb5ece8b90d0d2439efefc0e7283a: xen: flush queue when getting an event (2012-08-10 11:43:54 +0100) ---------------------------------------------------------------- Paolo Bonzini (3): net: notify iothread after flushing queue e1000: flush queue whenever can_receive can go from false to true xen: flush queue when getting an event hw/e1000.c | 4 ++++ hw/virtio-net.c | 4 ---- hw/xen_nic.c | 1 + net.c | 7 ++++++- net/queue.c | 5 +++-- net/queue.h | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) -- 1.7.10.4 ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2017-03-14 15:00 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-08-14 15:02 [Qemu-devel] [PULL 0/3] Net patches Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 1/3] net/vmxnet3: Fix incorrect debug message Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 2/3] tests: introduce basic pci test for virtio-net Stefan Hajnoczi 2015-08-14 15:02 ` [Qemu-devel] [PULL 3/3] tests: test rx recovery from cont Stefan Hajnoczi 2015-08-18 16:06 ` [Qemu-devel] [PULL 0/3] Net patches Peter Maydell -- strict thread matches above, loose matches on Subject: below -- 2017-03-14 8:02 Jason Wang 2017-03-14 15:00 ` Peter Maydell 2017-01-06 3:32 Jason Wang 2017-01-06 15:13 ` Peter Maydell 2016-12-05 9:52 Jason Wang 2016-12-05 10:42 ` no-reply 2016-12-05 14:35 ` Stefan Hajnoczi 2016-12-06 2:32 ` Jason Wang 2016-08-09 7:34 Jason Wang 2016-08-09 10:14 ` Peter Maydell 2015-09-15 12:02 Stefan Hajnoczi 2015-09-15 13:04 ` Peter Maydell 2014-01-13 7:43 Stefan Hajnoczi 2012-08-10 13:27 Stefan Hajnoczi
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.