Merge tag 'rdma-next-2017-08-10' of... (db14dff1) · Commits · git / linux-nf

drivers/infiniband/core/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,8 @@ ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \
		device.o fmr_pool.o cache.o netlink.o \
		roce_gid_mgmt.o mr_pool.o addr.o sa_query.o \
		multicast.o mad.o smi.o agent.o mad_rmpp.o \
		security.o
		security.o nldev.o

		ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o
		ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o umem_rbtree.o
		ib_core-$(CONFIG_CGROUP_RDMA) += cgroup.o

drivers/infiniband/core/addr.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -129,13 +129,11 @@ static void ib_nl_process_good_ip_rsep(const struct nlmsghdr *nlh)
		}

		int ib_nl_handle_ip_res_resp(struct sk_buff *skb,
		struct netlink_callback *cb)
		struct nlmsghdr *nlh,
		struct netlink_ext_ack *extack)
		{
		const struct nlmsghdr nlh = (struct nlmsghdr )cb->nlh;

		if ((nlh->nlmsg_flags & NLM_F_REQUEST) \|\|
		!(NETLINK_CB(skb).sk) \|\|
		!netlink_capable(skb, CAP_NET_ADMIN))
		!(NETLINK_CB(skb).sk))
		return -EPERM;

		if (ib_nl_is_good_ip_resp(nlh))
		@@ -185,7 +183,7 @@ static int ib_nl_ip_send_msg(struct rdma_dev_addr *dev_addr,

		/* Repair the nlmsg header length */
		nlmsg_end(skb, nlh);
		ibnl_multicast(skb, nlh, RDMA_NL_GROUP_LS, GFP_KERNEL);
		rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, GFP_KERNEL);

		/* Make the request retry, so when we get the response from userspace
		* we will have something.
		@@ -326,7 +324,7 @@ static void queue_req(struct addr_req *req)
		static int ib_nl_fetch_ha(struct dst_entry dst, struct rdma_dev_addr dev_addr,
		const void *daddr, u32 seq, u16 family)
		{
		if (ibnl_chk_listeners(RDMA_NL_GROUP_LS))
		if (rdma_nl_chk_listeners(RDMA_NL_GROUP_LS))
		return -EADDRNOTAVAIL;

		/* We fill in what we can, the response will fill the rest */

drivers/infiniband/core/cma.c

