From patchwork Mon May 10 16:58:53 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: 12248851 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 9BA23C43470 for ; Mon, 10 May 2021 16:59:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4AEDF611F0 for ; Mon, 10 May 2021 16:59:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AEDF611F0 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 321598E000F; Mon, 10 May 2021 12:59:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25C8C8E0007; Mon, 10 May 2021 12:59:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2F3E8E000F; Mon, 10 May 2021 12:59:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0049.hostedemail.com [216.40.44.49]) by kanga.kvack.org (Postfix) with ESMTP id C1BB78E0007 for ; Mon, 10 May 2021 12:59:39 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3C2F7824934B for ; Mon, 10 May 2021 16:59:39 +0000 (UTC) X-FDA: 78125932878.20.2702601 Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by imf08.hostedemail.com (Postfix) with ESMTP id 8F730801A820 for ; Mon, 10 May 2021 16:59:11 +0000 (UTC) Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14AGs35R073825; Mon, 10 May 2021 16:59:01 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=R5YaIiOIPcogBMiRGu0ElTp5Suy1rDI5DigjpTd5UYI=; b=HsIsdan5e7md03oi4Y0Xf/0OTTDEN91N0TvAaK74JjO9vm0PEAiNe3Q8fqxrhU+1SF2j 5zsL978jjp/rXZCX0UdD3Q5WQA1oMB+ANoZgDVB98QSX2Zu7s2fugOQ11tdbeHJVSBe9 RCHBsSd+aJGKf487RaBE37pTZbgaqXHGvvTW3ybJlQ9lWH9D73PbVbuzUnsd2nkdzDIC cJbLvOIh0DSf/VuSOUcn6vQkTN+a9VazwK5WJxv1Eu47FyzXcmJi3l5Tc1/KequRf63t yUQSq7nIPf6J0ooKQPnuSN5K80+ynrg7TM74mT+BvGZjA9YNUxwf49E3i9QgkdCXa/ZH fw== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 38e285b77s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 May 2021 16:59:00 +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 14AGtfFg036499; Mon, 10 May 2021 16:59:00 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-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 May 2021 16:59:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UrnTqCsy91F+C/Nvgn8Cpf6UBH141L/qbOg8TpCVGyDYtXEjpd9iPwHZdR89/g+s5/dgU0skEnToDZpGxE5Dg6odi0dBiFoSW2S4a3caEqcmsBi677CjN2APoSb62kIBXII9en/YAt1xam4cnLkdfn7G+ZbfE0RHcXMJ4tsHe4GofQoJ+LzDAaFQoxbkPCvhqerFvf+wwQsK4cv9tm/gPRY4P8FJIhIXcU7a+BW/XQmWExBaDLDZmlQlpLr7D7S4lhPeZ+pewE+xylzdQj5PcnnM8guFURgRrTOGZK9sdrEteir5U5NSlhN3hU8Ly4n0affVbGGNraEL4VsQ9Mt5pA== 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=R5YaIiOIPcogBMiRGu0ElTp5Suy1rDI5DigjpTd5UYI=; b=kZWQ9mq6emEIw4roeT5WiVxLfZspzeymgtg0ykARNq6su0FTbyhV8+13SWhqm19qSaHvMiaooClvJyRB5Fc7GmMEXTVmeXOkJX7Vk/mkeQE+JPgHuLKkOoHhtHqsf6STSpWXKgp+jQ4ck1gvSGwSNFRdAPcW84xgMtdzlvhYZ0Qez/lux8lYKz8x7zRILmqtwGLivLucDldQtYZVqlRVPmYVtQymHu0/xnMdf6lm6KXA39iRbx7lBpEYgRgcWkqLF7Zt1MSgYLFGN4X9fupLngiGmQFVswLryzzKClW//uZ1f4tXTTf8WJCt27lezz/7KWefE6PR1g2oPdB2aX3W9g== 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=R5YaIiOIPcogBMiRGu0ElTp5Suy1rDI5DigjpTd5UYI=; b=HwKzMVZD03lMtKnFqDl0SnqUgyKaZ9dTEF1FpKNCJgF5QOYxWlxDG202wy/ribI7tyz7UffQzRqfoMKL8rk4FzfpgRDUPg8FCTnRCv1cHU2qGMvyPZ+BooFfS9QVKvlXmJdqVY1j9QvPesF+9oBmlUs6FOzUrNtXrM6nYMfJvg0= 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 11/22] vfio: Use vma_lookup() instead of find_vma_intersection() Thread-Topic: [PATCH 11/22] vfio: Use vma_lookup() instead of find_vma_intersection() Thread-Index: AQHXRb3C3iM8lSkalkiXrBF32J/82g== Date: Mon, 10 May 2021 16:58:53 +0000 Message-ID: <20210510165839.2692974-12-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: 323fba9e-95f3-4980-8adb-08d913d4e4ab x-ms-traffictypediagnostic: CO1PR10MB4769: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:883; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JYJVX9tX78x3lV1+fbqYQZiS6cBChtfRhnHTcKCIPdHEvea8AyqA7mGgSVuAI7OK4hjI9AfnZv9QEIZBdRo01PelphMVenEURgy12RDMhp3iVzVJuUwJe0hepojCIjaOPkKRECKvRsYq3hLmD+tAniG2sDRU0u0piRAAMU822Elwt0mDp4yzWvogW3nKbf7d4kR0HIPVFspZXBbaP/Eggd7jcwi2rcWq4yOlXuPgO2CxbnBV78aclHH00rUtmEfiFnUkhcQ6UP3tOybCKaklWh3kj9yyKa7D6hFn6RyivcRcNCYu5PNgFGWkH1MXldqd0tbZj0noH0P6j+HpoIggQxU7h8TqSySUJnDwdwhHtMxmO+WtCPDDlFt1KdUJJLLodXVoitxqjD2PzxURwUjeT1mluokZ6Hp01lDr9qij6zK8n6KvPopqHqIoTc38buOy1as90Z+hp4/xGeZJVnFzoIBFl9E95AZ7kiBJ75sylCzVZQV9xq6V6wuHcNDwb7tmCc+YAcUlXXDitpGI2LQJdR+7+jfHD1YHNbq+lap4Q6OCHng+bqILPZzKBSzktIa82NgtKg8PAWd7cVjVtZIotf4EM49DvpFQRkNK9IvX4w4= 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?zY88PmeZW8gUj4REQ25Bxk2Ha?= =?iso-8859-1?q?x0xuv6glrm34EMsz9iYIeFT/diSrZzMC3B0Y4nXcQ2xlYNmwD+lqj+IKiiRe?= =?iso-8859-1?q?oS2H4+4NQexLFq0a0MqrU7G4DtCG0PCzvvZ4+h2n5rP1AvUY5hFHafuT8RcC?= =?iso-8859-1?q?MUGdzLMrKf/4UjNsZ/TwA17L6eDskZ1AVQLLHjIsE74NbCyOPaEj9lETmvRo?= =?iso-8859-1?q?LAIiW1UGFmmpnlmuuasTij9Ns4oKgaBIIRX+oyreVGDqiA8D6P1kdMbrKeV4?= =?iso-8859-1?q?BSj+CBL6my7Lpm5kAEMYrbqQIK4oZ5BXuTTGUYBq/fiYP5G4fLDDX6GEm5pN?= =?iso-8859-1?q?Skh5aMYnZ1VIbboqdmmGKMONVfjqGlWHLUdwiK7WlqYQWw7slyByp2Ky+Cef?= =?iso-8859-1?q?1YvchWwgJwT2I7/e2FwXLT9ZrpKSf/4+f2X0bGseYtYw0YxXVKKc8/MQPfs0?= =?iso-8859-1?q?WZD//ditTslmFXvx5x6Fbqmr862KCEnE6IASlqBoS+YRSnx63F1EG9CEGIZp?= =?iso-8859-1?q?YflIs2isgw60o8x8j1p3yp8mp/Ok0f344obMT/zJw3hbVA87uuTVTSnX6o8P?= =?iso-8859-1?q?to+V2sfqrDxI1+2GX6Do2KvO0BGRkM3KcmAZjNW+oPnWsI66foGWn69nq0pZ?= =?iso-8859-1?q?Mb6jOq5zVgvB4f1KLoxyY3dLDDFBr47asinL6gNPIeWk+0V9N69wI6lOMBV+?= =?iso-8859-1?q?s9a4sNU5cMo1Grz9r+aaRmLQQyCV+MSp9xhSZJpriqZwfGVEAlckSsL/hBhR?= =?iso-8859-1?q?HQqBliv/TVuoaPHenj0Ju3Yij2aAaD3CNXb0OySyfBKVLzK9a10e8hx2xhDr?= =?iso-8859-1?q?R3f4AlGqJRZeUs/ynXH2k51i2BLQd0b7+cRdJPLfrlfyftTxqKdFrp/ZjnDo?= =?iso-8859-1?q?hU0CRKbx723AlGn0sZBY7Z5L2Gk8Gcb4lghhXC0INxfophQ+UR2wG3t028bQ?= =?iso-8859-1?q?TjQnK/e+B6afjFZ3mxdsbYAwLRLQdwnLKbf6YCNQZcSh7LBxBT28kGbbT4+/?= =?iso-8859-1?q?RL0M4KNdERflBUpNDOYiNW6OYOKAjwsl6i8CxWLyERutF7hWEwQ8gN+c7+6N?= =?iso-8859-1?q?MFtJs1kHKf11lnlpYv7/4aamB5K1zNbxcRpP74lLHWlaFHF7jHIZJQrFfUdN?= =?iso-8859-1?q?DXJOuwkp/qst6eNCoChuL24iE1XQrDZwfg762oZcF1YBNDpsd084u7YTJ7GK?= =?iso-8859-1?q?nN3hXQlFSNCdiVXIyrNyeLInJneBxOhNLu1Dm2U+9JjghIzQ+3l3gzS7rGZc?= =?iso-8859-1?q?X6WJWUPlYvmnGED087mCk9avOrwjTa/iw7N4qWK4W76QbrwvbuBFjxedHQms?= =?iso-8859-1?q?mwvz0/NidnoIC/144Ym/I4kTlyqD7C74tMQFFq9MaEUBXqZSpETWxin57O4?= 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: 323fba9e-95f3-4980-8adb-08d913d4e4ab X-MS-Exchange-CrossTenant-originalarrivaltime: 10 May 2021 16:58:53.8808 (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: z3F9YDc50ldHa5BEWHtJKXrNvojorqAkGb3kqAPTNJbc+UuAJFxD/isjnEQGh22AtllZIgUcycEUxsaS77662g== 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: xpbc4otmZ6TJ2wXVrlf8SvXKIQ3C6ulV X-Proofpoint-ORIG-GUID: xpbc4otmZ6TJ2wXVrlf8SvXKIQ3C6ulV X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9980 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105100114 Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2020-01-29 header.b=HsIsdan5; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=HwKzMVZD; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf08.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 156.151.31.86) smtp.mailfrom=liam.howlett@oracle.com X-Stat-Signature: 84weo3h8t75mwap4jp9wgzd5qsf1dxe8 X-Rspamd-Queue-Id: 8F730801A820 X-Rspamd-Server: rspam05 Received-SPF: none (oracle.com>: No applicable sender policy available) receiver=imf08; identity=mailfrom; envelope-from=""; helo=userp2130.oracle.com; client-ip=156.151.31.86 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620665951-67412 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: vma_lookup() finds the vma of a specific address with a cleaner interface and is more readable. Signed-off-by: Liam R. Howlett --- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index a0747c35a778..fb695bf0b1c4 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -567,7 +567,7 @@ static int vaddr_get_pfns(struct mm_struct *mm, unsigned long vaddr, vaddr = untagged_addr(vaddr); retry: - vma = find_vma_intersection(mm, vaddr, vaddr + 1); + vma = vma_lookup(mm, vaddr); if (vma && vma->vm_flags & VM_PFNMAP) { ret = follow_fault_pfn(vma, mm, vaddr, pfn, prot & IOMMU_WRITE);