From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx1.manguebit.org (mx1.manguebit.org [143.255.12.172]) (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 18F0747D92E; Tue, 3 Mar 2026 14:45:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=143.255.12.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772549132; cv=none; b=go1bOf36aqDo6E5QYDWqmbsXcjgYLn9FYWCygocGWpRmoMJVPKvj/pUoK3Wc/19HAHFdCrh0nb6d291qCeUK3sC66VRNGg2tc90V+brnKBBpW1vJNQTil7hOR2JNe2Rg/RBtJDXTxyjoK64PcUl2sWzLUBhCo/5eQg9BP+RgmwA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772549132; c=relaxed/simple; bh=uWqCFemI7r+X/cbgz+jKv99U9fftwMpeskyPhKG/Evw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=P+nhQqy/xxNVYhxpWOMYg7zfqXb8vcSwgdVbepVgvzcaNNcMp9LGIdpA6K3PUD5V7pbFHlu2rmHA3b0QQxnoJ8g/qYbpVzppoZvFM5W9C/q5XxNPgfj4hkg8huVDd1/d4/Mo/eW0NiRTnFNkl7wnymYNwQkf0SZZpaCxSy90xO4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manguebit.org; spf=pass smtp.mailfrom=manguebit.org; dkim=pass (2048-bit key) header.d=manguebit.org header.i=@manguebit.org header.b=9rIchIxM; arc=none smtp.client-ip=143.255.12.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manguebit.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=manguebit.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=manguebit.org header.i=@manguebit.org header.b="9rIchIxM" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=manguebit.org; s=dkim; h=Content-Transfer-Encoding:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Content-Type:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=wUO+aCyJo2eWc7hnrMWMxGT1gldL/gBTEFER51cjCdM=; b=9rIchIxMQB6+pDjDkyFYbY1Ue6 0BPBaaA7J159F5+lhTbqbhma8k21dLnXUWA/L/aTdmiEDsjKl9PMZZkeotz7rFjrD05jkiVE1ncPd 3v1JIyQpP+G30uVpZf4HLcDA+O8cxNJIpra1qqd/YEnBgPmawbwSGy/rmQ6e7lbw+ASxutJednWah ozB/PjyEw9OTCvVsmGFOCo2uHsZLZCaJQjWKDZ1on2SrcFRhnp7d2vaYYQxRvDGKSq6Cou/3lZdZC bdeuLkZWIl0pEfpzTHxe+5Egp26GCCdtnuyf/2QzIa14A8wZnb/tGF9nZ688oPekhnCt4ayyPOsvN 2dS4qAUQ==; Received: from pc by mx1.manguebit.org with local (Exim 4.99.1) id 1vxQzy-00000000A4Y-3cr7; Tue, 03 Mar 2026 11:45:22 -0300 From: Paulo Alcantara To: Christian Brauner Cc: Xiaoli Feng , "Paulo Alcantara (Red Hat)" , David Howells , netfs@lists.linux.dev, stable@vger.kernel.org, linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH] netfs: fix error handling in netfs_extract_user_iter() Date: Tue, 3 Mar 2026 11:45:22 -0300 Message-ID: <20260303144522.1292521-1-pc@manguebit.org> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: netfs@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In netfs_extract_user_iter(), if iov_iter_extract_pages() failed to extract user pages, bail out on -ENOMEM, otherwise return the error code only if @npages == 0, allowing short DIO reads and writes to be issued. This fixes mmapstress02 from LTP tests against CIFS. Reported-by: Xiaoli Feng Fixes: 85dd2c8ff368 ("netfs: Add a function to extract a UBUF or IOVEC into a BVEC iterator") Signed-off-by: Paulo Alcantara (Red Hat) Reviewed-by: David Howells Cc: netfs@lists.linux.dev Cc: stable@vger.kernel.org Cc: linux-cifs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org --- fs/netfs/iterator.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/netfs/iterator.c b/fs/netfs/iterator.c index 72a435e5fc6d..dc1039b41cf4 100644 --- a/fs/netfs/iterator.c +++ b/fs/netfs/iterator.c @@ -22,7 +22,7 @@ * * Extract the page fragments from the given amount of the source iterator and * build up a second iterator that refers to all of those bits. This allows - * the original iterator to disposed of. + * the original iterator to be disposed of. * * @extraction_flags can have ITER_ALLOW_P2PDMA set to request peer-to-peer DMA be * allowed on the pages extracted. @@ -67,8 +67,8 @@ ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len, ret = iov_iter_extract_pages(orig, &pages, count, max_pages - npages, extraction_flags, &offset); - if (ret < 0) { - pr_err("Couldn't get user pages (rc=%zd)\n", ret); + if (unlikely(ret <= 0)) { + ret = ret ?: -EIO; break; } @@ -97,6 +97,13 @@ ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len, npages += cur_npages; } + if (ret < 0 && (ret == -ENOMEM || npages == 0)) { + for (i = 0; i < npages; i++) + unpin_user_page(bv[i].bv_page); + kvfree(bv); + return ret; + } + iov_iter_bvec(new, orig->data_source, bv, npages, orig_len - count); return npages; } -- 2.53.0