sync to upstream 01b6b9315f15 ("Merge branch net-ti-ethernet-warnings")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Author: kuba-moo

Documentation/netlink/specs/mptcp_pm.yaml

@@ -109,7 +109,6 @@ attribute-sets:
       -
         name: port
         type: u16
-        byte-order: big-endian
       -
         name: flags
         type: u32

Documentation/netlink/specs/netdev.yaml

@@ -167,6 +167,10 @@ attribute-sets:
           "re-attached", they are just waiting to disappear.
           Attribute is absent if Page Pool has not been detached, and
           can still be used to allocate new memory.
+      -
+        name: dmabuf
+        doc: ID of the dmabuf this page-pool is attached to.
+        type: u32
   -
     name: page-pool-info
     subset-of: page-pool
@@ -268,6 +272,10 @@ attribute-sets:
         name: napi-id
         doc: ID of the NAPI instance which services this queue.
         type: u32
+      -
+        name: dmabuf
+        doc: ID of the dmabuf attached to this queue, if any.
+        type: u32
 
   -
     name: qstats
@@ -457,6 +465,39 @@ attribute-sets:
           Number of times driver re-started accepting send
           requests to this queue from the stack.
         type: uint
+  -
+    name: queue-id
+    subset-of: queue
+    attributes:
+      -
+        name: id
+      -
+        name: type
+  -
+    name: dmabuf
+    attributes:
+      -
+        name: ifindex
+        doc: netdev ifindex to bind the dmabuf to.
+        type: u32
+        checks:
+          min: 1
+      -
+        name: queues
+        doc: receive queues to bind the dmabuf to.
+        type: nest
+        nested-attributes: queue-id
+        multi-attr: true
+      -
+        name: fd
+        doc: dmabuf file descriptor to bind.
+        type: u32
+      -
+        name: id
+        doc: id of the dmabuf binding
+        type: u32
+        checks:
+          min: 1
 
 operations:
   list:
@@ -510,6 +551,7 @@ operations:
             - inflight
             - inflight-mem
             - detach-time
+            - dmabuf
       dump:
         reply: *pp-reply
       config-cond: page-pool
@@ -574,6 +616,7 @@ operations:
             - type
             - napi-id
             - ifindex
+            - dmabuf
       dump:
         request:
           attributes:
@@ -619,6 +662,24 @@ operations:
             - rx-bytes
             - tx-packets
             - tx-bytes
+    -
+      name: bind-rx
+      doc: Bind dmabuf to netdev
+      attribute-set: dmabuf
+      flags: [ admin-perm ]
+      do:
+        request:
+          attributes:
+            - ifindex
+            - fd
+            - queues
+        reply:
+          attributes:
+            - id
+
+kernel-family:
+  headers: [ "linux/list.h"]
+  sock-priv: struct list_head
 
 mcast-groups:
   list:

Documentation/netlink/specs/rt_link.yaml

@@ -1137,6 +1137,10 @@ attribute-sets:
         name: dpll-pin
         type: nest
         nested-attributes: link-dpll-pin-attrs
+      -
+        name: max-pacing-offload-horizon
+        type: uint
+        doc: EDT offload horizon supported by the device (in nsec).
   -
     name: af-spec-attrs
     attributes:

generated/mptcp_pm-user.hpp

@@ -34,7 +34,7 @@ struct mptcp_pm_address {
 	std::optional<__u8> id;
 	std::optional<__u32> addr4 /* big-endian */;
 	std::vector<__u8> addr6;
-	std::optional<__u16> port /* big-endian */;
+	std::optional<__u16> port;
 	std::optional<__u32> flags;
 	std::optional<__s32> if_idx;
 };

generated/netdev-user.cpp

