From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0049.outbound.protection.outlook.com [104.47.1.49]) by dpdk.org (Postfix) with ESMTP id 01EE34F90; Tue, 8 May 2018 20:48:36 +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; bh=lu43sfNncZOexE6g+dMWLVdr8Q7wb3y3RPQ79MKvgv0=; b=STWtO8VTdpA2uXP+zMRhG07+8JSj/4kYn5ZWtA+d1l0QpVUnVowDAAJ46dncPofwXzAWLGP8V02VyA8RWD551Lw+NCmbS07VenxUgjwZFrtMRDqAZx3fewywII5UPTM7eVkgJz6Zgw2tqNO7oBeKB4ciOLygiJCyPM3cXkk07Qk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2034.eurprd05.prod.outlook.com (2603:10a6:203:1a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.755.16; Tue, 8 May 2018 18:48:34 +0000 From: Yongseok Koh To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Yongseok Koh , stable@dpdk.org Date: Tue, 8 May 2018 11:48:19 -0700 Message-Id: <20180508184819.29799-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CY4PR1801CA0031.namprd18.prod.outlook.com (2603:10b6:910:74::44) To AM5PR0501MB2034.eurprd05.prod.outlook.com (2603:10a6:203:1a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2034; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 3:IC8OIF720bDXF9UXVoe9BGnLXvL0OWGCzA6ZEEk8XrPZRFzyN2tWZAF9D6VIQlQgZZGmvpOL9L0+U2kNTNkgUFoqkfFeRH5TYwvLUVAqnagQcTs0FSc8ABV2IPKI7SBI0SrxSI5EYdX3JAovKfw2dmTaOLk3rx76y0fe9wyWiiPQwGPs5Ii1oZF1FmrBUJzhlOZcrTr5jlZSQuJTBe63MSn0ceLHPhriyIIhaBbhShom1h/Ncm1XtCUQmFrhtmsw; 25:6ruMfZMb2ye7LSY2frzU7wC7xAp+c9sqqIny8ieQQHm0MZxcQzH67ddMo6W5cSdzkNixANzMqNa+DMWkcea8wYV3tv4vbrhuB620hTNUOXOCyCrg7dYhp67D/5sr1LkCT2WsJeWaZBtAUZNAq9om7VSJt+tYmOQuwltCdmPpQoL8tsgv+SozKto44ZvZpj2cZ1wWWCMyz+Aq7kcdUBhN8jg2d9eb+STqNJXSqS5yqdgTs0WlO/zHNq+DycfdqSaBnennM+iL699209LtiQUWczGXTuRCuePcn+459r80n1S36B9xSJfM+a+yvBY5u1QqBaO639K2WX1+8r6+2TX2lQ==; 31:+Hb28nXMUyHo6Z7l2I0Jb7XAQ7oTj/THTeUJvZVe6DlHmOdZ8GXKjl7D02FMtL40yGv9ZuCx70bfElhtfRBBD9+1UF66ARF617kfMj9Cpa4lGLE3hSTHlkqyng+GF+w8GQOqLrrbdEmlMcNIBoF6vv5pgK3HKQHaiLfN3NVDJteTKEppQhhNP2jiMGI2o3dvdc8JIYEC9/zQeNH8K1z/TWd3PtIV5P8wshXcsYR5+IE= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2034: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 20:/aD+dBif1IJ423cNx2//j7hEt3rjq+qlL6x+3+iiGItGvP4hQuD8qV1F2/iZh84N86nio9xT9yV13hag3rRDx/4Xj87xAhzgqOnvj7E3R3/xT/Sh0gk0ZjXVPORCBCVHHcuelw/e0yT/GM8zXjsMXtYCQd+HabIHrZ8BqF558yxQHzyS2CbhVJ1ktYzJIij4i4B2p9pP1nZPNYST5stPomF90eed1dmZVhQ9FA9SyYRddv7yCjozvGwFMfcRy1rMlVUyJDo1O09P8WsEEGXRy7JkdNMzPjn+Kx39aCpA1mXfOC112I5bQfWVaVCoUa5lQ2TF55tZ+PRuHbAxJ2HJJkEKExuarSB0pWBGt5pcr3DUIbfCbzJhDGfBidMbfIu0SYVSiTYgmx1vAv19VMOqgapiVQRzONuP/iSbetT6Hw06B1tMZJF7RAZ7uSUhPv99dWcunvgXNKFfl2hVs+h7K1VKfKbkigst7Yyfmx1KDjp+UEu8yKYiHFd5oDW/Jyp5; 4:XDlequh5xTsTo95QMu0q71Zy6M58RV4jD6kM94U7rzc0MXC0bdhOKNceMsIOtWHshOVznGmP23iZcOFxhPsYuK/CZAvXtaf+v6fzBu5E0tt4iD1QfFAUUd2RU3eoB4wwS4RJTMM91n/BIBJSf9Hw5AT9fCtVuqEA3cldfZ1C6HSY2EjXnl/tEcOtSDmU+260jqxBzl3cSPH409WLDj/oxTRmLJn0cFrt0IH8gPX8ulejy4AZkYshCOuHPDf8RMdJkPQa5FKcM6NdrW40BnAJuQ== 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)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:AM5PR0501MB2034; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2034; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(376002)(396003)(366004)(346002)(189003)(199004)(2906002)(6666003)(86362001)(68736007)(81166006)(81156014)(8676002)(6116002)(3846002)(386003)(50466002)(69596002)(1076002)(478600001)(5660300001)(476003)(486006)(956004)(1857600001)(2616005)(50226002)(8936002)(36756003)(48376002)(21086003)(55016002)(53936002)(7736002)(186003)(97736004)(106356001)(105586002)(305945005)(51416003)(316002)(47776003)(7696005)(26005)(4326008)(25786009)(16586007)(52116002)(16526019)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2034; 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; AM5PR0501MB2034; 23:5XtPYvunr1nq0opQrRZGWoKbsUlblTe7anc+0Hf?= =?us-ascii?Q?iOEm4VxIUUSMPgjEozb/iD3ob04EV8D9ly4ID88UAcBXTM6Jj7KbAD3Nv5yN?= =?us-ascii?Q?C+IIRh6kaDQ/s7LjMTN3+yYCmz81/9ldWSePU/6s1vqnsA3EicpHVGhHtjSW?= =?us-ascii?Q?9JFAu1ndbC0ZQyIyHTYcwzpthdrDSlkwn5V/SPG0vPd7iEM0ny99ADu0MYpT?= =?us-ascii?Q?uQK+HC4yuDwwN3aey+t+1drfp1RuuMuXt+0/32UA777UE1iHytIJ+kiuZFVM?= =?us-ascii?Q?xfoArl8NGUP8u99zLEQfVmywB3VSv6PeMCaR+BC8Q8i/qH8dfkf+ZlAmSts9?= =?us-ascii?Q?x866g8s9de6AoVXI/GhKuZQcPUfb18WTZ1YlHNNeQKuvmYlJobGwMJdHy4J2?= =?us-ascii?Q?ZTSqXOFIILhPtJ0f0UiGKbyfik+mGQ6LQSChWTMYnmNI4RUW5AT4XuaO6ruK?= =?us-ascii?Q?TSP8KKknDbJjywfm9Gp0b6HeVHnsPFXcTwSoJ+qScVVIXdu6vUuKM+ytzYF6?= =?us-ascii?Q?Ym3Ry3JJHaN3TQCUOlecZXdYl7s3UkKYexoAjeb6ZiSpMxds6p5FaLm4PAwg?= =?us-ascii?Q?SyzNDDM1/1kQ9sByP412ttbcznnscpCL8imPwHQDdKIiRE2ChQxVf/5tCuk5?= =?us-ascii?Q?v/5F7svh/E1zQ5vOa73kOnYEqC3Gpq661sZPolnEfShSRWpsm/5ypGPs86JY?= =?us-ascii?Q?79EV0OOuReDjbZT0GvONecOJeIldtd2KVvDXeoNpYJ8JuFwzd+vkDMIwI3bp?= =?us-ascii?Q?3NfM3c+xJc+BO8expHJ4JT/EPF16zPmvZPBBzloARbKE4Y+Q8rgk8KvR4WH7?= =?us-ascii?Q?YSTfNHY87u1N5jdEcW4+GFRUQJxt29eCk1VX28krM9TKkpjG9ZtA7ncacerv?= =?us-ascii?Q?HRrefWaKiA5x9MyM5xivoRzhkWLqvNAOKCrSC/9vEsUZRN83fda6Qcc6T1+z?= =?us-ascii?Q?qISg4bZyrd5uYW9klbtX5haif2sFxMcaOZIkkLqNfwlicLaTgqXzoanwojOA?= =?us-ascii?Q?7iBwwPRYEh4njNmmcp7kGmbo+RJVtpE2Xp0PUnwvsxZqzsYDJTp82v8p0+3B?= =?us-ascii?Q?zF1OEuPTneRZCurxTOyuvqRq7YYuZnYcOrRn/1uXXfY4njWIi89v4dhASAOn?= =?us-ascii?Q?M36uvXvmdbrEXcQPekUiX852ketYJ0tK9yumvxftJadmjbTLj/07kVA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: NK36rQCxK6Oav5CAkZHYofXni8xANYf6yhjOtVIAD2rrV0zgOHDvwE2JnoMig3iBpcWQoAI5Nkgjkk88HyqtxXEj+vppunmTUOUNSAuoQj/MAahtDbBHAUa4c7rbvALBXDBkFE97mUoDSkHW7rMKWEdDB73Ro587Qy0j/SHHYMX4SMOi2y8VKx03Tm3rJH4F X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 6:yussgWtegRehaeG0uUJR0sESxnVFbBBeE/PB8b37wu1gwER8drW34fy7GmH3VvjYQvfCkCrg7E4DDdY7ozeFeX5CKmh3wlTkxRqKsQdZRedTE+hX1gKSr/6bk8xaIXH12SVMsJSePlVTyRLpG44wCGoZM2g1b/vUZvVHss2ekGLfoXTFB5uhXXVitZNH4MF5hpa+BLHxfcIYbB3e169HBkCS0mOclDkHameVXeBqWZ/J7UB+5vpriqhf7IpMo8ZJk/4KkQ5zbq8KRhoUJIm0GGPYn6oR72OMMQfdlGwJ1oa0Q3x0nlf1IqQzYNLCZLqlMxUv+7xSUfxQYiuPAyzmOaDNzfqYXTZEEGDlnFYIrvL1zsAH1d3qAwZNd03kjUmfTe1FMHWQRSH/GgGUGLck2/CjUMMEbVhww7yWAPwdppz49YAm8iyQ25/KqS0LjGsG7Dkhctv5XEbolH3SrhB7pQ==; 5:/XEf8az6+L/VM1Vs+7VR7H1hyCFZllXNptrmX30ct3xbykiD8MZ8r0/UYeFKxWy0hNGfLIwr9BeFP3xT+IfeLuZln6a8Q1eQKr49gYUw3tFn5oZZx62QwgOcgCKX0bUm+Ws7yjpEVC/eV8xXwE7X4hCJ7xqaHgKiCikGJbpkmNg=; 24:yBGalmpUYm8jJf5VVv3ymdmS7K500JzEjNpzLztNkFhp1C0rJ8uJQgpC5FJ/dyyi6fJR7ZfXxhIXBNl9Y9NLhzME5fVIk1f+COa3Gjl6IaE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 7:DPABdjh0qFCKLwPtY6TQDznm6htT17olcvFUYGjCxY5lHH/GQxc0k1qVVRoxCTPEdv2kRnMp346FAfR+JY1R5VWTHvj15VOsR5oJSUeIgqzoe82mNAXoX3131t++SuwDfCuh8h5SDG30cFgSgTSh369pkFzHKakJm1P9BZF1BmwvaGRvkWnzYtwUR2rwEwjOlPO+DFWJiYXG68j9dgk4SRIkU2+CujLUvgDaKj8jhis9Mv71FMbGtr8saLSlEdV9 X-MS-Office365-Filtering-Correlation-Id: 1864d88b-1475-4f99-b33e-08d5b5144dc9 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 18:48:34.0482 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1864d88b-1475-4f99-b33e-08d5b5144dc9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2034 Subject: [dpdk-dev] [PATCH] net/mlx5: fix calculation of Tx TSO inline room size X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 May 2018 18:48:37 -0000 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 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 44358744d..12fcdda34 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -725,18 +725,6 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl) inline_max_packet_sz) + (RTE_CACHE_LINE_SIZE - 1)) / RTE_CACHE_LINE_SIZE) * RTE_CACHE_LINE_SIZE; - } else if (tso) { - int inline_diff = txq_ctrl->txq.max_inline - - max_tso_inline; - - /* - * Adjust inline value as Verbs aggregates - * tso_inline and txq_inline fields. - */ - txq_ctrl->max_inline_data = inline_diff > 0 ? - inline_diff * - RTE_CACHE_LINE_SIZE : - 0; } else { txq_ctrl->max_inline_data = txq_ctrl->txq.max_inline * RTE_CACHE_LINE_SIZE; -- 2.11.0