From patchwork Fri Dec 16 15:50:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13075132 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 C1B53C001B2 for ; Fri, 16 Dec 2022 15:51:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99AF48E0002; Fri, 16 Dec 2022 10:51:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 90F5C8E000A; Fri, 16 Dec 2022 10:51:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69A9D8E0002; Fri, 16 Dec 2022 10:51:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4EC338E0008 for ; Fri, 16 Dec 2022 10:51:12 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 337514115F for ; Fri, 16 Dec 2022 15:51:12 +0000 (UTC) X-FDA: 80248608384.28.70C30A6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 3A75A4001B for ; Fri, 16 Dec 2022 15:51:10 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NawBOwIk; spf=pass (imf17.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671205870; 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=W6TRH+D4KiiNcSkU8trC/D1fuTVk/3U3ig0mjyWFdEw=; b=7prTNVpe6RoPceeuL5TtGtUTtYgnXXi3eEsx+Vl7GouM40BqCK8ekQfpZBhHnB3Moi9iEK D9IqzsxmQxuF4W1NbEW8/1Dp4vuhXv92hdvzg8DxxYR+x7FNeloiig4lYadk2j4eT2Kf91 LuNQhOkd4bXE9jxfjz99imYdNwIRhZk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NawBOwIk; spf=pass (imf17.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671205870; a=rsa-sha256; cv=none; b=QzfN7/M8ir+TajLvPvsO7BOKHGNj4YiTRa+ZyOw6jsGgSYb63cXtllHffZ9W9Wr69kuBRK nMvQ34D12y9nhMNNMLo2SV7/CNmZITIUtEjIdhWFmsBI0ZwdzsRlW2zWYqQN7VtLJSqFOq jIKiDRFx7eg0pSQm2li3MuaFztuuKOY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671205869; h=from:from: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; bh=W6TRH+D4KiiNcSkU8trC/D1fuTVk/3U3ig0mjyWFdEw=; b=NawBOwIkY6pLpbM0P1RyjWF81H0WCF5TVgKkr++GwpiKgU5Q8e6fUMny46VUQkYRyOFnr3 c2BdGNCEXiS5Hu4MDN22b50HCjRjhyzpDDcmC7vIJUrAeJ8NY5nBFxi3FwCRlrGR9ig3N3 n7gvNdTglOnyVTeuxHXJoLC7icky6VY= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-373-qUSS89UsOiq4MbxqqH--LA-1; Fri, 16 Dec 2022 10:51:08 -0500 X-MC-Unique: qUSS89UsOiq4MbxqqH--LA-1 Received: by mail-qk1-f198.google.com with SMTP id ay43-20020a05620a17ab00b006fa30ed61fdso2073680qkb.5 for ; Fri, 16 Dec 2022 07:51:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W6TRH+D4KiiNcSkU8trC/D1fuTVk/3U3ig0mjyWFdEw=; b=0CGyXi8uiusqwfJVzCWhw9QF8/D59yxUgO1JxXv1PWQ6ig9Xr5oE5ar0EVLmGs0JcU zsk7LvXtQed2dJ8Oc457edAxl6qBE5CQgfy0B/Ryjeta/dSBECXyZ/wWUBZ1iSGPWU+w 9AczyI9BcSMCcWt5u2luvSY3jut9XKQft6Q1yg9UoaDrjjC/awnt8TwWHbZ0CM1E+rJA 3Gn3YlAXrFVzUGsMDo3o6RJWAcq8wSquzENGQK24Utcdn59zQbh7oRABKCZBh+vuzgU+ LUJdAUhAA0ZkXQHWzvZxY3JYB8tTBTKRPBV2ouYOV3xy0rtoCCKRYih9hIV/PAptVmKH Jptg== X-Gm-Message-State: ANoB5pk8BQh1Ww3auLNFY7FI2dNcXp+m0LNzFkX6Eh2LG6agY5JiHaaI zhAmClI5mjQvIUugzENp8jAUwL8o9SPYsZNN0+0ngfI64NPdMmM2zvo0/xeXBXJ5uHRyIRpsIA0 01CovjYZWo8E= X-Received: by 2002:ad4:5883:0:b0:4c6:f65b:2e16 with SMTP id dz3-20020ad45883000000b004c6f65b2e16mr49280190qvb.21.1671205867778; Fri, 16 Dec 2022 07:51:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf4KCS0PO65p/SFUOeoYSoiml6w+3ib8mlnjzyMFPkaRCZw2NRbc7RAQAd1lnesrPAfcNCB8IQ== X-Received: by 2002:ad4:5883:0:b0:4c6:f65b:2e16 with SMTP id dz3-20020ad45883000000b004c6f65b2e16mr49280167qvb.21.1671205867572; Fri, 16 Dec 2022 07:51:07 -0800 (PST) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-45-70-31-26-132.dsl.bell.ca. [70.31.26.132]) by smtp.gmail.com with ESMTPSA id s81-20020a37a954000000b006eeb3165554sm1682297qke.19.2022.12.16.07.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 07:51:03 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Muchun Song , Miaohe Lin , Andrea Arcangeli , Nadav Amit , James Houghton , peterx@redhat.com, Mike Kravetz , David Hildenbrand , Rik van Riel , John Hubbard , Andrew Morton , Jann Horn Subject: [PATCH v4 1/9] mm/hugetlb: Let vma_offset_start() to return start Date: Fri, 16 Dec 2022 10:50:52 -0500 Message-Id: <20221216155100.2043537-2-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221216155100.2043537-1-peterx@redhat.com> References: <20221216155100.2043537-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 3A75A4001B X-Stat-Signature: 85dnef51ufb4a5pi5363xmp6143bo81w X-Rspam-User: X-HE-Tag: 1671205870-523934 X-HE-Meta: U2FsdGVkX1+BkrKbkNlhAZVGth0G7Nm5WGFt1St5DjO1OLNhX0vBV+yseZXGkyBKcBD/lwqrAwzRIt/gV6lFTMyv+76EKyJpHoqoVK2yGIyc3koNZoKKYeEGVqADUcEa9gIgS+QEowhwd6sljxSFQNw+khOzY7Jq/hSKYRgkimM/UQghez6lE4MxueKTDkK2CW/HXKcCwkYJHGjA72asKo0BX9hjGXfMXJ0kLTMd5rgJyxbovIYu3JX1YHUIsMv0ZK0NuB9hQROfeDUjnEdJvm/7VI7zJ/fvAyc4eRJ9nGRtVZA29BhLR7N09+f8DPiOCbJBaBlLx0+hXJ1kQiRULbIK0Jwag4deRlXFy8x/zlZDvmdyu5p5+oS7G85K/0KyK1LpSEMflFwvMb4HnvuJy/Ir2+5Lij0ORQrqrD3RwSiwRmxDPEHnx0mI+3sfVBBlYwOQguY3JpOeCWAa1rl5jI8LIyxEx+4yZ6cDh8rVHskqPN3VNW2IM85Wm9BtxTPBBou0vBBGqsoHZEg0979qoQYeJX4pObxiHmntkh+Luzk9HkJon9H0UwAL+1X4oqBRywovEYx2diAirCUZu9j1ir0R6P9IfxnbpKklPlWiG/MTtNZLav3wuHogI6pTq25fDDhPqDVtwn14hyJD76zpS56V39vbKUtL0hxfxeUe6w5UA7ln/Bj8FA8A0o46eqrmbF1h0P6umDpBIamGgVejz55GJJyon85fWEz3uA2k47gdlBlu3kvqoaoP4SZPV5qLKB8k8NAedMMdnKupUM0839aI2j7ZYF41UjGoBEPlYYKHwR/an4GIUm31gHc/6s1ojEGjFOIyLf8w8Sahj4mi0IjJqgQqvjYTMbk0HyAUnvEuOLtnUBNmg1uSOX85DsbBaLtg5hBxxhQzFKrTflplfQfMLFHuJqnP1N9gEvQwim75PY9lKEt5KYMRTLkx9gHEuC+NzjATyfUSNccOupi fWGuWb8q H5Gb6gAuSqOQ4nqBP/PAmK/+yK96awbRfMKhltgSaaYEC5Zk99KwkDytl1uTdBORclyESw2AQmiy+Dw0FZ8cJS39ZDHEQLhGFbBVjn7RRtX+fElwPK04BV1cMb2qGJ7lqKnYgqDCcMy5WFRj/8wtGjtoVUmQcf6VzkD5J4fv29exOKHLfu5xdZ2ZmfsMt0w/GW3Mospwl2AuTQTMovD583BNQ3R36pgHPeBBG 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: 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 Reviewed-by: John Hubbard Signed-off-by: Peter Xu --- fs/hugetlbfs/inode.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) 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