@@ -14,8 +14,8 @@
 namespace ynl_cpp {
 
 /* Enums */
-static constexpr std::array<std::string_view, NETDEV_CMD_QSTATS_GET + 1> netdev_op_strmap = []() {
-	std::array<std::string_view, NETDEV_CMD_QSTATS_GET + 1> arr{};
+static constexpr std::array<std::string_view, NETDEV_CMD_BIND_RX + 1> netdev_op_strmap = []() {
+	std::array<std::string_view, NETDEV_CMD_BIND_RX + 1> arr{};
 	arr[NETDEV_CMD_DEV_GET] = "dev-get";
 	arr[NETDEV_CMD_DEV_ADD_NTF] = "dev-add-ntf";
 	arr[NETDEV_CMD_DEV_DEL_NTF] = "dev-del-ntf";
@@ -28,6 +28,7 @@ static constexpr std::array<std::string_view, NETDEV_CMD_QSTATS_GET + 1> netdev_
 	arr[NETDEV_CMD_QUEUE_GET] = "queue-get";
 	arr[NETDEV_CMD_NAPI_GET] = "napi-get";
 	arr[NETDEV_CMD_QSTATS_GET] = "qstats-get";
+	arr[NETDEV_CMD_BIND_RX] = "bind-rx";
 	return arr;
 } ();
 
@@ -130,6 +131,18 @@ struct ynl_policy_nest netdev_page_pool_info_nest = {
 	.table = netdev_page_pool_info_policy.data(),
 };
 
+static std::array<ynl_policy_attr,NETDEV_A_QUEUE_MAX + 1> netdev_queue_id_policy = []() {
+	std::array<ynl_policy_attr,NETDEV_A_QUEUE_MAX + 1> arr{};
+	arr[NETDEV_A_QUEUE_ID] = { .name = "id", .type = YNL_PT_U32, };
+	arr[NETDEV_A_QUEUE_TYPE] = { .name = "type", .type = YNL_PT_U32, };
+	return arr;
+} ();
+
+struct ynl_policy_nest netdev_queue_id_nest = {
+	.max_attr = NETDEV_A_QUEUE_MAX,
+	.table = netdev_queue_id_policy.data(),
+};
+
 static std::array<ynl_policy_attr,NETDEV_A_DEV_MAX + 1> netdev_dev_policy = []() {
 	std::array<ynl_policy_attr,NETDEV_A_DEV_MAX + 1> arr{};
 	arr[NETDEV_A_DEV_IFINDEX] = { .name = "ifindex", .type = YNL_PT_U32, };
@@ -154,6 +167,7 @@ static std::array<ynl_policy_attr,NETDEV_A_PAGE_POOL_MAX + 1> netdev_page_pool_p
 	arr[NETDEV_A_PAGE_POOL_INFLIGHT] = { .name = "inflight", .type = YNL_PT_UINT, };
 	arr[NETDEV_A_PAGE_POOL_INFLIGHT_MEM] = { .name = "inflight-mem", .type = YNL_PT_UINT, };
 	arr[NETDEV_A_PAGE_POOL_DETACH_TIME] = { .name = "detach-time", .type = YNL_PT_UINT, };
+	arr[NETDEV_A_PAGE_POOL_DMABUF] = { .name = "dmabuf", .type = YNL_PT_U32, };
 	return arr;
 } ();
 
@@ -190,6 +204,7 @@ static std::array<ynl_policy_attr,NETDEV_A_QUEUE_MAX + 1> netdev_queue_policy =
 	arr[NETDEV_A_QUEUE_IFINDEX] = { .name = "ifindex", .type = YNL_PT_U32, };
 	arr[NETDEV_A_QUEUE_TYPE] = { .name = "type", .type = YNL_PT_U32, };
 	arr[NETDEV_A_QUEUE_NAPI_ID] = { .name = "napi-id", .type = YNL_PT_U32, };
+	arr[NETDEV_A_QUEUE_DMABUF] = { .name = "dmabuf", .type = YNL_PT_U32, };
 	return arr;
 } ();
 
@@ -253,6 +268,20 @@ struct ynl_policy_nest netdev_qstats_nest = {
 	.table = netdev_qstats_policy.data(),
 };
 
+static std::array<ynl_policy_attr,NETDEV_A_DMABUF_MAX + 1> netdev_dmabuf_policy = []() {
+	std::array<ynl_policy_attr,NETDEV_A_DMABUF_MAX + 1> arr{};
+	arr[NETDEV_A_DMABUF_IFINDEX] = { .name = "ifindex", .type = YNL_PT_U32, };
+	arr[NETDEV_A_DMABUF_QUEUES] = { .name = "queues", .type = YNL_PT_NEST, .nest = &netdev_queue_id_nest, };
+	arr[NETDEV_A_DMABUF_FD] = { .name = "fd", .type = YNL_PT_U32, };
+	arr[NETDEV_A_DMABUF_ID] = { .name = "id", .type = YNL_PT_U32, };
+	return arr;
+} ();
+
+struct ynl_policy_nest netdev_dmabuf_nest = {
+	.max_attr = NETDEV_A_DMABUF_MAX,
+	.table = netdev_dmabuf_policy.data(),
+};
+
 /* Common nested types */
 int netdev_page_pool_info_put(struct nlmsghdr *nlh, unsigned int attr_type,
 			      const netdev_page_pool_info&  obj)
@@ -292,6 +321,21 @@ int netdev_page_pool_info_parse(struct ynl_parse_arg *yarg,
 	return 0;
 }
 
+int netdev_queue_id_put(struct nlmsghdr *nlh, unsigned int attr_type,
+			const netdev_queue_id&  obj)
+{
+	struct nlattr *nest;
+
+	nest = ynl_attr_nest_start(nlh, attr_type);
+	if (obj.id.has_value())
+		ynl_attr_put_u32(nlh, NETDEV_A_QUEUE_ID, obj.id.value());
+	if (obj.type.has_value())
+		ynl_attr_put_u32(nlh, NETDEV_A_QUEUE_TYPE, obj.type.value());
+	ynl_attr_nest_end(nlh, nest);
+
+	return 0;
+}
+
 /* ============== NETDEV_CMD_DEV_GET ============== */
 /* NETDEV_CMD_DEV_GET - do */
 int netdev_dev_get_rsp_parse(const struct nlmsghdr *nlh,
@@ -421,6 +465,10 @@ int netdev_page_pool_get_rsp_parse(const struct nlmsghdr *nlh,
 			if (ynl_attr_validate(yarg, attr))
 				return YNL_PARSE_CB_ERROR;
 			dst->detach_time = (__u64)ynl_attr_get_uint(attr);
+		} else if (type == NETDEV_A_PAGE_POOL_DMABUF) {
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+			dst->dmabuf = (__u32)ynl_attr_get_u32(attr);
 		}
 	}
 
@@ -635,6 +683,10 @@ int netdev_queue_get_rsp_parse(const struct nlmsghdr *nlh,
 			if (ynl_attr_validate(yarg, attr))
 				return YNL_PARSE_CB_ERROR;
 			dst->ifindex = (__u32)ynl_attr_get_u32(attr);
+		} else if (type == NETDEV_A_QUEUE_DMABUF) {
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+			dst->dmabuf = (__u32)ynl_attr_get_u32(attr);
 		}
 	}
 
