From patchwork Wed Nov 29 09:21:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 31744 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E76C32BA9; Wed, 29 Nov 2017 10:21:47 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0065.outbound.protection.outlook.com [104.47.0.65]) by dpdk.org (Postfix) with ESMTP id 7615B2B9E for ; Wed, 29 Nov 2017 10:21:46 +0100 (CET) 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=y+pzcLR9qi+S75Ax3nmKikN4eFmtEEoFBbHHQCOm/2A=; b=X64Kktj2ffaq3lGogk2mAdyLd37GduemNvnZbTqFnTo2zR4MtQ3O933fhcETAuB53510EF9sk7PF/oG348U6/S2hIbJmHIFLKyu8vdo3GRKlu+Mkiqbr8lyEf4N0NoShbyPElsfywpkhM/vkR0ZDtgd4KnOYfPWuHmQnN282TrA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; Received: from mellanox.com (37.142.13.130) by AM6PR0502MB3655.eurprd05.prod.outlook.com (2603:10a6:209:9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.4; Wed, 29 Nov 2017 09:21:44 +0000 From: Matan Azrad To: Adrien Mazarguil Cc: dev@dpdk.org Date: Wed, 29 Nov 2017 09:21:26 +0000 Message-Id: <1511947286-4911-1-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: VI1PR0701CA0046.eurprd07.prod.outlook.com (2603:10a6:800:90::32) To AM6PR0502MB3655.eurprd05.prod.outlook.com (2603:10a6:209:9::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8168f78f-5212-426a-e66e-08d5370a9c38 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603268); SRVR:AM6PR0502MB3655; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3655; 3:hqgJB6Pnt9ykNU5gwZL4hvl22yEoT2PmM3IELzcHT9ObPuojJSICdVSMh3QFk2DUETUW7cc0V6hK9pewsvkE9e4hriYDr2PIbU9XhIxXiVAM1m4fpqgtyUK66iHliPKAmCz8WYGX5/O5WX4GGX7PMkKT62CoMpiOFdZjaREhSQMGVlKoTpyLN0N8e/rf9OCQu9dQHz+isiHpgrnl65swT/1kynfAyU2JNu/pGEyUt2qN7QitjDOdnRS6+1ou4xpV; 25:7cYRyySGYY31HMH/I0e04E2g8Hv6EmfBRVlpb/eXMzs4PvyDBqxDTv7QNF5IHZtijsK/+vfkeQkulQPbNRDC8orspgxNeugDTbhemj7NrpzZt0BQgB5Ide9rJkIcbxY8kVjk3IHlR+qqYO0Un0xKDKs3n/Eggx4ac4jFGMkUlcjN7Mj1DHPSfRO/SxEnBlNpeCYAe7aiouuCZRkUol0t8WnmM0/rSkCkOTr9WgKtB58tIBAtKDBVBe/jqkoKtjrX8Wb1ZijjNHExIPJ0vhLD7bEIpkiciAe1XDqj7EcSNBcLwa0pC9EjCzbUsT/eV6gkCM8iYPMdHAjKooOUSs3t1g==; 31:B1k4YF4yxZlkI4ADTR5ZLpzwU5F6XlobnB4JXE4so1tFTDa/pMpcM3FaWXbTNrcMoh+KONttO8e3AGsds9pdkTt7h+9xGXeDTpZLnRn5pV6IYQwPfRyzP/FhKRa3CfSWarDXsEch11MeXp2YLqC63cA3oSXG3Gre8Xc7hX07Bf3Bn4FUvQrqp9xYMsGcOvtveomuK5yIkIsaAKRAQRc6pzDiGy0KThh2n0B3gi2o9Xg= X-MS-TrafficTypeDiagnostic: AM6PR0502MB3655: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3655; 20:etmsPlflZwZuEudWRacqmUvhZZl/ivznun+2G3MikeEQzAzpJZAYyTTuI49Fz2Y7Q87teQYm0NQLN7RcVYf433b+jvc1TKz/AxxemtprrDSC+WfQEjj/sGHZeFxFHKCf9zHy2nWYMpE0iIyoYmwBMuQAPVkAIDsFzIs+WF4eDsHsAhfYV6shMYhHP7Rs7zAGVGQBNEJ42q4xeeQyKqkHZ+9Wlcin3ImTk3bPhiKW3SjflbMWInOlwdarMhgYDsrMFO/yJY0bJmIIPaiaWXpXV9o3F0C9vTBAcsiLqlySV3Y7bC6pEhO7D3ZULC+ghTHm0Xe2Kd0+KG+csjGQOwY5jz6i6C7fjlkMiYaekYiSwWxkXJcHftNhO4s3/u8F8YdgbIzBUeN1UgKntfOD9/d5XIXpB/KdDJX3YgxBhHoa3tj2UBgJvv9bjcwLwaJBZ/lZSWg/rMEc92eoYUA1Zz9GtQFNXPNOVouv9R0XpO3jyX3i/3E0mNtmk04sEgtM+2LU; 4:tAFrLRd84H99bCe2HlthCSuW7PsEg4PEMLk6TugYWBNlhdHPq4j70nVhNsc8VwsaqVpTx+XYiGngq6vt7SuKoQegLl6oBmv4Szr8Vk0Fc6AA7P9FjXDgqzu02VcI2rOgRI843m0rc/4meYuo9mbLkhSPw2NA1sM976WjxvkQWHJGTtkzkEI1BznjsuxVdjVcbqMYD9hvigXmKUZ8m/qjfKZ3eZ6+AjL6dnwIKb2zMRimqxnAbc+cNiwVLT3sLkXkB3i+PZbK8fzON/DzFZ9zzKsQmTGoEPISM9C8jSP4siXPI4olmPvsveV5v3VQMFqF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(278428928389397); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(3002001)(3231022)(93006095)(93001095)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123560025)(20161123558100)(20161123564025)(6072148)(201708071742011); SRVR:AM6PR0502MB3655; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM6PR0502MB3655; X-Forefront-PRVS: 05066DEDBB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(366004)(376002)(39860400002)(199003)(189002)(6666003)(55016002)(50466002)(52116002)(33026002)(36756003)(6116002)(3846002)(68736007)(101416001)(21086003)(105586002)(47776003)(16526018)(5660300001)(316002)(7696005)(16586007)(51416003)(66066001)(189998001)(48376002)(7736002)(106356001)(50226002)(305945005)(97736004)(50986999)(4720700003)(6916009)(33646002)(53936002)(8936002)(81166006)(8676002)(81156014)(2906002)(4326008)(478600001)(69596002)(86362001)(575784001)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0502MB3655; H:mellanox.com; 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; AM6PR0502MB3655; 23:steRsec68Shvds88T2c2JUJ/TpeDCajkYzY6jLE?= WuwA8LYlnyZx7UpdZP8yiHGIWxJ91wsU9iMDGhOYKFJgljtpMxy3fu1d/7EPJuZulLu++RCpYARHVGfOJZGZOuRTdfbxrmDx7g/6XsFrFOrs7x9lEsnEFBfhQvCtfJ+bQYqlILlXw7i5F/+40b0zM39ed0U4ZuI5Ut2KQsCp3DP9RedJxLhhHpUCRN1WKilQXIAndsnIMpsZ+Cb+1Ez+nL1s6YNm6bDDduvTJd7GbAsq1svKwYnwPgNhIOaaEy8mQ15MhePJhnd1nMcJTN8ZBWb5RK6vCzlcibrEm5ikKadTkuXkyhgtqeqP8Vbr/sEt6u78FgFCve0pKBCRrk15Cfjttb3gNdVG/9LTUXA5+outr8QzK9+c0jXCPNTB/lAkL91+mmNSqUtb/i7AYMDn/+TG5dZUH22lUbvSY+zea728zMs0AtcDFVmKvTIYunyfiKZD9DazA7dbZzzJYbEIoi/tl5Be0+VXcNBkzHdnHzBxpQmg7z/z71m47aUO7sPMGcW1HL5np9a20rzstZVlfdUrc0Bf0I/nDyxZtP8P4SXItG5l67WpNoVTF4kfLK4wN5j62xcbdBzOTyDKHYlTlxconmuf8MORsCXYTsu7v5lv+i5FobPteCP0abntU58U/ni9ReE1VFhw+XfGqT+AgYFdnmnBB7iFa7EHo74rHt9K1a4FNiOFAZjEcTc7aHx7RC/tL+wlI0CrIR3JDhg/7qaFOHYxS22RqoLX42iaOUo8C2qfVLgpR4g+SxPxEVHPfvq8+s5oWczJGDJ5Eceu3OoKjVaRKm9fzKqe90Dms0wUtcvsXdQR8R0zMMzELgdoOiCQq2Yb03L50ta+ar5HRu6v/cqL+dCvDiiN/ElCrIT77b3CO6yFrElsiASKWNUBTYuLejmxChi4VNjUdX8EOA9sEy/vmkSbC6zXhVrJxHx9QWo8JyYijOePGiCKTHyG54Oml1pYEDE1YTmtBupNSbG+djrnXtb150aNEq+hwk7Qpo9d3rmfgrOpFzJ/T1D92CxMS9Fb1pD4u6eFi3ILeUPJ+G3CtqQSN+AZFpzIn2wmI4q05Qi/P+OaeMs+j3tC7cNT6bxnGLsb+/dOfgz+1+/kFJHWQRkcO3xOdaF/5XvcILw== X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3655; 6:drtE1+C1L7uvp24hqCaXG8TMV1oX0cMGQC8ZFgD6t2/F4yYmih0U2l3XAF2pffsuIw0hRlRfJpSiq8v4O+UvEUVZxT6CfPDi9Ytm6LXZSNphGnSpiTYj9rZ1XFkuEZFK4SuKZ5/tHp/H8Rj2ikXiUW7PWcqP+XJmcgXRhJ31STjniKAKAKs3uwTKWCYXXpdK5llYBMx+OIPpwWDA7kqg9OIPQRPplJpx43WoHWBzP1DW11BaP+ggc+ERYuXdObmfmX5dnk/YZJjxQrruoHPd3qPHAA1Fv1q+t2WeTXJvU0HZGxt5CRWZfQhfY8uHaYKONvgVKXlWpNcbOnL8q+P1GM8VOaY0QmumZgC4AEn8qT0=; 5:FtoMohKsb7SlT4zQ1t5kmdjOzCsLdwX8I6idGf8BskN7GFlKUZplSb2ELYE5f+ZIthHLITx2SYtYezx5yn1OoUIzVB2bViyG/Qdn9vgiG5CvfJ0SIuVyfTstQ8lreT/l7kd8N1eR+whVeCciVrgQnk4nG94MlUrSvUwcRGQ2vuU=; 24:lX7U6cIoeWWCk/E81HAtGs6junlYPc7u5CoYVVHbu51XwQ/LkjWEhlBN6G9yc5ptNqSf2zTydxsKD9RkbMaymKzLN61Q9E7bkUrX3YruGDM=; 7:F2orNXqb8IhJYrEgRwtDHOh2j9W15+n51aAc50Zk28wSytvVgFgeFI7WgH74zf8Dr+cUzoJcFDNlCD67tkp99mVMVmnW/i3NK7oQHk2sBlHp5prUd6Bqx3pumUXJBZrK/0AY8vktXo+Edo0Ggn6szEns1NwZEiE+Q8r0QO/RO2rQVlovpHAwKd1CHqccPB4n78mlo2AD85S/vL4ttDxRIF9vxLdiSwBuvVmB3uJoHr7RbBXTGU4urXAT6EO8w7r1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2017 09:21:44.7812 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8168f78f-5212-426a-e66e-08d5370a9c38 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0502MB3655 Subject: [dpdk-dev] [PATCH] net/mlx4: revert workaround for broken Verbs 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This workaround was needed to properly handle device removal with old Mellanox OFED releases that are not supported by this PMD anymore. Starting from rdma-core v16 this removal issue shouldn't happen when setting MLX4_DEVICE_FATAL_CLEANUP environment variable to 1. Set the aforementioned variable to 1. Reverts: 5f4677c ("net/mlx4: workaround verbs error after plug-out") Signed-off-by: Matan Azrad Acked-by: Adrien Mazarguil --- config/common_base | 1 - doc/guides/nics/mlx4.rst | 8 -------- drivers/net/mlx4/Makefile | 4 ---- drivers/net/mlx4/mlx4.c | 6 ++++++ drivers/net/mlx4/mlx4_utils.h | 6 ------ 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/config/common_base b/config/common_base index e74febe..b8ee8f9 100644 --- a/config/common_base +++ b/config/common_base @@ -230,7 +230,6 @@ CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y # CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_MLX4_DEBUG=n -CONFIG_RTE_LIBRTE_MLX4_DEBUG_BROKEN_VERBS=n CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE=8 # diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 22341b9..cab45df 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -92,14 +92,6 @@ These options can be modified in the ``.config`` file. adds additional run-time checks and debugging messages at the cost of lower performance. -- ``CONFIG_RTE_LIBRTE_MLX4_DEBUG_BROKEN_VERBS`` (default **n**) - - Mellanox OFED versions earlier than 4.2 may return false errors from - Verbs object destruction APIs after the device is plugged out. - Enabling this option replaces assertion checks that cause the program - to abort with harmless debugging messages as a workaround. - Relevant only when CONFIG_RTE_LIBRTE_MLX4_DEBUG is enabled. - - ``CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE`` (default **8**) Maximum number of cached memory pools (MPs) per TX queue. Each MP from diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index f1f47c2..1f95e0d 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -82,10 +82,6 @@ ifdef CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE CFLAGS += -DMLX4_PMD_TX_MP_CACHE=$(CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE) endif -ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG_BROKEN_VERBS),y) -CFLAGS += -DMLX4_PMD_DEBUG_BROKEN_VERBS -endif - include $(RTE_SDK)/mk/rte.lib.mk # Generate and clean-up mlx4_autoconf.h. diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index f9e4f9d..97dac64 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -708,6 +708,12 @@ struct mlx4_conf { rte_mlx4_pmd_init(void) { /* + * MLX4_DEVICE_FATAL_CLEANUP tells ibv_destroy functions we + * want to get success errno value in case of calling them + * when the device was removed. + */ + setenv("MLX4_DEVICE_FATAL_CLEANUP", "1", 1); + /* * RDMAV_HUGEPAGES_SAFE tells ibv_fork_init() we intend to use * huge pages. Calling ibv_fork_init() during init allows * applications to use fork() safely for purposes other than diff --git a/drivers/net/mlx4/mlx4_utils.h b/drivers/net/mlx4/mlx4_utils.h index dc529c9..4f11405 100644 --- a/drivers/net/mlx4/mlx4_utils.h +++ b/drivers/net/mlx4/mlx4_utils.h @@ -70,13 +70,7 @@ __func__, \ RTE_FMT_TAIL(__VA_ARGS__,))) #define DEBUG(...) PMD_DRV_LOG(DEBUG, __VA_ARGS__) -#ifndef MLX4_PMD_DEBUG_BROKEN_VERBS #define claim_zero(...) assert((__VA_ARGS__) == 0) -#else /* MLX4_PMD_DEBUG_BROKEN_VERBS */ -#define claim_zero(...) \ - (void)(((__VA_ARGS__) == 0) || \ - DEBUG("Assertion `(" # __VA_ARGS__ ") == 0' failed (IGNORED).")) -#endif /* MLX4_PMD_DEBUG_BROKEN_VERBS */ #else /* NDEBUG */