From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABF5935AAC9 for ; Thu, 21 Aug 2025 20:07:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806875; cv=none; b=BZ0BI9dLipOKAtT9ncdqp9QryPT3lBeBdy9lnpKOwRmwy3aD49j5ieBlD8gpPt0OeOicY6ibUInL2wsrKbWCcox+uUoan5lVlBO87CBV0LGIvErAKCShDYwdEJZouILcZyvQP3XKn8ydAK857zW74JmfePOAIbvOyUafh58UVyw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806875; c=relaxed/simple; bh=d4tmPeOlqOBXo+X4Tiv9h/CbkpHAugux1EiNuLc/Y0E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uo33/Lvd7O9fjzNLMQhTv3Z4m3p1xjGrrP2CvS63OkurhIKerye4Vf25XoBodU9WAc18R408HzM3b8fDQ4AATyBFnfOOcSWG8tnmNyCnmJ6RCG8FU/2lmN2omkTGve7n6RU02j1Lx+xtiS6aeigFS9ainxch+/DVpTaMbNwrG3Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ApVUgePM; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ApVUgePM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755806872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MzMWVCGQW0mP4+/ULAfe7CdOmgWkAKLnoxAB4Fy092E=; b=ApVUgePMc5w7rL41HNMIKF85AcMs6Un4ujFWJA5x+7+Llhbk1+gVkmabnDQ0P0g6RwRZ6I hiG/PTnBi6M9L8qRsc++NZhZs06JhKlMLLamkv6/9nyiqk5kpcRGlad8oxOAC+Nn5J3rGI 2Nt7rHQpw5MKfM1CUw8SvaJu7Y3EaHY= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-mptbyAlSNbeHd5NcdCcVFA-1; Thu, 21 Aug 2025 16:07:50 -0400 X-MC-Unique: mptbyAlSNbeHd5NcdCcVFA-1 X-Mimecast-MFC-AGG-ID: mptbyAlSNbeHd5NcdCcVFA_1755806869 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-45a1b0caae1so7449045e9.3 for ; Thu, 21 Aug 2025 13:07:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755806869; x=1756411669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MzMWVCGQW0mP4+/ULAfe7CdOmgWkAKLnoxAB4Fy092E=; b=axyyWonLbiN+1Ar4H3QJNVCtvprBhcrhLoS+8G2AJRjJT3Q0pRn8H6byP8HaMQrVty 1e8bqmF6BCA5Tlwj8rhMuXOqpS2i+rHVvJWGGkZBbVZBm0vG8OSbBPYsYJnmJqOpEC2u oSD6Rgr2MGcJRsUVy+KWJgK6hRKvDnDAICy14RsWVMhDaNPPlJYzGTYwI+NXukN0m2GP QHxkQ+rlks8tbOcrIyPvyLiuiYhalouGtTUg0DuRoAnQw3omnTyWWF41Aha05DrGYGeO +slBLfjc0bz5OOJWAYLu/cw94I7u8EAPSeVifTea4KJ4uPvUXfLirvdiXi57ahc+L9hp syPA== X-Forwarded-Encrypted: i=1; AJvYcCXYC+QCvFJ+oBM0zsMvwMKoORfCJYeasxItatQqerD0UA0QOP8z08XmKyBhADL6w08pfP8zCwI=@vger.kernel.org X-Gm-Message-State: AOJu0YzBwG+oFh1clQU2GwtVAFDIzFRK9jQrB5lJy7x/AVQVEerKlAwW gCMJdQUPpyN0qQpHsAi7Tr11MeF8JmZTJeB6EEI0B9tDW5P1atGO0Hcg2Ux3n7feWu241Fdp8gB jyO7HzF1vgByzeE1CHBl6wWBH/KgyVPNW26vy3eJ1hCHP4qvCU6Po0Zu7HA== X-Gm-Gg: ASbGncuk73RT7KPcoOZ4vFvqCkMfGsOAi44n9D9B2AXKU9Ws/MbPVJROMUfs/yYSQwO TqA/P+CbEBauztMSWMhlD9JMyrUC+bQEMnWoj6weF4gUoNTf0huuHaFmOmRtcIye4Mz4La/z09q 8kl+Pw+Kavp10vlRFIq6cVpFEqSPcMpAA2y4zXPJ6TnIhSahr2QJiZjvpnEEtyi2B5XCWcB+5bB U5vV6/D6UfMT8F9rIctJY+jbgDXZCCOBxlo7Zssc0VE7nrFOISQ/fh42helJXhakI0hVWBfMgj1 baSui94326hYIQeyb4gZ128bZgtriyLL3NCy4f6DZMr7ZO3FmaPPMPOD3Y5d5p1eyh3dLDB051o MsP4zUJSAtTXXtGxTtwxalg== X-Received: by 2002:a05:6000:2901:b0:3b7:c703:ce4 with SMTP id ffacd0b85a97d-3c5dcff5f3amr167804f8f.59.1755806868897; Thu, 21 Aug 2025 13:07:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCm64ALptQrKyrLlaLt4xJ2vziBy3gZm4Q1WMVX6wnWhr2W2tRcHnZJHBwxpAOnTfL4mKx+A== X-Received: by 2002:a05:6000:2901:b0:3b7:c703:ce4 with SMTP id ffacd0b85a97d-3c5dcff5f3amr167760f8f.59.1755806868453; Thu, 21 Aug 2025 13:07:48 -0700 (PDT) Received: from localhost (p200300d82f26ba0008036ec5991806fd.dip0.t-ipconnect.de. [2003:d8:2f26:ba00:803:6ec5:9918:6fd]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3c5826751d5sm1323274f8f.14.2025.08.21.13.07.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Aug 2025 13:07:47 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: David Hildenbrand , Alexander Potapenko , Andrew Morton , Brendan Jackman , Christoph Lameter , Dennis Zhou , Dmitry Vyukov , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, iommu@lists.linux.dev, io-uring@vger.kernel.org, Jason Gunthorpe , Jens Axboe , Johannes Weiner , John Hubbard , kasan-dev@googlegroups.com, kvm@vger.kernel.org, "Liam R. Howlett" , Linus Torvalds , linux-arm-kernel@axis.com, linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-ide@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, Lorenzo Stoakes , Marco Elver , Marek Szyprowski , Michal Hocko , Mike Rapoport , Muchun Song , netdev@vger.kernel.org, Oscar Salvador , Peter Xu , Robin Murphy , Suren Baghdasaryan , Tejun Heo , virtualization@lists.linux.dev, Vlastimil Babka , wireguard@lists.zx2c4.com, x86@kernel.org, Zi Yan Subject: [PATCH RFC 15/35] fs: hugetlbfs: remove nth_page() usage within folio in adjust_range_hwpoison() Date: Thu, 21 Aug 2025 22:06:41 +0200 Message-ID: <20250821200701.1329277-16-david@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250821200701.1329277-1-david@redhat.com> References: <20250821200701.1329277-1-david@redhat.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The nth_page() is not really required anymore, so let's remove it. While at it, cleanup and simplify the code a bit. Signed-off-by: David Hildenbrand --- fs/hugetlbfs/inode.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 34d496a2b7de6..dc981509a7717 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -198,31 +198,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, static size_t adjust_range_hwpoison(struct folio *folio, size_t offset, size_t bytes) { - struct page *page; - size_t n = 0; - size_t res = 0; + struct page *page = folio_page(folio, offset / PAGE_SIZE); + size_t n, safe_bytes; - /* First page to start the loop. */ - page = folio_page(folio, offset / PAGE_SIZE); offset %= PAGE_SIZE; - while (1) { + for (safe_bytes = 0; safe_bytes < bytes; safe_bytes += n) { + if (is_raw_hwpoison_page_in_hugepage(page)) break; /* Safe to read n bytes without touching HWPOISON subpage. */ - n = min(bytes, (size_t)PAGE_SIZE - offset); - res += n; - bytes -= n; - if (!bytes || !n) - break; - offset += n; - if (offset == PAGE_SIZE) { - page = nth_page(page, 1); - offset = 0; - } + n = min(bytes - safe_bytes, (size_t)PAGE_SIZE - offset); + offset = 0; + page++; } - return res; + return safe_bytes; } /* -- 2.50.1