From patchwork Fri Jun 16 19:34:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Roy X-Patchwork-Id: 13283233 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2AFD1B914 for ; Fri, 16 Jun 2023 19:34:40 +0000 (UTC) Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32BC51BDB for ; Fri, 16 Jun 2023 12:34:39 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1b512309d18so7440615ad.3 for ; Fri, 16 Jun 2023 12:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686944078; x=1689536078; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hCQ0oqZebt0f7w02ep0VGISdxy1EYqDBBDeVHsi8aZc=; b=NafbEdheF2Jl3IkyDMvQ16RvmFOkhfOwMhPp+EF4a2hqVHgGUXDPSLyCd8T6zhZ7pm SfrBcrtweDUHa1vBHHgEftw2vMayhcDhjB7WQ9y3vWfzzRwVxnQGzLZ/s9YYBHlIrKAt uvXbYn2OnixVdEQwbFKG7Nd5/UK3biYJEr6Po0OcsmOnrbS/yeQIWT5UkOtQ7fIcyKwY bDOXPOPAmWmXmQ7vsqTGzVBgqwEmui+qwGwv7vd8AL5ieZp5eIrGSJ1t5aFiZRCPbWTZ 4qCwCSRh+V8GfsapDJ1WoyCsDgbmL8GZw7tAco7lV9nQYgFdFR6Qu4CS9bLP6QLPrNcq 6M2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686944078; x=1689536078; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hCQ0oqZebt0f7w02ep0VGISdxy1EYqDBBDeVHsi8aZc=; b=aamSE66L2oA+btfIA7LeQG6uJnjo8spWlcJyn6MVbmtK3EG+gURTZdxjGU1IhB3qMd tJJnnM0tydaSjoTJdVNJi3HDUBhq/YFW5RlwHG63HI6u/maEokkRUBqunvz0oU9e7DDM MIPPBmvqYRVzXYwbgb1uVurnT0GWRNJc6qnZQPTkic5vtBFhOIcGl41bLSo36CtVHMz6 urLLiPD7oYTVAqqZDjLZNFOvEF4aWq81qlT6PuYZv4pRouglB0YbiVl/Ls4p1PyYcst6 7tB4RhG+ozBpmLY6HRsFjOrX/5HoQL99cnn351qLLsxnGnI+xMY54hJbDiDLiOuX8o5B JXXw== X-Gm-Message-State: AC+VfDxTzDzZLqGYxZZ9Js8ToEjBBEj0i//U9Mj5EoAGAopmQqhLAwCI omT4Dh7ie2whOwh7G8CrKmlhWnY2Obc= X-Google-Smtp-Source: ACHHUZ4H3z4L5ojkjpF+pepdCWhBtkAp4Lx17JLNH59rUbrhtMbC1SG3MPpojScFnWgEIWFEZFa5+g== X-Received: by 2002:a17:903:280e:b0:1b0:48e9:cddd with SMTP id kp14-20020a170903280e00b001b048e9cdddmr2124411plb.69.1686944077968; Fri, 16 Jun 2023 12:34:37 -0700 (PDT) Received: from phantasmagoria.svl.corp.google.com ([2620:15c:2c4:200:3a2f:3090:9c74:c638]) by smtp.gmail.com with ESMTPSA id q11-20020a170902a3cb00b001b077301a58sm7614912plb.79.2023.06.16.12.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jun 2023 12:34:37 -0700 (PDT) From: Arjun Roy To: netdev@vger.kernel.org Cc: arjunroy@google.com, edumazet@google.com, soheil@google.com, kuba@kernel.org, akpm@linux-foundation.org, dsahern@kernel.org, davem@davemloft.net, linux-mm@kvack.org, pabeni@redhat.com Subject: [net-next,v2] tcp: Use per-vma locking for receive zerocopy Date: Fri, 16 Jun 2023 12:34:27 -0700 Message-ID: <20230616193427.3908429-1-arjunroy.kdev@gmail.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org From: Arjun Roy Per-VMA locking allows us to lock a struct vm_area_struct without taking the process-wide mmap lock in read mode. Consider a process workload where the mmap lock is taken constantly in write mode. In this scenario, all zerocopy receives are periodically blocked during that period of time - though in principle, the memory ranges being used by TCP are not touched by the operations that need the mmap write lock. This results in performance degradation. Now consider another workload where the mmap lock is never taken in write mode, but there are many TCP connections using receive zerocopy that are concurrently receiving. These connections all take the mmap lock in read mode, but this does induce a lot of contention and atomic ops for this process-wide lock. This results in additional CPU overhead caused by contending on the cache line for this lock. However, with per-vma locking, both of these problems can be avoided. As a test, I ran an RPC-style request/response workload with 4KB payloads and receive zerocopy enabled, with 100 simultaneous TCP connections. I measured perf cycles within the find_tcp_vma/mmap_read_lock/mmap_read_unlock codepath, with and without per-vma locking enabled. When using process-wide mmap semaphore read locking, about 1% of measured perf cycles were within this path. With per-VMA locking, this value dropped to about 0.45%. Signed-off-by: Arjun Roy Reviewed-by: Eric Dumazet --- v2 change: Fixed linker error on builds without CONFIG_INET. --- MAINTAINERS | 1 + include/linux/net_mm.h | 17 ++++++++++++++++ include/net/tcp.h | 1 + mm/memory.c | 7 ++++--- net/ipv4/tcp.c | 45 ++++++++++++++++++++++++++++++++++-------- 5 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 include/linux/net_mm.h diff --git a/MAINTAINERS b/MAINTAINERS index c6fa6ed454f4..a7c495e3323b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14727,6 +14727,7 @@ NETWORKING [TCP] M: Eric Dumazet L: netdev@vger.kernel.org S: Maintained +F: include/linux/net_mm.h F: include/linux/tcp.h F: include/net/tcp.h F: include/trace/events/tcp.h diff --git a/include/linux/net_mm.h b/include/linux/net_mm.h new file mode 100644 index 000000000000..b298998bd5a0 --- /dev/null +++ b/include/linux/net_mm.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifdef CONFIG_MMU + +#ifdef CONFIG_INET +extern const struct vm_operations_struct tcp_vm_ops; +static inline bool vma_is_tcp(const struct vm_area_struct *vma) +{ + return vma->vm_ops == &tcp_vm_ops; +} +#else +static inline bool vma_is_tcp(const struct vm_area_struct *vma) +{ + return false; +} +#endif /* CONFIG_INET*/ + +#endif /* CONFIG_MMU */ diff --git a/include/net/tcp.h b/include/net/tcp.h index 5066e4586cf0..bfa5e27205ba 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -45,6 +45,7 @@ #include #include #include +#include extern struct inet_hashinfo tcp_hashinfo; diff --git a/mm/memory.c b/mm/memory.c index f69fbc251198..3e46b4d881dc 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -77,6 +77,7 @@ #include #include #include +#include #include @@ -5280,12 +5281,12 @@ struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm, if (!vma) goto inval; - /* Only anonymous vmas are supported for now */ - if (!vma_is_anonymous(vma)) + /* Only anonymous and tcp vmas are supported for now */ + if (!vma_is_anonymous(vma) && !vma_is_tcp(vma)) goto inval; /* find_mergeable_anon_vma uses adjacent vmas which are not locked */ - if (!vma->anon_vma) + if (!vma->anon_vma && !vma_is_tcp(vma)) goto inval; if (!vma_start_read(vma)) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8d20d9221238..6240d81476b8 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1877,7 +1877,7 @@ void tcp_update_recv_tstamps(struct sk_buff *skb, } #ifdef CONFIG_MMU -static const struct vm_operations_struct tcp_vm_ops = { +const struct vm_operations_struct tcp_vm_ops = { }; int tcp_mmap(struct file *file, struct socket *sock, @@ -2176,6 +2176,34 @@ static void tcp_zc_finalize_rx_tstamp(struct sock *sk, } } +static struct vm_area_struct *find_tcp_vma(struct mm_struct *mm, + unsigned long address, + bool *mmap_locked) +{ + struct vm_area_struct *vma = NULL; + +#ifdef CONFIG_PER_VMA_LOCK + vma = lock_vma_under_rcu(mm, address); +#endif + if (vma) { + if (!vma_is_tcp(vma)) { + vma_end_read(vma); + return NULL; + } + *mmap_locked = false; + return vma; + } + + mmap_read_lock(mm); + vma = vma_lookup(mm, address); + if (!vma || !vma_is_tcp(vma)) { + mmap_read_unlock(mm); + return NULL; + } + *mmap_locked = true; + return vma; +} + #define TCP_ZEROCOPY_PAGE_BATCH_SIZE 32 static int tcp_zerocopy_receive(struct sock *sk, struct tcp_zerocopy_receive *zc, @@ -2193,6 +2221,7 @@ static int tcp_zerocopy_receive(struct sock *sk, u32 seq = tp->copied_seq; u32 total_bytes_to_map; int inq = tcp_inq(sk); + bool mmap_locked; int ret; zc->copybuf_len = 0; @@ -2217,13 +2246,10 @@ static int tcp_zerocopy_receive(struct sock *sk, return 0; } - mmap_read_lock(current->mm); - - vma = vma_lookup(current->mm, address); - if (!vma || vma->vm_ops != &tcp_vm_ops) { - mmap_read_unlock(current->mm); + vma = find_tcp_vma(current->mm, address, &mmap_locked); + if (!vma) return -EINVAL; - } + vma_len = min_t(unsigned long, zc->length, vma->vm_end - address); avail_len = min_t(u32, vma_len, inq); total_bytes_to_map = avail_len & ~(PAGE_SIZE - 1); @@ -2297,7 +2323,10 @@ static int tcp_zerocopy_receive(struct sock *sk, zc, total_bytes_to_map); } out: - mmap_read_unlock(current->mm); + if (mmap_locked) + mmap_read_unlock(current->mm); + else + vma_end_read(vma); /* Try to copy straggler data. */ if (!ret) copylen = tcp_zc_handle_leftover(zc, sk, skb, &seq, copybuf_len, tss);