From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9424E32B118 for ; Mon, 29 Jun 2026 13:56:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782741402; cv=none; b=f+05EW/QyGZtlaxMtHpCN80GQ2jzqggIj8Rwt+KxodXIyCqKIXUALR33JJha1tOu9adPkbuL/THiB2JlzxLsfUJqAMdrGsavZHPnFQt0dpQtp9LbFxlQ6WB3wZ6/ZUVzWMFIn7AeE0KBGGDze1z8RunJbgxY4BCkiT8vHcu+edI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782741402; c=relaxed/simple; bh=Bfe4DBZzQHsGL4rvG7nIN8Ksz2qGetbXxLJ5OQMHx90=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=PgXOYGLmB287Pr2ubKQn86BBVwAjP/ZEBiAmLthkEXZVe0HpYUSD5tyjDk6UNWgcCLbvKY9L6dkk+A3REDS7GgstyjHKVz6dIp6FnaDCmRF3iIG78zkD72MFlJNYy/K4jYOCJkh9Syk/OP0j7GxSkokIO2AG2uVhlhLDZP25G1c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=iTLJp6dT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=OQmkdJX6; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=c8FwD76f; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=0oUBUqEI; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="iTLJp6dT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="OQmkdJX6"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="c8FwD76f"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="0oUBUqEI" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E2E8075A06; Mon, 29 Jun 2026 13:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1782741398; h=from:from:reply-to: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:autocrypt:autocrypt; bh=wif5TkOjpA/toqZALFTtcoHHCFCpNXj/ZtBXBdU8ofc=; b=iTLJp6dTtPrWQYOFyPqFVjgKvk21ha7IRKet+2dRtaNfbz8s93LWr177MlCDv93Lw+QRgD 7o1KqI/bt1LmxMLueusI/725nXlN/PgmszTfVyozUBHb6Qi8yVL//+sb4YJ/wG4ME16N53 RIAPJVnA6x+MsLvQe0ziepnssaApP5Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1782741398; h=from:from:reply-to: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:autocrypt:autocrypt; bh=wif5TkOjpA/toqZALFTtcoHHCFCpNXj/ZtBXBdU8ofc=; b=OQmkdJX6vvxzSc5XuWuW7iqNsLRnbCxEqoEScPBsy0F3tBM4YLHsmsqy0SrlxzhAOGwRGX xhKvHI8OwBFGKHBA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1782741397; h=from:from:reply-to: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:autocrypt:autocrypt; bh=wif5TkOjpA/toqZALFTtcoHHCFCpNXj/ZtBXBdU8ofc=; b=c8FwD76f1Uwd6aWDKF6SNUoBEdd2a4NDbp8I0kHWLVFS513I7noTYBT1CKVGVbZLiFVsHG pD06GBDt/jyh5PfkHZ/Jefe0wtV6rATtUyZvbZuabE43i6zJ0mEIuDaNLER8BdqsrSK6J8 06M8bH3/rTealQHdY4kKQ1MBnzVyIOg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1782741397; h=from:from:reply-to: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:autocrypt:autocrypt; bh=wif5TkOjpA/toqZALFTtcoHHCFCpNXj/ZtBXBdU8ofc=; b=0oUBUqEIguzuujB7xM2VRDIjsqG4lJtIX0A2z5+9RGQsCFq29svGSk6y0ZdWklp8T5lnNO tljnfWx5rpptL/BA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D4D6E779A8; Mon, 29 Jun 2026 13:56:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id rfu3MpJ5Qmo6bAAAD6G6ig (envelope-from ); Mon, 29 Jun 2026 13:56:34 +0000 Message-ID: <21c4d96a-cd1b-4c65-8a66-2223df3b6109@suse.de> Date: Mon, 29 Jun 2026 15:56:33 +0200 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 19/30] mm: use linear_page_[index, delta]() consistently To: Lorenzo Stoakes , Andrew Morton Cc: Russell King , Dinh Nguyen , Simon Schuster , "James E . J . Bottomley" , Helge Deller , Jarkko Sakkinen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Ian Abbott , H Hartley Sweeten , Lucas Stach , David Airlie , Simona Vetter , Patrik Jakobsson , Maarten Lankhorst , Maxime Ripard , Rob Clark , Dmitry Baryshkov , Tomi Valkeinen , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Christian Koenig , Huang Rui , Ankit Agrawal , Alex Williamson , Alexander Viro , Christian Brauner , Dan Williams , Muchun Song , Oscar Salvador , David Hildenbrand , Suren Baghdasaryan , "Liam R . Howlett" , Matthew Wilcox , Marek Szyprowski , Peter Zijlstra , Arnaldo Carvalho de Melo , Namhyung Kim , Masami Hiramatsu , Oleg Nesterov , Steven Rostedt , SeongJae Park , Miaohe Lin , Hugh Dickins , Mike Rapoport , Kees Cook , Paolo Bonzini , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-parisc@vger.kernel.org, linux-sgx@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-tegra@vger.kernel.org, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev, linux-mm@kvack.org, iommu@lists.linux.dev, linux-perf-users@vger.kernel.org, linux-trace-kernel@vger.kernel.org, kasan-dev@googlegroups.com, damon@lists.linux.dev, Pedro Falcato , Rik van Riel , Harry Yoo , Jann Horn References: Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Flag: NO X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; SUSPICIOUS_RECIPS(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_CC(0.00)[armlinux.org.uk,kernel.org,siemens-energy.com,HansenPartnership.com,gmx.de,redhat.com,alien8.de,linux.intel.com,mev.co.uk,visionengravers.com,pengutronix.de,gmail.com,ffwll.ch,oss.qualcomm.com,ideasonboard.com,nvidia.com,amd.com,shazbot.org,zeniv.linux.org.uk,linux.dev,suse.de,google.com,infradead.org,samsung.com,goodmis.org,huawei.com,vger.kernel.org,lists.infradead.org,lists.freedesktop.org,lists.linux.dev,kvack.org,googlegroups.com,surriel.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_GT_50(0.00)[75]; TAGGED_RCPT(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:url,suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo] X-Spam-Level: X-Spam-Score: -2.80 Hi Am 29.06.26 um 14:23 schrieb Lorenzo Stoakes: > There are a number of places where we open code what linear_page_index() > and linear_page_delta() calculate. > > Replace this code with the appropriate functions for consistency. > > No functional change intended. > > Signed-off-by: Lorenzo Stoakes For the DRM changes: Reviewed-by: Thomas Zimmermann See below for two additional comments. > --- > arch/arm/mm/fault-armv.c | 2 +- > arch/x86/kernel/cpu/sgx/virt.c | 3 ++- > drivers/comedi/comedi_fops.c | 3 ++- > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 ++- > drivers/gpu/drm/gma500/gem.c | 2 +- > drivers/gpu/drm/msm/msm_gem.c | 3 ++- > drivers/gpu/drm/omapdrm/omap_gem.c | 5 +++-- > drivers/gpu/drm/tegra/gem.c | 3 ++- > drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 ++++--- > drivers/vfio/pci/nvgrace-gpu/main.c | 3 ++- > drivers/vfio/pci/vfio_pci_core.c | 3 ++- > mm/nommu.c | 2 +- > mm/vma.c | 2 +- > virt/kvm/guest_memfd.c | 2 +- > 14 files changed, 26 insertions(+), 17 deletions(-) > [...] > > #include > #include > @@ -2462,7 +2463,7 @@ static int comedi_vm_access(struct vm_area_struct *vma, unsigned long addr, > { > struct comedi_buf_map *bm = vma->vm_private_data; > unsigned long offset = > - addr - vma->vm_start + (vma->vm_pgoff << PAGE_SHIFT); > + addr - vma->vm_start + (vma_start_pgoff(vma) << PAGE_SHIFT); This doesn't seem to belong here. > > if (len < 0) > return -EINVAL; > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c > index b0436a1e103f..2e4d6d117ee2 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c > @@ -6,6 +6,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -188,7 +189,7 @@ static vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf) > } > > /* We don't use vmf->pgoff since that has the fake offset: */ > - pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; > + pgoff = linear_page_delta(vma, vmf->address); > > pfn = page_to_pfn(pages[pgoff]); > > diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c > index 88f1e86c8903..2708e8c68f4c 100644 > --- a/drivers/gpu/drm/gma500/gem.c > +++ b/drivers/gpu/drm/gma500/gem.c > @@ -288,7 +288,7 @@ static vm_fault_t psb_gem_fault(struct vm_fault *vmf) > > /* Page relative to the VMA start - we must calculate this ourselves > because vmf->pgoff is the fake GEM offset */ > - page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT; > + page_offset = linear_page_delta(vma, vmf->address); > > /* CPU view of the page, don't go via the GART for CPU writes */ > if (pobj->stolen) > diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c > index efd3d3c9a449..cbf723a5d86f 100644 > --- a/drivers/gpu/drm/msm/msm_gem.c > +++ b/drivers/gpu/drm/msm/msm_gem.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -360,7 +361,7 @@ static vm_fault_t msm_gem_fault(struct vm_fault *vmf) > } > > /* We don't use vmf->pgoff since that has the fake offset: */ > - pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; > + pgoff = linear_page_delta(vma, vmf->address); > > pfn = page_to_pfn(pages[pgoff]); > > diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c > index 8e013e4f2c6b..00404fb6c29a 100644 > --- a/drivers/gpu/drm/omapdrm/omap_gem.c > +++ b/drivers/gpu/drm/omapdrm/omap_gem.c > @@ -5,6 +5,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -359,7 +360,7 @@ static vm_fault_t omap_gem_fault_1d(struct drm_gem_object *obj, > pgoff_t pgoff; > > /* We don't use vmf->pgoff since that has the fake offset: */ > - pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; > + pgoff = linear_page_delta(vma, vmf->address); > > if (omap_obj->pages) { > omap_gem_cpu_sync_page(obj, pgoff); > @@ -407,7 +408,7 @@ static vm_fault_t omap_gem_fault_2d(struct drm_gem_object *obj, > const int m = DIV_ROUND_UP(omap_obj->width << fmt, PAGE_SIZE); > > /* We don't use vmf->pgoff since that has the fake offset: */ > - pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; > + pgoff = linear_page_delta(vma, vmf->address); > > /* > * Actual address we start mapping at is rounded down to previous slot > diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c > index 436394e04812..1d8d27a5ea89 100644 > --- a/drivers/gpu/drm/tegra/gem.c > +++ b/drivers/gpu/drm/tegra/gem.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > > #include > @@ -564,7 +565,7 @@ static vm_fault_t tegra_bo_fault(struct vm_fault *vmf) > if (!bo->pages) > return VM_FAULT_SIGBUS; > > - offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT; > + offset = linear_page_delta(vma, vmf->address); > page = bo->pages[offset]; > > return vmf_insert_page(vma, vmf->address, page); > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > index a80510489c45..88babf435ac2 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > @@ -32,6 +32,7 @@ > #define pr_fmt(fmt) "[TTM] " fmt > > #include > +#include > > #include > #include > @@ -208,9 +209,9 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, > if (unlikely(err != 0)) > return VM_FAULT_SIGBUS; > > - page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) + > - vma->vm_pgoff - drm_vma_node_start(&bo->base.vma_node); > - page_last = vma_pages(vma) + vma->vm_pgoff - > + page_offset = linear_page_index(vma, address) - > + drm_vma_node_start(&bo->base.vma_node); > + page_last = vma_end_pgoff(vma) - > drm_vma_node_start(&bo->base.vma_node); Not your fault, but page_last seems misnamed here. Best regards Thomas > > if (unlikely(page_offset >= PFN_UP(bo->base.size))) > diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace-gpu/main.c > index d07dcacb76bd..963fd8ded20d 100644 > --- a/drivers/vfio/pci/nvgrace-gpu/main.c > +++ b/drivers/vfio/pci/nvgrace-gpu/main.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -385,7 +386,7 @@ static unsigned long addr_to_pgoff(struct vm_area_struct *vma, > u64 pgoff = vma->vm_pgoff & > ((1U << (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT)) - 1); > > - return ((addr - vma->vm_start) >> PAGE_SHIFT) + pgoff; > + return linear_page_delta(vma, addr) + pgoff; > } > > static vm_fault_t nvgrace_gpu_vfio_pci_huge_fault(struct vm_fault *vmf, > diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c > index a28f1e99362c..55d4937d495a 100644 > --- a/drivers/vfio/pci/vfio_pci_core.c > +++ b/drivers/vfio/pci/vfio_pci_core.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1727,7 +1728,7 @@ static vm_fault_t vfio_pci_mmap_huge_fault(struct vm_fault *vmf, > struct vm_area_struct *vma = vmf->vma; > struct vfio_pci_core_device *vdev = vma->vm_private_data; > unsigned long addr = vmf->address & ~((PAGE_SIZE << order) - 1); > - unsigned long pgoff = (addr - vma->vm_start) >> PAGE_SHIFT; > + unsigned long pgoff = linear_page_delta(vma, addr); > unsigned long pfn = vma_to_pfn(vma) + pgoff; > vm_fault_t ret = VM_FAULT_FALLBACK; > > diff --git a/mm/nommu.c b/mm/nommu.c > index 60560b2c457e..7333d855e974 100644 > --- a/mm/nommu.c > +++ b/mm/nommu.c > @@ -1332,7 +1332,7 @@ static int split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, > *region = *vma->vm_region; > new->vm_region = region; > > - npages = (addr - vma->vm_start) >> PAGE_SHIFT; > + npages = linear_page_delta(vma, addr); > > if (new_below) { > region->vm_top = region->vm_end = new->vm_end = addr; > diff --git a/mm/vma.c b/mm/vma.c > index ee3a8ca13d07..185d07397ca6 100644 > --- a/mm/vma.c > +++ b/mm/vma.c > @@ -517,7 +517,7 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, > new->vm_end = addr; > } else { > new->vm_start = addr; > - new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); > + new->vm_pgoff += linear_page_delta(vma, addr); > } > > err = -ENOMEM; > diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c > index db57c5766ab6..f0e5da490866 100644 > --- a/virt/kvm/guest_memfd.c > +++ b/virt/kvm/guest_memfd.c > @@ -440,7 +440,7 @@ static int kvm_gmem_set_policy(struct vm_area_struct *vma, struct mempolicy *mpo > static struct mempolicy *kvm_gmem_get_policy(struct vm_area_struct *vma, > unsigned long addr, pgoff_t *ilx) > { > - pgoff_t pgoff = vma->vm_pgoff + ((addr - vma->vm_start) >> PAGE_SHIFT); > + pgoff_t pgoff = linear_page_index(vma, addr); > struct inode *inode = file_inode(vma->vm_file); > > *ilx = inode->i_ino; -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)