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 7C139A0093 for ; Tue, 19 May 2020 15:07:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 741CC1D65D; Tue, 19 May 2020 15:07:21 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id BBC671D603 for ; Tue, 19 May 2020 15:07:19 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id h4so2980295wmb.4 for ; Tue, 19 May 2020 06:07:19 -0700 (PDT) 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=KQL7UBKR5IduXLGHkgSvuKfzMdIETXESWNV+TBfLrbE=; b=qTzrGBm807Gf7O7tMAR0Xpglg2XCK0j/mXXiRNZbERde+N0Cm9mTWxFpt9TR8Ivygq 4P8lOgj7giNIrszg1mRKEyhGx95iSTU0bVeJsGvA2rISI3qqrnTeYKRgSbkJo03rN9Ca l0M6gUdhsG5/hL+Wp30BcKZvqb4UIGTLVRF7oJMwl9EJMfGY4a4rZdO/UZ4qTUkZ25bQ l5rhpv5QOkMHogxATaEKnnLC77b9gkLQX0g5qqGe+R8IbxeYQUxtWV5EQY8jVT7jTfYr TuArX+XteAXQhyB61PRMbokAHYTdCWNE+ofCM0g1bNQ6ZUv+Tqg+O4yiBVQ3ZNbWQywL 98dg== 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=KQL7UBKR5IduXLGHkgSvuKfzMdIETXESWNV+TBfLrbE=; b=Qz+Gnz8QnET13wcNW4Rf7EU9kKD7xAzqvGj1fiUBwG88fdan1GtTNNauXMphnTuFbk hUBsykZvLqkiNmZ2gFnpasUbed6XT+p/6A+Kh8pGpX2NvGhAETekLVFcTFZwIaPFeagy e5HjOEqIXZlaEmS5yq8sZWhDtxFmynHmWKGI++VlQbtzi+QPD/6D99GjwzhBSbPujtTQ CH6gBGims/38WFNCo1M5bz8ED8SGTwLv0aVQ7gzAn8Hx8ZvEXmUmZ1uEt09AFvulNkyh 0vSTO5KswK7jNev1H2wiTQRYnmQd+5EBbXFSJd0y1j6ICNX9cJyY3f5+fb6L5yLkb7Op u4bw== X-Gm-Message-State: AOAM531Ubrez3jwXpZUlhZRBU5congU9hGfVhkHaADuRhjuilC/8SW+C 7/UpseMxvWZ4u5q8ysaZVtobN9hT7s0tdKFb X-Google-Smtp-Source: ABdhPJwoADTiIFkGcOemivdZyyMCTZR3w6kqPDlSMEcZJ7+vXfpwhLcOIvmgiHiQrr1nxRCWXE4ddQ== X-Received: by 2002:a1c:2e46:: with SMTP id u67mr5308644wmu.156.1589893639437; Tue, 19 May 2020 06:07:19 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v126sm4482414wma.9.2020.05.19.06.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:07:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Tue, 19 May 2020 14:02:42 +0100 Message-Id: <20200519130549.112823-27-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: do not use PMD log type' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From 0bf29e36c3015e8a5bf315194caeaabc77363a0f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 30 Mar 2020 21:41:51 -0700 Subject: [PATCH] net/virtio: do not use PMD log type [ upstream commit 88fa5bb6b9807d55a3fbd34e5537fcf1ee7efb80 ] Virtio driver has its own logtype and should not use legacy PMD logtype. Fixes: 32c118fd0059 ("virtio: free mbuf's with threshold") Fixes: e5f456a98d3c ("net/virtio: support in-order Rx and Tx") Fixes: 1c8489da561b ("net/virtio-user: fix multi-process support") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/virtio/virtio_rxtx.c | 6 +++--- drivers/net/virtio/virtio_user_ethdev.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 752faa0f6e..060410577a 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1085,7 +1085,7 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, RTE_MIN(vq->vq_nentries / 4, DEFAULT_TX_FREE_THRESH); if (tx_free_thresh >= (vq->vq_nentries - 3)) { - RTE_LOG(ERR, PMD, "tx_free_thresh must be less than the " + PMD_DRV_LOG(ERR, "tx_free_thresh must be less than the " "number of TX entries minus 3 (%u)." " (tx_free_thresh=%u port=%u queue=%u)\n", vq->vq_nentries - 3, @@ -1133,7 +1133,7 @@ virtio_discard_rxbuf(struct virtqueue *vq, struct rte_mbuf *m) error = virtqueue_enqueue_recv_refill(vq, &m, 1); if (unlikely(error)) { - RTE_LOG(ERR, PMD, "cannot requeue discarded mbuf"); + PMD_DRV_LOG(ERR, "cannot requeue discarded mbuf"); rte_pktmbuf_free(m); } } @@ -1145,7 +1145,7 @@ virtio_discard_rxbuf_inorder(struct virtqueue *vq, struct rte_mbuf *m) error = virtqueue_enqueue_refill_inorder(vq, &m, 1); if (unlikely(error)) { - RTE_LOG(ERR, PMD, "cannot requeue discarded mbuf"); + PMD_DRV_LOG(ERR, "cannot requeue discarded mbuf"); rte_pktmbuf_free(m); } } diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index e61af40683..5637001dfc 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -561,7 +561,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev) const char *name = rte_vdev_device_name(dev); eth_dev = rte_eth_dev_attach_secondary(name); if (!eth_dev) { - RTE_LOG(ERR, PMD, "Failed to probe %s\n", name); + PMD_INIT_LOG(ERR, "Failed to probe %s", name); return -1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:45.715171277 +0100 +++ 0027-net-virtio-do-not-use-PMD-log-type.patch 2020-05-19 14:04:44.160647358 +0100 @@ -1,15 +1,16 @@ -From 88fa5bb6b9807d55a3fbd34e5537fcf1ee7efb80 Mon Sep 17 00:00:00 2001 +From 0bf29e36c3015e8a5bf315194caeaabc77363a0f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 30 Mar 2020 21:41:51 -0700 Subject: [PATCH] net/virtio: do not use PMD log type +[ upstream commit 88fa5bb6b9807d55a3fbd34e5537fcf1ee7efb80 ] + Virtio driver has its own logtype and should not use legacy PMD logtype. Fixes: 32c118fd0059 ("virtio: free mbuf's with threshold") Fixes: e5f456a98d3c ("net/virtio: support in-order Rx and Tx") Fixes: 1c8489da561b ("net/virtio-user: fix multi-process support") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit