Skip to content

splice, net: Switch over users of sendpage() and remove it

David Howells bpf ceph-devel cluster-devel dccp drbd-dev linux-arm-msm linux-block linux-can linux-crypto linux-doc linux-fsdevel linux-hams linux-mm linux-nfs linux-nvme linux-perf-users linux-rdma linux-s390 linux-scsi linux-sctp linux-wpan linux-x25 lkml mptcp netdev ocfs2-devel target-devel virtualization 5 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest16 patches 11 repliesApplied 16/16
  2. v415 patches 4 repliesSuperseded
  3. v318 patches 31 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v217 patches10 repliesSuperseded
v117 patches3 repliesSuperseded

Patches in v5 All 16 applied

#Subject and filesSizeRepliesApplied
1/16tcp_bpf, smc, tls, espintcp, siw: Reduce MSG_SENDPAGE_NOTLAST usagedrivers/infiniband/sw/siw/siw_qp_tx.c net/ipv4/tcp_bpf.c net/smc/smc_tx.c +2 more+17 -130 repliesApplied
2/16net: Use sendmsg(MSG_SPLICE_PAGES) not sendpage in skb_send_sock()net/core/skbuff.c+28 -220 repliesApplied
3/16ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpagenet/ceph/messenger_v1.c+20 -406 repliesApplied
4/16ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage()net/ceph/messenger_v2.c+19 -724 repliesApplied
5/16rds: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpagenet/rds/tcp_send.c+12 -110 repliesApplied
6/16dlm: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpagefs/dlm/lowcomms.c+7 -30 repliesApplied
7/16nvme-tcp: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpagedrivers/nvme/host/tcp.c+27 -220 repliesApplied
8/16nvmet-tcp: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpagedrivers/nvme/target/tcp.c+29 -170 repliesApplied
9/16smc: Drop smc_sendpage() in favour of smc_sendmsg() + MSG_SPLICE_PAGESnet/smc/af_smc.c net/smc/smc_stats.c net/smc/smc_stats.h +2 more+1 -520 repliesApplied
10/16drbd: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage()drivers/block/drbd/drbd_main.c+8 -40 repliesApplied
11/16scsi: iscsi_tcp: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpagedrivers/scsi/iscsi_tcp.c drivers/scsi/iscsi_tcp.h+10 -181 replyApplied
12/16scsi: target: iscsi: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpagedrivers/target/iscsi/iscsi_target_util.c+9 -60 repliesApplied
13/16ocfs2: Fix use of slab data with sendpagefs/ocfs2/cluster/tcp.c+12 -110 repliesApplied
14/16ocfs2: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage()fs/ocfs2/cluster/tcp.c+9 -60 repliesApplied
15/16sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)Documentation/bpf/map_sockmap.rst Documentation/filesystems/locking.rst Documentation/filesystems/vfs.rst +63 more+20 -4420 repliesApplied
16/16net: Kill MSG_SENDPAGE_NOTLASTinclude/linux/socket.h net/tls/tls_device.c net/tls/tls_main.c +3 more+5 -120 repliesApplied

Reviews trailers per patch

4 of 16 patches have a Reviewed-by or Acked-by.

PatchMarc Kleine-BuddeSagi GrimbergWillem de BruijnMike ChristieChris Leech
1/16
2/16
3/16
4/16
5/16
6/16
7/16T-b A-b
8/16T-b A-b
9/16
10/16
11/16R-b R-b
12/16
13/16
14/16
15/16A-b
16/16

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v5 thread

Cover letter [PATCH net-next v5 00/16] splice, net: Switch over users of sendpage() and remove it

Here's the final set of patches towards the removal of sendpage. All the drivers that use sendpage() get switched over to using sendmsg() with MSG_SPLICE_PAGES.

The following changes are made:

(1) Make the protocol drivers behave according to MSG_MORE, not MSG_SENDPAGE_NOTLAST. The latter is restricted to turning on MSG_MORE in the sendpage() wrappers.

(2) Fix ocfs2 to allocate its global protocol buffers with folio_alloc() rather than kzalloc() so as not to invoke the !sendpage_ok warning in skb_splice_from_iter().

(3) Make ceph/rds, skb_send_sock, dlm, nvme, smc, ocfs2, drbd and iscsi use sendmsg(), not sendpage and make them specify MSG_MORE instead of MSG_SENDPAGE_NOTLAST.

(4) Kill off sendpage and clean up MSG_SENDPAGE_NOTLAST.

I've pushed the patches here also:

https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=sendpage-3-killsb

David

Changes
=======
ver #5)
- Switch condition for setting MSG_MORE in write_partial_message_data()
- Split iscsi changes into client and target patches

ver #4)
- Drop the copy-slab-to-fragment code from skb_splice_from_iter().
- Slim down the driver changes to only do one page at a time.
- Drop the siw and drbd page aggregation single-sendmsg patches.
- Make nvme/host cancel MSG_SPLICE_PAGES if !sendpage_ok.
- Break out the ocfs2 protocol buffer allocation fix into its own patch.
- Simplify the ocfs2 protocol data transmission.

ver #3)
- Remove duplicate decl of skb_splice_from_iter().
- In tcp_bpf, reset msg_flags on each iteration to clear MSG_MORE.
- In tcp_bpf, set MSG_MORE if there's more data in the sk_msg.
- Split the nvme patch into host and target patches.

ver #2)
- Wrapped some lines at 80.
- Fixed parameter to put_cpu_ptr() to have an '&'.
- Use "unsigned int" rather than "unsigned".
- Removed duplicate word in comment.
- Filled in the commit message on the last patch.

David Howells (16):
tcp_bpf, smc, tls, espintcp, siw: Reduce MSG_SENDPAGE_NOTLAST usage
net: Use sendmsg(MSG_SPLICE_PAGES) not sendpage in skb_send_sock()
ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage
ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage()
rds: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage
dlm: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage
nvme-tcp: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpage
nvmet-tcp: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpage
smc: Drop smc_sendpage() in favour of smc_sendmsg() + MSG_SPLICE_PAGES
drbd: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage()
scsi: iscsi_tcp: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage
scsi: target: iscsi: Use sendmsg(MSG_SPLICE_PAGES) rather than
sendpage
ocfs2: Fix use of slab data with sendpage
ocfs2: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage()
sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)
net: Kill MSG_SENDPAGE_NOTLAST

 Documentation/bpf/map_sockmap.rst             | 10 +-
 Documentation/filesystems/locking.rst         |  2 -
 Documentation/filesystems/vfs.rst             |  1 -
 Documentation/networking/scaling.rst          |  4 +-
 crypto/af_alg.c                               | 28 ------
 crypto/algif_aead.c                           | 22 +----
 crypto/algif_rng.c                            |  2 -
 crypto/algif_skcipher.c                       | 14 ---
 drivers/block/drbd/drbd_main.c                | 12 ++-
 drivers/infiniband/sw/siw/siw_qp_tx.c         |  5 +-
 .../chelsio/inline_crypto/chtls/chtls.h       |  2 -
 .../chelsio/inline_crypto/chtls/chtls_io.c    | 14 ---
 .../chelsio/inline_crypto/chtls/chtls_main.c  |  1 -
 drivers/nvme/host/tcp.c                       | 49 +++++-----
 drivers/nvme/target/tcp.c                     | 46 ++++++----
 drivers/scsi/iscsi_tcp.c                      | 26 ++----
 drivers/scsi/iscsi_tcp.h                      |  2 -
 drivers/target/iscsi/iscsi_target_util.c      | 15 +--
 fs/dlm/lowcomms.c                             | 10 +-
 fs/nfsd/vfs.c                                 |  2 +-
 fs/ocfs2/cluster/tcp.c                        | 38 ++++----
 include/crypto/if_alg.h                       |  2 -
 include/linux/net.h                           |  8 --
 include/linux/socket.h                        |  4 +-
 include/net/inet_common.h                     |  2 -
 include/net/sock.h                            |  6 --
 include/net/tcp.h                             |  4 -
 net/appletalk/ddp.c                           |  1 -
 net/atm/pvc.c                                 |  1 -
 net/atm/svc.c                                 |  1 -
 net/ax25/af_ax25.c                            |  1 -
 net/caif/caif_socket.c                        |  2 -
 net/can/bcm.c                                 |  1 -
 net/can/isotp.c                               |  1 -
 net/can/j1939/socket.c                        |  1 -
 net/can/raw.c                                 |  1 -
 net/ceph/messenger_v1.c                       | 60 ++++--------
 net/ceph/messenger_v2.c                       | 91 ++++---------------
 net/core/skbuff.c                             | 50 +++++-----
 net/core/sock.c                               | 35 +------
 net/dccp/ipv4.c                               |  1 -
 net/dccp/ipv6.c                               |  1 -
 net/ieee802154/socket.c                       |  2 -
 net/ipv4/af_inet.c                            | 21 -----
 net/ipv4/tcp.c                                | 43 +--------
 net/ipv4/tcp_bpf.c                            | 28 +-----
 net/ipv4/tcp_ipv4.c                           |  1 -
 net/ipv4/udp.c                                | 15 ---
 net/ipv4/udp_impl.h                           |  2 -
 net/ipv4/udplite.c                            |  1 -
 net/ipv6/af_inet6.c                           |  3 -
 net/ipv6/raw.c                                |  1 -
 net/ipv6/tcp_ipv6.c                           |  1 -
 net/kcm/kcmsock.c                             | 20 ----
 net/key/af_key.c                              |  1 -
 net/l2tp/l2tp_ip.c                            |  1 -
 net/l2tp/l2tp_ip6.c                           |  1 -
 net/llc/af_llc.c                              |  1 -
 net/mctp/af_mctp.c                            |  1 -
 net/mptcp/protocol.c                          |  2 -
 net/netlink/af_netlink.c                      |  1 -
 net/netrom/af_netrom.c                        |  1 -
 net/packet/af_packet.c                        |  2 -
 net/phonet/socket.c                           |  2 -
 net/qrtr/af_qrtr.c                            |  1 -
 net/rds/af_rds.c                              |  1 -
 net/rds/tcp_send.c                            | 23 ++---
 net/rose/af_rose.c                            |  1 -
 net/rxrpc/af_rxrpc.c                          |  1 -
 net/sctp/protocol.c                           |  1 -
 net/smc/af_smc.c                              | 29 ------
 net/smc/smc_stats.c                           |  2 +-
 net/smc/smc_stats.h                           |  1 -
 net/smc/smc_tx.c                              | 19 +---
 net/smc/smc_tx.h                              |  2 -
 net/socket.c                                  | 48 ----------
 net/tipc/socket.c                             |  3 -
 net/tls/tls.h                                 |  6 --
 net/tls/tls_device.c                          | 24 +----
 net/tls/tls_main.c                            |  9 +-
 net/tls/tls_sw.c                              | 37 +-------
 net/unix/af_unix.c                            | 19 ----
 net/vmw_vsock/af_vsock.c                      |  3 -
 net/x25/af_x25.c                              |  1 -
 net/xdp/xsk.c                                 |  1 -
 net/xfrm/espintcp.c                           | 10 +-
 .../perf/trace/beauty/include/linux/socket.h  |  1 -
 tools/perf/trace/beauty/msg_flags.c           |  5 +-
 88 files changed, 230 insertions(+), 748 deletions(-)