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 EA85941D4F for ; Thu, 23 Feb 2023 10:38:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5B7B43160; Thu, 23 Feb 2023 10:38:18 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id EFA5343164 for ; Thu, 23 Feb 2023 10:38:15 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id l2-20020a05600c1d0200b003e1f6dff952so9465008wms.1 for ; Thu, 23 Feb 2023 01:38:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X+lSuCjCn+c8Ci4AiPKqiKKtGXj8FANalON4LKNsbj8=; b=GzGmzmU34QkqexNUpig8NmBT3iiyhl90fBz7F4hgiE0Ch8Ed0i38RQIG4IYRLPUyWj 1cR5ojsPjfuBysjpj3gFVeaQFqyW2G0oXDRV3rZXtJIyK/cUprpSW0CEjAwGLnxMnKPF GQLML2WKVzZJh5NYRyt55if86uXQTcr5uSrf/HgCLfEHmhe8Eh+LA7mZDGWGNeretx83 DGiXoIGLVTYqGCGBwPNVtvkKFqg9gdXxasNLzXHWHN63U3KPxnzdvfJIqeMgUQQcUDX4 UZHOuxDuFYpl1WL9Fe9wOs6IPV4gyC5hSgKTUWzBoOozATGHcdlaAMYyOQxcltF1AeWM puyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X+lSuCjCn+c8Ci4AiPKqiKKtGXj8FANalON4LKNsbj8=; b=R8y1CZvG3VOq3lfoJY4WZBI4fiIW4NZ6ID2X9/O5v865nPRKHuBcNNtrKK83QkgizG N2uQeLG2YP47tOosjPIFWGLUksQ3eyV51vm9y3Dxm+YhUdQCP7iF03JsHcBmrfoUvLUB G/72vR6oEb/46UErx7fLpj3aF/MXRZJL7qJSsUyTUC8wXaOvTawQOoQxSRF4XR3831MY p/gG1JsiCvTv8xH/x70jXmfVNmBVDk+n+PXhHT9FMStcqf5nH8c5LQeODFazai0iIUay XlcuxAj1Kuw2pVxUUBJLFAYXWb/C1Y9Bk4+sfHf0ivuQ+xx3zNWjzbGeH+7IE+8cGxGo haBw== X-Gm-Message-State: AO0yUKWp5rnUPlt0eZl7zx2DqrAn4SbU3feyzxftVuvpHLNzIPpu6lFB +qmcsZ2T5bMrLccI2s0JHJdojZ9g9fA= X-Google-Smtp-Source: AK7set/NiFNXjGWGHrWYrkDIC+A4qkMLZ7tQXapWUu5tc5nKIH8wg4kyBeXSso90V9zzkxUAv5Sixg== X-Received: by 2002:a05:600c:43ca:b0:3df:d8c5:ec18 with SMTP id f10-20020a05600c43ca00b003dfd8c5ec18mr2730306wmn.13.1677145095652; Thu, 23 Feb 2023 01:38:15 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id t4-20020adff044000000b002c5694aef92sm9480851wro.21.2023.02.23.01.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:38:15 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Sunil Uttarwar , dpdk stable Subject: patch 'crypto/ccp: remove some printf' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:24 +0000 Message-Id: <20230223093715.3926893-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. 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/230bbf810bfdcb9a7f728a2b393a8724e5d3188f Thanks. Luca Boccassi --- >From 230bbf810bfdcb9a7f728a2b393a8724e5d3188f Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 4 Oct 2022 11:51:29 +0200 Subject: [PATCH] crypto/ccp: remove some printf [ upstream commit e946ca8e727424b511fe4ea278d8bec76b800e7a ] A DPDK application must _not_ use printf. Use log framework. Fixes: ef4b04f87fa6 ("crypto/ccp: support device init") Signed-off-by: David Marchand Acked-by: Sunil Uttarwar --- drivers/crypto/ccp/ccp_dev.c | 4 ++-- drivers/crypto/ccp/ccp_pci.c | 3 ++- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c index 664ddc1747..c36409a0bc 100644 --- a/drivers/crypto/ccp/ccp_dev.c +++ b/drivers/crypto/ccp/ccp_dev.c @@ -361,7 +361,7 @@ ccp_find_lsb_regions(struct ccp_queue *cmd_q, uint64_t status) if (ccp_get_bit(&cmd_q->lsbmask, j)) weight++; - printf("Queue %d can access %d LSB regions of mask %lu\n", + CCP_LOG_DBG("Queue %d can access %d LSB regions of mask %lu\n", (int)cmd_q->id, weight, cmd_q->lsbmask); return weight ? 0 : -EINVAL; @@ -797,7 +797,7 @@ ccp_probe_devices(const struct rte_pci_id *ccp_id) snprintf(dirname, sizeof(dirname), "%s/%s", SYSFS_PCI_DEVICES, d->d_name); if (is_ccp_device(dirname, ccp_id, &ccp_type)) { - printf("CCP : Detected CCP device with ID = 0x%x\n", + CCP_LOG_DBG("CCP : Detected CCP device with ID = 0x%x\n", ccp_id[ccp_type].device_id); ret = ccp_probe_device(dirname, domain, bus, devid, function, ccp_type); diff --git a/drivers/crypto/ccp/ccp_pci.c b/drivers/crypto/ccp/ccp_pci.c index 1702a09c4f..6932cb4152 100644 --- a/drivers/crypto/ccp/ccp_pci.c +++ b/drivers/crypto/ccp/ccp_pci.c @@ -11,6 +11,7 @@ #include #include "ccp_pci.h" +#include "ccp_pmd_private.h" static const char * const uio_module_names[] = { "igb_uio", @@ -40,7 +41,7 @@ ccp_check_pci_uio_module(void) rewind(fp); } fclose(fp); - printf("Insert igb_uio or uio_pci_generic kernel module(s)"); + CCP_LOG_DBG("Insert igb_uio or uio_pci_generic kernel module(s)"); return -1;/* uio not inserted */ } diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c index 000b2f4fe0..0536994300 100644 --- a/drivers/crypto/ccp/rte_ccp_pmd.c +++ b/drivers/crypto/ccp/rte_ccp_pmd.c @@ -342,7 +342,7 @@ cryptodev_ccp_create(const char *name, goto init_error; } - printf("CCP : Crypto device count = %d\n", cryptodev_cnt); + CCP_LOG_DBG("CCP : Crypto device count = %d\n", cryptodev_cnt); dev->driver_id = ccp_cryptodev_driver_id; /* register rx/tx burst functions for data path */ -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:29.087317499 +0000 +++ 0020-crypto-ccp-remove-some-printf.patch 2023-02-23 09:36:28.210169645 +0000 @@ -1 +1 @@ -From e946ca8e727424b511fe4ea278d8bec76b800e7a Mon Sep 17 00:00:00 2001 +From 230bbf810bfdcb9a7f728a2b393a8724e5d3188f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e946ca8e727424b511fe4ea278d8bec76b800e7a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 424ead82c3..9c9cb81236 100644 +index 664ddc1747..c36409a0bc 100644 @@ -24 +25 @@ -@@ -362,7 +362,7 @@ ccp_find_lsb_regions(struct ccp_queue *cmd_q, uint64_t status) +@@ -361,7 +361,7 @@ ccp_find_lsb_regions(struct ccp_queue *cmd_q, uint64_t status) @@ -33 +34 @@ -@@ -709,7 +709,7 @@ ccp_probe_devices(struct rte_pci_device *pci_dev, +@@ -797,7 +797,7 @@ ccp_probe_devices(const struct rte_pci_id *ccp_id) @@ -40,2 +41,2 @@ - ret = ccp_probe_device(ccp_type, pci_dev); - if (ret == 0) + ret = ccp_probe_device(dirname, domain, bus, devid, + function, ccp_type); @@ -43 +44 @@ -index 38029a9081..c941e222c7 100644 +index 1702a09c4f..6932cb4152 100644 @@ -54 +55 @@ -@@ -41,7 +42,7 @@ ccp_check_pci_uio_module(void) +@@ -40,7 +41,7 @@ ccp_check_pci_uio_module(void) @@ -64 +65 @@ -index 221a0a5235..bcb621234c 100644 +index 000b2f4fe0..0536994300 100644 @@ -67 +68 @@ -@@ -237,7 +237,7 @@ cryptodev_ccp_create(const char *name, +@@ -342,7 +342,7 @@ cryptodev_ccp_create(const char *name, @@ -73,2 +73,0 @@ - dev->device = &pci_dev->device; - dev->device->driver = &pci_drv->driver; @@ -75,0 +75,2 @@ + + /* register rx/tx burst functions for data path */