From patchwork Fri May 19 09:39:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13248086 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4892C77B7A for ; Fri, 19 May 2023 09:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=XtE0X+Sz9tkAWYYqkAQIjG2xfTQDbSlN6NcZi3r9R2s=; b=iOzHqLASnYXPRC A0vy8N6DjNHZCE4o1RTv2KEk0Wt6L1GT3sxd10lt5IJi74YcWkQZl5BAmvZ6lBd6VS+dQJFv72Jho kz5PT0lHJAUYgV8nvNm6iTki+VQXHqwE+m+1xnZrFvvXugGIPWJGeT6AeGaHYUBLbY1QMJFbwTaC7 ERJ16ttVK6WO/LIaIyENnlbZok3v0kAvNNshGrekQF3b/adFaQc5Zc9fxckGNBQA5YLZ0lKzj5Z41 tvx4TnSbIcjbO99MAjDwkfC5mA0jpN/hLLY+1XHNgGXW8ghVgeUdZoSC7p4cdIutRrL1gZ5zHc3gv 0c6rgEZTzsLve+e2Fycg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pzwam-00FkfQ-30; Fri, 19 May 2023 09:40:08 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pzwaj-00FkeN-1n for linux-arm-kernel@lists.infradead.org; Fri, 19 May 2023 09:40:06 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1A7BF655A8; Fri, 19 May 2023 09:40:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00C86C433EF; Fri, 19 May 2023 09:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684489204; bh=62m/R5D6FGhqWG6KoI9PHPEn7TdMdQqLFV3wk0LBtDc=; h=From:To:Cc:Subject:Date:From; b=r5ynEHQ4VnYlo+YQjrf4A6aNXFbJk6j3c64Y7p0QM+DrWvOKJbZh68x46Tqydb38O MzJEmqOAOCv/UjBxt/7hYmy5B5C8xXNk+Pk4slcPAxTzm5btMMHC8Tq4NLUcW99nsw EHkGmjo/iZ9JE/YY1bu16vysaEMjywfEh8dG2cv4T4U7F1sYQWJ137x0R7n1LKD+ug 5o7PlE0O4QN5ybvdtJkliLy1JQG4V3dwzKwfGg4D+x90k9W+F1nhotMLMP+WPAY/so mQGAkaUOWqty6IqB1mzWmq2/FnYe5i3AgFTYmLaxD46SMuJQ7Cr0Ckz7+VFoXphUWy fEs8pclnp2+HQ== From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , Catalin Marinas , Will Deacon , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-perf-users@vger.kernel.org Subject: [PATCH] [suggestion] mm/gup: avoid IS_ERR_OR_NULL Date: Fri, 19 May 2023 11:39:13 +0200 Message-Id: <20230519093953.10972-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230519_024005_680122_D8AA727A X-CRM114-Status: GOOD ( 21.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann While looking at an unused-variable warning, I noticed a new interface coming in that requires the use of IS_ERR_OR_NULL(), which tends to indicate bad interface design and is usually surprising to users. Change get_user_page_vma_remote() to return -EIO when no pages were found and adapt the callers to match. Fixes: eca1a00155df ("mm/gup: remove vmas parameter from get_user_pages_remote()") Signed-off-by: Arnd Bergmann --- I see the real bug is already fixed, but this seemed worth pointing out still. Not sure if this is the best way to handle the return types here, but the version in linux-next doesn't look great either. --- arch/arm64/kernel/mte.c | 4 ++-- include/linux/mm.h | 2 +- kernel/events/uprobes.c | 5 ++++- mm/memory.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 4c5ef9b20065..6983ba35ce16 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -434,8 +434,8 @@ static int __access_remote_tags(struct mm_struct *mm, unsigned long addr, struct page *page = get_user_page_vma_remote(mm, addr, gup_flags, &vma); - if (IS_ERR_OR_NULL(page)) { - err = page == NULL ? -EIO : PTR_ERR(page); + if (IS_ERR(page)) { + err = PTR_ERR(page); break; } diff --git a/include/linux/mm.h b/include/linux/mm.h index 42ff3e04c006..4bb172e4818c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2397,7 +2397,7 @@ static inline struct page *get_user_page_vma_remote(struct mm_struct *mm, if (got < 0) return ERR_PTR(got); if (got == 0) - return NULL; + return ERR_PTR(-EIO); vma = vma_lookup(mm, addr); if (WARN_ON_ONCE(!vma)) { diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index cac3aef7c6f7..9cf2d4ba760e 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -474,7 +474,10 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, gup_flags |= FOLL_SPLIT_PMD; /* Read the page with vaddr into memory */ old_page = get_user_page_vma_remote(mm, vaddr, gup_flags, &vma); - if (IS_ERR_OR_NULL(old_page)) + if (old_page == ERR_PTR(-EIO)) + return 0; + + if (IS_ERR(old_page)) return PTR_ERR(old_page); ret = verify_opcode(old_page, vaddr, &opcode); diff --git a/mm/memory.c b/mm/memory.c index 8358f3b853f2..f9a81278e76d 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5604,7 +5604,7 @@ int __access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, struct page *page = get_user_page_vma_remote(mm, addr, gup_flags, &vma); - if (IS_ERR_OR_NULL(page)) { + if (IS_ERR(page)) { #ifndef CONFIG_HAVE_IOREMAP_PROT break; #else