+18 −15

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ MODULE_LICENSE("Dual BSD/GPL");
		#define CMA_MAX_CM_RETRIES 15
		#define CMA_CM_MRA_SETTING (IB_CM_MRA_FLAG_DELAY \| 24)
		#define CMA_IBOE_PACKET_LIFETIME 18
		#define CMA_PREFERRED_ROCE_GID_TYPE (1 << IB_GID_TYPE_ROCE_UDP_ENCAP)

		static const char * const cma_events[] = {
		[RDMA_CM_EVENT_ADDR_RESOLVED] = "address resolved",
		@@ -3998,7 +3999,8 @@ static void iboe_mcast_work_handler(struct work_struct *work)
		kfree(mw);
		}

		static void cma_iboe_set_mgid(struct sockaddr addr, union ib_gid mgid)
		static void cma_iboe_set_mgid(struct sockaddr addr, union ib_gid mgid,
		enum ib_gid_type gid_type)
		{
		struct sockaddr_in sin = (struct sockaddr_in )addr;
		struct sockaddr_in6 sin6 = (struct sockaddr_in6 )addr;
		@@ -4008,8 +4010,8 @@ static void cma_iboe_set_mgid(struct sockaddr addr, union ib_gid mgid)
		} else if (addr->sa_family == AF_INET6) {
		memcpy(mgid, &sin6->sin6_addr, sizeof *mgid);
		} else {
		mgid->raw[0] = 0xff;
		mgid->raw[1] = 0x0e;
		mgid->raw[0] = (gid_type == IB_GID_TYPE_IB) ? 0xff : 0;
		mgid->raw[1] = (gid_type == IB_GID_TYPE_IB) ? 0x0e : 0;
		mgid->raw[2] = 0;
		mgid->raw[3] = 0;
		mgid->raw[4] = 0;
		@@ -4050,7 +4052,9 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
		goto out1;
		}

		cma_iboe_set_mgid(addr, &mc->multicast.ib->rec.mgid);
		gid_type = id_priv->cma_dev->default_gid_type[id_priv->id.port_num -
		rdma_start_port(id_priv->cma_dev->device)];
		cma_iboe_set_mgid(addr, &mc->multicast.ib->rec.mgid, gid_type);

		mc->multicast.ib->rec.pkey = cpu_to_be16(0xffff);
		if (id_priv->id.ps == RDMA_PS_UDP)
		@@ -4066,8 +4070,6 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
		mc->multicast.ib->rec.hop_limit = 1;
		mc->multicast.ib->rec.mtu = iboe_get_mtu(ndev->mtu);

		gid_type = id_priv->cma_dev->default_gid_type[id_priv->id.port_num -
		rdma_start_port(id_priv->cma_dev->device)];
		if (addr->sa_family == AF_INET) {
		if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) {
		mc->multicast.ib->rec.hop_limit = IPV6_DEFAULT_HOPLIMIT;
		@@ -4280,6 +4282,10 @@ static void cma_add_one(struct ib_device *device)
		for (i = rdma_start_port(device); i <= rdma_end_port(device); i++) {
		supported_gids = roce_gid_type_mask_support(device, i);
		WARN_ON(!supported_gids);
		if (supported_gids & CMA_PREFERRED_ROCE_GID_TYPE)
		cma_dev->default_gid_type[i - rdma_start_port(device)] =
		CMA_PREFERRED_ROCE_GID_TYPE;
		else
		cma_dev->default_gid_type[i - rdma_start_port(device)] =
		find_first_bit(&supported_gids, BITS_PER_LONG);
		cma_dev->default_roce_tos[i - rdma_start_port(device)] = 0;
		@@ -4452,9 +4458,8 @@ static int cma_get_id_stats(struct sk_buff skb, struct netlink_callback cb)
		return skb->len;
		}

		static const struct ibnl_client_cbs cma_cb_table[] = {
		[RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats,
		.module = THIS_MODULE },
		static const struct rdma_nl_cbs cma_cb_table[] = {
		[RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats},
		};

		static int cma_init_net(struct net *net)
		@@ -4506,9 +4511,7 @@ static int __init cma_init(void)
		if (ret)
		goto err;

		if (ibnl_add_client(RDMA_NL_RDMA_CM, ARRAY_SIZE(cma_cb_table),
		cma_cb_table))
		pr_warn("RDMA CMA: failed to add netlink callback\n");
		rdma_nl_register(RDMA_NL_RDMA_CM, cma_cb_table);
		cma_configfs_init();

		return 0;
		@@ -4525,7 +4528,7 @@ static int __init cma_init(void)
		static void __exit cma_cleanup(void)
		{
		cma_configfs_exit();
		ibnl_remove_client(RDMA_NL_RDMA_CM);
		rdma_nl_unregister(RDMA_NL_RDMA_CM);
		ib_unregister_client(&cma_client);
		unregister_netdevice_notifier(&cma_nb);
		rdma_addr_unregister_client(&addr_client);

drivers/infiniband/core/core_priv.h

+21 −5

Original line number	Diff line number	Diff line
		@@ -102,6 +102,14 @@ void ib_enum_all_roce_netdevs(roce_netdev_filter filter,
		roce_netdev_callback cb,
		void *cookie);

		typedef int (nldev_callback)(struct ib_device device,
		struct sk_buff *skb,
		struct netlink_callback *cb,
		unsigned int idx);

		int ib_enum_all_devs(nldev_callback nldev_cb, struct sk_buff *skb,
		struct netlink_callback *cb);

		enum ib_cache_gid_default_mode {
		IB_CACHE_GID_DEFAULT_MODE_SET,
		IB_CACHE_GID_DEFAULT_MODE_DELETE
		@@ -179,8 +187,8 @@ void ib_mad_cleanup(void);
		int ib_sa_init(void);
		void ib_sa_cleanup(void);

		int ibnl_init(void);
		void ibnl_cleanup(void);
		int rdma_nl_init(void);
		void rdma_nl_exit(void);

		/**
		* Check if there are any listeners to the netlink group
		@@ -190,11 +198,14 @@ void ibnl_cleanup(void);
		int ibnl_chk_listeners(unsigned int group);

		int ib_nl_handle_resolve_resp(struct sk_buff *skb,
		struct netlink_callback *cb);
		struct nlmsghdr *nlh,
		struct netlink_ext_ack *extack);
		int ib_nl_handle_set_timeout(struct sk_buff *skb,
		struct netlink_callback *cb);
		struct nlmsghdr *nlh,
		struct netlink_ext_ack *extack);
		int ib_nl_handle_ip_res_resp(struct sk_buff *skb,
		struct netlink_callback *cb);
		struct nlmsghdr *nlh,
		struct netlink_ext_ack *extack);

		int ib_get_cached_subnet_prefix(struct ib_device *device,
		u8 port_num,
		@@ -301,4 +312,9 @@ static inline int ib_mad_enforce_security(struct ib_mad_agent_private *map,
		return 0;
		}
		#endif

		struct ib_device *__ib_device_get_by_index(u32 ifindex);
		/* RDMA device netlink */
		void nldev_init(void);
		void nldev_exit(void);
		#endif /* _CORE_PRIV_H */

drivers/infiniband/core/device.c

+83 −36

Original line number	Diff line number	Diff line
		@@ -134,6 +134,17 @@ static int ib_device_check_mandatory(struct ib_device *device)
		return 0;
		}

		struct ib_device *__ib_device_get_by_index(u32 index)
		{
		struct ib_device *device;

		list_for_each_entry(device, &device_list, core_list)
		if (device->index == index)
		return device;

		return NULL;
		}

		static struct ib_device __ib_device_get_by_name(const char name)
		{
		struct ib_device *device;
		@@ -145,7 +156,6 @@ static struct ib_device __ib_device_get_by_name(const char name)
		return NULL;
		}


		static int alloc_name(char *name)
		{
		unsigned long *inuse;
		@@ -326,10 +336,10 @@ static int read_port_immutable(struct ib_device *device)
		return 0;
		}

		void ib_get_device_fw_str(struct ib_device dev, char str, size_t str_len)
		void ib_get_device_fw_str(struct ib_device dev, char str)
		{
		if (dev->get_dev_fw_str)
		dev->get_dev_fw_str(dev, str, str_len);
		dev->get_dev_fw_str(dev, str);
		else
		str[0] = '\0';
		}
		@@ -394,6 +404,30 @@ static int ib_security_change(struct notifier_block *nb, unsigned long event,
		return NOTIFY_OK;
		}

		/**
		* __dev_new_index - allocate an device index
		*
		* Returns a suitable unique value for a new device interface
		* number. It assumes that there are less than 2^32-1 ib devices
		* will be present in the system.
		*/
		static u32 __dev_new_index(void)
		{
		/*
		* The device index to allow stable naming.
		* Similar to struct net -> ifindex.
		*/
		static u32 index;

		for (;;) {
		if (!(++index))
		index = 1;

		if (!__ib_device_get_by_index(index))
		return index;
		}
		}

		/**
		* ib_register_device - Register an IB device with IB core
		* @device:Device to register
		@@ -492,6 +526,7 @@ int ib_register_device(struct ib_device *device,
		if (client->add && !add_client_context(device, client))
		client->add(device);

		device->index = __dev_new_index();
		down_write(&lists_rwsem);
		list_add_tail(&device->core_list, &device_list);
		up_write(&lists_rwsem);
		@@ -892,6 +927,31 @@ void ib_enum_all_roce_netdevs(roce_netdev_filter filter,
		up_read(&lists_rwsem);
		}

		/**
		* ib_enum_all_devs - enumerate all ib_devices
		* @cb: Callback to call for each found ib_device
		*
		* Enumerates all ib_devices and calls callback() on each device.
		*/
		int ib_enum_all_devs(nldev_callback nldev_cb, struct sk_buff *skb,
		struct netlink_callback *cb)
		{
		struct ib_device *dev;
		unsigned int idx = 0;
		int ret = 0;

		down_read(&lists_rwsem);
		list_for_each_entry(dev, &device_list, core_list) {
		ret = nldev_cb(dev, skb, cb, idx);
		if (ret)
		break;
		idx++;
		}

		up_read(&lists_rwsem);
		return ret;
		}

		/**
		* ib_query_pkey - Get P_Key table entry
		* @device:Device to query
		@@ -1086,29 +1146,21 @@ struct net_device ib_get_net_dev_by_params(struct ib_device dev,
		}
		EXPORT_SYMBOL(ib_get_net_dev_by_params);

		static struct ibnl_client_cbs ibnl_ls_cb_table[] = {
		static const struct rdma_nl_cbs ibnl_ls_cb_table[] = {
		[RDMA_NL_LS_OP_RESOLVE] = {
		.dump = ib_nl_handle_resolve_resp,
		.module = THIS_MODULE },
		.doit = ib_nl_handle_resolve_resp,
		.flags = RDMA_NL_ADMIN_PERM,
		},
		[RDMA_NL_LS_OP_SET_TIMEOUT] = {
		.dump = ib_nl_handle_set_timeout,
		.module = THIS_MODULE },
		.doit = ib_nl_handle_set_timeout,
		.flags = RDMA_NL_ADMIN_PERM,
		},
		[RDMA_NL_LS_OP_IP_RESOLVE] = {
		.dump = ib_nl_handle_ip_res_resp,
		.module = THIS_MODULE },
		.doit = ib_nl_handle_ip_res_resp,
		.flags = RDMA_NL_ADMIN_PERM,
		},
		};

		static int ib_add_ibnl_clients(void)
		{
		return ibnl_add_client(RDMA_NL_LS, ARRAY_SIZE(ibnl_ls_cb_table),
		ibnl_ls_cb_table);
		}

		static void ib_remove_ibnl_clients(void)
		{
		ibnl_remove_client(RDMA_NL_LS);
		}

		static int __init ib_core_init(void)
		{
		int ret;
		@@ -1130,9 +1182,9 @@ static int __init ib_core_init(void)
		goto err_comp;
		}

		ret = ibnl_init();
		ret = rdma_nl_init();
		if (ret) {
		pr_warn("Couldn't init IB netlink interface\n");
		pr_warn("Couldn't init IB netlink interface: err %d\n", ret);
		goto err_sysfs;
		}

		@@ -1154,24 +1206,18 @@ static int __init ib_core_init(void)
		goto err_mad;
		}

		ret = ib_add_ibnl_clients();
		if (ret) {
		pr_warn("Couldn't register ibnl clients\n");
		goto err_sa;
		}

		ret = register_lsm_notifier(&ibdev_lsm_nb);
		if (ret) {
		pr_warn("Couldn't register LSM notifier. ret %d\n", ret);
		goto err_ibnl_clients;
		goto err_sa;
		}

		nldev_init();
		rdma_nl_register(RDMA_NL_LS, ibnl_ls_cb_table);
		ib_cache_setup();

		return 0;

		err_ibnl_clients:
		ib_remove_ibnl_clients();
		err_sa:
		ib_sa_cleanup();
		err_mad:
		@@ -1179,7 +1225,7 @@ static int __init ib_core_init(void)
		err_addr:
		addr_cleanup();
		err_ibnl:
		ibnl_cleanup();
		rdma_nl_exit();
		err_sysfs:
		class_unregister(&ib_class);
		err_comp:
		@@ -1191,13 +1237,14 @@ static int __init ib_core_init(void)

		static void __exit ib_core_cleanup(void)
		{
		unregister_lsm_notifier(&ibdev_lsm_nb);
		ib_cache_cleanup();
		ib_remove_ibnl_clients();
		nldev_exit();
		rdma_nl_unregister(RDMA_NL_LS);
		unregister_lsm_notifier(&ibdev_lsm_nb);
		ib_sa_cleanup();
		ib_mad_cleanup();
		addr_cleanup();
		ibnl_cleanup();
		rdma_nl_exit();
		class_unregister(&ib_class);
		destroy_workqueue(ib_comp_wq);
		/* Make sure that any pending umem accounting work is done. */