From patchwork Wed Jul 17 11:58:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: huhai X-Patchwork-Id: 11047783 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E50A138D for ; Wed, 17 Jul 2019 11:59:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E60022376 for ; Wed, 17 Jul 2019 11:59:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6242E260CD; Wed, 17 Jul 2019 11:59:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46A8022376 for ; Wed, 17 Jul 2019 11:59:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726973AbfGQL7U (ORCPT ); Wed, 17 Jul 2019 07:59:20 -0400 Received: from smtpbgeu1.qq.com ([52.59.177.22]:44123 "EHLO smtpbgeu1.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726273AbfGQL7U (ORCPT ); Wed, 17 Jul 2019 07:59:20 -0400 X-QQ-mid: bizesmtp18t1563364750t5mn80un Received: from localhost.localdomain (unknown [218.76.23.26]) by esmtp6.qq.com (ESMTP) with id ; Wed, 17 Jul 2019 19:59:06 +0800 (CST) X-QQ-SSF: 01400000002000E0JG32000A0000000 X-QQ-FEAT: A0aGqOzntPfW16zXB8MbibpT0O1Ilp7BQ70n2aSXZeIs63SsV6oekGxpSjW5P lrTwC4gbDd5nIJ81nzkZiWDqJSOlfhgpFm2yGdyJV0BPcbW/Hl0MCcWX+Mxr0eNDfPp7q1A +OjIPV9os5oVYaxjux2oyI3wn8gY8LLzghP5OpHZsHliBH9Uzzg5cXszxSg5yDSwT42J3yt n6Z+p8nwsk+xL2ozQ12tcAjwErZlXyKIpc79N6AzJnqY1wXof2NLSnv7/VWkhc3yNnmJOIG mKOmUv1V4EXfvCF8i7Ahbf1cNcdm2V4DYmXbvFDlgIqzPEhel42GP8gZwfNFcWqBeyOg== X-QQ-GoodBg: 2 From: huhai To: mst@redhat.com, jasowang@redhat.com Cc: kvm@vger.kernel.org, huhai Subject: [PATCH] vhost_net: fix missing descriptor recovery Date: Wed, 17 Jul 2019 19:58:34 +0800 Message-Id: <20190717115834.25988-1-huhai@kylinos.cn> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:kylinos.cn:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When get_tx_bufs get descriptor successful, but this descriptor have some problem, we should inform the guest to recycle this descriptor, instead of doing nothing. Signed-off-by: huhai --- drivers/vhost/net.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 247e5585af5d..939a2ef9c223 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -620,6 +620,7 @@ static int get_tx_bufs(struct vhost_net *net, if (*in) { vq_err(vq, "Unexpected descriptor format for TX: out %d, int %d\n", *out, *in); + vhost_add_used_and_signal(&net->dev, vq, ret, 0); return -EFAULT; } @@ -628,6 +629,7 @@ static int get_tx_bufs(struct vhost_net *net, if (*len == 0) { vq_err(vq, "Unexpected header len for TX: %zd expected %zd\n", *len, nvq->vhost_hlen); + vhost_add_used_and_signal(&net->dev, vq, ret, 0); return -EFAULT; }