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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 0B06CC47254 for ; Tue, 5 May 2020 17:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D376A206CC for ; Tue, 5 May 2020 17:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588698310; bh=t/fDWEogthAmgEzIsZeMrFQCGdPf3CvEx7El5ySzB5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mmT2Y04lxod06v9MPfbr6U5Xamr2vVw/qhItz40Lc+3YbDqBlDeNW2Ox9B9rVG1MK c/ExXllUvZzoh/9hC0iqU90xIiZD9nSfjcgOzA2aDRjLTNbsNih8fY0/AJAIt2n2cY jVpCiE6ZNfUZ++4cTbacOp+Pbx8cJ0DDLZy3mgvk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730541AbgEERFJ (ORCPT ); Tue, 5 May 2020 13:05:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:43984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730342AbgEERFI (ORCPT ); Tue, 5 May 2020 13:05:08 -0400 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.1]) (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 D8F5B206B9; Tue, 5 May 2020 17:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588698308; bh=t/fDWEogthAmgEzIsZeMrFQCGdPf3CvEx7El5ySzB5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o4kjFfl1LaQoklFfO8Q+2tI3Q3bD5CvzjE9SJFBkFD4P4jhDmb8kAuZIysjBtSnkd v2D+e/5+GSMInT5CjkF+CsX76R04xkAAqQXu2j7q9aREsACpcrbUK2bsCLe5/MLbYg Kn4K4O1M3CKJn4d0F8WM0HYweiYk75mQEtk0UDEg= From: Jakub Kicinski To: dsahern@gmail.com Cc: stephen@networkplumber.org, jacob.e.keller@intel.com, jiri@resnulli.us, netdev@vger.kernel.org, kernel-team@fb.com, Jakub Kicinski Subject: [PATCH iproute2-next RESEND] devlink: support kernel-side snapshot id allocation Date: Tue, 5 May 2020 10:04:57 -0700 Message-Id: <20200505170457.1997205-1-kuba@kernel.org> X-Mailer: git-send-email 2.25.4 In-Reply-To: <76a99d9c-3574-1c8d-07cb-1f16e1bf9cca@gmail.com> References: <76a99d9c-3574-1c8d-07cb-1f16e1bf9cca@gmail.com> 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 Make ID argument optional and read the snapshot info that kernel sends us. $ devlink region new netdevsim/netdevsim1/dummy netdevsim/netdevsim1/dummy: snapshot 0 $ devlink -jp region new netdevsim/netdevsim1/dummy { "regions": { "netdevsim/netdevsim1/dummy": { "snapshot": [ 1 ] } } } $ devlink region show netdevsim/netdevsim1/dummy netdevsim/netdevsim1/dummy: size 32768 snapshot [0 1] Signed-off-by: Jakub Kicinski --- devlink/devlink.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index bd48a73bc0e4..507972c360a7 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -6476,6 +6476,23 @@ static int cmd_region_read(struct dl *dl) return err; } +static int cmd_region_snapshot_new_cb(const struct nlmsghdr *nlh, void *data) +{ + struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh); + struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {}; + struct dl *dl = data; + + mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb); + if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] || + !tb[DEVLINK_ATTR_REGION_NAME] || + !tb[DEVLINK_ATTR_REGION_SNAPSHOT_ID]) + return MNL_CB_ERROR; + + pr_out_region(dl, tb); + + return MNL_CB_OK; +} + static int cmd_region_snapshot_new(struct dl *dl) { struct nlmsghdr *nlh; @@ -6484,12 +6501,15 @@ static int cmd_region_snapshot_new(struct dl *dl) nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_REGION_NEW, NLM_F_REQUEST | NLM_F_ACK); - err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION | - DL_OPT_REGION_SNAPSHOT_ID, 0); + err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION, + DL_OPT_REGION_SNAPSHOT_ID); if (err) return err; - return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL); + pr_out_section_start(dl, "regions"); + err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_region_snapshot_new_cb, dl); + pr_out_section_end(dl); + return err; } static void cmd_region_help(void) -- 2.25.4