From patchwork Mon May 10 16:58:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12248825 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=-17.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,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 DA86CC433B4 for ; Mon, 10 May 2021 16:59:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6983B61481 for ; Mon, 10 May 2021 16:59:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6983B61481 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E8AE66B0072; Mon, 10 May 2021 12:59:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DCA7F6B0074; Mon, 10 May 2021 12:59:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42CCE8D0003; Mon, 10 May 2021 12:59:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id D28028E0001 for ; Mon, 10 May 2021 12:59:24 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 8604D8248D51 for ; Mon, 10 May 2021 16:59:24 +0000 (UTC) X-FDA: 78125932248.04.8E85714 Received: from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by imf07.hostedemail.com (Postfix) with ESMTP id DEE31A001A98 for ; Mon, 10 May 2021 16:59:20 +0000 (UTC) Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14AGsFo1173323; Mon, 10 May 2021 16:59:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2020-01-29; bh=OtOL2A/ZbTYZXiXqaF3a8Xytx+OAVd/DKSy1kuCLwSM=; b=iJriBxxaTWFZ+38j0bKhzVxVUFLXhRavBRh94wZpJQfYApt5ILobqjEjXQ9E8hhhbMS8 w6T6sOp5TrbTAtVa9vYZSjpYlNYeyk43f0G/RBfyuqPMTq7FHj1aND9olg3CHfFe/YNJ yj7Un6+3z3iG7/VRbAoztImIU3T/LpAlf816QeikSxe2w9ZnYUgFNXgu9dzLV5lZwnkU 7mE2MbRajQgdrQ2z17W2cH9jWht/CamN8kb9VhwHoYKsUaTceDFZPLgtRrJJ6sY59tbP BMtSwLMmHab11nGBtcPYlghM19fw63M6WcoeVxF8vy4ReBEo2MMkzs/u6hSidONhPZgS vg== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 38dg5bc2gd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 May 2021 16:59:02 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14AGtfFh036499; Mon, 10 May 2021 16:59:01 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by userp3030.oracle.com with ESMTP id 38dfrvs50x-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 May 2021 16:59:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g+ptwm4Ju8PwkkMIHlVouq+7ezyicRizwweHUma8+fmapAN5jdFZZ8Ot6SGZq9pLR3qnGmYb++i/gkjSHZ9+SCrsBLjUyD8WClm/wVX3VMBBhPzoklkd/EJPiZ1zRzvYjPZfKGyNbSgV4nXoTAuXKQ4oN7T4810uPPBSrULBSUuZq9H/wB4En9s9Mg/XBlJjnKycYFB191Yoyn+08/O+XFG5L7dFq/4eZZm++AY0bwKbo1SPXNuRRrP/G7YRJpFwvfKqWPsQzK0uxsxElD2wbU9tXuQyanDePZ2DaLQ4+BIfgbJZJP1KvCMO6BcwiCWN4Y0EuHtf8vWShbFQNV4aKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OtOL2A/ZbTYZXiXqaF3a8Xytx+OAVd/DKSy1kuCLwSM=; b=nP2rxbzrBQKTs6nkH/ApvJlaZd4JRPmORwYdTCxEExd9Bboqz53oFTJSA5vywUBW2IHt3cDha+65DtmVTxwiPgx1X774/EvkullyLiRZFE/50Aav9cK2UQwAJZjsi55OYJYdaiImeVVhOUGmnGyzMnCPAKkGv6vS4ZWQsgV/XvStm21VJGDMfAo1uhhZY55LIIdt++SFXm6MdOE/MOghS3jJOmHsZCIGoo4W09sZSb7TujqhDuTYqgvP+ToWwngxdObkMuHnHbEza9avKlIGnrFo+txCwmhDfHAf9/HKdGRrLAC032kDa4dK0FCUNy8JO60LaWNH9PE5sRNNgVUhcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OtOL2A/ZbTYZXiXqaF3a8Xytx+OAVd/DKSy1kuCLwSM=; b=n089OKwdlw4zzyTO7HbaUBlKP5+r726eG6/sYWQDDTiqeS/qdhBx2mF6cv1EQupXeKV73JpZ3ysKt3fqTTzjgEvnlZLMaCUbdX2usrY/bv9vQBLCsjvtQaBQXpda/CzYjE216WXfYWd46X+J6sV98EzloIKfTKgEkea8v0/9xkI= Received: from MWHPR10MB1582.namprd10.prod.outlook.com (2603:10b6:300:22::8) by CO1PR10MB4769.namprd10.prod.outlook.com (2603:10b6:303:94::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:58:54 +0000 Received: from MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::353a:1802:6e91:1811]) by MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::353a:1802:6e91:1811%8]) with mapi id 15.20.4108.031; Mon, 10 May 2021 16:58:54 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Song Liu , Davidlohr Bueso , "Paul E . McKenney" , Matthew Wilcox , Laurent Dufour , David Rientjes , Axel Rasmussen , Suren Baghdasaryan , Vlastimil Babka , Rik van Riel , Peter Zijlstra , Michel Lespinasse , Liam Howlett Subject: [PATCH 12/22] net/ipv5/tcp: Use vma_lookup() in tcp_zerocopy_receive() Thread-Topic: [PATCH 12/22] net/ipv5/tcp: Use vma_lookup() in tcp_zerocopy_receive() Thread-Index: AQHXRb3C8AW4MeSLNEeR8Dl/1JhMVg== Date: Mon, 10 May 2021 16:58:54 +0000 Message-ID: <20210510165839.2692974-13-Liam.Howlett@Oracle.com> References: <20210510165839.2692974-1-Liam.Howlett@Oracle.com> In-Reply-To: <20210510165839.2692974-1-Liam.Howlett@Oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.30.2 x-originating-ip: [23.233.25.87] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 980c1640-4a6a-4df4-d603-08d913d4e4fc x-ms-traffictypediagnostic: CO1PR10MB4769: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4714; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wRx3+ebjuUWzhl+Aumwr66xBKTG8znGxiCoQbF4zm6Y7twwrgPvDKcSZ8BnkJ29tohpyYlwPvIzSVCOl+sSlRlu9cq0AMCmQtSW2rua8DDbrB+1oyejQvvfuokX9y865a/AciKvMxiE9vlBfb+/9H7IcmaHaWa9M7C6HQS0nq8/YQcq300a8eT5fsOD1Y4kr3NpsopBD0RJuIrg7csZ+75fjH9302+PLoKVbysZUmz+mBZnphBp4uSVdI1dAQ7B7f0a7wpjPhl/wKnBoM79MVmjDs9/l6BgmgaU94CR+lWXO+sDTsT3H3tBaR2Ha2YatqxbtFfAWfroffcZVTwjBDja96T6oBNWX7YJhAmAqEiBaozyZ1i87pwS60gtn49YqrNygmUbwFv0AL+MVFZlnOC3ecu8wSp7Jaw0dFl6+JUB+N/CiTwmX3A2scRBsldDBH54r7rMacZYlHOLM3CDWk0IuLqeKkGsgrzm7hN1Mp0kdRh7wx/pK9gH8p57k7eKOC8m5hhRvbNyP9Bt1a8hCeEkL6hGQST5rcy25j5rmUFJOtW/ONcFflLxvqSbLvjdz8NTJwaUIzXRMt3FE4j4eg64JQDqBsRTXHeTKr0QtmLo= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR10MB1582.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(396003)(136003)(376002)(366004)(39860400002)(7416002)(66476007)(64756008)(1076003)(110136005)(478600001)(38100700002)(122000001)(54906003)(6512007)(186003)(2616005)(107886003)(36756003)(66946007)(66446008)(86362001)(66556008)(4326008)(76116006)(71200400001)(6486002)(83380400001)(4744005)(6506007)(8676002)(2906002)(316002)(26005)(8936002)(5660300002)(44832011)(91956017);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?xUy4yqr6p4DTGKT3J3U+pvm4I?= =?iso-8859-1?q?b7BXBW7ebuZA94nPmHwBZKWNc5UoFI/kRWAS5B7Pg7VlSOD2r3qYyYIG4PhI?= =?iso-8859-1?q?1m/W8QMI2zX8jvhMM+tAMn2p2+V8PpLXya9D52B2Gp/luJ/HwwCofYkkM9v1?= =?iso-8859-1?q?whAEwavCfPTrNnxkWMzXEZYVUL1+yPTxu70RHozR++tE4R08YHDmluz6V2Sn?= =?iso-8859-1?q?XQ9237+CxckYrMOnoSgILEH1VT3DjUsj1FzdEx4MfnfDLXxmt3HqCDC15g/D?= =?iso-8859-1?q?NMVAx2QwY04ut3yYDy3ieUwraDOO48uE32HjDHEiz5BqhqbQHnFa3MM9H48a?= =?iso-8859-1?q?qsARajW8rNXg0tcrEvB/bGb+fvyzpAMNwykkKfulS8BU3HUWQaORgjcWAHLJ?= =?iso-8859-1?q?S8zO8n2XsUPGGi1wqMVSjjO4ysZ27HCPRb08gMll2FSFRe6PWiTUVGTCpZoj?= =?iso-8859-1?q?utgjbCpWp4YupB6w8rokntxJElKtqBH6umiMNZ2jlcqtCkPhSReBgbfV+jwF?= =?iso-8859-1?q?XefVT+bDYBB5ArUIDd9FnGx6xIImzezbNmIqdK8+VIfSL5nkKDVM3XiB3PBi?= =?iso-8859-1?q?EmAco4hJa6NLPR+zd1RSialTYd2UXR66ygPQFUMaqMfk3OxUlqTKOs+XND21?= =?iso-8859-1?q?3FhI23mg8TTr+pN+iY9a6tAFkcfZzoK+L/53RKsDHQNHHjJ6uj/5HrKVDt8l?= =?iso-8859-1?q?9MXy5HZcjcCWDucFSFGX289O6l6lSyx3mR6rJ5kvne6dl4Fc2InuQ/Ul1onP?= =?iso-8859-1?q?oeUNWQgE2zITIeo7XGFYmQRtIKMF10ILHSU04jrvCGBVWrxEyL+gMkufEJVI?= =?iso-8859-1?q?cnwE8KXcZtf5wltYTfUYAohOc8e+R38Jr6b40MrUwo70p+Jaha4s+6XgNyog?= =?iso-8859-1?q?D8tdWK9gu/mEFGWfdcqHiTnmULfK81MFLCrWWVTf9yM1W1vQLToLKWQtLs+x?= =?iso-8859-1?q?TDGVsAw5UgFNBLFGMj9IE7O+Rwvcf7QNEfVE/tNTOpXhmxwDoKr9RVfNDCFh?= =?iso-8859-1?q?ZE+Equ3NyWO3i7UVfRs5rlI6MHq6Y4PUukEHESruH4NSc04kJX6tw3UHdLxZ?= =?iso-8859-1?q?Iy/UK14e7vIxBGDUT3gwLQEpfwLCpjPfP5qkV54piIGWg+H3Xv63TJ3BOUyF?= =?iso-8859-1?q?1d6eG+UXQKrC2hBK56yOI45nQVuY11zqiBZB9KGuO34N2vxad+WIdb1zNo3z?= =?iso-8859-1?q?BSktAfD/E/vPJLvuy1MqkKt4iy1FgagNSyuuUf9fLbIQu0wtMQ1cO0NogP1n?= =?iso-8859-1?q?3k2qcIlGZq2KOGBgicoNnE17/xvxi+MQ90TjqNoQ7tFcBL1n88GeK2DS79yM?= =?iso-8859-1?q?sKK7OyeABEIxLdpseG6hFuoMhpP6ibCZA1/WAlSD4MgdQIqzMiyAO4w3Cb+?= MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR10MB1582.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 980c1640-4a6a-4df4-d603-08d913d4e4fc X-MS-Exchange-CrossTenant-originalarrivaltime: 10 May 2021 16:58:54.4056 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: flcktzwiNvxs8BxPfALoUFvpWRYYresg8rp269nwUiRPd3B1sq7RjIjXRDEW6D4J3Y91N3sXuGZNV+S9eLV4vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4769 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9980 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 adultscore=0 bulkscore=0 mlxscore=0 suspectscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105100114 X-Proofpoint-GUID: glkBaJr4nOtIH-TVvKG-kyjhArUvaTwj X-Proofpoint-ORIG-GUID: glkBaJr4nOtIH-TVvKG-kyjhArUvaTwj X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9980 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 spamscore=0 clxscore=1015 priorityscore=1501 adultscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 impostorscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105100114 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2020-01-29 header.b=iJriBxxa; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=n089OKwd; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf07.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 141.146.126.79) smtp.mailfrom=liam.howlett@oracle.com X-Stat-Signature: ahfqt9ggkzm7jcjbaw11q3sbdwnezj7u X-Rspamd-Queue-Id: DEE31A001A98 X-Rspamd-Server: rspam05 Received-SPF: none (oracle.com>: No applicable sender policy available) receiver=imf07; identity=mailfrom; envelope-from=""; helo=aserp2130.oracle.com; client-ip=141.146.126.79 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620665960-765977 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: Use vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated. Signed-off-by: Liam R. Howlett --- net/ipv4/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e14fd0c50c10..d4781a514012 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2094,8 +2094,8 @@ static int tcp_zerocopy_receive(struct sock *sk, mmap_read_lock(current->mm); - vma = find_vma(current->mm, address); - if (!vma || vma->vm_start > address || vma->vm_ops != &tcp_vm_ops) { + vma = vma_lookup(current->mm, address); + if (!vma || vma->vm_ops != &tcp_vm_ops) { mmap_read_unlock(current->mm); return -EINVAL; }