From patchwork Sun Jan 22 10:05:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 46923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1089916wrn; Sun, 22 Jan 2023 02:18:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXsobePqmL1JND0FCJ4OFeOmZpGAhpsSZiJiKiMdddgKSbP4qBn4RORyJGdSyAZ6Rtyms/95 X-Received: by 2002:a17:902:834b:b0:192:d230:6778 with SMTP id z11-20020a170902834b00b00192d2306778mr42113480pln.13.1674382708937; Sun, 22 Jan 2023 02:18:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674382708; cv=none; d=google.com; s=arc-20160816; b=sUlFh5DOXORhp+tXtfUHHf94m8Sb3/UPXPGPG7Ia/LAFUyCSCGMTBDQbqVIsPV0wZb GiMRy/7OFOZ0QBqlvlZLSzCi0K0yMOIgiR0MUHW67r2VisdMQOOVMEJRS2fvBlhd4ATj aIya4j+R/1LY5NHJHxQATxdQeTUPKt+HWB0gCd5FP31bbzjKrexvNo95Ebn91is3bjlS ZRteeyzQsJAAzdXt4oTIwb48XEJPqsCsyeAU4wBHt8B6oZiI2ilfTWyA7qL/YOhp9aJU mZh9ZmbJKfZwL4+B5HnPkTAYgxP8dyNLOhycSdkdiJEI4G9YO4CYA9g5sUMTv3znjUit pAtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:ui-outboundreport:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=hYEdOj8XX/RObGI/u6rSM12nLK2LpMCE+t/tR4+HhVs=; b=T9/xdYn396LwrSWI6H/gJkWOYfVxk+shAT9EUeI6gCcA68K/F94qh2dtZjDWmGaZvJ I+D9zE3l4AHwwNBpRMhYj2dg+KGZZi7zHcdyAZGc0SJXAtyoCxJe4dtSoxtKkv3SoP8B iw+kmZ5YBLpwfjf82dIRWx8o3hurEJGOslu+R7JSmhIDNhNOFXall/gOWiLLl3GtLE4E c9R//TmKIFm91ozTLP2QfqiMiRFBOSCIAFBrB0uagnIw4JbSWaDSiBmX0q0YkZu8t+zp IwWQeekvk0rHoUeWZuJB1W0uTTDYO+Q4BSOjrN9fkN4gLGtyzAHjM607pCGNTCJlWTB5 TsBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j70-20020a638049000000b004b55673ea6fsi36831649pgd.103.2023.01.22.02.18.14; Sun, 22 Jan 2023 02:18:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229924AbjAVKGf (ORCPT + 99 others); Sun, 22 Jan 2023 05:06:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbjAVKGd (ORCPT ); Sun, 22 Jan 2023 05:06:33 -0500 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FC8F1CF69; Sun, 22 Jan 2023 02:05:45 -0800 (PST) Received: from lenovo-t14s.redhat.com ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mv3M8-1oSwdn1I24-00r0FP; Sun, 22 Jan 2023 11:05:31 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: "Michael S. Tsirkin" , Parav Pandit , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Eli Cohen , Jason Wang , Gautam Dawar , Cindy Lu , "David S. Miller" , =?utf-8?q?Eugenio_P=C3=A9rez?= Subject: [PATCH 2/4] virtio_net: add a timeout in virtnet_send_command() Date: Sun, 22 Jan 2023 11:05:24 +0100 Message-Id: <20230122100526.2302556-3-lvivier@redhat.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230122100526.2302556-1-lvivier@redhat.com> References: <20230122100526.2302556-1-lvivier@redhat.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Q/I/cga4nZOLWJZ6626JLw2DTN8BqDTEy/TTN7AmLPPbAvv4s/x 3Mb+7W/tWh2hPzaySdoOxxbH2k0Iq67YvdoSX7Dy/+p2/8WeDpQc94lfaAGKtjv1tyBixOT y23u7MmcoQ0e7tZLyBsqOQfI0xHlC5Abzxl7uPydBZiPyOdJhnFQarIJhyt9uTi0wD/VXiK DrR/t3vOSm/bCjw6SHx7w== UI-OutboundReport: notjunk:1;M01:P0:HM0lcQr5Jvs=;mzd2YF4kR7weYP6YA3EqDZLTl2j A/oWHtswsjYt5zeLBta83WIk2hmbo/2M4lwL+uRMaFO680jdbnFH/qJ1SEIVOfc4kdFZzO0MC 0IStB76FO8D90jh28K5SndhKkJlx0ufbU5Fa4c67couM3raVz+8TIMpe2RVLI6nvJd7BwdcLY fgNq0EdlP/dSQt84R3QRYJWOOy72MfZZyOd1K4ZmKdLLeu/myBHU83vzrXLYIM73p/s6QKQzE vrZGMnzViOj1b8+HGW47AHla/36LMPiLkSe1O3szv57s9vjJnV7dAWltB/UXqBTU8Bw1a0wtL KUr2NwWuSjq5JnalEn1A7Gu9up6cZDc0+GrNaKHfUSNZj6eXl77N4oq0ebxPYWsDHeo9luLG8 1dsOYnD7xSvb09yVpH+V2fGnxgAi+urXAW+UE87MIG1Mi1FjcQJoOLNUm9f6MR18cWak1wamO s9z2jKhwkblBXG7JYw7pK2IR5+5lYOvUCW4h7u0Ev97bWBUfFeQG/pJZXAqiKBleW5Q45nI1X 9Iwnd5yFJNHLOVaqsb2l4UfrIp5ltMYm+/RcTu9OOs2qSRMPBa/QHhx3KslOiwAMb46HQdlxK zyHw7iP1Zsd/17wwDqDUe59QVyEz2tZkBJkIiK4n+R5QE1he4/uZ7ftHBqmkeB0L5eJmeWDgk 5Fi7qCAtfgPFvPBqdDKEzHRYfVWzVwwUX6SEQvo6kw== X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755717523237088188?= X-GMAIL-MSGID: =?utf-8?q?1755717523237088188?= if the device control queue is buggy, don't crash the kernel by waiting for ever the response. Signed-off-by: Laurent Vivier --- drivers/net/virtio_net.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 25511a86590e..29b3cc72082d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1974,6 +1974,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, struct scatterlist *sgs[4], hdr, stat; unsigned out_num = 0, tmp; int ret; + unsigned long timeout; /* Caller should know better */ BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)); @@ -2006,8 +2007,10 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, /* Spin for a response, the kick causes an ioport write, trapping * into the hypervisor, so the request should be handled immediately. */ + timeout = jiffies + 20 * HZ; while (!virtqueue_get_buf(vi->cvq, &tmp) && - !virtqueue_is_broken(vi->cvq)) + !virtqueue_is_broken(vi->cvq) && + !time_after(jiffies, timeout)) cpu_relax(); return vi->ctrl->status == VIRTIO_NET_OK;