From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AFDCC43381 for ; Sat, 23 Feb 2019 09:16:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D72BA206BA for ; Sat, 23 Feb 2019 09:16:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550913413; bh=Bj7nzfNLaebrVhYxFeiGuhNM0jMCwmqx6bD/ilHlAaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ncj602GRqndgc92UzdZi7Hszkm2xoJh9uq9olLLijHnyjVu+3hhfrokFw7z2cX9M0 CXvtsNqysNk7zbJVBiG6cfbcdKF3dnSvMVLo9bmYpm0DUY8AMsY4lNm5kSAf3erFEj 2dI0mRHiaBdG5PG2iQNb7/D3qwUL+zMX3+oPVAzc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727575AbfBWJQw (ORCPT ); Sat, 23 Feb 2019 04:16:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:54792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725859AbfBWJQw (ORCPT ); Sat, 23 Feb 2019 04:16:52 -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 EA810206BA; Sat, 23 Feb 2019 09:16:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550913410; bh=Bj7nzfNLaebrVhYxFeiGuhNM0jMCwmqx6bD/ilHlAaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YzOZVCNyeU7i6qVdtNcoHOsD2yHT/04NZftVATcNmUKCZ0lVjo/Bu+D5JadMIc6KQ xAf6Apd4rgR8KPiayN1FYKwi6SCvoLXIJeu8BFrC4WBCFgpiteCDZodmiDuUHaRyKG 3jnztmXCGJxoB4fMXgERVKM4JDNeWVWkN/cLVHqU= From: Leon Romanovsky To: David Ahern Cc: Leon Romanovsky , netdev , RDMA mailing list , Stephen Hemminger , Steve Wise Subject: [PATCH iproute2-next v2 14/19] rdma: Move MR code to be suitable for per-line parsing Date: Sat, 23 Feb 2019 11:15:23 +0200 Message-Id: <20190223091528.8509-15-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190223091528.8509-1-leon@kernel.org> References: <20190223091528.8509-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky Reviewed-by: Steve Wise Signed-off-by: Leon Romanovsky --- rdma/res-mr.c | 178 +++++++++++++++++++++++++------------------------- 1 file changed, 90 insertions(+), 88 deletions(-) diff --git a/rdma/res-mr.c b/rdma/res-mr.c index e373035a..36993b5e 100644 --- a/rdma/res-mr.c +++ b/rdma/res-mr.c @@ -7,11 +7,96 @@ #include "res.h" #include +static int res_mr_line(struct rd *rd, const char *name, int idx, + struct nlattr *nla_entry) +{ + 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)) + goto out; + + 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)) + goto out; + + 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)) + goto out; + + 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)) + goto out; + + 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); + res_print_uint(rd, "pid", 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); + + print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]); + newline(rd); + +out: + if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) + free(comm); + return MNL_CB_OK; +} 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; + int ret = MNL_CB_OK; const char *name; uint32_t idx; @@ -25,93 +110,10 @@ int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data) 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); - res_print_uint(rd, "pid", 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); + ret = res_mr_line(rd, name, idx, nla_entry); + + if (ret != MNL_CB_OK) + break; } - return MNL_CB_OK; + return ret; } - -- 2.19.1