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 86844A0524 for ; Fri, 5 Feb 2021 12:35:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7DC8E188A29; Fri, 5 Feb 2021 12:35:32 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id B5068188A2E for ; Fri, 5 Feb 2021 12:35:30 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id g10so7351549wrx.1 for ; Fri, 05 Feb 2021 03:35:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rUHFKH++2OYR2cmDvwKL01XKC6OIHuzAODvoMnPS07U=; b=EzG/RrJ8AD0bhC7Sck4SCXb3ky4pptKIMjwDMd9W8Ac36FwJ3YCcI2n/dc3P3l6kN/ MUywabJwC2iJ9L1bnvVgIFNfax83RvR2bGNrTsM4nW5YFgN17oIe8NP5vS7yvQ7IlWsj +FVI9d0lDOuvqXYWYVyngaKF2FTovEWoqURS+YstWdGAmSLq2h9KVh2mZFLpXVnL1V8o ZiUw1RSSMIyJ+JQ3Ixz5zqZjuQLYPGembB33t7EjBgMBb+cRzKgmFDupcC8n8KTywVT0 4Zqqhwti6IZkeX3B1Cj941Bzkh2dh6eLytZGHzctbOVP3uqLvNjFcMJn84Uie2SLA2uH o9gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rUHFKH++2OYR2cmDvwKL01XKC6OIHuzAODvoMnPS07U=; b=msptn+UTEtjeZfwamlUPhfdKqK/EFeBHw8M5oWbMj3RiyhyLqygS7/Eeczrz8TaS7b JV9IFaPjG+o80Qa63pFUrn/O7BK30C6MK0qy8bZfVWhVqN8azhf5rwy1PnxuOGlS4MCv C8zLqmFNarN3ML8n9jnbiatb7m/e7C4OVIQvuSirL7KtTtIQztGrarryAZqMW+ZH6tbN JU3Asv71cJztXUXEJUy9HlG0SHq35NXa6Fs9DGy9CZCMZTDmI/IYXykFMyqYlupoHewb qexUzZEtyudCwR8g3EU3V9+rYYQJQ+mDPrgGirZnaw/6iKvL2TMy0gTdhU61L+rlkisc rPcA== X-Gm-Message-State: AOAM531KFx6adXYbsbYLvjpNuKAqflbxvRGGamP1eFiVjH9NYiQLwWAh AWBSf0h6tP5R8JibxwUDNt4CgYsX0moLRfGt X-Google-Smtp-Source: ABdhPJyv9L/1Rqpz57vdvhKM9aCENlupKmUtDnruIknhO4Y2w/1kLcpusscSIntf2BST3MOol70pjw== X-Received: by 2002:adf:dcc8:: with SMTP id x8mr4579962wrm.234.1612524930573; Fri, 05 Feb 2021 03:35:30 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c18sm22954379wmk.0.2021.02.05.03.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:35:29 -0800 (PST) From: luca.boccassi@gmail.com To: Hemant Agrawal Cc: Thomas Monjalon , dpdk stable Date: Fri, 5 Feb 2021 11:18:01 +0000 Message-Id: <20210205111920.1272063-195-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/procinfo: fix security context info' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 02/07/21. 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/3aad6dffd819aae936127e40f522f55d8dde32e4 Thanks. Luca Boccassi --- >From 3aad6dffd819aae936127e40f522f55d8dde32e4 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Wed, 20 Jan 2021 10:47:11 +0530 Subject: [PATCH] app/procinfo: fix security context info [ upstream commit 026a546a22ab20c325f07435e3a12debd267524d ] We need to differentiate between crypto and ethernet security context as they belong to different devices. Fixes: d82d6ac64338 ("app/procinfo: add crypto security context info") Signed-off-by: Hemant Agrawal Signed-off-by: Thomas Monjalon --- app/proc-info/main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index 44249dd2cb..b9587f7ded 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -645,11 +646,16 @@ metrics_display(int port_id) } static void -show_security_context(uint16_t portid) +show_security_context(uint16_t portid, bool inline_offload) { - void *p_ctx = rte_eth_dev_get_sec_ctx(portid); + void *p_ctx; const struct rte_security_capability *s_cap; + if (inline_offload) + p_ctx = rte_eth_dev_get_sec_ctx(portid); + else + p_ctx = rte_cryptodev_get_sec_ctx(portid); + if (p_ctx == NULL) return; @@ -856,7 +862,7 @@ show_port(void) } #ifdef RTE_LIB_SECURITY - show_security_context(i); + show_security_context(i, true); #endif } } @@ -1220,7 +1226,7 @@ show_crypto(void) } #ifdef RTE_LIB_SECURITY - show_security_context(i); + show_security_context(i, false); #endif } } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:37.886640914 +0000 +++ 0195-app-procinfo-fix-security-context-info.patch 2021-02-05 11:18:29.150697661 +0000 @@ -1 +1 @@ -From 026a546a22ab20c325f07435e3a12debd267524d Mon Sep 17 00:00:00 2001 +From 3aad6dffd819aae936127e40f522f55d8dde32e4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 026a546a22ab20c325f07435e3a12debd267524d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org