The following changes since commit 3ab42e46acf867c45bc929fcc37693e327a35a24:

  Merge tag 'pull-ufs-20240603' of https://gitlab.com/jeuk20.kim/qemu into staging (2024-06-03 08:18:14 -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 dcab53611191f50cf4feabc1d8794d04afe53407:

  ebpf: Added traces back. Changed source set for eBPF to 'system'. (2024-06-04 15:14:26 +0800)

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

iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAmZewo4ACgkQ7wSWWzmN
YhHhxgf/ZaECxru4fP8wi34XdSG/PR+BF+W5M9gZIRGrHg3vIf3/LRTpZTDccbRN
Qpwtypr9O6/AWG9Os80rn7alsmMDxN8PDDNLa9T3wf5pJUQSyQ87Yy0MiuTNPSKD
HKYUIfIlbFCM5WUW4huMmg98gKTgnzZMqOoRyMFZitbkR59qCm+Exws4HtXvCH68
3k4lgvnFccmzO9iIzaOUIPs+Yf04Kw/FrY0Q/6nypvqbF2W80Md6w02JMQuTLwdF
Guxeg/n6g0NLvCBbkjiM2VWfTaWJYbwFSwRTAMxM/geqh7qAgGsmD0N5lPlgqRDy
uAy2GvFyrwzcD0lYqf0/fRK0Go0HPA==
=J70K
-----END PGP SIGNATURE-----

----------------------------------------------------------------
Akihiko Odaki (18):
      tap: Remove tap_probe_vnet_hdr_len()
      tap: Remove qemu_using_vnet_hdr()
      net: Move virtio-net header length assertion
      net: Remove receive_raw()
      tap: Call tap_receive_iov() from tap_receive()
      tap: Shrink zeroed virtio-net header
      virtio-net: Do not propagate ebpf-rss-fds errors
      virtio-net: Add only one queue pair when realizing
      virtio-net: Copy header only when necessary
      virtio-net: Shrink header byte swapping buffer
      virtio-net: Disable RSS on reset
      virtio-net: Unify the logic to update NIC state for RSS
      virtio-net: Always set populate_hash
      virtio-net: Do not write hashes to peer buffer
      ebpf: Fix RSS error handling
      ebpf: Return 0 when configuration fails
      ebpf: Refactor tun_rss_steering_prog()
      ebpf: Add a separate target for skeleton

Alexey Dobriyan (1):
      virtio-net: drop too short packets early

Andrew Melnychenko (1):
      ebpf: Added traces back. Changed source set for eBPF to 'system'.

 ebpf/ebpf_rss.c          |    7 +
 ebpf/rss.bpf.skeleton.h  | 1558 +++++++++++++++++++++++-----------------------
 ebpf/trace.h             |    1 +
 hw/net/e1000e.c          |    1 -
 hw/net/igb.c             |    1 -
 hw/net/net_tx_pkt.c      |    4 +-
 hw/net/virtio-net.c      |  282 ++++-----
 hw/net/vmxnet3.c         |    2 -
 include/net/net.h        |    8 -
 net/dump.c               |    4 +-
 net/net.c                |   47 +-
 net/netmap.c             |    5 -
 net/tap-bsd.c            |    5 -
 net/tap-linux.c          |   20 -
 net/tap-solaris.c        |    5 -
 net/tap-stub.c           |    5 -
 net/tap.c                |   77 +--
 net/tap_int.h            |    1 -
 tools/ebpf/Makefile.ebpf |   15 +-
 tools/ebpf/rss.bpf.c     |   44 +-
 20 files changed, 968 insertions(+), 1124 deletions(-)
 create mode 100644 ebpf/trace.h

On 6/4/24 02:37, Jason Wang wrote:
> The following changes since commit 3ab42e46acf867c45bc929fcc37693e327a35a24:
> 
>    Merge tag 'pull-ufs-20240603' ofhttps://gitlab.com/jeuk20.kim/qemu  into staging (2024-06-03 08:18:14 -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 dcab53611191f50cf4feabc1d8794d04afe53407:
> 
>    ebpf: Added traces back. Changed source set for eBPF to 'system'. (2024-06-04 15:14:26 +0800)
> 
> -----------------------

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


r~

04.06.2024 10:37, Jason Wang wrote:
> Akihiko Odaki (18):
>        tap: Remove tap_probe_vnet_hdr_len()
>        tap: Remove qemu_using_vnet_hdr()
>        net: Move virtio-net header length assertion
>        net: Remove receive_raw()
>        tap: Call tap_receive_iov() from tap_receive()
>        tap: Shrink zeroed virtio-net header
>        virtio-net: Do not propagate ebpf-rss-fds errors
>        virtio-net: Add only one queue pair when realizing
>        virtio-net: Copy header only when necessary
>        virtio-net: Shrink header byte swapping buffer
>        virtio-net: Disable RSS on reset
>        virtio-net: Unify the logic to update NIC state for RSS
>        virtio-net: Always set populate_hash
>        virtio-net: Do not write hashes to peer buffer
>        ebpf: Fix RSS error handling
>        ebpf: Return 0 when configuration fails
>        ebpf: Refactor tun_rss_steering_prog()
>        ebpf: Add a separate target for skeleton
> 
> Alexey Dobriyan (1):
>        virtio-net: drop too short packets early
> 
> Andrew Melnychenko (1):
>        ebpf: Added traces back. Changed source set for eBPF to 'system'.

Is there anything in there for qemu-stable?
(NOT picking up without explicit mention of stable)

Thanks,

/mjt
-- 
GPG Key transition (from rsa2048 to rsa4096) since 2024-04-24.
New key: rsa4096/61AD3D98ECDF2C8E  9D8B E14E 3F2A 9DD7 9199  28F1 61AD 3D98 ECDF 2C8E
Old key: rsa2048/457CE0A0804465C5  6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
Transition statement: http://www.corpit.ru/mjt/gpg-transition-2024.txt

On Wed, Jun 5, 2024 at 6:14 PM Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> 04.06.2024 10:37, Jason Wang wrote:
> > Akihiko Odaki (18):
> >        tap: Remove tap_probe_vnet_hdr_len()
> >        tap: Remove qemu_using_vnet_hdr()
> >        net: Move virtio-net header length assertion
> >        net: Remove receive_raw()
> >        tap: Call tap_receive_iov() from tap_receive()
> >        tap: Shrink zeroed virtio-net header
> >        virtio-net: Do not propagate ebpf-rss-fds errors
> >        virtio-net: Add only one queue pair when realizing
> >        virtio-net: Copy header only when necessary
> >        virtio-net: Shrink header byte swapping buffer
> >        virtio-net: Disable RSS on reset
> >        virtio-net: Unify the logic to update NIC state for RSS
> >        virtio-net: Always set populate_hash
> >        virtio-net: Do not write hashes to peer buffer
> >        ebpf: Fix RSS error handling
> >        ebpf: Return 0 when configuration fails
> >        ebpf: Refactor tun_rss_steering_prog()
> >        ebpf: Add a separate target for skeleton
> >
> > Alexey Dobriyan (1):
> >        virtio-net: drop too short packets early
> >
> > Andrew Melnychenko (1):
> >        ebpf: Added traces back. Changed source set for eBPF to 'system'.
>
> Is there anything in there for qemu-stable?
> (NOT picking up without explicit mention of stable)

One candidate might be "virtio-net: drop too short packets early".

Thanks

>
> Thanks,
>
> /mjt
> --
> GPG Key transition (from rsa2048 to rsa4096) since 2024-04-24.
> New key: rsa4096/61AD3D98ECDF2C8E  9D8B E14E 3F2A 9DD7 9199  28F1 61AD 3D98 ECDF 2C8E
> Old key: rsa2048/457CE0A0804465C5  6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
> Transition statement: http://www.corpit.ru/mjt/gpg-transition-2024.txt
>

On 2024/06/05 19:14, Michael Tokarev wrote:
> 04.06.2024 10:37, Jason Wang wrote:
>> Akihiko Odaki (18):
>>        tap: Remove tap_probe_vnet_hdr_len()
>>        tap: Remove qemu_using_vnet_hdr()
>>        net: Move virtio-net header length assertion
>>        net: Remove receive_raw()
>>        tap: Call tap_receive_iov() from tap_receive()
>>        tap: Shrink zeroed virtio-net header
>>        virtio-net: Do not propagate ebpf-rss-fds errors
>>        virtio-net: Add only one queue pair when realizing
>>        virtio-net: Copy header only when necessary
>>        virtio-net: Shrink header byte swapping buffer
>>        virtio-net: Disable RSS on reset
>>        virtio-net: Unify the logic to update NIC state for RSS
>>        virtio-net: Always set populate_hash
>>        virtio-net: Do not write hashes to peer buffer
>>        ebpf: Fix RSS error handling
>>        ebpf: Return 0 when configuration fails
>>        ebpf: Refactor tun_rss_steering_prog()
>>        ebpf: Add a separate target for skeleton
>>
>> Alexey Dobriyan (1):
>>        virtio-net: drop too short packets early
>>
>> Andrew Melnychenko (1):
>>        ebpf: Added traces back. Changed source set for eBPF to 'system'.
> 
> Is there anything in there for qemu-stable?
> (NOT picking up without explicit mention of stable)

No for my patches. Some fixes bugs but they are pretty minor and not 
problems in practice.

Regards,
Akihiko Odaki