From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 92BA4A054C for ; Fri, 14 Feb 2020 18:04:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3DE67F72; Fri, 14 Feb 2020 18:04:11 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 483F9F72 for ; Fri, 14 Feb 2020 18:04:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aO4MHTzdHvzK7M2+uZEGGJPsy+dupwNUV3nEYavO7Tw=; b=NNcYKyizOMY+XxmxnFV0jalTYvscezEgm8trjfuksqdGQQ1593zmFZBT33gTmYvYifdKwQ l4XzvVdPQCg7in5z9EN5DvZCJxUP7dgEdtmo0hpwRE1Y7Jyic6gTB2an6ZweIXSZEqWmEY +KpHZESnh6/6bKp/c7o/pphS1IkxRsA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-gWkGQ7ByNxGuH9n41s4dvg-1; Fri, 14 Feb 2020 12:04:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53E82801E67; Fri, 14 Feb 2020 17:04:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 368F484BCD; Fri, 14 Feb 2020 17:03:59 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Tiwei Bie , dpdk stable Date: Fri, 14 Feb 2020 17:02:56 +0000 Message-Id: <20200214170337.25093-2-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: gWkGQ7ByNxGuH9n41s4dvg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/virtio-user: check tap offload setting failure' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c5a07f62ca929e0b43= 9fe6430a5bb84bfca11fae Thanks. Kevin. --- >From c5a07f62ca929e0b439fe6430a5bb84bfca11fae Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 13 Jan 2020 15:40:31 +0800 Subject: [PATCH] net/virtio-user: check tap offload setting failure [ upstream commit 1ad2f882b34a644d4dc91b366f38a73a1b4f4cf5 ] The function vhost_kernel_tap_set_offload() could return errors, the return value need to be checked. And there is no need to fail when error is -ENOTSUP. Fixes: 1db4d2330bc8 ("net/virtio-user: check negotiated features before set= ") Signed-off-by: Yunjian Wang Reviewed-by: Tiwei Bie --- drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c b/drivers/ne= t/virtio/virtio_user/vhost_kernel_tap.c index 361011ce65..e95cd9da4c 100644 --- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c +++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c @@ -75,4 +75,5 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int = req_mq, =09struct ifreq ifr; =09int tapfd; +=09int ret; =20 =09/* TODO: @@ -140,5 +141,7 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, in= t req_mq, =09} =20 -=09vhost_kernel_tap_set_offload(tapfd, features); +=09ret =3D vhost_kernel_tap_set_offload(tapfd, features); +=09if (ret < 0 && ret !=3D -ENOTSUP) +=09=09goto error; =20 =09memset(&ifr, 0, sizeof(ifr)); --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:37.168786936 +0000 +++ 0002-net-virtio-user-check-tap-offload-setting-failure.patch=092020-02-= 14 17:02:36.908408835 +0000 @@ -1 +1 @@ -From 1ad2f882b34a644d4dc91b366f38a73a1b4f4cf5 Mon Sep 17 00:00:00 2001 +From c5a07f62ca929e0b439fe6430a5bb84bfca11fae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1ad2f882b34a644d4dc91b366f38a73a1b4f4cf5 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2fbfecba12..2fa4f0d661 100644 +index 361011ce65..e95cd9da4c 100644