From patchwork Fri Sep 23 21:53:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Talpey X-Patchwork-Id: 1681705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MZ5Xc0J8cz1yqV for ; Sat, 24 Sep 2022 07:54:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231387AbiIWVyi (ORCPT ); Fri, 23 Sep 2022 17:54:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbiIWVyh (ORCPT ); Fri, 23 Sep 2022 17:54:37 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90D086327 for ; Fri, 23 Sep 2022 14:54:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QymDbH+nOCpkv26kex2GZh5NaTHIovaqdbf9b6yhGeQiylOEQ+rk7/onV0ocSgbKJACUhsAjwTtBfb7+ArF7noxU8B7TXgv4ZtDGmC3BAbF8OIWieMzPX4Rvohfi4L/mwMVxYh5TLwEVhlTrO74BXDVlF8N0A51Yk4zLOIQIHLh0fZBWR5Iq+1BJyHsmkTeBeGdATk53xjCgj+Tmb3kEOXCtkYhR71S0SmvbfMsRgY1T2BOLTN01BxxGi+glPO0ip+ILeHShtqwuRjTxUEYyqW2BpugmyRlFJGHhXthOQF47yHTvhTHAjaX9IRu1TZUexC9WzL65nVbttzd27m53Dg== 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=Ta9jH0CPNAcarRyFejg98tnimrtEnVbOqrhWWQc34SM=; b=n7tsQJhkk0WxoA2/sFC6JaV3VXKCzh3Gp8lJBbvY2CPNU/sLgUWBiwg0ECeNX2+00EY7mJCGHz7ekcabOSwVzEhd6H4kp10mnfoan6ioYPl03JIiZv81joU5GDEGl2Ryp8xwXJfB3412v2Lzl26ZjkJzQmfIQ81GQ7x90QW7D+9DfUtPME2lvK5eGT42fURxkw9HqJ2ErQtmoFK1B0tskzva/3mZzfA/ZrklmSREU7d1TL05db62EgGdJuFxNHggtIXV1PH5QmohaBb/FkJ2FiKfBCKL6tqdFiz08BlcOPh/W4tfHVFatu5VGtRO67RhjeNU3G8z5yTRpFtA2OTV1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=talpey.com; dmarc=pass action=none header.from=talpey.com; dkim=pass header.d=talpey.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=talpey.com; Received: from SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) by MW2PR0102MB3481.prod.exchangelabs.com (2603:10b6:302:5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Fri, 23 Sep 2022 21:54:28 +0000 Received: from SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0]) by SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0%3]) with mapi id 15.20.5654.014; Fri, 23 Sep 2022 21:54:28 +0000 From: Tom Talpey To: smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: linkinjeon@kernel.org, senozhatsky@chromium.org, bmt@zurich.ibm.com, longli@microsoft.com, dhowells@redhat.com, Tom Talpey Subject: [PATCH v2 1/6] Decrease the number of SMB3 smbdirect client SGEs Date: Fri, 23 Sep 2022 21:53:55 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: BL1PR13CA0074.namprd13.prod.outlook.com (2603:10b6:208:2b8::19) To SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR01MB4445:EE_|MW2PR0102MB3481:EE_ X-MS-Office365-Filtering-Correlation-Id: 67e02447-0cb1-4759-4529-08da9dae2e2e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hESARQ4bsoA1XwRu61OtFy2olMhq+T1zyIalPiptzA3LxDPFRdJlY4wQZ7aMn61EJQtuW0Qn5Qvj4aAX/ysR8E561BCQEO9T7IjvWjbbbGnnnJt6qJsCiWLvR/jDd05wgfp20+luBhAW87J3RzrZGnU9mlK72PCMPAaxzW9dt1OOXDHtqJUew3L/SgJdJ2hRyP5MaOFNGCoO/FJhvvnMumT4Fwvrj5h3GDQoDY06mT8ZV714joJ9BcHrn+q9m7voCFJcK1xjil9MxAvH5E/IirxFP5XJrroJNV7hJLbxsm3njMN5vLrTvl2B3j9IuAOhy6Omo2yTsuq3Dp7m+NmO1I1DsC3ytGlnLiCiPRBNkLLRqltEN0zm44aoaxjvijgRX76gMJNg3rMB3nTU9DYtiR9clGFGefPiIkmt82eqkujZiNW2VlE5CcjgQWUJO71sKkhJPVi3ujOUqBYDKrGSRzldQ1gQyuh8or43vZNeHyz5eBy6wKWYDIhrOdSYU4UUvMpWrTFljCfNSmnzS69GhkGxynww8yI6NRScn4ukDtA3Tmb+/uTwi/nd6dX6F0wvQ4lpRqaUEZdLVrN/tm0V/jLT6lXV0xcbYEWstK6OBH9j+Cv0LZH7Q8JK5NfXE+XJ8/thGy3C2b4ZFwdmsPLFBNwPEv4AAp9r3MgiTUqvLME+G7PpJRCJk6nBbat6OcPe1VXK9x8qOAourMTPMVPg/ii/XrHsdeI3M3NoYxAXlewZ338t13a2+Wr0p24DTKTywmkscCXb7C2ypCaaNGO5RQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR01MB4445.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199015)(8936002)(38100700002)(41300700001)(66556008)(8676002)(38350700002)(66946007)(66476007)(36756003)(5660300002)(2906002)(26005)(6512007)(6506007)(52116002)(4326008)(186003)(478600001)(6486002)(107886003)(6666004)(2616005)(316002)(83380400001)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C1Ey87hKRTzhYF7c+xhxA2uPdr7jKdA/zap6cqHMxFIPFWoPIbtCulbSd5gC9Z/jnrvLnHaDQZfJO8MvYgiM3hiqAklWk0Y6UltZj2Br7V3aROxfOwYXU36DZt4ckoCITy5q3s1js9WL724KZ6MQ9l+ojhrPQT49xv24AHzA/oGWY/FUQqIWkyG09N5KYSDUQ1tgAII6DXtWT6uuX5AeP2lxkQFei0ap69o9mVEPcp9+u5EjXzz/rRXjDq0yNWxLQuEg16A0saoU+WpPaVsy49xF5Rr7kw/2b7xATiBLWvSF2SNPp93xfwVM7vVPEsG6PhcF8b/s73PSK79e3LXok9f2jMuO9kw2VlyZhihwlPdApYQN8Sc5dzZDtRe98KI486DiN9TIrS/Dpiq+FxIjhb5IVs/xEZvEFZmwu8vzm0DVeH+5o4PMd7IIpeBNtMvhE51lbzC61twIME6rzs7+gL+YZ4JRVP+DDUBryxecyoKm83iorDAeHA2rftgSXYtbDPE6oFEmjrCzkV1Eohz9AE6eCyCet+Y7aZrEq6RsBGe8UqfjF7qM7ysPIvxVSlZxvmrNUMCjqCwK3Tkh/JoTdg7gtNd4XTq4Q16ATvWHvsD0rzzTOU+QTFIQAD1dizdzicpDVLbx9RFFD0/TCh+Jz4l8FdD/Qbc1McwnLg7l6YyU0hZ+VUGElSQl1P8pKTD0K4DZSDYIb6thy64nWv3grCX6SGapcZmPkrNe40Ctr1QZGZR6DZcrcXtahu8B04SSmKLO+jKEBgh+7Q4/QwgqfDjLC3pMt+Gt4FVYWTantjLVfZLtApqNnPVrxjNxrPr/kWNqYE4OHw97GnE/wdh8VB/QzN6ZMWOliXkIKM0Sxv7nXVGKkY1KZjk6YVVgwkIpw3h0uEIa/vJ56ohvMHewcd3phc1Bl0JoZR0HyfW27W6kkyOKRMdBP6OV8mtyIEawrkrflW3ZIUdsjZyB7VaA0lxql+0FysGX2q1pB02xFbxHRKmeoLyB6ntyGs6YVpYYnZqZt7ooFQpSdz3JpuULtRfIdV7KgJkzhC/lLMXzMuq0cigzk61i4d5gxdPtisr/iuMZhLqmaAftp0jqMsqSJMBVeThOjUDbqUvY0qyYTOWgI9S0BHyEUws2Hik7l44qK4ODclQb1rTFETpvSR0J1VJDuXDo6J7rEnr2BPQ4ac8tGdi1EgTyKIDNVJFSEmJOQK8n8Bmxy+csZrRiCwoTBFhXs44k5yGt+tWUaOK4j2WL5o1+zpGhGTPd/OXFcdgbG9Riucv6uzX/iCTTwtHKCI3BsoX+eFT3mH2mmj/d5d0OfkkTNXbJbOqd5miCuy15PYdVlQhMRXHTH7SKwz+rImQ82Es4+hBRLzYgwkklrbTLK6SnHxqExbq6pVJ8sRJ8iZU7mrbn3s5HHpCQbEU4SQyBVLJreEBECmVozigPUDzY8gmbMuSjYKJ5+MaQ5B+WsGo4WeC6lU6VWx4DhREeNz3PP+uJOJJTFR5nN94DsaND8zH6J2MGtLwWvVumjSi3y6Azj/u1Jmvu1PvdVEvc7AB6iX2nl6V8lhB4whgSo5IKf6ru6C7BKJLyf+QlyszF X-OriginatorOrg: talpey.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67e02447-0cb1-4759-4529-08da9dae2e2e X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4445.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 21:54:25.2251 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2b2dcae7-2555-4add-bc80-48756da031d5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ttmGzWPoC3gT4BtW077JUIpMpCqFIW9Mt7FsJXE1yHbZmnduSE1eehdTvnP2GtsJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR0102MB3481 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org The client-side SMBDirect layer requires no more than 6 send SGEs and 1 receive SGE. The previous default of 8 send and 8 receive causes smbdirect to fail on the SoftiWARP (siw) provider, and possibly others. Additionally, large numbers of SGEs reduces performance significantly on adapter implementations. Also correct the frmr page count comment (not an SGE count). Signed-off-by: Tom Talpey --- fs/cifs/smbdirect.c | 26 ++++++++++++-------------- fs/cifs/smbdirect.h | 14 +++++++++----- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index 5fbbec22bcc8..f81229721b76 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c @@ -99,7 +99,7 @@ int smbd_keep_alive_interval = 120; * User configurable initial values for RDMA transport * The actual values used may be lower and are limited to hardware capabilities */ -/* Default maximum number of SGEs in a RDMA write/read */ +/* Default maximum number of pages in a single RDMA write/read */ int smbd_max_frmr_depth = 2048; /* If payload is less than this byte, use RDMA send/recv not read/write */ @@ -1017,9 +1017,9 @@ static int smbd_post_send_data( { int i; u32 data_length = 0; - struct scatterlist sgl[SMBDIRECT_MAX_SGE]; + struct scatterlist sgl[SMBDIRECT_MAX_SEND_SGE - 1]; - if (n_vec > SMBDIRECT_MAX_SGE) { + if (n_vec > SMBDIRECT_MAX_SEND_SGE - 1) { cifs_dbg(VFS, "Can't fit data to SGL, n_vec=%d\n", n_vec); return -EINVAL; } @@ -1562,17 +1562,15 @@ static struct smbd_connection *_smbd_get_connection( info->max_receive_size = smbd_max_receive_size; info->keep_alive_interval = smbd_keep_alive_interval; - if (info->id->device->attrs.max_send_sge < SMBDIRECT_MAX_SGE) { + if (info->id->device->attrs.max_send_sge < SMBDIRECT_MAX_SEND_SGE || + info->id->device->attrs.max_recv_sge < SMBDIRECT_MAX_RECV_SGE) { log_rdma_event(ERR, - "warning: device max_send_sge = %d too small\n", - info->id->device->attrs.max_send_sge); - log_rdma_event(ERR, "Queue Pair creation may fail\n"); - } - if (info->id->device->attrs.max_recv_sge < SMBDIRECT_MAX_SGE) { - log_rdma_event(ERR, - "warning: device max_recv_sge = %d too small\n", + "device %.*s max_send_sge/max_recv_sge = %d/%d too small\n", + IB_DEVICE_NAME_MAX, + info->id->device->name, + info->id->device->attrs.max_send_sge, info->id->device->attrs.max_recv_sge); - log_rdma_event(ERR, "Queue Pair creation may fail\n"); + goto config_failed; } info->send_cq = NULL; @@ -1598,8 +1596,8 @@ static struct smbd_connection *_smbd_get_connection( qp_attr.qp_context = info; qp_attr.cap.max_send_wr = info->send_credit_target; qp_attr.cap.max_recv_wr = info->receive_credit_max; - qp_attr.cap.max_send_sge = SMBDIRECT_MAX_SGE; - qp_attr.cap.max_recv_sge = SMBDIRECT_MAX_SGE; + qp_attr.cap.max_send_sge = SMBDIRECT_MAX_SEND_SGE; + qp_attr.cap.max_recv_sge = SMBDIRECT_MAX_RECV_SGE; qp_attr.cap.max_inline_data = 0; qp_attr.sq_sig_type = IB_SIGNAL_REQ_WR; qp_attr.qp_type = IB_QPT_RC; diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h index a87fca82a796..207ef979cd51 100644 --- a/fs/cifs/smbdirect.h +++ b/fs/cifs/smbdirect.h @@ -91,7 +91,7 @@ struct smbd_connection { /* Memory registrations */ /* Maximum number of RDMA read/write outstanding on this connection */ int responder_resources; - /* Maximum number of SGEs in a RDMA write/read */ + /* Maximum number of pages in a single RDMA write/read on this connection */ int max_frmr_depth; /* * If payload is less than or equal to the threshold, @@ -225,21 +225,25 @@ struct smbd_buffer_descriptor_v1 { __le32 length; } __packed; -/* Default maximum number of SGEs in a RDMA send/recv */ -#define SMBDIRECT_MAX_SGE 16 +/* Maximum number of SGEs used by smbdirect.c in any send work request */ +#define SMBDIRECT_MAX_SEND_SGE 6 + /* The context for a SMBD request */ struct smbd_request { struct smbd_connection *info; struct ib_cqe cqe; - /* the SGE entries for this packet */ - struct ib_sge sge[SMBDIRECT_MAX_SGE]; + /* the SGE entries for this work request */ + struct ib_sge sge[SMBDIRECT_MAX_SEND_SGE]; int num_sge; /* SMBD packet header follows this structure */ u8 packet[]; }; +/* Maximum number of SGEs used by smbdirect.c in any receive work request */ +#define SMBDIRECT_MAX_RECV_SGE 1 + /* The context for a SMBD response */ struct smbd_response { struct smbd_connection *info; From patchwork Fri Sep 23 21:53:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Talpey X-Patchwork-Id: 1681707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MZ5Xg25YFz1yqM for ; Sat, 24 Sep 2022 07:54:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230421AbiIWVym (ORCPT ); Fri, 23 Sep 2022 17:54:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbiIWVyk (ORCPT ); Fri, 23 Sep 2022 17:54:40 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2076.outbound.protection.outlook.com [40.107.220.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 962BFFD2B for ; Fri, 23 Sep 2022 14:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bSVtDYPGnA7LsHxC74MKd3JGEXGxU9sUjW9I4+T04bZNeGh9O9xli88IxxKjDNcuHg10E7mEkz+uyaHyGMX1KKf6xYWRUMg7kvquN4IGyQHYDTLPXxterKBDjA5OdimVQ5cjMcBY9CGsgY57DcDXDsj5eXRHGEpKAvfq5v/TttdrKNyuiLtk1L+4JOEKSw+41DxQZPM4K2vvx8mMBWJ1/15RC4GNtG17VCxSPMM67d7q00nseC2Sv7AD44XjZooX2pV5NW4MQz1yFz3iVr6aLc9utZmNa0O8pvGV3w47PQS2rTPryTpRCvNt9maVQERcAoNPX0zYg2IDDX8S66uwKg== 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=AfZdJeW/hOyqzyBMa7dqBWBQC0UrIykEQL/VXl4PhC4=; b=WfENheIm0gc9vmTsRIrTfrnb8aYL8E/X00mDzIupo5v9auCLqkM51zfmViM7iD4KKUY1lZdBzRftwpZmxdpEJjtovw9xJx+hZcTZ6WofO0zigBmGmhk0W+lOAzRrSSDcvC91ZTPAgfbOMAc4VvUrx5HRJZU4bAn385IuVRr0GARWn2bw2QQgxa7LhDLe5ZJS2Nn2dOfG1d+ahi3Yur5z77oN5GeHd34lBoGR0tEJZwVY3bQrm5Kkbz+ZsaN4c5YOda1edYCdlCVnyDCFsCnYnPxmSI5cJtlHXTt6oqPAnPsFwqAuRPGNGOclG6tYZa/D96CAnI+x+hEvDkxVVfCsCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=talpey.com; dmarc=pass action=none header.from=talpey.com; dkim=pass header.d=talpey.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=talpey.com; Received: from SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) by MW2PR0102MB3481.prod.exchangelabs.com (2603:10b6:302:5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Fri, 23 Sep 2022 21:54:31 +0000 Received: from SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0]) by SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0%3]) with mapi id 15.20.5654.014; Fri, 23 Sep 2022 21:54:31 +0000 From: Tom Talpey To: smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: linkinjeon@kernel.org, senozhatsky@chromium.org, bmt@zurich.ibm.com, longli@microsoft.com, dhowells@redhat.com, Tom Talpey Subject: [PATCH v2 2/6] Decrease the number of SMB3 smbdirect server SGEs Date: Fri, 23 Sep 2022 21:53:56 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: BL1PR13CA0074.namprd13.prod.outlook.com (2603:10b6:208:2b8::19) To SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR01MB4445:EE_|MW2PR0102MB3481:EE_ X-MS-Office365-Filtering-Correlation-Id: 9842eab6-dfd6-40fb-9fb9-08da9dae2eac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3VEUsiNetdFKijnfbCuAYlyeGA0MXBcSlaOMJfa6eRgVy35jD/0DRTBBOcpThDbq52xAWWT+g5m0Icb0VfmwIDMUliHzq9LnPyHhwvmhq09NfRVxSlQjM/iYkluvojYWbOk4nrCcqgPgi64lTxQbscXCfn5If+g6FqJD94bEF4B08S/1oAKZzEFXXCUd8OqnKbgGSQ9huJA4Whv7t6Ekpqvt38Bm8n7+YrDDjcDtAu7/xk0eiRUpuLWtw6ag6G/a89nta+3VJG8O9HVXSVXR+o/z6M8MjPkzrPHf+DsTQSxDNamLb6U56BbqMhR5VcPVPplnDOQnl7WGgOPycQ7odAaDbfjTd3zpaoaw5YQPElzS2gmF77DkCNQPbgiHAhvjn9bcXJKMQRM1EKa3tQ+isIX4iICyRl2bQyX1ZfFt6ZxtsoVi7aqumqUWTwuCF62IX7JohA05DW73jpTF5K4Gp7KsgWt7PPSdIibmDYpC67u3OHGx5NuVChy9IiI9dM5cd3QXLHSkZvZHEt0xKgPl2ljD/RLbvwGbw7BqCB09JI6ytSxTuLzXFLRYADBk+V+XHXXXfA3T38OuYNVE0IEnh7EEL3xhWX0tXs29RShtNTg+JnA1sWDV/8tFrRMs5t/VWZsFQL21O+vgtOezLnBQksrJV5uBE7bZYr1IMjrGbHc+FSzdM1p1q0HogI65+OT56rOSCRfoTbfSAN++0SOREcL/5hjvDCGWQPB0NJS8OpuZVqEuInAzJVmc54pS+TZg9eD4sF7MmM6Bt8mgANaMIw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR01MB4445.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199015)(8936002)(38100700002)(41300700001)(66556008)(8676002)(38350700002)(66946007)(66476007)(36756003)(4744005)(5660300002)(2906002)(26005)(6512007)(6506007)(52116002)(4326008)(186003)(478600001)(6486002)(107886003)(6666004)(2616005)(316002)(83380400001)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nmKPwutFaNt+qT4maDdvAp8mtqg75YS3wsfyEqtg7XxzaTwXBQ1DhqTebN1Pm6VeGfcXlcs+mPzaIVRF3X5kjIk0h0V7bX9Y+8Pd9od3xIfe4syNmxuDMzmibjB0HGh0Vdhe+UdTzGRR+xBubk/sQ7SnhIu3U3IpWV8lVXhprg36xBlKBM3F/8visWdlIIO56E7cEpQx9MIWUmY8VFev/FTul8crBWlyF/tA2kQ3ZHFbcmJEW+SdUVHdRApMQnwQUo4Gr42yU33K70DgqLPzNleOl8l/skk8I21VPqZ4TIMO93AmbDSVFLSMSGIJ2trkUjMvrp4793KVwVaJheWlh5aPA+/i5Vr/BA0hLhFLDwgY2JkkQ4EBzp5B5VNXFdwIAPyGpGqExsX3+Re5WMg7PGn+KOcPV0pWdiJZghiNFjTnoA8Xnty9gXquU6CjgWOEa7B/4FXnsgfHESOiUPCQvXuq0TyzyNZfDbTVW53feYUctuuDajhdGf6YUCFBYajt3pv+REIHMBPVZ9IbKNnj3/VkgLm/YmMSRI/OXBEouMqlboZYf8oj6mo1XqHXeyZe21paPGnmxJzRE2ZMB50VAr36riViLWF8IpRML1gCO5LyaPjdI9j7MEmYQ+akcAPVWUEzNjIEAuS81Nm9flPNl+5aFLPcnMn7f5Q/0igrNU96X0QaCQ0Zd8xv6i1hxNpoh/90xduYU4y5iVBkVtULK1FKHzq0frDWZUXsYwOf3ZZy1rlxUxWgXalIMeMqmr4QR+IJEQldc47Fv3Vpj2ue1OCJaVMNYrfZkMWlY+W5s8Cdr2qB3HyBw1CtHIQzXvUQ9PTrkEWGGUg4kDJIwM4AHMNLz6r7fGurMfH+KjxeFzClxExmyRdKCgZeU59gezMH0AY1i8zQBvk+Pe70Q/qtUryrauhJ0Zbl1NLhhd0d/eMm9vhuHZfTrbeDqwSyeASRY+XCe0kRZO6ZleCTgiwKZRUmB6SD5coTgUMd6NddLbfqN9W7D6tA8OtLizPuWHZM8xhjpKMbMUQnYGRWqJsLsvR/h3N6cRb6mhF3Fo4/kqN5nRa/jZbSVd42hR2t6+ZMLsBa2qUcS/Xk4hOTA3Amo1IjhWkGvj8hPu/jHxE0p/5dNgh5a1eiwMlUbWFka+PlWZv2jCk1oNrvGOE8JkxkSaisGY55BMr94jEUqvDOIe+F8eqZrDOsVNfi/p8bRdqLEq/aXm31MM5RnxBSCfWQnxERJIevYGJ5AN7y1Ks85BiC+Rok1ZUFv3Mt8Ujxe3uWU1D9cGALbkuIPP/nIydjl8IxuO+oASH44lSQGII3naijmSLMgc3iUR9bRV+oJfpXu5dwGHiLuWWWIYIs761qQ/IdCRok+zBV2wd+s7ixMYGhefeEDHmfieApTzeYGR+QuUT6uK89gU3FFFJSqdERyMOgyhYDY+SEpaY4drV57PEtsyblC7qPITPiFTPJdMhyVbswaBYFvS1lrd4qFetnTpibjDRpI4oRX/FrZ4mwvO+aAPpoCjmWgcTbm1gyWgQptb84x0Pb8azpon1ghVFnUWsbu7JVHA0WNw1esudCInOaXfqrwezmzNHoSpn8YH2D X-OriginatorOrg: talpey.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9842eab6-dfd6-40fb-9fb9-08da9dae2eac X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4445.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 21:54:26.0844 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2b2dcae7-2555-4add-bc80-48756da031d5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mLqRffA0ANS9ZayOboQIOnw4gtTIDpkzrPphmCUFtQIqA6ZpRWeJN5SWZwCu+7IO X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR0102MB3481 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org The server-side SMBDirect layer requires no more than 6 send SGEs The previous default of 8 causes ksmbd to fail on the SoftiWARP (siw) provider, and possibly others. Additionally, large numbers of SGEs reduces performance significantly on adapter implementations. Signed-off-by: Tom Talpey Acked-by: Namjae Jeon --- fs/ksmbd/transport_rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ksmbd/transport_rdma.c b/fs/ksmbd/transport_rdma.c index 35b55ee94fe5..494b8e5af4b3 100644 --- a/fs/ksmbd/transport_rdma.c +++ b/fs/ksmbd/transport_rdma.c @@ -32,7 +32,7 @@ /* SMB_DIRECT negotiation timeout in seconds */ #define SMB_DIRECT_NEGOTIATE_TIMEOUT 120 -#define SMB_DIRECT_MAX_SEND_SGES 8 +#define SMB_DIRECT_MAX_SEND_SGES 6 #define SMB_DIRECT_MAX_RECV_SGES 1 /* From patchwork Fri Sep 23 21:53:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Talpey X-Patchwork-Id: 1681706 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MZ5Xf3PDcz1yqM for ; Sat, 24 Sep 2022 07:54:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232315AbiIWVyl (ORCPT ); Fri, 23 Sep 2022 17:54:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230421AbiIWVyk (ORCPT ); Fri, 23 Sep 2022 17:54:40 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E02C810FCA for ; Fri, 23 Sep 2022 14:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vg9nJ0CdU+axka/OmTBvkZlnkt4GtLmeISltnwXoOlx+X1P4ra4rvGaK2ltteUWqCmGhN4WpizZRxh2LaQlp4uiw4ZvYjWE7wkNp/LtwBLPnIQuiVZaZQt3UNg0kpMRCJtj535nYiy2VLQUCFwCjaU+hD4k21rEpKTyQnlX80d9MH7vU0kY/ag9bdTuc6a9PvBS7dY/AfqfUMVljrtW/DbZMrI/F+/S60OdUSwsFVkjlpZro+TkLp01WzmZ2U+lMpQJGet4sZtPIVYLi3Qu+M4FylP45mmce715iaPgzwbNF1w0jH8Sm0gk6ZA48Rejm40HgjjKqMLrjy60d+iHk5g== 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=zt3d8Oy1VfX+ugp+UOthZmnd/5vgHGAh5+SQqKRIXms=; b=CvnLaYfeghzHbRImaRr6xLvLgj7vusDeAJM0qnACQrjcFUORcgcwfqNqRmLl2i+qogHjvuvsaz0S8HvfelX/vsrLo1YWy121TdYHDqzZdQpTXKLI1V+gBY66RCHHy/QDDflrFkGdZX20AMC4YIUAsDAbRP9YHCVzZPhOxIsxfViUGy6RV/7bJwFg0AKN0zJmt7DrmlbL9uPjTDq6p/NokaVK6pXnAe9eNCXuiSzqcBEFOEqxhiDB3FeckaKikgCf3GQkk0tvLmt1LJ4Ue8bvjcsaMdsa9GGddrdLLYPVsW5E3Yb9bolnyERUmoYJ73DOCQBAFnBncP60VItMY5AiCw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=talpey.com; dmarc=pass action=none header.from=talpey.com; dkim=pass header.d=talpey.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=talpey.com; Received: from SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) by MW2PR0102MB3481.prod.exchangelabs.com (2603:10b6:302:5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Fri, 23 Sep 2022 21:54:33 +0000 Received: from SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0]) by SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0%3]) with mapi id 15.20.5654.014; Fri, 23 Sep 2022 21:54:33 +0000 From: Tom Talpey To: smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: linkinjeon@kernel.org, senozhatsky@chromium.org, bmt@zurich.ibm.com, longli@microsoft.com, dhowells@redhat.com, Tom Talpey Subject: [PATCH v2 3/6] Reduce client smbdirect max receive segment size Date: Fri, 23 Sep 2022 21:53:57 +0000 Message-Id: <695ca86038c26eb1c806050c365e22f5e8464f4e.1663961449.git.tom@talpey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: BL1PR13CA0074.namprd13.prod.outlook.com (2603:10b6:208:2b8::19) To SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR01MB4445:EE_|MW2PR0102MB3481:EE_ X-MS-Office365-Filtering-Correlation-Id: a6f4ebb7-aeda-4f63-9808-08da9dae2f28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Inl66A6JG9FC06CuVoivWYrQhZnnUciI45jGaosq6ztqm5fmSuTjuCwEDbCH4EMrw4bvp/upcItfWwIn/02EtyvUWsjAXo6PSi3LTmB8AT32Q6kDrizD2eolbClNSI3JPAIOGsV3CkEdWKs5uadISvElnuO6v6qFJUGKUbnF1B0sTYlibU61Ry6IBAGOt7ccMo4Sn8ktspwv90ZbTizbAn8xqWL9ZTc1Ja/b8qeQYrC0DyPmZmmmQW2jArhI6+GALZ/jvrST/Cz587UCwW1bhLOkpbVn/HZs48XeELloCn6ao1s+HsxIwUQosQdUPMQPKUmtMKCAWzrtOvdZIxvJA2OVho9MPO4ZwIK1B/a08W0cX+IpfUDBAU2uUVTeJSdei538OhPVQjJtOQvM8gH68DeMm3aQXZRIYoRGa222YgEbcf9hjKx8WZA3UlJX4Zu6O2tBNaI667fuYMhr/gJi10yr1+7L/f8iuKliswCYgG6YlKgH/o4B6J3/y8qimotCLAWu7ItD4y//aVyq1Rb/f/juVqZJHXB/45W6zK4Bwo+e8+9IWaQ9h1k57iMZBKCvtZ8qc44AvD/g7FBuoJp4YuV6qjQKsZAETyrSltXsi9B4FYAnPJ9Py1PRjDi1qVxe01BBhdLOXbjUyrn1zlY5GKTqa+Dm5kHeyDKJ0lra0YSyB4piqvTLMhCGatvU4jDWiTo4f0dYG6VBDC7sHOcSJbd/dM5lRqw+8mBeuEAcXChHTNZCW3Ms1j2gWiZwVvqqVb5KZfxLVQx7kHU1RaBG7w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR01MB4445.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199015)(8936002)(38100700002)(41300700001)(66556008)(8676002)(38350700002)(66946007)(66476007)(36756003)(4744005)(5660300002)(2906002)(26005)(6512007)(6506007)(52116002)(4326008)(186003)(478600001)(6486002)(107886003)(6666004)(2616005)(316002)(83380400001)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2Vzn6nfJnC8Yfw4rrP/GV2EH64kgZcACnp6sZZbrPQLhEaWHKXvyD95xRZwXGxbUhByFAg2mWka/UfveDwXYMZvIUmKgN/Oj/T2LcpSXphzDgMx0q97l/nPa33+1oQg0veM7PRkfXtr8N4Rwuw/60el33xmpSD3V8rYgObcYPkjEhVNJVYZqNpd9Ut0PxICneOC0KxS+gmF2Cf1ZklMRBqCvz6syW6j1aZ2yzPPvNi07B/p4FUjpBNuRhkKxuMMawYHdr6I5RLk3NgzjbjiedvzJKtpm2Uyfx1ovEreyUEhowtRHBAylJfGxt2MwKC2jQ1Tp1+JFnzhXnuSRPJME2pRgcCjVj/kd3daSHTVydUpIjN1hQbmDN8k6wRVeSnK9XJeALCUbTfmzAr1SswBS3cF4vQG3t+YzSBIHZ/niIxEMRKabW/UNRDlMhKh8cuSVS+FWXv2rK9AyCyDZKVJGjBthPytZeOgLECuYcNZgTthEUtyNrqNS82athbWodGiPJkIJz6M40zMnVHUbTfCRCdZXKgl5Q01lR9uN+5tQsckjp5iRa+6cRj8ubAT051gnlC7CAnqigh0y+v9jwX6zfOIQRIWPdZSay0Q8EV0um6GYMaAslvTTATZIe3zAr2E/eCU2UHqwpHEAWqUHgeDu8lLV/XsJU/470+N44Wl9qnmIXaz48WnpeGx6zPHO3a6P98I5oEwv4hHtc9LR8rzNdnzGH9rhu3Ya/BZnkm/Q0EyoFL0OrbDte0LZu3OR60GiE/PKxZ07z4q2ovAKg/8p08VM7AaQWf4m//96En/a2O0OnxWKYhE/nP5L0FMP67+fBoptiZRXIOSknQlVzSx1T8ZwisGPA4Zr6PxNzFDP1mVdxob44Jt9WRUnF4I82E1Gvanc9S6wo8FmeQpyJoeBUCcuk5dH3clZY8D04SyLKUtPvq6TlhxJJ87jk/7E1sS9zbdxV32dtDIjKgzzwhNx5F100+mSVeNJ4cU0uYyDk61agoBAVj3pkSLjc0UsTZ5G5znculMrOIvJ8IE8ItNAobhXKcboz3FP66XyAz2vZ0wIBXgStJ9tnKhmW4vAXXYs6U9/43+9dc2hNI3egIui+HawTlMB0lrF1YpiirTjYtUyQZXe3gpgUKWUKWFwrmzOH2r8OB1vcS3ODD3PdtzkglGfvbS9Z0Yc8kGmIGD2MWnB0pD6SjsFa1hoWjTFSuRCKhhyw3ULBZIQ4lIt2gdb2G6SpYJGG+Zo/N/VvT4oAn4QIeaB+DOpgzKGyWr8YdYOuMwEJDJF1tposEpoz9YZfjFWocr/C7W2eCjFc04atQnBzpyQv8NbD3M1xlV66SYm3MLegZIs/30JYT931TDh8JlTH+qLOmhA3TFg5LUUipPEnj7s2uK7Ubp1k7/ERzvQxBsfcjnSQhhhM7TRv+Zj3mNY/BrkwXWdhS5oD6YJEn0HRPPgUUXtgrM7tEC5E87aeI1jabmisrEJQD3P0/xWGwog1aRm51TdWhsDVqcjdS6HTPiC4rR9wvAGkal6uXrkHmhjlDhYzmYltIasFRJzGaqBW5kIyLg1sxO9wgnCvP3+iD5nCWnJJewLz+Ra0JZy X-OriginatorOrg: talpey.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6f4ebb7-aeda-4f63-9808-08da9dae2f28 X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4445.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 21:54:26.9281 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2b2dcae7-2555-4add-bc80-48756da031d5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DcFu/YZxJg1kvC2D/YL/lvpplDFPBz4Y4oHEinxyY0JP3Zs+A+hSgWVjWNHFskQc X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR0102MB3481 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Reduce client smbdirect max segment receive size to 1364 to match protocol norms. Larger buffers are unnecessary and add significant memory overhead. Signed-off-by: Tom Talpey --- fs/cifs/smbdirect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index f81229721b76..4908ca54610c 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c @@ -90,7 +90,7 @@ int smbd_max_send_size = 1364; int smbd_max_fragmented_recv_size = 1024 * 1024; /* The maximum single-message size which can be received */ -int smbd_max_receive_size = 8192; +int smbd_max_receive_size = 1364; /* The timeout to initiate send of a keepalive message on idle */ int smbd_keep_alive_interval = 120; From patchwork Fri Sep 23 21:53:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Talpey X-Patchwork-Id: 1681709 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MZ5Xk2qxmz1yqV for ; Sat, 24 Sep 2022 07:54:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232503AbiIWVyo (ORCPT ); Fri, 23 Sep 2022 17:54:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232514AbiIWVyl (ORCPT ); Fri, 23 Sep 2022 17:54:41 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C828193F1 for ; Fri, 23 Sep 2022 14:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JeiLbJn726sNNgG+rAQq6TS4LVk8xVYA8QlI22bD47TTX54yMd7O/0A1aOpEqqG6kntyWomPMtaxruwPJl3qksjeRumGa1qemGoZYXO5u/6VrfrXzzAhqmCe8utH5/q12br92OvPczOSo1w8cCW8iroZVBcjpkVl1RGxmsxye6REGCpOLlZqDl/MugQ0Z5YH+vZehKtEdrsRC4wzTXqduSzm+b1XJ8NwVOJ2o6wFoa1UEgaLdIu1/qMWgGtA20VrndpZoacaGqzVwBo4tCk6/gpsi/JVOwcS5KlLyFSnltXKNoZs8e+qXnwd42cJcW/X6K/4QRf03+OAyff87UlqgA== 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=phnMl4ugC+e8OyWUA6WiuLa8GoD33pQPA9NWUYMuASQ=; b=PY2KRAfUzq6PoMhpAgT8728uKnIOvn+EaMmyq21wHcWKFpXc3TZS2YYLVDBE3KwhlwtwX7AUAXXY5MhS57t0MtLBXN+0iXTA+CCwBV8kdeVqckqOJzU01IN0Df1yTn12FobKIOoISK5UFJ8LsjYmEHpGvmPMf85AIltc6TpLp7zxC6ErUNe605pUzwHGk9S5FA6nKqoiJLVOdll+g0pI+ZdP8Qp7ZuwEoj7ehJQ7tKzX2H90+/BSAQDbeuR0Cvd8mOjZO9wDF460FomFh94tyQX+MVmlr/nFYUIWZUPoqvU2cHdq41oR2jboLxNrEdn//aO5zXp8qk1q0o5i9znx1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=talpey.com; dmarc=pass action=none header.from=talpey.com; dkim=pass header.d=talpey.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=talpey.com; Received: from SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) by MW2PR0102MB3481.prod.exchangelabs.com (2603:10b6:302:5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Fri, 23 Sep 2022 21:54:34 +0000 Received: from SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0]) by SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0%3]) with mapi id 15.20.5654.014; Fri, 23 Sep 2022 21:54:34 +0000 From: Tom Talpey To: smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: linkinjeon@kernel.org, senozhatsky@chromium.org, bmt@zurich.ibm.com, longli@microsoft.com, dhowells@redhat.com, Tom Talpey Subject: [PATCH v2 4/6] Reduce server smbdirect max send/receive segment sizes Date: Fri, 23 Sep 2022 21:53:58 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: BL1PR13CA0074.namprd13.prod.outlook.com (2603:10b6:208:2b8::19) To SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR01MB4445:EE_|MW2PR0102MB3481:EE_ X-MS-Office365-Filtering-Correlation-Id: 687f566b-9978-40bf-4085-08da9dae2fb5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uMhU/cMldhJciwWfz4bgDr0Dys4nvRFuexBhqO6jeBnGdtCKLUjPnu5Nevk1PNA+SAf97n46ApJxRYeaHPjMURCnyUHaq6IieGYpbx4KkBQy9v+SAF1PLbZe1KmgZNQuyxgS+fIngO3HcIDrRK0xGLZeSiSkr5QrXlEMgBYW+GnlBGDV78lRHTsfMpMs0XYrptMyJaOuh+3DHrgDjrplMwi0fZAo1KuZJ2NvAH2/DLbe2+ErvrefCMSayoanJQykt7IXOCot1lAWJV7EZO0+5FNrGXxk8CoFhDqwYMVa37feRFGwlHncjUsW/DRfGVGAa/VQ3iZpKCji435m6SMZvmYHmYUFpCK0JSfatdhEbey9WrWvQ1P8nt4T4aOyLebVEdIjYfwJ7qczkGXvtj678qtB/UeruDUC/cBHWJUs8iF7xJS9p1b3BipKIQMPqtZWWn/eYTe4Zp/wsaXWCbCJ3Oyx6/b6Fr0i4qTCkqEP8m1jn5Akw+vkKadg/F70KfUn0AK5PiH91rH0jCCY/Si9J3hdgqJPgx0KoQRY44Cvdh7pzOvMmMfSSOxJ6SVsPtIDf3RCbSt4iAB88YgIzG7sUJlSHdSWdaEZsGXHns+MrEoSSDGrTfdONEZ2GkkeFrzg8wBI+EyGaKr+TdE46CJrksNP98OOX7MWM2eP7UJhpdzQoWr+ogmMqwAeFcXesm8YXVIl07zVjQupCuvM2RBMu4JuxFZQsYIYb2I/t102P6nWk7Tw1AZ5g/zMVIEwiU4fbjU8lRWLQ1rURuYQDfkdWQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR01MB4445.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199015)(8936002)(38100700002)(41300700001)(66556008)(8676002)(38350700002)(66946007)(66476007)(36756003)(5660300002)(2906002)(26005)(6512007)(6506007)(52116002)(4326008)(186003)(478600001)(6486002)(107886003)(6666004)(2616005)(316002)(83380400001)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7Vc+skfA0FOr6ZioazM2uk7/2POBIZt1dPzQkspBxzhLAEym7qGEcf9Al2bisz6bHVfj+ReJORbzv8o0zG8TTcwUfPlO2wWDNPILhTYp25Td5sfJIXapFr95M1QzeAwaNnjs52xSiGn4WGWWWvmEKFGNrpRXO8ylTa3vPlZdL9qx+RjxlkPcvkcH2csLEvPDeqRLHERRj3aPbwtUkflW3WErYI12I1nYupjFUaE0y4bAdg6tusUbdnxYFtHFC9J3tzuMa6GdlAC4LQfkaT7k+nEH5Cu3+T+9goaC7m0DoBCIxmdJYFt/7khOnfE63NboozQE+VpCrXpngSvldjo/HvbI7l4aLfk5LO5XXxmy46zo0eBXAhfMX3ZK/Gl5lfINjvEhFHTNpUWa/FaRQJhBppZIAGJ1Q3yc7mnPsJ+NX2OcCXq6F1Tr2I0hZoaIorZq9uuPSU+p7KTaLCDpkaUokhyBl7Qylr3auywnAQf5hsAgFVvsoRiUg1jrkyatJvg2uvlWsefzrTxjDS1IHitUv3w6d+Jw1Ve5qOb0qE47cX5cLeKTToNhmsvrXM9z/7eVTwsZMy7Z6u5rcRmzKL59+d3aE2bbEQ/q1MBeJSE+ucOjMFKZA2vudy5q5Flw3cJPKqVPofVQ+cmNrUNqoBnZSoVEC28rUtbQHe0yCn8O8kSOp1PIh61/GBW3x/9Ddkx4qEE98WnlvUkxpZuA633xHulgd8O7+5s34bh0JtRUZsupiXYZD8fIldLQ99uvhhLeYTVk1sPAJh3sWO4o264IFvfdGRQ3vD1gOKeEQ/1/BS0/eLq0LHBjA/cbifRcQAEJ5++AaQnfwE8FZwhpQNoSGmITwKZvbLRZS7RwUv4g+b8ht/Ct2dFTN9lvyn0RLa71cKqj1kz7L79ZBqs0p8FJSwzh0IKYFUuYIHr6/wMD7G+vXW4XVchR+q3k2GGkxoGwrOt7ZKrUX8hJklGK79KSD+Lt/rOAaOxdLFoSCPqRVxK9osXbjIiqtn7M7be43NB2bKM1NUNBymlNLtYVSGy1kBoHO19As7KsSPM+VhzMF8smQPee/ODA/pJ+oHfCtZ8YXZtJnmgBLiCDp/kAgEJBYrS6nzYGu2VAHpBSuBsubXlGkAWLp+klYWK2QCOEsVhbY3ikZeteOspqmBblDKVvNzr7JE6gYN8xTIIRZ67MILYIgvd0HtkIJYl2UKJE84E8bgaUQn31GUW73AuWUoY8BgAW0hvaAUMrTm0ng45Wd5p+TRXJEgdJDHhrt6IwY66UdU8TGLK6Vk6SjpafBNIo1iwXzszGwERJAM5A9us9fiSXbRUd/2UhuRr5BLo68nS5RSu69OVq/a3yqyP/ynrhYyCE78OJdi61xQ8rqtYX1QvmtSCDUZohtQUMRj1u9/kWxt0KYkB+JISj4NY0m6831x+OUI8wFsfgB8FeC2+Ed08c5ezZN8cORv1r8ivaPP6fTrkAI1tI7Lv37f+N88dO8QiCkVb6JLeX1LKC7fJVO8wuwgrTIQmhnoWU+ZfM0rHMfORcplJOAvnTC+rO0PUlDj4hkNMKmLiRFGg76Cs5m5T8tJ9cJJDMIdC25rNwsXyt X-OriginatorOrg: talpey.com X-MS-Exchange-CrossTenant-Network-Message-Id: 687f566b-9978-40bf-4085-08da9dae2fb5 X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4445.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 21:54:27.8343 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2b2dcae7-2555-4add-bc80-48756da031d5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wqwVKg6pMNdo53OETgXJiJqa6kS5QH7yDclrjiTIqJo3x4L13IE/e3Ur95IPXr58 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR0102MB3481 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Reduce ksmbd smbdirect max segment send and receive size to 1364 to match protocol norms. Larger buffers are unnecessary and add significant memory overhead. Signed-off-by: Tom Talpey Acked-by: Namjae Jeon --- fs/ksmbd/transport_rdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ksmbd/transport_rdma.c b/fs/ksmbd/transport_rdma.c index 494b8e5af4b3..0315bca3d53b 100644 --- a/fs/ksmbd/transport_rdma.c +++ b/fs/ksmbd/transport_rdma.c @@ -62,13 +62,13 @@ static int smb_direct_receive_credit_max = 255; static int smb_direct_send_credit_target = 255; /* The maximum single message size can be sent to remote peer */ -static int smb_direct_max_send_size = 8192; +static int smb_direct_max_send_size = 1364; /* The maximum fragmented upper-layer payload receive size supported */ static int smb_direct_max_fragmented_recv_size = 1024 * 1024; /* The maximum single-message size which can be received */ -static int smb_direct_max_receive_size = 8192; +static int smb_direct_max_receive_size = 1364; static int smb_direct_max_read_write_size = SMBD_DEFAULT_IOSIZE; From patchwork Fri Sep 23 21:53:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Talpey X-Patchwork-Id: 1681708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MZ5Xh4hppz1yqM for ; Sat, 24 Sep 2022 07:54:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229511AbiIWVyn (ORCPT ); Fri, 23 Sep 2022 17:54:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232503AbiIWVyl (ORCPT ); Fri, 23 Sep 2022 17:54:41 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2076.outbound.protection.outlook.com [40.107.220.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C7B6193D8 for ; Fri, 23 Sep 2022 14:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=crvXmFQsZJN5CLtabpxWEQGQJDKTf6W6ClVX8FH8W6LUW3Q3Vkw5sm2Ul9ZU1kyZoq0XR4kXGXKyA3FfCM+IgrGfs9OyV/3IrBEW6keoxM6UwItFANkU+TTBmy0Z1fOxp5HjPO5kBsD7Vdkqa8veVRobkemkhbWtCOSYbv1Q+CWG9zX5tsEF9ZYSskiEki85lXDsANqD645l2/868r1eq5MlwvnsMakEB8SpjFwU18Qyt57IY+ivllLkS3RV+Cu37Y1BNpDnDM8RIj7/M5fBnCYCrnFAtKht6Z+7g+VTktrSzKg9eyR/A/YA+H0q9AF1txFHRxiG19KVzddMRjpT/g== 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=LST/EbNmmvrfpVR9pArI4f4fDznQBxgDBKokjk/LBuo=; b=Qi1uExkDIFX1FMkOaidct4ks7WB5KN8UvQ/ImaBqNMW80v/o06zNQCNEb2vqcoIReyngLTs7srwH40OG3WojSo/pRLtYVs3RaxcjBChYLl240z2YLGONnjyyUzoVEmWiFnik8EokUMesjcC928lgtORRiVWmD4Dkm2IVG1PnHL6vV+iZ2jdflwIrJ3cV4JY9fEZ/u9QX1UkbvgbCPHS3W6VjLszIZg7XEhhFVTqRN7YUb0eQB5Ds28lnmm69xXmGZKpcj4TR4t4IEe/uwx0jTCmsCNUx+PpulYAGBDzbIPRWScPymTRL+En+TV8NBH9aKoLzBWhnWCXe52942NXDqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=talpey.com; dmarc=pass action=none header.from=talpey.com; dkim=pass header.d=talpey.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=talpey.com; Received: from SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) by MW2PR0102MB3481.prod.exchangelabs.com (2603:10b6:302:5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Fri, 23 Sep 2022 21:54:35 +0000 Received: from SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0]) by SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0%3]) with mapi id 15.20.5654.014; Fri, 23 Sep 2022 21:54:35 +0000 From: Tom Talpey To: smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: linkinjeon@kernel.org, senozhatsky@chromium.org, bmt@zurich.ibm.com, longli@microsoft.com, dhowells@redhat.com, Tom Talpey Subject: [PATCH v2 5/6] Handle variable number of SGEs in client smbdirect send. Date: Fri, 23 Sep 2022 21:53:59 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: BL1PR13CA0074.namprd13.prod.outlook.com (2603:10b6:208:2b8::19) To SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR01MB4445:EE_|MW2PR0102MB3481:EE_ X-MS-Office365-Filtering-Correlation-Id: 588e5e39-6bf8-40e7-e906-08da9dae3041 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AUP0N2gkrbEeT75wAuSjr0vgcjd72iVSQ5bniwolQqz2BE11sm9JNd+nYZyTHZIDmhm8fptfboQQEDeWKhMUIL1swQNYhUZrkG+gtvIRkRlKxWnxlWpl76y1MvbyeugnmVRpZza1HHN1Ws+A5I1EJpEatzCS5NNVgYtgsG9M3uYm6QyxKuo5DWH8rUFKkYlWg56Bme71EfL4h7rAWZpOzziK5rtFtOCZs4CSNfYd9OP2pBxcZCltoTmMXQb5eI0a5rYvKyTYpZ20K9jWLGS5XI2s3vhHf8M0lpuDKSoZZ/prGWybCAQNJ1MxduZlHOBZxQBqQyBiaQTaWNaqXLuMnGKJp1arTMxuLgniQ4KuRb3CjytW4+X/1HDAj0o3CN8LiR1GNKjmzoTY6Dsl68VSOteThh/8WldK9UIEP4pP8h0xTu4jKd3QiBqgJQUagEkO64oHbqRas1YLuTULEn2do/CyTlIWX9GzA0PLrF6SpyfwkIu9+3ZeggzQJB/I35uUMEZjvjYZVPpPu3W6o4DH6Q3brCSz4s95OjEBirYDfPvSjivUbyySBQntEPlOvgxU29ZRcNUP8OL3GDcwI7vipGM1JhXaduhhUViaLRT6AB5hTCk5oG2AJWq8e1KXUxjowrNzf9js/4dgHFtYFFS/E7i22QSdTZHlEnKeKWtRgTZ4RiysA6fCXsOCTD3F3A2lnYMO8Oauac7v+bEbm3RGcp13ryCE8dh4f08iC8vaUAb1tp0rt9h0xcpeeHYuTnuJ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR01MB4445.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199015)(8936002)(38100700002)(41300700001)(66556008)(8676002)(38350700002)(66946007)(66476007)(36756003)(5660300002)(2906002)(26005)(6512007)(6506007)(52116002)(4326008)(186003)(478600001)(6486002)(107886003)(6666004)(2616005)(316002)(83380400001)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m+pR2W8AYyfsA1xopG3TfilNnYdkvqTtiW3fizDp0YLUAwLOEdRFf/8YQY3WUZHfhjpLPSTP0tBxCBaSRjJG0ng3K0TihLLv/vLnhbmNs94ZX6slklZ5NmsdWdtE2afXBz54eIu7Hs/SKnGI9trE8NdZg6guxw27joy7+BzDfsYmhoEI/hi/iypWVfWE/6QTRQuBuA96YKo0U13OBsONwr5NWsByCRTvaiTPDZ6eFAK68MVbc+kpUXZEdnyacLa53+0I3H91N7cpSrJFEW244XQWOPhj7gdoUhPsUmlK7KbU7PHwlAtlhhL8FL2p+a7NP9aY/0bL64rlx6EJ+ydYDYx6Gkr3bEhCPNKVAmJpa70qXab6MC/UNE1qWslufnjAU7eVWffN2YWmEgUcLTVfVvF4k4Z+WTpORF0cn2IjGi4/79Ao25UFXG6WRMqlf1r5ZfEo9zsphDIJYJmx2PRoFTwt9y0c6+aV7urGRPQuArBnCpK+18HqVe/Bx/uegf4aD2p0SJOQ7fGOGmMnmAkNkCSK7s7F2BYdYkskEsfzkDvSO/MEJytxGm+HTmMYzOIUpQ+KzT4yxKpjr1kYl8ULNHhDaKSVvcbnkoLQXNHFzGgDejpVtTn8Fu509grdha2mPvyJ68sb7LTbArcx9GA5rA9WrWRRF4pZuRGDbqPAgZvMzfetkNVICLZyB3LVxkdQbHmLmaJPKhi0Q5HkBDRxWZVSgo8rFWsv3oApIX1kV5vDxSPv8suVjGm0d3L9iEMQN0Ol0GNin6GWnw2cx9vb7i2Gwe0Z/oGPblVKoyj5c0IjDHy9dckyikVPSoKPHT8iwk2XqFUF4moNKD5PntYTcnw3LtCp+aThUeg/PpqIfJ9kWle2xBqzg6qTyMOM9NieA3AeFnYAdyEP4gaFadnmXbQ+rmp5zsmVp3D+rmZvNfDxRKrylJHyd5LNNMegyp8+LAZD/L05vamYrPqcudus6wDfsv2sCblYWsg99unXKAQY0/RPj0tvLc+IpYctz6kxL3iV0NTbsw4dVEaNPqmD9CLrmhzH0Q3l433sLzYfjvI6+vW/vKH5EDzPGWoQKxcchzW8NhK2hlUBOiNS1WfcpenP7I0UkzypieS0guYP/I1HHcK/i7A8ZreFNijcHBDf+4lt5iWE/HuhlSn0Y8B0zv/iEEhsEPANL+gU1MoMS4OfeWOV26qNhKvR7c/MM3ucWBPP4Wh8/iYUCEBa/lDc3WuHbRPRI4Aw8z8k7r0wugauTGXQXmvjw8gSJcKQAP6ycZ0Bn/cGIUzkfYCbckxxOOD3m7rX6bM7TiBx36C554jmVu4JtXKtDa/xVWaBxIRO/DsZzTjy3ncwSjJcgKisPYd88AIHZzzidWqSSGmWz+X3g5+evsKHKYM+Nl794MH4mLFtbhFD/X42u1+13N+rIBB4FwLmaQqmDvp8SCCJSouoGIGvgdinxOe/U7acVXdSl8MTESGFf7TBYo6xumnzF9SA1EEU/oXaKr3GIUu1Pl9CCbCV6WcDE4g/Y+t5RxMkUnOUs/UWemecWbm7XUzqaO+zPDx+nF2oris5EaNgnZ1yw8wJnx/9ZJbwloqPoO3/ X-OriginatorOrg: talpey.com X-MS-Exchange-CrossTenant-Network-Message-Id: 588e5e39-6bf8-40e7-e906-08da9dae3041 X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4445.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 21:54:28.7092 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2b2dcae7-2555-4add-bc80-48756da031d5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ctMmgoEP4NFMDbzfp9ty+/7+vWBBWXH+zuHoCMmInEO8P6Mk5srAu+dMfQfquYZl X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR0102MB3481 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org If/when an outgoing request contains more scatter/gather segments than can be mapped in a single RDMA send work request, use smbdirect fragments to send it in multiple packets. Signed-off-by: Tom Talpey --- fs/cifs/smbdirect.c | 185 ++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 108 deletions(-) diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index 4908ca54610c..6ac424d26fe6 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c @@ -1984,10 +1984,11 @@ int smbd_send(struct TCP_Server_Info *server, int num_rqst, struct smb_rqst *rqst_array) { struct smbd_connection *info = server->smbd_conn; - struct kvec vec; + struct kvec vecs[SMBDIRECT_MAX_SEND_SGE - 1]; int nvecs; int size; unsigned int buflen, remaining_data_length; + unsigned int offset, remaining_vec_data_length; int start, i, j; int max_iov_size = info->max_send_size - sizeof(struct smbd_data_transfer); @@ -1996,10 +1997,8 @@ int smbd_send(struct TCP_Server_Info *server, struct smb_rqst *rqst; int rqst_idx; - if (info->transport_status != SMBD_CONNECTED) { - rc = -EAGAIN; - goto done; - } + if (info->transport_status != SMBD_CONNECTED) + return -EAGAIN; /* * Add in the page array if there is one. The caller needs to set @@ -2010,125 +2009,95 @@ int smbd_send(struct TCP_Server_Info *server, for (i = 0; i < num_rqst; i++) remaining_data_length += smb_rqst_len(server, &rqst_array[i]); - if (remaining_data_length > info->max_fragmented_send_size) { + if (unlikely(remaining_data_length > info->max_fragmented_send_size)) { + /* assertion: payload never exceeds negotiated maximum */ log_write(ERR, "payload size %d > max size %d\n", remaining_data_length, info->max_fragmented_send_size); - rc = -EINVAL; - goto done; + return -EINVAL; } log_write(INFO, "num_rqst=%d total length=%u\n", num_rqst, remaining_data_length); rqst_idx = 0; -next_rqst: - rqst = &rqst_array[rqst_idx]; - iov = rqst->rq_iov; - - cifs_dbg(FYI, "Sending smb (RDMA): idx=%d smb_len=%lu\n", - rqst_idx, smb_rqst_len(server, rqst)); - for (i = 0; i < rqst->rq_nvec; i++) - dump_smb(iov[i].iov_base, iov[i].iov_len); - - - log_write(INFO, "rqst_idx=%d nvec=%d rqst->rq_npages=%d rq_pagesz=%d rq_tailsz=%d buflen=%lu\n", - rqst_idx, rqst->rq_nvec, rqst->rq_npages, rqst->rq_pagesz, - rqst->rq_tailsz, smb_rqst_len(server, rqst)); - - start = i = 0; - buflen = 0; - while (true) { - buflen += iov[i].iov_len; - if (buflen > max_iov_size) { - if (i > start) { - remaining_data_length -= - (buflen-iov[i].iov_len); - log_write(INFO, "sending iov[] from start=%d i=%d nvecs=%d remaining_data_length=%d\n", - start, i, i - start, - remaining_data_length); - rc = smbd_post_send_data( - info, &iov[start], i-start, - remaining_data_length); - if (rc) - goto done; - } else { - /* iov[start] is too big, break it */ - nvecs = (buflen+max_iov_size-1)/max_iov_size; - log_write(INFO, "iov[%d] iov_base=%p buflen=%d break to %d vectors\n", - start, iov[start].iov_base, - buflen, nvecs); - for (j = 0; j < nvecs; j++) { - vec.iov_base = - (char *)iov[start].iov_base + - j*max_iov_size; - vec.iov_len = max_iov_size; - if (j == nvecs-1) - vec.iov_len = - buflen - - max_iov_size*(nvecs-1); - remaining_data_length -= vec.iov_len; - log_write(INFO, - "sending vec j=%d iov_base=%p iov_len=%zu remaining_data_length=%d\n", - j, vec.iov_base, vec.iov_len, - remaining_data_length); - rc = smbd_post_send_data( - info, &vec, 1, - remaining_data_length); - if (rc) - goto done; + do { + rqst = &rqst_array[rqst_idx]; + iov = rqst->rq_iov; + + cifs_dbg(FYI, "Sending smb (RDMA): idx=%d smb_len=%lu\n", + rqst_idx, smb_rqst_len(server, rqst)); + remaining_vec_data_length = 0; + for (i = 0; i < rqst->rq_nvec; i++) { + remaining_vec_data_length += iov[i].iov_len; + dump_smb(iov[i].iov_base, iov[i].iov_len); + } + + log_write(INFO, "rqst_idx=%d nvec=%d rqst->rq_npages=%d rq_pagesz=%d rq_tailsz=%d buflen=%lu\n", + rqst_idx, rqst->rq_nvec, + rqst->rq_npages, rqst->rq_pagesz, + rqst->rq_tailsz, smb_rqst_len(server, rqst)); + + start = 0; + offset = 0; + do { + buflen = 0; + i = start; + j = 0; + while (i < rqst->rq_nvec && + j < SMBDIRECT_MAX_SEND_SGE - 1 && + buflen < max_iov_size) { + + vecs[j].iov_base = iov[i].iov_base + offset; + if (buflen + iov[i].iov_len > max_iov_size) { + vecs[j].iov_len = + max_iov_size - iov[i].iov_len; + buflen = max_iov_size; + offset = vecs[j].iov_len; + } else { + vecs[j].iov_len = + iov[i].iov_len - offset; + buflen += vecs[j].iov_len; + offset = 0; + ++i; } - i++; - if (i == rqst->rq_nvec) - break; + ++j; } + + remaining_vec_data_length -= buflen; + remaining_data_length -= buflen; + log_write(INFO, "sending %s iov[%d] from start=%d nvecs=%d remaining_data_length=%d\n", + remaining_vec_data_length > 0 ? + "partial" : "complete", + rqst->rq_nvec, start, j, + remaining_data_length); + start = i; - buflen = 0; - } else { - i++; - if (i == rqst->rq_nvec) { - /* send out all remaining vecs */ - remaining_data_length -= buflen; - log_write(INFO, "sending iov[] from start=%d i=%d nvecs=%d remaining_data_length=%d\n", - start, i, i - start, + rc = smbd_post_send_data(info, vecs, j, remaining_data_length); + if (rc) + goto done; + } while (remaining_vec_data_length > 0); + + /* now sending pages if there are any */ + for (i = 0; i < rqst->rq_npages; i++) { + rqst_page_get_length(rqst, i, &buflen, &offset); + nvecs = (buflen + max_iov_size - 1) / max_iov_size; + log_write(INFO, "sending pages buflen=%d nvecs=%d\n", + buflen, nvecs); + for (j = 0; j < nvecs; j++) { + size = min_t(unsigned int, max_iov_size, remaining_data_length); + remaining_data_length -= size; + log_write(INFO, "sending pages i=%d offset=%d size=%d remaining_data_length=%d\n", + i, j * max_iov_size + offset, size, remaining_data_length); - rc = smbd_post_send_data(info, &iov[start], - i-start, remaining_data_length); + rc = smbd_post_send_page( + info, rqst->rq_pages[i], + j*max_iov_size + offset, + size, remaining_data_length); if (rc) goto done; - break; } } - log_write(INFO, "looping i=%d buflen=%d\n", i, buflen); - } - - /* now sending pages if there are any */ - for (i = 0; i < rqst->rq_npages; i++) { - unsigned int offset; - - rqst_page_get_length(rqst, i, &buflen, &offset); - nvecs = (buflen + max_iov_size - 1) / max_iov_size; - log_write(INFO, "sending pages buflen=%d nvecs=%d\n", - buflen, nvecs); - for (j = 0; j < nvecs; j++) { - size = max_iov_size; - if (j == nvecs-1) - size = buflen - j*max_iov_size; - remaining_data_length -= size; - log_write(INFO, "sending pages i=%d offset=%d size=%d remaining_data_length=%d\n", - i, j * max_iov_size + offset, size, - remaining_data_length); - rc = smbd_post_send_page( - info, rqst->rq_pages[i], - j*max_iov_size + offset, - size, remaining_data_length); - if (rc) - goto done; - } - } - - rqst_idx++; - if (rqst_idx < num_rqst) - goto next_rqst; + } while (++rqst_idx < num_rqst); done: /* From patchwork Fri Sep 23 21:54:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Talpey X-Patchwork-Id: 1681710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MZ5Xl2x0jz1yqM for ; Sat, 24 Sep 2022 07:54:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232514AbiIWVyq (ORCPT ); Fri, 23 Sep 2022 17:54:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231701AbiIWVyn (ORCPT ); Fri, 23 Sep 2022 17:54:43 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D20761EAFC for ; Fri, 23 Sep 2022 14:54:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VPnzhKyMCQ0tYZIk7Mlr1PXVe2KQ+OsVUzGlgbDh7v2qKTYeQ3CMJiB+okF+nj/Nz9QRKSwtYnIqxQDLy+OAM3PF6XmQ9YOnH36y55L9Qukq+hTrNf5cgheD/qeR2T0tQLQ9nMw4Jq9IRUoHLsxO70J5lqW5hzTEjqSh80yogceJfA89wPZwfNuWSJnwLxtjod9nta4Ef5+eF1VTHlDRcOkGXt0Hmwu2kiSUBUXPcrR7Y2GVwhwJ/vcG3dHjU4h9peRkYPIixcJJDjt2J4hlbGb7HW2l17Gc01BK2AeitwnRG2wGOYz7bN24aKK7mOUf145T66YKU8egNDQLwqaL1Q== 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=YPu9BzhPJxokeo+9xsRSZpejNWGQMbOBgOVg6lQl7UE=; b=lxCSs2pKehGVOzypQHmDDACwPciOCxebb+Khu2VWHwuAuGDUwPpxaPcyJrpRHUY+ikmA2cGDM2z9CH6hPsn+o3Ho4eWLu4XbBkvTTcxDcXvtlBp59kk+aTJZ0Gvs3hggiK00+OzwKCj1ITQLGCK3nk5tg28sARaWuoxmwEJW86r+LsKlDbEaYmpABjsJOMeabuzcPVARIDJWFhu0UJkq/8e3g3hzuWAl11dmAnvZLJUhjZkJ/33dJPQOUPzkjUe+WDwCIBzWcYKrm7COojXPQSbke38g3j5wkyGOrVRlCC/12jssKjnoGLQz+/iHwMiXqQZ0Qb1WULouKVTcK8gUgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=talpey.com; dmarc=pass action=none header.from=talpey.com; dkim=pass header.d=talpey.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=talpey.com; Received: from SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) by MW2PR0102MB3481.prod.exchangelabs.com (2603:10b6:302:5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Fri, 23 Sep 2022 21:54:36 +0000 Received: from SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0]) by SN6PR01MB4445.prod.exchangelabs.com ([fe80::d99d:5143:a233:36a0%3]) with mapi id 15.20.5654.014; Fri, 23 Sep 2022 21:54:36 +0000 From: Tom Talpey To: smfrench@gmail.com, linux-cifs@vger.kernel.org Cc: linkinjeon@kernel.org, senozhatsky@chromium.org, bmt@zurich.ibm.com, longli@microsoft.com, dhowells@redhat.com, Tom Talpey Subject: [PATCH v2 6/6] Fix formatting of client smbdirect RDMA logging Date: Fri, 23 Sep 2022 21:54:00 +0000 Message-Id: <01a4ede1bf68bcbc2ee99cdd00ea229bbc618bb9.1663961449.git.tom@talpey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: BL1PR13CA0074.namprd13.prod.outlook.com (2603:10b6:208:2b8::19) To SN6PR01MB4445.prod.exchangelabs.com (2603:10b6:805:e2::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR01MB4445:EE_|MW2PR0102MB3481:EE_ X-MS-Office365-Filtering-Correlation-Id: 14949948-5d61-424e-e143-08da9dae30bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i5tYGKblo8zHeRy/vknzGjMG2Mgykuy6jGe8Y+8P2KhugQzw59+dYa/Oa9h1/iOA+tjbRseAoa3r6IeSYISeVFAgQ8J/spJxTQgo5+Uswy402NiLdk2vINkk0OIH2mwTKoLHvmVzwUTrHiAuO+ftchXhInBUVTpzVYWphveu88+3kYxOTCFQiB9i26PqCIZphIrMz2xStD1N377Gk2s/Y4Eu/UjOg7kiBNgSLHNeeLdQS5LTQLpbXHqZA3mPFOpkVvwjcjluoB2c0HBDulaK8CUKua2EwPHTgBF9enPXdNxWxpNxY9tUlO4HldKLQYTHRN47LKfPsujK+1xIvsqzXiUemSSxfpPo2hczEMYowf1aERaZIOqHPOBGoshGRa5bu8I6BeT9F3DhK79yceA6yagJnv77cPvWxR70iDtOPZ0Km1K4V5PazRUM7yjT5nvIx2vYeuTs3/dRr3xn+MvljZszuTNHPrhcHurhRoeofTSaLnRkFQlrm0QCzzluvlnFCY82Cczja3vEubXFRJsfFIdETAH5mfngJ5kXnpupx0zzkAzZpHxhEY+Y4AgvZxxZ13IFQx5M44TYP29N874ywzB32R/zS+v1oJ+dJxzFDyvqZxd51ICcz+2Uam+3/mBZLRO/n4uroCoYceRaXcCjXsNMwvL6WRN6mYhvTCV6QJuvHVXFGlOVoNR38eg2//WFYy1eXbgHUEJ9VKPSAkJ7ituy3ftXF2c4Y/c1YgGsDp4017dD0cbmnLaAd4Y/HAD+aXtS5XNlpYNzJmCHVcQn2A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR01MB4445.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199015)(8936002)(38100700002)(41300700001)(66556008)(8676002)(38350700002)(66946007)(66476007)(36756003)(5660300002)(2906002)(26005)(6512007)(6506007)(52116002)(4326008)(186003)(478600001)(6486002)(107886003)(6666004)(2616005)(316002)(83380400001)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uCKjRiHQJiMYdw4RGO176tVtPOo1XLS5UXKPUG95aYQJhkk9M/N2aBeeI3vlyxVko49qyo7HDC+r7JiEwMPLeqSo5aHT0STm2Zhglyrjmh5kmNx88vz42hRbnkZyFFPylGB16gpTanOrViS+8cxRV7MHOBP2s14brBoumfHR1dcbc1LSN57Wv7grL45aBlEW0wTfJAlGx8QQlAx/3ckPpSEsKGLzk6Wrl/3pvtqYq69soa7sjTggZt0tyCeuLxHcsiw/XXhz3b71ykj5srlyZCPGBODfuB4rGs3M2ba234zfe8qaTVj+DBxuwZ79FQ12ibAfZaJTG6qTre0GJEyJ8kqlAcV8wYcXr+wWxfCximGYbBaU7JIEd0xS6C/m6ZblEXREIEdTDth8msIiJT8iSArkOE6zlj2Sz2BvXHSYJt4Ke+r9dvQxALr4XMB0z/8X/aU5T3KsVD1uA+Lmw02Hbl0EvSId8oqDK6skR8Pu/v3gE24QNXj7u29aMH8lUrBGeuzTuz2+2XjgxQkJd+UYXiUaootJO5uEUoeziISQtxf0Zgwxn+E6Ykz0N7XeuufzJoXeGF0r4QPJfy7S1DS5Oq6O6F+LVryWxvx1uPH98BSmTOg8BWgk/POObP9Ldc3DaooM82TWDcWdrIZh/wUbEDZq+z5T6Tqjrcifww7M2tFUk6EK4c2/tIQ1gMLi+SwqXlwMaR5rQeSuNQxH/QLDSBhUjGS9n4NcitEp7PI98guDC4LrzBGefKGybqiiOOeMnM/Jc4DKcgKcgvUr2NL4McSQ/Fh6itEv/efcuOcJYgKbUHWR8ALvW9IVaRTRZvA7SS+UgFABnUOP69b20SC3KR/gqQ48xRloZhsAKV78u5BRYxtQXdrj3bu7kiJAa5ian1CNQ8+B1ioJevq465rAqSZY5eluibIreudpqFWi1uQ1GfKF5qfuOhNzO5AQ8JN0pL9wrMzIR0whZG1dt/3kK9wD81hKU9j6FZKm8ZM1GGenAmUk24d3EpA8WXQWmcVskkpX8JQdVUtFrGfUxMp5EYmJFqe83X0oZ3aJrHgwhTzKvBefr9MfBAicoDL/IrW6Bt12FGkU1L7Ypl1X9KejLeplashie4K4TW/BGRVV5ZUMVTlhq75V7VtwKCjSS0EswwI850hF8ZR3OReSWNdU8KOML4rg2PvjtSeAfVvhxaPyjjpdQM25vXF2pqiPVCzhgf3JfbeGEE0w9ToNDsvIaeFhaPAATyFRR9MW45RkHS57M1d1tus2e+WVNhIHPlRWSA7+eoAY6t70ubIRM2CVXOPKxzHSzYGpOHdgVVz+HaGgJLO79nj4EFcCTlsJw+hDyaBSdRuE+YKzofvuxX3OgQHR6Wx2sdRcULoggLhDD1bgfpQQ/wiLiLeD2Rrd4Y7pWpspW2TvLDeItjosRGxHT5KdC6aU4bPAqr46ikHO+jfzA+qMMrGiETl/SyM1M7g9ZJ9EaLIG3yHWgpsKpfRrB+GUR1WNQAdM1pc3nfcGYcJLE+g37q2WdhZxqJMp/Eg1NRs2YQ9N0A6pjH8tUPhBfK7T5KTZ8i5bTmvUk+NPfOoDgYOhOS15jHIYXGol9BlN X-OriginatorOrg: talpey.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14949948-5d61-424e-e143-08da9dae30bd X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4445.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 21:54:29.5060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 2b2dcae7-2555-4add-bc80-48756da031d5 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XG5k8wYTmLIfdZ8NXqYL1Fot3Waz1moI9KVr+QBOXA7EhDIE8Pu6g5C8tXXqVfZj X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR0102MB3481 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Make the debug logging more consistent in formatting of addresses, lengths, and bitfields. Signed-off-by: Tom Talpey --- fs/cifs/smbdirect.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index 6ac424d26fe6..90789aaa6567 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c @@ -270,7 +270,7 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc) struct smbd_request *request = container_of(wc->wr_cqe, struct smbd_request, cqe); - log_rdma_send(INFO, "smbd_request %p completed wc->status=%d\n", + log_rdma_send(INFO, "smbd_request 0x%p completed wc->status=%d\n", request, wc->status); if (wc->status != IB_WC_SUCCESS || wc->opcode != IB_WC_SEND) { @@ -448,7 +448,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) struct smbd_connection *info = response->info; int data_length = 0; - log_rdma_recv(INFO, "response=%p type=%d wc status=%d wc opcode %d byte_len=%d pkey_index=%x\n", + log_rdma_recv(INFO, "response=0x%p type=%d wc status=%d wc opcode %d byte_len=%d pkey_index=%u\n", response, response->type, wc->status, wc->opcode, wc->byte_len, wc->pkey_index); @@ -723,7 +723,7 @@ static int smbd_post_send_negotiate_req(struct smbd_connection *info) send_wr.opcode = IB_WR_SEND; send_wr.send_flags = IB_SEND_SIGNALED; - log_rdma_send(INFO, "sge addr=%llx length=%x lkey=%x\n", + log_rdma_send(INFO, "sge addr=0x%llx length=%u lkey=0x%x\n", request->sge[0].addr, request->sge[0].length, request->sge[0].lkey); @@ -792,7 +792,7 @@ static int smbd_post_send(struct smbd_connection *info, for (i = 0; i < request->num_sge; i++) { log_rdma_send(INFO, - "rdma_request sge[%d] addr=%llu length=%u\n", + "rdma_request sge[%d] addr=0x%llx length=%u\n", i, request->sge[i].addr, request->sge[i].length); ib_dma_sync_single_for_device( info->id->device, @@ -1079,7 +1079,7 @@ static int smbd_negotiate(struct smbd_connection *info) response->type = SMBD_NEGOTIATE_RESP; rc = smbd_post_recv(info, response); - log_rdma_event(INFO, "smbd_post_recv rc=%d iov.addr=%llx iov.length=%x iov.lkey=%x\n", + log_rdma_event(INFO, "smbd_post_recv rc=%d iov.addr=0x%llx iov.length=%u iov.lkey=0x%x\n", rc, response->sge.addr, response->sge.length, response->sge.lkey); if (rc) @@ -1539,7 +1539,7 @@ static struct smbd_connection *_smbd_get_connection( if (smbd_send_credit_target > info->id->device->attrs.max_cqe || smbd_send_credit_target > info->id->device->attrs.max_qp_wr) { - log_rdma_event(ERR, "consider lowering send_credit_target = %d. Possible CQE overrun, device reporting max_cpe %d max_qp_wr %d\n", + log_rdma_event(ERR, "consider lowering send_credit_target = %d. Possible CQE overrun, device reporting max_cqe %d max_qp_wr %d\n", smbd_send_credit_target, info->id->device->attrs.max_cqe, info->id->device->attrs.max_qp_wr); @@ -1548,7 +1548,7 @@ static struct smbd_connection *_smbd_get_connection( if (smbd_receive_credit_max > info->id->device->attrs.max_cqe || smbd_receive_credit_max > info->id->device->attrs.max_qp_wr) { - log_rdma_event(ERR, "consider lowering receive_credit_max = %d. Possible CQE overrun, device reporting max_cpe %d max_qp_wr %d\n", + log_rdma_event(ERR, "consider lowering receive_credit_max = %d. Possible CQE overrun, device reporting max_cqe %d max_qp_wr %d\n", smbd_receive_credit_max, info->id->device->attrs.max_cqe, info->id->device->attrs.max_qp_wr);