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 8A905C433EF for ; Sat, 29 Jan 2022 00:33:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA2486B0075; Fri, 28 Jan 2022 19:33:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D52B06B007B; Fri, 28 Jan 2022 19:33:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C19936B0080; Fri, 28 Jan 2022 19:33:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id AFE9F6B0075 for ; Fri, 28 Jan 2022 19:33:32 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 7770B97912 for ; Sat, 29 Jan 2022 00:33:32 +0000 (UTC) X-FDA: 79081451064.16.CBFDDB5 Received: from server.lespinasse.org (server.lespinasse.org [63.205.204.226]) by imf19.hostedemail.com (Postfix) with ESMTP id 0D87D1A0006 for ; Sat, 29 Jan 2022 00:33:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-53-ed; t=1643416409; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to : from; bh=Ks58RD92sFw1u4MB19gv/koeUljumN7OZNwwzwqESMg=; b=GydC0FU6vw4+iPN7EbvznPgucVy/xofT+Usuu4cmXupf8aIP5votm1UGluhzGJVYhYHX0 VgBMfvgzy49ZWUnAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-53-rsa; t=1643416409; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to : from; bh=Ks58RD92sFw1u4MB19gv/koeUljumN7OZNwwzwqESMg=; b=BQP2aVVJwWLZaQGslcdEA4461tfkn3lV+mH53sNQ4HqTI2qpWTXRzwZarK4tah61Tm20L m0c+G76dwHAt+ycXy/dA30Q7OVPsTqIRpwSbJxK7VnADm8SN2dwwTshQj0q1xSz+3gB7+ph D049T9ZuLYmaChIFAaseiwvhGtumJbL++TpDybWha/F6lSOsVZmbIBqj7aJwX03n3c9bx0n fMoTpXA8guGQQV46TrZJ+GECgavBKXRbvsQMsuF5u63Agz1q/ljaCFYBUZQchYhtL+n3udy KBvjjwQDdHnrM5Hyb0/f9J58vZw6IrxWxQXVMqtCQUl85n5zrVEWxWYh9pLA== Received: by server.lespinasse.org (Postfix, from userid 1000) id 84F5116094C; Fri, 28 Jan 2022 16:33:29 -0800 (PST) Date: Fri, 28 Jan 2022 16:33:29 -0800 From: Michel Lespinasse To: kernel test robot Cc: Michel Lespinasse , Linux-MM , linux-kernel@vger.kernel.org, Andrew Morton , llvm@lists.linux.dev, kbuild-all@lists.01.org, kernel-team@fb.com, Laurent Dufour , Jerome Glisse , Peter Zijlstra , Michal Hocko , Vlastimil Babka , Davidlohr Bueso Subject: Re: [PATCH v2 12/35] mm: separate mmap locked assertion from find_vma Message-ID: <20220129003329.GB18863@lespinasse.org> References: <20220128131006.67712-13-michel@lespinasse.org> <202201290752.GKB0XPLn-lkp@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202201290752.GKB0XPLn-lkp@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 0D87D1A0006 X-Stat-Signature: 6phkw87o51itr3gcy4hy9m3jckoo7jff X-Rspam-User: nil Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=lespinasse.org header.s=srv-53-ed header.b=GydC0FU6; dkim=pass header.d=lespinasse.org header.s=srv-53-rsa header.b=BQP2aVVJ; spf=pass (imf19.hostedemail.com: domain of michel@lespinasse.org designates 63.205.204.226 as permitted sender) smtp.mailfrom=michel@lespinasse.org; dmarc=pass (policy=none) header.from=lespinasse.org X-HE-Tag: 1643416411-939344 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 Sat, Jan 29, 2022 at 08:08:15AM +0800, kernel test robot wrote: > >> mm/nommu.c:666:24: error: redefinition of 'find_vma' > struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) > ^ > include/linux/mm.h:2759:24: note: previous definition is here > struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) > ^ > 1 error generated. Nice catch. The following amended patch should fix this: (I only added the mm/nommu.c changes) ----------------------------------- 8< ---------------------------------- mm: separate mmap locked assertion from find_vma This adds a new __find_vma() function, which implements find_vma minus the mmap_assert_locked() assertion. find_vma() is then implemented as an inline wrapper around __find_vma(). Signed-off-by: Michel Lespinasse --- drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++-- include/linux/mm.h | 9 ++++++++- mm/mmap.c | 5 ++--- mm/nommu.c | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 5ae812d60abe..94ab71a9b493 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -515,7 +515,7 @@ static void error_print_context(struct drm_i915_error_state_buf *m, } static struct i915_vma_coredump * -__find_vma(struct i915_vma_coredump *vma, const char *name) +__i915_find_vma(struct i915_vma_coredump *vma, const char *name) { while (vma) { if (strcmp(vma->name, name) == 0) @@ -529,7 +529,7 @@ __find_vma(struct i915_vma_coredump *vma, const char *name) static struct i915_vma_coredump * find_batch(const struct intel_engine_coredump *ee) { - return __find_vma(ee->vma, "batch"); + return __i915_find_vma(ee->vma, "batch"); } static void error_print_engine(struct drm_i915_error_state_buf *m, diff --git a/include/linux/mm.h b/include/linux/mm.h index 4600dbb98cef..6f7712179503 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2751,10 +2751,17 @@ extern int expand_upwards(struct vm_area_struct *vma, unsigned long address); #endif /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ -extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr); +extern struct vm_area_struct * __find_vma(struct mm_struct * mm, unsigned long addr); extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, struct vm_area_struct **pprev); +static inline +struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) +{ + mmap_assert_locked(mm); + return __find_vma(mm, addr); +} + /** * find_vma_intersection() - Look up the first VMA which intersects the interval * @mm: The process address space. diff --git a/mm/mmap.c b/mm/mmap.c index 1e8fdb0b51ed..b09a2c875507 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2276,12 +2276,11 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, EXPORT_SYMBOL(get_unmapped_area); /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ -struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) +struct vm_area_struct *__find_vma(struct mm_struct *mm, unsigned long addr) { struct rb_node *rb_node; struct vm_area_struct *vma; - mmap_assert_locked(mm); /* Check the cache first. */ vma = vmacache_find(mm, addr); if (likely(vma)) @@ -2308,7 +2307,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) return vma; } -EXPORT_SYMBOL(find_vma); +EXPORT_SYMBOL(__find_vma); /* * Same as find_vma, but also return a pointer to the previous VMA in *pprev. diff --git a/mm/nommu.c b/mm/nommu.c index 55a9e48a7a02..8d2582ff319f 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -663,7 +663,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) * look up the first VMA in which addr resides, NULL if none * - should be called with mm->mmap_lock at least held readlocked */ -struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) +struct vm_area_struct *__find_vma(struct mm_struct *mm, unsigned long addr) { struct vm_area_struct *vma; @@ -685,7 +685,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) return NULL; } -EXPORT_SYMBOL(find_vma); +EXPORT_SYMBOL(__find_vma); /* * find a VMA -- 2.20.1