From patchwork Thu Apr 26 14:50:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 905114 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="AeMYtzSN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40X0Pd70fhz9ryr for ; Fri, 27 Apr 2018 00:51:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756608AbeDZOvP (ORCPT ); Thu, 26 Apr 2018 10:51:15 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34224 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756481AbeDZOvG (ORCPT ); Thu, 26 Apr 2018 10:51:06 -0400 Received: by mail-pf0-f193.google.com with SMTP id a14so8072623pfi.1 for ; Thu, 26 Apr 2018 07:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QrqVhQ8X+XDYoGAFMiMk5tKgDC6IfjR81fG2iZp9Gb8=; b=AeMYtzSNCzjxh6uY3K8vmRKejjZBmBrE3dxHrfUS11gWwckISB+DBfsPg7tX7mb/pW MgXUHqkrHYnGAzD2F2ILsPZbm+IRXfRHfbdse1tw+7AYlkWHH/DXnCmt3xz9nVxhB5KQ LsslvfUnWlfyVnHZ1Fn5YBzIhx7taMMK2WeIMwyTCI1D+/MmDfvbNYyYBvYRnbdGxF8O 9H2zsvsqOKhUK8LbA0QQgsDMeUfu/sqfcFuzrCa4agdtRCMS2aTI4+BzinvxIkuSu0bo yJaaYgxDWWmMPrKlaXKZBOtPFNgdz72jX4XgOOHbDqnYZHJQFwnMNufsN3zQ+0+6726R PrYA== 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:in-reply-to :references; bh=QrqVhQ8X+XDYoGAFMiMk5tKgDC6IfjR81fG2iZp9Gb8=; b=PRIQ3EMJaNbSfHfaWH4RsffcK5HZEtZien764gbqlsrmRwf/Dr+h1AyAqEroFyMSOB 2zOP+waEKubTL8SvVQ0eI65NVsWiXUtZ+8AiFXXmTXHv3fg54+rDWp8z5Ss0eObh7bCP PJOf7Riv2uWULxvtgVyz/yEToGYROtnM9YWkG6/wLVEePvP+5yr6kZbPZwF/iFoRh4q8 sn3xbMTWJ6if9hQtpBruB8a6AweX7VGV+eJhaq3gSWyU+MBpGDvDtKMLJZddO3KIzQ8+ zc2aYHXvnjplgKkzGv1LV5GLPXRvcnKUaIO8dSdmFKrtyEFelWsr/O5MfOCsrW20M2wN BPXg== X-Gm-Message-State: ALQs6tAFgol7Ghe6U+hNetFK2xHz/5/5Ft7dzZUywFNGWw4WAyMiS1Vx JRc59ieXomvp02R1897TxrUajg== X-Google-Smtp-Source: AIpwx4+J3wXQYIenfZvvg3Zq7AGRGtq6BZDAMQioNDIuerMHuQIjS7g9t2HeQ/IChCrUtioZBIzJLA== X-Received: by 10.99.7.86 with SMTP id 83mr12667848pgh.211.1524754265650; Thu, 26 Apr 2018 07:51:05 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:f5a:7eca:440a:3ead]) by smtp.gmail.com with ESMTPSA id w19sm6218790pgv.59.2018.04.26.07.51.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Apr 2018 07:51:04 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Andy Lutomirski , linux-kernel , linux-mm , Ka-Cheong Poon , Eric Dumazet , Eric Dumazet , Soheil Hassas Yeganeh Subject: [PATCH v3 net-next 2/2] selftests: net: tcp_mmap must use TCP_ZEROCOPY_RECEIVE Date: Thu, 26 Apr 2018 07:50:56 -0700 Message-Id: <20180426145056.220325-3-edumazet@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog In-Reply-To: <20180426145056.220325-1-edumazet@google.com> References: <20180426145056.220325-1-edumazet@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After prior kernel change, mmap() on TCP socket only reserves VMA. We have to use getsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) to perform the transfert of pages from skbs in TCP receive queue into such VMA. struct tcp_zerocopy_receive { __u64 address; /* in: address of mapping */ __u32 length; /* in/out: number of bytes to map/mapped */ __u32 recv_skip_hint; /* out: amount of bytes to skip */ }; After a successful getsockopt(...TCP_ZEROCOPY_RECEIVE...), @length contains number of bytes that were mapped, and @recv_skip_hint contains number of bytes that should be read using conventional read()/recv()/recvmsg() system calls, to skip a sequence of bytes that can not be mapped, because not properly page aligned. Signed-off-by: Eric Dumazet Cc: Andy Lutomirski Cc: Soheil Hassas Yeganeh Acked-by: Soheil Hassas Yeganeh --- tools/testing/selftests/net/tcp_mmap.c | 64 +++++++++++++++----------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/tools/testing/selftests/net/tcp_mmap.c b/tools/testing/selftests/net/tcp_mmap.c index dea342fe6f4e88b5709d2ac37b2fc9a2a320bf44..77f762780199ff1f69f9f6b3f18e72deddb69f5e 100644 --- a/tools/testing/selftests/net/tcp_mmap.c +++ b/tools/testing/selftests/net/tcp_mmap.c @@ -76,9 +76,10 @@ #include #include #include -#include #include #include +#include +#include #ifndef MSG_ZEROCOPY #define MSG_ZEROCOPY 0x4000000 @@ -134,11 +135,12 @@ void hash_zone(void *zone, unsigned int length) void *child_thread(void *arg) { unsigned long total_mmap = 0, total = 0; + struct tcp_zerocopy_receive zc; unsigned long delta_usec; int flags = MAP_SHARED; struct timeval t0, t1; char *buffer = NULL; - void *oaddr = NULL; + void *addr = NULL; double throughput; struct rusage ru; int lu, fd; @@ -153,41 +155,46 @@ void *child_thread(void *arg) perror("malloc"); goto error; } + if (zflg) { + addr = mmap(NULL, chunk_size, PROT_READ, flags, fd, 0); + if (addr == (void *)-1) + zflg = 0; + } while (1) { struct pollfd pfd = { .fd = fd, .events = POLLIN, }; int sub; poll(&pfd, 1, 10000); if (zflg) { - void *naddr; + socklen_t zc_len = sizeof(zc); + int res; - naddr = mmap(oaddr, chunk_size, PROT_READ, flags, fd, 0); - if (naddr == (void *)-1) { - if (errno == EAGAIN) { - /* That is if SO_RCVLOWAT is buggy */ - usleep(1000); - continue; - } - if (errno == EINVAL) { - flags = MAP_SHARED; - oaddr = NULL; - goto fallback; - } - if (errno != EIO) - perror("mmap()"); + zc.address = (__u64)addr; + zc.length = chunk_size; + zc.recv_skip_hint = 0; + res = getsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, + &zc, &zc_len); + if (res == -1) break; + + if (zc.length) { + assert(zc.length <= chunk_size); + total_mmap += zc.length; + if (xflg) + hash_zone(addr, zc.length); + total += zc.length; } - total_mmap += chunk_size; - if (xflg) - hash_zone(naddr, chunk_size); - total += chunk_size; - if (!keepflag) { - flags |= MAP_FIXED; - oaddr = naddr; + if (zc.recv_skip_hint) { + assert(zc.recv_skip_hint <= chunk_size); + lu = read(fd, buffer, zc.recv_skip_hint); + if (lu > 0) { + if (xflg) + hash_zone(buffer, lu); + total += lu; + } } continue; } -fallback: sub = 0; while (sub < chunk_size) { lu = read(fd, buffer + sub, chunk_size - sub); @@ -228,6 +235,8 @@ void *child_thread(void *arg) error: free(buffer); close(fd); + if (zflg) + munmap(addr, chunk_size); pthread_exit(0); } @@ -371,7 +380,8 @@ int main(int argc, char *argv[]) setup_sockaddr(cfg_family, host, &listenaddr); if (mss && - setsockopt(fdlisten, SOL_TCP, TCP_MAXSEG, &mss, sizeof(mss)) == -1) { + setsockopt(fdlisten, IPPROTO_TCP, TCP_MAXSEG, + &mss, sizeof(mss)) == -1) { perror("setsockopt TCP_MAXSEG"); exit(1); } @@ -402,7 +412,7 @@ int main(int argc, char *argv[]) setup_sockaddr(cfg_family, host, &addr); if (mss && - setsockopt(fd, SOL_TCP, TCP_MAXSEG, &mss, sizeof(mss)) == -1) { + setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, &mss, sizeof(mss)) == -1) { perror("setsockopt TCP_MAXSEG"); exit(1); }