From patchwork Fri May 21 17:47:58 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: 12273491 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 64132C4707A for ; Fri, 21 May 2021 17:48:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DAAEC613B6 for ; Fri, 21 May 2021 17:48:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DAAEC613B6 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 2E24F940027; Fri, 21 May 2021 13:48:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A7EA940028; Fri, 21 May 2021 13:48:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0371940027; Fri, 21 May 2021 13:48:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id A3712940025 for ; Fri, 21 May 2021 13:48:03 -0400 (EDT) Received: from smtpin39.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 42E551824A6FB for ; Fri, 21 May 2021 17:48:03 +0000 (UTC) X-FDA: 78165971646.39.4CFBF54 Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by imf02.hostedemail.com (Postfix) with ESMTP id 2AF7640B8CD3 for ; Fri, 21 May 2021 17:48:00 +0000 (UTC) Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14LHT4xB142881; Fri, 21 May 2021 17:48: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=qi437W/o5QflSbEaroiiEDMzr+VJhZPrZhpkRgfqNdg=; b=KEj0hMBIK2/yAwg/CSsJoc6goXDwHrXNq58ga0n+lY2iWwtb2DcEkTtCzz/v/2UED8jb 1zHWuRoCD7Ow/LRM44rrj4ows7AkDt2Sj5rQUjaoJ5mCQ7HhPA+FTKIAgY6wmwdVz/yT P5UOFZMb+93H2Z2L5PIwaiKW5m25L9fwaC+6cyLxCiNxxjccQGXPhltMzmhwnb6adyu+ minopHUCtCzhBGXt36HUDL1nLiBhGtHR3/RJY3JsR6rDvDIbCZpMVItaKMdU1t6XBci3 +thixi6gDWBHfVcnixjyZjzFPVA8WfI8lV9GziouVljiQAF29cLUHAOMGFP/lYW4o9IM nQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 38j68mratg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 May 2021 17:48:01 +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 14LHk0rS189475; Fri, 21 May 2021 17:48:00 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-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 May 2021 17:48:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YWMksOLSCPU++wt6dNb3JSZR2E0EDhxWdMkd4aCf0cgTsKs8llCOYozPasH6y/hlknGdKc+kXxd6kLWshvtxO6kTp2D7TEeO8ASYmFw9ipOGXkLYFHI+v4Fn0BaPVj5jkS3tzULXVVhIPlhcIkvlNl7go9tpBbRDelsLWgtdK0lpoj88pD4IlSf+V7hLeL3OyDq+O4qfWeWYIP7B0fdKQU7BI8EJPMD+dPz1zSF0MRBIjE3O7SIp9l/OR99VXagcBxNdihONxPEu4nDHt+yCUyRS+GyBiWm8XQVjxIoIC8xxRdIcLN78vROuhClAJBXEaqc8N9iuQi18gCArZXqOIA== 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=qi437W/o5QflSbEaroiiEDMzr+VJhZPrZhpkRgfqNdg=; b=aTRCxqb2qOtbviAUMzb+BVqm5qhKrUpYmYy1JIK7ALJ9O2H3tBsaz/095PIxuULAm8su/HfnVxdXs4DSG61d2sF2+Sx3a/Fk2yyKuOcTNMKCSah/77Q+jXQRniR/Lz9K7j8z3vRd6xEHQCm+OrgZh9HyhhWuiXkISyGQpbIe7OkGDQbpUUfEPxUybg4UZR2kf/kZvFuFLF+fAGPLJ0NkjnPs47aJBx4o10FpxAMmeUnmEIYfvUEYRKgqJGwfhlHz/AL8GsBlZQbfNmSMqlSHoW2m8bR11E8UxOp472rdbxzKAdSQgGgtdusxvUjxbMbEegXKDv5qfs4XVWOJq0tpTg== 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=qi437W/o5QflSbEaroiiEDMzr+VJhZPrZhpkRgfqNdg=; b=vnXcWVpU4XBWARhMD1U88kBtGwKtWZ5Lvsp4bUZNgSDT6bBrXcOFAEkjXq6NCXZ/uIZ6E4Z95SRYALjL3tJSrXDrIPjgk6aqCbE+FcWfxOpG9o0IJk8Vau7ePRWOn1bX+WWjguAy+pUENci0ETSufzs4Ma/OCFhBEEeBw+6jVyY= 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:47:58 +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:47:58 +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 04/22] arch/arm64/kvm: Use vma_lookup() instead of find_vma_intersection() Thread-Topic: [PATCH v2 04/22] arch/arm64/kvm: Use vma_lookup() instead of find_vma_intersection() Thread-Index: AQHXTmlvLXitcS3FrU6F1y8xQLuqxw== Date: Fri, 21 May 2021 17:47:58 +0000 Message-ID: <20210521174745.2219620-5-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: 9e1fdac4-8df8-454a-53fa-08d91c809276 x-ms-traffictypediagnostic: CO1PR10MB4467: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4502; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: EBAqKYO5aTsIUWAcp/KcL1q97AG2wjDcAYEfBFo/iHq40pqKfeJP5nBl14tqXlfRUnJlbYOUFiSQ/kzs5MyLo+1qWE2PVxANPV5cvMgU3cq95I/Jj441nTswQraYcHE+If3QVii00ShWuqKBQUMIURnZ9B0LAkcw27s+GTJkXoci/yOLM5W29ULWpMTgoDD0ui72GGtrEDZGOn3WrFm+j908LQULyEur8a1A0x/9mCmYZsSoDvvVWsPkJoJ3tgz/D84aVeHrJk5MltKK4EEa1E5Hn+WYQmv31fJevur+cKEwOe2chYKBEvkBMlm7meha0LPAhWv2BzoG6VtG3PD1UTscpZcp3LREciWcKQjUE1OZ7OZUvC5McPGMJYzPPVCi6pSmmSOsYjtKaRsKFbnl+/KsoWnoiqZeo0zslZJ17ptWh7D2yX5badNpEYf1Ec7Cq/bGHa8Yw3jBfLAv4Sny+ekCCYx33bU1Mpc5xXT7NJMugGxAdxSx7ZUZTUQe+RC3mpxu4hEI+Td1XyiBxKCDpD5jZdoc/913qHi7UTs0pN2AF+hDnPt9blvaShao4RXAHYf4CsfhEp0jcMy4rNRCw/EkmMLx0e8T2hAskNTW+oE= 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?GNMDlO/+BaROo0xVN6zq9WjMk?= =?iso-8859-1?q?ecX0s0MBxDjhMoIaTCHimL4qxn+h/ShEjnPqmYCYi22Eea0P8TgbjIiTcEFP?= =?iso-8859-1?q?DmoyCIzPVvDR/IDmHSOWTEuQPVyjnkSw8iJyyP027Dtix2zqtRE6VWX5SrVk?= =?iso-8859-1?q?lBhtNRoyAVFJ2xW0wWUxPM/5gGtkwcpyZcdnh6C3EfY5nOO1YSpxadF+CcJM?= =?iso-8859-1?q?1FncGyETbApwVS6B7XOBykJpFx6B8sQH2kxrMMcwN3j2qelof/TooahmO5oT?= =?iso-8859-1?q?c7eMatBHtxwoc7GgfVpDQjm8yLfBaM1NYTEUB7UrrzcIN79GNaIH5Km5kpeC?= =?iso-8859-1?q?15lA05Je/VPr7PFEbOFBdBx7mPwNzdbiO0wWr53xtEjeVWOiCATURxZjuZJI?= =?iso-8859-1?q?XMxa1y5Sqs/EjSEWMZ21PuvXOX1YAT3fm3pw8GObEef43QMCoX7L9Rq6pzmu?= =?iso-8859-1?q?2KboCY4u+8F13XEwWpFsyMr0WTd+cG4GnS3sJ4120hxk0AaN/Bv9UHtUHUSI?= =?iso-8859-1?q?G7z0cjbtU5GTrt3l87LiBGqcRohxUTeTD8w7B3n49ykg/d+otflQ3VsoT7Dg?= =?iso-8859-1?q?AnLFNP6jDYmvTh9ydXl/mfqto9jyyezjFtl1AA5Jdy+VHYEzbtnwZRol2EfM?= =?iso-8859-1?q?G8cMF1V0TFtXGISPCcG7ehFCOTsI91QPw9nINn275bJGOKKqEnh4K95pVq5l?= =?iso-8859-1?q?yuVw0sIkxHqoOQXya0/zjON4fVCIaHGolJU4EX0TZCs1Nks1qWJWwjQYs0u7?= =?iso-8859-1?q?W7Jtjil5qTPn9y+nje1s0ovnaIEPA1OhkEs6fv4TULaz/WO+LNbFfv40Ouiu?= =?iso-8859-1?q?yRyPiXdXCGniCSzrBP6TXsZh3mwfgR1R/aZNG4rqh4V5YPo4841YuoyqL6B2?= =?iso-8859-1?q?BlBpICgeeXWhAgrJEHhCwfcVdEgB2q6pgE24+Z64M1n4h33Q5mUTmELnSqzc?= =?iso-8859-1?q?KmjGA3wOcTH50UjdR1O6CrOSGvEV5/m44Mf35DohK6GJL9P8uvp2eHiT2FLn?= =?iso-8859-1?q?PFwbZqMCFd4tzRGdPCtQmGduy/H6aMbKlfhM3ERy7J0ZCVaAKyK46FdcvpiY?= =?iso-8859-1?q?uTDrJ+y424scxVamttfJZKuNBA0O/xkEoEJ5Br7padSiT/d2MTLdYPfmGgDL?= =?iso-8859-1?q?YOevdtj/YZySgXg2HiADRt8xoShar89I0ZMIXdcZDh5NJug1QulTB+q1mevT?= =?iso-8859-1?q?d7JtVZwDTZOo2Jeqjy6bhEw4+54EAalaRMEdIj1TYzvTIDpaYoxFr3U5arCk?= =?iso-8859-1?q?nzP6PACIcccZi8KQxABxXm44Mq9MAhTYrqvoGezZWhoyx6yXa/umnLxiHalk?= =?iso-8859-1?q?nAGMbI3/ZuND2VLxItLdxS34ACih4h5YXHf88pU2S+RSGYFjHvDGE3ClWcE?= 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: 9e1fdac4-8df8-454a-53fa-08d91c809276 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 May 2021 17:47:58.7106 (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: vXW78RKfkzIJAsOO5QHFDfRwi+CVVoljkAcCcieC2p5yWUhAwbx4jgP5Sgj7i4DhUiDy1zWitK9HcatTxQZWmA== 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: UOVTllcrUkbtTB18mTT2iUfXabLQxZo9 X-Proofpoint-GUID: UOVTllcrUkbtTB18mTT2iUfXabLQxZo9 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9991 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 suspectscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105210092 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2020-01-29 header.b=KEj0hMBI; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=vnXcWVpU; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf02.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 141.146.126.78) smtp.mailfrom=liam.howlett@oracle.com X-Stat-Signature: 4in14smgcoixakhqmm3tdffwd9di1hhh X-Rspamd-Queue-Id: 2AF7640B8CD3 X-Rspamd-Server: rspam02 X-HE-Tag: 1621619280-938990 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 Reviewed-by: Laurent Dufour Acked-by: David Hildenbrand Acked-by: Davidlohr Bueso --- arch/arm64/kvm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index c5d1f3c87dbd..8b112b594e09 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -855,7 +855,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, /* Let's check if we will get back a huge page backed by hugetlbfs */ mmap_read_lock(current->mm); - vma = find_vma_intersection(current->mm, hva, hva + 1); + vma = vma_lookup(current->mm, hva); if (unlikely(!vma)) { kvm_err("Failed to find VMA for hva 0x%lx\n", hva); mmap_read_unlock(current->mm);