[PULL 0/2] Net patches

[PULL 0/2] Net patches

[Jason Wang]

The following changes since commit 69680740eafa1838527c90155a7432d51b8ff203:

  Merge tag 'qdev-array-prop' of https://repo.or.cz/qemu/kevin into staging (2023-11-11 11:23:25 +0800)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to d90014fc337ab77f37285b1a30fd4f545056be0a:

  igb: Add Function Level Reset to PF and VF (2023-11-13 15:33:37 +0800)

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

----------------------------------------------------------------
Cédric Le Goater (2):
      igb: Add a VF reset handler
      igb: Add Function Level Reset to PF and VF

 hw/core/machine.c   |  3 ++-
 hw/net/igb.c        | 15 +++++++++++++++
 hw/net/igb_common.h |  1 +
 hw/net/igb_core.c   |  6 ++++--
 hw/net/igb_core.h   |  3 +++
 hw/net/igbvf.c      | 19 +++++++++++++++++++
 hw/net/trace-events |  1 +
 7 files changed, 45 insertions(+), 3 deletions(-)

[PULL 1/2] igb: Add a VF reset handler

[Jason Wang]

From: Cédric Le Goater <clg@redhat.com>

Export the igb_vf_reset() helper routine from the PF model to let the
IGBVF model implement its own device reset.

Cc: Akihiko Odaki <akihiko.odaki@daynix.com>
Suggested-by: Sriram Yagnaraman <sriram.yagnaraman@est.tech>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/igb.c        |  6 ++++++
 hw/net/igb_common.h |  1 +
 hw/net/igb_core.c   |  6 ++++--
 hw/net/igb_core.h   |  3 +++
 hw/net/igbvf.c      | 10 ++++++++++
 hw/net/trace-events |  1 +
 6 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/hw/net/igb.c b/hw/net/igb.c
index 8ff832a..e70a66e 100644
--- a/hw/net/igb.c
+++ b/hw/net/igb.c
@@ -122,6 +122,12 @@ igb_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
     igb_core_write(&s->core, addr, val, size);
 }
 
+void igb_vf_reset(void *opaque, uint16_t vfn)
+{
+    IGBState *s = opaque;
+    igb_core_vf_reset(&s->core, vfn);
+}
+
 static bool
 igb_io_get_reg_index(IGBState *s, uint32_t *idx)
 {
diff --git a/hw/net/igb_common.h b/hw/net/igb_common.h
index 5c261ba..b316a5b 100644
--- a/hw/net/igb_common.h
+++ b/hw/net/igb_common.h
@@ -152,5 +152,6 @@ enum {
 
 uint64_t igb_mmio_read(void *opaque, hwaddr addr, unsigned size);
 void igb_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned size);
+void igb_vf_reset(void *opaque, uint16_t vfn);
 
 #endif
diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c
index f6a5e23..2a7a11a 100644
--- a/hw/net/igb_core.c
+++ b/hw/net/igb_core.c
@@ -2477,11 +2477,13 @@ static void igb_set_vfmailbox(IGBCore *core, int index, uint32_t val)
     }
 }
 
-static void igb_vf_reset(IGBCore *core, uint16_t vfn)
+void igb_core_vf_reset(IGBCore *core, uint16_t vfn)
 {
     uint16_t qn0 = vfn;
     uint16_t qn1 = vfn + IGB_NUM_VM_POOLS;
 
+    trace_igb_core_vf_reset(vfn);
+
     /* disable Rx and Tx for the VF*/
     core->mac[RXDCTL0 + (qn0 * 16)] &= ~E1000_RXDCTL_QUEUE_ENABLE;
     core->mac[RXDCTL0 + (qn1 * 16)] &= ~E1000_RXDCTL_QUEUE_ENABLE;
@@ -2560,7 +2562,7 @@ static void igb_set_vtctrl(IGBCore *core, int index, uint32_t val)
 
     if (val & E1000_CTRL_RST) {
         vfn = (index - PVTCTRL0) / 0x40;
-        igb_vf_reset(core, vfn);
+        igb_core_vf_reset(core, vfn);
     }
 }
 
