From patchwork Tue Oct 25 13:59:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Aptel X-Patchwork-Id: 13019295 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 625F7C04A95 for ; Tue, 25 Oct 2022 14:03:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232412AbiJYODa (ORCPT ); Tue, 25 Oct 2022 10:03:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232031AbiJYODE (ORCPT ); Tue, 25 Oct 2022 10:03:04 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2079.outbound.protection.outlook.com [40.107.92.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0BE0190E67 for ; Tue, 25 Oct 2022 07:00:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NBWhe6RD83Vw0uE/YayPk1OEnm3RC3gP1sIvuFg1bNHRngy97Oqc0/Kzq1iKsy/zS5JcStvPIydGs2QquC5Q8jd4IfPVUL0GEWOblOoicddXWFyET/sNjxz0zuZsYKfjWc0AMuUY3BdwHPGgddOrdg4dQNCL/RofXJdvPNSsAAKkQHRHA9RTCPAqI76t4wVCQTUIIA95PrSMoBTEXGFckorKeAXHvCBQA7PLirb2MfZGYL/jPHlhWwSCx7t/MkK0r7QDWsrgaYiRJVC+YvGO+NXk14l0Oamlvi6+edt37lk/cv+AFCOZx+xct3N+yc4N7vd4u9bT/qNtxVGEaA+H9g== 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=CgcebzpYjn6XXcMOBmx9qMp4+UVXRnoJ8IvKT4kLqAY=; b=hBsibGiMM5NHIaXKDducvuRrwDKCjNH0svYx8xWWJJgL0aYkI+pf6HEv3nx+/5CnBG/gb1oD2HXOuYtu/4y0CtPD0qrSjCC1cFzysVk7O9DbJTzazjVXuFaGJ8Cv5OvzUqOPDe+mSwvSa4GkeHFkkogJ2hYzoARgE+CPQ5QGW7To1sTbPzDFd1emAqwV/zEH8tjpjQe7e8yec4SKnpy5m410k0rFT4ar1mR4MZC5XbS1W/5aOZ8W+zgVgjUquOcL6QITlSoe2qndFFP9VCFu0pV9/ubIxYikUu76+DmMIoXJ4fUObROLf2v1zjPC//A0FnQariqKjK7644J0Sj1t7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; 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=CgcebzpYjn6XXcMOBmx9qMp4+UVXRnoJ8IvKT4kLqAY=; b=P7atqzrPSv+mB8tr0IP62WztqzBsczjgHc629e4U04Oi6Ws1Ua/SzG1saF0ZLTSEwjEkD7iLCO8HVOUyNXNqmbru/3nFCCDN2MhosopEWmyLOIoF72Hfj8vbnY4JVgcANlt2xiX6fXjr3Vx5OkYRUeuzPIT0UqeKvzKYdi0/IGMw6J7b5/F68Hqw6mUqwLlvU3tujYSauyD8QuNUYIM4KnfS/4mtyUiq/XwI3DjI769sYZ7YB95zQeMYsHVwjev1zAu/4bjSY3s04miw+66N7WAwunmJ5qJaov1smc4m2u1Zf7GGgLYv92VtpYeVfHP7BJ+BwXWk0JZpHOxZBXfYUQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from SJ1PR12MB6075.namprd12.prod.outlook.com (2603:10b6:a03:45e::8) by BL3PR12MB6521.namprd12.prod.outlook.com (2603:10b6:208:3bd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Tue, 25 Oct 2022 14:00:30 +0000 Received: from SJ1PR12MB6075.namprd12.prod.outlook.com ([fe80::6713:a338:b6aa:871]) by SJ1PR12MB6075.namprd12.prod.outlook.com ([fe80::6713:a338:b6aa:871%3]) with mapi id 15.20.5746.028; Tue, 25 Oct 2022 14:00:30 +0000 From: Aurelien Aptel To: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com, saeedm@nvidia.com, tariqt@nvidia.com, leon@kernel.org, linux-nvme@lists.infradead.org, sagi@grimberg.me, hch@lst.de, kbusch@kernel.org, axboe@fb.com, chaitanyak@nvidia.com Cc: smalin@nvidia.com, aaptel@nvidia.com, ogerlitz@nvidia.com, yorayz@nvidia.com, borisp@nvidia.com, aurelien.aptel@gmail.com, malin1024@gmail.com Subject: [PATCH v7 04/23] Revert "nvme-tcp: remove the unused queue_size member in nvme_tcp_queue" Date: Tue, 25 Oct 2022 16:59:39 +0300 Message-Id: <20221025135958.6242-5-aaptel@nvidia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221025135958.6242-1-aaptel@nvidia.com> References: <20221025135958.6242-1-aaptel@nvidia.com> X-ClientProxiedBy: LO2P265CA0197.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9e::17) To SJ1PR12MB6075.namprd12.prod.outlook.com (2603:10b6:a03:45e::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR12MB6075:EE_|BL3PR12MB6521:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e3b46ce-c1e7-431e-ff30-08dab6914709 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H/KjOsWYO1gjTpbyBXnoLYJW9jS+Y7s1oDLsAooSPwLKZ1RLsk9w+q2ZKO3VtkMHaioGKzuxHFcGhTwV5TigBrAqDYsl9JfiKtSinaXG/LGdIDdvVDebICjPCEzazLK/5X0LXDO7+IrRW4dNOWhm5vicZvmKrmXuvUS2va+fuRKEtfXsf6g8S322VenPZxvLZM5b7J+WKWHi9SpE7vxuT2VSQCAdCmSdhwD6DMsW2D0Qli9F7uBZ6w2jB8Rhet+2PFmL7nM0+9HbYfwkIv0eOJhg+Ynlbf/lukvWjXS8GBMJivlw7S4Tql0vzfuh3uL9PBcGtDgrYRHme50ASnyBFmeCcPGMcyltKA+FZIWkglSFh2U8ZKQZcF1M3NSy/o4kz0wbId9RJ7xnvhH9vQUBpskjA+9hqQRUweSuMo+2BGxVAgmoS2P1T/IWg5/jJ0Fp0MLvACvAMSJaVRThiu3UmH5YDGW2pH7E4wpbijQYl7wkoY7/Eak6M3/CO/UxZXnxbqijssdkUBMaT6wKJCc+ncYmjMAtYSU8lUY7i4YZktJV7HDy6nQA6C8aRQasikBw9ClTBXE2WV+XEylAPYpohd0f1wpHixSlmofmOiFTpy9v9NTmRBB4R8OWGI3QKhT0ddebuy+tII74IPmEMMG5MnbgQW5legve2p6RJA7majwzFZv5A2M3oUJ7JOestaCyNmVN8pAJEl6Qa05XcATmoB4zOkw9Cvja4L3wL/C3iNesKpvsKfmhWJ10jttKJ2it X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR12MB6075.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(376002)(396003)(346002)(366004)(451199015)(921005)(83380400001)(1076003)(186003)(2616005)(86362001)(38100700002)(2906002)(41300700001)(8936002)(5660300002)(478600001)(7416002)(26005)(6506007)(6486002)(4326008)(8676002)(66556008)(66476007)(316002)(6636002)(66946007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YMfpSnXcafMq2EwM+RKtMEMJ9uIXtIQ8vmYAWty/ztndFRBMm3YZjyEF45zgU+GAjyJVEmhLhXOT58Le2/xprm1uf4phKCF8M21c8FYxAerYSLX0Qmas1OHZHmtWL7CR8gBZ+SMbzwpw3AaBlDG8rw4JTxKMhe5js5fSWVTJX+Hvl937Btn+mtWazCUZO9RN7axAlUJCeCLseDyavjMkHZYP7KTtwouSRu+7wbLlm61OB+P/PzPw5MLcI6bt0cGhKQakdZ+T/xedCr0DWdOXvfwyT17Rlw44odI2gEm+n/3XoOKWZqnW1/tFQbS8ebzGBORHEJJH+DdbfeGHMF0ksF7zmn4CSPImvwJjhhl8c7mdmDrv+UO5G3Zt1bdc/sBud/gHx5uTkZmdOdJfzfmY51tnU16n/iRoCUJs6zag9Nr7f5WdfY7fwaR8OWER6zSsTok6daNaMMKbXPsIIeqvmyOZmREpmGiUYKgcU55HdowqFyaDD2dKK5wMuAPMhlUjg3mtEIgYpXnHKXXiEGdbnhyXyRihbFTPy2Dw9/gwFzbJ35DAqRl7kQqzez16MaDKC+VyriDe5dKZb3ZYu8gcpHA/9UyhuQuz6GiEh0a8AVXFh6t2NLTBAWSebB4ldBD0rX4skUmQtLPI0U1AX5pqGvNDRRpeaZFlWDT4SaCfRWvKOYIlMGvFOmkRxQmF4gCK1onOHyNbTVUHVxbPpxYnvcHsQ5l4wopEO4kvGn6pgsA8F3rVveUuuG9gAipgmF+s5RE+YxT2S23k7Vu5v+7zDXiVulEA8Z6tFNuhSu6ll5fphvkGxCOb7Cg/sGFAoHD4qebcdtQMHKX4X+ooggBlu5TJnaiA10vrecaLI9szZ4crvIDtFWOzsfjUEikcl6um9bxxaYYuC5v4MEO+XTIKckPOul1VETUzBorcl/zesOnX2X1KRZCBNKIo6A1q4l7+5BL2Tqs42wjlWubw9UBRIn0EpCubcTyhe+MIoEEn/drcnZsZzns4IiB+Rgo1iR6N2quek3OqoRJlbKTepXS63/FBS+ZIzvhdcJc7TKJ3kdhqqV+hEDZLIFjvoj8GlxWyzTHu7SHRYMNlH4ivwV629AoUFx9DpkeZvyNmQ+kV43gxhrN8bN19f3Nl0nlrS7m3kyY2LzTCY4avNJ3tNpTywiHXg8dDli0mC+KcAhkQ6kdCygeBBmT36DgZNFqw+i6l7WnpWD+pWdcBlGNB7RPlqL8xm2B8Ig9JuMX+hGKP4DqB8AjDrDaqQ5IBfCu9ZmthcmkU+a7zUK4bAD4EoqIBXtMZVSC5NPLvVogV33lvfCSBszcOrKTFYBtQhw3SCDZ83wS5hlBhezjKwnCY9y0Dv4Ib2Uxff3SgcCsPvHeM3obsMw61PiEtcqH2uqELeiG+kDiI2DlFruPWmhPyiBZQ7xVe2Ru0uDnOpyLWYgsWbFFY0CX4IE3qbQnod5RTa1h7KwO8Ds16/lYD9cuDX99e3M8v6eRg/SVIhbVXPmMI8z1o6WOOV9JpEh7NffQit9swS6962dj/uZFdILewGbtmvDAbfsz3Lrynw/t5+IqQ3SkMHAz+7mMZs4jRVjMu79vB X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e3b46ce-c1e7-431e-ff30-08dab6914709 X-MS-Exchange-CrossTenant-AuthSource: SJ1PR12MB6075.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 14:00:30.5790 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ChId7/rztW0Mda8QEtTBbyjVGvKYB5WBv4D2iF5Q7AKoxBzqKkwzvUCkivmSA2DpnMrtEBk07Dfx0cCygMew/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6521 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit fb8745d040ef5b9080003325e56b91fefe1022bb. The newly added NVMeTCP offload requires the field nvme_tcp_queue->queue_size in the patch "nvme-tcp: Add DDP offload control path" in nvme_tcp_offload_socket(). The queue size is part of struct ulp_ddp_config parameters. Fixed space alignment to open parenthesis from the original patch. Signed-off-by: Shai Malin Signed-off-by: Aurelien Aptel --- drivers/nvme/host/tcp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 1eed0fc26b3a..42b2d86dcfc2 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -133,6 +133,7 @@ struct nvme_tcp_queue { /* send state */ struct nvme_tcp_request *request; + int queue_size; u32 maxh2cdata; size_t cmnd_capsule_len; struct nvme_tcp_ctrl *ctrl; @@ -1475,7 +1476,8 @@ static void nvme_tcp_set_queue_io_cpu(struct nvme_tcp_queue *queue) queue->io_cpu = cpumask_next_wrap(n - 1, cpu_online_mask, -1, false); } -static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid) +static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, + int qid, size_t queue_size) { struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl); struct nvme_tcp_queue *queue = &ctrl->queues[qid]; @@ -1487,6 +1489,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid) INIT_LIST_HEAD(&queue->send_list); mutex_init(&queue->send_mutex); INIT_WORK(&queue->io_work, nvme_tcp_io_work); + queue->queue_size = queue_size; if (qid > 0) queue->cmnd_capsule_len = nctrl->ioccsz * 16; @@ -1734,7 +1737,7 @@ static int nvme_tcp_alloc_admin_queue(struct nvme_ctrl *ctrl) { int ret; - ret = nvme_tcp_alloc_queue(ctrl, 0); + ret = nvme_tcp_alloc_queue(ctrl, 0, NVME_AQ_DEPTH); if (ret) return ret; @@ -1754,7 +1757,7 @@ static int __nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) int i, ret; for (i = 1; i < ctrl->queue_count; i++) { - ret = nvme_tcp_alloc_queue(ctrl, i); + ret = nvme_tcp_alloc_queue(ctrl, i, ctrl->sqsize + 1); if (ret) goto out_free_queues; }