From patchwork Tue Jan 22 18:31:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 1029441 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="0Mi7H4hC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43kcT720B4z9s3q for ; Wed, 23 Jan 2019 05:31:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726815AbfAVSby (ORCPT ); Tue, 22 Jan 2019 13:31:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:54710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726857AbfAVSbv (ORCPT ); Tue, 22 Jan 2019 13:31:51 -0500 Received: from localhost (unknown [77.138.135.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BFEE221726; Tue, 22 Jan 2019 18:31:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548181910; bh=jJn5JiR/ACzUlTG2S+wHZN89Tt6dHyKZmwHMmk1KP2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0Mi7H4hC6J4oztfLGfreokV/RIDJWOIvoS2mTzHi4Mi3doNOVCG9BqcCDUbHdFn5J YGVtHVQ6TgufnpaJoDop8rwmXKxajV2jaWK22rEK64KUwstz+eirAVUwFPjTXPJui2 hjLfsvtm2c0cOuLpaNottbp+59+qOaNK+s6k/yyU= From: Leon Romanovsky To: David Ahern Cc: Leon Romanovsky , netdev , RDMA mailing list , Stephen Hemminger Subject: [PATCH iproute2-next 06/19] rdma: Refactor out resource MR logic to separate file Date: Tue, 22 Jan 2019 20:31:12 +0200 Message-Id: <20190122183125.15920-7-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190122183125.15920-1-leon@kernel.org> References: <20190122183125.15920-1-leon@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky Logically separate resource MR logic to separate file, in order to make MR specific logic self-contained. Signed-off-by: Leon Romanovsky --- rdma/Makefile | 2 +- rdma/res-mr.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++ rdma/res.c | 122 -------------------------------------------------- rdma/res.h | 14 ++++++ 4 files changed, 132 insertions(+), 123 deletions(-) create mode 100644 rdma/res-mr.c diff --git a/rdma/Makefile b/rdma/Makefile index 9c2fb203..0b4e1eef 100644 --- a/rdma/Makefile +++ b/rdma/Makefile @@ -6,7 +6,7 @@ TARGETS := ifeq ($(HAVE_MNL),y) CFLAGS += -I./include/uapi/ -RDMA_OBJ = rdma.o utils.o dev.o link.o res.o res-pd.o +RDMA_OBJ = rdma.o utils.o dev.o link.o res.o res-pd.o res-mr.o TARGETS += rdma endif diff --git a/rdma/res-mr.c b/rdma/res-mr.c new file mode 100644 index 00000000..dae5def2 --- /dev/null +++ b/rdma/res-mr.c @@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB +/* + * res-mr.c RDMA tool + * Authors: Leon Romanovsky + */ + +#include "res.h" +#include + +int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data) +{ + struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {}; + struct nlattr *nla_table, *nla_entry; + struct rd *rd = data; + const char *name; + uint32_t idx; + + mnl_attr_parse(nlh, 0, rd_attr_cb, tb); + if (!tb[RDMA_NLDEV_ATTR_DEV_INDEX] || !tb[RDMA_NLDEV_ATTR_DEV_NAME] || + !tb[RDMA_NLDEV_ATTR_RES_MR]) + return MNL_CB_ERROR; + + name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]); + idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]); + nla_table = tb[RDMA_NLDEV_ATTR_RES_MR]; + + mnl_attr_for_each_nested(nla_entry, nla_table) { + struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {}; + uint32_t rkey = 0, lkey = 0; + uint64_t iova = 0, mrlen; + char *comm = NULL; + uint32_t pdn = 0; + uint32_t mrn = 0; + uint32_t pid = 0; + int err; + + err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line); + if (err != MNL_CB_OK) + return MNL_CB_ERROR; + + if (!nla_line[RDMA_NLDEV_ATTR_RES_MRLEN] || + (!nla_line[RDMA_NLDEV_ATTR_RES_PID] && + !nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])) { + return MNL_CB_ERROR; + } + + if (nla_line[RDMA_NLDEV_ATTR_RES_RKEY]) + rkey = mnl_attr_get_u32( + nla_line[RDMA_NLDEV_ATTR_RES_RKEY]); + if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY]) + lkey = mnl_attr_get_u32( + nla_line[RDMA_NLDEV_ATTR_RES_LKEY]); + if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA]) + iova = mnl_attr_get_u64( + nla_line[RDMA_NLDEV_ATTR_RES_IOVA]); + + mrlen = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_MRLEN]); + if (rd_check_is_filtered(rd, "mrlen", mrlen)) + continue; + + if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) { + pid = mnl_attr_get_u32( + nla_line[RDMA_NLDEV_ATTR_RES_PID]); + comm = get_task_name(pid); + } + + if (rd_check_is_filtered(rd, "pid", pid)) { + free(comm); + continue; + } + + if (nla_line[RDMA_NLDEV_ATTR_RES_MRN]) + mrn = mnl_attr_get_u32( + nla_line[RDMA_NLDEV_ATTR_RES_MRN]); + if (rd_check_is_filtered(rd, "mrn", mrn)) + continue; + + if (nla_line[RDMA_NLDEV_ATTR_RES_PDN]) + pdn = mnl_attr_get_u32( + nla_line[RDMA_NLDEV_ATTR_RES_PDN]); + if (rd_check_is_filtered(rd, "pdn", pdn)) + continue; + + if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]) + /* discard const from mnl_attr_get_str */ + comm = (char *)mnl_attr_get_str( + nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]); + + if (rd->json_output) + jsonw_start_array(rd->jw); + + print_dev(rd, idx, name); + if (nla_line[RDMA_NLDEV_ATTR_RES_RKEY]) + print_key(rd, "rkey", rkey); + if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY]) + print_key(rd, "lkey", lkey); + if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA]) + print_key(rd, "iova", iova); + res_print_uint(rd, "mrlen", mrlen); + print_pid(rd, pid); + print_comm(rd, comm, nla_line); + + if (nla_line[RDMA_NLDEV_ATTR_RES_MRN]) + res_print_uint(rd, "mrn", mrn); + + if (nla_line[RDMA_NLDEV_ATTR_RES_PDN]) + res_print_uint(rd, "pdn", pdn); + + if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) + free(comm); + + print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); + newline(rd); + } + return MNL_CB_OK; +} + diff --git a/rdma/res.c b/rdma/res.c index 494a82e4..1de8c797 100644 --- a/rdma/res.c +++ b/rdma/res.c @@ -838,115 +838,6 @@ static int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data) return MNL_CB_OK; } -static int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data) -{ - struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {}; - struct nlattr *nla_table, *nla_entry; - struct rd *rd = data; - const char *name; - uint32_t idx; - - mnl_attr_parse(nlh, 0, rd_attr_cb, tb); - if (!tb[RDMA_NLDEV_ATTR_DEV_INDEX] || - !tb[RDMA_NLDEV_ATTR_DEV_NAME] || - !tb[RDMA_NLDEV_ATTR_RES_MR]) - return MNL_CB_ERROR; - - name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]); - idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]); - nla_table = tb[RDMA_NLDEV_ATTR_RES_MR]; - - mnl_attr_for_each_nested(nla_entry, nla_table) { - struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {}; - uint32_t rkey = 0, lkey = 0; - uint64_t iova = 0, mrlen; - char *comm = NULL; - uint32_t pdn = 0; - uint32_t mrn = 0; - uint32_t pid = 0; - int err; - - err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line); - if (err != MNL_CB_OK) - return MNL_CB_ERROR; - - if (!nla_line[RDMA_NLDEV_ATTR_RES_MRLEN] || - (!nla_line[RDMA_NLDEV_ATTR_RES_PID] && - !nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME])) { - return MNL_CB_ERROR; - } - - if (nla_line[RDMA_NLDEV_ATTR_RES_RKEY]) - rkey = mnl_attr_get_u32( - nla_line[RDMA_NLDEV_ATTR_RES_RKEY]); - if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY]) - lkey = mnl_attr_get_u32( - nla_line[RDMA_NLDEV_ATTR_RES_LKEY]); - if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA]) - iova = mnl_attr_get_u64( - nla_line[RDMA_NLDEV_ATTR_RES_IOVA]); - - mrlen = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_MRLEN]); - if (rd_check_is_filtered(rd, "mrlen", mrlen)) - continue; - - if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) { - pid = mnl_attr_get_u32( - nla_line[RDMA_NLDEV_ATTR_RES_PID]); - comm = get_task_name(pid); - } - - if (rd_check_is_filtered(rd, "pid", pid)) { - free(comm); - continue; - } - - if (nla_line[RDMA_NLDEV_ATTR_RES_MRN]) - mrn = mnl_attr_get_u32( - nla_line[RDMA_NLDEV_ATTR_RES_MRN]); - if (rd_check_is_filtered(rd, "mrn", mrn)) - continue; - - if (nla_line[RDMA_NLDEV_ATTR_RES_PDN]) - pdn = mnl_attr_get_u32( - nla_line[RDMA_NLDEV_ATTR_RES_PDN]); - if (rd_check_is_filtered(rd, "pdn", pdn)) - continue; - - if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]) - /* discard const from mnl_attr_get_str */ - comm = (char *)mnl_attr_get_str( - nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]); - - if (rd->json_output) - jsonw_start_array(rd->jw); - - print_dev(rd, idx, name); - if (nla_line[RDMA_NLDEV_ATTR_RES_RKEY]) - print_key(rd, "rkey", rkey); - if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY]) - print_key(rd, "lkey", lkey); - if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA]) - print_key(rd, "iova", iova); - res_print_uint(rd, "mrlen", mrlen); - print_pid(rd, pid); - print_comm(rd, comm, nla_line); - - if (nla_line[RDMA_NLDEV_ATTR_RES_MRN]) - res_print_uint(rd, "mrn", mrn); - - if (nla_line[RDMA_NLDEV_ATTR_RES_PDN]) - res_print_uint(rd, "pdn", pdn); - - if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) - free(comm); - - print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); - newline(rd); - } - return MNL_CB_OK; -} - RES_FUNC(res_no_args, RDMA_NLDEV_CMD_RES_GET, NULL, true); static const struct @@ -996,19 +887,6 @@ struct filters cq_valid_filters[MAX_NUMBER_OF_FILTERS] = { RES_FUNC(res_cq, RDMA_NLDEV_CMD_RES_CQ_GET, cq_valid_filters, true); -static const -struct filters mr_valid_filters[MAX_NUMBER_OF_FILTERS] = { - { .name = "dev", .is_number = false }, - { .name = "rkey", .is_number = true }, - { .name = "lkey", .is_number = true }, - { .name = "mrlen", .is_number = true }, - { .name = "pid", .is_number = true }, - { .name = "mrn", .is_number = true }, - { .name = "pdn", .is_number = true } -}; - -RES_FUNC(res_mr, RDMA_NLDEV_CMD_RES_MR_GET, mr_valid_filters, true); - static int res_show(struct rd *rd) { const struct rd_cmd cmds[] = { diff --git a/rdma/res.h b/rdma/res.h index dd01b803..e3619773 100644 --- a/rdma/res.h +++ b/rdma/res.h @@ -10,6 +10,7 @@ int _res_send_msg(struct rd *rd, uint32_t command, mnl_cb_t callback); int res_pd_parse_cb(const struct nlmsghdr *nlh, void *data); +int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data); #define RES_FUNC(name, command, valid_filters, strict_port) \ static inline int _##name(struct rd *rd)\ @@ -44,6 +45,19 @@ struct filters pd_valid_filters[MAX_NUMBER_OF_FILTERS] = { RES_FUNC(res_pd, RDMA_NLDEV_CMD_RES_PD_GET, pd_valid_filters, true); +static const +struct filters mr_valid_filters[MAX_NUMBER_OF_FILTERS] = { + { .name = "dev", .is_number = false }, + { .name = "rkey", .is_number = true }, + { .name = "lkey", .is_number = true }, + { .name = "mrlen", .is_number = true }, + { .name = "pid", .is_number = true }, + { .name = "mrn", .is_number = true }, + { .name = "pdn", .is_number = true } +}; + +RES_FUNC(res_mr, RDMA_NLDEV_CMD_RES_MR_GET, mr_valid_filters, true); + char *get_task_name(uint32_t pid); void print_dev(struct rd *rd, uint32_t idx, const char *name); void print_users(struct rd *rd, uint64_t val);