From patchwork Wed Aug 11 15:47:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bui Quang Minh X-Patchwork-Id: 12431529 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E8ADC4338F for ; Wed, 11 Aug 2021 15:49:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3998B60E97 for ; Wed, 11 Aug 2021 15:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233338AbhHKPto (ORCPT ); Wed, 11 Aug 2021 11:49:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232614AbhHKPtR (ORCPT ); Wed, 11 Aug 2021 11:49:17 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 875C6C061765; Wed, 11 Aug 2021 08:48:53 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id u15so1094042ple.2; Wed, 11 Aug 2021 08:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bnbtkZQpf9L11aDuuRqukc6bXD8KPDfRpyCDHXZZaSw=; b=Nklu0H16XER0KgpmpqewCi2NGILrtRkmfYBkqkFUbOs/0jVtoiLhJondqeBn+gtUa5 UDlDMHiPDEIVecaNEcKchWU9AYKMeVfr3ZTF2KpTdzZGlOpzcvq2sf5SBf4YIkQrTyyD oKp/LxZi78ORQ2qmpWDmUlameGzw3kAzoJkVQkPoYvUEwIVIZ0LA78IzSxqS2rn6th7R QxiHism49G14oszpqdqDgMey0BmbBWHZcSjDMmS+cn3X637bEZu11+nY9NRg+052zUj5 +Ub3klqFNtIx2gzS5ueeW9s/V/G8gCaFzLLdOaF+OrvccvAu+QWFPkHI3bCaAfjMMtXU BzJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bnbtkZQpf9L11aDuuRqukc6bXD8KPDfRpyCDHXZZaSw=; b=ZO+H5fPQzVXMfUK+q+l29poU4wbYFS4ZuZY8/Ym+hNr1hO7hqqmQemxYxPtnLQ2ekT nj8tSYPlV7XzECL0bVlIQ58RUfqL2H43z8XC1gwrJKbPnuwQhoAxZJhjcc3sMhUOSPcq 5pSczITejczrEgi32F+e6TDyFH+HjgOqpAr+boTyVX8ABzbVjYn/L6+TjgaqK78JU/uQ KzpXOE66yyMjIsT+yb/S8W0/y96RtTBRJxEgh6sPUFmbSmKGrVNIMJriZ4x4injlse6T VvFI3x+9VR68v3e4oK989xkRTOruIJleDGu9TClY2PLnaVvKM0IlcDWhORTCXpLT9qL6 2lIA== X-Gm-Message-State: AOAM532+dPRb+wM/YEK2tlUR2oMpvDqIWBSeurfHG9a3362U1FssBvCL Lad4Fws9qPY+3fwjCnSVB8F0XceOVXY05sws3zI= X-Google-Smtp-Source: ABdhPJxvcweWTijhuddFYgviNeCUaMea9vqbvVuo82WvAh55gburpMOc2LgJeFIBv7fNNtyxV6JOfQ== X-Received: by 2002:a63:496:: with SMTP id 144mr303838pge.353.1628696932741; Wed, 11 Aug 2021 08:48:52 -0700 (PDT) Received: from localhost.localdomain ([123.20.118.31]) by smtp.gmail.com with ESMTPSA id r17sm35023423pgu.8.2021.08.11.08.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 08:48:52 -0700 (PDT) From: Bui Quang Minh To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, yoshfuji@linux-ipv6.org, dsahern@kernel.org, willemb@google.com, pabeni@redhat.com, avagin@gmail.com, alexander@mihalicyn.com, minhquangbui99@gmail.com, lesedorucalin01@gmail.com Subject: [PATCH v2 2/2] selftests: Add udp_repair test Date: Wed, 11 Aug 2021 22:47:49 +0700 Message-Id: <20210811154749.7023-1-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This is a simple test for UDP_REPAIR in 3 cases: - Socket is an udp4 socket - Socket is an udp6 socket with pending ipv4 packets - Socket is an udp6 socket with pending ipv6 packets Signed-off-by: Bui Quang Minh --- tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/udp_repair.c | 218 +++++++++++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 tools/testing/selftests/net/udp_repair.c diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore index 19deb9cdf72f..c9daab1721d5 100644 --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@ -31,3 +31,4 @@ rxtimestamp timestamping txtimestamp so_netns_cookie +udp_repair diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 4f9f73e7a299..602f798c8880 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -42,6 +42,7 @@ TEST_GEN_FILES += gro TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls TEST_GEN_FILES += toeplitz +TEST_GEN_PROGS += udp_repair TEST_FILES := settings diff --git a/tools/testing/selftests/net/udp_repair.c b/tools/testing/selftests/net/udp_repair.c new file mode 100644 index 000000000000..1b2c53129c71 --- /dev/null +++ b/tools/testing/selftests/net/udp_repair.c @@ -0,0 +1,218 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PORT 5000 +#define BUF_SIZE 256 + +#define UDP_REPAIR 2 + +char send_buf[BUF_SIZE]; +struct udp_dump { + union { + struct sockaddr_in addr_v4; + struct sockaddr_in6 addr_v6; + }; + char buf[BUF_SIZE]; +}; + +struct sockaddr_in addr_v4; +struct sockaddr_in6 addr_v6; + +int udp_server(int is_udp4) +{ + int sock, ret; + unsigned short family; + struct sockaddr *server_addr; + unsigned int addr_len; + + if (is_udp4) { + family = AF_INET; + server_addr = (struct sockaddr *) &addr_v4; + addr_len = sizeof(addr_v4); + } else { + family = AF_INET6; + server_addr = (struct sockaddr *) &addr_v6; + addr_len = sizeof(addr_v6); + } + + sock = socket(family, SOCK_DGRAM, IPPROTO_UDP); + if (sock < 0) + error(1, errno, "socket server"); + + ret = bind(sock, server_addr, addr_len); + if (ret < 0) + error(1, errno, "bind server socket"); + + return sock; +} + +void server_recv(int sock) +{ + char recv_buf[BUF_SIZE]; + int ret; + + ret = recv(sock, recv_buf, sizeof(recv_buf), 0); + if (ret < 0) + error(1, errno, "recv in server"); + + if (memcmp(recv_buf, send_buf, BUF_SIZE)) + error(1, 0, "recv: data mismatch"); +} + +int create_corked_udp_client(int is_udp4) +{ + int sock, ret, val = 1; + unsigned short family = is_udp4 ? AF_INET : AF_INET6; + + sock = socket(family, SOCK_DGRAM, IPPROTO_UDP); + if (sock < 0) + error(1, errno, "socket client"); + + ret = setsockopt(sock, SOL_UDP, UDP_CORK, &val, sizeof(val)); + if (ret < 0) + error(1, errno, "setsockopt cork udp"); + + return sock; +} + +struct udp_dump *checkpoint(int sock, int is_udp4) +{ + int ret, val; + unsigned int addr_len; + struct udp_dump *dump; + struct sockaddr *addr; + + dump = malloc(sizeof(*dump)); + if (!dump) + error(1, 0, "malloc"); + + if (is_udp4) { + addr = (struct sockaddr *) &dump->addr_v4; + addr_len = sizeof(dump->addr_v4); + } else { + addr = (struct sockaddr *) &dump->addr_v6; + addr_len = sizeof(dump->addr_v6); + } + + val = 1; + ret = setsockopt(sock, SOL_UDP, UDP_REPAIR, &val, sizeof(val)); + if (ret < 0) + error(1, errno, "setsockopt udp_repair"); + + val = 0; + ret = setsockopt(sock, SOL_SOCKET, SO_PEEK_OFF, &val, sizeof(val)); + if (ret < 0) + error(1, errno, "setsockopt so_peek_off"); + + ret = recvfrom(sock, dump->buf, BUF_SIZE / 2, MSG_PEEK, + addr, &addr_len); + if (ret < 0) + error(1, errno, "dumping send queue"); + + ret = recvfrom(sock, dump->buf + BUF_SIZE / 2, + BUF_SIZE - BUF_SIZE / 2, MSG_PEEK, + addr, &addr_len); + if (ret < 0) + error(1, errno, "dumping send queue"); + + if (memcmp(dump->buf, send_buf, BUF_SIZE)) + error(1, 0, "dump: data mismatch"); + + return dump; +} + +void restore(int sock, struct udp_dump *dump, int is_udp4) +{ + struct sockaddr *addr; + int val; + unsigned int addr_len; + + if (is_udp4) { + addr = (struct sockaddr *) &dump->addr_v4; + addr_len = sizeof(dump->addr_v4); + } else { + addr = (struct sockaddr *) &dump->addr_v6; + addr_len = sizeof(dump->addr_v6); + } + + if (sendto(sock, dump->buf, BUF_SIZE, 0, addr, addr_len) < 0) + error(1, errno, "send data"); + + val = 0; + if (setsockopt(sock, SOL_UDP, UDP_CORK, &val, sizeof(val)) < 0) + error(1, errno, "setsockopt un-cork udp"); +} + +void run_test(int is_udp4_sock, int is_udp4_packet) +{ + int server_sock, client_sock, ret, val; + struct udp_dump *dump; + struct sockaddr *addr; + unsigned int addr_len; + + if (is_udp4_packet) { + addr = (struct sockaddr *) &addr_v4; + addr_len = sizeof(addr_v4); + } else { + addr = (struct sockaddr *) &addr_v6; + addr_len = sizeof(addr_v6); + } + + server_sock = udp_server(is_udp4_packet); + client_sock = create_corked_udp_client(is_udp4_sock); + + ret = sendto(client_sock, send_buf, sizeof(send_buf), 0, + addr, addr_len); + if (ret < 0) + error(1, errno, "send data"); + + dump = checkpoint(client_sock, is_udp4_sock); + close(client_sock); + + client_sock = create_corked_udp_client(is_udp4_sock); + restore(client_sock, dump, is_udp4_sock); + + val = 0; + setsockopt(client_sock, SOL_UDP, UDP_CORK, &val, sizeof(val)); + server_recv(server_sock); + + close(server_sock); + close(client_sock); +} + +void init(void) +{ + addr_v4.sin_family = AF_INET; + addr_v4.sin_port = htons(PORT); + addr_v4.sin_addr.s_addr = inet_addr("127.0.0.1"); + + addr_v6.sin6_family = AF_INET6; + addr_v6.sin6_port = htons(PORT); + inet_pton(AF_INET6, "::1", &addr_v6.sin6_addr); + + memset(send_buf, 'A', BUF_SIZE / 2); + memset(send_buf + BUF_SIZE / 2, 'B', BUF_SIZE - BUF_SIZE / 2); +} + +int main(void) +{ + init(); + fprintf(stderr, "Test udp4 socket\n"); + run_test(1, 1); + fprintf(stderr, "Test udp6 socket sending udp4 packet\n"); + run_test(0, 1); + fprintf(stderr, "Test udp6 socket sending udp6 packet\n"); + run_test(0, 0); + fprintf(stderr, "Ok\n"); + return 0; +}