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 70EE5A0093 for ; Wed, 9 Mar 2022 12:02:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C32440395; Wed, 9 Mar 2022 12:02:26 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 3EA2840395 for ; Wed, 9 Mar 2022 12:02:25 +0100 (CET) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 00E993F1AF for ; Wed, 9 Mar 2022 11:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823745; bh=JaRR9dG8zoQBi2pcsSxRnEZVvX7sDNbHowgL9NClIe0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rOSee3JiPHlqN9jnFcmsvZX06kHpAY2l9GiLaxZkhrKsv5g9SWhgv/2O4ctlmuVzN zX5kLXlctgBpiBFEn5hUpDGpjTggQqEBhcuHSUYUmnJjoaByIn1Pz7a+W+nX8nT89Q YJ5+NUDS4cBLZonwNkGuv8t9GzsEuOqq27Zjq4Mk+/BuL8yph3a4fhFfxe67eS7k6a bJAYiab96mEMLFmd1sqwwzjqxBUSiE/A1DM137NctUTvoOyzhODIk20clFmOF/vSe6 dx0lRZufLgQO39lXLmVuRQLMzWb3JKcKxQp5OaD0IUcEo4Z3veWqM+ChSlQLLWh8Cw UYwwC3Qhtt2+Q== Received: by mail-wm1-f70.google.com with SMTP id 20-20020a05600c231400b00389886f6b23so824046wmo.6 for ; Wed, 09 Mar 2022 03:02:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JaRR9dG8zoQBi2pcsSxRnEZVvX7sDNbHowgL9NClIe0=; b=vodDWm6uN1pXRWgmxQG9LY3lFIX4UB+aRmsZY293JL7qF/i6drlQaru1MhnHaWkYPk LCnc6xP/aup28oTb3EncUcDEo8YMM3A28KDd6PljWjg669gHbIDMGXwzj4M7MwLi+A5v wHBPS5C1zzQstA9GzPoRic10ih4BKdVSEedT23ea89jasThow4AodfJH2EZFFXkd6++q Q7ahT/7plwg3A1i2wqO8L4CS2cyhfsXJMPEQS+dWGyGZnyxO+SUsE31hqrNA+dhnbp4v SZQZNqYhloTKV6LqxKN1eUW2pAUKsVHAMy3NkIg9FOR2D89RsG0nfV1zT9K5DJZjwg9T +vhw== X-Gm-Message-State: AOAM531vf1LKHyJN2sPV6GJhm+OPjohkezeN+5HYJgsGZtqAw3o09qgj 9kpIROUa5GzUTm/+rQN/76ihsbF6b0xoIC48O/UfMmzrzSMuPz3RA7eojRAclKa+oLIQDpieCPU nJlc8YjaHkG8hiptFHgS+Ch8p X-Received: by 2002:a7b:c5d1:0:b0:37f:a8a3:9e17 with SMTP id n17-20020a7bc5d1000000b0037fa8a39e17mr7012545wmk.109.1646823744292; Wed, 09 Mar 2022 03:02:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNzMKjBz7JmtCbaswZedWI2gDEz2HbhOC12yZRp1xjAu0elS6tVlKgYbaGoETKkPKdskBuWw== X-Received: by 2002:a7b:c5d1:0:b0:37f:a8a3:9e17 with SMTP id n17-20020a7bc5d1000000b0037fa8a39e17mr7012515wmk.109.1646823743985; Wed, 09 Mar 2022 03:02:23 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id bg42-20020a05600c3caa00b00380deeaae72sm4955385wmb.1.2022.03.09.03.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:02:23 -0800 (PST) From: christian.ehrhardt@canonical.com 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 19.11.12 Date: Wed, 9 Mar 2022 12:00:48 +0100 Message-Id: <20220309110116.1295395-17-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.12 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/11/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/1716c2f16a47896d939a9fa87c70adc08bfabd6f Thanks. Christian Ehrhardt --- >From 1716c2f16a47896d939a9fa87c70adc08bfabd6f 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 c50974f723..9eae705caa 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -783,7 +783,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals __rte_unused, 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; } @@ -795,7 +795,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals __rte_unused, &umem->fq, &umem->cq, &usr_config); if (ret) { - AF_XDP_LOG(ERR, "Failed to create umem"); + AF_XDP_LOG(ERR, "Failed to create umem\n"); goto err; } umem->buffer = base_addr; @@ -819,7 +819,7 @@ 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; } @@ -855,7 +855,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, &usr_config); if (ret) { - AF_XDP_LOG(ERR, "Failed to create umem"); + AF_XDP_LOG(ERR, "Failed to create umem\n"); goto err; } umem->mz = mz; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:44.282897992 +0100 +++ 0017-net-af_xdp-add-missing-trailing-newline-in-logs.patch 2022-03-09 11:57:43.360938181 +0100 @@ -1 +1 @@ -From 744fd4126937b7f195fac38ae24cab52d0922b04 Mon Sep 17 00:00:00 2001 +From 1716c2f16a47896d939a9fa87c70adc08bfabd6f 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 c50974f723..9eae705caa 100644 @@ -29,19 +30,19 @@ -@@ -1071,7 +1071,7 @@ 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; - } - -@@ -1084,7 +1084,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, - ret = xsk_umem__create(&umem->umem, base_addr, umem_size, - &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; - } - umem->buffer = base_addr; -@@ -1124,7 +1124,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -783,7 +783,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals __rte_unused, + + 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; + } + +@@ -795,7 +795,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals __rte_unused, + &umem->fq, &umem->cq, &usr_config); + + if (ret) { +- AF_XDP_LOG(ERR, "Failed to create umem"); ++ AF_XDP_LOG(ERR, "Failed to create umem\n"); + goto err; + } + umem->buffer = base_addr; +@@ -819,7 +819,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -56 +57 @@ -@@ -1160,7 +1160,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -855,7 +855,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -65,18 +65,0 @@ -@@ -1847,7 +1847,7 @@ afxdp_mp_request_fds(const char *name, struct rte_eth_dev *dev) - AF_XDP_LOG(DEBUG, "Sending multi-process IPC request for %s\n", name); - 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; - } -@@ -1996,7 +1996,7 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) - if (!afxdp_dev_count) { - 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; - }