From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8763BA034F for ; Tue, 1 Mar 2022 11:45:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A98D426EE; Tue, 1 Mar 2022 11:45:02 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 160F7426E8 for ; Tue, 1 Mar 2022 11:45:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131500; 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=gFmINapHgeNf31WhBBgsuvrnTyzFkm/TPShXkLyAx0M=; b=b0NzeEXJFyIT4JXzRP3BTr5GH1ijTBB4yZAs2+tpbGIWK4Z9yOr59iHUmGeq+3mbIQ3I9p Ls0tciya1Z+ueeS717hglHSJ4lf0X5caxTOSdc1qxTHBKjtgNe9of1melrEnWS7JkSdGk5 ZaxXgkkeTMZUZpU/pkNWURop2swJxNs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-7yKFmo19PdOo48U8dwD5Zg-1; Tue, 01 Mar 2022 05:44:57 -0500 X-MC-Unique: 7yKFmo19PdOo48U8dwD5Zg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9ED1F100C610; Tue, 1 Mar 2022 10:44:56 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 887AB6FB08; Tue, 1 Mar 2022 10:44:55 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ciara Loftus , dpdk stable Subject: patch 'net/af_xdp: add missing trailing newline in logs' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:07 +0000 Message-Id: <20220301104300.334382-51-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/dd1851c1de7ecfd64e6c8263fcec73f3bda24ff6 Thanks. Kevin --- >From dd1851c1de7ecfd64e6c8263fcec73f3bda24ff6 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 17 Feb 2022 14:06:14 +0100 Subject: [PATCH] net/af_xdp: add missing trailing newline in logs [ upstream commit 744fd4126937b7f195fac38ae24cab52d0922b04 ] Caught while trying --in-memory mode, some log messages in this driver are not terminated with a newline: rte_pmd_af_xdp_probe(): net_af_xdp: Failed to register multi-process IPC callback: Operation not supportedvdev_probe(): failed to initialize net_af_xdp device Other locations in this driver had the same issue, fix all at once. Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") Fixes: 9876cf8316b3 ("net/af_xdp: re-enable secondary process support") Signed-off-by: David Marchand Acked-by: Ciara Loftus --- drivers/net/af_xdp/rte_eth_af_xdp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index b3ed704b36..d7e46c0aa5 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -1052,5 +1052,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, rte_socket_id()); if (umem == NULL) { - AF_XDP_LOG(ERR, "Failed to allocate umem info"); + AF_XDP_LOG(ERR, "Failed to allocate umem info\n"); return NULL; } @@ -1065,5 +1065,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, &rxq->fq, &rxq->cq, &usr_config); if (ret) { - AF_XDP_LOG(ERR, "Failed to create umem"); + AF_XDP_LOG(ERR, "Failed to create umem\n"); goto err; } @@ -1099,5 +1099,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, umem = rte_zmalloc_socket("umem", sizeof(*umem), 0, rte_socket_id()); if (umem == NULL) { - AF_XDP_LOG(ERR, "Failed to allocate umem info"); + AF_XDP_LOG(ERR, "Failed to allocate umem info\n"); return NULL; } @@ -1135,5 +1135,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, if (ret) { - AF_XDP_LOG(ERR, "Failed to create umem"); + AF_XDP_LOG(ERR, "Failed to create umem\n"); goto err; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.772756235 +0000 +++ 0051-net-af_xdp-add-missing-trailing-newline-in-logs.patch 2022-03-01 10:41:01.334244104 +0000 @@ -1 +1 @@ -From 744fd4126937b7f195fac38ae24cab52d0922b04 Mon Sep 17 00:00:00 2001 +From dd1851c1de7ecfd64e6c8263fcec73f3bda24ff6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 744fd4126937b7f195fac38ae24cab52d0922b04 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -22,2 +23,2 @@ - drivers/net/af_xdp/rte_eth_af_xdp.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + drivers/net/af_xdp/rte_eth_af_xdp.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) @@ -26 +27 @@ -index 2163df7c5c..69dfa1b898 100644 +index b3ed704b36..d7e46c0aa5 100644 @@ -29 +30 @@ -@@ -1072,5 +1072,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1052,5 +1052,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -36 +37 @@ -@@ -1085,5 +1085,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1065,5 +1065,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -43 +44 @@ -@@ -1125,5 +1125,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1099,5 +1099,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -50 +51 @@ -@@ -1161,5 +1161,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1135,5 +1135,5 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -57,14 +57,0 @@ -@@ -1848,5 +1848,5 @@ afxdp_mp_request_fds(const char *name, struct rte_eth_dev *dev) - ret = rte_mp_request_sync(&request, &replies, &timeout); - if (ret < 0 || replies.nb_received != 1) { -- AF_XDP_LOG(ERR, "Failed to request fds from primary: %d", -+ AF_XDP_LOG(ERR, "Failed to request fds from primary: %d\n", - rte_errno); - return -1; -@@ -1997,5 +1997,5 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) - ret = rte_mp_action_register(ETH_AF_XDP_MP_KEY, afxdp_mp_send_fds); - if (ret < 0 && rte_errno != ENOTSUP) { -- AF_XDP_LOG(ERR, "%s: Failed to register multi-process IPC callback: %s", -+ AF_XDP_LOG(ERR, "%s: Failed to register multi-process IPC callback: %s\n", - name, strerror(rte_errno)); - return -1;