xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDMA/uverbs: Reduce number of command header flags checks

Browse Source 
Simplify the code by directly checking the availability of extended
command flog instead of doing multiple shift operations.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Leon Romanovsky
2018-02-21 18:12:43 +02:00
committed by Doug Ledford
parent cd35cf4b40
commit 372e15c5db
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/infiniband/core/uverbs_main.c
View File

@@ -657,19 +657,12 @@ static bool verify_command_idx(u32 command, bool extended)
static ssize_t process_hdr(struct ib_uverbs_cmd_hdr *hdr, static ssize_t process_hdr(struct ib_uverbs_cmd_hdr *hdr,
u32 *command, bool *extended) u32 *command, bool *extended)
{ {
u32 flags; if (hdr->command & ~(u32)(IB_USER_VERBS_CMD_FLAG_EXTENDED |
if (hdr->command & ~(u32)(IB_USER_VERBS_CMD_FLAGS_MASK |
IB_USER_VERBS_CMD_COMMAND_MASK)) IB_USER_VERBS_CMD_COMMAND_MASK))
return -EINVAL; return -EINVAL;
*command = hdr->command & IB_USER_VERBS_CMD_COMMAND_MASK; *command = hdr->command & IB_USER_VERBS_CMD_COMMAND_MASK;
flags = (hdr->command & *extended = hdr->command & IB_USER_VERBS_CMD_FLAG_EXTENDED;
IB_USER_VERBS_CMD_FLAGS_MASK) >> IB_USER_VERBS_CMD_FLAGS_SHIFT;
*extended = flags & IB_USER_VERBS_CMD_FLAG_EXTENDED;
if (flags & ~IB_USER_VERBS_CMD_FLAG_EXTENDED)
return -EINVAL;
if (!verify_command_idx(*command, *extended)) if (!verify_command_idx(*command, *extended))
return -EOPNOTSUPP; return -EOPNOTSUPP;

5
include/uapi/rdma/ib_user_verbs.h
View File

@@ -141,10 +141,7 @@ struct ib_uverbs_cq_moderation_caps {
*/ */
#define IB_USER_VERBS_CMD_COMMAND_MASK 0xff #define IB_USER_VERBS_CMD_COMMAND_MASK 0xff
#define IB_USER_VERBS_CMD_FLAGS_MASK 0xff000000u #define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80000000u
#define IB_USER_VERBS_CMD_FLAGS_SHIFT 24
#define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80
struct ib_uverbs_cmd_hdr { struct ib_uverbs_cmd_hdr {
__u32 command; __u32 command;