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 E0F82372048 for ; Thu, 2 Jul 2026 11:02:40 +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=1782990162; cv=none; b=UYBryhTyoFyL+v2+C0p5e10uGQ6WuBGNnm1AnM/58E9+rgsLEP/zQEIhPsh27E76fwy16ZhJn1D69a+BFo6R9BQxBrNqItZQDJD9wr6Gw/PWGiEC6kTvnoHg7dveIZzCRMKfhyGOzuJkQq9fZbSYrZrxjZwfBsPCA45WR8AeWdE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782990162; c=relaxed/simple; bh=uMqwZJyr6chMf0MwPp5q4gmwfYyxgZT7Dae0BetgmFk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=noE8/3Xxn7H0l11HuhWhXSHmnPCjgH28CbfqQQamTsR4uR38i+U5h5YqzJR5y6nR5NUwye4RWw8OUDwI5vN1YMyapIXwhHunkykxuqRd56XXtXZm4KNWCkRb7MrgO7zrGdlXtmuPZFNdaBbr5ezc9bDu8WJLn8TRfaP0MEcNW4E= 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=ZFAr4l2+; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=msKl1dIi; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ZFAr4l2+; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=msKl1dIi; 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="ZFAr4l2+"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="msKl1dIi"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ZFAr4l2+"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="msKl1dIi" 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 7DE2175836; Thu, 2 Jul 2026 11:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1782990159; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aTESfSg/UDSKvCRKPYkjGkeDM+9N47RJ1ZSYfcEDptc=; b=ZFAr4l2+lrq1YO8WesM6M58ypD2d1Cyp2s3pst8Rp0JZxHuiDVOlOnC92+mVQ9xTYMSFWS 1Ib82i762wqOGopbJZZlN7tmyxjkqZjvIu+qmX9Atuchw9HhuS7W06f9QtxqDVwmWJ1ICd uu64skCdlWkr87lNnC2ETcXvRCO8ZMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1782990159; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aTESfSg/UDSKvCRKPYkjGkeDM+9N47RJ1ZSYfcEDptc=; b=msKl1dIiRRwvTRJnIBFlZAMLsZZDvuNzGM1yJ0QV+Onsisiyi0tgiyUaerrEkj2tWwsuxt DimetfMNnHbkSQDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1782990159; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aTESfSg/UDSKvCRKPYkjGkeDM+9N47RJ1ZSYfcEDptc=; b=ZFAr4l2+lrq1YO8WesM6M58ypD2d1Cyp2s3pst8Rp0JZxHuiDVOlOnC92+mVQ9xTYMSFWS 1Ib82i762wqOGopbJZZlN7tmyxjkqZjvIu+qmX9Atuchw9HhuS7W06f9QtxqDVwmWJ1ICd uu64skCdlWkr87lNnC2ETcXvRCO8ZMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1782990159; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aTESfSg/UDSKvCRKPYkjGkeDM+9N47RJ1ZSYfcEDptc=; b=msKl1dIiRRwvTRJnIBFlZAMLsZZDvuNzGM1yJ0QV+Onsisiyi0tgiyUaerrEkj2tWwsuxt DimetfMNnHbkSQDQ== 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 18BD8779AA; Thu, 2 Jul 2026 11:02:35 +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 IWHTAktFRmoYWwAAD6G6ig (envelope-from ); Thu, 02 Jul 2026 11:02:35 +0000 Date: Thu, 2 Jul 2026 12:02:33 +0100 From: Pedro Falcato To: Lorenzo Stoakes Cc: Andrew Morton , 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 , Thomas Zimmermann , 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, Rik van Riel , Harry Yoo , Jann Horn Subject: Re: [PATCH 18/30] mm/vma: remove duplicative vma_pgoff_offset() helper Message-ID: References: <10671c2fc5d0dd4e3bf497181923e63e46053df1.1782735110.git.ljs@kernel.org> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <10671c2fc5d0dd4e3bf497181923e63e46053df1.1782735110.git.ljs@kernel.org> X-Spam-Flag: NO X-Spam-Score: -2.80 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)[linux-foundation.org,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,suse.de,oss.qualcomm.com,ideasonboard.com,nvidia.com,amd.com,shazbot.org,zeniv.linux.org.uk,linux.dev,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]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLhmcirxxpt5jndy7xobbegf18)]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TAGGED_RCPT(0.00)[]; RCPT_COUNT_GT_50(0.00)[75]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email,pedro-suse.lan:mid] X-Spam-Level: On Mon, Jun 29, 2026 at 01:23:29PM +0100, Lorenzo Stoakes wrote: > This is doing what linear_page_index() does, so eliminate it and replace it > with linear_page_index(). > > Update the VMA userland tests to reflect this change. > > No functional change intended. > > Signed-off-by: Lorenzo Stoakes Reviewed-by: Pedro Falcato > --- > mm/vma.h | 9 +-------- > tools/testing/vma/include/dup.h | 16 ++++++++++++++++ > 2 files changed, 17 insertions(+), 8 deletions(-) > > diff --git a/mm/vma.h b/mm/vma.h > index 527716c8739d..2342516ce00e 100644 > --- a/mm/vma.h > +++ b/mm/vma.h > @@ -247,13 +247,6 @@ static inline pgoff_t vmg_end_pgoff(const struct vma_merge_struct *vmg) > return vmg_start_pgoff(vmg) + vmg_pages(vmg); > } > > -/* Assumes addr >= vma->vm_start. */ > -static inline pgoff_t vma_pgoff_offset(struct vm_area_struct *vma, > - unsigned long addr) > -{ > - return vma->vm_pgoff + PHYS_PFN(addr - vma->vm_start); > -} > - > #define VMG_STATE(name, mm_, vmi_, start_, end_, vma_flags_, pgoff_) \ > struct vma_merge_struct name = { \ > .mm = mm_, \ > @@ -275,7 +268,7 @@ static inline pgoff_t vma_pgoff_offset(struct vm_area_struct *vma, > .start = start_, \ > .end = end_, \ > .vm_flags = vma_->vm_flags, \ > - .pgoff = vma_pgoff_offset(vma_, start_), \ > + .pgoff = linear_page_index(vma_, start_), \ > .file = vma_->vm_file, \ > .anon_vma = vma_->anon_vma, \ > .policy = vma_policy(vma_), \ > diff --git a/tools/testing/vma/include/dup.h b/tools/testing/vma/include/dup.h > index 535747d7fee4..7ed165c8d9bc 100644 > --- a/tools/testing/vma/include/dup.h > +++ b/tools/testing/vma/include/dup.h > @@ -1548,3 +1548,19 @@ static inline pgprot_t vma_get_page_prot(vma_flags_t vma_flags) > > return vm_get_page_prot(vm_flags); > } > + > +static inline pgoff_t linear_page_delta(const struct vm_area_struct *vma, > + const unsigned long address) > +{ > + return (address - vma->vm_start) >> PAGE_SHIFT; > +} > + > +static inline pgoff_t linear_page_index(const struct vm_area_struct *vma, > + const unsigned long address) > +{ > + pgoff_t pgoff; > + > + pgoff = linear_page_delta(vma, address); > + pgoff += vma_start_pgoff(vma); > + return pgoff; > +} > -- > 2.54.0 > -- Pedro