From patchwork Fri May 21 17:48:03 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: 12273509 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, URIBL_BLOCKED,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 0EC67C4707D for ; Fri, 21 May 2021 17:48:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AEE56613B6 for ; Fri, 21 May 2021 17:48:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AEE56613B6 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 06A9B94002C; Fri, 21 May 2021 13:48:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5FDE5940032; Fri, 21 May 2021 13:48:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96E3A94002C; Fri, 21 May 2021 13:48:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0044.hostedemail.com [216.40.44.44]) by kanga.kvack.org (Postfix) with ESMTP id 2AFA7940030 for ; Fri, 21 May 2021 13:48:08 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C80EB8248068 for ; Fri, 21 May 2021 17:48:07 +0000 (UTC) X-FDA: 78165971814.21.BF61C47 Received: from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by imf03.hostedemail.com (Postfix) with ESMTP id AC645C0042DF for ; Fri, 21 May 2021 17:48:04 +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 14LHUivM083360; Fri, 21 May 2021 17:48:06 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=fIRcoajTFMiabKZ8RzY9HcQHD9zt2KiAxqTFQo5plv4=; b=w1jNNWnVu2RlzqWuiRoXKhet8Jp5KOFhiJ+P6IqmflUY671Deh3cCwiI/ue43ZtAgRHc Z0FiWpgEoHWPqS9q70sr7Et1Dhz2oj33yXdiJxx7Y/euNaq0NmQNjzqUOTvGfog2C8yX aaXKB0IFGYRq8j76uoaeCwMSEs20eTvnEkGGR41h2z3D4xwxWcSFAo/eQWn4/gM3IjJr kzxnTeI6TCyGHS6FqMFKnhmlDnwBIHng//wzY8lOzhyrnufk0YSgp6euTB1+5JsB0TaG iadWwUs/wGFscB4edJf1CUNYRAFO7gKqnjilYi7QwO5MWo52Gd5+RZwRu38WgL8PxGDt 8A== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2130.oracle.com with ESMTP id 38j3tbrf2n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 May 2021 17:48:06 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14LHk0ra189475; Fri, 21 May 2021 17:48:05 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2043.outbound.protection.outlook.com [104.47.57.43]) by userp3020.oracle.com with ESMTP id 38n4930cwe-12 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 May 2021 17:48:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b2CdcXQ0vrBOg/ZLSuDifhCs2rD0iJZ5DksYGyVZY/0qjZTxMDM0njU2gD/4OuT5NQ5b5qjpQYENTJPMyuNap3Y/qyuLql79hW6pH3UujuqylP+YuehMIJdDHV7H1B8PbG8d0kz7R6hRWfBNZaRUQ5fY8xhacRr2R4Q8GIxCzS7eP7+CoPP18s1Ujk/65v+qVW4dK4foHRwUlYXAgffF00Q2hS+y+TvIvYS0vaFW3sm/i8jTjWp4/4lqS7vLDoPEQQXSW4qBA+Xm2KiVbYeE2vrfKM4O7rf9GQZEIftRgC8CCZXsKkMXpi8AfLnYDLotZWJCBYxHodRAV1fTogYRVA== 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=fIRcoajTFMiabKZ8RzY9HcQHD9zt2KiAxqTFQo5plv4=; b=oCkfZzPkbEiiG8ITJwlSjm4ggGPUbD+GnIVnOQ+/MjrbrVE5DTzyxPu7cK/IRQUs3iq9+V1KDx20rbV+7AkbYz2pWzEHUBTspf5hCIseIPsbaltuyZrHtFnKoRTw9s4xFqZUIkZIAMX1BPWofcqqs5DqLrz10fg6y4wadG2ds+GX9mMfsFnvRnXhlQ748szifJG+tEQrJBmf+SYlqrtXKBJBAC/qJ5KcNkuRrFXZE3AfbEA7efCwxZitJuJSZreHHnDdufOJX13oqrgYZHdEdIOqbpIqwSdhFf+JxOeDxc9B/gvdJlL7cwQ23+S/tKxQQwc4ckJkzocOSAroApIDwg== 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=fIRcoajTFMiabKZ8RzY9HcQHD9zt2KiAxqTFQo5plv4=; b=xq/fS8qyYG6ZfPfkc3tsyidA6Fap0fcR1qP5Rn0E3r6vx9kHnOECksCFyJ6xf/qmQKQUZeZA56ymABJh61CByCiQahScwqdY630xGIqBn9tAWO0upy3MG00OGFRn77OnYWc9E9E+JfaBl7ECXi8nxt20NaiBgDfkSn9COyE6Eyo= Received: from MWHPR10MB1582.namprd10.prod.outlook.com (2603:10b6:300:22::8) by CO1PR10MB4467.namprd10.prod.outlook.com (2603:10b6:303:90::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23; Fri, 21 May 2021 17:48:03 +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.4150.023; Fri, 21 May 2021 17:48:03 +0000 From: Liam Howlett To: Andrew Morton , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" CC: Geert Uytterhoeven , Laurent Dufour , Davidlohr Bueso , Liam Howlett Subject: [PATCH v2 12/22] net/ipv5/tcp: Use vma_lookup() in tcp_zerocopy_receive() Thread-Topic: [PATCH v2 12/22] net/ipv5/tcp: Use vma_lookup() in tcp_zerocopy_receive() Thread-Index: AQHXTmlyDt7SC7vGkE6pf511w4R8Yg== Date: Fri, 21 May 2021 17:48:03 +0000 Message-ID: <20210521174745.2219620-13-Liam.Howlett@Oracle.com> References: <20210521174745.2219620-1-Liam.Howlett@Oracle.com> In-Reply-To: <20210521174745.2219620-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: bd7d0fa7-1ff8-4670-2e47-08d91c809516 x-ms-traffictypediagnostic: CO1PR10MB4467: 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: DYYL/51e96dZp8fS5dfjUcVNhQAvwB0xsXkLYRLhHXhDihWVD3itrvx7MiQfuDl9MHDmeDWHQeeU7V5jvNP0Kqxq5MtBasQm0RejToS8B/gZBrLFcCWKZ/WEGQQBgreg3T2XBm6euX/Pgb4robrW5yV2tYb3csCQP/0J4FwCgrlzjZvWPb64BaT5dqffAfIP1ko9wOu6vSBhsJLsfe3/9bVBCRxwIdtJlPvUW5hsRPUnPNmO673DbXnqyMXNzrB5sEdayG/NT22jcVADd/peDLFg/QmWFwTLvYdJWB12RDcwnOQPriL5BFNRRNg+JA1geDHOT+iHzKzd3h58bz9C0bTE/4OjURy3YIi7QRdu7iWHJBAyYdRCeRUhN2YKuHwpExR4RXL2Pnt25zYBA1gwx2G4HqHu+0EHdFssFJrgX6biGuCxrh2g92JgTzVOQw3N6f05FEJz/v7dw2uUiuqQQQetXPfMqhV3+aBk6hcPOVdHWj/0KQHrmuplkuzR2+x4gEYA17Ix6mGdMjgF3K0UWMFRA1ratAtqN8l9kAiJZum25O7/JnamPnLdg/+g3NWmaaMQXiVaAKjq4q27CqrAWgZe7C5wf7KYsbTyNuhojpI= 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)(376002)(396003)(366004)(39860400002)(136003)(6512007)(26005)(44832011)(71200400001)(107886003)(76116006)(91956017)(122000001)(86362001)(8936002)(66446008)(66556008)(6486002)(64756008)(2616005)(5660300002)(8676002)(36756003)(186003)(4326008)(66476007)(66946007)(478600001)(1076003)(54906003)(2906002)(110136005)(38100700002)(4744005)(316002)(83380400001)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?M+FUwI49zwqzsWhd9bpUpFHa1?= =?iso-8859-1?q?mU56e4zWC63+uxpTLioIh5JMdJiCMV/UhLnAZKKMhWz4GwhuHWFynAmuZTI6?= =?iso-8859-1?q?YzXis5TH1oBcHp+EXYj/w9VHKIlvoFNgEttp/zsScWIe2lfKvUhkL9ibqL0Y?= =?iso-8859-1?q?aOR4oK7Rly8C14Ayzo6h5sEIaioil8rD7lNEjrokui7wTXR7n1tzEW2Xltlm?= =?iso-8859-1?q?rapD4TaAOWqbV9BQJucOd6ofuBQ5dYXJog2Y02iBAxfNXOEEqgNT0fWkoRMi?= =?iso-8859-1?q?oQLyFLDmmCCEL0gvkOV2m8NK3m7Uddtdn679K46JuTHxMlvtdC8yvr4xAIoz?= =?iso-8859-1?q?nBldrUCrD7sIKZYzitssK8sBMt3FA09NOU6RSKkYMsNcOz26kHNri/BNviQq?= =?iso-8859-1?q?ulNkh1Y5t5zv4znhJaxrALQOc8/ENgKrHap6YyvfXljrZBN6eSMupSsfO4fk?= =?iso-8859-1?q?oNMjNdBy17zH2v+0dVcCA+jIKhThsILs3OmvgJ4DhAB5AsQWVQnd2FoTTT5x?= =?iso-8859-1?q?zgxjhmKXxeEM4ZhbM+cw5BvDiJ2ezDBqwwbfC40AxwN64uPiDtgLu9ZoFwVH?= =?iso-8859-1?q?4G6aqbuGWeEKXeOrDagveoYM4t0IaWyDjH7kuhEv/HewlewJmh2LxW+2kP+y?= =?iso-8859-1?q?q5p5fKSbyIfZ3dQDjsUkHsztCHUHxxUowA8ew0TUU2Q0/2fE0Kn8CLs/2jea?= =?iso-8859-1?q?H1+QeEKlJftby3jxECubmIpmC5RZARJ7bXwMDgJTj+HJOsAnI6F/TLJLnHhD?= =?iso-8859-1?q?DBCUR/ESZBqY6GGKDYpgCE6qoIlTjpYkqKcZjvDKNx6FGAHXT7Dv/PuI2lwi?= =?iso-8859-1?q?Bqc2HoM7YYNPOS69EquV/ExEk/QmPlb2pApVSVNDgAXa4Q3LmWtsI1GL01N6?= =?iso-8859-1?q?4CFTWsqSjVTBhODKcqyygfQEpXjxMLhwD/LniLbxw8RAjp6toq7EVHalseVI?= =?iso-8859-1?q?OS/3yVGdWjK4d7svrqf+/dUnKjPz9zuo7eQe9EV5tFqee6d+Aql75Ga3dPAz?= =?iso-8859-1?q?LymUH3HtNXlFBWV0wLWd33LBq0YuLVYUY1m8U9AmgvaX6nIQxr2uBkJ/sPvV?= =?iso-8859-1?q?3T5/6n2HdQdavH3qH0VswG171j0RVKJcxnQiDqefkxd6zZK3EKOxepQXxFXb?= =?iso-8859-1?q?+oWOjQJeCsKgr+IYzXjYelHPUFTTBZ01N6nMZ3BzlhrdapRD6P7pNYb0wNue?= =?iso-8859-1?q?BAni5gAlh6sOYAqqv+6+aaRViONDpPoozBt5OPl32mx+nynOjzL5IYExEr8n?= =?iso-8859-1?q?IQu+BIQfyAAtrnTHv8cBVAkcSWZ0HCsMXz7IORkBuIXOlGYjoX4EyhloN0z2?= =?iso-8859-1?q?e8du+KF8X5fGC5XCHFvXOdNzto5f9Bw3KvdS6TkttQVCyYw15TgAkk3gEOR?= 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: bd7d0fa7-1ff8-4670-2e47-08d91c809516 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 May 2021 17:48:03.1246 (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: D7m2dITF/Fw3OA4M+3u0wklaH5zeA3Zjk1a0e1kY/azLtqwqpW+p0l3SSV6RXFfd+4F/SRrax7+6Jso1Qo6v0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4467 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9991 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105210093 X-Proofpoint-ORIG-GUID: UYhckXECVaRgxlXFYmeL43bh9aSKL-nS X-Proofpoint-GUID: UYhckXECVaRgxlXFYmeL43bh9aSKL-nS X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9991 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 malwarescore=0 spamscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 mlxscore=0 impostorscore=0 adultscore=0 clxscore=1015 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105210092 X-Rspamd-Queue-Id: AC645C0042DF Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2020-01-29 header.b=w1jNNWnV; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="xq/fS8qy"; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf03.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-Rspamd-Server: rspam03 X-Stat-Signature: czkhbn9ndeh9r3xgfdgzeohy3qba8358 X-HE-Tag: 1621619284-815739 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 Reviewed-by: Laurent Dufour Acked-by: David Hildenbrand Acked-by: Davidlohr Bueso --- 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; }