* [PULL 0/2] Net patches
@ 2021-09-17 8:24 Jason Wang
2021-09-17 8:24 ` [PULL 1/2] ebpf: only include in system emulators Jason Wang
` (2 more replies)
0 siblings, 3 replies; 22+ messages in thread
From: Jason Wang @ 2021-09-17 8:24 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: 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(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 1/2] ebpf: only include in system emulators
2021-09-17 8:24 [PULL 0/2] Net patches Jason Wang
@ 2021-09-17 8:24 ` Jason Wang
2021-09-17 8:24 ` [PULL 2/2] virtio-net: fix use after unmap/free for sg Jason Wang
2021-09-20 17:30 ` [PULL 0/2] Net patches Peter Maydell
2 siblings, 0 replies; 22+ messages in thread
From: Jason Wang @ 2021-09-17 8:24 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Paolo Bonzini, Jason Wang
From: Paolo Bonzini <pbonzini@redhat.com>
eBPF files are being included in user emulators, which is useless and
also breaks compilation because ebpf/trace-events is only processed
if a system emulator is included in the build.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/566
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
ebpf/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ebpf/meson.build b/ebpf/meson.build
index 9cd0635..2dd0fd8 100644
--- a/ebpf/meson.build
+++ b/ebpf/meson.build
@@ -1 +1 @@
-common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
+softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
--
2.7.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PULL 2/2] virtio-net: fix use after unmap/free for sg
2021-09-17 8:24 [PULL 0/2] Net patches Jason Wang
2021-09-17 8:24 ` [PULL 1/2] ebpf: only include in system emulators Jason Wang
@ 2021-09-17 8:24 ` Jason Wang
2021-09-20 17:30 ` [PULL 0/2] Net patches Peter Maydell
2 siblings, 0 replies; 22+ messages in thread
From: Jason Wang @ 2021-09-17 8:24 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Alexander Bulekov, Jason Wang, qemu-stable
When mergeable buffer is enabled, we try to set the num_buffers after
the virtqueue elem has been unmapped. This will lead several issues,
E.g a use after free when the descriptor has an address which belongs
to the non direct access region. In this case we use bounce buffer
that is allocated during address_space_map() and freed during
address_space_unmap().
Fixing this by storing the elems temporarily in an array and delay the
unmap after we set the the num_buffers.
This addresses CVE-2021-3748.
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Fixes: fbe78f4f55c6 ("virtio-net support")
Cc: qemu-stable@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/virtio-net.c | 39 ++++++++++++++++++++++++++++++++-------
1 file changed, 32 insertions(+), 7 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 16d20cd..f205331 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1746,10 +1746,13 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
VirtIONet *n = qemu_get_nic_opaque(nc);
VirtIONetQueue *q = virtio_net_get_subqueue(nc);
VirtIODevice *vdev = VIRTIO_DEVICE(n);
+ VirtQueueElement *elems[VIRTQUEUE_MAX_SIZE];
+ size_t lens[VIRTQUEUE_MAX_SIZE];
struct iovec mhdr_sg[VIRTQUEUE_MAX_SIZE];
struct virtio_net_hdr_mrg_rxbuf mhdr;
unsigned mhdr_cnt = 0;
- size_t offset, i, guest_offset;
+ size_t offset, i, guest_offset, j;
+ ssize_t err;
if (!virtio_net_can_receive(nc)) {
return -1;
@@ -1780,6 +1783,12 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
total = 0;
+ if (i == VIRTQUEUE_MAX_SIZE) {
+ virtio_error(vdev, "virtio-net unexpected long buffer chain");
+ err = size;
+ goto err;
+ }
+
elem = virtqueue_pop(q->rx_vq, sizeof(VirtQueueElement));
if (!elem) {
if (i) {
@@ -1791,7 +1800,8 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
n->guest_hdr_len, n->host_hdr_len,
vdev->guest_features);
}
- return -1;
+ err = -1;
+ goto err;
}
if (elem->in_num < 1) {
@@ -1799,7 +1809,8 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
"virtio-net receive queue contains no in buffers");
virtqueue_detach_element(q->rx_vq, elem, 0);
g_free(elem);
- return -1;
+ err = -1;
+ goto err;
}
sg = elem->in_sg;
@@ -1836,12 +1847,13 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
if (!n->mergeable_rx_bufs && offset < size) {
virtqueue_unpop(q->rx_vq, elem, total);
g_free(elem);
- return size;
+ err = size;
+ goto err;
}
- /* signal other side */
- virtqueue_fill(q->rx_vq, elem, total, i++);
- g_free(elem);
+ elems[i] = elem;
+ lens[i] = total;
+ i++;
}
if (mhdr_cnt) {
@@ -1851,10 +1863,23 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
&mhdr.num_buffers, sizeof mhdr.num_buffers);
}
+ for (j = 0; j < i; j++) {
+ /* signal other side */
+ virtqueue_fill(q->rx_vq, elems[j], lens[j], j);
+ g_free(elems[j]);
+ }
+
virtqueue_flush(q->rx_vq, i);
virtio_notify(vdev, q->rx_vq);
return size;
+
+err:
+ for (j = 0; j < i; j++) {
+ g_free(elems[j]);
+ }
+
+ return err;
}
static ssize_t virtio_net_do_receive(NetClientState *nc, const uint8_t *buf,
--
2.7.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2021-09-17 8:24 [PULL 0/2] Net patches Jason Wang
2021-09-17 8:24 ` [PULL 1/2] ebpf: only include in system emulators Jason Wang
2021-09-17 8:24 ` [PULL 2/2] virtio-net: fix use after unmap/free for sg Jason Wang
@ 2021-09-20 17:30 ` Peter Maydell
2 siblings, 0 replies; 22+ messages in thread
From: Peter Maydell @ 2021-09-20 17:30 UTC (permalink / raw)
To: Jason Wang; +Cc: QEMU Developers
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 0/2] Net patches
@ 2023-11-14 3:09 Jason Wang
2023-11-14 17:32 ` Stefan Hajnoczi
2023-11-16 16:47 ` David Woodhouse
0 siblings, 2 replies; 22+ messages in thread
From: Jason Wang @ 2023-11-14 3:09 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang
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(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2023-11-14 3:09 Jason Wang
@ 2023-11-14 17:32 ` Stefan Hajnoczi
2023-11-16 16:47 ` David Woodhouse
1 sibling, 0 replies; 22+ messages in thread
From: Stefan Hajnoczi @ 2023-11-14 17:32 UTC (permalink / raw)
To: Jason Wang; +Cc: qemu-devel, jasowang
[-- 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 --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2023-11-14 3:09 Jason Wang
2023-11-14 17:32 ` Stefan Hajnoczi
@ 2023-11-16 16:47 ` David Woodhouse
2023-11-17 2:28 ` Jason Wang
1 sibling, 1 reply; 22+ messages in thread
From: David Woodhouse @ 2023-11-16 16:47 UTC (permalink / raw)
To: Jason Wang, qemu-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 0/2] Net patches
@ 2022-11-08 4:19 Jason Wang
2022-11-08 16:32 ` Stefan Hajnoczi
2022-11-08 18:18 ` Stefan Hajnoczi
0 siblings, 2 replies; 22+ messages in thread
From: Jason Wang @ 2022-11-08 4:19 UTC (permalink / raw)
To: stefanha; +Cc: qemu-devel, 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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2022-11-08 4:19 Jason Wang
@ 2022-11-08 16:32 ` Stefan Hajnoczi
2022-11-09 3:34 ` Jason Wang
2022-11-09 7:54 ` Laurent Vivier
2022-11-08 18:18 ` Stefan Hajnoczi
1 sibling, 2 replies; 22+ messages in thread
From: Stefan Hajnoczi @ 2022-11-08 16:32 UTC (permalink / raw)
To: Jason Wang, Laurent Vivier; +Cc: stefanha, qemu-devel
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2022-11-08 16:32 ` Stefan Hajnoczi
@ 2022-11-09 3:34 ` Jason Wang
2022-11-09 7:54 ` Laurent Vivier
1 sibling, 0 replies; 22+ messages in thread
From: Jason Wang @ 2022-11-09 3:34 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Laurent Vivier, stefanha, qemu-devel
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
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2022-11-08 16:32 ` Stefan Hajnoczi
2022-11-09 3:34 ` Jason Wang
@ 2022-11-09 7:54 ` Laurent Vivier
1 sibling, 0 replies; 22+ messages in thread
From: Laurent Vivier @ 2022-11-09 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi, Jason Wang; +Cc: stefanha, qemu-devel
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2022-11-08 4:19 Jason Wang
2022-11-08 16:32 ` Stefan Hajnoczi
@ 2022-11-08 18:18 ` Stefan Hajnoczi
1 sibling, 0 replies; 22+ messages in thread
From: Stefan Hajnoczi @ 2022-11-08 18:18 UTC (permalink / raw)
To: Jason Wang; +Cc: stefanha, qemu-devel
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 0/2] Net patches
@ 2022-07-06 3:47 Jason Wang
2022-07-06 6:50 ` Richard Henderson
0 siblings, 1 reply; 22+ messages in thread
From: Jason Wang @ 2022-07-06 3:47 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: 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(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2022-07-06 3:47 Jason Wang
@ 2022-07-06 6:50 ` Richard Henderson
0 siblings, 0 replies; 22+ messages in thread
From: Richard Henderson @ 2022-07-06 6:50 UTC (permalink / raw)
To: Jason Wang, qemu-devel, peter.maydell
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(-)
>
>
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 0/2] Net patches
@ 2021-11-05 4:17 Jason Wang
2021-11-05 15:41 ` Richard Henderson
0 siblings, 1 reply; 22+ messages in thread
From: Jason Wang @ 2021-11-05 4:17 UTC (permalink / raw)
To: peter.maydell; +Cc: Jason Wang, qemu-devel
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(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2021-11-05 4:17 Jason Wang
@ 2021-11-05 15:41 ` Richard Henderson
0 siblings, 0 replies; 22+ messages in thread
From: Richard Henderson @ 2021-11-05 15:41 UTC (permalink / raw)
To: Jason Wang, peter.maydell; +Cc: qemu-devel
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~
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 0/2] Net patches
@ 2020-08-04 6:41 Jason Wang
2020-08-04 10:53 ` Peter Maydell
0 siblings, 1 reply; 22+ messages in thread
From: Jason Wang @ 2020-08-04 6:41 UTC (permalink / raw)
To: peter.maydell; +Cc: Jason Wang, qemu-devel
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(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2020-08-04 6:41 Jason Wang
@ 2020-08-04 10:53 ` Peter Maydell
2020-08-05 2:43 ` Jason Wang
0 siblings, 1 reply; 22+ messages in thread
From: Peter Maydell @ 2020-08-04 10:53 UTC (permalink / raw)
To: Jason Wang; +Cc: QEMU Developers
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2020-08-04 10:53 ` Peter Maydell
@ 2020-08-05 2:43 ` Jason Wang
0 siblings, 0 replies; 22+ messages in thread
From: Jason Wang @ 2020-08-05 2:43 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
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
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 0/2] Net patches
@ 2020-07-21 13:34 Jason Wang
2020-07-21 16:36 ` Peter Maydell
0 siblings, 1 reply; 22+ messages in thread
From: Jason Wang @ 2020-07-21 13:34 UTC (permalink / raw)
To: peter.maydell, qemu-devel; +Cc: 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(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PULL 0/2] Net patches
2020-07-21 13:34 Jason Wang
@ 2020-07-21 16:36 ` Peter Maydell
0 siblings, 0 replies; 22+ messages in thread
From: Peter Maydell @ 2020-07-21 16:36 UTC (permalink / raw)
To: Jason Wang; +Cc: QEMU Developers
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
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2023-11-17 2:29 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-17 8:24 [PULL 0/2] Net patches Jason Wang
2021-09-17 8:24 ` [PULL 1/2] ebpf: only include in system emulators Jason Wang
2021-09-17 8:24 ` [PULL 2/2] virtio-net: fix use after unmap/free for sg Jason Wang
2021-09-20 17:30 ` [PULL 0/2] Net patches Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2023-11-14 3:09 Jason Wang
2023-11-14 17:32 ` Stefan Hajnoczi
2023-11-16 16:47 ` David Woodhouse
2023-11-17 2:28 ` Jason Wang
2022-11-08 4:19 Jason Wang
2022-11-08 16:32 ` Stefan Hajnoczi
2022-11-09 3:34 ` Jason Wang
2022-11-09 7:54 ` Laurent Vivier
2022-11-08 18:18 ` Stefan Hajnoczi
2022-07-06 3:47 Jason Wang
2022-07-06 6:50 ` Richard Henderson
2021-11-05 4:17 Jason Wang
2021-11-05 15:41 ` Richard Henderson
2020-08-04 6:41 Jason Wang
2020-08-04 10:53 ` Peter Maydell
2020-08-05 2:43 ` Jason Wang
2020-07-21 13:34 Jason Wang
2020-07-21 16:36 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).