From patchwork Wed Feb 12 13:57:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Foster X-Patchwork-Id: 13971679 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 6ABE420E6F8 for ; Wed, 12 Feb 2025 13:55:03 +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=1739368504; cv=none; b=uGlIJ+/g1GJJ0/K/IG7IuL+Us1H6LCo2igG7gEwBKkjk5SGYzx0IFm/I6P4qX2Q7pKF6ZGo7eUrtugJSbBYM0EpEL3IH3+kkpJTeH5VHALiimfJCPRuVZ495ahvbQsp5+bxmFHkxnAfiQ4CY+Ccjv2frLAYOU4XC+MbY6JW11nk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739368504; c=relaxed/simple; bh=BZ0EXFVtx0bypwGFoiIDPf3VnOCDey5nDk2uYFXKRE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BRl0S53L9RNhtak05iXUWoB+2dCT9sQDdZQLAE2swOnpwiJyLbPCtGkUU3FwPsZaiHTGKFdCx7C5EYsRREqlY9ex6RYfVZZYTgnSX4JD3IFXzXR5pc4Ttp/dq9G99Ah/4pp0hL5eXOAAWGt8+WNRR/+M2uTbuNOGn8BJK6BT9I8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=SFZ09Kn5; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="SFZ09Kn5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739368502; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iP2KfwV21yDB6zRXNXD8gha5Sw+1taL4/Qnp0xAyLq0=; b=SFZ09Kn5UrfaRz6uwWczwlDVB3dFG5+beeSQpOkLfnSWC2LADsrreohI9vq/OGSg6hIrfv W+GB2W/ImYvJZt+9ED6h2cSIcTHK56+OpZkR4jtHHSj/YAMIqi/oD5WeiND+/wnRrRpnwF A3p+FBfENqeUH3oyEZtsb8nR45g1Yw4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-1hv2-2gINiGFL3REmRZ07A-1; Wed, 12 Feb 2025 08:54:57 -0500 X-MC-Unique: 1hv2-2gINiGFL3REmRZ07A-1 X-Mimecast-MFC-AGG-ID: 1hv2-2gINiGFL3REmRZ07A_1739368496 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6443B1956096; Wed, 12 Feb 2025 13:54:56 +0000 (UTC) Received: from bfoster.redhat.com (unknown [10.22.88.88]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6D52D3001D10; Wed, 12 Feb 2025 13:54:55 +0000 (UTC) From: Brian Foster To: linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, Christoph Hellwig , "Darrick J . Wong" Subject: [PATCH 08/10] dax: advance the iomap_iter on pte and pmd faults Date: Wed, 12 Feb 2025 08:57:10 -0500 Message-ID: <20250212135712.506987-9-bfoster@redhat.com> In-Reply-To: <20250212135712.506987-1-bfoster@redhat.com> References: <20250212135712.506987-1-bfoster@redhat.com> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Advance the iomap_iter on PTE and PMD faults. Each of these operations assign a hardcoded size to iter.processed. Replace those with an advance and status return. Signed-off-by: Brian Foster --- fs/dax.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 3de9120edf32..85dc5c5b8332 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1776,8 +1776,10 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, ret |= VM_FAULT_MAJOR; } - if (!(ret & VM_FAULT_ERROR)) - iter.processed = PAGE_SIZE; + if (!(ret & VM_FAULT_ERROR)) { + u64 length = PAGE_SIZE; + iter.processed = iomap_iter_advance(&iter, &length); + } } if (iomap_errp) @@ -1890,8 +1892,10 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, continue; /* actually breaks out of the loop */ ret = dax_fault_iter(vmf, &iter, pfnp, &xas, &entry, true); - if (ret != VM_FAULT_FALLBACK) - iter.processed = PMD_SIZE; + if (ret != VM_FAULT_FALLBACK) { + u64 length = PMD_SIZE; + iter.processed = iomap_iter_advance(&iter, &length); + } } unlock_entry: