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 5D647213228; Tue, 18 Feb 2025 20:27:06 +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=1739910426; cv=none; b=RPUIlGbUJqoeA5BsT2YWGKHVww+WvT0MlInNlQl3sRR8OjXB6XytRQ03l98c6LknpuUpoFu5DnGHfkPj8mDP4mGvsrGszU7P661Vy+L6eHvGTksKUNlZQHLQy//R/jFHOtoAA0Qj/0wC0YoVDphJ2H0h8EFtiw8jiuapBDyHoYo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739910426; c=relaxed/simple; bh=wOAL4Oqj9IeI2buYcEwBIqcYqke3ieKR71XPdXq3GHc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BhGXvYFOFoFodBSWkHCwMbNTuYjc0UOJfJDv/ZdGzlwSkCgaBv1spEMi8x9JiuYia168MeUjN+cqDEdXiprvPsq6tViVrJXx3Qjhy76MU4mpHpfoY0M5MSn4ofXJfC0HLtboMN0eEx6VAy7z32Mf9sOzAR/C9Fb7jCASHdYPeM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OoL3qxMI; 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="OoL3qxMI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E632AC4CEE2; Tue, 18 Feb 2025 20:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739910426; bh=wOAL4Oqj9IeI2buYcEwBIqcYqke3ieKR71XPdXq3GHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OoL3qxMIT3VwI76PFpXkjVypuiPwzPHrdr/TxrPOt1GWFs44hcUsGPfHMwcFLdX5W 0zJQ9r6Mj8RvofjeHx6kG7ajwd4Z74+EsX0kwcOnauyxW2eTV7TSGUrp/ymUzgrtXV XcfqawlEiqriR2lhqKJq4kNiZlCc+GA0mK3BXN6xwf/0t4nLzkA0zcugZExlFFRfhW MLGXhScjpq1/JiKe/NYezV5TfZX5+914hHELVf0eavyubW1sEXXWy54pfyJ1c9imn6 4yUbQRnBxr1ge5yP3xb7VU36omdlfSTrM0Jz/rwMu7T92gnNSmV8RsWnslDddqIxpT 7wG31Apbyhg9g== 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, tiwei.btw@antgroup.com, jiri@resnulli.us, u.kleine-koenig@pengutronix.de, linux-um@lists.infradead.org Subject: [PATCH AUTOSEL 6.12 22/31] um: virtio_uml: use raw spinlock Date: Tue, 18 Feb 2025 15:26:08 -0500 Message-Id: <20250218202619.3592630-22-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250218202619.3592630-1-sashal@kernel.org> References: <20250218202619.3592630-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.12.15 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 2b6e701776b6b..f0020e7c908d0 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; } @@ -1220,7 +1220,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