@@ -870,6 +922,60 @@ netdev_qstats_get_dump(ynl_cpp::ynl_socket&  ys,
 	return ret;
 }
 
+/* ============== NETDEV_CMD_BIND_RX ============== */
+/* NETDEV_CMD_BIND_RX - do */
+int netdev_bind_rx_rsp_parse(const struct nlmsghdr *nlh,
+			     struct ynl_parse_arg *yarg)
+{
+	const struct nlattr *attr;
+	netdev_bind_rx_rsp *dst;
+
+	dst = (netdev_bind_rx_rsp*)yarg->data;
+
+	ynl_attr_for_each(attr, nlh, yarg->ys->family->hdr_len) {
+		unsigned int type = ynl_attr_type(attr);
+
+		if (type == NETDEV_A_DMABUF_ID) {
+			if (ynl_attr_validate(yarg, attr))
+				return YNL_PARSE_CB_ERROR;
+			dst->id = (__u32)ynl_attr_get_u32(attr);
+		}
+	}
+
+	return YNL_PARSE_CB_OK;
+}
+
+std::unique_ptr<netdev_bind_rx_rsp>
+netdev_bind_rx(ynl_cpp::ynl_socket&  ys, netdev_bind_rx_req& req)
+{
+	struct ynl_req_state yrs = { .yarg = { .ys = ys, }, };
+	std::unique_ptr<netdev_bind_rx_rsp> rsp;
+	struct nlmsghdr *nlh;
+	int err;
+
+	nlh = ynl_gemsg_start_req(ys, ((struct ynl_sock*)ys)->family_id, NETDEV_CMD_BIND_RX, 1);
+	((struct ynl_sock*)ys)->req_policy = &netdev_dmabuf_nest;
+	yrs.yarg.rsp_policy = &netdev_dmabuf_nest;
+
+	if (req.ifindex.has_value())
+		ynl_attr_put_u32(nlh, NETDEV_A_DMABUF_IFINDEX, req.ifindex.value());
+	if (req.fd.has_value())
+		ynl_attr_put_u32(nlh, NETDEV_A_DMABUF_FD, req.fd.value());
+	for (unsigned int i = 0; i < req.queues.size(); i++)
+		netdev_queue_id_put(nlh, NETDEV_A_DMABUF_QUEUES, req.queues[i]);
+
+	rsp.reset(new netdev_bind_rx_rsp());
+	yrs.yarg.data = rsp.get();
+	yrs.cb = netdev_bind_rx_rsp_parse;
+	yrs.rsp_cmd = NETDEV_CMD_BIND_RX;
+
+	err = ynl_exec(ys, nlh, &yrs);
+	if (err < 0)
+		return nullptr;
+
+	return rsp;
+}
+
 static constexpr std::array<ynl_ntf_info, NETDEV_CMD_PAGE_POOL_CHANGE_NTF + 1> netdev_ntf_info = []() {
 	std::array<ynl_ntf_info, NETDEV_CMD_PAGE_POOL_CHANGE_NTF + 1> arr{};
 	arr[NETDEV_CMD_DEV_ADD_NTF] =  {

generated/netdev-user.hpp

@@ -38,6 +38,11 @@ struct netdev_page_pool_info {
 	std::optional<__u32> ifindex;
 };
 
+struct netdev_queue_id {
+	std::optional<__u32> id;
+	std::optional<netdev_queue_type> type;
+};
+
 /* ============== NETDEV_CMD_DEV_GET ============== */
 /* NETDEV_CMD_DEV_GET - do */
 struct netdev_dev_get_req {
@@ -83,6 +88,7 @@ struct netdev_page_pool_get_rsp {
 	std::optional<__u64> inflight;
 	std::optional<__u64> inflight_mem;
 	std::optional<__u64> detach_time;
+	std::optional<__u32> dmabuf;
 };
 
 /*
@@ -154,6 +160,7 @@ struct netdev_queue_get_rsp {
 	std::optional<netdev_queue_type> type;
 	std::optional<__u32> napi_id;
 	std::optional<__u32> ifindex;
+	std::optional<__u32> dmabuf;
 };
 
 /*
@@ -230,5 +237,23 @@ std::unique_ptr<netdev_qstats_get_rsp_list>
 netdev_qstats_get_dump(ynl_cpp::ynl_socket&  ys,
 		       netdev_qstats_get_req_dump& req);
 
+/* ============== NETDEV_CMD_BIND_RX ============== */
+/* NETDEV_CMD_BIND_RX - do */
+struct netdev_bind_rx_req {
+	std::optional<__u32> ifindex;
+	std::optional<__u32> fd;
+	std::vector<netdev_queue_id> queues;
+};
+
+struct netdev_bind_rx_rsp {
+	std::optional<__u32> id;
+};
+
+/*
+ * Bind dmabuf to netdev
+ */
+std::unique_ptr<netdev_bind_rx_rsp>
+netdev_bind_rx(ynl_cpp::ynl_socket&  ys, netdev_bind_rx_req& req);
+
 } //namespace ynl_cpp
 #endif /* _LINUX_NETDEV_GEN_H */