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 AB959A034F for ; Wed, 10 Nov 2021 07:42:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 579654068B; Wed, 10 Nov 2021 07:42:39 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2079.outbound.protection.outlook.com [40.107.237.79]) by mails.dpdk.org (Postfix) with ESMTP id C7A3F4014D for ; Wed, 10 Nov 2021 07:42:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O/L61zyd/34NWUyAQsKftyTGeKdjUSeSyLzEpdrpWZuKUP9E4qp8vjYygrPm1uWIFQcCUD94MBV7NHi0z7lUgYGFwbUV4hgMohvFF49/6ioig8hsHwHVkUTvTyJjjjaXUWjjLSNdAHDtA2ADUd85eWoOmX52kSJYQbcaesi7MhmL1qNdd+9Si8uema/O7BfddltoH9IBxsuqtUugPVlu6SOztLbOyP3DH7Jcbu69yYPSHp/tVaLOF+u+KmDdDAtjY8kf/jD+4YyeDqUk8FAZikgyMtUu7Zw5K+bBHfauSwMKqJ0QqUjKSTQIzpZ1Ofxe4sF29QMDi8kIjsqeU+b8ew== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FuJMyIxO2kxrd2LvXLtCqPz2JoA68/CzHQWwW3lEytI=; b=h6eFrrca7h8XrBtAkNAtf0c+H7PPTcGZ8B0GZ/xnJqryrm/Sjnip/YhL7T8Z6U+8GngXyIlOl8stCgUgWyvRabqjBacQWE+TQiF0ZZKaB6thG+DeTXFAZM28YGeRYrq4o78rTmqWqizRU5jzksEo8Posd3xn7qaj8v+4Dp0k9SmYY7GTa8jBA5bitL5qdgTvtxOhEfE6xkTEiMR0YgyEqKernkYHEtxLb9OnFPbBIWn3Qn/6LmtBJsha0kRvVNiww2FT5KPpkYSL0ebAmWMmUF92Fqnq3oYWoJHbCF0lLP7zkuvpfPEIcGCDW2cTS0RYX5i0+vMPGPBbL8R7LaOyGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=FuJMyIxO2kxrd2LvXLtCqPz2JoA68/CzHQWwW3lEytI=; b=SYT17P3vPvtwXfZVlpkbvQtiOkX34bQBWfQhoEiUhAHHOHFsyKTHGLTYMshwhsrnHthgb2L/ZfgXbkB+w52C4vS2P9C4JomLcPHp5EjUWjawYfUocaT4rEg+WVAevJwoaFmKDoCw7I/psr4aZD/pryTgWp7hyYEZEPGAserAVVtpWX0UEDm/rocbTgjlP608uaeFJiuU/OJgLxrd0jkz0t+i3nqKSwyTFznBjr4PX9JvUpMpovlNYjtRXF3D/3IVQo02N/4Zvo1rzwMpSvnJOQtT7y3dZPP8eoYlLTqf9y8YLFn8xckBC7Td7M3dC+/jH32rLX+/hs4duVhg7J3Hkw== Received: from DM6PR06CA0089.namprd06.prod.outlook.com (2603:10b6:5:336::22) by CY4PR12MB1222.namprd12.prod.outlook.com (2603:10b6:903:3b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:42:35 +0000 Received: from DM6NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:5:336:cafe::e0) by DM6PR06CA0089.outlook.office365.com (2603:10b6:5:336::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:42:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.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 DM6NAM11FT004.mail.protection.outlook.com (10.13.172.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:42:35 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:42:32 +0000 From: Xueming Li To: David Marchand CC: Luca Boccassi , Maxime Coquelin , dpdk stable Date: Wed, 10 Nov 2021 14:29:35 +0800 Message-ID: <20211110063216.2744012-92-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a875c0bf-9a7f-43f5-7ef8-08d9a41547b9 X-MS-TrafficTypeDiagnostic: CY4PR12MB1222: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NhZ2KbAExvN+WDHffGjg5/RkZXfqEh8wmg9LUqXq7woLn27iYgQz74tA0GiHy5cFdhAW8kx1kgVegzkKUSmnzlUMdNlkpYXpbwfqnqxi4N+eovk5Il8NOWi++1++TiPUBVCs0aW4tBCQi7g7kQAyXOvkQffl+KXUbdbh1hFqpFeHoTj9Da2OHOo3v1MYIYqX4pIMMwsfdNrDEQdqpCexYMHuIkUw+1v78XILFOWRyVxS+/9VOziwg+ShBkZXSon/aVlXJUQv+DR+mqCJMGZAtevI9lcqvzwtT8fVPqvyJyqNvbL9CUiIFRGMqZoZaauIeZkA84elfSnitcrEnRTNDX4FvrdgDJ0BiDTDBZ9/7vlUvBeUaEPwcyKGriV+sG/ubFnh2/ocfrbpHCBO3Hi6mP1OtvlBRXT+h3Am67Hno+QcMJYK0inzlDEUJZz1jqEipzMv/Qxf0mN/THUhVxD89TC9usaLq+TykmKJCYa7QPKXL7v4ua6A7BpEAsW5zX5rSiQ1Gwm15chJy6XRN7YyVipxICw8Et5MzKCpPlqrZvxSSl5QnBG+1L5OyLvlK1D+TF6z//oCJHQJSHc1wID+1H6GVjGaNSdzMIfbn6kq/eCD4txTvb7fLXv3Q3xwOv5k47UG/ga5O5lvrXUr7yKswDmm73bli+ScJJeqGgQaCyGtQvT9jbQwM6KuJmthniP5liV+hYQ47oDjkk4taGXoeTgesKV0oLHtDqxeoZc82W7+MuD/yNUwxHoq8XrS0eGYaHXS92GbneVOSWeNs+3HAXOnPQmseJAUTy9GKHILlqWmW4omCv4TXFi96Cez6Fc6R4X+c6HNRQW9pw23pFNi3g== 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)(46966006)(36840700001)(70586007)(4326008)(7636003)(508600001)(83380400001)(7696005)(336012)(53546011)(36860700001)(426003)(70206006)(2616005)(47076005)(36756003)(1076003)(4001150100001)(86362001)(82310400003)(2906002)(54906003)(966005)(6916009)(356005)(55016002)(6286002)(5660300002)(8676002)(26005)(316002)(16526019)(186003)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:42:35.3083 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a875c0bf-9a7f-43f5-7ef8-08d9a41547b9 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: DM6NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1222 Subject: [dpdk-stable] patch 'net/virtio: do not use PMD log type' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/49a2b0ca693e364b05ab14d500382f0edb609719 Thanks. Xueming Li --- >From 49a2b0ca693e364b05ab14d500382f0edb609719 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 16 Sep 2021 15:25:02 +0200 Subject: [PATCH] net/virtio: do not use PMD log type Cc: Xueming Li [ upstream commit db48aaa2340047e6fbadbe0db9a76ff712e86ec4 ] Fixes: 1982462eadea ("net/virtio: add Rx free threshold setting") Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 7fb41f12af..bb7f3a36d4 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -695,16 +695,16 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, RTE_MIN(vq->vq_nentries / 4, DEFAULT_RX_FREE_THRESH); if (rx_free_thresh & 0x3) { - RTE_LOG(ERR, PMD, "rx_free_thresh must be multiples of four." - " (rx_free_thresh=%u port=%u queue=%u)\n", + PMD_INIT_LOG(ERR, "rx_free_thresh must be multiples of four." + " (rx_free_thresh=%u port=%u queue=%u)", rx_free_thresh, dev->data->port_id, queue_idx); return -EINVAL; } if (rx_free_thresh >= vq->vq_nentries) { - RTE_LOG(ERR, PMD, "rx_free_thresh must be less than the " + PMD_INIT_LOG(ERR, "rx_free_thresh must be less than the " "number of RX entries (%u)." - " (rx_free_thresh=%u port=%u queue=%u)\n", + " (rx_free_thresh=%u port=%u queue=%u)", vq->vq_nentries, rx_free_thresh, dev->data->port_id, queue_idx); return -EINVAL; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:06.076203488 +0800 +++ 0091-net-virtio-do-not-use-PMD-log-type.patch 2021-11-10 14:17:01.850746254 +0800 @@ -1 +1 @@ -From db48aaa2340047e6fbadbe0db9a76ff712e86ec4 Mon Sep 17 00:00:00 2001 +From 49a2b0ca693e364b05ab14d500382f0edb609719 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit db48aaa2340047e6fbadbe0db9a76ff712e86ec4 ] @@ -7 +9,0 @@ -Cc: stable@dpdk.org @@ -16 +18 @@ -index 501ca1582d..b9d7c8d18f 100644 +index 7fb41f12af..bb7f3a36d4 100644 @@ -19 +21 @@ -@@ -690,16 +690,16 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -695,16 +695,16 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,