From patchwork Mon Jun 20 16:10:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 14097 X-Patchwork-Delegate: bruce.richardson@intel.com 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 4AFAAADBD; Mon, 20 Jun 2016 18:11:46 +0200 (CEST) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id 48A99ADA5 for ; Mon, 20 Jun 2016 18:11:31 +0200 (CEST) Received: by mail-wm0-f49.google.com with SMTP id f126so75811122wma.1 for ; Mon, 20 Jun 2016 09:11:31 -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 :in-reply-to:references; bh=otQ1DzWtSLzlYHu9g7N+Fp/lZuSP/jWAMUVKLbmpBm4=; b=Vs+xrOXy8GCeqeO38zIFS9DN16bbHPvtasa4IwiaKQxIWMaU7DFcS7PkfhJ9xvtt8Q mZXAopefZo2AnywsQjLaHFMyVKjJelZCZe9p6cajZhevxiUTaibRp6TD+D/6hjM68O6P yRbnUUrzbRoh4ldUEY8Gk2AARWiJzrGXu7uUHCzm4wudx/9Zk+aMxlDPlXEIvHkCHkA9 ogftC1ADAXELMnNlmEzL2ARN4djHGL2TrPQEa41t39d3jJk3o2w5uEKgyTgGoS+y5LZC 0r9A68jFBA+V2uDr0bcldy0EXSQAIeYwnujH4Hzqh6rmKFdvbEIi8Ex8JlALx6O7+Bmv u+lw== 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:in-reply-to:references; bh=otQ1DzWtSLzlYHu9g7N+Fp/lZuSP/jWAMUVKLbmpBm4=; b=ktno2wxRUR7W1+35PqbH630QlYs/IUxEiGrCohqbGwYlkjdYmlSTNxp2U7bB6IjvEJ ry6R/IJBv0MgeaQLSnISuPfjp+bQOkUfTxHFYRH7rCoVdjV5t5aqf4AKZrYHnKMSmjZ+ JX+qalrRiZ1gmRUFqFilXZqko8w3LIsand28uJXYDtT/4KPliqlUnNwtPrQSgp+KH4OT UWvh16nX56Z+dPG+j3mYUq2Se+0ZsJ0vJHOZ+ql7XUKzcaDpjKNVg56f7rahdfjv3ooC QJkp3hwXvfAP9F7Zsyg+RzrP6HR7qJr2l5WTdek/MNh8n98/jQNoL3t+lrEjXKFZngK0 Re+g== X-Gm-Message-State: ALyK8tLmnQyQNiuZeAFxL6tTRs8T7O6y3mVUNrustQ6yJsenkNMKzjsTZKn0BV8ibLhnfuwu X-Received: by 10.194.115.130 with SMTP id jo2mr17192025wjb.82.1466439089513; Mon, 20 Jun 2016 09:11:29 -0700 (PDT) Received: from ping.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id f189sm4543977wmf.19.2016.06.20.09.11.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Jun 2016 09:11:29 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Ferruh Yigit , Adrien Mazarguil Date: Mon, 20 Jun 2016 18:10:23 +0200 Message-Id: <1466439037-14095-12-git-send-email-nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466439037-14095-1-git-send-email-nelio.laranjeiro@6wind.com> References: <1465379291-25310-1-git-send-email-nelio.laranjeiro@6wind.com> <1466439037-14095-1-git-send-email-nelio.laranjeiro@6wind.com> In-Reply-To: <1465379291-25310-1-git-send-email-nelio.laranjeiro@6wind.com> References: <1465379291-25310-1-git-send-email-nelio.laranjeiro@6wind.com> Subject: [dpdk-dev] [PATCH v2 11/25] mlx5: add support for configuration through kvargs 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" The intent is to replace the remaining compile-time options and environment variables with a common mean of runtime configuration. This commit only adds the kvargs handling code, subsequent commits will update the rest. Signed-off-by: Nelio Laranjeiro Signed-off-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 3f45d84..56b1dfc 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -37,6 +37,7 @@ #include #include #include +#include #include /* Verbs header. */ @@ -57,6 +58,7 @@ #include #include #include +#include #ifdef PEDANTIC #pragma GCC diagnostic error "-pedantic" #endif @@ -237,6 +239,70 @@ mlx5_dev_idx(struct rte_pci_addr *pci_addr) return ret; } +/** + * Verify and store value for device argument. + * + * @param[in] key + * Key argument to verify. + * @param[in] val + * Value associated with key. + * @param opaque + * User data. + * + * @return + * 0 on success, errno value on failure. + */ +static int +mlx5_args_check(const char *key, const char *val, void *opaque) +{ + struct priv *priv = opaque; + + /* No parameters are expected at the moment. */ + (void)priv; + (void)val; + WARN("%s: unknown parameter", key); + return EINVAL; +} + +/** + * Parse device parameters. + * + * @param priv + * Pointer to private structure. + * @param devargs + * Device arguments structure. + * + * @return + * 0 on success, errno value on failure. + */ +static int +mlx5_args(struct priv *priv, struct rte_devargs *devargs) +{ + static const char *params[] = { + NULL, + }; + struct rte_kvargs *kvlist; + int ret = 0; + int i; + + if (devargs == NULL) + return 0; + kvlist = rte_kvargs_parse(devargs->args, params); + if (kvlist == NULL) + return 0; + /* Process parameters. */ + for (i = 0; (i != RTE_DIM(params)); ++i) { + if (rte_kvargs_count(kvlist, params[i])) { + ret = rte_kvargs_process(kvlist, params[i], + mlx5_args_check, priv); + if (ret != 0) + return ret; + } + } + rte_kvargs_free(kvlist); + return 0; +} + static struct eth_driver mlx5_driver; /** @@ -408,6 +474,12 @@ mlx5_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) priv->port = port; priv->pd = pd; priv->mtu = ETHER_MTU; + err = mlx5_args(priv, pci_dev->devargs); + if (err) { + ERROR("failed to process device arguments: %s", + strerror(err)); + goto port_error; + } if (ibv_exp_query_device(ctx, &exp_device_attr)) { ERROR("ibv_exp_query_device() failed"); goto port_error;