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 4F025A0A0E for ; Mon, 10 May 2021 18:05:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 46DD540140; Mon, 10 May 2021 18:05:06 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2056.outbound.protection.outlook.com [40.107.236.56]) by mails.dpdk.org (Postfix) with ESMTP id 7F2B2410FE for ; Mon, 10 May 2021 18:05:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OGdpK9Eq7VMzFkJX/8/iKywVt5xtJtZksHr/5/o80SVMuV7CGkFsvnWExwxFsG+QNNAoIy0tfmCJm5pmteo155YIdKRJAXih+VwFG43RMr7qrNP9qBh0mBtu1o8Xiu88eJeXUcFkjTT7dQQ6e0eUGzaQZD8QhhQ/m4SADd/juuI6XkTUsnUehp79xvL9+gngjr9ny7s/UaUgzOyhK66OaycbfSJuA850JygfejbUY5x5xCk0Cca57FuD05Eq6UDsBWqxOUOSXjoaRjlehNBfLA29Zc8bqN/aXrhnZBheQvTgXB4Sv3cJR/Nr+jnIWcCQoDISkNXIMXpGlfKW3xHKuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oV0w7q6WFtZhWBvi3Rnbvfk8F+k7qhuovIBLOURvAbo=; b=RZji6c+S5HhyGUpd7dzL/+tHeVSqfguvy7dVYPYn2IcukAlZVvz43Um0PV0edsQ2pJGke4fejGgoDquD5KaLS2r2RM+/C63YczBg67n07ZDRTGvmpDXJnj0bu5O68rrlNeltRNqa2CCxMJk/s403HLZvOBommYpqBZGpk3Nvm0DtA4jyGK0QxSeg0O7Wve9VpXy0ZXeV9iJ8yt9BliBNwUzL3DTMEhvaiiV0GX5jK8Bh7rQQ8M49PfFIyvC8tGeVdKFWa8ZycvyRGrxN16mR7oo8wS0C7PuyLsCSBCKXLIPK12An5oVU/0CnzlYLq8La3PgHBmxbuKakorQfxLZmLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oV0w7q6WFtZhWBvi3Rnbvfk8F+k7qhuovIBLOURvAbo=; b=VwdbcYazYOljHvHecbLPg4ap49sMVp0PNqadBdlaG43v76+KS7+y0vvMf7QpYqt8wY0/TX2Ae+crG3gc9sdYA92DXeSDQdFWns2IWItdZ67vxLDTeMwUVsxZaIfbpnd6pcRZddgtc7tZlq3Za7cAHZ+hk14aV31bWW5iS/FVij7QV5TtxiX4RrJOw9YELZzPmqNqMhqcZrTZlHgcnGdezURlk94yPv9ZePdT/5/2gwiv1z2ffFzkJYAeDQqvGVynxTrtZQNcR6tdhwKvzyvjF+Z6rEPjluPFbO1hHV8B2RtNZyUZyuvsBD5USMlyrxCsivFdKtBXtOtbVuQ4C/4s4g== Received: from BN6PR21CA0009.namprd21.prod.outlook.com (2603:10b6:404:8e::19) by BYAPR12MB2966.namprd12.prod.outlook.com (2603:10b6:a03:df::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:05:02 +0000 Received: from BN8NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:404:8e:cafe::47) by BN6PR21CA0009.outlook.office365.com (2603:10b6:404:8e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.3 via Frontend Transport; Mon, 10 May 2021 16:05:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT048.mail.protection.outlook.com (10.13.177.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:05:02 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:05:00 +0000 From: Xueming Li To: Dmitry Kozlyuk CC: Luca Boccassi , Ferruh Yigit , dpdk stable Date: Mon, 10 May 2021 23:59:28 +0800 Message-ID: <20210510160258.30982-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22d6f8b3-55ee-45f2-bf79-08d913cd5e75 X-MS-TrafficTypeDiagnostic: BYAPR12MB2966: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6QtoWT9MBl0b9aFMmLtNhpDOshJACaLJy00CjeRnqgm5rr5SpIMT4nQR4jZjqE0UE+PxPRXgREdcocyTWGkZMPCHVcV08unO4lh/bYlyLAw9AYwxvfrUNaIYOC+dGIFeBd0UeXtDevcd8v3lkm2uHhmmuhbJtHyZlBxMYvDUUiirk6E8ceDEUOyRuxz5plCtMJz37nDq37LvDqneYYNuWKrtTLthaNscphrgdM2QS6jvm+oD8nRea6OgWpKb70IP3fveJl38Y2UpnXTtnof1BXxkE5C4GpHk8TjtF6L7U04uVbmg+J1KHsnAdp95EXasEF2mP6mTs1VRwjuWnwYYVXM5xS+/h/n/TyIHFcWYgmrwWuppswiFv4b9+8Nfa8X2MP7mPaQQSd1n5XQ/pHQDYqkAJYIXEZKxjM2EGICCG44+Yr+YhUqn1+wVVyoiyl4EF2j5tQAUd8QaNpdi1sHsK5kNPduZt7+WyG1u2UvXXiRJN78nY0fK8J0hqXvO66Rvd1FQGUSNvTvU557DfezKUEQ4tsplglibiNC/QWhGEXr2jlw+jcpDTZYgLFlSrEh0flWoHGvB7G9vi++svgl2Cxm0t3jVvy+yMRQUkVvPPXZxOtDcLXmbjmaNtS4/YH+nOAXHrEkNmrnFPLA0K28mF/qn0MuxB17xW77WscNLRXcm9PAxTXSoBeeXz/+xnY0YCEy2kDcf4tBc1/4El4sZ/YKMzGx63D98cmUK6sbnB5psose02WSBrZGkBwTTTYVKTqy9PpjOdRELQz1W+BPJTA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(39860400002)(346002)(376002)(136003)(46966006)(36840700001)(82740400003)(47076005)(16526019)(186003)(316002)(26005)(54906003)(36756003)(5660300002)(6286002)(86362001)(7696005)(966005)(6666004)(478600001)(36906005)(2906002)(8936002)(70206006)(6916009)(426003)(8676002)(53546011)(55016002)(7636003)(356005)(36860700001)(70586007)(4326008)(2616005)(1076003)(82310400003)(83380400001)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:05:02.1965 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22d6f8b3-55ee-45f2-bf79-08d913cd5e75 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2966 Subject: [dpdk-stable] patch 'net/pcap: fix format string' has been queued to stable release 20.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/cf30b35eb3758dfb71c0de82627ff47713085b52 Thanks. Xueming Li --- >From cf30b35eb3758dfb71c0de82627ff47713085b52 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Sun, 14 Feb 2021 05:16:12 +0300 Subject: [PATCH] net/pcap: fix format string Cc: Luca Boccassi [ upstream commit 198aba383316162e98c6e0c3c53c525ddca0b071 ] Use PRIu32 for uint32_t (found by -Wformat with Clang on Windows). Fixes: a3f5252e5cbd ("net/pcap: enable infinitely Rx a pcap file") Signed-off-by: Dmitry Kozlyuk Acked-by: Ferruh Yigit --- drivers/net/pcap/rte_eth_pcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 40f4fa9021..14a0072d86 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -827,7 +827,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, pcap_pkt_count = count_packets_in_pcap(pcap, pcap_q); - snprintf(ring_name, sizeof(ring_name), "PCAP_RING%" PRIu16, + snprintf(ring_name, sizeof(ring_name), "PCAP_RING%" PRIu32, ring_number); pcap_q->pkts = rte_ring_create(ring_name, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.213834300 +0800 +++ 0020-net-pcap-fix-format-string.patch 2021-05-10 23:59:26.340000000 +0800 @@ -1 +1 @@ -From 198aba383316162e98c6e0c3c53c525ddca0b071 Mon Sep 17 00:00:00 2001 +From cf30b35eb3758dfb71c0de82627ff47713085b52 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 198aba383316162e98c6e0c3c53c525ddca0b071 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 38b1fe2f77..2766745a71 100644 +index 40f4fa9021..14a0072d86 100644 @@ -21 +23 @@ -@@ -893,7 +893,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, +@@ -827,7 +827,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,