From patchwork Fri Jun 24 08:50:47 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: 14323 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 56458C6CA; Fri, 24 Jun 2016 10:53:32 +0200 (CEST) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 2684CC6F6 for ; Fri, 24 Jun 2016 10:53:23 +0200 (CEST) Received: by mail-wm0-f43.google.com with SMTP id v199so13992268wmv.0 for ; Fri, 24 Jun 2016 01:53: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=jbinjXxwALby8qZuGzr+EnDxWyWRGC/qklIlZ4khrvA=; b=oJoKBhzIYIZ+hLkbIAVPl7nJw3S0Er05PqZSlepwNhbvd/HylmkrkbdKgcqBSlND/L vujuOzCTs96TjjsgVhq3A6Mb21pfeuQnE9Y+G+LFXAcBNjvqC9GOU4vzCiX/Ule1417P svExfRU9t3oI4OxqXl+D5gWjhYaujh3vcW/ILYL3QRlTX6yOuuGDiS46Ta0SpHnO3Gn2 0ie77TnZeicwGEpwfQVsXxKg7PAmQ9nC6WA9eVhYEvLpv4hFN6lJFl+A5lkkRXHmG+Uk YSpNqmfoWp+tCPxeucI47mkm9TAcgOsp1mdjLSIOEQa4uyxGp+ymBejOXlNLJg2LJ2+E 18uw== 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=jbinjXxwALby8qZuGzr+EnDxWyWRGC/qklIlZ4khrvA=; b=G4j9zTKZrEJgYwt0vaU33PZpD0XjlldrZgO+MG3wkrCzvuBM4QDmXfxU+KHZtSubgW 4Wjq5VYtGhx+otTmzyU/p7CA9hWXI5mtOE9cmoFI3US3DONNWpNPpPP86RpnCNSMjibt 519F/HhClnLU5dpauJ1OQ3nC1kcNNhLN9A1HJF3hBJ2lCJFhM5tNajO6dk4Frs5c7vSL AAs4Vix4u+XcjvSlLZKiZI1AlU13n3GexqCkZYeWGf9AN3zEmmltNw9PUHrYYWDTZXPD cBaueqrViDfTLOBsSQgGWZwbTEtGhPTrcWuEAu3TjhSyU4nruACdun0+T6x9PPLPxFpj gIoA== X-Gm-Message-State: ALyK8tKRLwS8M4liB5uSvvzicBXqEBnQwxh6HCw87eSE5rjZVylEc71du8tl+AHPHZEEnDSs X-Received: by 10.194.116.229 with SMTP id jz5mr2566678wjb.180.1466758402902; Fri, 24 Jun 2016 01:53:22 -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 t188sm2060584wma.8.2016.06.24.01.53.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Jun 2016 01:53:22 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Bruce Richardson , Ferruh Yigit , Adrien Mazarguil Date: Fri, 24 Jun 2016 10:50:47 +0200 Message-Id: <1466758261-25986-12-git-send-email-nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466758261-25986-1-git-send-email-nelio.laranjeiro@6wind.com> References: <1466700801-10383-1-git-send-email-nelio.laranjeiro@6wind.com> <1466758261-25986-1-git-send-email-nelio.laranjeiro@6wind.com> Subject: [dpdk-dev] [PATCH v6 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 | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 3f45d84..6027393 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,71 @@ 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, negative 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) +{ + const char **params = (const char *[]){ + NULL, + }; + struct rte_kvargs *kvlist; + int ret = 0; + int i; + + if (devargs == NULL) + return 0; + /* Following UGLY cast is done to pass checkpatch. */ + 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 +475,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;