Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 477864c8 authored by Moni Shoua's avatar Moni Shoua Committed by Doug Ledford
Browse files

IB/core: Let create_ah return extended response to user 



Add struct ib_udata to the signature of create_ah callback that is
implemented by IB device drivers. This allows HW drivers to return extra
data to the userspace library.
This patch prepares the ground for mlx5 driver to resolve destination
mac address for a given GID and return it to userspace.
This patch was previously submitted by Knut Omang as a part of the
patch set to support Oracle's Infiniband HCA (SIF).

Signed-off-by: default avatarKnut Omang <knut.omang@oracle.com>
Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Reviewed-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 6ad279c5

drivers/infiniband/core/uverbs_cmd.c

+10 −1
Original line number Diff line number Diff line
@@ -2877,6 +2877,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, 
	struct ib_ah			*ah;

	struct ib_ah_attr		attr;

	int ret;

	struct ib_udata                   udata;



	if (out_len < sizeof resp)

		return -ENOSPC;
@@ -2884,6 +2885,10 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	INIT_UDATA(&udata, buf + sizeof(cmd),

		   (unsigned long)cmd.response + sizeof(resp),

		   in_len - sizeof(cmd), out_len - sizeof(resp));



	uobj = kmalloc(sizeof *uobj, GFP_KERNEL);

	if (!uobj)

		return -ENOMEM;
@@ -2910,12 +2915,16 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, 
	memset(&attr.dmac, 0, sizeof(attr.dmac));

	memcpy(attr.grh.dgid.raw, cmd.attr.grh.dgid, 16);



	ah = ib_create_ah(pd, &attr);

	ah = pd->device->create_ah(pd, &attr, &udata);



	if (IS_ERR(ah)) {

		ret = PTR_ERR(ah);

		goto err_put;

	}



	ah->device  = pd->device;

	ah->pd      = pd;

	atomic_inc(&pd->usecnt);

	ah->uobject  = uobj;

	uobj->object = ah;

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) 
{

	struct ib_ah *ah;



	ah = pd->device->create_ah(pd, ah_attr);

	ah = pd->device->create_ah(pd, ah_attr, NULL);



	if (!IS_ERR(ah)) {

		ah->device  = pd->device;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ 
#include "common.h"



static struct ib_ah *iwch_ah_create(struct ib_pd *pd,

				    struct ib_ah_attr *ah_attr)

				    struct ib_ah_attr *ah_attr,

				    struct ib_udata *udata)

{

	return ERR_PTR(-ENOSYS);

}

drivers/infiniband/hw/cxgb4/provider.c

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ module_param(fastreg_support, int, 0644); 
MODULE_PARM_DESC(fastreg_support, "Advertise fastreg support (default=1)");



static struct ib_ah *c4iw_ah_create(struct ib_pd *pd,

				    struct ib_ah_attr *ah_attr)

				    struct ib_ah_attr *ah_attr,

				    struct ib_udata *udata)



{

	return ERR_PTR(-ENOSYS);

}

drivers/infiniband/hw/hns/hns_roce_ah.c

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 
#define HNS_ROCE_VLAN_SL_BIT_MASK	7

#define HNS_ROCE_VLAN_SL_SHIFT		13



struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *ah_attr)

struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *ah_attr,

				 struct ib_udata *udata)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(ibpd->device);

	struct device *dev = &hr_dev->pdev->dev;