diff --git a/hw/net/igb_core.h b/hw/net/igb_core.h
index 9cbbfd5..bf8c46f 100644
--- a/hw/net/igb_core.h
+++ b/hw/net/igb_core.h
@@ -130,6 +130,9 @@ igb_core_set_link_status(IGBCore *core);
 void
 igb_core_pci_uninit(IGBCore *core);
 
+void
+igb_core_vf_reset(IGBCore *core, uint16_t vfn);
+
 bool
 igb_can_receive(IGBCore *core);
 
diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c
index d55e1e8..07343fa 100644
--- a/hw/net/igbvf.c
+++ b/hw/net/igbvf.c
@@ -273,6 +273,13 @@ static void igbvf_pci_realize(PCIDevice *dev, Error **errp)
     pcie_ari_init(dev, 0x150);
 }
 
+static void igbvf_qdev_reset_hold(Object *obj)
+{
+    PCIDevice *vf = PCI_DEVICE(obj);
+
+    igb_vf_reset(pcie_sriov_get_pf(vf), pcie_sriov_vf_number(vf));
+}
+
 static void igbvf_pci_uninit(PCIDevice *dev)
 {
     IgbVfState *s = IGBVF(dev);
@@ -287,6 +294,7 @@ static void igbvf_class_init(ObjectClass *class, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(class);
     PCIDeviceClass *c = PCI_DEVICE_CLASS(class);
+    ResettableClass *rc = RESETTABLE_CLASS(class);
 
     c->realize = igbvf_pci_realize;
     c->exit = igbvf_pci_uninit;
@@ -295,6 +303,8 @@ static void igbvf_class_init(ObjectClass *class, void *data)
     c->revision = 1;
     c->class_id = PCI_CLASS_NETWORK_ETHERNET;
 
+    rc->phases.hold = igbvf_qdev_reset_hold;
+
     dc->desc = "Intel 82576 Virtual Function";
     dc->user_creatable = false;
 
diff --git a/hw/net/trace-events b/hw/net/trace-events
index 3097742..387e32e 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -274,6 +274,7 @@ igb_core_mdic_read(uint32_t addr, uint32_t data) "MDIC READ: PHY[%u] = 0x%x"
 igb_core_mdic_read_unhandled(uint32_t addr) "MDIC READ: PHY[%u] UNHANDLED"
 igb_core_mdic_write(uint32_t addr, uint32_t data) "MDIC WRITE: PHY[%u] = 0x%x"
 igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRITE: PHY[%u] UNHANDLED"
+igb_core_vf_reset(uint16_t vfn) "VF%d"
 
 igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfrstd) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF reset done: %d"
 
-- 
2.7.4

[PULL 2/2] igb: Add Function Level Reset to PF and VF

[Jason Wang]

From: Cédric Le Goater <clg@redhat.com>

The Intel 82576EB GbE Controller say that the Physical and Virtual
Functions support Function Level Reset. Add the capability to the PF
device model using device property "x-pcie-flr-init" which is "on" by
default and "off" for machines <= 8.1 to preserve compatibility.

The FLR capability of the VF model is defined according to the FLR
property of the PF, this to avoid adding an extra compatibility
property.

Cc: Sriram Yagnaraman <sriram.yagnaraman@est.tech>
Fixes: 3a977deebe6b ("Intrdocue igb device emulation")
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/core/machine.c | 3 ++-
 hw/net/igb.c      | 9 +++++++++
 hw/net/igbvf.c    | 9 +++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 50edaab..0c17398 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -35,7 +35,8 @@
 GlobalProperty hw_compat_8_1[] = {
     { TYPE_PCI_BRIDGE, "x-pci-express-writeable-slt-bug", "true" },
     { "ramfb", "x-migrate", "off" },
-    { "vfio-pci-nohotplug", "x-ramfb-migrate", "off" }
+    { "vfio-pci-nohotplug", "x-ramfb-migrate", "off" },
+    { "igb", "x-pcie-flr-init", "off" },
 };
 const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1);
 
