Commit 163786f7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'devmem-tcp-minor-cleanups-and-ksft-improvements' 

Mina Almasry says:

====================
Devmem TCP minor cleanups and ksft improvements

v2: https://lore.kernel.org/20250519023517.4062941-1-almasrymina@google.com
====================

Link: https://patch.msgid.link/20250523230524.1107879-1-almasrymina@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 429d410b affffcbb

net/core/devmem.c

+4 −1
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx, 
struct net_devmem_dmabuf_binding *

net_devmem_bind_dmabuf(struct net_device *dev,

		       enum dma_data_direction direction,

		       unsigned int dmabuf_fd, struct netlink_ext_ack *extack)

		       unsigned int dmabuf_fd, struct netdev_nl_sock *priv,

		       struct netlink_ext_ack *extack)

{

	struct net_devmem_dmabuf_binding *binding;

	static u32 id_alloc_next;
@@ -299,6 +300,8 @@ net_devmem_bind_dmabuf(struct net_device *dev, 
	if (err < 0)

		goto err_free_chunks;



	list_add(&binding->list, &priv->bindings);



	return binding;



err_free_chunks:

net/core/devmem.h

+4 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define _NET_DEVMEM_H



#include <net/netmem.h>

#include <net/netdev_netlink.h>



struct netlink_ext_ack;
@@ -82,7 +83,8 @@ void __net_devmem_dmabuf_binding_free(struct work_struct *wq); 
struct net_devmem_dmabuf_binding *

net_devmem_bind_dmabuf(struct net_device *dev,

		       enum dma_data_direction direction,

		       unsigned int dmabuf_fd, struct netlink_ext_ack *extack);

		       unsigned int dmabuf_fd, struct netdev_nl_sock *priv,

		       struct netlink_ext_ack *extack);

struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id);

void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding);

int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx,
@@ -170,6 +172,7 @@ static inline void __net_devmem_dmabuf_binding_free(struct work_struct *wq) 
static inline struct net_devmem_dmabuf_binding *

net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd,

		       enum dma_data_direction direction,

		       struct netdev_nl_sock *priv,

		       struct netlink_ext_ack *extack)

{

	return ERR_PTR(-EOPNOTSUPP);

net/core/netdev-genl.c

+2 −6
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info) 
	}



	binding = net_devmem_bind_dmabuf(netdev, DMA_FROM_DEVICE, dmabuf_fd,

					 info->extack);

					 priv, info->extack);

	if (IS_ERR(binding)) {

		err = PTR_ERR(binding);

		goto err_unlock;
@@ -943,8 +943,6 @@ int netdev_nl_bind_rx_doit(struct sk_buff *skb, struct genl_info *info) 
			goto err_unbind;

	}



	list_add(&binding->list, &priv->bindings);



	nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding->id);

	genlmsg_end(rsp, hdr);
@@ -1020,15 +1018,13 @@ int netdev_nl_bind_tx_doit(struct sk_buff *skb, struct genl_info *info) 
		goto err_unlock_netdev;

	}



	binding = net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd,

	binding = net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd, priv,

					 info->extack);

	if (IS_ERR(binding)) {

		err = PTR_ERR(binding);

		goto err_unlock_netdev;

	}



	list_add(&binding->list, &priv->bindings);



	nla_put_u32(rsp, NETDEV_A_DMABUF_ID, binding->id);

	genlmsg_end(rsp, hdr);

net/core/page_pool.c

+2 −2
Original line number Diff line number Diff line
@@ -867,8 +867,8 @@ void page_pool_put_unrefed_netmem(struct page_pool *pool, netmem_ref netmem, 
	if (!allow_direct)

		allow_direct = page_pool_napi_local(pool);



	netmem =

		__page_pool_put_page(pool, netmem, dma_sync_size, allow_direct);

	netmem = __page_pool_put_page(pool, netmem, dma_sync_size,

				      allow_direct);

	if (netmem && !page_pool_recycle_in_ring(pool, netmem)) {

		/* Cache full, fallback to free pages */

		recycle_stat_inc(pool, ring_full);

net/ipv4/tcp.c

+10 −14
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
	int flags, err, copied = 0;

	int mss_now = 0, size_goal, copied_syn = 0;

	int process_backlog = 0;

	bool sockc_valid = true;

	int sockc_err = 0;

	int zc = 0;

	long timeo;
@@ -1075,13 +1075,10 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 


	sockc = (struct sockcm_cookie){ .tsflags = READ_ONCE(sk->sk_tsflags) };

	if (msg->msg_controllen) {

		err = sock_cmsg_send(sk, msg, &sockc);

		if (unlikely(err))

			/* Don't return error until MSG_FASTOPEN has been

			 * processed; that may succeed even if the cmsg is

			 * invalid.

		sockc_err = sock_cmsg_send(sk, msg, &sockc);

		/* Don't return error until MSG_FASTOPEN has been processed;

		 * that may succeed even if the cmsg is invalid.

		 */

			sockc_valid = false;

	}



	if ((flags & MSG_ZEROCOPY) && size) {
@@ -1092,7 +1089,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
		} else if (sock_flag(sk, SOCK_ZEROCOPY)) {

			skb = tcp_write_queue_tail(sk);

			uarg = msg_zerocopy_realloc(sk, size, skb_zcopy(skb),

						    sockc_valid && !!sockc.dmabuf_id);

						    !sockc_err && sockc.dmabuf_id);

			if (!uarg) {

				err = -ENOBUFS;

				goto out_err;
@@ -1102,7 +1099,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
			else

				uarg_to_msgzc(uarg)->zerocopy = 0;



			if (sockc_valid && sockc.dmabuf_id) {

			if (!sockc_err && sockc.dmabuf_id) {

				binding = net_devmem_get_binding(sk, sockc.dmabuf_id);

				if (IS_ERR(binding)) {

					err = PTR_ERR(binding);
@@ -1116,7 +1113,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
			zc = MSG_SPLICE_PAGES;

	}



	if (sockc_valid && sockc.dmabuf_id &&

	if (!sockc_err && sockc.dmabuf_id &&

	    (!(flags & MSG_ZEROCOPY) || !sock_flag(sk, SOCK_ZEROCOPY))) {

		err = -EINVAL;

		goto out_err;
@@ -1160,9 +1157,8 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
		/* 'common' sending to sendq */

	}



	if (!sockc_valid) {

		if (!err)

			err = -EINVAL;

	if (sockc_err) {

		err = sockc_err;

		goto out_err;

	}