Patch "IB/mlx4: Forbid using sysfs to change RoCE pkeys" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

IB/mlx4: Forbid using sysfs to change RoCE pkeys

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ib-mlx4-forbid-using-sysfs-to-change-roce-pkeys.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Jack Morgenstein <[email protected]>
Date: Thu, 30 Jul 2015 17:34:23 +0300
Subject: IB/mlx4: Forbid using sysfs to change RoCE pkeys

From: Jack Morgenstein <[email protected]>

commit 2b135db3e81301d0452e6aa107349abe67b097d6 upstream.

The pkey mapping for RoCE must remain the default mapping:
VFs:
virtual index 0 = mapped to real index 0 (0xFFFF) All others indices: mapped to a real pkey index containing an
invalid pkey.
PF:
virtual index i = real index i.

Don't allow users to change these mappings using files found in sysfs.

---
 drivers/infiniband/hw/mlx4/sysfs.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

@@ -640,6 +640,8 @@ static int add_port(struct mlx4_ib_dev *
 	struct mlx4_port *p;
 	int i;
 	int ret;
+	int is_eth = rdma_port_get_link_layer(&dev->ib_dev, port_num) ==
+			IB_LINK_LAYER_ETHERNET;
 
 	p = kzalloc(sizeof *p, GFP_KERNEL);
 	if (!p)

@@ -657,7 +659,8 @@ static int add_port(struct mlx4_ib_dev *
 
 	p->pkey_group.name  = "pkey_idx";
 	p->pkey_group.attrs =
-		alloc_group_attrs(show_port_pkey, store_port_pkey,
+		alloc_group_attrs(show_port_pkey,
+				  is_eth ? NULL : store_port_pkey,
 				  dev->dev->caps.pkey_table_len[port_num]);
 	if (!p->pkey_group.attrs) {
 		ret = -ENOMEM;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/ib-mlx4-fix-potential-deadlock-when-sending-mad-to-wire.patch queue-4.1/ib-mlx4-forbid-using-sysfs-to-change-roce-pkeys.patch