From patchwork Mon Jul 8 21:04:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijian Zhang X-Patchwork-Id: 13727033 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2D8F14E2D7 for ; Mon, 8 Jul 2024 21:06:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720472777; cv=none; b=OBVqlhYy7TN/sUz5oGaAZ7OxJm7fWH2gv4LApd7ue8if/XUEd/syyq0ssRszNSbd69JrZxzePzgDGXdo1xBpBqDPSvBccGdsgXoybKEkF/t1tCHTsjl4dS61aD03TmSyB906xuxv71fXXBeAlb110z1U9MEBa8VdnSLgVtOAhmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720472777; c=relaxed/simple; bh=AGEHkBfuQB3+6zn2ykavACl/xw35qvt9M17BsR63GxE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e5V2SrVL8g5wvE4utpEy/YYWZhiQpf2q7+b9VbPI2zDGB8hBP18lpgUq8uxH9Fz8Ne7c8fk059wlZ+Cm0pxzW+3lEmjgHAZKMnVAKXeCV+bBP7Bu70K2Vk/DAiW3kb/nifMJryaIl5yvDMuMjthpvdbcmz9GLJGjKMA4afJmfvg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=Uw06Bgxr; arc=none smtp.client-ip=209.85.210.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="Uw06Bgxr" Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-7036ab4a2acso1102350a34.2 for ; Mon, 08 Jul 2024 14:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1720472773; x=1721077573; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T81lePJCJIcQm7BHyJTfJJuarqsHs52UTrO/4557dbc=; b=Uw06BgxrP7ceWxn5q3ZAfDpoyBlptud0cVyeJSlrJbTX24NcBnsaIrolgOd8rLVXCk CTDayk0pYvZVaKXI3XD4C8LJmQ4KfJ3sHQPBjOhIABJUqxR1OO7C1Jn8P6qS8rza4bDn UcVlDYHxFx8BBK6TWWk9Y5c2wZhs/fxuCWcRojWY88BMjTHPV2APVdSTySJ098mIr8PB elVT0V+ljs2Oscm83mBfoclzBjs+4u63oYFrjl7efYQSgAU6U6y8WnecLrlZ2oE4yxjJ /snKRiN6t+63Zh4IA86wV1ns5B2YmXMT0K2vEbVsGP6F6xQbvbZ6kZRvsMv/nmwk5yLM kW1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720472773; x=1721077573; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T81lePJCJIcQm7BHyJTfJJuarqsHs52UTrO/4557dbc=; b=hWzt4hmGjss5E0MiQG0TFD35dzO8LKrr/mf8ij2/L9V5oLprbb6TueZgiLBVe4m6Aq gXP1STrXqpn9b8FFPZcCXXgX6QdZrm0hgK1Brf9rJY6r7R23GQtaK+zp7N+urRrwdMNo U6PFhGthH21mGv4Zi+GxGiCjPcv9APPL0kx9grjzaczZp0kTw2Cbk/IaVEZjf5MwQ6XK CiPtPaO4BD6e+WajQ0x4FtcADPRu92NtYE1+uH6sR7AU85qx45r2R+/32WcxFKomlYQL 9oeUnGdpnr4c97YiUMjX1dsbio8UDHrj9TtJN/sUw7Iznux0AXLsKUG+UcnY8aM09RLw PhFw== X-Gm-Message-State: AOJu0Yypg6CrlDH883zDQA72B2dlefKgFo/CLMpmH737fM1+CRvuJyUU gy0gLH8H9mwr/2VcjXZBf5uzrX44P2nigDAq+4Rp3Mtvkub02ZG7DBEN/g7/IP6BJNZw6oUe2SP 8 X-Google-Smtp-Source: AGHT+IGiB1vhwXy9EgH7GAxPlXmZR2ckvyBzt4B/Skj0TdvAunW5H6A3B8em48LbdB42OFMizuLp3w== X-Received: by 2002:a05:6830:1e32:b0:703:6599:3258 with SMTP id 46e09a7af769-70375a1f0e6mr688174a34.19.1720472773265; Mon, 08 Jul 2024 14:06:13 -0700 (PDT) Received: from n191-036-066.byted.org ([139.177.233.196]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f18ff82a7sm28212185a.9.2024.07.08.14.06.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 14:06:12 -0700 (PDT) From: zijianzhang@bytedance.com To: netdev@vger.kernel.org Cc: edumazet@google.com, willemdebruijn.kernel@gmail.com, cong.wang@bytedance.com, xiaochun.lu@bytedance.com, Zijian Zhang Subject: [PATCH net-next v7 1/3] sock: support copying cmsgs to the user space in sendmsg Date: Mon, 8 Jul 2024 21:04:03 +0000 Message-Id: <20240708210405.870930-2-zijianzhang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240708210405.870930-1-zijianzhang@bytedance.com> References: <20240708210405.870930-1-zijianzhang@bytedance.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Zijian Zhang Users can pass msg_control as a placeholder to recvmsg, and get some info from the kernel upon returning of it, but it's not available for sendmsg. Recvmsg uses put_cmsg to copy info back to the user, while ____sys_sendmsg creates a kernel copy of msg_control and passes that to the callees, put_cmsg in sendmsg path will write into this kernel buffer. If users want to get info after returning of sendmsg, they typically have to call recvmsg on the ERRMSG_QUEUE of the socket, incurring extra system call overhead. This commit supports copying cmsg from the kernel space to the user space upon returning of sendmsg to mitigate this overhead. Signed-off-by: Zijian Zhang Signed-off-by: Xiaochun Lu --- include/linux/socket.h | 6 +++++ include/net/sock.h | 2 +- net/core/sock.c | 6 +++-- net/ipv4/ip_sockglue.c | 2 +- net/ipv6/datagram.c | 2 +- net/socket.c | 54 ++++++++++++++++++++++++++++++++++++++---- 6 files changed, 62 insertions(+), 10 deletions(-) diff --git a/include/linux/socket.h b/include/linux/socket.h index 2a1ff91d1914..75461812a7a3 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -71,6 +71,7 @@ struct msghdr { void __user *msg_control_user; }; bool msg_control_is_user : 1; + bool msg_control_copy_to_user : 1; bool msg_get_inq : 1;/* return INQ after receive */ unsigned int msg_flags; /* flags on received message */ __kernel_size_t msg_controllen; /* ancillary data buffer length */ @@ -168,6 +169,11 @@ static inline struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr return __cmsg_nxthdr(__msg->msg_control, __msg->msg_controllen, __cmsg); } +static inline bool cmsg_copy_to_user(struct cmsghdr *__cmsg) +{ + return 0; +} + static inline size_t msg_data_left(struct msghdr *msg) { return iov_iter_count(&msg->msg_iter); diff --git a/include/net/sock.h b/include/net/sock.h index cce23ac4d514..9c728287d21d 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1804,7 +1804,7 @@ static inline void sockcm_init(struct sockcm_cookie *sockc, }; } -int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg, +int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg, struct sockcm_cookie *sockc); int sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct sockcm_cookie *sockc); diff --git a/net/core/sock.c b/net/core/sock.c index 9abc4fe25953..efb30668dac3 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2826,7 +2826,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, } EXPORT_SYMBOL(sock_alloc_send_pskb); -int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg, +int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg, struct sockcm_cookie *sockc) { u32 tsflags; @@ -2866,6 +2866,8 @@ int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg, default: return -EINVAL; } + if (cmsg_copy_to_user(cmsg)) + msg->msg_control_copy_to_user = true; return 0; } EXPORT_SYMBOL(__sock_cmsg_send); @@ -2881,7 +2883,7 @@ int sock_cmsg_send(struct sock *sk, struct msghdr *msg, return -EINVAL; if (cmsg->cmsg_level != SOL_SOCKET) continue; - ret = __sock_cmsg_send(sk, cmsg, sockc); + ret = __sock_cmsg_send(sk, msg, cmsg, sockc); if (ret) return ret; } diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index cf377377b52d..6360b8ba9c84 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -267,7 +267,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, } #endif if (cmsg->cmsg_level == SOL_SOCKET) { - err = __sock_cmsg_send(sk, cmsg, &ipc->sockc); + err = __sock_cmsg_send(sk, msg, cmsg, &ipc->sockc); if (err) return err; continue; diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index fff78496803d..c9ae30acf895 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -777,7 +777,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, } if (cmsg->cmsg_level == SOL_SOCKET) { - err = __sock_cmsg_send(sk, cmsg, &ipc6->sockc); + err = __sock_cmsg_send(sk, msg, cmsg, &ipc6->sockc); if (err) return err; continue; diff --git a/net/socket.c b/net/socket.c index e416920e9399..6a9c9e24d781 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2525,8 +2525,43 @@ static int copy_msghdr_from_user(struct msghdr *kmsg, return err < 0 ? err : 0; } -static int ____sys_sendmsg(struct socket *sock, struct msghdr *msg_sys, - unsigned int flags, struct used_address *used_address, +static int sendmsg_copy_cmsg_to_user(struct msghdr *msg_sys, + struct user_msghdr __user *umsg) +{ + struct compat_msghdr __user *umsg_compat = + (struct compat_msghdr __user *)umsg; + unsigned int flags = msg_sys->msg_flags; + struct msghdr msg_user = *msg_sys; + unsigned long cmsg_ptr; + struct cmsghdr *cmsg; + int err; + + msg_user.msg_control_is_user = true; + msg_user.msg_control_user = umsg->msg_control; + cmsg_ptr = (unsigned long)msg_user.msg_control; + for_each_cmsghdr(cmsg, msg_sys) { + if (!CMSG_OK(msg_sys, cmsg)) + break; + if (cmsg_copy_to_user(cmsg)) + put_cmsg(&msg_user, cmsg->cmsg_level, cmsg->cmsg_type, + cmsg->cmsg_len - sizeof(*cmsg), CMSG_DATA(cmsg)); + } + + err = __put_user((msg_sys->msg_flags & ~MSG_CMSG_COMPAT), COMPAT_FLAGS(umsg)); + if (err) + return err; + if (MSG_CMSG_COMPAT & flags) + err = __put_user((unsigned long)msg_user.msg_control - cmsg_ptr, + &umsg_compat->msg_controllen); + else + err = __put_user((unsigned long)msg_user.msg_control - cmsg_ptr, + &umsg->msg_controllen); + return err; +} + +static int ____sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg, + struct msghdr *msg_sys, unsigned int flags, + struct used_address *used_address, unsigned int allowed_msghdr_flags) { unsigned char ctl[sizeof(struct cmsghdr) + 20] @@ -2537,6 +2572,7 @@ static int ____sys_sendmsg(struct socket *sock, struct msghdr *msg_sys, ssize_t err; err = -ENOBUFS; + msg_sys->msg_control_copy_to_user = false; if (msg_sys->msg_controllen > INT_MAX) goto out; @@ -2594,6 +2630,14 @@ static int ____sys_sendmsg(struct socket *sock, struct msghdr *msg_sys, used_address->name_len); } + if (msg && msg_sys->msg_control_copy_to_user && err >= 0) { + ssize_t len = err; + + err = sendmsg_copy_cmsg_to_user(msg_sys, msg); + if (!err) + err = len; + } + out_freectl: if (ctl_buf != ctl) sock_kfree_s(sock->sk, ctl_buf, ctl_len); @@ -2636,8 +2680,8 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg, if (err < 0) return err; - err = ____sys_sendmsg(sock, msg_sys, flags, used_address, - allowed_msghdr_flags); + err = ____sys_sendmsg(sock, msg, msg_sys, flags, used_address, + allowed_msghdr_flags); kfree(iov); return err; } @@ -2648,7 +2692,7 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg, long __sys_sendmsg_sock(struct socket *sock, struct msghdr *msg, unsigned int flags) { - return ____sys_sendmsg(sock, msg, flags, NULL, 0); + return ____sys_sendmsg(sock, NULL, msg, flags, NULL, 0); } long __sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned int flags, From patchwork Mon Jul 8 21:04:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijian Zhang X-Patchwork-Id: 13727034 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A10F614E2F9 for ; Mon, 8 Jul 2024 21:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720472778; cv=none; b=YBLT3QQHsh5doJjDHPWcp4JF9yOPVVYn0OB/fF3lSkVMPHZu/CqYp++4aTdiD9uek85HcXQP6iI+pXMm4Pd4kTJYHFgI1bhphpWR6eqdDeDRPyt5NxjlfVaW9gxYnOSy+SP39QjmUc+nlDuDSlyb75sXrh825tui1kGu/BGti/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720472778; c=relaxed/simple; bh=HFy0s1s103d+p7gb8OsrS2j+Hy7FEkucKo81DlyGm7E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LzSRO1/atk+xohhToHTfWCX/eZxOCecHP6ZCYdRW57nLvGK8DAfXd4XcU831P4FYTkBFO9BcPyu+0Maja6VjdHwlElXLodOEcxcSc4T9EXmPnFKwlogiFbcNPJxYHofauRL1LdLiV76bTfQr43XFFD/jqPzLXqskvq1mBRAizJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=OmxYzJAP; arc=none smtp.client-ip=209.85.222.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="OmxYzJAP" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-79f190d8ebfso24718085a.3 for ; Mon, 08 Jul 2024 14:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1720472775; x=1721077575; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QevkCAQsvPXNjVWJix+AsF4hLyLcr1BV78IDym4Fwz8=; b=OmxYzJAPrK4mHB30NO3rrRx73VC27+XSOwVKMbfD77K5hZJ/MifvcitV4BYB9NR+DK +miG/NaEWxnGYsUG7B+1YkySSFF+TerZ1ZqyQV05VONqjBY9qasDVqSLPRbyYaEk7fNb YdEf4oUWqptlmUUWKh6BL2a4rEJurMjwi0ani0tpZ0YEXnoOMHk55M51S5e/q+TgBle2 B7yVfce+lcbU0EIEB046ZpmltoHlh8qTG64uwmxqdor9tZ6TVFqWFSy2jS8eNN+Ga4v+ 7nKxJPO7lBf+SVx4Fg/dhzUvzqMkQPF+dPznR1tbdhVcOUtMD0iImphL750bOx15plPr Q+Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720472775; x=1721077575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QevkCAQsvPXNjVWJix+AsF4hLyLcr1BV78IDym4Fwz8=; b=NZ3M34bq3UfBmvdyIdMQeVnTo5Eg7IT0KdQFM6qtit1tAqSnKd4fM/oNzjyYTJb5RB E5xaAKSohr4yHA03CdLLf5sfVsj9K/V0UMJChYT+uguSWhPZOpy1GGW8JZpHlfBMhdql qLDY3zzs7AzNY6vw1sK2QE86vfGk2SW9TNEKipzLPuZTh6mS12RA1nWCR6Xv1YKSXfDC uJewGRJRHvOLHUNqpYgPKEbQqROPINKkvot+4G30pMwoPqXdzhWmGsXUX03pD/5twxQf etOJBq16goL0GtZNE6HRuAGKPkwT615XKivq6Ds5sfX8zUA6Z/13TEpIVDnUOyY7anp/ 92pA== X-Gm-Message-State: AOJu0YyLbixNMAoV2l/R3pqpZU6aob8Hr/WUze3YSYn19AvjSVZytpSR e44Sw9HjxfIc7V35S1QUT9oNmI992ARVwZw1Ujt+kF3ZzLKjVk6/pnwWxe89+L6Vuwuwz4KwQzi I X-Google-Smtp-Source: AGHT+IEwapOFCq9wdvpwYwCDxPNJmJ4sp2dSybtm/oAKoPWYIIUd/j35wNOXZjGBrG1/MlqetFV8og== X-Received: by 2002:a05:620a:e02:b0:79f:433:6e7f with SMTP id af79cd13be357-79f19a1344bmr72818285a.21.1720472774846; Mon, 08 Jul 2024 14:06:14 -0700 (PDT) Received: from n191-036-066.byted.org ([139.177.233.196]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f18ff82a7sm28212185a.9.2024.07.08.14.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 14:06:14 -0700 (PDT) From: zijianzhang@bytedance.com To: netdev@vger.kernel.org Cc: edumazet@google.com, willemdebruijn.kernel@gmail.com, cong.wang@bytedance.com, xiaochun.lu@bytedance.com, Zijian Zhang Subject: [PATCH net-next v7 2/3] sock: add MSG_ZEROCOPY notification mechanism based on msg_control Date: Mon, 8 Jul 2024 21:04:04 +0000 Message-Id: <20240708210405.870930-3-zijianzhang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240708210405.870930-1-zijianzhang@bytedance.com> References: <20240708210405.870930-1-zijianzhang@bytedance.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Zijian Zhang The MSG_ZEROCOPY flag enables copy avoidance for socket send calls. However, zerocopy is not a free lunch. Apart from the management of user pages, the combination of poll + recvmsg to receive notifications incurs unignorable overhead in the applications. We try to mitigate this overhead with a new notification mechanism based on msg_control. Leveraging the general framework to copy cmsgs to the user space, we copy zerocopy notifications to the user upon returning of sendmsgs. Signed-off-by: Zijian Zhang Signed-off-by: Xiaochun Lu --- arch/alpha/include/uapi/asm/socket.h | 2 ++ arch/mips/include/uapi/asm/socket.h | 2 ++ arch/parisc/include/uapi/asm/socket.h | 2 ++ arch/sparc/include/uapi/asm/socket.h | 2 ++ include/linux/socket.h | 2 +- include/uapi/asm-generic/socket.h | 2 ++ include/uapi/linux/socket.h | 13 ++++++++ net/core/sock.c | 46 +++++++++++++++++++++++++++ 8 files changed, 70 insertions(+), 1 deletion(-) diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h index e94f621903fe..7c32d9dbe47f 100644 --- a/arch/alpha/include/uapi/asm/socket.h +++ b/arch/alpha/include/uapi/asm/socket.h @@ -140,6 +140,8 @@ #define SO_PASSPIDFD 76 #define SO_PEERPIDFD 77 +#define SCM_ZC_NOTIFICATION 78 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h index 60ebaed28a4c..3f7fade998cb 100644 --- a/arch/mips/include/uapi/asm/socket.h +++ b/arch/mips/include/uapi/asm/socket.h @@ -151,6 +151,8 @@ #define SO_PASSPIDFD 76 #define SO_PEERPIDFD 77 +#define SCM_ZC_NOTIFICATION 78 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h index be264c2b1a11..77f5bee0fdc9 100644 --- a/arch/parisc/include/uapi/asm/socket.h +++ b/arch/parisc/include/uapi/asm/socket.h @@ -132,6 +132,8 @@ #define SO_PASSPIDFD 0x404A #define SO_PEERPIDFD 0x404B +#define SCM_ZC_NOTIFICATION 0x404C + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h index 682da3714686..eb44fc515b45 100644 --- a/arch/sparc/include/uapi/asm/socket.h +++ b/arch/sparc/include/uapi/asm/socket.h @@ -133,6 +133,8 @@ #define SO_PASSPIDFD 0x0055 #define SO_PEERPIDFD 0x0056 +#define SCM_ZC_NOTIFICATION 0x0057 + #if !defined(__KERNEL__) diff --git a/include/linux/socket.h b/include/linux/socket.h index 75461812a7a3..6f1b791e2de8 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -171,7 +171,7 @@ static inline struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr static inline bool cmsg_copy_to_user(struct cmsghdr *__cmsg) { - return 0; + return __cmsg->cmsg_type == SCM_ZC_NOTIFICATION; } static inline size_t msg_data_left(struct msghdr *msg) diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h index 8ce8a39a1e5f..02e9159c7944 100644 --- a/include/uapi/asm-generic/socket.h +++ b/include/uapi/asm-generic/socket.h @@ -135,6 +135,8 @@ #define SO_PASSPIDFD 76 #define SO_PEERPIDFD 77 +#define SCM_ZC_NOTIFICATION 78 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h index d3fcd3b5ec53..ab361f30f3a6 100644 --- a/include/uapi/linux/socket.h +++ b/include/uapi/linux/socket.h @@ -2,6 +2,8 @@ #ifndef _UAPI_LINUX_SOCKET_H #define _UAPI_LINUX_SOCKET_H +#include + /* * Desired design of maximum size and alignment (see RFC2553) */ @@ -35,4 +37,15 @@ struct __kernel_sockaddr_storage { #define SOCK_TXREHASH_DISABLED 0 #define SOCK_TXREHASH_ENABLED 1 +struct zc_info_elem { + __u32 lo; + __u32 hi; + __u8 zerocopy; +}; + +struct zc_info { + __u32 size; + struct zc_info_elem arr[]; +}; + #endif /* _UAPI_LINUX_SOCKET_H */ diff --git a/net/core/sock.c b/net/core/sock.c index efb30668dac3..e0b5162233d3 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2863,6 +2863,52 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg, case SCM_RIGHTS: case SCM_CREDENTIALS: break; + case SCM_ZC_NOTIFICATION: { + struct zc_info *zc_info = CMSG_DATA(cmsg); + struct zc_info_elem *zc_info_arr; + struct sock_exterr_skb *serr; + int cmsg_data_len, i = 0; + struct sk_buff_head *q; + unsigned long flags; + struct sk_buff *skb; + u32 zc_info_size; + + if (!sock_flag(sk, SOCK_ZEROCOPY) || sk->sk_family == PF_RDS) + return -EINVAL; + + cmsg_data_len = cmsg->cmsg_len - sizeof(struct cmsghdr); + if (cmsg_data_len < sizeof(struct zc_info)) + return -EINVAL; + + zc_info_size = zc_info->size; + zc_info_arr = zc_info->arr; + if (cmsg_data_len != sizeof(struct zc_info) + + zc_info_size * sizeof(struct zc_info_elem)) + return -EINVAL; + + q = &sk->sk_error_queue; + spin_lock_irqsave(&q->lock, flags); + skb = skb_peek(q); + while (skb && i < zc_info_size) { + struct sk_buff *skb_next = skb_peek_next(skb, q); + + serr = SKB_EXT_ERR(skb); + if (serr->ee.ee_errno == 0 && + serr->ee.ee_origin == SO_EE_ORIGIN_ZEROCOPY) { + zc_info_arr[i].hi = serr->ee.ee_data; + zc_info_arr[i].lo = serr->ee.ee_info; + zc_info_arr[i].zerocopy = !(serr->ee.ee_code + & SO_EE_CODE_ZEROCOPY_COPIED); + __skb_unlink(skb, q); + consume_skb(skb); + i++; + } + skb = skb_next; + } + spin_unlock_irqrestore(&q->lock, flags); + zc_info->size = i; + break; + } default: return -EINVAL; } From patchwork Mon Jul 8 21:04:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijian Zhang X-Patchwork-Id: 13727035 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09A5514EC5E for ; Mon, 8 Jul 2024 21:06:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720472780; cv=none; b=Ma+2W5M4U9S+DGxaf3nztglEIoi7XYiXeqRP2n24HQrKn9pVsHzo/DOt1c0bJWfnnBWEVUtoK7W+PM/ssKw1XL/UTS6YzWLvU1ygnqBNQuOHs1GxKKzOQmYv+4GYAl3qyXnIsuZl5sYuTeC5x+uhIlmtCgfK4U82RUaclg6uYnk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720472780; c=relaxed/simple; bh=XjDtgy90FMpVOjjO4ziOcDuAIwqT36CpllMg9ThGv6M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=d1XXkLL6Nfo4sbT/kKRYIMnsAiw5E09mLReFwg63gALQ9nTmg2EWmnGo1Om0153RdCPIUQKkOkXxT0dF8Jd4kp8Op4K1iiaHGO91BKN+qYoN62LfQQ16w/wLsEinBuEh70Jnv7Pjo+y08PDOzjgPGGW9KUSeEVuHHlNIGOdPom8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=amU8m8UM; arc=none smtp.client-ip=209.85.222.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="amU8m8UM" Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-79f083f5cb6so133442485a.3 for ; Mon, 08 Jul 2024 14:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1720472776; x=1721077576; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=THjKmeHNnZ5uNtrRboBkzythALmpfKB7bgjjdmq0wQU=; b=amU8m8UMO1kRJjrXopl1PStzxeFUev8/MGWXszAxKoHUrO07hFeElrD10GmE0uHhBs be5JNTSyWoL2YnFI9/3srmndigjRu2fQcUqxIPran/lAlZZVdxZd+k/svFQdjOBKJ3IT zcJOwecbn3qyvj/GpobH0UeY8Nxwiar6xRYYoAG95kyT5eRPV0LIWK65VFawal8vRMUR sAQOJOrgZzlxcKnblMRpMbHoNK/+B1th9eXPtY1LMQ2cYJG3MgqUWM8DPC3vD1bdYPTR hVoSZK/WwEzi8BQu3LDyDTjNI0jsfq6PFndj1WQ/pNTpRZw5cImTpM9yaW6oW0esnY4N GMBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720472776; x=1721077576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=THjKmeHNnZ5uNtrRboBkzythALmpfKB7bgjjdmq0wQU=; b=k9xo9T4FQzRQjD2PYlG8H5GuVqkBAIz7K2sfeJM2x2kkroC/6aAWj6F0t1JBFuS2EH FvrfP9R1/kQaC90s3w4fCbqvnzfmDnMlpWI35zEDOPHkVr/cYoDxiwSvolF4aEJKnhen PGWgd4VVpprWQgE8jhH6VX1J9xYMJrRywrOjP7H3R0SGZMygjDEaHLquA9/zrEtnFzZI qogXA0+WvJChWiLJJkCTYgECO/6XoJNJTpCsSD+Dr4rkgAUImnWPaF9gI4fBcOJ1mzpf NIr7eEwQMIJLWb1iShkT4eGMMyJlWWGvIzCG4rIW7P9+rHmQEvQ2IdlAJBzjVLrI8fe1 6Q2g== X-Gm-Message-State: AOJu0YztSDHmKTn9JILOLFhRpZHfCzO4yAWAv+Lg2HphmGR8frpMeOqm K+KQ+eUEkIwRZFkQixn+T2He0HYeaXIn3NSzYFjdSL6p8GWwm86iL04I5VYncnCes0LsEFKqhIN p X-Google-Smtp-Source: AGHT+IFFqcxr0E3K4M/RtcPNFhgYtRNQp5xfKrpwjDHnWCWrWWnnsIaArG0Ed1iuhYBZvaOsuYVYLw== X-Received: by 2002:a05:620a:2952:b0:79e:fca9:27c6 with SMTP id af79cd13be357-79f19ae357emr88059085a.55.1720472776567; Mon, 08 Jul 2024 14:06:16 -0700 (PDT) Received: from n191-036-066.byted.org ([139.177.233.196]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f18ff82a7sm28212185a.9.2024.07.08.14.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 14:06:16 -0700 (PDT) From: zijianzhang@bytedance.com To: netdev@vger.kernel.org Cc: edumazet@google.com, willemdebruijn.kernel@gmail.com, cong.wang@bytedance.com, xiaochun.lu@bytedance.com, Zijian Zhang Subject: [PATCH net-next v7 3/3] selftests: add MSG_ZEROCOPY msg_control notification test Date: Mon, 8 Jul 2024 21:04:05 +0000 Message-Id: <20240708210405.870930-4-zijianzhang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240708210405.870930-1-zijianzhang@bytedance.com> References: <20240708210405.870930-1-zijianzhang@bytedance.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Zijian Zhang We update selftests/net/msg_zerocopy.c to accommodate the new mechanism, cfg_notification_limit has the same semantics for both methods. Test results are as follows, we update skb_orphan_frags_rx to the same as skb_orphan_frags to support zerocopy in the localhost test. cfg_notification_limit = 1, both method get notifications after 1 calling of sendmsg. In this case, the new method has around 17% cpu savings in TCP and 23% cpu savings in UDP. +---------------------+---------+---------+---------+---------+ | Test Type / Protocol| TCP v4 | TCP v6 | UDP v4 | UDP v6 | +---------------------+---------+---------+---------+---------+ | ZCopy (MB) | 7523 | 7706 | 7489 | 7304 | +---------------------+---------+---------+---------+---------+ | New ZCopy (MB) | 8834 | 8993 | 9053 | 9228 | +---------------------+---------+---------+---------+---------+ | New ZCopy / ZCopy | 117.42% | 116.70% | 120.88% | 126.34% | +---------------------+---------+---------+---------+---------+ cfg_notification_limit = 32, both get notifications after 32 calling of sendmsg, which means more chances to coalesce notifications, and less overhead of poll + recvmsg for the original method. In this case, the new method has around 7% cpu savings in TCP and slightly better cpu usage in UDP. In the context of selftest, notifications of TCP are more likely to out of order than UDP, it's easier to coalesce more notifications in UDP. The original method can get one notification with range of 32 in a recvmsg most of the time. In TCP, most notifications' range is around 2, so the original method needs around 16 recvmsgs to get notified in one round. That's the reason for the "New ZCopy / ZCopy" diff in TCP and UDP here. +---------------------+---------+---------+---------+---------+ | Test Type / Protocol| TCP v4 | TCP v6 | UDP v4 | UDP v6 | +---------------------+---------+---------+---------+---------+ | ZCopy (MB) | 8842 | 8735 | 10072 | 9380 | +---------------------+---------+---------+---------+---------+ | New ZCopy (MB) | 9366 | 9477 | 10108 | 9385 | +---------------------+---------+---------+---------+---------+ | New ZCopy / ZCopy | 106.00% | 108.28% | 100.31% | 100.01% | +---------------------+---------+---------+---------+---------+ In conclusion, when notification interval is small or notifications are hard to be coalesced, the new mechanism is highly recommended. Otherwise, the performance gain from the new mechanism is very limited. Signed-off-by: Zijian Zhang Signed-off-by: Xiaochun Lu --- tools/testing/selftests/net/msg_zerocopy.c | 111 ++++++++++++++++++-- tools/testing/selftests/net/msg_zerocopy.sh | 1 + 2 files changed, 105 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/msg_zerocopy.c b/tools/testing/selftests/net/msg_zerocopy.c index 7ea5fb28c93d..064d2aaf7a2c 100644 --- a/tools/testing/selftests/net/msg_zerocopy.c +++ b/tools/testing/selftests/net/msg_zerocopy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* Evaluate MSG_ZEROCOPY * * Send traffic between two processes over one of the supported @@ -66,6 +67,10 @@ #define SO_ZEROCOPY 60 #endif +#ifndef SCM_ZC_NOTIFICATION +#define SCM_ZC_NOTIFICATION 78 +#endif + #ifndef SO_EE_CODE_ZEROCOPY_COPIED #define SO_EE_CODE_ZEROCOPY_COPIED 1 #endif @@ -74,6 +79,11 @@ #define MSG_ZEROCOPY 0x4000000 #endif +enum notification_type { + MSG_ZEROCOPY_NOTIFY_ERRQUEUE = 1, + MSG_ZEROCOPY_NOTIFY_SENDMSG = 2, +}; + static int cfg_cork; static bool cfg_cork_mixed; static int cfg_cpu = -1; /* default: pin to last cpu */ @@ -86,7 +96,7 @@ static int cfg_runtime_ms = 4200; static int cfg_verbose; static int cfg_waittime_ms = 500; static int cfg_notification_limit = 32; -static bool cfg_zerocopy; +static enum notification_type cfg_zerocopy; static socklen_t cfg_alen; static struct sockaddr_storage cfg_dst_addr; @@ -97,6 +107,9 @@ static long packets, bytes, completions, expected_completions; static int zerocopied = -1; static uint32_t next_completion; static uint32_t sends_since_notify; +static char *zc_ckbuf; +static int zc_info_size; +static bool added_zcopy_info; static unsigned long gettimeofday_ms(void) { @@ -182,7 +195,26 @@ static void add_zcopy_cookie(struct msghdr *msg, uint32_t cookie) memcpy(CMSG_DATA(cm), &cookie, sizeof(cookie)); } -static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain) +static void add_zcopy_info(struct msghdr *msg) +{ + struct zc_info *zc_info; + struct cmsghdr *cm; + + if (!msg->msg_control) + error(1, errno, "NULL user arg"); + cm = (struct cmsghdr *)msg->msg_control; + cm->cmsg_len = CMSG_LEN(zc_info_size); + cm->cmsg_level = SOL_SOCKET; + cm->cmsg_type = SCM_ZC_NOTIFICATION; + + zc_info = (struct zc_info *)CMSG_DATA(cm); + zc_info->size = cfg_notification_limit; + + added_zcopy_info = true; +} + +static bool do_sendmsg(int fd, struct msghdr *msg, + enum notification_type do_zerocopy, int domain) { int ret, len, i, flags; static uint32_t cookie; @@ -200,6 +232,12 @@ static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain) msg->msg_controllen = CMSG_SPACE(sizeof(cookie)); msg->msg_control = (struct cmsghdr *)ckbuf; add_zcopy_cookie(msg, ++cookie); + } else if (do_zerocopy == MSG_ZEROCOPY_NOTIFY_SENDMSG && + sends_since_notify + 1 >= cfg_notification_limit) { + memset(&msg->msg_control, 0, sizeof(msg->msg_control)); + msg->msg_controllen = CMSG_SPACE(zc_info_size); + msg->msg_control = (struct cmsghdr *)zc_ckbuf; + add_zcopy_info(msg); } } @@ -218,7 +256,7 @@ static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain) if (do_zerocopy && ret) expected_completions++; } - if (do_zerocopy && domain == PF_RDS) { + if (msg->msg_control) { msg->msg_control = NULL; msg->msg_controllen = 0; } @@ -466,6 +504,44 @@ static void do_recv_completions(int fd, int domain) sends_since_notify = 0; } +static void do_recv_completions2(void) +{ + struct cmsghdr *cm = (struct cmsghdr *)zc_ckbuf; + struct zc_info *zc_info; + __u32 hi, lo, range; + __u8 zerocopy; + int i; + + zc_info = (struct zc_info *)CMSG_DATA(cm); + for (i = 0; i < zc_info->size; i++) { + hi = zc_info->arr[i].hi; + lo = zc_info->arr[i].lo; + zerocopy = zc_info->arr[i].zerocopy; + range = hi - lo + 1; + + if (cfg_verbose && lo != next_completion) + fprintf(stderr, "gap: %u..%u does not append to %u\n", + lo, hi, next_completion); + next_completion = hi + 1; + + if (zerocopied == -1) + zerocopied = zerocopy; + else if (zerocopied != zerocopy) { + fprintf(stderr, "serr: inconsistent\n"); + zerocopied = zerocopy; + } + + completions += range; + + if (cfg_verbose >= 2) + fprintf(stderr, "completed: %u (h=%u l=%u)\n", + range, hi, lo); + } + + sends_since_notify = 0; + added_zcopy_info = false; +} + /* Wait for all remaining completions on the errqueue */ static void do_recv_remaining_completions(int fd, int domain) { @@ -541,6 +617,14 @@ static void do_tx(int domain, int type, int protocol) sizeof(struct sockaddr_in6)); } + if (cfg_zerocopy == MSG_ZEROCOPY_NOTIFY_SENDMSG) { + zc_info_size = sizeof(struct zc_info) + + sizeof(struct zc_info_elem) * cfg_notification_limit; + zc_ckbuf = (char *)malloc(CMSG_SPACE(zc_info_size)); + if (!zc_ckbuf) + error(1, errno, "zc_ckbuf malloc failed"); + } + iov[2].iov_base = payload; iov[2].iov_len = cfg_payload_len; msg.msg_iovlen++; @@ -553,11 +637,16 @@ static void do_tx(int domain, int type, int protocol) else do_sendmsg(fd, &msg, cfg_zerocopy, domain); - if (cfg_zerocopy && sends_since_notify >= cfg_notification_limit) + if (cfg_zerocopy == MSG_ZEROCOPY_NOTIFY_ERRQUEUE && + sends_since_notify >= cfg_notification_limit) do_recv_completions(fd, domain); + if (cfg_zerocopy == MSG_ZEROCOPY_NOTIFY_SENDMSG && + added_zcopy_info) + do_recv_completions2(); + while (!do_poll(fd, POLLOUT)) { - if (cfg_zerocopy) + if (cfg_zerocopy == MSG_ZEROCOPY_NOTIFY_ERRQUEUE) do_recv_completions(fd, domain); } @@ -566,6 +655,9 @@ static void do_tx(int domain, int type, int protocol) if (cfg_zerocopy) do_recv_remaining_completions(fd, domain); + if (cfg_zerocopy == MSG_ZEROCOPY_NOTIFY_SENDMSG) + free(zc_ckbuf); + if (close(fd)) error(1, errno, "close"); @@ -715,7 +807,7 @@ static void parse_opts(int argc, char **argv) cfg_payload_len = max_payload_len; - while ((c = getopt(argc, argv, "46c:C:D:i:l:mp:rs:S:t:vz")) != -1) { + while ((c = getopt(argc, argv, "46c:C:D:i:l:mnp:rs:S:t:vz")) != -1) { switch (c) { case '4': if (cfg_family != PF_UNSPEC) @@ -749,6 +841,9 @@ static void parse_opts(int argc, char **argv) case 'm': cfg_cork_mixed = true; break; + case 'n': + cfg_zerocopy = MSG_ZEROCOPY_NOTIFY_SENDMSG; + break; case 'p': cfg_port = strtoul(optarg, NULL, 0); break; @@ -768,7 +863,7 @@ static void parse_opts(int argc, char **argv) cfg_verbose++; break; case 'z': - cfg_zerocopy = true; + cfg_zerocopy = MSG_ZEROCOPY_NOTIFY_ERRQUEUE; break; } } @@ -779,6 +874,8 @@ static void parse_opts(int argc, char **argv) error(1, 0, "-D required for PF_RDS\n"); if (!cfg_rx && !saddr) error(1, 0, "-S required for PF_RDS\n"); + if (cfg_zerocopy == MSG_ZEROCOPY_NOTIFY_SENDMSG) + error(1, 0, "PF_RDS does not support MSG_ZEROCOPY_NOTIFY_SENDMSG"); } setup_sockaddr(cfg_family, daddr, &cfg_dst_addr); setup_sockaddr(cfg_family, saddr, &cfg_src_addr); diff --git a/tools/testing/selftests/net/msg_zerocopy.sh b/tools/testing/selftests/net/msg_zerocopy.sh index 89c22f5320e0..022a6936d86f 100755 --- a/tools/testing/selftests/net/msg_zerocopy.sh +++ b/tools/testing/selftests/net/msg_zerocopy.sh @@ -118,4 +118,5 @@ do_test() { do_test "${EXTRA_ARGS}" do_test "-z ${EXTRA_ARGS}" +do_test "-n ${EXTRA_ARGS}" echo ok