From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5ABB8272911; Tue, 18 Feb 2025 20:28:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739910525; cv=none; b=UrL9s8XXAXMxnR79kwqr010uRlTZpV/L6wAO5JdNWB0BFyOvyAprb2aBsfjFSWEuC4ljLPS3CZyU/q/GQoZq3zoE+fy2dZWnjIek2dV6C8h00MURMp/mzBa5uFASPedoX7Zo9WmtFshpiUYMZAn5KYLuo8/GNq6GlVwZmVY1VKg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739910525; c=relaxed/simple; bh=sYERlul87AXhhSQUHbZpMDP0T12IZn5GGQDnr+ED6cU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S3YwzLfpEZCwiKfCotic+K/UIgHWzxkMcFg3w8yabs3HCE7nPYvu7I/uVvPOaopTUM+Vm0LbSyk+OZXwoLoZEsqKDnWO5XmBMpW+cpddEKGgB0+Skbxf8v5C/YwUrBuqOJG/mNxC6CXBPpDBFKMtuiL4cpf4Oa16OqFXcKj1UCo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DoF8Y1MA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DoF8Y1MA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EAD16C4CEE2; Tue, 18 Feb 2025 20:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739910525; bh=sYERlul87AXhhSQUHbZpMDP0T12IZn5GGQDnr+ED6cU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DoF8Y1MAR39I9V6124/vkaOUXVJHls8JZtJyCOyezRSCNXkrXR/644cpOk72X2xIr 1zeXafp6uZ0aLm4+830RGIfVvsHPX/SKx7jhVACCXXR7AR62ajwLksx7ueYP5gxhUf UBXnb7HqNDriLJXylxWzCj6+LWbzkNHhl+8e1Bp6T7Ycv+DF5BgTuo4YI2eijMOfRL tOeJp3wra+/GsZFf6kcYnyqHpIyEUGOQCVQ7FwPITDpF2+3fkvgs6s2oafpDNU8xNU Zb0oe8wALh0Augan2sykYaSD5Fdx0gdRXW6MFbMpdXaacWxNyQzWgeaE+YmvA8YNkE 6Y/KvnijCDl1Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Richard Weinberger , Sasha Levin , anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, benjamin.berg@intel.com, mst@redhat.com, jiri@resnulli.us, tiwei.btw@antgroup.com, u.kleine-koenig@pengutronix.de, linux-um@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 12/13] um: virtio_uml: use raw spinlock Date: Tue, 18 Feb 2025 15:28:16 -0500 Message-Id: <20250218202819.3593598-12-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250218202819.3593598-1-sashal@kernel.org> References: <20250218202819.3593598-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.128 Content-Transfer-Encoding: 8bit From: Johannes Berg [ Upstream commit daa1a05ba431540097ec925d4e01d53ef29a98f1 ] This is needed because at least in time-travel the code can be called directly from the deep architecture and IRQ handling code. Link: https://patch.msgid.link/20250110125550.32479-7-johannes@sipsolutions.net Signed-off-by: Johannes Berg Signed-off-by: Richard Weinberger Signed-off-by: Sasha Levin --- arch/um/drivers/virtio_uml.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c index ddd080f6dd82e..64e8cd59014fb 100644 --- a/arch/um/drivers/virtio_uml.c +++ b/arch/um/drivers/virtio_uml.c @@ -52,7 +52,7 @@ struct virtio_uml_device { struct platform_device *pdev; struct virtio_uml_platform_data *pdata; - spinlock_t sock_lock; + raw_spinlock_t sock_lock; int sock, req_fd, irq; u64 features; u64 protocol_features; @@ -247,7 +247,7 @@ static int vhost_user_send(struct virtio_uml_device *vu_dev, if (request_ack) msg->header.flags |= VHOST_USER_FLAG_NEED_REPLY; - spin_lock_irqsave(&vu_dev->sock_lock, flags); + raw_spin_lock_irqsave(&vu_dev->sock_lock, flags); rc = full_sendmsg_fds(vu_dev->sock, msg, size, fds, num_fds); if (rc < 0) goto out; @@ -267,7 +267,7 @@ static int vhost_user_send(struct virtio_uml_device *vu_dev, } out: - spin_unlock_irqrestore(&vu_dev->sock_lock, flags); + raw_spin_unlock_irqrestore(&vu_dev->sock_lock, flags); return rc; } @@ -1218,7 +1218,7 @@ static int virtio_uml_probe(struct platform_device *pdev) goto error_free; vu_dev->sock = rc; - spin_lock_init(&vu_dev->sock_lock); + raw_spin_lock_init(&vu_dev->sock_lock); rc = vhost_user_init(vu_dev); if (rc) -- 2.39.5