diff --git a/hw/net/igb.c b/hw/net/igb.c
index e70a66e..dfb722b 100644
--- a/hw/net/igb.c
+++ b/hw/net/igb.c
@@ -78,6 +78,7 @@ struct IGBState {
     uint32_t ioaddr;
 
     IGBCore core;
+    bool has_flr;
 };
 
 #define IGB_CAP_SRIOV_OFFSET    (0x160)
@@ -101,6 +102,9 @@ static void igb_write_config(PCIDevice *dev, uint32_t addr,
 
     trace_igb_write_config(addr, val, len);
     pci_default_write_config(dev, addr, val, len);
+    if (s->has_flr) {
+        pcie_cap_flr_write_config(dev, addr, val, len);
+    }
 
     if (range_covers_byte(addr, len, PCI_COMMAND) &&
         (dev->config[PCI_COMMAND] & PCI_COMMAND_MASTER)) {
@@ -433,6 +437,10 @@ static void igb_pci_realize(PCIDevice *pci_dev, Error **errp)
     }
 
     /* PCIe extended capabilities (in order) */
+    if (s->has_flr) {
+        pcie_cap_flr_init(pci_dev);
+    }
+
     if (pcie_aer_init(pci_dev, 1, 0x100, 0x40, errp) < 0) {
         hw_error("Failed to initialize AER capability");
     }
@@ -588,6 +596,7 @@ static const VMStateDescription igb_vmstate = {
 
 static Property igb_properties[] = {
     DEFINE_NIC_PROPERTIES(IGBState, conf),
+    DEFINE_PROP_BOOL("x-pcie-flr-init", IGBState, has_flr, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c
index 07343fa..94a4e88 100644
--- a/hw/net/igbvf.c
+++ b/hw/net/igbvf.c
@@ -204,6 +204,10 @@ static void igbvf_write_config(PCIDevice *dev, uint32_t addr, uint32_t val,
 {
     trace_igbvf_write_config(addr, val, len);
     pci_default_write_config(dev, addr, val, len);
+    if (object_property_get_bool(OBJECT(pcie_sriov_get_pf(dev)),
+                                 "x-pcie-flr-init", &error_abort)) {
+        pcie_cap_flr_write_config(dev, addr, val, len);
+    }
 }
 
 static uint64_t igbvf_mmio_read(void *opaque, hwaddr addr, unsigned size)
@@ -266,6 +270,11 @@ static void igbvf_pci_realize(PCIDevice *dev, Error **errp)
         hw_error("Failed to initialize PCIe capability");
     }
 
+    if (object_property_get_bool(OBJECT(pcie_sriov_get_pf(dev)),
+                                 "x-pcie-flr-init", &error_abort)) {
+        pcie_cap_flr_init(dev);
+    }
+
     if (pcie_aer_init(dev, 1, 0x100, 0x40, errp) < 0) {
         hw_error("Failed to initialize AER capability");
     }
-- 
2.7.4

Re: [PULL 0/2] Net patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 0/2] Net patches

[David Woodhouse]

[-- Attachment #1: Type: text/plain, Size: 780 bytes --]

On Tue, 2023-11-14 at 11:09 +0800, Jason Wang wrote:
> The following changes since commit 69680740eafa1838527c90155a7432d51b8ff203:
> 
>   Merge tag 'qdev-array-prop' of https://repo.or.cz/qemu/kevin into staging (2023-11-11 11:23:25 +0800)
> 
> are available in the git repository at:
> 
>   https://github.com/jasowang/qemu.git tags/net-pull-request
> 
> for you to fetch changes up to d90014fc337ab77f37285b1a30fd4f545056be0a:
> 
>   igb: Add Function Level Reset to PF and VF (2023-11-13 15:33:37 +0800)

Hi Jason, 

I note this doesn't include the net_cleanup() fix from
https://lore.kernel.org/qemu-devel/20231115172723.1161679-2-dwmw2@infradead.org/

Do you mind if I submit that in a pull request with the other fixes
from that series?

Thanks.

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]

Re: [PULL 0/2] Net patches

[Jason Wang]

On Fri, Nov 17, 2023 at 12:49 AM David Woodhouse <dwmw2@infradead.org> wrote:
>
> On Tue, 2023-11-14 at 11:09 +0800, Jason Wang wrote:
> > The following changes since commit 69680740eafa1838527c90155a7432d51b8ff203:
> >
> >   Merge tag 'qdev-array-prop' of https://repo.or.cz/qemu/kevin into staging (2023-11-11 11:23:25 +0800)
> >
> > are available in the git repository at:
> >
> >   https://github.com/jasowang/qemu.git tags/net-pull-request
> >
> > for you to fetch changes up to d90014fc337ab77f37285b1a30fd4f545056be0a:
> >
> >   igb: Add Function Level Reset to PF and VF (2023-11-13 15:33:37 +0800)
>
> Hi Jason,
>
> I note this doesn't include the net_cleanup() fix from
> https://lore.kernel.org/qemu-devel/20231115172723.1161679-2-dwmw2@infradead.org/
>

Yes, it's in the list of patches that need review and it seems fine.

> Do you mind if I submit that in a pull request with the other fixes
> from that series?

I've queued this for rc1. Pull request will be sent no later than 21st.

Thanks

>
> Thanks.

Re: [PULL 0/2] Net patches

[Laurent Vivier]

On 11/8/22 17:32, Stefan Hajnoczi wrote:
> On Mon, 7 Nov 2022 at 23:20, Jason Wang <jasowang@redhat.com> wrote:
>>
>> The following changes since commit 524fc737431d240f9d9f10aaf381003092868bac:
>>
>>    util/log: Ignore per-thread flag if global file already there (2022-11-07 16:00:02 -0500)
>>
>> are available in the git repository at:
>>
>>    https://github.com/jasowang/qemu.git tags/net-pull-request
>>
>> for you to fetch changes up to fd2c87c7b0c97be2ac8d334885419f51f5963b51:
>>
>>    tests/qtest: netdev: test stream and dgram backends (2022-11-08 12:10:26 +0800)
>>
>> ----------------------------------------------------------------
>>
>> ----------------------------------------------------------------
>> Laurent Vivier (1):
>>        tests/qtest: netdev: test stream and dgram backends
> 
> This test does not pass in CI:
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964536
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964524
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964471
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964475

These four fail because of "No machine specified, and there is no default"

> https://gitlab.com/qemu-project/qemu/-/jobs/3290964569

This one because of an unexpected "info network" result:

st0: index=0,type=stream,
xlnx.xps-ethernetlite.0: 
index=0,type=nic,model=xlnx.xps-ethernetlite,macaddr=52:54:00:12:34:56

> 
> We're in soft freeze now. Please hold off on new tests unless they
> verify regressions/blockers.

Sorry for that, I fix that and wait for 7.3...

Thanks,
Laurent

Re: [PULL 0/2] Net patches

[Jason Wang]

On Wed, Nov 9, 2022 at 12:33 AM Stefan Hajnoczi <stefanha@gmail.com> wrote:
>
> On Mon, 7 Nov 2022 at 23:20, Jason Wang <jasowang@redhat.com> wrote:
> >
> > The following changes since commit 524fc737431d240f9d9f10aaf381003092868bac:
> >
> >   util/log: Ignore per-thread flag if global file already there (2022-11-07 16:00:02 -0500)
> >
> > are available in the git repository at:
> >
> >   https://github.com/jasowang/qemu.git tags/net-pull-request
> >
> > for you to fetch changes up to fd2c87c7b0c97be2ac8d334885419f51f5963b51:
> >
> >   tests/qtest: netdev: test stream and dgram backends (2022-11-08 12:10:26 +0800)
> >
> > ----------------------------------------------------------------
> >
> > ----------------------------------------------------------------
> > Laurent Vivier (1):
> >       tests/qtest: netdev: test stream and dgram backends
>
> This test does not pass in CI:
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964536
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964524
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964471
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964475
> https://gitlab.com/qemu-project/qemu/-/jobs/3290964569
>
> We're in soft freeze now. Please hold off on new tests unless they
> verify regressions/blockers.

Ok, so I think the netdev socket test could go for 7.3.

Thanks

>
> Thanks,
> Stefan
>

Re: [PULL 0/2] Net patches

[Stefan Hajnoczi]

On Mon, 7 Nov 2022 at 23:20, Jason Wang <jasowang@redhat.com> wrote:
> Si-Wei Liu (1):
>       vhost-vdpa: fix assert !virtio_net_get_subqueue(nc)->async_tx.elem in virtio_net_reset

I have applied just this patch to the staging tree.

Thanks,
Stefan

Re: [PULL 0/2] Net patches

[Stefan Hajnoczi]

On Mon, 7 Nov 2022 at 23:20, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit 524fc737431d240f9d9f10aaf381003092868bac:
>
>   util/log: Ignore per-thread flag if global file already there (2022-11-07 16:00:02 -0500)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to fd2c87c7b0c97be2ac8d334885419f51f5963b51:
>
>   tests/qtest: netdev: test stream and dgram backends (2022-11-08 12:10:26 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Laurent Vivier (1):
>       tests/qtest: netdev: test stream and dgram backends

This test does not pass in CI:
https://gitlab.com/qemu-project/qemu/-/jobs/3290964536
https://gitlab.com/qemu-project/qemu/-/jobs/3290964524
https://gitlab.com/qemu-project/qemu/-/jobs/3290964471
https://gitlab.com/qemu-project/qemu/-/jobs/3290964475
https://gitlab.com/qemu-project/qemu/-/jobs/3290964569

We're in soft freeze now. Please hold off on new tests unless they
verify regressions/blockers.

Thanks,
Stefan

[PULL 0/2] Net patches

[Jason Wang]

The following changes since commit 524fc737431d240f9d9f10aaf381003092868bac:

  util/log: Ignore per-thread flag if global file already there (2022-11-07 16:00:02 -0500)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to fd2c87c7b0c97be2ac8d334885419f51f5963b51:

  tests/qtest: netdev: test stream and dgram backends (2022-11-08 12:10:26 +0800)

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

----------------------------------------------------------------
Laurent Vivier (1):
      tests/qtest: netdev: test stream and dgram backends

Si-Wei Liu (1):
      vhost-vdpa: fix assert !virtio_net_get_subqueue(nc)->async_tx.elem in virtio_net_reset

 net/vhost-vdpa.c            |   2 +-
 tests/qtest/meson.build     |   2 +
 tests/qtest/netdev-socket.c | 435 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 438 insertions(+), 1 deletion(-)
 create mode 100644 tests/qtest/netdev-socket.c

Re: [PULL 0/2] Net patches

[Richard Henderson]

On 7/6/22 09:17, Jason Wang wrote:
> The following changes since commit 39e19f5f67d925c60278a6156fd1776d04495a93:
> 
>    Merge tag 'pull-xen-20220705' of https://xenbits.xen.org/git-http/people/aperard/qemu-dm into staging (2022-07-05 22:13:51 +0530)
> 
> are available in the git repository at:
> 
>    https://github.com/jasowang/qemu.git tags/net-pull-request
> 
> for you to fetch changes up to a495eba03c31c96d6a0817b13598ce2219326691:
> 
>    ebpf: replace deprecated bpf_program__set_socket_filter (2022-07-06 11:39:09 +0800)
> 
> ----------------------------------------------------------------
> 
> ----------------------------------------------------------------
> Ding Hui (1):
>        e1000: set RX descriptor status in a separate operation
> 
> Haochen Tong (1):
>        ebpf: replace deprecated bpf_program__set_socket_filter

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.


r~


> 
>   ebpf/ebpf_rss.c | 2 +-
>   hw/net/e1000.c  | 5 ++++-
>   2 files changed, 5 insertions(+), 2 deletions(-)
> 
> 
> 

[PULL 0/2] Net patches

[Jason Wang]

The following changes since commit 39e19f5f67d925c60278a6156fd1776d04495a93:

  Merge tag 'pull-xen-20220705' of https://xenbits.xen.org/git-http/people/aperard/qemu-dm into staging (2022-07-05 22:13:51 +0530)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to a495eba03c31c96d6a0817b13598ce2219326691:

  ebpf: replace deprecated bpf_program__set_socket_filter (2022-07-06 11:39:09 +0800)

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

----------------------------------------------------------------
Ding Hui (1):
      e1000: set RX descriptor status in a separate operation

Haochen Tong (1):
      ebpf: replace deprecated bpf_program__set_socket_filter

 ebpf/ebpf_rss.c | 2 +-
 hw/net/e1000.c  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

Re: [PULL 0/2] Net patches

[Richard Henderson]

On 11/5/21 12:17 AM, Jason Wang wrote:
> The following changes since commit 18e356a53a2926a15343b914db64324d63748f25:
> 
>    Merge remote-tracking branch 'remotes/stsquad/tags/pull-for-6.2-041121-2' into staging (2021-11-04 08:33:46 -0400)
> 
> are available in the git repository at:
> 
>    https://github.com/jasowang/qemu.git tags/net-pull-request
> 
> for you to fetch changes up to 3fd641ac5ec713e67129c1a57e8b6281182bd843:
> 
>    Fix virtio-net-pci* "vectors" compat (2021-11-05 11:32:00 +0800)
> 
> ----------------------------------------------------------------
> 
> ----------------------------------------------------------------
> Eduardo Habkost (1):
>        Fix virtio-net-pci* "vectors" compat
> 
> Jon Maloy (1):
>        e1000: fix tx re-entrancy problem
> 
>   hw/core/machine.c | 2 +-
>   hw/net/e1000.c    | 7 +++++++
>   2 files changed, 8 insertions(+), 1 deletion(-)

Applied, thanks.

r~

[PULL 0/2] Net patches

[Jason Wang]

The following changes since commit 18e356a53a2926a15343b914db64324d63748f25:

  Merge remote-tracking branch 'remotes/stsquad/tags/pull-for-6.2-041121-2' into staging (2021-11-04 08:33:46 -0400)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to 3fd641ac5ec713e67129c1a57e8b6281182bd843:

  Fix virtio-net-pci* "vectors" compat (2021-11-05 11:32:00 +0800)

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

----------------------------------------------------------------
Eduardo Habkost (1):
      Fix virtio-net-pci* "vectors" compat

Jon Maloy (1):
      e1000: fix tx re-entrancy problem

 hw/core/machine.c | 2 +-
 hw/net/e1000.c    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Re: [PULL 0/2] Net patches

[Peter Maydell]

On Fri, 17 Sept 2021 at 09:24, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit d1fe59377bbbf91dfded1f08ffe3c636e9db8dc0:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.2-pull-request' into staging (2021-09-16 16:02:31 +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 bedd7e93d01961fcb16a97ae45d93acf357e11f6:
>
>   virtio-net: fix use after unmap/free for sg (2021-09-17 16:07:52 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.2
for any user-visible changes.

-- PMM

[PULL 0/2] Net patches

[Jason Wang]

The following changes since commit d1fe59377bbbf91dfded1f08ffe3c636e9db8dc0:

  Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.2-pull-request' into staging (2021-09-16 16:02:31 +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 bedd7e93d01961fcb16a97ae45d93acf357e11f6:

  virtio-net: fix use after unmap/free for sg (2021-09-17 16:07:52 +0800)

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

----------------------------------------------------------------
Jason Wang (1):
      virtio-net: fix use after unmap/free for sg

Paolo Bonzini (1):
      ebpf: only include in system emulators

 ebpf/meson.build    |  2 +-
 hw/net/virtio-net.c | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)

Re: [PULL 0/2] Net patches

[Jason Wang]

On 2020/8/4 下午6:53, Peter Maydell wrote:
> On Tue, 4 Aug 2020 at 07:41, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit 5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10:
>>
>>    Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200803' into staging (2020-08-03 20:34:26 +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 035e69b063835a5fd23cacabd63690a3d84532a8:
>>
>>    hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() (2020-08-04 14:14:48 +0800)
>>
>> ----------------------------------------------------------------
>>
>> ----------------------------------------------------------------
>> Lukas Straub (1):
>>        colo-compare: Remove superfluous NULL-pointer checks for s->iothread
>>
>> Mauro Matteo Cascella (1):
>>        hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment()
> Hi; this pullreq includes a patch where there's mangled UTF-8 in
> one of the commit messages: the "colo-compare: Remove superfluous
> NULL-pointer checks for s->iothread" patch has a mangled version
> of the e-with-acute-accent character in Philippe's surname in his
> Reviewed-by: tag.
>
> Since this is the day of rc3 and I think you're at a timezone
> offset that would make rerolling the series in time tricky,
> I'm going to let this through. But please can you fix your
> patch-handling workflow to ensure it doesn't corrupt UTF-8 ?


My bad, it's time for me to use patchwork probably (or is there a better 
tools)?

Thanks


>
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
> for any user-visible changes.
>
> -- PMM
>

Re: [PULL 0/2] Net patches

[Peter Maydell]

On Tue, 4 Aug 2020 at 07:41, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit 5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200803' into staging (2020-08-03 20:34:26 +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 035e69b063835a5fd23cacabd63690a3d84532a8:
>
>   hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() (2020-08-04 14:14:48 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Lukas Straub (1):
>       colo-compare: Remove superfluous NULL-pointer checks for s->iothread
>
> Mauro Matteo Cascella (1):
>       hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment()

Hi; this pullreq includes a patch where there's mangled UTF-8 in
one of the commit messages: the "colo-compare: Remove superfluous
NULL-pointer checks for s->iothread" patch has a mangled version
of the e-with-acute-accent character in Philippe's surname in his
Reviewed-by: tag.

Since this is the day of rc3 and I think you're at a timezone
offset that would make rerolling the series in time tricky,
I'm going to let this through. But please can you fix your
patch-handling workflow to ensure it doesn't corrupt UTF-8 ?

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM

[PULL 0/2] Net patches

[Jason Wang]

The following changes since commit 5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200803' into staging (2020-08-03 20:34:26 +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 035e69b063835a5fd23cacabd63690a3d84532a8:

  hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() (2020-08-04 14:14:48 +0800)

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

----------------------------------------------------------------
Lukas Straub (1):
      colo-compare: Remove superfluous NULL-pointer checks for s->iothread

Mauro Matteo Cascella (1):
      hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment()

 hw/net/net_tx_pkt.c | 5 ++++-
 net/colo-compare.c  | 8 ++------
 2 files changed, 6 insertions(+), 7 deletions(-)

Re: [PULL 0/2] Net patches

[Peter Maydell]

On Tue, 21 Jul 2020 at 14:34, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit 90218a9a393c7925f330e7dcc08658e2a01d3bd4:
>
>   Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-21' into staging (2020-07-21 10:24:38 +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 5519724a13664b43e225ca05351c60b4468e4555:
>
>   hw/net/xgmac: Fix buffer overflow in xgmac_enet_send() (2020-07-21 21:30:39 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Andrew (1):
>       hw/net: Added plen fix for IPv6
>
> Mauro Matteo Cascella (1):
>       hw/net/xgmac: Fix buffer overflow in xgmac_enet_send()
>

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM

[PULL 0/2] Net patches

[Jason Wang]

The following changes since commit 90218a9a393c7925f330e7dcc08658e2a01d3bd4:

  Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-21' into staging (2020-07-21 10:24:38 +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 5519724a13664b43e225ca05351c60b4468e4555:

  hw/net/xgmac: Fix buffer overflow in xgmac_enet_send() (2020-07-21 21:30:39 +0800)

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

----------------------------------------------------------------
Andrew (1):
      hw/net: Added plen fix for IPv6

Mauro Matteo Cascella (1):
      hw/net/xgmac: Fix buffer overflow in xgmac_enet_send()

 hw/net/net_tx_pkt.c | 23 +++++++++++++++++++++++
 hw/net/net_tx_pkt.h | 14 ++++++++++++++
 hw/net/xgmac.c      | 14 ++++++++++++--
 include/net/eth.h   |  1 +
 4 files changed, 50 insertions(+), 2 deletions(-)