From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1795013613; b=139L2oZyvGxJGYPo07ptwrNkP1Nfg1PfJE9n/B9+BicliCgzv3Q61YDmYopjFChYZinX kXLjs469OCMWxjFsuenH+PX++B9lhJ6ldUkKu53r8d6SaEVY14tUYCGpv1X5GYF/yusQg Lla8ygNjVCjPbETeafLhfLy5PrPmzIDCXOizc6mtsEEGHMCNprt86GEp73+ST3trAXeY+ qjPNHq8rgvsOhLXT2sG0PNfsqtkVjdzxdH6glNGNPymPfPnmVP32uee5deq8yXPMWRNHl 2atfEuzp3lnqHYWvKyFWxUTPh8Z9QWbEFEzJ+r+z6mHPaLyXNIRmZWfVPVS8S0z+TqQ== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795013613; h=Received:DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id:X-B4-Tracking: X-Change-ID:To:Cc:X-Mailer:X-Developer-Signature:X-Developer-Key: X-Endpoint-Received:X-Original-From:Reply-To; bh=JhqkB8+ikY0EQHy0mFR/yHf+TqnBEpjGFQ+Trl/H16U=; b=EVreaDoeiYClLn6KT4Ct8qS2Sssqj18qC1pQOadvSabRvddATGD3KJgE1jePLAcRQpYj miSP0bUYbV/wbZgCFfCR1f5FbPntIQIWH8kqDyakf5XMKHFICTWGwLjtyGA8vOG4bYzy3 XvpoVjMmi8vnJPQp/M0PAgJIPhv9xxU8B3G4zSq2guIvIjy70gS6flxJtz8tlfMvJC7WY NpSA449MPBEcHOToPXLYjEbVZJz7K2mKzXlL6so/zt0ThalV/dA2yqpi1+ShLz9iDgf/F B9FsRzCLXoKk1exXfpoRlYpqFlJpJEGpWNxoV4+n+C6FciP8MhXs09KW0cqdtVhX9Rg== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=D2572sYO; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2F39606A330 for ; Wed, 18 Nov 2026 14:53:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=D2572sYO Authentication-Results: smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 ARC-Seal: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; cv=none; t=1795013612; b=oGKtrIkr2Wv9BIdul9AeXXL/7AUJRYdXSPS3zAV1K9x8pOQptpFXrGZcmojnfDDQkSP+ fg52RYyL6E0ulGHomVvugDkwn4yxd3Mer0+f/nW3HyI8tWirFJ0TTXgwT0PTDQ0EtfUJK SX/oW4fgkbR2QXxoBMcDgwucKP5BiAH0zB5XOU5Ika1qDB0zOsqel7BTNATbMqcQpmYV2 /8FHO3lewJn4yu7/1/kxuN/g7Oh1+j8byTQ+L0ZPu1/CVaHZi6r0zNYNkG8WNvO4J1cam ziA1DEkn07QdNm3bMU6X+UcmBsJrbkTnjJT47zB2Gt9RvCv5fvDZBf2TcFeKzX3GYog== ARC-Message-Signature: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; c=relaxed/relaxed; t=1795013612; h=DKIM-Signature:Received:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:X-B4-Tracking:X-Change-ID:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key:X-Endpoint-Received: X-Original-From:Reply-To; bh=JhqkB8+ikY0EQHy0mFR/yHf+TqnBEpjGFQ+Trl/H16U=; b=Sef5YFaPiNY9XIJ3KtqBbqW7W7u2RdSbkkrhfxw3xspkq+O793RyUove+h9c4rXp3WL5 snC+uAPOjkjEFjWVhIsW86BZYyYKYSSPVqiEfem5qj6omIc3A9Gpgt5v3BNafvvMdfR+x BSdbRDFUUmJZHwbv/XerhMKDtKGOvGDL9F7CO/zSUxLVrEGKzJEZeUjQ4VFueVIDEJQOL +RWyf8DykIs7Z1fvDoNHxmioAoCJwfw/VwbOa+1+yc/kcfmk7/qpfZEKRHw2t3hRtitIc K+26OaAzV/AjIq+RqRUTHe9LoGGIMQhmT/AWTBeegzu+aUMHSN5YGPKSH6VHygYPvNg== ARC-Authentication-Results: i=1; smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 Received: from lkml.kernel.org (nexus.subspace.kernel.org [100.80.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 678C31F000C4; Wed, 18 Nov 2026 14:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795013612; bh=JhqkB8+ikY0EQHy0mFR/yHf+TqnBEpjGFQ+Trl/H16U=; h=From:Date:Subject:To:Cc:Reply-To; b=D2572sYOZOK3dO6DNHGR87m9WtzeiRfoNpMb4s+g3TzpORhBgYihQEU3Y5dOy6XI5 LQDe9PoOEQqeLmQDl8wQ9h/pCtRM4csAGtc9Jc7P5dJsdbO7YYzdP7x4E00s+PP8KV IgqPQubm44A1KWorJMmEy/c/OQEdDAHLdMUUhg6NzEZFyVHZCHIdEn0k6hzow00pUl o7rqgnsMAU4bHHTlDQznz5QrD/pWopIb8BlGilPfdiJ/SHhuo2Cj8qYol0xmCAAcEx caT9+mMjhvSRJWij8MjhC22rjP0Mf0SxSYG1pMCp6JRGk4pIm97DmokvtysYKI/t4F G8EKxg3LmJu2Q== Received: from nexus.subspace.kernel.org (localhost [IPv6:::1]) by lkml.kernel.org (Postfix) with ESMTP id ECFD04ADF5; Wed, 18 Nov 2026 14:53:31 +0000 (UTC) From: Suyuan Wang via B4 Relay Date: Wed, 18 Nov 2026 14:53:31 +0000 Subject: [PATCH] xen/pvcalls: return -EINTR from recvmsg when the wait is interrupted X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261118-xen-pvcalls-v1-1-5e9d662900a0@gmail.com> X-B4-Tracking: v=1; b=H4sIAOq7/WoC/yXMQQqDMBBG4avIrBvIBBHxKtKFib86ElLJtCKId 29ql9/ivZMUWaDUVSdl7KLySgX8qCgsQ5phZCwmZ13DzK05kMy2hyFGNfCTr4Mdwd5RKbaMSY7 71j//1o9fEd6/BV3XF046lM9vAAAA X-Change-ID: 20261118-xen-pvcalls-ebfb4c0de1b2 To: sstabellini@kernel.org, jgross@suse.com Cc: oleksandr_tyshchenko@epam.com, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1795013611; l=2573; i=shyckless@gmail.com; s=default; h=from:subject:message-id; bh=JS0N2by4izL7XI6U/P5YKixzFBa9rEd0luLKdyK1x98=; b=8hmEpcRcMvT3FgZ8jhjQzuy6IWqP2SSP25b2VY+7+Za5wAoI5L6TaM8tQaT4ccyBoc61ubOsj qWwMBB2oqy8CsaiwHbH+gXaG7fcVtJyGssZTqMFDNLJySiPErW/J6DP X-Developer-Key: i=shyckless@gmail.com; a=ed25519; pk=pMtccVGiWES3bV+7YBFuBclkvq2n2HBHQ5azaBrK2lY= X-Endpoint-Received: by B4 Relay for shyckless@gmail.com/default with auth_id=1498 X-Original-From: Suyuan Wang Reply-To: shyckless@gmail.com From: Suyuan Wang pvcalls_front_recvmsg() waits for data in a loop and ignores what wait_event_interruptible() returns: while (!(flags & MSG_DONTWAIT) && !pvcalls_front_read_todo(map)) { wait_event_interruptible(map->active.inflight_conn_req, pvcalls_front_read_todo(map)); } Once a signal is pending, wait_event_interruptible() returns -ERESTARTSYS right away without sleeping, and the loop calls it again. The caller then spins with map->active.in_mutex held until data arrives or the backend reports an error. The signal can't be handled while it spins, so the task can't be killed either, and other readers of the socket block on in_mutex. Return -EINTR when the wait is interrupted, as pvcalls_front_accept() already does for its interruptible waits. Jump to the end of the function so that in_mutex is released and pvcalls_exit_sock() is called. Found with a static analysis tool and checked by hand. Fixes: ae0d04052e07 ("xen/pvcalls: implement recvmsg") Co-developed-by: Kaixuan Li Signed-off-by: Kaixuan Li Signed-off-by: Suyuan Wang --- There are no in-tree callers of pvcalls_front_recvmsg(), so this only matters to code built on the exported frontend API. That's why I left out Cc: stable. Compile tested only (x86_64 with CONFIG_XEN_PVCALLS_FRONTEND=y, W=1 and sparse show no new warnings). I haven't run it in a Xen guest. --- drivers/xen/pvcalls-front.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c index 3e7aa807c317..5d6c8ba66849 100644 --- a/drivers/xen/pvcalls-front.c +++ b/drivers/xen/pvcalls-front.c @@ -693,8 +693,11 @@ int pvcalls_front_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, len = XEN_FLEX_RING_SIZE(PVCALLS_RING_ORDER); while (!(flags & MSG_DONTWAIT) && !pvcalls_front_read_todo(map)) { - wait_event_interruptible(map->active.inflight_conn_req, - pvcalls_front_read_todo(map)); + if (wait_event_interruptible(map->active.inflight_conn_req, + pvcalls_front_read_todo(map))) { + ret = -EINTR; + goto out; + } } ret = __read_ring(map->active.ring, &map->active.data, &msg->msg_iter, len, flags); @@ -706,6 +709,7 @@ int pvcalls_front_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, if (ret == -ENOTCONN) ret = 0; +out: mutex_unlock(&map->active.in_mutex); pvcalls_exit_sock(sock); return ret;