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 E918942D46 for ; Sun, 25 Jun 2023 08:45:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3DB540ED8; Sun, 25 Jun 2023 08:45:23 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2087.outbound.protection.outlook.com [40.107.100.87]) by mails.dpdk.org (Postfix) with ESMTP id 92DB340A7F for ; Sun, 25 Jun 2023 08:45:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aS3w/3gED+G7xrtnlb0BrYlUuR4BEPuQkZj5sQ/qz52rTjgNdw4QpoGWkBguRZLULvqQIpyh0w1sPn5noGGkdijKmnIBNQkFiEK3Cc+5nFUcSCAKF7bkowfUwlG9aD7S5X5HwMdH11bpZt9TQu9bSiJQ7bYiaksqzwy9AZU3asJzlHz4GUMe9/mHF3YlzAvVNKv3bS87gKvap8GQLqLfVFc7weW9zU4fVFG0VNgJlU8yhzVtJauEkp5ZylTD/DcO8lsO5iFOa5XQhyEYi4iU9VzZ2Lg94TOPx7vNUmQVoSj87PakcKo6/M1udJmylzXTqXwJX/aXEJx84wzYiwKC0g== 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=Lel0oIUh13aVn83zGDP9n5WZTKdDlU5/PHDV1K/QyI8=; b=Vxax+l86qdlCA091g6r8Bzfj5m2FnbFToDETmicx9Uy8eNB3ekcCJEuMISQRrdlsZVpNn/vQvMo+qiNHa24k0ToeOruUIoSS+cImPTk6TjbjIo2nedZKuCsiKQfjFQpulksV05XzlVv2zE+m4X26LkSCrjUoSvlnjRKKbYDBxpugnGgk9/llhd3nCmDGFaU6sU7nXMQU/btBjJpwlRtZVf8wBLqKWZuhTx+uyYxCUfJKzPU3rPUnY/Hmsv5DbwcT279dnhtwH02cW6WB/995d2WRQhH4SJSKsILiLL+q8HJQKr5bnVXBPmXwECL6uKnYTi/5FW4ShE85oBuCbohScA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=Lel0oIUh13aVn83zGDP9n5WZTKdDlU5/PHDV1K/QyI8=; b=HZixM/wKhxPPem8/8oFSK49P6+rvsQdd129MzNUxHBv+DIRr7z6zLPZF2BZClKRHv31vfgGwa58QaffVUv9zve5HWkQsDjkUuTaxqJk2XdT7buxqZ3t5ZnIlQOUFaS+33ybuvA1WovuvIpFEpgKGPtQT5Sn5KBG7NS5eeF355IhSxiaKRecVf6TKdEfmLCk6o+S0cNYoySjIBpouu3QpCQ2hFn9O3WpnjuvCI8nbvtjuztaoTKNfRJwyms8tgqb+qE2wY99WxUSb83V1kZ7SJmJmBPBnMUC0Mxz16UkTQBV05pgCKOgaxiBlg/88jD5lsgikda04UJ3C5a8MpnCs8g== Received: from BN9PR03CA0907.namprd03.prod.outlook.com (2603:10b6:408:107::12) by DS0PR12MB6416.namprd12.prod.outlook.com (2603:10b6:8:cb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:45:19 +0000 Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::d7) by BN9PR03CA0907.outlook.office365.com (2603:10b6:408:107::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:45:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT068.mail.protection.outlook.com (10.13.177.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:45:18 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:45:07 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:45:05 -0700 From: Xueming Li To: Wenjing Qiao CC: Charles Stoll , Qi Zhang , dpdk stable Subject: patch 'common/idpf/base: fix control queue send and receive' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:26 +0800 Message-ID: <20230625063544.11183-109-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT068:EE_|DS0PR12MB6416:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bd030b1-2138-42a6-f23e-08db7547bdb9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k2Aw/DxM8Jkb6AH2LO1r1kXwowLd5Bmk6yHV6QAUXZuWE5DXLSN150O5kl7VzFeSnzPSdu0mZU7LQz3t0GsuXHs8bfT2i9tdwVlu2D+mk0tc/OBkOVhyGGHAbJwx1tg0co4wRmWtC+e717qN+zofhkyQYFWN7oa6ggKUxKRyGmC7x0Vo6k/QEfOdql4vYxI+T4/dCgR5YTqGj8No64no69t/wGsmPzt1bxKCzOnP4gijW904PdPViXsI4kD2ZAYnO9Q34LY+a4ufeWwMtbs6n9ib5gYz9TjStSHAGJ5S0UQtFmeEQHYxyh+E75EiT3iVzqpZPhC3W1axhdzE1z4onaFWLUDh4IBLHdo2xHq1bTA6Pm8Tb21JPOJgcEVXcQnW6hj72XDZNnqxBhR+iRZVXJd56C8vW1tFVdBJmND/LC9QrZVSumF+xUmHB2IrX/7Fap+5AdNyVRy7AziZEcqSf5ou/ebKTHvmr/8yZ7smo7BgpfXn2j7p9Tf8YpdhiuEcxz/Fqjue/NghYx6ZazT5Z7gDs3W+t2LbUMADMtpawN68gCTBNCvcDxRSFQl7dmudJTYbJSyvSwi1u/ujlkBhnx10DhcuEvcqHOaQHPn8ofjZ2ckbP/78l9jFVbSSGLIsm78E01uQtANcm6mYjTGKcyQmZ5ITNXzWE4xn0gzAaK1adaifbU+OzxjQl7GXHHHlbZHKwuqzHqd4DQHKIXg+4hJ8bFVBJpCSBDWovIQq2LX9FoAPw/eh+kX9/3Pz3CUP2qYhRHStdTGdRgSc/Oxlnw== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(346002)(396003)(39860400002)(376002)(451199021)(46966006)(36840700001)(40470700004)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(6666004)(2616005)(54906003)(426003)(83380400001)(336012)(26005)(53546011)(1076003)(186003)(16526019)(6286002)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(7636003)(70586007)(82740400003)(55016003)(40480700001)(316002)(8936002)(8676002)(41300700001)(86362001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:45:18.7233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2bd030b1-2138-42a6-f23e-08db7547bdb9 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6416 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4cc85337b399df2a47f997980ea2ac80030464d7 Thanks. Xueming Li --- >From 4cc85337b399df2a47f997980ea2ac80030464d7 Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Wed, 26 Apr 2023 06:22:46 -0400 Subject: [PATCH] common/idpf/base: fix control queue send and receive Cc: Xueming Li [ upstream commit abb00ba2ad68eedbb7d04dd05ef1b112fd9211f9 ] Fixes the ctlq send and receive functions to not cast the cookie field to a u64 before programming. By doing a cast, it can cause endianness issues as LE will swap the lower 32 and higher 32 bits whereas BE will not. By treating this field as two 32 bit values, both BE and LE will place the retval and opcode in the correct location. Since this field is now being treated as two 32 bit values, the cfg.data section must also be split into a data high and data low. Macros to easily pack and read these fields have also been added. Fixes: fb4ac04e9bfa ("common/idpf: introduce common library") Signed-off-by: Charles Stoll Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- .mailmap | 1 + drivers/common/idpf/base/idpf_controlq.c | 16 ++++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.mailmap b/.mailmap index 79553991de..642bb987d0 100644 --- a/.mailmap +++ b/.mailmap @@ -198,6 +198,7 @@ Chaoyong He Chao Zhu Charles Brett Charles Myers +Charles Stoll Chas Williams <3chas3@gmail.com> Chenbo Xia Chengchang Tang diff --git a/drivers/common/idpf/base/idpf_controlq.c b/drivers/common/idpf/base/idpf_controlq.c index 3af81e5a64..8e4d3ee54f 100644 --- a/drivers/common/idpf/base/idpf_controlq.c +++ b/drivers/common/idpf/base/idpf_controlq.c @@ -311,18 +311,14 @@ int idpf_ctlq_send(struct idpf_hw *hw, struct idpf_ctlq_info *cq, for (i = 0; i < num_q_msg; i++) { struct idpf_ctlq_msg *msg = &q_msg[i]; - u64 msg_cookie; desc = IDPF_CTLQ_DESC(cq, cq->next_to_use); desc->opcode = CPU_TO_LE16(msg->opcode); desc->pfid_vfid = CPU_TO_LE16(msg->func_id); - msg_cookie = *(u64 *)&msg->cookie; - desc->cookie_high = - CPU_TO_LE32(IDPF_HI_DWORD(msg_cookie)); - desc->cookie_low = - CPU_TO_LE32(IDPF_LO_DWORD(msg_cookie)); + desc->cookie_high = CPU_TO_LE32(msg->cookie.mbx.chnl_opcode); + desc->cookie_low = CPU_TO_LE32(msg->cookie.mbx.chnl_retval); desc->flags = CPU_TO_LE16((msg->host_id & IDPF_HOST_ID_MASK) << IDPF_CTLQ_FLAG_HOST_ID_S); @@ -620,8 +616,6 @@ int idpf_ctlq_recv(struct idpf_ctlq_info *cq, u16 *num_q_msg, num_to_clean = *num_q_msg; for (i = 0; i < num_to_clean; i++) { - u64 msg_cookie; - /* Fetch next descriptor and check if marked as done */ desc = IDPF_CTLQ_DESC(cq, ntc); flags = LE16_TO_CPU(desc->flags); @@ -639,10 +633,8 @@ int idpf_ctlq_recv(struct idpf_ctlq_info *cq, u16 *num_q_msg, if (flags & IDPF_CTLQ_FLAG_ERR) ret_code = -EBADMSG; - msg_cookie = (u64)LE32_TO_CPU(desc->cookie_high) << 32; - msg_cookie |= (u64)LE32_TO_CPU(desc->cookie_low); - idpf_memcpy(&q_msg[i].cookie, &msg_cookie, sizeof(u64), - IDPF_NONDMA_TO_NONDMA); + q_msg[i].cookie.mbx.chnl_opcode = LE32_TO_CPU(desc->cookie_high); + q_msg[i].cookie.mbx.chnl_retval = LE32_TO_CPU(desc->cookie_low); q_msg[i].opcode = LE16_TO_CPU(desc->opcode); q_msg[i].data_len = LE16_TO_CPU(desc->datalen); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.389933100 +0800 +++ 0108-common-idpf-base-fix-control-queue-send-and-receive.patch 2023-06-25 14:31:58.555773900 +0800 @@ -1 +1 @@ -From abb00ba2ad68eedbb7d04dd05ef1b112fd9211f9 Mon Sep 17 00:00:00 2001 +From 4cc85337b399df2a47f997980ea2ac80030464d7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit abb00ba2ad68eedbb7d04dd05ef1b112fd9211f9 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 0431e410a7..c5fb28ad86 100644 +index 79553991de..642bb987d0 100644 @@ -31 +33 @@ -@@ -201,6 +201,7 @@ Chaoyong He +@@ -198,6 +198,7 @@ Chaoyong He