From patchwork Tue Jul 30 20:39:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Abeni X-Patchwork-Id: 13747882 X-Patchwork-Delegate: kuba@kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EAFB18DF8B for ; Tue, 30 Jul 2024 20:41:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722372115; cv=none; b=HIzEveZwikGmL2DB8BS7XfgVS0CSgn7Lr2psku+y+9U3obCiWF6CVQf+G3v+iw04j2dW0PDGTA71TGZuPC/BdcP14P3YNpA3dhWJSGkta3Vyth8F2ZIVl6GUtU+E5O3PW8RDKlLjT7Pogxqt3pyq/XetKcydwrst18VsI7lCueY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722372115; c=relaxed/simple; bh=AAhuE1tV6Bvxq5B4Q0HX9f3N3Rhx1Ca/gsjgpTnzeMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Au7MvotaCC3p86pYmwtQ61sBIqqLLrjf108qZhROgKHbnIhMH/5R9j5IpfqVrPEc4IA4QhyudzEos7pq0GmXDTTadZZAT5V4qsSDqFNinKLytI0Z/ir3fZdYKt3eF1y/VdX0Y3HnZg7SYeo6HvyfnIXEGe9P+kfR1Q0YN6a7x60= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FEE3bsNT; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FEE3bsNT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722372113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I9uoXNm8LEUVQGgTwT7fGYH1W2nXpZyxRFoc46gbJ+4=; b=FEE3bsNTD8UvlrlLLrwXj3KKWg4h2+8rqt/KIGPoL6dKXYjb/gMzbPqnFpAwYEYJeBqnfE aGM+xTCjWUYkYvKTud8O6q2LLxCz5PEPC2/cT+dbh7wgauxZJSitnhFfGlaH8vzq37daiZ Ll7E1rL8pNfgULifFyMRT55b79+tSdE= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-ng8WhPqcNzusqt3yQp_RZQ-1; Tue, 30 Jul 2024 16:41:44 -0400 X-MC-Unique: ng8WhPqcNzusqt3yQp_RZQ-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54198195608A; Tue, 30 Jul 2024 20:41:43 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.224.30]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 753393000192; Tue, 30 Jul 2024 20:41:39 +0000 (UTC) From: Paolo Abeni To: netdev@vger.kernel.org Cc: Jakub Kicinski , Jiri Pirko , Madhu Chittim , Sridhar Samudrala , Simon Horman , John Fastabend , Sunil Kovvuri Goutham , Jamal Hadi Salim Subject: [PATCH v3 07/12] net: shaper: implement introspection support Date: Tue, 30 Jul 2024 22:39:50 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Patchwork-Delegate: kuba@kernel.org The netlink op is a simple wrapper around the device callback. Extend the existing fetch_dev() helper adding an attribute argument for the requested device. Reuse such helper in the newly implemented operation. Signed-off-by: Paolo Abeni --- RFC v2 -> RFC v3: - dev_put() -> netdev_put() --- include/net/net_shaper.h | 11 ++++ net/shaper/shaper.c | 108 +++++++++++++++++++++++++++++++++++---- 2 files changed, 109 insertions(+), 10 deletions(-) diff --git a/include/net/net_shaper.h b/include/net/net_shaper.h index 8cd65d727e52..402f9d8476ee 100644 --- a/include/net/net_shaper.h +++ b/include/net/net_shaper.h @@ -103,6 +103,17 @@ struct net_shaper_ops { */ int (*delete)(struct net_device *dev, u32 handle, struct netlink_ext_ack *extack); + + /** + * @capabilities: get the shaper features supported by the NIC + * + * Fills the bitmask @cap with the supported cababilites for the + * specified @scope and device @dev. + * + * Returns 0 on success or a negative error value otherwise. + */ + int (*capabilities)(struct net_device *dev, + enum net_shaper_scope scope, unsigned long *cap); }; #define NET_SHAPER_SCOPE_SHIFT 26 diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c index 5363e10606e2..f9c53c8b7ce7 100644 --- a/net/shaper/shaper.c +++ b/net/shaper/shaper.c @@ -118,16 +118,17 @@ net_shaper_fill_one(struct sk_buff *msg, struct net_shaper_info *shaper, /* On success sets pdev to the relevant device and acquires a reference * to it */ -static int fetch_dev(const struct genl_info *info, struct net_device **pdev) +static int fetch_dev(const struct genl_info *info, int type, + struct net_device **pdev) { struct net *ns = genl_info_net(info); struct net_device *dev; int ifindex; - if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_IFINDEX)) + if (GENL_REQ_ATTR_CHECK(info, type)) return -EINVAL; - ifindex = nla_get_u32(info->attrs[NET_SHAPER_A_IFINDEX]); + ifindex = nla_get_u32(info->attrs[type]); dev = dev_get_by_index(ns, ifindex); if (!dev) { GENL_SET_ERR_MSG_FMT(info, "device %d not found", ifindex); @@ -425,7 +426,7 @@ int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info) u32 handle; int ret; - ret = fetch_dev(info, &dev); + ret = fetch_dev(info, NET_SHAPER_A_IFINDEX, &dev); if (ret) return ret; @@ -476,7 +477,7 @@ int net_shaper_nl_get_dumpit(struct sk_buff *skb, unsigned long handle; int ret; - ret = fetch_dev(info, &dev); + ret = fetch_dev(info, NET_SHAPER_A_IFINDEX, &dev); if (ret) return ret; @@ -543,7 +544,7 @@ int net_shaper_nl_set_doit(struct sk_buff *skb, struct genl_info *info) if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_SHAPER)) return -EINVAL; - ret = fetch_dev(info, &dev); + ret = fetch_dev(info, NET_SHAPER_A_IFINDEX, &dev); if (ret) return ret; @@ -617,7 +618,7 @@ int net_shaper_nl_delete_doit(struct sk_buff *skb, struct genl_info *info) if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_HANDLE)) return -EINVAL; - ret = fetch_dev(info, &dev); + ret = fetch_dev(info, NET_SHAPER_A_IFINDEX, &dev); if (ret) return ret; @@ -786,7 +787,7 @@ int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info) GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_OUTPUT)) return -EINVAL; - ret = fetch_dev(info, &dev); + ret = fetch_dev(info, NET_SHAPER_A_IFINDEX, &dev); if (ret) return ret; @@ -837,15 +838,102 @@ int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info) return ret; } -int net_shaper_nl_cap_get_doit(struct sk_buff *skb, struct genl_info *info) +static int +net_shaper_cap_fill_one(struct sk_buff *msg, unsigned long flags, + const struct genl_info *info) { + unsigned long cur; + void *hdr; + + hdr = genlmsg_iput(msg, info); + if (!hdr) + return -EMSGSIZE; + + for (cur = NET_SHAPER_A_CAPABILITIES_SUPPORT_METRIC_BPS; + cur <= NET_SHAPER_A_CAPABILITIES_MAX; ++cur) { + if (flags & BIT(cur) && nla_put_flag(msg, cur)) + goto nla_put_failure; + } + + genlmsg_end(msg, hdr); + return 0; + +nla_put_failure: + genlmsg_cancel(msg, hdr); + return -EMSGSIZE; +} + +int net_shaper_nl_cap_get_doit(struct sk_buff *skb, struct genl_info *info) +{ + const struct net_shaper_ops *ops; + enum net_shaper_scope scope; + struct net_device *dev; + struct sk_buff *msg; + unsigned long flags; + int ret; + + if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_CAPABILITIES_SCOPE)) + return -EINVAL; + + ret = fetch_dev(info, NET_SHAPER_A_CAPABILITIES_IFINDEX, &dev); + if (ret) + return ret; + + scope = nla_get_u32(info->attrs[NET_SHAPER_A_CAPABILITIES_SCOPE]); + ops = dev->netdev_ops->net_shaper_ops; + ret = ops->capabilities(dev, scope, &flags); + if (ret) + goto put; + + msg = genlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!msg) + goto put; + + ret = net_shaper_cap_fill_one(msg, flags, info); + if (ret) + goto free_msg; + + ret = genlmsg_reply(msg, info); + if (ret) + goto free_msg; + +put: + netdev_put(dev, NULL); + return ret; + +free_msg: + nlmsg_free(msg); + goto put; } int net_shaper_nl_cap_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb) { - return 0; + const struct genl_info *info = genl_info_dump(cb); + const struct net_shaper_ops *ops; + enum net_shaper_scope scope; + struct net_device *dev; + unsigned long flags; + int ret; + + ret = fetch_dev(info, NET_SHAPER_A_CAPABILITIES_IFINDEX, &dev); + if (ret) + return ret; + + ops = dev->netdev_ops->net_shaper_ops; + for (scope = 0; scope <= NET_SHAPER_SCOPE_MAX; ++scope) { + if (ops->capabilities(dev, scope, &flags)) + continue; + + ret = net_shaper_cap_fill_one(skb, flags, info); + if (ret) + goto put; + } + +put: + dev_put(dev); + return ret; } void dev_shaper_flush(struct net_device *dev)