Skip to content

backport vsock patches for RHEL-9.3

Stefano Garzarella requested to merge sgarzarella/centos-stream-9:bz2209707 into main

Bugzilla: https://bugzilla.redhat.com/2209707

This is a preliminary list of vsock patches we have in Linux 6.4-rc4 that we should backport into RHEL-9.3:

Conflicts:

  • iov_iter_init() calls still use READ/WRITE since we don't have commit de4eda9de2d9 ("use less confusing names for iov_iter direction initializers") downstream
$ git backport-diff -u upstream-local/master -r main..HEAD
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/28:[----] [--] 'vsock: return errors other than -ENOMEM to socket'
002/25:[----] [--] 'test/vsock: rework message bounds test'
003/25:[----] [--] 'test/vsock: add big message test'
004/25:[----] [--] 'test/vsock: vsock_perf utility'
005/25:[----] [-C] 'virtio/vsock: replace virtio_vsock_pkt with sk_buff'
006/25:[----] [--] 'vhost: remove unused paramete'
007/25:[----] [--] 'virtio/vsock: don't use skbuff state to account credit'
008/25:[----] [--] 'virtio/vsock: remove redundant 'skb_pull()' call'
009/25:[----] [--] 'virtio/vsock: don't drop skbuff on copy failure'
010/25:[----] [--] 'test/vsock: copy to user failure test'
011/25:[----] [--] 'virtio/vsock: check transport before skb allocation'
012/25:[----] [--] 'vsock/loopback: use only sk_buff_head.lock to protect the packet queue'
013/25:[----] [--] 'virtio/vsock: allocate multiple skbuffs on tx'
014/25:[----] [--] 'virtio/vsock: check argument to avoid no effect call'
015/25:[----] [--] 'testing/vsock: add vsock_perf to gitignore'
016/25:[----] [--] 'virtio/vsock: fix header length on skb merging'
017/25:[----] [--] 'virtio/vsock: WARN_ONCE() for invalid state of socket'
018/25:[----] [--] 'test/vsock: new skbuff appending test'
019/25:[----] [--] 'virtio/vsock: fix leaks due to missing skb owner'
020/25:[----] [--] 'vsock/vmci: convert VMCI error code to -ENOMEM on send'
021/25:[----] [--] 'vsock/vmci: convert VMCI error code to -ENOMEM on receive'
022/25:[----] [--] 'vsock: return errors other than -ENOMEM to socket'
023/25:[----] [--] 'vsock/test: update expected return values'
024/25:[----] [--] 'vsock/loopback: don't disable irqs for queue access'
025/25:[----] [--] 'vsock: avoid to close connected socket after the timeout'

New features:

  • replaced virtio_vsock_pkt with sk_buff to allow new features and improve performance (usual test can be used)
  • returned better error on send()/recv() failure (tests updated)
  • sockmap support for vsock is not backported since there are several conflicts and it is still not well tested upstream

Signed-off-by: Stefano Garzarella sgarzare@redhat.com

Merge request reports