* [for-next 1/6] net/mlx5: remove some extraneous spaces in indentations
2018-05-07 23:52 [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 Saeed Mahameed
@ 2018-05-07 23:52 ` Saeed Mahameed
2018-05-07 23:53 ` [for-next 2/6] net/mlx5: Decrease level of prints about non-existent MKEY Saeed Mahameed
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Saeed Mahameed @ 2018-05-07 23:52 UTC (permalink / raw)
To: David S. Miller, Doug Ledford
Cc: netdev, linux-rdma, Leon Romanovsky, Jason Gunthorpe,
Colin Ian King, Saeed Mahameed
From: Colin Ian King <colin.king@canonical.com>
There are several lines where there is an extraneous space causing
indentation misalignment. Remove them.
Cleans up Cocconelle warnings:
./drivers/net/ethernet/mellanox/mlx5/core/qp.c:409:3-18: code aligned
with following code on line 410
./drivers/net/ethernet/mellanox/mlx5/core/qp.c:415:3-18: code aligned
with following code on line 416
./drivers/net/ethernet/mellanox/mlx5/core/qp.c:421:3-18: code aligned
with following code on line 422
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/qp.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/qp.c b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
index 02d6c5b5d502..4ca07bfb6b14 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/qp.c
@@ -407,21 +407,21 @@ static int modify_qp_mbox_alloc(struct mlx5_core_dev *dev, u16 opcode, int qpn,
case MLX5_CMD_OP_RST2INIT_QP:
if (MBOX_ALLOC(mbox, rst2init_qp))
return -ENOMEM;
- MOD_QP_IN_SET_QPC(rst2init_qp, mbox->in, opcode, qpn,
- opt_param_mask, qpc);
- break;
+ MOD_QP_IN_SET_QPC(rst2init_qp, mbox->in, opcode, qpn,
+ opt_param_mask, qpc);
+ break;
case MLX5_CMD_OP_INIT2RTR_QP:
if (MBOX_ALLOC(mbox, init2rtr_qp))
return -ENOMEM;
- MOD_QP_IN_SET_QPC(init2rtr_qp, mbox->in, opcode, qpn,
- opt_param_mask, qpc);
- break;
+ MOD_QP_IN_SET_QPC(init2rtr_qp, mbox->in, opcode, qpn,
+ opt_param_mask, qpc);
+ break;
case MLX5_CMD_OP_RTR2RTS_QP:
if (MBOX_ALLOC(mbox, rtr2rts_qp))
return -ENOMEM;
- MOD_QP_IN_SET_QPC(rtr2rts_qp, mbox->in, opcode, qpn,
- opt_param_mask, qpc);
- break;
+ MOD_QP_IN_SET_QPC(rtr2rts_qp, mbox->in, opcode, qpn,
+ opt_param_mask, qpc);
+ break;
case MLX5_CMD_OP_RTS2RTS_QP:
if (MBOX_ALLOC(mbox, rts2rts_qp))
return -ENOMEM;
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [for-next 2/6] net/mlx5: Decrease level of prints about non-existent MKEY
2018-05-07 23:52 [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 Saeed Mahameed
2018-05-07 23:52 ` [for-next 1/6] net/mlx5: remove some extraneous spaces in indentations Saeed Mahameed
@ 2018-05-07 23:53 ` Saeed Mahameed
2018-05-07 23:53 ` [for-next 3/6] net/mlx5: Refactor num of blocks in mailbox calculation Saeed Mahameed
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Saeed Mahameed @ 2018-05-07 23:53 UTC (permalink / raw)
To: David S. Miller, Doug Ledford
Cc: netdev, linux-rdma, Leon Romanovsky, Jason Gunthorpe, Saeed Mahameed
From: Leon Romanovsky <leonro@mellanox.com>
User-controlled application can cause multiple prints as below to flood
dmesg. Since knowledge of failed MKey release is important for debug,
let's decrease its level to debug.
mlx5_core 0000:00:04.0: mlx5_core_destroy_mkey:127:(pid 2352): failed
radix tree delete of mkey 0x1ed700
Reported-by: Noa Osherovich <noaos@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/mr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mr.c b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
index b9736f505bdf..f4f02f775c93 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
@@ -123,8 +123,8 @@ int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev,
deleted_mkey = radix_tree_delete(&table->tree, mlx5_base_mkey(mkey->key));
write_unlock_irqrestore(&table->lock, flags);
if (!deleted_mkey) {
- mlx5_core_warn(dev, "failed radix tree delete of mkey 0x%x\n",
- mlx5_base_mkey(mkey->key));
+ mlx5_core_dbg(dev, "failed radix tree delete of mkey 0x%x\n",
+ mlx5_base_mkey(mkey->key));
return -ENOENT;
}
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [for-next 3/6] net/mlx5: Refactor num of blocks in mailbox calculation
2018-05-07 23:52 [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 Saeed Mahameed
2018-05-07 23:52 ` [for-next 1/6] net/mlx5: remove some extraneous spaces in indentations Saeed Mahameed
2018-05-07 23:53 ` [for-next 2/6] net/mlx5: Decrease level of prints about non-existent MKEY Saeed Mahameed
@ 2018-05-07 23:53 ` Saeed Mahameed
2018-05-07 23:53 ` [for-next 4/6] net/mlx5: Fix dump_command mailbox length printed Saeed Mahameed
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Saeed Mahameed @ 2018-05-07 23:53 UTC (permalink / raw)
To: David S. Miller, Doug Ledford
Cc: netdev, linux-rdma, Leon Romanovsky, Jason Gunthorpe,
Moshe Shemesh, Saeed Mahameed
From: Moshe Shemesh <moshe@mellanox.com>
Get the logic that calculates the number of blocks in a command mailbox
into a dedicated function.
Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 21cd1703a862..0f7062104ad9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -135,6 +135,14 @@ static struct mlx5_cmd_layout *get_inst(struct mlx5_cmd *cmd, int idx)
return cmd->cmd_buf + (idx << cmd->log_stride);
}
+static int mlx5_calc_cmd_blocks(struct mlx5_cmd_msg *msg)
+{
+ int size = msg->len;
+ int blen = size - min_t(int, sizeof(msg->first.data), size);
+
+ return DIV_ROUND_UP(blen, MLX5_CMD_DATA_BLOCK_SIZE);
+}
+
static u8 xor8_buf(void *buf, size_t offset, int len)
{
u8 *ptr = buf;
@@ -174,10 +182,7 @@ static void calc_block_sig(struct mlx5_cmd_prot_block *block)
static void calc_chain_sig(struct mlx5_cmd_msg *msg)
{
struct mlx5_cmd_mailbox *next = msg->next;
- int size = msg->len;
- int blen = size - min_t(int, sizeof(msg->first.data), size);
- int n = (blen + MLX5_CMD_DATA_BLOCK_SIZE - 1)
- / MLX5_CMD_DATA_BLOCK_SIZE;
+ int n = mlx5_calc_cmd_blocks(msg);
int i = 0;
for (i = 0; i < n && next; i++) {
@@ -220,12 +225,9 @@ static void free_cmd(struct mlx5_cmd_work_ent *ent)
static int verify_signature(struct mlx5_cmd_work_ent *ent)
{
struct mlx5_cmd_mailbox *next = ent->out->next;
+ int n = mlx5_calc_cmd_blocks(ent->out);
int err;
u8 sig;
- int size = ent->out->len;
- int blen = size - min_t(int, sizeof(ent->out->first.data), size);
- int n = (blen + MLX5_CMD_DATA_BLOCK_SIZE - 1)
- / MLX5_CMD_DATA_BLOCK_SIZE;
int i = 0;
sig = xor8_buf(ent->lay, 0, sizeof(*ent->lay));
@@ -1137,7 +1139,6 @@ static struct mlx5_cmd_msg *mlx5_alloc_cmd_msg(struct mlx5_core_dev *dev,
struct mlx5_cmd_mailbox *tmp, *head = NULL;
struct mlx5_cmd_prot_block *block;
struct mlx5_cmd_msg *msg;
- int blen;
int err;
int n;
int i;
@@ -1146,8 +1147,8 @@ static struct mlx5_cmd_msg *mlx5_alloc_cmd_msg(struct mlx5_core_dev *dev,
if (!msg)
return ERR_PTR(-ENOMEM);
- blen = size - min_t(int, sizeof(msg->first.data), size);
- n = (blen + MLX5_CMD_DATA_BLOCK_SIZE - 1) / MLX5_CMD_DATA_BLOCK_SIZE;
+ msg->len = size;
+ n = mlx5_calc_cmd_blocks(msg);
for (i = 0; i < n; i++) {
tmp = alloc_cmd_box(dev, flags);
@@ -1165,7 +1166,6 @@ static struct mlx5_cmd_msg *mlx5_alloc_cmd_msg(struct mlx5_core_dev *dev,
head = tmp;
}
msg->next = head;
- msg->len = size;
return msg;
err_alloc:
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [for-next 4/6] net/mlx5: Fix dump_command mailbox length printed
2018-05-07 23:52 [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 Saeed Mahameed
` (2 preceding siblings ...)
2018-05-07 23:53 ` [for-next 3/6] net/mlx5: Refactor num of blocks in mailbox calculation Saeed Mahameed
@ 2018-05-07 23:53 ` Saeed Mahameed
2018-05-07 23:53 ` [for-next 5/6] net/mlx5: Cleanup unused field in Work Queue parameters Saeed Mahameed
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Saeed Mahameed @ 2018-05-07 23:53 UTC (permalink / raw)
To: David S. Miller, Doug Ledford
Cc: netdev, linux-rdma, Leon Romanovsky, Jason Gunthorpe,
Moshe Shemesh, Saeed Mahameed
From: Moshe Shemesh <moshe@mellanox.com>
Dump command mailbox length printed was correct only if data_only flag
was set. For the case that data_only flag was clear the offset to stop
printing at was wrong and so the buffer printed was too short.
Changed the print loop to stop according to number of buffers in
mailbox.
Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters")
Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 0f7062104ad9..487388aed98f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -722,9 +722,11 @@ static void dump_command(struct mlx5_core_dev *dev,
struct mlx5_cmd_msg *msg = input ? ent->in : ent->out;
u16 op = MLX5_GET(mbox_in, ent->lay->in, opcode);
struct mlx5_cmd_mailbox *next = msg->next;
+ int n = mlx5_calc_cmd_blocks(msg);
int data_only;
u32 offset = 0;
int dump_len;
+ int i;
data_only = !!(mlx5_core_debug_mask & (1 << MLX5_CMD_DATA));
@@ -751,7 +753,7 @@ static void dump_command(struct mlx5_core_dev *dev,
offset += sizeof(*ent->lay);
}
- while (next && offset < msg->len) {
+ for (i = 0; i < n && next; i++) {
if (data_only) {
dump_len = min_t(int, MLX5_CMD_DATA_BLOCK_SIZE, msg->len - offset);
dump_buf(next->buf, dump_len, 1, offset);
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [for-next 5/6] net/mlx5: Cleanup unused field in Work Queue parameters
2018-05-07 23:52 [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 Saeed Mahameed
` (3 preceding siblings ...)
2018-05-07 23:53 ` [for-next 4/6] net/mlx5: Fix dump_command mailbox length printed Saeed Mahameed
@ 2018-05-07 23:53 ` Saeed Mahameed
2018-05-07 23:53 ` [for-next 6/6] net/mlx5: fix spelling mistake: "modfiy" -> "modify" Saeed Mahameed
2018-05-10 12:18 ` [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 David Miller
6 siblings, 0 replies; 9+ messages in thread
From: Saeed Mahameed @ 2018-05-07 23:53 UTC (permalink / raw)
To: David S. Miller, Doug Ledford
Cc: netdev, linux-rdma, Leon Romanovsky, Jason Gunthorpe,
Tariq Toukan, Saeed Mahameed
From: Tariq Toukan <tariqt@mellanox.com>
Remove the 'linear' field from struct mlx5_wq_param.
It is redundant, set but never read.
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 -
drivers/net/ethernet/mellanox/mlx5/core/wq.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index b29c1d93f058..f60905648797 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1896,7 +1896,6 @@ static void mlx5e_build_rq_param(struct mlx5e_priv *priv,
MLX5_SET(rqc, rqc, scatter_fcs, params->scatter_fcs_en);
param->wq.buf_numa_node = dev_to_node(&mdev->pdev->dev);
- param->wq.linear = 1;
}
static void mlx5e_build_drop_rq_param(struct mlx5e_priv *priv,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.h b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
index fca90b94596d..f3dfa0ca3c5d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
@@ -38,7 +38,6 @@
#include <linux/mlx5/qp.h>
struct mlx5_wq_param {
- int linear;
int buf_numa_node;
int db_numa_node;
};
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [for-next 6/6] net/mlx5: fix spelling mistake: "modfiy" -> "modify"
2018-05-07 23:52 [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 Saeed Mahameed
` (4 preceding siblings ...)
2018-05-07 23:53 ` [for-next 5/6] net/mlx5: Cleanup unused field in Work Queue parameters Saeed Mahameed
@ 2018-05-07 23:53 ` Saeed Mahameed
2018-05-10 12:18 ` [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 David Miller
6 siblings, 0 replies; 9+ messages in thread
From: Saeed Mahameed @ 2018-05-07 23:53 UTC (permalink / raw)
To: David S. Miller, Doug Ledford
Cc: netdev, linux-rdma, Leon Romanovsky, Jason Gunthorpe,
Colin Ian King, Saeed Mahameed
From: Colin Ian King <colin.king@canonical.com>
Trivial fix to spelling mistake in netdev_warn warning message
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
index 610d485c4b03..f64b5e78519b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
@@ -565,7 +565,7 @@ static void arfs_modify_rule_rq(struct mlx5e_priv *priv,
err = mlx5_modify_rule_destination(rule, &dst, NULL);
if (err)
netdev_warn(priv->netdev,
- "Failed to modfiy aRFS rule destination to rq=%d\n", rxq);
+ "Failed to modify aRFS rule destination to rq=%d\n", rxq);
}
static void arfs_handle_work(struct work_struct *work)
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07
2018-05-07 23:52 [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 Saeed Mahameed
` (5 preceding siblings ...)
2018-05-07 23:53 ` [for-next 6/6] net/mlx5: fix spelling mistake: "modfiy" -> "modify" Saeed Mahameed
@ 2018-05-10 12:18 ` David Miller
2018-05-15 14:34 ` Doug Ledford
6 siblings, 1 reply; 9+ messages in thread
From: David Miller @ 2018-05-10 12:18 UTC (permalink / raw)
To: saeedm; +Cc: dledford, netdev, linux-rdma, leonro, jgg
From: Saeed Mahameed <saeedm@mellanox.com>
Date: Mon, 7 May 2018 16:52:58 -0700
> This pull request includes misc updates and cleanups for mlx5 core
> driver for both net and rdma next branches, for more information please
> see tag log below.
>
> Please pull and let me know if there's any problem.
Looks good, pulled into net-next.
Thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07
2018-05-10 12:18 ` [pull request][for-next 0/6] Mellanox, mlx5 updates 2018-05-07 David Miller
@ 2018-05-15 14:34 ` Doug Ledford
0 siblings, 0 replies; 9+ messages in thread
From: Doug Ledford @ 2018-05-15 14:34 UTC (permalink / raw)
To: David Miller, saeedm; +Cc: netdev, linux-rdma, leonro, jgg
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
On Thu, 2018-05-10 at 08:18 -0400, David Miller wrote:
> From: Saeed Mahameed <saeedm@mellanox.com>
> Date: Mon, 7 May 2018 16:52:58 -0700
>
> > This pull request includes misc updates and cleanups for mlx5 core
> > driver for both net and rdma next branches, for more information please
> > see tag log below.
> >
> > Please pull and let me know if there's any problem.
>
> Looks good, pulled into net-next.
>
> Thanks.
Thanks, pulled into rdma-next.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread