From patchwork Tue Jul 11 20:20:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13309351 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B8B8C001B0 for ; Tue, 11 Jul 2023 20:21:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1BFC68D0002; Tue, 11 Jul 2023 16:21:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 170168E0001; Tue, 11 Jul 2023 16:21:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 039078D0008; Tue, 11 Jul 2023 16:21:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E8A9D8D0002 for ; Tue, 11 Jul 2023 16:21:24 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BD1511A03E1 for ; Tue, 11 Jul 2023 20:21:24 +0000 (UTC) X-FDA: 81000450888.14.251F9EC Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 06CFB18001E for ; Tue, 11 Jul 2023 20:21:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=BzG7fNes; dmarc=none; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689106883; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5FN0HiT2a6i6oQBEDqgGmkCDTbMkD96qK8TmIcdDOvU=; b=PD6SVRDCuXntQj1Y5dguULSRfs6IT7bdiBeoWtd413aVcm9Cllyx5+ETrliD0lb+ypdAsH 9HZOKgVcxGFfoPHEw6PQRKYVCtqIogRwjnjrLsisEQZ7bci76ZbuncF08qVWpMmFMgRCwl F5IEnyTttf0Qwbf5uld1w2f79U5TXSM= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=BzG7fNes; dmarc=none; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689106883; a=rsa-sha256; cv=none; b=KlsU5fY5vdJIzgIkx+DuTJy9OkkTa8V3Ez5hm68eiNgyW1+L+dWrkiDL1BUmbuHgeyrewk 3JSUKU68BxXY0guZD6eRXCCgk524ZoQ8rPW+RqW888X/qiQq/k4Q/zSUlX4agHIfjOnOJV djw/khEcrM6IMx55A6nuOLGa5w9xrqc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5FN0HiT2a6i6oQBEDqgGmkCDTbMkD96qK8TmIcdDOvU=; b=BzG7fNesDSv9f5c/jHckIpGYxr 1AjjHU4Ah6jva8EK1Xcg1/biocRXvpql2nETap2r1zt63XApMDK8MNuoMrkEge7p433afITqveoC3 Lh9PyA4r1OYCcI8kixo3vPG870zrKJVBOEc45zm+IEQoWThCsGK0JCfwO5zglXVRuurCxIV49tMb6 tlkYbLY36M0L1CpBIWxZD89hARza9OQ7yNWvq3+9zcyasAmecs0SbqtEGsAY8bVkyE7Y/8n3U9YG8 hOj3abiKh2aB7siI996/oscxpg5i29HTOtetWXWuMHJK8XmiAJaslK8w9KiTK8fuihRlHUcdFaRBh GJRAiejQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qJJqr-00G1Q6-EC; Tue, 11 Jul 2023 20:20:49 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Arjun Roy , Eric Dumazet , Suren Baghdasaryan , linux-fsdevel@vger.kernel.org, Punit Agrawal Subject: [PATCH v2 1/9] Revert "tcp: Use per-vma locking for receive zerocopy" Date: Tue, 11 Jul 2023 21:20:39 +0100 Message-Id: <20230711202047.3818697-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230711202047.3818697-1-willy@infradead.org> References: <20230711202047.3818697-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 8zyxmbrp1rzmbepjghnpasusz7unqgeq X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 06CFB18001E X-HE-Tag: 1689106882-523944 X-HE-Meta: U2FsdGVkX18iGTSABpggNVIWWkFh6mMPldsGGa/8V3Qu+af4h///W8qAnil4iX+TS2XMOiy3wE76HahqFnvTz1HvPi+cyjns0J4Gv3Qx2bzZwMH772isa8B/xZnIAmiecpufiBB/fOPcIALdlMFFKCcdxXyBLCZhMM+Ji9jIj/UN8Q+LrWm0In6nRaGGXnXsyzx0milBOYtTOnywAi9iHvYHsS0R5DP1TLzjDRonUAnVFPQV030hgpFRnOK6z+o5lu0YI/cjIztE8KGXSRpvCrwwn8wemlpfx4MYfQJNNCsAKsAUnbXtYAcS184mU89U9WnpLGn0fVLIGzA0wwv0xaA5IkGFQHw+bwGUs3U8k9jc3IzSEl5ejEHZwyIDsx8JNwVf9A+FkWGwrq1jOd+bLlMC8mBP83GQ4Y5PHYY96w99m1WVa0cUw2niLy1PwIxG5+paNDvy2Qy//odin4KSZZMa6h70L240AGSHqViKcWJxlOQNY07nQrsa5Gpf1jTgekPEMu/hPWtcclFuiLB/sH4qbX+9YjJZG/O0V6x92cDB75SkyO96jhj0PzhR5HJcCxbsDgN+PvmqrrDKzw58YVFq4qs56tx7yR7P56zwCCLY//YCEfvIF4Vjx7CIAwVTiLFOwmVXBsuJ0lG3f9EWGpuGxQ5qY7xbXZ05zuafifZRJlbhkYANK8lPlIA43E5WnIvNaELJF4sKfE7JYrhPGLcYHvgTZOpwgIyAQgoh2sXklZycsEygPnBLt2kXa1YCwUAjs9hI6/s8XByUfNht/KafQ9zgaMy60uqJuQ92ZD8GUFmjjBCXgwykzGQ9DwzDjvInzeRETS3oat4OxCBXjhYrS+2mRw/pCJax0QtUBtobxOT3bhokLpKquMEVJewEKJuDxHGJPWsfRJNX1VeLUkWorc+FJ1JU6YUcX9cQpDmBOFptdrtlVOJ/nMoEKKHF603Y5fqs8TvK6GXBY1i 5WxKHOX0 rS7v8by8td07SGnsPPdZoWZrG2jZwUFZpYs7wxQlmii4m2L27Q2N43SBcexHfJby33WECcdajj5m5NzHIQS6xPJG/DaTun041ZHT5HYZcOEeBtpSMkGyV1Ml8V//gnGAyZVp1bt7aq7x2Vzz0vHdZvlcSmRLycnGyyvo5DP9onJAwJwXrIqi3Ll99GhLDIFuGHJi9WzbF2UESMjI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This reverts commit 7a7f094635349a7d0314364ad50bdeb770b6df4f. Reviewed-by: Suren Baghdasaryan --- 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, 11 insertions(+), 60 deletions(-) delete mode 100644 include/linux/net_mm.h diff --git a/MAINTAINERS b/MAINTAINERS index 18cd0ce2c7d2..00047800cff1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14816,7 +14816,6 @@ 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 deleted file mode 100644 index b298998bd5a0..000000000000 --- a/include/linux/net_mm.h +++ /dev/null @@ -1,17 +0,0 @@ -/* 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 226bce6d1e8c..95e4507febed 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -45,7 +45,6 @@ #include #include #include -#include extern struct inet_hashinfo tcp_hashinfo; diff --git a/mm/memory.c b/mm/memory.c index 0a265ac6246e..2c7967632866 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -77,7 +77,6 @@ #include #include #include -#include #include @@ -5419,12 +5418,12 @@ struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm, if (!vma) goto inval; - /* Only anonymous and tcp vmas are supported for now */ - if (!vma_is_anonymous(vma) && !vma_is_tcp(vma)) + /* Only anonymous vmas are supported for now */ + if (!vma_is_anonymous(vma)) goto inval; /* find_mergeable_anon_vma uses adjacent vmas which are not locked */ - if (!vma->anon_vma && !vma_is_tcp(vma)) + if (!vma->anon_vma) goto inval; if (!vma_start_read(vma)) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e03e08745308..1542de3f66f7 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1739,7 +1739,7 @@ void tcp_update_recv_tstamps(struct sk_buff *skb, } #ifdef CONFIG_MMU -const struct vm_operations_struct tcp_vm_ops = { +static const struct vm_operations_struct tcp_vm_ops = { }; int tcp_mmap(struct file *file, struct socket *sock, @@ -2038,34 +2038,6 @@ 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, @@ -2083,7 +2055,6 @@ 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; @@ -2108,10 +2079,13 @@ static int tcp_zerocopy_receive(struct sock *sk, return 0; } - vma = find_tcp_vma(current->mm, address, &mmap_locked); - if (!vma) - return -EINVAL; + mmap_read_lock(current->mm); + vma = vma_lookup(current->mm, address); + if (!vma || vma->vm_ops != &tcp_vm_ops) { + mmap_read_unlock(current->mm); + 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); @@ -2185,10 +2159,7 @@ static int tcp_zerocopy_receive(struct sock *sk, zc, total_bytes_to_map); } out: - if (mmap_locked) - mmap_read_unlock(current->mm); - else - vma_end_read(vma); + mmap_read_unlock(current->mm); /* Try to copy straggler data. */ if (!ret) copylen = tcp_zc_handle_leftover(zc, sk, skb, &seq, copybuf_len, tss);