From patchwork Tue Jun 30 09:27:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 5971 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 CA3EAC422; Tue, 30 Jun 2015 11:28:38 +0200 (CEST) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by dpdk.org (Postfix) with ESMTP id 045C2C43E for ; Tue, 30 Jun 2015 11:28:28 +0200 (CEST) Received: by wicgi11 with SMTP id gi11so10685620wic.0 for ; Tue, 30 Jun 2015 02:28:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2m8ggPkvhmkDWPHLj7qTdJjaYXk+Vr1x1YCeFiJm93g=; b=daOUFtxWvfLLry+CWx6avqcr6ZmtZwJGr5M/i3fOjKwAJTeOSQbxUuzblAZA16MfCY gP3cgs1tlXdSipM4I7DDffEdt5nd3+usp1SMgDvjdYNDXf2ml6bq+OnC2aJqphyO39rV 5zOYwjnV+rfluPI+P02vefI63o8wEW8l/c6ar7oEnfS7XXxux3Yq5nC5gnUbHOBhejiS hITnH05Z/00Ub7Ff9tzyiWbPAhUKZjlJVy+PUALluO1+nPw6h93pX8P+DrpzeXkw8ux3 T4WBf2ZT29r4D+NVIfPU29szVdTznS3jxYP/qew26XfyXr+ESuMMtiqur1+hhdspWlS7 9PYg== X-Gm-Message-State: ALoCoQm9xDYSmvplq1mjvkvrxjKAVjmpO1TZvYJphBP4iGxlDU2k4Z3SGt84bNrpaUsBeK7lO+CJ X-Received: by 10.194.59.98 with SMTP id y2mr37767223wjq.42.1435656508860; Tue, 30 Jun 2015 02:28:28 -0700 (PDT) Received: from 6wind.com (6wind.net2.nerim.net. [213.41.151.210]) by mx.google.com with ESMTPSA id q4sm67979640wja.24.2015.06.30.02.28.27 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 30 Jun 2015 02:28:28 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 30 Jun 2015 11:27:49 +0200 Message-Id: <1435656489-27986-4-git-send-email-adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435656489-27986-1-git-send-email-adrien.mazarguil@6wind.com> References: <1433546120-2254-1-git-send-email-adrien.mazarguil@6wind.com> <1435656489-27986-1-git-send-email-adrien.mazarguil@6wind.com> Subject: [dpdk-dev] [PATCH v2 03/23] mlx4: make sure experimental device query function is implemented X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Olga Shern HAVE_EXP_QUERY_DEVICE is used to check whether ibv_exp_query_device() can be used. RSS and inline receive features depend on it. Signed-off-by: Olga Shern Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/Makefile | 4 ++++ drivers/net/mlx4/mlx4.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index 97b364a..ce1f2b0 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -112,6 +112,10 @@ mlx4_autoconf.h: $(RTE_SDK)/scripts/auto-config-h.sh SEND_RAW_WR_SUPPORT \ infiniband/verbs.h \ type 'struct ibv_send_wr_raw' $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_EXP_QUERY_DEVICE \ + infiniband/verbs.h \ + type 'struct ibv_exp_device_attr' $(AUTOCONF_OUTPUT) mlx4.o: mlx4_autoconf.h diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index ad37e01..bd20569 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -4458,17 +4458,18 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) struct ibv_pd *pd = NULL; struct priv *priv = NULL; struct rte_eth_dev *eth_dev; -#if defined(INLINE_RECV) || defined(RSS_SUPPORT) +#ifdef HAVE_EXP_QUERY_DEVICE struct ibv_exp_device_attr exp_device_attr; -#endif +#endif /* HAVE_EXP_QUERY_DEVICE */ struct ether_addr mac; union ibv_gid temp_gid; +#ifdef HAVE_EXP_QUERY_DEVICE + exp_device_attr.comp_mask = IBV_EXP_DEVICE_ATTR_EXP_CAP_FLAGS; #ifdef RSS_SUPPORT - exp_device_attr.comp_mask = - (IBV_EXP_DEVICE_ATTR_EXP_CAP_FLAGS | - IBV_EXP_DEVICE_ATTR_RSS_TBL_SZ); + exp_device_attr.comp_mask |= IBV_EXP_DEVICE_ATTR_RSS_TBL_SZ; #endif /* RSS_SUPPORT */ +#endif /* HAVE_EXP_QUERY_DEVICE */ DEBUG("using port %u (%08" PRIx32 ")", port, test); @@ -4513,11 +4514,12 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) priv->port = port; priv->pd = pd; priv->mtu = ETHER_MTU; -#ifdef RSS_SUPPORT +#ifdef HAVE_EXP_QUERY_DEVICE if (ibv_exp_query_device(ctx, &exp_device_attr)) { - INFO("experimental ibv_exp_query_device"); + ERROR("ibv_exp_query_device() failed"); goto port_error; } +#ifdef RSS_SUPPORT if ((exp_device_attr.exp_device_cap_flags & IBV_EXP_DEVICE_QPG) && (exp_device_attr.exp_device_cap_flags & @@ -4569,6 +4571,7 @@ mlx4_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) priv->inl_recv_size); } #endif /* INLINE_RECV */ +#endif /* HAVE_EXP_QUERY_DEVICE */ (void)mlx4_getenv_int; priv->vf = vf;