p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dlm: use __le types for rcom messages 

This patch changes to use __le types directly in the dlm rcom
structure which is casted at the right dlm message buffer positions.

The main goal what is reached here is to remove sparse warnings
regarding to host to little byte order conversion or vice versa. Leaving
those sparse issues ignored and always do it in out/in functionality
tends to leave it unknown in which byte order the variable is being
handled.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Alexander Aring 2022-04-04 16:06:40 -04:00 committed by David Teigland
parent 3428785a65
commit 2f9dbeda8d
7 changed files with 52 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/dlm/dlm_internal.h
View File

@ -451,11 +451,11 @@ struct dlm_message {
struct dlm_rcom { struct dlm_rcom {
struct dlm_header rc_header; struct dlm_header rc_header;
uint32_t rc_type; /* DLM_RCOM_ */ __le32 rc_type; /* DLM_RCOM_ */
int rc_result; /* multi-purpose */ __le32 rc_result; /* multi-purpose */
uint64_t rc_id; /* match reply with request */ __le64 rc_id; /* match reply with request */
uint64_t rc_seq; /* sender's ls_recover_seq */ __le64 rc_seq; /* sender's ls_recover_seq */
uint64_t rc_seq_reply; /* remote ls_recover_seq */ __le64 rc_seq_reply; /* remote ls_recover_seq */
char rc_buf[]; char rc_buf[];
}; };

3
fs/dlm/lock.c
View File

@ -5062,8 +5062,7 @@ void dlm_receive_buffer(union dlm_packet *p, int nodeid)
type = p->message.m_type; type = p->message.m_type;
break; break;
case DLM_RCOM: case DLM_RCOM:
dlm_rcom_in(&p->rcom); type = le32_to_cpu(p->rcom.rc_type);
type = p->rcom.rc_type;
break; break;
default: default:
log_print("invalid h_cmd %d from %u", hd->h_cmd, nodeid); log_print("invalid h_cmd %d from %u", hd->h_cmd, nodeid);

9
fs/dlm/member.c
View File

@ -120,18 +120,13 @@ int dlm_slots_copy_in(struct dlm_ls *ls)
ro0 = (struct rcom_slot *)(rc->rc_buf + sizeof(struct rcom_config)); ro0 = (struct rcom_slot *)(rc->rc_buf + sizeof(struct rcom_config));
for (i = 0, ro = ro0; i < num_slots; i++, ro++) {
ro->ro_nodeid = le32_to_cpu(ro->ro_nodeid);
ro->ro_slot = le16_to_cpu(ro->ro_slot);
}
log_slots(ls, gen, num_slots, ro0, NULL, 0); log_slots(ls, gen, num_slots, ro0, NULL, 0);
list_for_each_entry(memb, &ls->ls_nodes, list) { list_for_each_entry(memb, &ls->ls_nodes, list) {
for (i = 0, ro = ro0; i < num_slots; i++, ro++) { for (i = 0, ro = ro0; i < num_slots; i++, ro++) {
if (ro->ro_nodeid != memb->nodeid) if (le32_to_cpu(ro->ro_nodeid) != memb->nodeid)
continue; continue;
memb->slot = ro->ro_slot; memb->slot = le16_to_cpu(ro->ro_slot);
memb->slot_prev = memb->slot; memb->slot_prev = memb->slot;
break; break;
} }

80
fs/dlm/rcom.c
View File

@ -40,10 +40,10 @@ static void _create_rcom(struct dlm_ls *ls, int to_nodeid, int type, int len,
rc->rc_header.h_length = cpu_to_le16(mb_len); rc->rc_header.h_length = cpu_to_le16(mb_len);
rc->rc_header.h_cmd = DLM_RCOM; rc->rc_header.h_cmd = DLM_RCOM;
rc->rc_type = type; rc->rc_type = cpu_to_le32(type);
spin_lock(&ls->ls_recover_lock); spin_lock(&ls->ls_recover_lock);
rc->rc_seq = ls->ls_recover_seq; rc->rc_seq = cpu_to_le64(ls->ls_recover_seq);
spin_unlock(&ls->ls_recover_lock); spin_unlock(&ls->ls_recover_lock);
*rc_ret = rc; *rc_ret = rc;
@ -91,13 +91,11 @@ static int create_rcom_stateless(struct dlm_ls *ls, int to_nodeid, int type,
static void send_rcom(struct dlm_mhandle *mh, struct dlm_rcom *rc) static void send_rcom(struct dlm_mhandle *mh, struct dlm_rcom *rc)
{ {
dlm_rcom_out(rc);
dlm_midcomms_commit_mhandle(mh); dlm_midcomms_commit_mhandle(mh);
} }
static void send_rcom_stateless(struct dlm_msg *msg, struct dlm_rcom *rc) static void send_rcom_stateless(struct dlm_msg *msg, struct dlm_rcom *rc)
{ {
dlm_rcom_out(rc);
dlm_lowcomms_commit_msg(msg); dlm_lowcomms_commit_msg(msg);
dlm_lowcomms_put_msg(msg); dlm_lowcomms_put_msg(msg);
} }
@ -145,10 +143,10 @@ static int check_rcom_config(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
return 0; return 0;
} }
static void allow_sync_reply(struct dlm_ls *ls, uint64_t *new_seq) static void allow_sync_reply(struct dlm_ls *ls, __le64 *new_seq)
{ {
spin_lock(&ls->ls_rcom_spin); spin_lock(&ls->ls_rcom_spin);
*new_seq = ++ls->ls_rcom_seq; *new_seq = cpu_to_le64(++ls->ls_rcom_seq);
set_bit(LSFL_RCOM_WAIT, &ls->ls_flags); set_bit(LSFL_RCOM_WAIT, &ls->ls_flags);
spin_unlock(&ls->ls_rcom_spin); spin_unlock(&ls->ls_rcom_spin);
} }
@ -182,7 +180,7 @@ int dlm_rcom_status(struct dlm_ls *ls, int nodeid, uint32_t status_flags)
if (nodeid == dlm_our_nodeid()) { if (nodeid == dlm_our_nodeid()) {
rc = ls->ls_recover_buf; rc = ls->ls_recover_buf;
rc->rc_result = dlm_recover_status(ls); rc->rc_result = cpu_to_le32(dlm_recover_status(ls));
goto out; goto out;
} }
@ -208,7 +206,7 @@ int dlm_rcom_status(struct dlm_ls *ls, int nodeid, uint32_t status_flags)
rc = ls->ls_recover_buf; rc = ls->ls_recover_buf;
if (rc->rc_result == -ESRCH) { if (rc->rc_result == cpu_to_le32(-ESRCH)) {
/* we pretend the remote lockspace exists with 0 status */ /* we pretend the remote lockspace exists with 0 status */
log_debug(ls, "remote node %d not ready", nodeid); log_debug(ls, "remote node %d not ready", nodeid);
rc->rc_result = 0; rc->rc_result = 0;
@ -259,7 +257,7 @@ static void receive_rcom_status(struct dlm_ls *ls, struct dlm_rcom *rc_in)
rc->rc_id = rc_in->rc_id; rc->rc_id = rc_in->rc_id;
rc->rc_seq_reply = rc_in->rc_seq; rc->rc_seq_reply = rc_in->rc_seq;
rc->rc_result = status; rc->rc_result = cpu_to_le32(status);
set_rcom_config(ls, (struct rcom_config *)rc->rc_buf, num_slots); set_rcom_config(ls, (struct rcom_config *)rc->rc_buf, num_slots);
@ -287,11 +285,11 @@ static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
{ {
spin_lock(&ls->ls_rcom_spin); spin_lock(&ls->ls_rcom_spin);
if (!test_bit(LSFL_RCOM_WAIT, &ls->ls_flags) || if (!test_bit(LSFL_RCOM_WAIT, &ls->ls_flags) ||
rc_in->rc_id != ls->ls_rcom_seq) { le64_to_cpu(rc_in->rc_id) != ls->ls_rcom_seq) {
log_debug(ls, "reject reply %d from %d seq %llx expect %llx", log_debug(ls, "reject reply %d from %d seq %llx expect %llx",
rc_in->rc_type, le32_to_cpu(rc_in->rc_type),
le32_to_cpu(rc_in->rc_header.h_nodeid), le32_to_cpu(rc_in->rc_header.h_nodeid),
(unsigned long long)rc_in->rc_id, (unsigned long long)le64_to_cpu(rc_in->rc_id),
(unsigned long long)ls->ls_rcom_seq); (unsigned long long)ls->ls_rcom_seq);
goto out; goto out;
} }
@ -367,7 +365,7 @@ int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid)
if (error) if (error)
goto out; goto out;
memcpy(rc->rc_buf, r->res_name, r->res_length); memcpy(rc->rc_buf, r->res_name, r->res_length);
rc->rc_id = (unsigned long) r->res_id; rc->rc_id = cpu_to_le64(r->res_id);
send_rcom(mh, rc); send_rcom(mh, rc);
out: out:
@ -383,7 +381,7 @@ static void receive_rcom_lookup(struct dlm_ls *ls, struct dlm_rcom *rc_in)
sizeof(struct dlm_rcom); sizeof(struct dlm_rcom);
/* Old code would send this special id to trigger a debug dump. */ /* Old code would send this special id to trigger a debug dump. */
if (rc_in->rc_id == 0xFFFFFFFF) { if (rc_in->rc_id == cpu_to_le64(0xFFFFFFFF)) {
log_error(ls, "receive_rcom_lookup dump from %d", nodeid); log_error(ls, "receive_rcom_lookup dump from %d", nodeid);
dlm_dump_rsb_name(ls, rc_in->rc_buf, len); dlm_dump_rsb_name(ls, rc_in->rc_buf, len);
return; return;
@ -397,7 +395,7 @@ static void receive_rcom_lookup(struct dlm_ls *ls, struct dlm_rcom *rc_in)
DLM_LU_RECOVER_MASTER, &ret_nodeid, NULL); DLM_LU_RECOVER_MASTER, &ret_nodeid, NULL);
if (error) if (error)
ret_nodeid = error; ret_nodeid = error;
rc->rc_result = ret_nodeid; rc->rc_result = cpu_to_le32(ret_nodeid);
rc->rc_id = rc_in->rc_id; rc->rc_id = rc_in->rc_id;
rc->rc_seq_reply = rc_in->rc_seq; rc->rc_seq_reply = rc_in->rc_seq;
@ -456,7 +454,7 @@ int dlm_send_rcom_lock(struct dlm_rsb *r, struct dlm_lkb *lkb)
rl = (struct rcom_lock *) rc->rc_buf; rl = (struct rcom_lock *) rc->rc_buf;
pack_rcom_lock(r, lkb, rl); pack_rcom_lock(r, lkb, rl);
rc->rc_id = (unsigned long) r; rc->rc_id = cpu_to_le64(r);
send_rcom(mh, rc); send_rcom(mh, rc);
out: out:
@ -510,15 +508,14 @@ int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in)
rc->rc_header.h_length = cpu_to_le16(mb_len); rc->rc_header.h_length = cpu_to_le16(mb_len);
rc->rc_header.h_cmd = DLM_RCOM; rc->rc_header.h_cmd = DLM_RCOM;
rc->rc_type = DLM_RCOM_STATUS_REPLY; rc->rc_type = cpu_to_le32(DLM_RCOM_STATUS_REPLY);
rc->rc_id = rc_in->rc_id; rc->rc_id = rc_in->rc_id;
rc->rc_seq_reply = rc_in->rc_seq; rc->rc_seq_reply = rc_in->rc_seq;
rc->rc_result = -ESRCH; rc->rc_result = cpu_to_le32(-ESRCH);
rf = (struct rcom_config *) rc->rc_buf; rf = (struct rcom_config *) rc->rc_buf;
rf->rf_lvblen = cpu_to_le32(~0U); rf->rf_lvblen = cpu_to_le32(~0U);
dlm_rcom_out(rc);
dlm_midcomms_commit_mhandle(mh); dlm_midcomms_commit_mhandle(mh);
return 0; return 0;
@ -577,27 +574,27 @@ void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
uint64_t seq; uint64_t seq;
switch (rc->rc_type) { switch (rc->rc_type) {
case DLM_RCOM_STATUS_REPLY: case cpu_to_le32(DLM_RCOM_STATUS_REPLY):
reply = 1; reply = 1;
break; break;
case DLM_RCOM_NAMES: case cpu_to_le32(DLM_RCOM_NAMES):
names = 1; names = 1;
break; break;
case DLM_RCOM_NAMES_REPLY: case cpu_to_le32(DLM_RCOM_NAMES_REPLY):
names = 1; names = 1;
reply = 1; reply = 1;
break; break;
case DLM_RCOM_LOOKUP: case cpu_to_le32(DLM_RCOM_LOOKUP):
lookup = 1; lookup = 1;
break; break;
case DLM_RCOM_LOOKUP_REPLY: case cpu_to_le32(DLM_RCOM_LOOKUP_REPLY):
lookup = 1; lookup = 1;
reply = 1; reply = 1;
break; break;
case DLM_RCOM_LOCK: case cpu_to_le32(DLM_RCOM_LOCK):
lock = 1; lock = 1;
break; break;
case DLM_RCOM_LOCK_REPLY: case cpu_to_le32(DLM_RCOM_LOCK_REPLY):
lock = 1; lock = 1;
reply = 1; reply = 1;
break; break;
@ -609,10 +606,10 @@ void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
seq = ls->ls_recover_seq; seq = ls->ls_recover_seq;
spin_unlock(&ls->ls_recover_lock); spin_unlock(&ls->ls_recover_lock);
if (stop && (rc->rc_type != DLM_RCOM_STATUS)) if (stop && (rc->rc_type != cpu_to_le32(DLM_RCOM_STATUS)))
goto ignore; goto ignore;
if (reply && (rc->rc_seq_reply != seq)) if (reply && (le64_to_cpu(rc->rc_seq_reply) != seq))
goto ignore; goto ignore;
if (!(status & DLM_RS_NODES) && (names || lookup || lock)) if (!(status & DLM_RS_NODES) && (names || lookup || lock))
@ -622,59 +619,60 @@ void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
goto ignore; goto ignore;
switch (rc->rc_type) { switch (rc->rc_type) {
case DLM_RCOM_STATUS: case cpu_to_le32(DLM_RCOM_STATUS):
receive_rcom_status(ls, rc); receive_rcom_status(ls, rc);
break; break;
case DLM_RCOM_NAMES: case cpu_to_le32(DLM_RCOM_NAMES):
receive_rcom_names(ls, rc); receive_rcom_names(ls, rc);
break; break;
case DLM_RCOM_LOOKUP: case cpu_to_le32(DLM_RCOM_LOOKUP):
receive_rcom_lookup(ls, rc); receive_rcom_lookup(ls, rc);
break; break;
case DLM_RCOM_LOCK: case cpu_to_le32(DLM_RCOM_LOCK):
if (le16_to_cpu(rc->rc_header.h_length) < lock_size) if (le16_to_cpu(rc->rc_header.h_length) < lock_size)
goto Eshort; goto Eshort;
receive_rcom_lock(ls, rc); receive_rcom_lock(ls, rc);
break; break;
case DLM_RCOM_STATUS_REPLY: case cpu_to_le32(DLM_RCOM_STATUS_REPLY):
receive_sync_reply(ls, rc); receive_sync_reply(ls, rc);
break; break;
case DLM_RCOM_NAMES_REPLY: case cpu_to_le32(DLM_RCOM_NAMES_REPLY):
receive_sync_reply(ls, rc); receive_sync_reply(ls, rc);
break; break;
case DLM_RCOM_LOOKUP_REPLY: case cpu_to_le32(DLM_RCOM_LOOKUP_REPLY):
receive_rcom_lookup_reply(ls, rc); receive_rcom_lookup_reply(ls, rc);
break; break;
case DLM_RCOM_LOCK_REPLY: case cpu_to_le32(DLM_RCOM_LOCK_REPLY):
if (le16_to_cpu(rc->rc_header.h_length) < lock_size) if (le16_to_cpu(rc->rc_header.h_length) < lock_size)
goto Eshort; goto Eshort;
dlm_recover_process_copy(ls, rc); dlm_recover_process_copy(ls, rc);
break; break;
default: default:
log_error(ls, "receive_rcom bad type %d", rc->rc_type); log_error(ls, "receive_rcom bad type %d",
le32_to_cpu(rc->rc_type));
} }
return; return;
ignore: ignore:
log_limit(ls, "dlm_receive_rcom ignore msg %d " log_limit(ls, "dlm_receive_rcom ignore msg %d "
"from %d %llu %llu recover seq %llu sts %x gen %u", "from %d %llu %llu recover seq %llu sts %x gen %u",
rc->rc_type, le32_to_cpu(rc->rc_type),
nodeid, nodeid,
(unsigned long long)rc->rc_seq, (unsigned long long)le64_to_cpu(rc->rc_seq),
(unsigned long long)rc->rc_seq_reply, (unsigned long long)le64_to_cpu(rc->rc_seq_reply),
(unsigned long long)seq, (unsigned long long)seq,
status, ls->ls_generation); status, ls->ls_generation);
return; return;
Eshort: Eshort:
log_error(ls, "recovery message %d from %d is too short", log_error(ls, "recovery message %d from %d is too short",
rc->rc_type, nodeid); le32_to_cpu(rc->rc_type), nodeid);
} }

10
fs/dlm/recover.c
View File

@ -114,7 +114,7 @@ static int wait_status_all(struct dlm_ls *ls, uint32_t wait_status,
if (save_slots) if (save_slots)
dlm_slot_save(ls, rc, memb); dlm_slot_save(ls, rc, memb);
if (rc->rc_result & wait_status) if (le32_to_cpu(rc->rc_result) & wait_status)
break; break;
if (delay < 1000) if (delay < 1000)
delay += 20; delay += 20;
@ -141,7 +141,7 @@ static int wait_status_low(struct dlm_ls *ls, uint32_t wait_status,
if (error) if (error)
break; break;
if (rc->rc_result & wait_status) if (le32_to_cpu(rc->rc_result) & wait_status)
break; break;
if (delay < 1000) if (delay < 1000)
delay += 20; delay += 20;
@ -568,14 +568,14 @@ int dlm_recover_master_reply(struct dlm_ls *ls, struct dlm_rcom *rc)
struct dlm_rsb *r; struct dlm_rsb *r;
int ret_nodeid, new_master; int ret_nodeid, new_master;
r = recover_idr_find(ls, rc->rc_id); r = recover_idr_find(ls, le64_to_cpu(rc->rc_id));
if (!r) { if (!r) {
log_error(ls, "dlm_recover_master_reply no id %llx", log_error(ls, "dlm_recover_master_reply no id %llx",
(unsigned long long)rc->rc_id); (unsigned long long)le64_to_cpu(rc->rc_id));
goto out; goto out;
} }
ret_nodeid = rc->rc_result; ret_nodeid = le32_to_cpu(rc->rc_result);
if (ret_nodeid == dlm_our_nodeid()) if (ret_nodeid == dlm_our_nodeid())
new_master = 0; new_master = 0;

18
fs/dlm/util.c
View File

@ -108,21 +108,3 @@ void dlm_message_in(struct dlm_message *ms)
ms->m_asts = le32_to_cpu(ms->m_asts); ms->m_asts = le32_to_cpu(ms->m_asts);
ms->m_result = from_dlm_errno(le32_to_cpu(ms->m_result)); ms->m_result = from_dlm_errno(le32_to_cpu(ms->m_result));
} }
void dlm_rcom_out(struct dlm_rcom *rc)
{
rc->rc_type = cpu_to_le32(rc->rc_type);
rc->rc_result = cpu_to_le32(rc->rc_result);
rc->rc_id = cpu_to_le64(rc->rc_id);
rc->rc_seq = cpu_to_le64(rc->rc_seq);
rc->rc_seq_reply = cpu_to_le64(rc->rc_seq_reply);
}
void dlm_rcom_in(struct dlm_rcom *rc)
{
rc->rc_type = le32_to_cpu(rc->rc_type);
rc->rc_result = le32_to_cpu(rc->rc_result);
rc->rc_id = le64_to_cpu(rc->rc_id);
rc->rc_seq = le64_to_cpu(rc->rc_seq);
rc->rc_seq_reply = le64_to_cpu(rc->rc_seq_reply);
}

2
fs/dlm/util.h
View File

@ -13,8 +13,6 @@
void dlm_message_out(struct dlm_message *ms); void dlm_message_out(struct dlm_message *ms);
void dlm_message_in(struct dlm_message *ms); void dlm_message_in(struct dlm_message *ms);
void dlm_rcom_out(struct dlm_rcom *rc);
void dlm_rcom_in(struct dlm_rcom *rc);
#endif #endif