mbox

[PULL,0/8] Net patches

Message ID 20240312113642.36862-1-jasowang@redhat.com
State New
Headers show

Pull-request

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

Message

Jason Wang March 12, 2024, 11:36 a.m. UTC
The following changes since commit 05ec974671200814fa5c1d5db710e0e4b88a40af:

  Merge tag 'm68k-for-9.0-pull-request' of https://github.com/vivier/qemu-m68k into staging (2024-03-11 18:42:53 +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 0cc14182aba961f4c34a21dd202ce6e4a87470f5:

  ebpf: Updated eBPF program and skeleton. (2024-03-12 19:31:47 +0800)

----------------------------------------------------------------
-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAmXwPUAACgkQ7wSWWzmN
YhFnIwgAgctDniJwlRxXB01eVlzXz7IulHnpSby07XEJxENSpGB8ufaeE4eK5gJy
NVK6C2+1EU2vRxm4oIdcvtN4C4/jtRbYYjiSTx7eE4FmSkqshSnR5XCV72LDqG3i
WbzInjMvYfysmcMXLfrWgxOnVew9WqEzlpEWlc7FfNKnkzBVf+JDztfqCUx0XM7H
qefw4ImjqQw993QxJpipXC7aEGUyouB0RIBB71FkCa9ihlh9x7W68evbOI/jTn5q
HWuStgS02sKHjRFliMbdbMY77FNUz4Yroo/GKSvGt64atxkQSJqPNAV+/9n18LNy
QAH5eK6cXFPOIAaYpADU5kHDVVAFiw==
=iBdx
-----END PGP SIGNATURE-----

----------------------------------------------------------------
Andrew Melnychenko (5):
      ebpf: Added eBPF map update through mmap.
      ebpf: Added eBPF initialization by fds.
      virtio-net: Added property to load eBPF RSS with fds.
      qmp: Added new command to retrieve eBPF blob.
      ebpf: Updated eBPF program and skeleton.

Laurent Vivier (2):
      igb: fix link state on resume
      e1000e: fix link state on resume

Nick Briggs (1):
      Avoid unaligned fetch in ladr_match()

 ebpf/ebpf.c                    |   69 +++
 ebpf/ebpf.h                    |   29 +
 ebpf/ebpf_rss-stub.c           |    6 +
 ebpf/ebpf_rss.c                |  149 ++++-
 ebpf/ebpf_rss.h                |   10 +
 ebpf/meson.build               |    2 +-
 ebpf/rss.bpf.skeleton.h        | 1343 ++++++++++++++++++++--------------------
 ebpf/trace.h                   |    1 -
 hw/net/e1000e_core.c           |   60 +-
 hw/net/e1000e_core.h           |    2 -
 hw/net/igb_core.c              |   51 +-
 hw/net/igb_core.h              |    2 -
 hw/net/pcnet.c                 |    2 +-
 hw/net/virtio-net.c            |   54 +-
 include/hw/virtio/virtio-net.h |    2 +
 meson.build                    |   10 +-
 qapi/ebpf.json                 |   66 ++
 qapi/meson.build               |    1 +
 qapi/qapi-schema.json          |    1 +
 tools/ebpf/rss.bpf.c           |    7 +-
 20 files changed, 1058 insertions(+), 809 deletions(-)
 create mode 100644 ebpf/ebpf.c
 create mode 100644 ebpf/ebpf.h
 delete mode 100644 ebpf/trace.h
 create mode 100644 qapi/ebpf.json

Comments

Peter Maydell March 12, 2024, 4:29 p.m. UTC | #1
On Tue, 12 Mar 2024 at 11:36, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit 05ec974671200814fa5c1d5db710e0e4b88a40af:
>
>   Merge tag 'm68k-for-9.0-pull-request' of https://github.com/vivier/qemu-m68k into staging (2024-03-11 18:42:53 +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 0cc14182aba961f4c34a21dd202ce6e4a87470f5:
>
>   ebpf: Updated eBPF program and skeleton. (2024-03-12 19:31:47 +0800)
>
> ----------------------------------------------------------------
> -----BEGIN PGP SIGNATURE-----
>
> iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAmXwPUAACgkQ7wSWWzmN
> YhFnIwgAgctDniJwlRxXB01eVlzXz7IulHnpSby07XEJxENSpGB8ufaeE4eK5gJy
> NVK6C2+1EU2vRxm4oIdcvtN4C4/jtRbYYjiSTx7eE4FmSkqshSnR5XCV72LDqG3i
> WbzInjMvYfysmcMXLfrWgxOnVew9WqEzlpEWlc7FfNKnkzBVf+JDztfqCUx0XM7H
> qefw4ImjqQw993QxJpipXC7aEGUyouB0RIBB71FkCa9ihlh9x7W68evbOI/jTn5q
> HWuStgS02sKHjRFliMbdbMY77FNUz4Yroo/GKSvGt64atxkQSJqPNAV+/9n18LNy
> QAH5eK6cXFPOIAaYpADU5kHDVVAFiw==
> =iBdx
> -----END PGP SIGNATURE-----
>


Applied, thanks.

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

-- PMM
Michael Tokarev March 12, 2024, 5:56 p.m. UTC | #2
12.03.2024 14:36, Jason Wang wrote:
...
> ----------------------------------------------------------------
> Andrew Melnychenko (5):
>        ebpf: Added eBPF map update through mmap.
>        ebpf: Added eBPF initialization by fds.
>        virtio-net: Added property to load eBPF RSS with fds.
>        qmp: Added new command to retrieve eBPF blob.
>        ebpf: Updated eBPF program and skeleton.
> 
> Laurent Vivier (2):
>        igb: fix link state on resume
>        e1000e: fix link state on resume
> 
> Nick Briggs (1):
>        Avoid unaligned fetch in ladr_match()

 From the above, I'm picking up igb & e100e "fix link state on resume"
and "Avoid unaligned fetch in ladr_match()" for stable.

Please let me know if this is incorrect.

Thanks,

/mjt
Jason Wang March 13, 2024, 6:43 a.m. UTC | #3
On Wed, Mar 13, 2024 at 1:56 AM Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> 12.03.2024 14:36, Jason Wang wrote:
> ...
> > ----------------------------------------------------------------
> > Andrew Melnychenko (5):
> >        ebpf: Added eBPF map update through mmap.
> >        ebpf: Added eBPF initialization by fds.
> >        virtio-net: Added property to load eBPF RSS with fds.
> >        qmp: Added new command to retrieve eBPF blob.
> >        ebpf: Updated eBPF program and skeleton.
> >
> > Laurent Vivier (2):
> >        igb: fix link state on resume
> >        e1000e: fix link state on resume
> >
> > Nick Briggs (1):
> >        Avoid unaligned fetch in ladr_match()
>
>  From the above, I'm picking up igb & e100e "fix link state on resume"
> and "Avoid unaligned fetch in ladr_match()" for stable.
>
> Please let me know if this is incorrect.
>

It's correct.

Thanks

> Thanks,
>
> /mjt
>