From patchwork Sun Feb 26 09:09:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Talat Batheesh X-Patchwork-Id: 734186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vYDpY5ggcz9sNg; Wed, 1 Mar 2017 23:12:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="eZKX03zS"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cj37A-0005YU-Bt; Wed, 01 Mar 2017 12:12:16 +0000 Received: from mail-db5eur01on0087.outbound.protection.outlook.com ([104.47.2.87] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1chuqR-0007pK-Bn for kernel-team@lists.canonical.com; Sun, 26 Feb 2017 09:10:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=i4OsyPS7fpmHzJssaFZiVXjGP/DFDx2ozg9+5TtcOCI=; b=eZKX03zShEwzolC2PEhVEnYsy3ZvVvbq3cOaUNt4k0IcPG9Pes4OSHgG5JhaUersNx2HZMKIzLtIvqeoX/NsjuYQ+dTFCuWmHQq0H7EUX6TPXifG/BrxgczagmJCHez8pTnN51koGQIG1oMWKPmjIjm57jxJstc8hHoO/Zb9Zsw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=talatb@mellanox.com; Received: from dev-h-vrt-005.mth.labs.mlnx (193.47.165.251) by HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 09:10:17 +0000 From: Talat Batheesh To: Subject: [PATCH 04/18] net/mlx5: Use exact encap header size for the FW input buffer Date: Sun, 26 Feb 2017 11:09:49 +0200 Message-ID: <1488100203-31976-4-git-send-email-talatb@mellanox.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1488100203-31976-1-git-send-email-talatb@mellanox.com> References: <1488100203-31976-1-git-send-email-talatb@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM4PR02CA0026.eurprd02.prod.outlook.com (10.165.239.164) To HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) X-MS-Office365-Filtering-Correlation-Id: 6f384c85-9560-4fdd-bd7c-08d45e274890 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 3:JeCfTPPpx977I0rHaRtemxL+2xouhl4XPXY/L05Zvqu01YbsOJq5BXMhhamGF7b+28G283CWVV+hURCKYig0ZDRnKUxPMnL/E+5qluo6bEbxK18cl0itEU9pfHeBy9nmuVmuQKEQQd1OIrhVRtM4JeQRD1+Fryl+WEZyXB8BJXhtAwoODyIhBphcuArp4aauuij8Jw+MCwgTgX+qEtIe5I4r8IwU9EK8EhUfs/xryM82WJl2Xepj7DlrTGTaSwWVrHGkyUrlrOEnYQHI6L0pclF1x5E4WcaJaWnxjoprjFM=; 25:Fr7OwDdlx+QsG4Wud5STOc6AuczMnLPY4YsEmxHhibykIaeJ2J4mTUCalhyi/t1A2wh+7a7nnsOrKk2a4JKjWWnMOorC3/1v+9CccqdjeoF0gUee7T9JeEfOD4jFd3P6CqDIw9aLtetxeOcgG67RlMZ9HkClmPRw1ql1w5Dbsl4qz7F6iZdCA9RR27B6nXHcC98KEzCrlo/2nCfMN45RampLHQw9Bf2xU0soqT1eQRdHP4XiOUVDD5bZw93ZiN/2v7N5Z6fS/OS+ZMMNsEtN8vLHLH04OmYlOQ0rjmkYWWiwbyYf8dz2OVZMQXy8P0hMxfI1vdHjDsoTjU1A8ZSRnqypi2Y0XFn4XaTehSR3MDQ8WHqSEgHr1aBAHKly2TyilD5hDAlhDnM5mpdn2Hvat0WAN5+9QzkdXkcPCfBdO8QM7FJm3DqomVHtwL1uqOMT9GM3wXNrJgLmnjMRufwXjw== X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 31:hxh22oJAdB76DoflXxavbgstdZJ2WusQrKZM4Aj0SoggXCyeqTPtvpYsGrdvpcC6vwD39k2UXxMwkeCob/emxYcBrxKAbrR+/tW2FE6P4DOqD4nDRDq5Jk7v/EhP7sS9ssoZugNAruiNgFp6X4OVaykWgoUoIpx4FBoiSaBH3OMKlSJKl26H8j8Lhb0WYtVJsG6dMKuVleYFW4hymB5gcnxgRHxZ6DazbOkkk3Jyi6gkhdvfQg7lZsBbeYg8ds8X; 20:4E1NTXp0rLLgITCzk5KM17XqfjwztMM/H3dbqEGh6OMXNfIeHxwntbUyUX3nXG8Hv2mxawt+V3wK9Zt441L7iCX2XW1BB3Z6hzybvYPx+mlkNuBL8qfrIDh/35lIS8WpHS/5NHuhOc5Ktfrj4PA2SCY3cxM4uW+RJ2rtxpXAh+5Lj3Euv7bqkVmGfhPKgWhwcTosFIK9CxCY2HWGReGhNZdgYv0PDS8KcWoXG3S0x+gnddCCwA3SwchEgQcxs2P+aUYiHL6jKZj/65dQObQYFudzboGNRkDqWHPG8az7Tk7Unyq3+cFY+bgbeSse70ZRyOD3XjZEX6LPTQ2ZO6ilR8IwlFrfsKoH6y9HJZ52G8pMpActSPrp0C97va+JwPkwRz6hjCqaknWSDr67Xli6OSRIxxBPxcLgPnTK1W6x9JgFLLunD6LLhsNkI+lekhJ5aXEd1apliwb/GL3Nhz7R2uwFP2a/ExhfV1S/j23CXSRNeC1spymnQD94iOR9h2iM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(211254476889703)(24339691489775); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(6072148); SRVR:HE1PR05MB1306; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 4:sFfYs1h4XSUUa/w9CaqHZglmEqYPvBQfRklBuIDc30PBpPvoQdDm5EvNhVfGuo5os6axDzJqhjEcrVP/gmYH11uvn56AuYwEbQ3sB6kWqphEzSnNS711Zrju/KOumxXajYBvMftseL8RtBNyIjtfgnMI9qZbrWXG7u5rpt5rdCavEo9C0jvSdpb0S4Z/ST9LtFnPNRVFd1mNBg39eW+cx1dotnivIc57ojnWNTE1s1u2dT8KOtl+m6qRyAsemkEb7KUM9+B2uDI9Xlf/AUCQOrxmh/qb4Nd3gXbAVTA4rHYAedCGklbG9PAwUUPSxKPXfubA1RkmPlQgg/iTg70K93cVJCXEGy6I45edTPiyPwgloJ7wTd19qcPGV1yCz1V0rdRQtMA3VQibFW887R4Z3wWJ//IqR8UzeVjmqdR07u+tkNzTtHrIt6WozfrwBPstXW8ua/n7bPWM0jvDiKiS+p67iesUOftiXRkoEgtwDJe/xkxUX2xni8mdKH5hsgCuAfHrV/w1rfP2tLcKp1fTWTzIRt+NgL2tkomOWU5ZNBQw9kjW5TkvCwby78FPNQC5FC7FsFHIxwh61IBkZkVg2dwQl755rMXk0KNbeOfpa4y5ToTmFOx1EAfWsNUn89LRgGV3UVqZaOuiPifxrov6xE8xwWLXyjl9D9LcJNUUk3eaa4MLl11dmr59BwEHTMmeiYehZp1GYDwPlzz2GnupXw== X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39450400003)(39850400002)(39840400002)(199003)(189002)(68736007)(81166006)(8676002)(6512007)(81156014)(50226002)(3846002)(6116002)(50466002)(6506006)(48376002)(66066001)(6306002)(25786008)(47776003)(6666003)(2950100002)(5003940100001)(6916009)(6486002)(36756003)(5660300001)(101416001)(189998001)(92566002)(7736002)(107886003)(110136004)(33646002)(97736004)(105586002)(38730400002)(106356001)(2351001)(305945005)(76176999)(50986999)(4326007)(53936002)(2906002)(86362001)(575784001)(42186005)(450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB1306; H:dev-h-vrt-005.mth.labs.mlnx; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB1306; 23:LQzAzlW2LJSYU5nqEAOC5Eqy1opMj4g9pyOdYIH9C?= =?us-ascii?Q?G7oa+53314MzkGtcz6X2dUEIGUYAw1lG/VTP31zgOvK+6l3i6zo5alfqyT/v?= =?us-ascii?Q?srb8PQ6ZWccTTZCXN/UHxumZQn/c0nx2gXOj3Nblo+vJoA7X3HjsRgySKOFJ?= =?us-ascii?Q?rW7EHM7OTWNJ6D6wRKs2QsEt8aeRadbzo14nT8wm5GHFwDkepJ0PhqRuFEK4?= =?us-ascii?Q?7axADlDnki1nMZRb4/r++SVARDdWJUXywKcGgwZgK8RyDRmdK4nGlxgT5/bn?= =?us-ascii?Q?1gj2p0EzrcGhDp79N4ESmpVo5lSL4xEDIdec9D490LKiBI+e+FiBTxI2zqWj?= =?us-ascii?Q?WkD1tTpXEiFSd1FX1X5+zrqL9b7qwykhRFkKm7QGsac7IxWeZFJeOxBS9kO5?= =?us-ascii?Q?SmEU7olY9vCNA8ce4jhoEsHCXhLjdvyEM2uDp8rPv+nPw8RJcdxsgaSuYoAt?= =?us-ascii?Q?YnkUxzA8d36LIQ9Jsaz/Y/sX+TPJdp5RrQAdKD2ra9tR3TRdyHEkLKnmcWRB?= =?us-ascii?Q?4+aTHq2Kc5ToC0ZpFiDeV0f8hz1OGhCwkFE1M7YTRf7ffjw/Estj8hMd75jW?= =?us-ascii?Q?6xlpG6eu0fgVBDKB6dCfRs/acaWRIcdVyZ/zrb665wWcbOtDl7DHJ0JrE76V?= =?us-ascii?Q?eGw5mA0cF0FRZ2WdJJJMxLhQpnDLhsyC01ezGnAp9vvFgWFKrO4iBXnEapyW?= =?us-ascii?Q?5vSerEPUHAnYPUx54/QLSr0EVl7Af4I4JrZHQXKWLfOEfao1l7G2JuJQZWLf?= =?us-ascii?Q?PCwR41kw/xxwP2gzpon6AzUxGgdNXU6nEQfuz8Op64zz9QD/KujhNPcGrZtO?= =?us-ascii?Q?2bXUZBhU+gAgURuhsM//GnU+5ymb1hRAz3CevjDSvzZrw/DxXldgHiJZG7ee?= =?us-ascii?Q?x7Djw1CgE6+FdWcpR97fkulL/5PMh4oVLT1UjIU4LRz84yT5q5XHKsPWYNKO?= =?us-ascii?Q?3y3UnfpjqU7tpNF284ztHr2Q3N06X81lZqpJP7b7kcBDX/Tjk8bPnKW04g+g?= =?us-ascii?Q?9TTTBQ3mnJ0RyBDqE9id8Z0EB+NlOEcEJuXZe4ZbIRcr3qNk7i7cJVUX3XUg?= =?us-ascii?Q?VJTbl/IK1reyIr8DsU2BUErIYypQvbrJVOSGQv/HTJNnooX2c2HNZUanWEd0?= =?us-ascii?Q?pI65mN1/ubfj8TibN80Fmgq6c44VgM3IcrBmy06R9qgQuPPaUxxk+gUL61BD?= =?us-ascii?Q?74vOD3y65EToF3y30XSqr7ctkZ7Xm0ylly+V+pqyXbEa/mGfYlzroG/S6UBt?= =?us-ascii?Q?ZiXHjuSXoiToNQRYpkAGhWyuZAudjAevAmkkv3/bh847oMF54cw1vRNT2ykU?= =?us-ascii?B?UT09?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 6:3fQ9zhaZyqpkTCB1673j8euIp7qmrSAbV7vP9OxHZtau826ipu45bUCwcQhVfzGNFpcck0jlyVploNILOcA72FbLiS0vspt5V8PTmxlDUM4ZL4sf9s/Y3Kcs0rYQkmsKat71YeXMN/kMJgPcfiFFjXSr5LzlTAAn51YFhFRlzGlqnH6XZH9mqCfB1RZvMMmURXiWXGvWHn+goSlsd9fzxom8VTDtgGlaD295KuqqMiysJVnIKWS9m5FCo+hnILQm+vbnlU6yZgBxRfmtm0uTBY2PFwW6RBQZRpGksPA50wPQdBHoocMGBBsbCEBr41O2pk/sq8br7hor4/qZUuaHvVpB5f1pM6VxMwHNIy39izeh3DgQ3u1SeVQhBcQa9/y9xyRM7MCTnZbjgRfSOnSjv9aR6GA7EsOaGo1SfSzKm4s=; 5:OSFnYF6AwkIUb7NqmHWpnXkZtN2lgfwmbVDykgCAo/nuLMV9VVnrhD9TW2WurboUYeeTNktoqwPV1sHvazY7BKTzlqYV1bEgTjWcLqx7ZhMva0ulEmppbV2APSy/zz57PxcUzaKJuhkcqHUezwFURSjNxL9VQlGY9prqLn9H1Io=; 24:aSCM7kjoxcQ8s2YqJDbftEfYN0memIS0JCOlgoJwEQDGHhC7plybxAYRlNKheFP51LnP/t0sjoevU/tCgcKIvlbMAAgjeslH8v3tK/8wnQc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 7:XeJvatzCIpUp1I9ywI3JkkpqslrOGtrgCiT0og+lzsfv/5BeoFmqSt1XWM/KjwAAWjRuiIrtbgJLsH4zLiPeK7m/knMe7ZQYWeAj0z3NUDwwV8IXdTylC97zPI09CKf8O6GqwBh2nicA288HlKPPJyZA33GLnO10XNWbslbgG+g6oE61qgLSkU8jMZ0J3EzL5TTAAAstTgFqAumVjoITMtGv4pdAAZbtg8LpWIUcawOOHKJa1IvmoEyvjYJ6YAkadAIxe2MC9q79k+fdYidFRgdaVcGQJZ6zb2ivY1lKp9HLUKKU5bKDiAznkZf4cARHtsWIqaLVFOlkjXy9LyPk5A== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 09:10:17.5368 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1306 X-Mailman-Approved-At: Wed, 01 Mar 2017 12:12:14 +0000 Cc: talatb@mellanox.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Or Gerlitz BugLink: https://bugs.launchpad.net/ubuntu/1668019 The current code is allocating the max encap size supported by the firmware and not the size requested by the caller, fix that. Also, spare a warning when the size of the encapsulation headers is bigger from what is supported by the firmware. Signed-off-by: Or Gerlitz Reviewed-by: Hadar Hen Zion Signed-off-by: Saeed Mahameed (cherry picked from commit 073ff3c8e6acdd6bae91a037e6f2d0edeed4165d) Signed-off-by: Talat Batheesh --- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c index b53fc85..b64a781 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c @@ -473,10 +473,13 @@ int mlx5_encap_alloc(struct mlx5_core_dev *dev, int err; u32 *in; - if (size > MLX5_CAP_ESW(dev, max_encap_header_size)) + if (size > max_encap_size) { + mlx5_core_warn(dev, "encap size %zd too big, max supported is %d\n", + size, max_encap_size); return -EINVAL; + } - in = kzalloc(MLX5_ST_SZ_BYTES(alloc_encap_header_in) + max_encap_size, + in = kzalloc(MLX5_ST_SZ_BYTES(alloc_encap_header_in) + size, GFP_KERNEL); if (!in) return -ENOMEM;