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 5C408A0093 for ; Thu, 28 May 2020 18:25:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C6CD11DC28; Thu, 28 May 2020 18:25:26 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 1087C1DC20 for ; Thu, 28 May 2020 18:25:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683124; 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=X631LQJwwrUafhtq9mRtMdNRnQim9WlBA/9HeYDVo30=; b=WNNJyKwckm6j7YmI0vy/SIvBSYMPpCzBvCThK1nmngLlDRJGQWKWsk2aoMEBZoaiwNTxmK edUSgLunD4BAUFq1AYwq1dUTiiUtv+fUsTp+uw6tl0rPbTTNS0+bReODUDuli9Q4Ne4MDZ l37uLQoGb9u5/csnVjl2RbF8KBYqda8= 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-373-3GZTK1qKN5uxzHHQHZFfQQ-1; Thu, 28 May 2020 12:25:21 -0400 X-MC-Unique: 3GZTK1qKN5uxzHHQHZFfQQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 662641054F8B; Thu, 28 May 2020 16:25:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8248960C87; Thu, 28 May 2020 16:25:19 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Thu, 28 May 2020 17:22:35 +0100 Message-Id: <20200528162322.7863-48-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: do not use PMD log type' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e66682dac7aac575666c04841d57f980f9692198 Thanks. Kevin. --- >From e66682dac7aac575666c04841d57f980f9692198 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 30 Mar 2020 21:41:52 -0700 Subject: [PATCH] net/tap: do not use PMD log type [ upstream commit bd3b90d53a62c2147f747dfaf863117f39099a32 ] The PMD logtype is legacy and drivers should use their own logtype. Fixes: 050316a88313 ("net/tap: support TSO (TCP Segment Offload)") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 3a8aa44a73..9964f39db5 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -781,5 +781,5 @@ apply: break; default: - RTE_LOG(WARNING, PMD, "%s: ioctl() called with wrong arg\n", + TAP_LOG(WARNING, "%s: ioctl() called with wrong arg", pmd->name); return -EINVAL; @@ -1233,5 +1233,7 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev) if (!mp) { struct pmd_internals *pmd = dev->data->dev_private; - RTE_LOG(DEBUG, PMD, "%s: failed to create mbuf pool for device %s\n", + + TAP_LOG(ERR, + "%s: failed to create mbuf pool for device %s\n", pmd->name, dev->device->name); return -1; -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:01.619751792 +0100 +++ 0048-net-tap-do-not-use-PMD-log-type.patch 2020-05-28 17:12:59.119555993 +0100 @@ -1 +1 @@ -From bd3b90d53a62c2147f747dfaf863117f39099a32 Mon Sep 17 00:00:00 2001 +From e66682dac7aac575666c04841d57f980f9692198 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd3b90d53a62c2147f747dfaf863117f39099a32 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 05470a2115..2c9fb76b63 100644 +index 3a8aa44a73..9964f39db5 100644 @@ -21 +22 @@ -@@ -779,5 +779,5 @@ apply: +@@ -781,5 +781,5 @@ apply: @@ -28 +29 @@ -@@ -1302,5 +1302,7 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev) +@@ -1233,5 +1233,7 @@ tap_gso_ctx_setup(struct rte_gso_ctx *gso_ctx, struct rte_eth_dev *dev)