From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9633841DEC8; Sat, 12 Sep 2026 09:35:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789205718; cv=none; b=rLxEG+qZTgoi8ETQLbH2wQuhfWlxxQ8K1F/3pxEMi0MbY3hVAQt38SlxGxK+/gJvV8r0jKUEMnzrWIpRPbf4ElggVe38rqSxRzzwB6Cnqu3gpT0lsiRPgtdKdBALlxtVBxNXlJkz1aha5yDmXf16qq9SwaQNCN/8v3IjPyPTcHg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789205718; c=relaxed/simple; bh=zZ2NLVOrKNnNq1lFh3yeABCG1Cb4PNJliHoBplGQwvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H37G7YDbe7IERd3OD3PNYMYPSZAcr5OydCZKg1yUn2NrZVMCNc1btcGe3sz9hPBo/3TXcnHxQicHjhF6ijoVETpKROZb9klqpEgkeVwBu61QP22ZnEcD3dn6cM/T9MyCvKxwKqNY9YgRk+dUmi3QoZSJRqj+Z7fN5yuXs00WPxk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Tb87HNR8; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Tb87HNR8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2263A1F000FF; Sat, 12 Sep 2026 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789205715; bh=p2+4yqxU0Xw7a2lFpT/mQ6TU+Likj1pKX7CBQwU7A04=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Tb87HNR8/DlDA7XtlRlwStpDF/fBftmH2AmUBrwaFWfemqsO3PFW0bKU1nbZFb4QV SNVJp6icCz3uuacdQ1WiVmCSIXln7Fy+UcOPryIL8P53w/5LtqFfnYnoFAm5cxQN1u N6noh7a2XetCaRLww/A4vgUIotHjYwwbNKVO6RlU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pankaj Gupta , Li Chen , "Michael S. Tsirkin" , Sasha Levin Subject: [PATCH 6.18 0059/1518] nvdimm: virtio_pmem: use READ_ONCE()/WRITE_ONCE() for wait flags Date: Sat, 12 Sep 2026 08:37:08 +0200 Message-ID: <20260912065624.783239523@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li Chen [ Upstream commit 08e72a5ba1ab9dc0adf993ff0f4d606a1e3445a8 ] Use READ_ONCE()/WRITE_ONCE() for the wait_event() flags (done and wq_buf_avail). They are observed by waiters without pmem_lock, so make the accesses explicit single loads/stores and avoid compiler reordering/caching across the wait/wake paths. Acked-by: Pankaj Gupta Signed-off-by: Li Chen Signed-off-by: Michael S. Tsirkin Message-ID: <20260630092338.2094628-8-me@linux.beauty> Stable-dep-of: e57140944b5a ("nvdimm: virtio_pmem: refcount requests for token lifetime") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/nvdimm/nd_virtio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/nvdimm/nd_virtio.c +++ b/drivers/nvdimm/nd_virtio.c @@ -24,9 +24,9 @@ static void virtio_pmem_wake_one_waiter( req_buf = list_first_entry(&vpmem->req_list, struct virtio_pmem_request, list); - req_buf->wq_buf_avail = true; + list_del_init(&req_buf->list); + WRITE_ONCE(req_buf->wq_buf_avail, true); wake_up(&req_buf->wq_buf); - list_del(&req_buf->list); } /* The interrupt handler */ @@ -40,7 +40,7 @@ void virtio_pmem_host_ack(struct virtque spin_lock_irqsave(&vpmem->pmem_lock, flags); while ((req_data = virtqueue_get_buf(vq, &len)) != NULL) { virtio_pmem_wake_one_waiter(vpmem); - req_data->done = true; + WRITE_ONCE(req_data->done, true); wake_up(&req_data->host_acked); } spin_unlock_irqrestore(&vpmem->pmem_lock, flags); @@ -72,7 +72,7 @@ static int virtio_pmem_flush(struct nd_r if (!req_data) return -ENOMEM; - req_data->done = false; + WRITE_ONCE(req_data->done, false); init_waitqueue_head(&req_data->host_acked); init_waitqueue_head(&req_data->wq_buf); INIT_LIST_HEAD(&req_data->list); @@ -93,12 +93,12 @@ static int virtio_pmem_flush(struct nd_r GFP_ATOMIC)) == -ENOSPC) { dev_info(&vdev->dev, "failed to send command to virtio pmem device, no free slots in the virtqueue\n"); - req_data->wq_buf_avail = false; + WRITE_ONCE(req_data->wq_buf_avail, false); list_add_tail(&req_data->list, &vpmem->req_list); spin_unlock_irqrestore(&vpmem->pmem_lock, flags); /* A host response results in "host_ack" getting called */ - wait_event(req_data->wq_buf, req_data->wq_buf_avail); + wait_event(req_data->wq_buf, READ_ONCE(req_data->wq_buf_avail)); spin_lock_irqsave(&vpmem->pmem_lock, flags); } err1 = virtqueue_kick(vpmem->req_vq); @@ -112,7 +112,7 @@ static int virtio_pmem_flush(struct nd_r err = -EIO; } else { /* A host response results in "host_ack" getting called */ - wait_event(req_data->host_acked, req_data->done); + wait_event(req_data->host_acked, READ_ONCE(req_data->done)); err = le32_to_cpu(req_data->resp.ret); }