From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0059.outbound.protection.outlook.com [104.47.2.59]) by dpdk.org (Postfix) with ESMTP id E1CD0D010 for ; Tue, 5 Jun 2018 02:42:04 +0200 (CEST) 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:X-MS-Exchange-SenderADCheck; bh=nPGbaulbaATIAqEOcCo+/sRg2x2XtbW6nwmgI/Xkekg=; b=SgWIctYVRbsM0HyT+D232Pcowyh7/XJTUsts4PpPOkNYMNbYCES6JbHCREU1gxWSB29zB4cFlkoa3/s/I3Wco7PTNQmZXY2y+Sqz8z7L6gRfKntmnNUTpRzosLzs2WJaGN1ZfCMyMAkKGeybyD6Hy9fIzuL4gKHEdMnUHl6l42Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:42:02 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, Yongseok Koh Date: Mon, 4 Jun 2018 17:41:32 -0700 Message-Id: <20180605004139.14660-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605002732.13866-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO2PR04CA0088.namprd04.prod.outlook.com (2603:10b6:104:6::14) To VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0501MB2045; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 3:Pug7zGfYFM5kBBFORMhOuIGyueBmVH4soQ7oqfRodkJVMyAU+EnLDsTjyCGCmGoWjy0Q9C5S0LCS3oQtURRNxINJTJJ62ANRc/S7TAt5/3cUGWjsD5fGVcQbZHGNfzfkLAtZnS8h91h4TAffRcE8jq14mjARNWMB0Ig0XS+fHqFKLTR6i2PesLHrn2HXx2wmoSwydXH6I2Gox+EOW80eCdyOaqIFUSkHxAElv4RMCX4R+njp4jn9JqANw9AXR5OM; 25:C6H9STvTJOi4xt+2H1GAWtJ3j0TCavuzqsU481RxwVwn0ozLH3LP2/X8OwD9BYWmecUcMZ3JtJn4XxRh4/sTothitZcW1IMipGSC4X87sGUFA1wgZozyrUcL0VQCpsas3DvMCnyH1/YaCJDyb0blPa6BaKGir31jgppoK4YBsSUOVKIjEwEIzhHd014RK1D6ZDpYq0UTfdoYf5kQR4Et5zkAs1YICFM98qams6RUbJJy7UUGKtc+c/Y3RGF7emd/c/SQc9YcgWnXo2Oz6rrj98yaHoy4JXGl7RjJ7/SAc/wzf+WuifAgko6aQSSpZclnNb62dMnVOYlJbw0PXMcwMQ==; 31:qEqecqZD27ds2+KyOVffKtkiCUekeshy48HCby2o8Jl+HdO4x2wVgG3kKi/ESVIA9FtcqP/b6Wlz4dbVXhpMqtoYL1k5zUrWBvPXe2CFTLqRKnE+EISKJ+MHAtfkX+el7sIlKOTeSmbxm6k7ulSM4islIWESE4EK6CWns3yRfjDE2z5rpN/BA3hJmhKFyPwuqGEKm+a8rIrr+lU3mif5/4N61apvph6GjUtiNSjKSFA= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2045: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 20:GhhjPUlaTZANSYkq0QZ5GN42Q4RZoee7tn5J6d8a65OZo/qep6N4FLHLKJtiuEbH19DlBS1b5XT4L98LD+xRf2XwiqiV0UfN0kQMVvXrJPlc+wla3aguCBxxR0hlbS7I7gER0r2ARBZqm9+qH15w8at00MgYW/Nl40kaCceR6iuh9atrKFUNgdU0ZwVAKBADnIE8DiyygZkhuQWBRIq9x8ZmSEJbf1ntHA0TlvVGczP+OHvCCBr/cdHcpZe7c3CzeNMG/yZV5iWpmgk+oLR8wdGO66yCVKdyTwnQcXabLTTGKB23/y1nDgWMs1DcCYZoX4K0u4cenX8rWVQczGaB5mn7RD7GhoGeQ9YzGHphH96MB7ZOrmCOfHlC5oNUfqIJ0cVEi2AwIZatc+A4IE8hxa75vkVxQ9Ojc2zG5PNVMY4l2VZIc6sOccCfGjgmceAwK+b3LX9sZ4tvOvn4NfRNThdoGKzbI2WJ201goqHNjP++PZEh5NXWFQdwfzll0Y/T; 4:7AHg2N/ue6gfAZ2Kjq9GQzbCNNI1BVty6tUCEBjYpOUmZ1C8/NfZX0B9e09nLXWJ0GdK2EmTH08xfhY+5I9s5QqTAhkLsgZuVlQV6/4B5y+418Q91LO3eSopJ0X1RonLf+mtbLCZZQbQbXmTai+FxGnWsnFQ4s0Yqcw9ki0OGWg12ZIRwU74CumLRfGQcf/GOu9aQlXqQOnu4BYhTNZDcIYLeuQJM+T93lalf38EuSPpJAwKxm3nWzmdXALSr/G/EwEh8VbdHdCsBFJyAHxcOg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2045; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2045; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(366004)(39380400002)(376002)(396003)(189003)(199004)(5660300001)(8936002)(3846002)(6116002)(6666003)(2351001)(55016002)(97736004)(7736002)(305945005)(8676002)(48376002)(68736007)(2361001)(6916009)(2906002)(575784001)(86362001)(81166006)(81156014)(1076002)(50466002)(53936002)(47776003)(446003)(16586007)(36756003)(105586002)(2616005)(486006)(316002)(956004)(51416003)(69596002)(52116002)(7696005)(11346002)(386003)(476003)(50226002)(478600001)(66066001)(4326008)(107886003)(186003)(21086003)(25786009)(106356001)(76176011)(16526019)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2045; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0501MB2045; 23:BUaVND7SOEFNfyd0kRbjz++jcV+N0bEeFbMX0/L?= =?us-ascii?Q?TaunGxPkbF+Lxk+oeZg2IWaP3ryKc1TIWtfalsYfNlmNZlazc03V+8g4aptT?= =?us-ascii?Q?ewv4NhadHnDxx6gQclxDxS1Nt1X2qKixh7Y6VHYwaKgmhR/1fjfG8dnzMvMP?= =?us-ascii?Q?n40Qv1QeTpJiwDa6+edwVI5EDkBB/JEgx6egxJq7ryFeIiO1/ZpWnaf+5w2b?= =?us-ascii?Q?ZP8q8+wFZ0NqEV9Y/8ucdGkBJ8TiCHdP8h4RCiZG15tkbtGe0Bd/V5HSxm5R?= =?us-ascii?Q?QvdDpq9giVNWB8y5FHSriPcizyghhqMWVhsOAzGcfZYkkCGYiywNP5iDtq2Z?= =?us-ascii?Q?39DougCb40GR6wPwfdegmWT4BxXqn4swKqfMPPaeYJPOhzOrylgCqns9BRpR?= =?us-ascii?Q?8MC0mKcgPPrKyp0zfpGWvhaLMSHl7ne9wEjGAWcVF+igk79zzG1OH2YBki3l?= =?us-ascii?Q?A9d22o97xUwhLxCAT6DjBQWj0lS5q34sG5h5Iz6t2+NypBlWhXgjLhyeA4gD?= =?us-ascii?Q?65tqEtZJai98WoilkY2jwEPPotq3axy8euOnU4ZqacfgzfA7S4YoIpr1xScy?= =?us-ascii?Q?YTWbpEDcPDMKNEa2OPAaOFjNI19P1YNzDDaDuJuU+ZF9mD/hk3hzB28E+TOK?= =?us-ascii?Q?3g7FvNf98qkq4vPV3NYFamIm7juwdL7CXzQxwudrYyWurMyLn7LKIWuHecUb?= =?us-ascii?Q?H+ZVKKPMZb6zcikB/2BEO49zgsc8n7kujOv1TFzYJh+tkn4LcXqjT/KG/tm3?= =?us-ascii?Q?I4fHoYDDrj/UvFwi4xeGdL0qH3dwPJ0tXtuR61Qs1kE3CpHkcVcXeIsdSzRr?= =?us-ascii?Q?AZSMXtfdrIFGXCyML8bQfnoNvQE545tBnkTZzRvgJpxm1Ko0juPgef1OpNCR?= =?us-ascii?Q?LzyhBIFa0IZHxIVQM5wwD6AqbYGormcY3lfvhcuQNFJjr3MlnSo/4TbtyYCA?= =?us-ascii?Q?BUw1LlZC/66cUZ3C+u9eC43yk74V/dMvHfr5IMpMmq5ARORmTBQphB+GvwuE?= =?us-ascii?Q?xtjLVvJzcnc4KZ1OxVM0j+VHjmvhF99G083oa4x2KmlHUrm6kGWaylcGbhof?= =?us-ascii?Q?2f5/w++OHOLr3zMD59viQYaAMOjAFFio64T31YUIGrCiX2ehq3CJgRjDNERZ?= =?us-ascii?Q?LEyupeb3kY3fg1tO9QOkvZNxxlaIrn1eUeBw92saRCfLkTOGwIRIsKVNtdAJ?= =?us-ascii?Q?162hit6aV+hhiBfk33JqFJZ46ooKeEsebbxbSO+sL/xWamxD9zVQQTXrT4A7?= =?us-ascii?Q?2LlBG68gpOzClytgdNfaIe/QWaLco+FFwB3w2jQ2i9lkJ/NyEDwERV0oPisF?= =?us-ascii?Q?okOT2dV9MH5BrAlM+9R1ngB4=3D?= X-Microsoft-Antispam-Message-Info: cPkT2QYDCKbqlYfD/hjPEH7mnblW38QZApoimqL5tuug9O1RSjk9QOIfzQI0RXDcf0POW0dP5i5N7lLbzvNrmz+w7mp6foly4hjIPpvKzuazCjvJzDo8eOWxS2M6HGA4U6NCkJj/SetDGU+uEX5gxzAE051GAby6jzn55q06EkCYrGGaElsVRO2PT+O6ePE9 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 6:4D0+h4NcXH46lqL5PpabdNfMI6UdoAduBgBEc0J7V6CmQGvFpoxbkJu2Q4L+bDsPjRcc5eGoOxPwxMtTGaMt2V7+28NiQXW6t5bou+ZVlA40GA97qGH4i6J9wEVhD28cLJd4hSgdO8wWYzEgQNWOArz9vtceUhW8gPJ8oSm12HI+gvHNW000dNytg5DjpvKS290JgVIqqKRp+yaiAS1KgC1PSg1QtacqI2pXKNLe4dj1nK3X3OAl0d36UuUtqXtxXo8rCpTu6fOlG2b+09RNiZPxM1qblrhCfzxqhJaS6WC78u77qpafjPefzlKKu6piPk/HZRMlLzUdvah8NDtP8qJEtZrPxpjD2cgi8nSsr+TGTFxCI+UTSHcAHADa/S9WLqWKZfxCHGkcI7tlcOCg4aby7PxTKLPKiwLRtUZXV9Co7/DHItASOBUV28eBv03Te3I83H5VvmGiBQ/CIhZoRA==; 5:PUwCOrW0NWZ+Wk7OL/eJUwr9KY2YKq1xwLHJ+yX48nrylKmSuc8ED7ak9uiXp5ZnrYolHO120iEPoxg6Ts0iUi44qZhYCXvI4LVQCgIbQz5kYb07TT9NaDseyBD+hhU4fi5k0Hzs20n00xzTOYuIUzYN/qxxXuvhn3WYC9GGbtE=; 24:yPFB+DKAohW4Z13nWQ1YmDvJ0XdL9U622RmgMtzlM5tShAu/e/8x4kMX7MJAvr+yodh+2sHGxdepQIdbLi9gHGXg2w+aS07tno8mxrCNoyA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 7:UyNWUXWWwtdds8iD7Y3COvQ3rSWcGhdGd9OiBt2dK7n/BoZ0PXoiSJzt8B4//wlxKnB7hiHM65PHNae5dXCnY2l3/7ta7PEMlqEVV2sexk8ZPZSyqOBbNFdDp0+E2sKdAEAUWzjZjV0CNChzhKXcUiHmlX0VDSZezI5qOOlmwyy7buFt57aByjJM8Jbeu6cdBh9fu+A5g1IFJI3ID44qixRgODbjYZPZlEt0pPAg+MAIOlWDQmIq2Oui4CuRkqR1 X-MS-Office365-Filtering-Correlation-Id: 4526587c-7858-4ae0-6942-08d5ca7d2852 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:42:02.4161 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4526587c-7858-4ae0-6942-08d5ca7d2852 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2045 Subject: [dpdk-stable] [PATCH v2 60/67] net/mlx5: fix calculation of Tx TSO inline room size X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 00:42:05 -0000 [ backported from upstream commit 95d7e115be89f071d672d9cfd5c0eb1b23fce5fc ] rdma-core doesn't add up max_tso_header size to max_inline_data size. The library takes bigger value between the two. Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core") Cc: stable@dpdk.org Signed-off-by: Yongseok Koh Acked-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_txq.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 4e54ff33d..7abfd565b 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -662,17 +662,6 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, priv->inline_max_packet_sz) + (RTE_CACHE_LINE_SIZE - 1)) / RTE_CACHE_LINE_SIZE) * RTE_CACHE_LINE_SIZE; - } else if (priv->tso) { - int inline_diff = tmpl->txq.max_inline - max_tso_inline; - - /* - * Adjust inline value as Verbs aggregates - * tso_inline and txq_inline fields. - */ - tmpl->max_inline_data = inline_diff > 0 ? - inline_diff * - RTE_CACHE_LINE_SIZE : - 0; } else { tmpl->max_inline_data = tmpl->txq.max_inline * RTE_CACHE_LINE_SIZE; -- 2.11.0