IB/mlx5: Implement the ODP capability query verb (8cdd312c) · Commits · 戴 / test

drivers/infiniband/hw/mlx5/Makefile

+1 −0

Original line number	Diff line number	Diff line
		obj-$(CONFIG_MLX5_INFINIBAND) += mlx5_ib.o

		mlx5_ib-y := main.o cq.o doorbell.o qp.o mem.o srq.o mr.o ah.o mad.o
		mlx5_ib-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += odp.o

drivers/infiniband/hw/mlx5/main.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,12 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
		props->max_mcast_grp;
		props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */

		#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
		if (dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
		props->device_cap_flags \|= IB_DEVICE_ON_DEMAND_PAGING;
		props->odp_caps = dev->odp_caps;
		#endif

		out:
		kfree(in_mad);
		kfree(out_mad);
		@@ -1321,6 +1327,8 @@ static void mlx5_ib_add(struct mlx5_core_dev mdev)
		(1ull << IB_USER_VERBS_CMD_DESTROY_SRQ) \|
		(1ull << IB_USER_VERBS_CMD_CREATE_XSRQ) \|
		(1ull << IB_USER_VERBS_CMD_OPEN_QP);
		dev->ib_dev.uverbs_ex_cmd_mask =
		(1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE);

		dev->ib_dev.query_device = mlx5_ib_query_device;
		dev->ib_dev.query_port = mlx5_ib_query_port;
		@@ -1366,6 +1374,8 @@ static void mlx5_ib_add(struct mlx5_core_dev mdev)
		dev->ib_dev.free_fast_reg_page_list = mlx5_ib_free_fast_reg_page_list;
		dev->ib_dev.check_mr_status = mlx5_ib_check_mr_status;

		mlx5_ib_internal_query_odp_caps(dev);

		if (mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_XRC) {
		dev->ib_dev.alloc_xrcd = mlx5_ib_alloc_xrcd;
		dev->ib_dev.dealloc_xrcd = mlx5_ib_dealloc_xrcd;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,9 @@ struct mlx5_ib_dev {
		struct mlx5_mr_cache cache;
		struct timer_list delay_timer;
		int fill_delay;
		#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
		struct ib_odp_caps odp_caps;
		#endif
		};

		static inline struct mlx5_ib_cq to_mibcq(struct mlx5_core_cq mcq)
		@@ -559,6 +562,15 @@ void mlx5_umr_cq_handler(struct ib_cq cq, void cq_context);
		int mlx5_ib_check_mr_status(struct ib_mr *ibmr, u32 check_mask,
		struct ib_mr_status *mr_status);

		#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
		int mlx5_ib_internal_query_odp_caps(struct mlx5_ib_dev *dev);
		#else
		static inline int mlx5_ib_internal_query_odp_caps(struct mlx5_ib_dev *dev)
		{
		return 0;
		}
		#endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */

		static inline void init_query_mad(struct ib_smp *mad)
		{
		mad->base_version = 1;

drivers/infiniband/hw/mlx5/odp.c

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014 Mellanox Technologies. All rights reserved.
		*
		* This software is available to you under a choice of one of two
		* licenses. You may choose to be licensed under the terms of the GNU
		* General Public License (GPL) Version 2, available from the file
		* COPYING in the main directory of this source tree, or the
		* OpenIB.org BSD license below:
		*
		* Redistribution and use in source and binary forms, with or
		* without modification, are permitted provided that the following
		* conditions are met:
		*
		* - Redistributions of source code must retain the above
		* copyright notice, this list of conditions and the following
		* disclaimer.
		*
		* - Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials
		* provided with the distribution.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
		* SOFTWARE.
		*/

		#include "mlx5_ib.h"

		#define COPY_ODP_BIT_MLX_TO_IB(reg, ib_caps, field_name, bit_name) do { \
		if (be32_to_cpu(reg.field_name) & MLX5_ODP_SUPPORT_##bit_name) \
		ib_caps->field_name \|= IB_ODP_SUPPORT_##bit_name; \
		} while (0)

		int mlx5_ib_internal_query_odp_caps(struct mlx5_ib_dev *dev)
		{
		int err;
		struct mlx5_odp_caps hw_caps;
		struct ib_odp_caps *caps = &dev->odp_caps;

		memset(caps, 0, sizeof(*caps));

		if (!(dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG))
		return 0;

		err = mlx5_query_odp_caps(dev->mdev, &hw_caps);
		if (err)
		goto out;

		/* At this point we would copy the capability bits that the driver
		* supports from the hw_caps struct to the caps struct. However, no
		* such capabilities are supported so far. */
		out:
		return err;
		}

Admin message