From patchwork Sun Apr 13 02:04:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14049173 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 D04FFC369AB for ; Sun, 13 Apr 2025 02:05:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77E8D68004E; Sat, 12 Apr 2025 22:04:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 68C8B680041; Sat, 12 Apr 2025 22:04:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52ED768004E; Sat, 12 Apr 2025 22:04:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2CA36680041 for ; Sat, 12 Apr 2025 22:04:59 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C120581CC6 for ; Sun, 13 Apr 2025 02:04:59 +0000 (UTC) X-FDA: 83327377518.02.3D12ADD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id E7C8840003 for ; Sun, 13 Apr 2025 02:04:57 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YplEmaMJ; spf=pass (imf07.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744509898; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LG6tXDmnP8G8MkHZOoO/Lg5rvAo2Y4/akxgGjSvAvag=; b=s5/Mwo/aVm9Q90bI6/ObzYING8WDH4Hxf2tWfUIYX81qGReyCLSvbBUL9A+4nOb5ZG5axj 2BDyXw0T85R5crtCgFnVQQ3/zoDSKnV/107KOUJfqk/d7iAYSzI7mQPya8pMfD8y0dQyUI xU5NOUzlC16TBbU1dAS+wxqhUTIVhUk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YplEmaMJ; spf=pass (imf07.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744509898; a=rsa-sha256; cv=none; b=qwfkUKiuFHG3vIThkawMbWCkXXTL4TxkaVsxMsAy1NOeWygCJW32swphgmN7eAYzGYnQxi SN06HF0GQiC0INxelkphwYKqQmT0mjmXAq/sr7Bnug5nHaQfyHHNUQP2H4o4ZGMqIqS9kE g1XQE9RK8sVZZnfRvrkPGWqI8pob7LE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744509897; 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: in-reply-to:in-reply-to:references:references; bh=LG6tXDmnP8G8MkHZOoO/Lg5rvAo2Y4/akxgGjSvAvag=; b=YplEmaMJOpQRWWZH0CYS44rF8UvkFYz9MniHoxgufyEN4y6P976tNYJAfnmfX8kfzYEbw4 Zg9eMLPOq1/rs6jEon5SvwzvPJiAvh/AyrI1dU3lC+xZ/fxaBLKi+fbpk5gx2BFeMugEzO bDBFUElOtI4ejcZLmUHpy8P3ikFUINw= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-257-9eRCweagMs6Bu0zXjU0TjA-1; Sat, 12 Apr 2025 22:04:55 -0400 X-MC-Unique: 9eRCweagMs6Bu0zXjU0TjA-1 X-Mimecast-MFC-AGG-ID: 9eRCweagMs6Bu0zXjU0TjA_1744509894 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F344218004A9; Sun, 13 Apr 2025 02:04:53 +0000 (UTC) Received: from localhost (unknown [10.72.112.43]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0E69C180B486; Sun, 13 Apr 2025 02:04:51 +0000 (UTC) Date: Sun, 13 Apr 2025 10:04:47 +0800 From: Baoquan He To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, david@redhat.com, osalvador@suse.de, yanjun.zhu@linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v5 4/4] mm/gup: clean up codes in fault_in_xxx() functions Message-ID: References: <20250410035717.473207-1-bhe@redhat.com> <20250410035717.473207-5-bhe@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250410035717.473207-5-bhe@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Queue-Id: E7C8840003 X-Stat-Signature: wndiyjuxnc99awsssp774ibngw8nomki X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744509897-571212 X-HE-Meta: U2FsdGVkX190IRXoeCVnupBvI/3gRHZjqiNMk72v/RjrT95cfFb48hKAbit0haO3cvSiuqNhG7HLM9EeSX4KyE13Fr6SCpeRv7h8k0owE18iMU9Gdd8yi39QhJGXToIvRuBLykN85p8GMBoTFov6pN7bK99sI9v0LqJJGSXPcAsTaNSNZwHuqE7cbid3T+e1hxmzwi1YDY9if3H+kwv0+EbBKy+4a3MlCE/Xx5XMbzZeeOV8JVUUcJD1uEl5v6u2AVcGKuiIoto9PBBw8TaICQylCBST0kjawg/oElerXO/EJ+V0ly4HgaziGtkLxp1pAd2gZopToYNmcYogKNn9gVjqxrj60t5DP1DNloMk1irXxBvXmoF97KXw23B/J0nrYTD2dOIE4OH9o12WrEux6R6O/jIAl0e2zV520IsKbMnln+rzBrG+n1BWpNrKKEQcR8rid4q06SydVQsKPtkbP6YxmB8soNLQ4kKtOvrdm6LzVWFW4Cb3OELHFGGX8LKJl9bmi7N8iq6fsZvpr+bfsLPgcZFxVPh3RBwWrtlCDcROaWHDbe1tbngIShNsiH0HMeZAlabU0MB/HI8Y8Fr0p6HRRgvWtqjHb2qxKuWY9SV3RJbDUzapAL4ITFljGMBeq+WuTzXjJQHFMUDsOhw5MejDiovn1813J+ggq7uvsZ22EeUE2PuHaMdg1APIJdvaRMbklx2/49f6dp1kNbj3W0x7s4ck1gOL/b1UbMsF8C9CMaYBmSfyC4/kRhNHdZncAR21oFXbI2gZYtXcOZj54KS8kTbYn96z/M48P2QMAxxO4cc2ndP2EfMC8g0pPvGRq6mhlGZ3mt6I8bKpTfd3PccVEkG+hrGY/dMhluicofJnV25RF90p/s4N0GWLFRHtyLZ9xdGpkrgyf9JtKiDPinbhASj2a+TliIOuILXsLuIiBWWycfSFylB61OH+dFJPoyIjXGGf9CIuwfLx5Bu 3ct3ciDq whpBD19WEsePY+N7dTACjfgc+kEtPeVBqWzPt5TrFgYe6XTAsVS+MZ77Y5XIFDf6E92KfMZhwzDQfjgdd3yQbrq1vdEI0gg80ZGMoE7c4R5dEDnURrQ2Nskp6jviJaL3SLZFFOFGhR2lO0NHY4eUFbRGlLdhvwGqv5R8TWoRstYlZ9wo7AzUiAh56JjR7tzQFD0eEWr0h7HVLqvBBR2DsVJizn7gRDrplaopvCXMcbwbDs0SIEYaID+QUQ5MEjM+MIm54MZ7Ud2WpnLCn4+gevSHOMpnVfOR9qhZW23E7eFxqiVovDpSewEZ+Ik7eiiRNXpfT69ovwPiqPTqu36Hk8fYfp2rwI6QZAceVMmK9NOC/d2oxYqeZhvlsCekHyyGXEvlqN342LiYnWF7HPvzjgXZbalCJ5UBi3HTyWX1Nb+oT36dSjpRAeoRqKaXu99QeVolCzOf/cid+noUIq18m7xIXF1su+8O72WrK 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: List-Subscribe: List-Unsubscribe: The code style in fault_in_readable() and fault_in_writable() is a little inconsistent with fault_in_safe_writeable(). In fault_in_readable() and fault_in_writable(), it uses 'uaddr' passed in as loop cursor. While in fault_in_safe_writeable(), local variable 'start' is used as loop cursor. This may mislead people when reading code or making change in these codes. Here define explicit loop cursor and use for loop to simplify codes in these three functions. These cleanup can make them be consistent in code style and improve readability. Signed-off-by: Baoquan He Acked-by: David Hildenbrand --- v4->v5: Address minor concerns from David: - Remove one blank line in fault_in_writable() added in v4; - Put the loop cursor initialization 'cur = start;' into the for loop initialization part. mm/gup.c | 62 ++++++++++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 77a5bc622567..f32168339390 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2113,28 +2113,22 @@ static long __get_user_pages_locked(struct mm_struct *mm, unsigned long start, */ size_t fault_in_writeable(char __user *uaddr, size_t size) { - char __user *start = uaddr, *end; + const unsigned long start = (unsigned long)uaddr; + const unsigned long end = start + size; + unsigned long cur; if (unlikely(size == 0)) return 0; if (!user_write_access_begin(uaddr, size)) return size; - if (!PAGE_ALIGNED(uaddr)) { - unsafe_put_user(0, uaddr, out); - uaddr = (char __user *)PAGE_ALIGN((unsigned long)uaddr); - } - end = (char __user *)PAGE_ALIGN((unsigned long)start + size); - if (unlikely(end < start)) - end = NULL; - while (uaddr != end) { - unsafe_put_user(0, uaddr, out); - uaddr += PAGE_SIZE; - } + /* Stop once we overflow to 0. */ + for (cur = start; cur && cur < end; cur = PAGE_ALIGN_DOWN(cur + PAGE_SIZE)) + unsafe_put_user(0, (char __user *)cur, out); out: user_write_access_end(); - if (size > uaddr - start) - return size - (uaddr - start); + if (size > cur - start) + return size - (cur - start); return 0; } EXPORT_SYMBOL(fault_in_writeable); @@ -2188,26 +2182,24 @@ EXPORT_SYMBOL(fault_in_subpage_writeable); */ size_t fault_in_safe_writeable(const char __user *uaddr, size_t size) { - unsigned long start = (unsigned long)uaddr, end; + const unsigned long start = (unsigned long)uaddr; + const unsigned long end = start + size; + unsigned long cur; struct mm_struct *mm = current->mm; bool unlocked = false; if (unlikely(size == 0)) return 0; - end = PAGE_ALIGN(start + size); - if (end < start) - end = 0; mmap_read_lock(mm); - do { - if (fixup_user_fault(mm, start, FAULT_FLAG_WRITE, &unlocked)) + /* Stop once we overflow to 0. */ + for (cur = start; cur && cur < end; cur = PAGE_ALIGN_DOWN(cur + PAGE_SIZE)) + if (fixup_user_fault(mm, cur, FAULT_FLAG_WRITE, &unlocked)) break; - start = (start + PAGE_SIZE) & PAGE_MASK; - } while (start != end); mmap_read_unlock(mm); - if (size > start - (unsigned long)uaddr) - return size - (start - (unsigned long)uaddr); + if (size > cur - start) + return size - (cur - start); return 0; } EXPORT_SYMBOL(fault_in_safe_writeable); @@ -2222,30 +2214,24 @@ EXPORT_SYMBOL(fault_in_safe_writeable); */ size_t fault_in_readable(const char __user *uaddr, size_t size) { - const char __user *start = uaddr, *end; + const unsigned long start = (unsigned long)uaddr; + const unsigned long end = start + size; + unsigned long cur; volatile char c; if (unlikely(size == 0)) return 0; if (!user_read_access_begin(uaddr, size)) return size; - if (!PAGE_ALIGNED(uaddr)) { - unsafe_get_user(c, uaddr, out); - uaddr = (const char __user *)PAGE_ALIGN((unsigned long)uaddr); - } - end = (const char __user *)PAGE_ALIGN((unsigned long)start + size); - if (unlikely(end < start)) - end = NULL; - while (uaddr != end) { - unsafe_get_user(c, uaddr, out); - uaddr += PAGE_SIZE; - } + /* Stop once we overflow to 0. */ + for (cur = start; cur && cur < end; cur = PAGE_ALIGN_DOWN(cur + PAGE_SIZE)) + unsafe_get_user(c, (const char __user *)cur, out); out: user_read_access_end(); (void)c; - if (size > uaddr - start) - return size - (uaddr - start); + if (size > cur - start) + return size - (cur - start); return 0; } EXPORT_SYMBOL(fault_in_readable);