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.133.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 A46FC3DA5A1 for ; Mon, 27 Apr 2026 15:30:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777303827; cv=none; b=OJDD/mkegYfD3BFcRnuFoUYai8sBHcaNxZwvJA1Z6TO14/bqY0XUWSWMZ/zL7vyT4+YYvv5MMSCTFXck8arXY5HK+cUJZx63K6i1kJ/ldwwG8V0dDabuHXjTh/6/fD3FbMlf2ENqugmODsu9R2S5lMKxe/Qjtw86n8+RWuQnXFc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777303827; c=relaxed/simple; bh=TzKE7QcFZf39E2UkvuI1rxQbsvby4wW7m4gGjN+BIzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RS4RjWVnONeCH0hG/9/0wHlAS2bfkIN2vyLY5wPJ5yRGidGH9MYsSnVeOmqKdeNdPbux0/EimFy1j11mJftmST+qwHw+pY7of7CMcs6rahaK3EWULB6G1/rHVl8Jt9JGO+X/9EP7gqP10gRO1Nq4AivUoU5IDO3UUkZL3JyMfWw= 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=btbuFHrX; arc=none smtp.client-ip=170.10.133.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="btbuFHrX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777303824; 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=REMGICrXXI7qiSN2rIwTeEeIpWS2D3QtA/yikvDYdpo=; b=btbuFHrXzOpVbKJ8LMsnDjkUyov2FGc0FJGOWP6Pag8oPjkNROeLtXejPdnv5m34FxmEnP H0pZMy6/ZheVGF1WOrTKa05LOEoaJNEPjbHCijJMY0h0q5OQZjmQ1KcWslDmFsCzWbnI+s koIA7HVBS6I0M2Tny8wWXUJnU+4RJ/c= Received: from mx-prod-mc-01.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-646-o_86Fju7MJyIRarjiHxZSQ-1; Mon, 27 Apr 2026 11:30:19 -0400 X-MC-Unique: o_86Fju7MJyIRarjiHxZSQ-1 X-Mimecast-MFC-AGG-ID: o_86Fju7MJyIRarjiHxZSQ_1777303816 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AC26719560A2; Mon, 27 Apr 2026 15:30:15 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.32.126]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BF3EC19560AB; Mon, 27 Apr 2026 15:30:12 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Paulo Alcantara , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 03/22] netfs: Fix missing locking around retry adding new subreqs Date: Mon, 27 Apr 2026 16:29:30 +0100 Message-ID: <20260427152953.180038-4-dhowells@redhat.com> In-Reply-To: <20260427152953.180038-1-dhowells@redhat.com> References: <20260427152953.180038-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Fix netfs_retry_read_subrequests() and netfs_retry_write_stream() to take the appropriate lock when adding extra subrequests into stream->subrequests. Fixes: e2d46f2ec332 ("netfs: Change the read result collector to only use one work item") Fixes: 288ace2f57c9 ("netfs: New writeback implementation") Closes: https://sashiko.dev/#/patchset/20260425125426.3855807-1-dhowells%40redhat.com Signed-off-by: David Howells cc: Paulo Alcantara cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/read_retry.c | 2 ++ fs/netfs/write_retry.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fs/netfs/read_retry.c b/fs/netfs/read_retry.c index cca9ac43c077..b34561e257f0 100644 --- a/fs/netfs/read_retry.c +++ b/fs/netfs/read_retry.c @@ -203,7 +203,9 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq) refcount_read(&subreq->ref), netfs_sreq_trace_new); + spin_lock(&rreq->lock); list_add(&subreq->rreq_link, &to->rreq_link); + spin_unlock(&rreq->lock); to = list_next_entry(to, rreq_link); trace_netfs_sreq(subreq, netfs_sreq_trace_retry); diff --git a/fs/netfs/write_retry.c b/fs/netfs/write_retry.c index 29489a23a220..db0f23708b2d 100644 --- a/fs/netfs/write_retry.c +++ b/fs/netfs/write_retry.c @@ -153,7 +153,9 @@ static void netfs_retry_write_stream(struct netfs_io_request *wreq, netfs_sreq_trace_new); trace_netfs_sreq(subreq, netfs_sreq_trace_split); + spin_lock(&wreq->lock); list_add(&subreq->rreq_link, &to->rreq_link); + spin_unlock(&wreq->lock); to = list_next_entry(to, rreq_link); trace_netfs_sreq(subreq, netfs_sreq_trace_retry);