From mboxrd@z Thu Jan 1 00:00:00 1970 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 80A1BC63708 for ; Wed, 7 Dec 2022 21:21:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E017E8E0003; Wed, 7 Dec 2022 16:21:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB0518E0001; Wed, 7 Dec 2022 16:21:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C51548E0003; Wed, 7 Dec 2022 16:21:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B4E368E0001 for ; Wed, 7 Dec 2022 16:21:27 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 741871C66C8 for ; Wed, 7 Dec 2022 21:21:27 +0000 (UTC) X-FDA: 80216781414.24.398570B Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2068.outbound.protection.outlook.com [40.107.100.68]) by imf27.hostedemail.com (Postfix) with ESMTP id D5E8940019 for ; Wed, 7 Dec 2022 21:21:26 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=s7ZOIrGT; spf=pass (imf27.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.100.68 as permitted sender) smtp.mailfrom=jhubbard@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1670448087; a=rsa-sha256; cv=pass; b=34Y+p8FmscrBOfk2T2A2OBxm/2vxWFMz2R62Bp3VhFEellcx1Y2+/7hPZpalyA0/Qesaef tmr25DNpb4fyafrVLyNAOvxFirpNZiTCjwReHxgm1emYufGtvmt1vml1F/MjwYbrbi5XV8 aVVvIxT9EHKddpu1p0WSnoTcFcoc2Hc= ARC-Authentication-Results: i=2; imf27.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=s7ZOIrGT; spf=pass (imf27.hostedemail.com: domain of jhubbard@nvidia.com designates 40.107.100.68 as permitted sender) smtp.mailfrom=jhubbard@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670448087; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gw6etKoKbhI5UOmQDWSnwQkbKmxcGeVEhUL6Kb78D4s=; b=as0QgATObs/CNRaaagJPSikvNLdlIDbrhbngqqllvzvstYWbWX8hfaQK1OfimRlsn90+BJ E2bvnL9tf6n7dR46gSnPDUIwG4tRe86UwaJAvLMkxZliNb8YhcVVx57oc+AT39MEq/gnd1 W7Jq2rBo30od07ZB2/kJolFm9eFxbi0= ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hC7RH9Hr4oJ4TQcf/MXy3OzURebrW80ta8mCSGCT2yRGL5U/V1S7hmO+AEA49yVavDdBOwUhWakkss7F449Cxvl58C0nWPTR/n6xyohuVDeF2h9GbPWHQyperiyChu/mM9lz/PJcd5Lcw92v51TpXlzPWejgibH3wFjeGO98Z3K/g8l7dqtr7CihlDlIQTDtObzGNRC7mh8ZXigVzDEd3A5+Cl4JITXWURXbTU6vo5sRdKD2oAm2ephnC2eELKEqpnzH9nFpHhAX1ZQKPR0i6FaCPqGsGC306y3PSRMx2QzCHBrh3v3f1wuwL1P4f9OcwWXaa1W8XNxeV0y192atDg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gw6etKoKbhI5UOmQDWSnwQkbKmxcGeVEhUL6Kb78D4s=; b=Emem0aYuj1CKrA+tB7IZNNgKlIGNW7QXcb0r7d+2PnYLX8/UPOpWELYlVySIC9qMmfBJB4DXhhjccYd5bZUYzaFXbJMW2GAycwFQIKCyLJkLxt/TSI1cg+3sotWbUuqED3ymNqpLsDbCQ4dlZiiawSGP4vwtrG3NjVn0EQFOEf+vZxnyPrmd9BSesnI2u6eOBC5fvHdI86P3LPPQJ7xza/S9MGI8ctafAuE6l0uVAYNeMX1T44esfRGaC1MbvpTHFP4I9cFj62jbbgzReShNwTys9ELfXh5LgAb5x2SaRoXUtB2YT8jpu0LOR1QXrKcquxhOunD0+kx6YVaQUD9isQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gw6etKoKbhI5UOmQDWSnwQkbKmxcGeVEhUL6Kb78D4s=; b=s7ZOIrGTMgoN6ncTOreAnuDMwNfc8L7Jau+wXcE2Qyb/wdn+6Gls6VO6K79agkg+h5e/qzqeQz85P2syx9LaqTjgjdRBaZ6hsCSxROso6HskGr1D2x5Rnzym/TGd66mxeHoStBqYHv5BUFUattt62mAlHPvRZ8667gKsW30c7AN9GH3oppOpR0MFzbrDBLLz1+VibTqayghe42N/ATRveflCHPEupAHusr2wV+p7MhxMrJStZHRLmrxzI3PXWYL5YrElwJaaeh3DvXCMRIoMR0fU99piWucPTYgfEh7aZEQITW+CLbdzQSP1SlATtft1gr3Z0e7GROZUvZyMKAwLaQ== Received: from DM6PR04CA0008.namprd04.prod.outlook.com (2603:10b6:5:334::13) by PH0PR12MB8031.namprd12.prod.outlook.com (2603:10b6:510:28e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Wed, 7 Dec 2022 21:21:24 +0000 Received: from DS1PEPF0000E659.namprd02.prod.outlook.com (2603:10b6:5:334:cafe::83) by DM6PR04CA0008.outlook.office365.com (2603:10b6:5:334::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14 via Frontend Transport; Wed, 7 Dec 2022 21:21:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS1PEPF0000E659.mail.protection.outlook.com (10.167.18.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8 via Frontend Transport; Wed, 7 Dec 2022 21:21:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 7 Dec 2022 13:21:13 -0800 Received: from [10.110.48.28] (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 7 Dec 2022 13:21:12 -0800 Message-ID: Date: Wed, 7 Dec 2022 13:21:12 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH v2 01/10] mm/hugetlb: Let vma_offset_start() to return start Content-Language: en-US To: Peter Xu , , CC: Muchun Song , Andrea Arcangeli , James Houghton , Jann Horn , Rik van Riel , Miaohe Lin , Andrew Morton , "Mike Kravetz" , David Hildenbrand , Nadav Amit References: <20221207203034.650899-1-peterx@redhat.com> <20221207203034.650899-2-peterx@redhat.com> From: John Hubbard In-Reply-To: <20221207203034.650899-2-peterx@redhat.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E659:EE_|PH0PR12MB8031:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d393121-a19d-4f8d-8a73-08dad898fe8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m654IGVLoL01aBdMWINN9oYkCZGZ+AG1Bd6SJ0yyDC0tlJ5yA6m8262+mLtakTmJlY11UsRBMrae08dvUp7mqxMZuhlg5TIgwU/5MU2rOLrZIyCzZUYPIM63r0xVIVZMtpfjAV+CeZBi/LloXplkSQDUwfMDKsqrCi7YOkrccSTYdGLjKmRKufvOLpcIBpuLUdvVHCG5sWZk+dNe/yFSvwYomfsuvJok8Ff21VMK/OJn+3isUXLLpFLp+IQHCZknMAi2lQ10A2lfDXtjy9ugJ65Y6vNAEnmaPJOVZ+itb5+TVN/j/UfUmGvNL/QzEkH6/+CuxTw0rc+uAnuf3qZGJoX6fe/QLhL0Uj+e9B729pg8NvJrjOGOng+zMQ4rWT8TsXT0xOeDkxi45W9VR4Vfac9f7RUAjkyWQmn0VIMTWpX4cfXPgyoDYAPiAK2Js0ts2/4+0KZCfVGqfvCfDmTymTAqMUvGMJLPsq2gsGXB+X6M9gSpN/H6a3hw09C7YkZX7T+RSF4Z6sNInAGKVwVp0PZcRP5Us0ruYWVQko0ghdtQjssWvlGKFuGoHgiPdyaAWNFZ4k+XIvPTZRH9YbfNuAFyOL/C85fD7DRN/UcD0Jno4YsPsiorxyuuGVrQzwsjJONWDn57sv/EtHRg/quCbH2gO3pXb19qIDxTqp+nQxDqoFJjX/p05Do+LIXq9k/EkMc7eZV1iWYuwe1iZD79OJFzjQGfBPTUBDDZQ5SG3CSQJ1YINYR7Pf16IWovdxjR X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(376002)(39860400002)(136003)(346002)(396003)(451199015)(36840700001)(46966006)(40470700004)(31696002)(70206006)(16526019)(40460700003)(40480700001)(41300700001)(186003)(86362001)(36756003)(70586007)(336012)(8676002)(4326008)(316002)(2616005)(426003)(8936002)(47076005)(7416002)(16576012)(5660300002)(53546011)(54906003)(478600001)(26005)(110136005)(7636003)(356005)(82310400005)(82740400003)(2906002)(36860700001)(83380400001)(31686004)(43740500002)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2022 21:21:24.1970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d393121-a19d-4f8d-8a73-08dad898fe8b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000E659.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8031 X-Rspam-User: X-Spamd-Result: default: False [-5.03 / 9.00]; BAYES_HAM(-5.63)[99.19%]; SUSPICIOUS_RECIPS(1.50)[]; SUBJECT_HAS_UNDERSCORES(1.00)[]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; DMARC_POLICY_ALLOW(-0.50)[nvidia.com,reject]; R_DKIM_ALLOW(-0.20)[Nvidia.com:s=selector2]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; RCPT_COUNT_TWELVE(0.00)[13]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[Nvidia.com:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=2]; HAS_XOIP(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_FIVE(0.00)[6] X-Rspamd-Queue-Id: D5E8940019 X-Rspamd-Server: rspam01 X-Stat-Signature: 7w3mrpmspx4z8r3pim6qk8rf1wkmy8ct X-HE-Tag: 1670448086-669605 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: On 12/7/22 12:30, Peter Xu wrote: > Even though vma_offset_start() is named like that, it's not returning "the > start address of the range" but rather the offset we should use to offset > the vma->vm_start address. > > Make it return the real value of the start vaddr, and it also helps for all > the callers because whenever the retval is used, it'll be ultimately added > into the vma->vm_start anyway, so it's better. > > Reviewed-by: Mike Kravetz > Reviewed-by: David Hildenbrand > Signed-off-by: Peter Xu > --- > fs/hugetlbfs/inode.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) This is a nice refinement. Reviewed-by: John Hubbard thanks, -- John Hubbard NVIDIA > > diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c > index 790d2727141a..fdb16246f46e 100644 > --- a/fs/hugetlbfs/inode.c > +++ b/fs/hugetlbfs/inode.c > @@ -412,10 +412,12 @@ static bool hugetlb_vma_maps_page(struct vm_area_struct *vma, > */ > static unsigned long vma_offset_start(struct vm_area_struct *vma, pgoff_t start) > { > + unsigned long offset = 0; > + > if (vma->vm_pgoff < start) > - return (start - vma->vm_pgoff) << PAGE_SHIFT; > - else > - return 0; > + offset = (start - vma->vm_pgoff) << PAGE_SHIFT; > + > + return vma->vm_start + offset; > } > > static unsigned long vma_offset_end(struct vm_area_struct *vma, pgoff_t end) > @@ -457,7 +459,7 @@ static void hugetlb_unmap_file_folio(struct hstate *h, > v_start = vma_offset_start(vma, start); > v_end = vma_offset_end(vma, end); > > - if (!hugetlb_vma_maps_page(vma, vma->vm_start + v_start, page)) > + if (!hugetlb_vma_maps_page(vma, v_start, page)) > continue; > > if (!hugetlb_vma_trylock_write(vma)) { > @@ -473,8 +475,8 @@ static void hugetlb_unmap_file_folio(struct hstate *h, > break; > } > > - unmap_hugepage_range(vma, vma->vm_start + v_start, v_end, > - NULL, ZAP_FLAG_DROP_MARKER); > + unmap_hugepage_range(vma, v_start, v_end, NULL, > + ZAP_FLAG_DROP_MARKER); > hugetlb_vma_unlock_write(vma); > } > > @@ -507,10 +509,9 @@ static void hugetlb_unmap_file_folio(struct hstate *h, > */ > v_start = vma_offset_start(vma, start); > v_end = vma_offset_end(vma, end); > - if (hugetlb_vma_maps_page(vma, vma->vm_start + v_start, page)) > - unmap_hugepage_range(vma, vma->vm_start + v_start, > - v_end, NULL, > - ZAP_FLAG_DROP_MARKER); > + if (hugetlb_vma_maps_page(vma, v_start, page)) > + unmap_hugepage_range(vma, v_start, v_end, NULL, > + ZAP_FLAG_DROP_MARKER); > > kref_put(&vma_lock->refs, hugetlb_vma_lock_release); > hugetlb_vma_unlock_write(vma); > @@ -540,8 +541,7 @@ hugetlb_vmdelete_list(struct rb_root_cached *root, pgoff_t start, pgoff_t end, > v_start = vma_offset_start(vma, start); > v_end = vma_offset_end(vma, end); > > - unmap_hugepage_range(vma, vma->vm_start + v_start, v_end, > - NULL, zap_flags); > + unmap_hugepage_range(vma, v_start, v_end, NULL, zap_flags); > > /* > * Note that vma lock only exists for shared/non-private