gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user_sdma: fix use of uninitialized variable (vl)

Browse Source 
This defines a single field in hfi1_pportdata, getting offset
from dwarf headers -- need to compute that at configure time
This commit is contained in:
Dominique Martinet
2017-09-15 11:14:00 +09:00
committed by Balazs Gerofi
parent 73cc07f98e
commit 2dc85ee417
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/include/hfi1/hfi.h
View File

@@ -816,7 +816,19 @@ struct hfi1_pportdata {
#ifndef __HFI1_ORIG__ #ifndef __HFI1_ORIG__
struct hfi1_pportdata { struct hfi1_pportdata {
char _padding[1899]; // TODO: compute this offset automatically from kernel we're basing off
/*
$ objdump --dwarf $(modinfo -n hfi1) | \
awk '/DW_AT_name.*: vls_operational/ {
while (getline) {
if (/DW_AT_data_member_location/) {
print $NF; exit;
}
}
}'
-> 1899
*/
u8 vls_operational;
}; };
#endif /* __HFI1_ORIG__ */ #endif /* __HFI1_ORIG__ */
@@ -1509,7 +1521,7 @@ struct hfi1_devdata {
send_routine process_pio_send ____cacheline_aligned_in_smp; send_routine process_pio_send ____cacheline_aligned_in_smp;
send_routine process_dma_send; send_routine process_dma_send;
void *pio_inline_send; //void (*pio_inline_send)(struct hfi1_devdata *dd, struct pio_buf *pbuf,u64 pbc, const void *from, size_t count); void *pio_inline_send; //void (*pio_inline_send)(struct hfi1_devdata *dd, struct pio_buf *pbuf,u64 pbc, const void *from, size_t count);
void *pport; //struct hfi1_pportdata *pport; struct hfi1_pportdata *pport;
void **rcd; //struct hfi1_ctxtdata **rcd; void **rcd; //struct hfi1_ctxtdata **rcd;
u64 __percpu *int_counter; u64 __percpu *int_counter;
@@ -1790,6 +1802,10 @@ static inline void pause_for_credit_return(struct hfi1_devdata *dd)
udelay(usec ? usec : 1); udelay(usec ? usec : 1);
} }
#endif /* __HFI1_ORIG__ */
#define OPA_MAX_SCS 32 // from opa_smi.h
/** /**
* sc_to_vlt() reverse lookup sc to vl * sc_to_vlt() reverse lookup sc to vl
* @dd - devdata * @dd - devdata
@@ -1797,20 +1813,12 @@ static inline void pause_for_credit_return(struct hfi1_devdata *dd)
*/ */
static inline u8 sc_to_vlt(struct hfi1_devdata *dd, u8 sc5) static inline u8 sc_to_vlt(struct hfi1_devdata *dd, u8 sc5)
{ {
unsigned seq;
u8 rval;
if (sc5 >= OPA_MAX_SCS) if (sc5 >= OPA_MAX_SCS)
return (u8)(0xff); return (u8)(0xff);
do { return *(((u8 *)dd->sc2vl) + sc5);
seq = read_seqbegin(&dd->sc2vl_lock);
rval = *(((u8 *)dd->sc2vl) + sc5);
} while (read_seqretry(&dd->sc2vl_lock, seq));
return rval;
} }
#ifdef __HFI1_ORIG__
#define PKEY_MEMBER_MASK 0x8000 #define PKEY_MEMBER_MASK 0x8000
#define PKEY_LOW_15_MASK 0x7fff #define PKEY_LOW_15_MASK 0x7fff

5
kernel/user_sdma.c
View File

@@ -909,8 +909,6 @@ int hfi1_user_sdma_process_request(void *private_data, struct iovec *iovec,
} }
TP("- (opcode & USER_OPCODE_CHECK_MASK) !="); TP("- (opcode & USER_OPCODE_CHECK_MASK) !=");
// TODO: Enable this validation and checking
#ifdef __HFI1_ORIG__
/* /*
* Validate the vl. Do not trust packets from user space blindly. * Validate the vl. Do not trust packets from user space blindly.
* VL comes from PBC, SC comes from LRH, and the VL needs to * VL comes from PBC, SC comes from LRH, and the VL needs to
@@ -925,7 +923,8 @@ int hfi1_user_sdma_process_request(void *private_data, struct iovec *iovec,
ret = -EINVAL; ret = -EINVAL;
goto free_req; goto free_req;
} }
// TODO: Enable this validation and checking
#ifdef __HFI1_ORIG__
/* Checking P_KEY for requests from user-space */ /* Checking P_KEY for requests from user-space */
if (egress_pkey_check(dd->pport, req->hdr.lrh, req->hdr.bth, sc, if (egress_pkey_check(dd->pport, req->hdr.lrh, req->hdr.bth, sc,
PKEY_CHECK_INVALID)) { PKEY_CHECK_INVALID)) {