From patchwork Thu Jan 30 17:09:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Foster X-Patchwork-Id: 13954741 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 4ECFA1F03DE for ; Thu, 30 Jan 2025 17:07:49 +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=1738256870; cv=none; b=hANNFJAsi0yVM2LfFvKu9QtsxGaWOkKORZ3uoe8OzeKfCKpdMkFzl1q37qMvXBndN/vJrrN08/pPwB74cY5k8BnOLSTuTEievEn84SHJ3BULnS/ehh1RGN9sfrNcRLMU0RnA3TrqSj+RW5iueDF7IzUxVzZVwaU2bDJoRQGi9rg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738256870; c=relaxed/simple; bh=lbE0ncRQAHCxmz6OZ0krfnko+/rOEkIe83zcnTw04fc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DISYv1hxF+St0tmoMLN1RMAzkB9f9kai0Ps+8pIZKesLc2RE94HJE6eWyqgSv91zgL8qKjngqfdir762+GbjflCC2kNVkyU9so4wqpMrPgsWClLShgEq9YFuL6zsw464sgjBw+jCqUvZfKjDafgcYsCbUdJIU2Hwe7ip5oNspAs= 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=X0E2bMI/; 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="X0E2bMI/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738256868; 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=Y/3n+3CqF5bkcm5ag7qCI2+ZZ+H1Wf/QP/jrJXyaQmg=; b=X0E2bMI/1NlrOrUGtaIQCB3ImlW7QYHdSO+BluU5tyMfhFoBBenK8XgKzAjEtgGdBne8hg LZYLmK5EXgwWsStKkqHbrCX9QqYaIY3MhQgKy7gionpLUIOC/A1rXFZrm8YMQnZFmshQqZ DdQbo4DKhMBY3BngYuKEQWXV9EgqV7I= Received: from mx-prod-mc-02.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-387-OtVSqm6xNZqQvDaE2oSYbQ-1; Thu, 30 Jan 2025 12:07:44 -0500 X-MC-Unique: OtVSqm6xNZqQvDaE2oSYbQ-1 X-Mimecast-MFC-AGG-ID: OtVSqm6xNZqQvDaE2oSYbQ 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D7A221955DC6; Thu, 30 Jan 2025 17:07:42 +0000 (UTC) Received: from bfoster.redhat.com (unknown [10.22.80.113]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1ABE930001BE; Thu, 30 Jan 2025 17:07:41 +0000 (UTC) From: Brian Foster To: linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, Christoph Hellwig Subject: [PATCH v3 6/7] iomap: advance the iter directly on unshare range Date: Thu, 30 Jan 2025 12:09:47 -0500 Message-ID: <20250130170949.916098-7-bfoster@redhat.com> In-Reply-To: <20250130170949.916098-1-bfoster@redhat.com> References: <20250130170949.916098-1-bfoster@redhat.com> Precedence: bulk X-Mailing-List: linux-fsdevel@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 Modify unshare range to advance the iter directly. Replace the local pos and length calculations with direct advances and loop based on iter state instead. Signed-off-by: Brian Foster Reviewed-by: Christoph Hellwig --- fs/iomap/buffered-io.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 678c189faa58..f953bf66beb1 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1267,20 +1267,19 @@ EXPORT_SYMBOL_GPL(iomap_write_delalloc_release); static loff_t iomap_unshare_iter(struct iomap_iter *iter) { struct iomap *iomap = &iter->iomap; - loff_t pos = iter->pos; - loff_t length = iomap_length(iter); - loff_t written = 0; + u64 bytes = iomap_length(iter); + int status; if (!iomap_want_unshare_iter(iter)) - return length; + return iomap_iter_advance(iter, &bytes); do { struct folio *folio; - int status; size_t offset; - size_t bytes = min_t(u64, SIZE_MAX, length); + loff_t pos = iter->pos; bool ret; + bytes = min_t(u64, SIZE_MAX, bytes); status = iomap_write_begin(iter, pos, bytes, &folio); if (unlikely(status)) return status; @@ -1298,14 +1297,14 @@ static loff_t iomap_unshare_iter(struct iomap_iter *iter) cond_resched(); - pos += bytes; - written += bytes; - length -= bytes; - balance_dirty_pages_ratelimited(iter->inode->i_mapping); - } while (length > 0); - return written; + status = iomap_iter_advance(iter, &bytes); + if (status) + break; + } while (bytes > 0); + + return status; } int