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 B9775A0350 for ; Mon, 28 Feb 2022 22:22:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B4459411AB; Mon, 28 Feb 2022 22:22:13 +0100 (CET) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mails.dpdk.org (Postfix) with ESMTP id 7824F40140 for ; Mon, 28 Feb 2022 22:22:12 +0100 (CET) Received: by mail-ej1-f48.google.com with SMTP id vz16so27571729ejb.0 for ; Mon, 28 Feb 2022 13:22:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QxPZc8As00OYGkYNjJ0+ZQ70GTKufvjQzVcAQf0sQYE=; b=b2XI4Pg5dmcGcNl1gNmVozxjdbbLKDX31DNIBBQq2nXMqJ1PLpaX4xAAnTJnyatSnQ RLvJXiPYlw2eRNH+zyZIi3GeBlL2FpBkMIDHJV2agavuMgYbzOhsC0QI8QXL5gR/1MOg uJV5AjlX2xxSRIp/+HI2JP4iZkNJSf17TzKzDO1JFqrHP29QkOXmnzgT18kXkXfFe8rC s/SinFVVPMeavFAiUitBUGyxFB22lAVq+gWsanirg9pHnkk2J7TacgSdaAVO0fdYjnZ7 CpQjVtY6iQKSyCnady8UXoy0BpdjcatjftGzdd2VziRXmxkXThfTAPqAGIxmPmoA7Yqi V2yQ== 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=QxPZc8As00OYGkYNjJ0+ZQ70GTKufvjQzVcAQf0sQYE=; b=d81D8NToKUCuqNBtm1TpejVaWkSJx5kDx48WbSN/Jo3Dd5pAkPAfTpnx6h5AVgpkvp MykjMbP9GqXuFG6Xh587RCayJbkDoIBbAYafHwyiIbV+IaRhCn2zLD50J3IBytrRuvFV hJjU7m1/0gcmJBBXPY00B3TA1CanVdLjJUPjeVI8frt7zlJBKr5F8y4N3b8ClF+uno+W MntrM1Bn24Lt9E53KBv6m8qoD4QIU7+sm6Cpy9sRD/utOjCbnyrzMtp68x28r/eesuGb a7ZEWMMLj2R/hlU/U44HUMX22d2TkL3XXY3UywzF5eEt5Hq+j8nP5tlx/wl/Lvll0rxR OITA== X-Gm-Message-State: AOAM533C5PcNWIeJyY3wuEYhGZKQD7cAEqsSnQdjcTTW+trzwaxIreWl PB8yrhiBviAq/fvkJ18J4Lcbd0n1y3K5Yg== X-Google-Smtp-Source: ABdhPJz1P7JYeES8OA7RBhCOyptZI2XlonuekSOv2b0YXPCCOVqCbgZDfA2FB/6GgbQC065bNkS/FA== X-Received: by 2002:a17:906:d49:b0:6b6:1f07:fb76 with SMTP id r9-20020a1709060d4900b006b61f07fb76mr16191753ejh.704.1646083332153; Mon, 28 Feb 2022 13:22:12 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id g2-20020aa7c842000000b0041314b98872sm6401127edt.22.2022.02.28.13.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:22:11 -0800 (PST) From: luca.boccassi@gmail.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 20.11.5 Date: Mon, 28 Feb 2022 21:20:23 +0000 Message-Id: <20220228212047.3341966-27-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.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 20.11.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/92f88226d93fee87198688fa3ae99509b0922451 Thanks. Luca Boccassi --- >From 92f88226d93fee87198688fa3ae99509b0922451 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 a8f50b14e3..eaf93695ec 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -958,7 +958,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; } @@ -971,7 +971,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; @@ -1005,7 +1005,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; } @@ -1041,7 +1041,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:56.135143599 +0000 +++ 0027-net-af_xdp-add-missing-trailing-newline-in-logs.patch 2022-02-28 21:17:53.916930897 +0000 @@ -1 +1 @@ -From 744fd4126937b7f195fac38ae24cab52d0922b04 Mon Sep 17 00:00:00 2001 +From 92f88226d93fee87198688fa3ae99509b0922451 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 a8f50b14e3..eaf93695ec 100644 @@ -29 +30 @@ -@@ -1071,7 +1071,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -958,7 +958,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -38 +39 @@ -@@ -1084,7 +1084,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -971,7 +971,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, @@ -47 +48 @@ -@@ -1124,7 +1124,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, +@@ -1005,7 +1005,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, +@@ -1041,7 +1041,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; - }