From patchwork Tue May 28 21:21:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijian Zhang X-Patchwork-Id: 13677479 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 A4A4C16DED8 for ; Tue, 28 May 2024 21:21:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716931294; cv=none; b=omUz92RdaR9ubdT2SbyIrM8Y9bzZ07rmDGfJZCxo7EwIZjaw78D7KddYQBmQTZw9/UgKXCBx+C49ZpYAJOCUEHeIEBfwHohsYJiq+IlgcAMXkyqSRGpWFRlrVA6DT7/JYiyZxZYodIaECNp2kZ+5nJhMu2tRyi5miM4shEwyDbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716931294; c=relaxed/simple; bh=dNWcyM476OH0vYBSo/Kk3Jx7KuSnoow7Mr3DNeSolcA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PDX6Ld0VJxDBmeloP6sRihpumfB+Q4fD20oHKskNDaTONtFtUZaFhchCqOxMjZWFnmYButuUUinvnBN2pLAz6EqNShnK8m6JYAG7jZCbtHkLxHnudB4kX8Q75q8hdiZbOHgcW6XH3vrAY1+kQmnRzi8OnOpL6y4Q1Zn2iCGAFaU= 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=NHDseq7U; arc=none smtp.client-ip=209.85.222.169 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="NHDseq7U" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-794977cbcc3so53352185a.0 for ; Tue, 28 May 2024 14:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1716931291; x=1717536091; 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=rabWcKhADufYxgChzwdAanqzucOdi69JhATOYQQ8ag4=; b=NHDseq7U05uaCp4WiBHYwDynV7bAAF36BmEgaBIxckwMOj6yZJMSiJN34Oz7DFhdo6 qu3MZYfxvcmsY9cridi6bI6GcQieH2npOrY+P/w1bboFn3rpJayRSiX3nZE3/W+k6+SD t2CyMUlr/dCakabwWYKGT8XFP6vvyQpYEEPyufxUJWQ4Gkdn82FvsW22neWOCEtEC0Cr nWSCOc0gwjUNB9i4LoUsAEFfXQ+duShtt3SCppPjTShh/7tN/f72e3Mf1cLwGkYwr3Hd QNDNcdyi5c8+LSSdN3GkjLeBxZkJ8QqwrfsvpxPu2HSCt/+V1G9QTJo0xffVxPDDk5Lh d2pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716931291; x=1717536091; 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=rabWcKhADufYxgChzwdAanqzucOdi69JhATOYQQ8ag4=; b=j1MtZO6DQ8FUex8ZwYZRbjn+IW3ZQnx2CaBufMMhmZPm61nbS3AjoJRJxtY+U+0JUE DHzuMFEwZu6XGGu73GeN2q2Yd36VA27qX5zd3YmKbNA9NjaI7XGIokGDu7zGjpTS6ANk loljVweGxITY1NX4UNpgyGm4aDGd49D1Unl5Zr7Vr14jafKLWIR5ey7SBRT7Wu5T8/g4 m5dwJJ0RytDJy1yWVkwH5IIu51BwQ7ZgxSoL0hReTCGj/tkClgDQDyOesKmvDpzAt3NS nM9E2I5ZYcOv1GuSOehqSFj68vEju4Bkv23RC6MLFRUDmZX1Bbfjyu0TaDSSau9gJPjl wycg== X-Gm-Message-State: AOJu0YzYS6ZO4c9J6DGa4egBwLeDsqDv5cvrTEsCtb+wdbSZDHULL+XR RqLyRElsLHzersLRfgXz31eE8vyXQpBNuDUSJhB5Nz3wSPPmd1kssn7Y3YibQTHTeBaxblQhCms S X-Google-Smtp-Source: AGHT+IGZ10UOrlZ64cZKVGE3Efbll0NClj2xEk7EWqsAkdOC7w4SJzNfEOzJ/KwTnmmeVxHuLY+7jg== X-Received: by 2002:a05:620a:222a:b0:794:bbbb:768b with SMTP id af79cd13be357-794bbbb7973mr764822285a.78.1716931291295; Tue, 28 May 2024 14:21:31 -0700 (PDT) Received: from n191-036-066.byted.org ([147.160.184.94]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794abca80a7sm412619485a.17.2024.05.28.14.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 14:21:31 -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 v4 1/3] selftests: fix OOM problem in msg_zerocopy selftest Date: Tue, 28 May 2024 21:21:01 +0000 Message-Id: <20240528212103.350767-2-zijianzhang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240528212103.350767-1-zijianzhang@bytedance.com> References: <20240528212103.350767-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 In selftests/net/msg_zerocopy.c, it has a while loop keeps calling sendmsg on a socket with MSG_ZEROCOPY flag, and it will recv the notifications until the socket is not writable. Typically, it will start the receiving process after around 30+ sendmsgs. However, because of the commit dfa2f0483360 ("tcp: get rid of sysctl_tcp_adv_win_scale") the sender is always writable and does not get any chance to run recv notifications. The selftest always exits with OUT_OF_MEMORY because the memory used by opt_skb exceeds the core.sysctl_optmem_max. According to our experiments, this problem can be mitigated by open the DEBUG_LOCKDEP configuration for the kernel. But it will makes the notifications disordered even in good commits before commit dfa2f0483360 ("tcp: get rid of sysctl_tcp_adv_win_scale"). We introduce "cfg_notification_limit" to force sender to receive notifications after some number of sendmsgs. And, notifications may not come in order, because of the reason we present above. We have order checking code managed by cfg_verbose. Signed-off-by: Zijian Zhang Signed-off-by: Xiaochun Lu --- tools/testing/selftests/net/msg_zerocopy.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/msg_zerocopy.c b/tools/testing/selftests/net/msg_zerocopy.c index bdc03a2097e8..ba6c257f689c 100644 --- a/tools/testing/selftests/net/msg_zerocopy.c +++ b/tools/testing/selftests/net/msg_zerocopy.c @@ -85,6 +85,7 @@ static bool cfg_rx; 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 socklen_t cfg_alen; @@ -95,6 +96,8 @@ static char payload[IP_MAXPACKET]; static long packets, bytes, completions, expected_completions; static int zerocopied = -1; static uint32_t next_completion; +/* The number of sendmsgs which have not received notified yet */ +static uint32_t sendmsg_counter; static unsigned long gettimeofday_ms(void) { @@ -208,6 +211,7 @@ static bool do_sendmsg(int fd, struct msghdr *msg, bool do_zerocopy, int domain) error(1, errno, "send"); if (cfg_verbose && ret != len) fprintf(stderr, "send: ret=%u != %u\n", ret, len); + sendmsg_counter++; if (len) { packets++; @@ -435,7 +439,7 @@ static bool do_recv_completion(int fd, int domain) /* Detect notification gaps. These should not happen often, if at all. * Gaps can occur due to drops, reordering and retransmissions. */ - if (lo != next_completion) + 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; @@ -460,6 +464,7 @@ static bool do_recv_completion(int fd, int domain) static void do_recv_completions(int fd, int domain) { while (do_recv_completion(fd, domain)) {} + sendmsg_counter = 0; } /* Wait for all remaining completions on the errqueue */ @@ -549,6 +554,9 @@ static void do_tx(int domain, int type, int protocol) else do_sendmsg(fd, &msg, cfg_zerocopy, domain); + if (cfg_zerocopy && sendmsg_counter >= cfg_notification_limit) + do_recv_completions(fd, domain); + while (!do_poll(fd, POLLOUT)) { if (cfg_zerocopy) do_recv_completions(fd, domain); @@ -708,7 +716,7 @@ static void parse_opts(int argc, char **argv) cfg_payload_len = max_payload_len; - while ((c = getopt(argc, argv, "46c:C:D:i:mp:rs:S:t:vz")) != -1) { + while ((c = getopt(argc, argv, "46c:C:D:i:l:mp:rs:S:t:vz")) != -1) { switch (c) { case '4': if (cfg_family != PF_UNSPEC) @@ -736,6 +744,9 @@ static void parse_opts(int argc, char **argv) if (cfg_ifindex == 0) error(1, errno, "invalid iface: %s", optarg); break; + case 'l': + cfg_notification_limit = strtoul(optarg, NULL, 0); + break; case 'm': cfg_cork_mixed = true; break; From patchwork Tue May 28 21:21:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijian Zhang X-Patchwork-Id: 13677480 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 97DF317B4F0 for ; Tue, 28 May 2024 21:21:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716931296; cv=none; b=nTJ6sKx4j9YMWkJS3M8gVFLr0qalqLNvVIXs0V8wfB7aJrdu1b4qNIngtY37qf3hkdL6BjngJ8U7zbhc73BmtG70rQ+pqh/Z8lk2LDIYIvUyzZZCb7vnfB/7Cn+/yoqgv2FKx5VoQ/WjBu9pv6UOAnMow0UMpHLfTJl6lR13pec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716931296; c=relaxed/simple; bh=ta0Px17Ekd/qP7jcVxp/V+NAEtF2Mcebxi90oqCLlHg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Iw9PvRqHEZ1q2OVpStde7ihcMO/ycfTTiddthP9qJi1prgG9QC46ILEN4/Kx5Fl5WEvEqISZdMpu7CeGuWBfMv/+PYmqs7P61nMBS6aBsYAJ7MJWladVQzAkFHnzBxhyZ/j/KeTWFFJUwq3qzjiirBsyZZNjngFR5RNmAlAhLv4= 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=H4Ldzn/E; arc=none smtp.client-ip=209.85.222.176 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="H4Ldzn/E" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-794ba2d4d82so58676485a.0 for ; Tue, 28 May 2024 14:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1716931293; x=1717536093; 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=w+9mokwG2vctTP/n+qmcoDSQAN6t/8AkrkgDXrIIePk=; b=H4Ldzn/Eg5lb1JpYTUg5JFIVGAX+hKg80tvPkZ9DPLbVBlSOp4PbpwS1Hhe7NxXpBJ wLHUzJmzwbkNDAf8n0TZd8p2fdfobf8CNwbas0EXFNIm1Fjb8AKJWfiHtmoU1oulGi5N ulUIuI8L0DuYbR8cyki2o4zl9tCI8YOlsQcHw1Jz7HPrW29zYX0HXDQGoFN3kpOdOnHc dmthprSeLJpJKWXIpX2ZRa4tw0bK7kLar4lws3G1y+WmhGiay5DlMO61NrSCkLRUEsjg gj/3OlPuhA7g1zgqLniwSPSgUb72sjz1NxEj8aKdaLwJTw1jVVb4538QPs1hQFJHOyoL 3LOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716931293; x=1717536093; 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=w+9mokwG2vctTP/n+qmcoDSQAN6t/8AkrkgDXrIIePk=; b=X6nx+sPPcLGjUAcJeXtdLq1MEq+gM5lXsNnSZrgRaIRrHHRjywXgAecQUJV/RUHlCN YAu+q4Ym1E3DMEgtkYrtcDkWGfykUiwZD9mJ2/j4Ze9buYqmTty+CCVDpRoVOERIV6Mv guj0qvMP2WI9NzH6qnZ2/FjVh6EDnX0ZMCXV3r39bsYWi3qFyW1W372qLQNSI9430EV+ /DzlxHg8QdTrfO1aOM848xSEPJNhEZ9C/zUK/wgt3E6q4ac8fXOIp4xlNcFEsriJChuK Txh7TAMkvi5/z3ICz8rNz1kODZRR4BTGVYBRXbjOaiJcaAMye6jZv+nt1iVxENu0a3MT 4Ibw== X-Gm-Message-State: AOJu0Yz1FMT+np5s8s5E3kA5rfbbVq9hGLjVVGRDHi0Lbmzrd++VhY+Z ithgg8bxpiDsLovmJbJxBVTLodacB3VemPD9rrJhHGCIeki39ke4FmeSzf4pTT4aWV8BBPKlbiX l X-Google-Smtp-Source: AGHT+IGdfK8CGwIbHLkW9liW8S9yD7fsowGh2BQZyMBeiXKEAPmRO95MKlfqcKmcSiwf74gmdCKCAw== X-Received: by 2002:a05:620a:7299:b0:793:29:7fdd with SMTP id af79cd13be357-794ab04a366mr1528609685a.1.1716931292582; Tue, 28 May 2024 14:21:32 -0700 (PDT) Received: from n191-036-066.byted.org ([147.160.184.94]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794abca80a7sm412619485a.17.2024.05.28.14.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 14:21:32 -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 v4 2/3] sock: add MSG_ZEROCOPY notification mechanism based on msg_control Date: Tue, 28 May 2024 21:21:02 +0000 Message-Id: <20240528212103.350767-3-zijianzhang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240528212103.350767-1-zijianzhang@bytedance.com> References: <20240528212103.350767-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. The overhead of such sometimes might be more than the CPU savings from zerocopy. We try to solve this problem with a new notification mechanism based on msgcontrol. This new mechanism aims to reduce the overhead associated with receiving notifications by embedding them directly into user arguments passed with each sendmsg control message. By doing so, we can significantly reduce the complexity and overhead for managing notifications. In an ideal pattern, the user will keep calling sendmsg with SCM_ZC_NOTIFICATION msg_control, and the notification will be delivered as soon as possible. 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/uapi/asm-generic/socket.h | 2 + include/uapi/linux/socket.h | 10 ++++ net/core/sock.c | 68 +++++++++++++++++++++++++++ 7 files changed, 88 insertions(+) diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h index e94f621903fe..7761a4e0ea2c 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..89edc51380f0 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..2911b43e6a9d 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..dc045e87cc8e 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/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h index 8ce8a39a1e5f..7474c8a244bc 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..15cec8819f34 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,12 @@ struct __kernel_sockaddr_storage { #define SOCK_TXREHASH_DISABLED 0 #define SOCK_TXREHASH_ENABLED 1 +#define SOCK_ZC_INFO_MAX 128 + +struct zc_info_elem { + __u32 lo; + __u32 hi; + __u8 zerocopy; +}; + #endif /* _UAPI_LINUX_SOCKET_H */ diff --git a/net/core/sock.c b/net/core/sock.c index 521e6373d4f7..21239469d75c 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2847,6 +2847,74 @@ int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg, case SCM_RIGHTS: case SCM_CREDENTIALS: break; + case SCM_ZC_NOTIFICATION: { + int ret, i = 0; + int cmsg_data_len, zc_info_elem_num; + void __user *usr_addr; + struct zc_info_elem zc_info_kern[SOCK_ZC_INFO_MAX]; + unsigned long flags; + struct sk_buff_head *q, local_q; + struct sk_buff *skb, *tmp; + struct sock_exterr_skb *serr; + + 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_elem)) + return -EINVAL; + + zc_info_elem_num = cmsg_data_len / sizeof(struct zc_info_elem); + if (!zc_info_elem_num || zc_info_elem_num > SOCK_ZC_INFO_MAX) + return -EINVAL; + + if (in_compat_syscall()) + usr_addr = compat_ptr(*(compat_uptr_t *)CMSG_DATA(cmsg)); + else + usr_addr = (void __user *)*(void **)CMSG_DATA(cmsg); + if (!access_ok(usr_addr, cmsg_data_len)) + return -EFAULT; + + q = &sk->sk_error_queue; + skb_queue_head_init(&local_q); + spin_lock_irqsave(&q->lock, flags); + skb = skb_peek(q); + while (skb && i < zc_info_elem_num) { + 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_kern[i].hi = serr->ee.ee_data; + zc_info_kern[i].lo = serr->ee.ee_info; + zc_info_kern[i].zerocopy = !(serr->ee.ee_code + & SO_EE_CODE_ZEROCOPY_COPIED); + __skb_unlink(skb, q); + __skb_queue_tail(&local_q, skb); + i++; + } + skb = skb_next; + } + spin_unlock_irqrestore(&q->lock, flags); + + ret = copy_to_user(usr_addr, + zc_info_kern, + i * sizeof(struct zc_info_elem)); + + if (unlikely(ret)) { + spin_lock_irqsave(&q->lock, flags); + skb_queue_reverse_walk_safe(&local_q, skb, tmp) { + __skb_unlink(skb, &local_q); + __skb_queue_head(q, skb); + } + spin_unlock_irqrestore(&q->lock, flags); + return -EFAULT; + } + + while ((skb = __skb_dequeue(&local_q))) + consume_skb(skb); + break; + } default: return -EINVAL; } From patchwork Tue May 28 21:21: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: 13677481 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (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 B65D417BB1B for ; Tue, 28 May 2024 21:21:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716931297; cv=none; b=Pwc3tI/NASDobhS1ouNTThRFyj17LCfKs7ldFfMbN2vWpV61oSkfzEGizbb+7a0svsS5/myF4pzQF98GKQjQ+dBnSoXdiQr2hN0WBZeQDS0u9hVBP5Wt0WnHCQEQBN+Lq3A6Y4Pt2wc26npIRslhTUZQxcdzzKg5jwRbjEjRCWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716931297; c=relaxed/simple; bh=4yfs2Nl8yUORfU9xJ0tw5I5G5B1ggqQ/R8KCWZZrVlA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TSIZKei8terse/S7oTOWEZfvbUREfY/Z9onSLbJoH9Vk0I+hxlIk5Vl3PVuDx1Ev6nDesfEhpscwbJIOJABWF+3M6PWpQOTl7avLQrbd8lfF2oBOQWcomN2N/i9fUS6J1hHGWtiJqaFd9tkqBwtI1UJhLsLhlRI7fgJpOQ2NnTA= 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=Wx50qeGS; arc=none smtp.client-ip=209.85.222.179 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="Wx50qeGS" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-794ac6b5409so92694385a.2 for ; Tue, 28 May 2024 14:21:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1716931294; x=1717536094; 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=hSMjgtZl0FFUIBNXq0ZFWaWaR2txjAdQiVKI/+fWLPg=; b=Wx50qeGSv+eOcyPj2xfXe98fJzdu1YTFCRodHb3w8V+Aw22P1U45alxc7oHTjTw4Hd Yp6vgeYzllRaVG/nGmHktBqEeFTJI0ALd5W3vC0THddh6kvzfW/iUEJ/PxIIrTXDfVyk Z/ufJ8bJ4/uhwh1qcFpzRIs1clQ11sx89up953BCZNcw6TktC5AldRCQ9gkn/pEcRwNL +rCUVz6MqTrGre0Ul98WY+irbwQZ8vmn0XUYlGk6Gshw1VVXJvLkKMOfmgE4X4mVDX1n zu2gty6BrtmPyFDQi/GIg8Ss2QHoGfnmcqBbwGDQQV1WXlB5vlQO562uN3Bzx4IOZp7r Xxjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716931294; x=1717536094; 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=hSMjgtZl0FFUIBNXq0ZFWaWaR2txjAdQiVKI/+fWLPg=; b=Cdq6Beoyc2vpWI86MunlaOZoP5Ra1ayPBwUPoKnISSIdctm7tz+Bg7DZgo0v33EIOX rBrRFYt7VLwhtKynS1bjVfgUQw4I7uBGJgIs+51B9VaONfA5goqVLSUIiRFHTUzXaPcs WG0Mfy8M3dKG7SYZ7j9Q3jbMGNW3PluE3jhpLNdlYfaeJCgjsEP2yPFGkwHt00bf53iL /CEF/bb50m8pmy1JydkW4TyGOCsQnsK0DWWVHDdBqedalJaixyXf20Jp/3eTHtLhyUaC R1Mx6CpbqjAj8/d5oi7Rtqlxb9e9Bt1UclXzyigKAzZduVxvNd2CQjIoHKXsXKG4U7T2 jF4A== X-Gm-Message-State: AOJu0YyTVqfW5DwRlGkqVi1921xNoWhEnLG6/YUj16/WhhqNXGb4DvaF 7sKyyKQCT0Uij0lZsBY1x8p5HLDZ24ZG465+h4mBSg8K7K0S8dvio/uOLWe6/glojV7YRh3XODO x X-Google-Smtp-Source: AGHT+IGbFoZhlTejNleaf21Bysjq2W7a0ohmqOpKz+oBjEul5otHV078TPRR9bKB6fQuE2Ly5X+ebA== X-Received: by 2002:a05:620a:470a:b0:793:3bb:322b with SMTP id af79cd13be357-794ab0f4385mr1818320985a.62.1716931294047; Tue, 28 May 2024 14:21:34 -0700 (PDT) Received: from n191-036-066.byted.org ([147.160.184.94]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794abca80a7sm412619485a.17.2024.05.28.14.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 14:21:33 -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 v4 3/3] selftests: add MSG_ZEROCOPY msg_control notification test Date: Tue, 28 May 2024 21:21:03 +0000 Message-Id: <20240528212103.350767-4-zijianzhang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240528212103.350767-1-zijianzhang@bytedance.com> References: <20240528212103.350767-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. Test result from selftests/net/msg_zerocopy.c, cfg_notification_limit = 1, in this case MSG_ZEROCOPY approximately aligns with the semantics of MSG_ZEROCOPY_UARG. In this case, the new flag has around 13% cpu savings in TCP and 18% cpu savings in UDP. +---------------------+---------+---------+---------+---------+ | Test Type / Protocol| TCP v4 | TCP v6 | UDP v4 | UDP v6 | +---------------------+---------+---------+---------+---------+ | ZCopy (MB) | 5147 | 4885 | 7489 | 7854 | +---------------------+---------+---------+---------+---------+ | New ZCopy (MB) | 5859 | 5505 | 9053 | 9236 | +---------------------+---------+---------+---------+---------+ | New ZCopy / ZCopy | 113.83% | 112.69% | 120.88% | 117.59% | +---------------------+---------+---------+---------+---------+ cfg_notification_limit = 32, it means less poll + recvmsg overhead, the new mechanism performs 8% better in TCP. For UDP, no obvious performance gain is observed and sometimes may lead to degradation. Thus, if users don't need to retrieve the notification ASAP in UDP, the original mechanism is preferred. +---------------------+---------+---------+---------+---------+ | Test Type / Protocol| TCP v4 | TCP v6 | UDP v4 | UDP v6 | +---------------------+---------+---------+---------+---------+ | ZCopy (MB) | 6272 | 6138 | 12138 | 10055 | +---------------------+---------+---------+---------+---------+ | New ZCopy (MB) | 6774 | 6620 | 11504 | 10355 | +---------------------+---------+---------+---------+---------+ | New ZCopy / ZCopy | 108.00% | 107.85% | 94.78% | 102.98% | +---------------------+---------+---------+---------+---------+ Signed-off-by: Zijian Zhang Signed-off-by: Xiaochun Lu --- tools/testing/selftests/net/msg_zerocopy.c | 103 ++++++++++++++++++-- tools/testing/selftests/net/msg_zerocopy.sh | 1 + 2 files changed, 97 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/msg_zerocopy.c b/tools/testing/selftests/net/msg_zerocopy.c index ba6c257f689c..48750a7a162c 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,13 @@ #define MSG_ZEROCOPY 0x4000000 #endif +#define ZC_MSGERR_NOTIFICATION 1 +#define ZC_MSGCTL_NOTIFICATION 2 + +#define SOCK_ZC_INFO_NUM 8 + +#define INVALID_ZEROCOPY_VAL 2 + static int cfg_cork; static bool cfg_cork_mixed; static int cfg_cpu = -1; /* default: pin to last cpu */ @@ -86,13 +98,16 @@ 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 int cfg_zerocopy; /* Either 1 or 2, mode for SO_ZEROCOPY */ static socklen_t cfg_alen; static struct sockaddr_storage cfg_dst_addr; static struct sockaddr_storage cfg_src_addr; static char payload[IP_MAXPACKET]; +static struct zc_info_elem zc_info[SOCK_ZC_INFO_NUM]; +static char zc_ckbuf[CMSG_SPACE(sizeof(void *))]; +static struct zc_info_elem *zc_info_ptr = zc_info; static long packets, bytes, completions, expected_completions; static int zerocopied = -1; static uint32_t next_completion; @@ -170,6 +185,26 @@ static int do_accept(int fd) return fd; } +static void add_zcopy_info(struct msghdr *msg) +{ + int i; + struct cmsghdr *cm; + + if (!msg->msg_control) + error(1, errno, "NULL user arg"); + cm = (void *)msg->msg_control; + /* Although only the address of the array will be written into the + * zc_ckbuf, we assign cmsg_len to CMSG_LEN(sizeof(zc_info)) to specify + * the length of the array. + */ + cm->cmsg_len = CMSG_LEN(sizeof(zc_info)); + cm->cmsg_level = SOL_SOCKET; + cm->cmsg_type = SCM_ZC_NOTIFICATION; + memcpy(CMSG_DATA(cm), &zc_info_ptr, sizeof(zc_info_ptr)); + for (i = 0; i < SOCK_ZC_INFO_NUM; i++) + zc_info[i].zerocopy = INVALID_ZEROCOPY_VAL; +} + static void add_zcopy_cookie(struct msghdr *msg, uint32_t cookie) { struct cmsghdr *cm; @@ -183,7 +218,7 @@ 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 bool do_sendmsg(int fd, struct msghdr *msg, int do_zerocopy, int domain) { int ret, len, i, flags; static uint32_t cookie; @@ -201,6 +236,15 @@ 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 == ZC_MSGCTL_NOTIFICATION) { + memset(&msg->msg_control, 0, sizeof(msg->msg_control)); + /* Although only the address of the array will be written into the + * zc_ckbuf, msg_controllen must be larger or equal than any cmsg_len + * in it. Otherwise, we will get -EINVAL. + */ + msg->msg_controllen = CMSG_SPACE(sizeof(zc_info)); + msg->msg_control = (struct cmsghdr *)zc_ckbuf; + add_zcopy_info(msg); } } @@ -219,7 +263,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; } @@ -393,6 +437,42 @@ static bool do_recvmsg_completion(int fd) return ret; } +static void do_recv_completions2(void) +{ + int i; + __u32 hi, lo, range; + __u8 zerocopy; + + for (i = 0; zc_info[i].zerocopy != INVALID_ZEROCOPY_VAL; i++) { + struct zc_info_elem elem = zc_info[i]; + + hi = elem.hi; + lo = elem.lo; + zerocopy = elem.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); + } + + sendmsg_counter -= i; +} + static bool do_recv_completion(int fd, int domain) { struct sock_extended_err *serr; @@ -554,11 +634,15 @@ static void do_tx(int domain, int type, int protocol) else do_sendmsg(fd, &msg, cfg_zerocopy, domain); - if (cfg_zerocopy && sendmsg_counter >= cfg_notification_limit) + if (cfg_zerocopy == ZC_MSGERR_NOTIFICATION && + sendmsg_counter >= cfg_notification_limit) do_recv_completions(fd, domain); + if (cfg_zerocopy == ZC_MSGCTL_NOTIFICATION) + do_recv_completions2(); + while (!do_poll(fd, POLLOUT)) { - if (cfg_zerocopy) + if (cfg_zerocopy == ZC_MSGERR_NOTIFICATION) do_recv_completions(fd, domain); } @@ -716,7 +800,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) @@ -750,6 +834,9 @@ static void parse_opts(int argc, char **argv) case 'm': cfg_cork_mixed = true; break; + case 'n': + cfg_zerocopy = ZC_MSGCTL_NOTIFICATION; + break; case 'p': cfg_port = strtoul(optarg, NULL, 0); break; @@ -769,7 +856,7 @@ static void parse_opts(int argc, char **argv) cfg_verbose++; break; case 'z': - cfg_zerocopy = true; + cfg_zerocopy = ZC_MSGERR_NOTIFICATION; break; } } @@ -780,6 +867,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 == ZC_MSGCTL_NOTIFICATION) + error(1, 0, "PF_RDS does not support ZC_MSGCTL_NOTIFICATION"); } 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