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 7793EA0527 for ; Mon, 9 Nov 2020 19:44:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6440669A4; Mon, 9 Nov 2020 19:44:52 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by dpdk.org (Postfix) with ESMTP id 8A0656883 for ; Mon, 9 Nov 2020 19:44:51 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id p8so9073248wrx.5 for ; Mon, 09 Nov 2020 10:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HFd4Mk5CzpvBvmBRQinrYyHxkL7nt98DHXOihp/aRzg=; b=qBLblgI1mj3glzDur+JbjU8aTK5rIPYCWxVAiFZ7lOylii3wWin5hNIR4N9P7ElMS+ bNZNhykUN0bZT4v+D1Ar6hLgGrtHY5dOL1m5+apapk27IiGa/CrSy53N6+B/MUZVCQUd RvAti5mAAxALouXE/nJAhQRGLuMCaesAlb9nCA0DwYnNWyzNkCfvDc7IxELRWjNm1wzs Qlg/+b3teweZWoh8Zt3az0peNGNZsQgJIsVu+NToMM0dNZPiGjHCOWvPHD/AdzhN9EsS eVwZoDEKQLOujTF07YvmPY5OCpYsEtjr3s90WuYdPW+w9esHVAuNK1PVPTkyK8ntNL0I Vgdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HFd4Mk5CzpvBvmBRQinrYyHxkL7nt98DHXOihp/aRzg=; b=Q9zvdenVzZaW/7Vfoqan5AX658SBXtNbd1IkZ9qfKbZM5zIyCK98itUDS0gHxA9dGb TSRlx6GAgxk61XBmCegzBrPdidbTXjNwmYl2+Bl5mCCy5+iFlfjGybuOgQJAp+vUkUv1 2Wx6/s5xWKOvcpr6CvOUCSglAqaUP3+wW4WUom/CcmD4bE+K+8nR0upwxGgmvjuqTsOe ciw4YJu4QTyKnbLBAU7z5xUxQVhdsglHavE2UG+E/BjL4jiqn+NyK/imfYKNYI+Mc4xE +iNLJjC9aPwZA5Iwb4pqJyz0j6N1I+K/SvGvqXJp/MzFwU9QZubMrDOTgJFKG7nQ3s9X f6gg== X-Gm-Message-State: AOAM530cK1wRS18tTnc9uZhR+gN4MZAi8JyMlIONVTqzEgfdFxJJnC+e 0lWh9mD+1jGpZrkKxl23Qbs= X-Google-Smtp-Source: ABdhPJw1eCSvhgnpkoUnvaHSOFNfdksnxz65qlYTdJ+r/iLOQCYQl0eEmE9MBguTZncj5Y+CpvQBIQ== X-Received: by 2002:adf:c388:: with SMTP id p8mr19784844wrf.307.1604947490318; Mon, 09 Nov 2020 10:44:50 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t23sm339548wmn.4.2020.11.09.10.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:49 -0800 (PST) From: luca.boccassi@gmail.com To: Long Li Cc: Matan Azrad , dpdk stable Date: Mon, 9 Nov 2020 18:40:50 +0000 Message-Id: <20201109184111.3463090-62-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/vdev_netvsc: fix device probing error flow' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/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 rebasing (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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/201ebb769bed8d45b49bc1da825a0b76d41ef11a Thanks. Luca Boccassi --- >From 201ebb769bed8d45b49bc1da825a0b76d41ef11a Mon Sep 17 00:00:00 2001 From: Long Li Date: Thu, 22 Oct 2020 01:11:34 -0700 Subject: [PATCH] net/vdev_netvsc: fix device probing error flow [ upstream commit 702b27d3fc4b82643d08d4b072e6d61b6d73e6be ] If a device probe fails, the alarm is canceled and will no longer work for previously probed devices. Fix this by checking if alarm is necessary at the end of each device probe. Reset the alarm if there are vdev_netvsc_ctx created. Fixes: e7dc5d7becc5 ("net/vdev_netvsc: implement core functionality") Signed-off-by: Long Li Acked-by: Matan Azrad --- drivers/net/vdev_netvsc/vdev_netvsc.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c index be8f19c0c6..48081b9146 100644 --- a/drivers/net/vdev_netvsc/vdev_netvsc.c +++ b/drivers/net/vdev_netvsc/vdev_netvsc.c @@ -673,6 +673,7 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) int ret; DRV_LOG(DEBUG, "invoked as \"%s\", using arguments \"%s\"", name, args); + rte_eal_alarm_cancel(vdev_netvsc_alarm, NULL); if (!kvargs) { DRV_LOG(ERR, "cannot parse arguments list"); goto error; @@ -688,17 +689,13 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) !strcmp(pair->key, VDEV_NETVSC_ARG_MAC)) ++specified; } - if (ignore) { - if (kvargs) - rte_kvargs_free(kvargs); - return 0; - } + if (ignore) + goto ignore; if (specified > 1) { DRV_LOG(ERR, "More than one way used to specify the netvsc" " device."); goto error; } - rte_eal_alarm_cancel(vdev_netvsc_alarm, NULL); /* Gather interfaces. */ ret = vdev_netvsc_foreach_iface(vdev_netvsc_netvsc_probe, 1, name, kvargs, specified, &matched); @@ -719,17 +716,19 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) } DRV_LOG(WARNING, "non-netvsc device was probed as netvsc"); } - ret = rte_eal_alarm_set(VDEV_NETVSC_PROBE_MS * 1000, - vdev_netvsc_alarm, NULL); - if (ret < 0) { - DRV_LOG(ERR, "unable to schedule alarm callback: %s", - rte_strerror(-ret)); - goto error; - } error: + ++vdev_netvsc_ctx_inst; +ignore: if (kvargs) rte_kvargs_free(kvargs); - ++vdev_netvsc_ctx_inst; + /* Reset alarm if there are device context created */ + if (vdev_netvsc_ctx_count) { + ret = rte_eal_alarm_set(VDEV_NETVSC_PROBE_MS * 1000, + vdev_netvsc_alarm, NULL); + if (ret < 0) + DRV_LOG(ERR, "unable to schedule alarm callback: %s", + rte_strerror(-ret)); + } return 0; } -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.538950910 +0000 +++ 0062-net-vdev_netvsc-fix-device-probing-error-flow.patch 2020-11-09 18:40:11.199312340 +0000 @@ -1 +1 @@ -From 702b27d3fc4b82643d08d4b072e6d61b6d73e6be Mon Sep 17 00:00:00 2001 +From 201ebb769bed8d45b49bc1da825a0b76d41ef11a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 702b27d3fc4b82643d08d4b072e6d61b6d73e6be ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 1ecb0b3e6a..c1b7099717 100644 +index be8f19c0c6..48081b9146 100644 @@ -25 +26 @@ -@@ -671,6 +671,7 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) +@@ -673,6 +673,7 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) @@ -33 +34 @@ -@@ -686,17 +687,13 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) +@@ -688,17 +689,13 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) @@ -53 +54 @@ -@@ -717,17 +714,19 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev) +@@ -719,17 +716,19 @@ vdev_netvsc_vdev_probe(struct rte_vdev_device *dev)