From patchwork Tue Aug 1 16:54:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 27339 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id B6C83A156; Tue, 1 Aug 2017 18:55:52 +0200 (CEST) Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 4156BA10C for ; Tue, 1 Aug 2017 18:55:24 +0200 (CEST) Received: by mail-wm0-f47.google.com with SMTP id m85so20344740wma.0 for ; Tue, 01 Aug 2017 09:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SePz+ZxgsvZxBUBwfc1sKQJiAXUpXQRvsG3O2hecCd0=; b=qk+o5r/9W7WqLKFYFB+XgNUJ+jPxYc8nZVfo4j7giDBziuE35X2ILLGOjGJgre6M4/ hVlqhDdIHisr7T/0BkKHUNaIVs0r29qiQKnNC4ZtiHSxOi+hKnKpWPZCHMzzEte6Euet K/2EBbYI14Ty/P61Igjic7YfgubiPLsHcxa61bgYIqcePUJqvHA7BjgotVvRkSexC4Ws zhS1xa2dgcYFZiOdf75qxyCkxzfThul5T8+s4MBMkjCuXict0djER+9XDnHNyRPzYzxv nQhuOdkR7dO8R0r162lMUZ/4cmVNVqPUh9cFXZD9IV6sc9TjPbGgHiYs1cM8tgMYoDq6 8JKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SePz+ZxgsvZxBUBwfc1sKQJiAXUpXQRvsG3O2hecCd0=; b=WGhZVFQPONs3nQSfVV2EOxGfWpt2KaGQ+JJHXA5YgnuRBY45cLQIuUFkzRSDrRZHyH cYFmxf271/x+Hra6ziTdaqZq8VjaXC0J8a37zv3ZjrNgsd05NAJmKSGHTgBO/m5gzRIG rkaO0bs0Bbu5DO1kW0DMCzvP9bwekCg07o1kwFWE/OZhpYN7ThupHwZcLu2dyIetoGuu o2a0QJcLG8lY0dfZjaJlK9+b7JA6u5g3EJwZXVl3J5qNSJkAw/jPZeyKw4w8LM5sCFLf aAKjoHlgCxNJrsMSXv2TIHKyInh8ghCRuma0q2GeRRjOJ55HlNxZZDHfxeltpw8oYBcE 29dQ== X-Gm-Message-State: AIVw110nQ828c0s04qNYPtPupH//Uiek/mdOMTXMLtbzutOHTVoGvTPK I9pahFY/b1+z/jSCnfs= X-Received: by 10.28.25.71 with SMTP id 68mr2037480wmz.76.1501606523522; Tue, 01 Aug 2017 09:55:23 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id y12sm51000988wrb.39.2017.08.01.09.55.22 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 01 Aug 2017 09:55:22 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Cc: Moti Haimovsky Date: Tue, 1 Aug 2017 18:54:10 +0200 Message-Id: <72ba98f16083077e9e377d50cfdc1002215b7cf3.1501598384.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 23/48] net/mlx4: revert multicast echo prevention 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 reverts commit 8b3ffe95e75d6d305992505005cbb95969874a15. Multicast loopback prevention is not part of the standard Verbs interface. Remove it temporarily. Signed-off-by: Moti Haimovsky Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/Makefile | 6 +----- drivers/net/mlx4/mlx4.c | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index 8406ba2..78ea350 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -87,11 +87,7 @@ mlx4_autoconf.h.new: FORCE mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q $(RM) -f -- '$@' - $Q sh -- '$<' '$@' \ - HAVE_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK \ - infiniband/verbs.h \ - enum IBV_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK \ - $(AUTOCONF_OUTPUT) + $Q : > '$@' # Create mlx4_autoconf.h or update it in case it differs from the new one. diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 144cfb0..ffad5a4 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -1266,13 +1266,6 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc, .intf_scope = IBV_EXP_INTF_GLOBAL, .intf = IBV_EXP_INTF_QP_BURST, .obj = tmpl.qp, -#ifdef HAVE_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK - /* MC loopback must be disabled when not using a VF. */ - .family_flags = - (!priv->vf ? - IBV_EXP_QP_BURST_CREATE_DISABLE_ETH_LOOPBACK : - 0), -#endif }; tmpl.if_qp = ibv_exp_query_intf(priv->ctx, &attr.params, &status); if (tmpl.if_qp == NULL) {