From 2dc85ee417ff19261c16862103c910042c116d1d Mon Sep 17 00:00:00 2001
From: Dominique Martinet <dominique.martinet@cea.fr>
Date: Fri, 15 Sep 2017 11:14:00 +0900
Subject: [PATCH] user_sdma: fix use of uninitialized variable (vl)

This defines a single field in hfi1_pportdata, getting offset
from dwarf headers -- need to compute that at configure time
---
 kernel/include/hfi1/hfi.h | 32 ++++++++++++++++++++------------
 kernel/user_sdma.c        |  5 ++---
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/kernel/include/hfi1/hfi.h b/kernel/include/hfi1/hfi.h
index b59f2a57..3a820135 100644
--- a/kernel/include/hfi1/hfi.h
+++ b/kernel/include/hfi1/hfi.h
@@ -816,7 +816,19 @@ struct hfi1_pportdata {
 
 #ifndef __HFI1_ORIG__
 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__ */
 
@@ -1509,7 +1521,7 @@ struct hfi1_devdata {
 	send_routine process_pio_send ____cacheline_aligned_in_smp;
 	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 *pport; //struct hfi1_pportdata *pport;
+	struct hfi1_pportdata *pport;
 
 	void **rcd; //struct hfi1_ctxtdata **rcd;
 	u64 __percpu *int_counter;
@@ -1790,6 +1802,10 @@ static inline void pause_for_credit_return(struct hfi1_devdata *dd)
 	udelay(usec ? usec : 1);
 }
 
+#endif /* __HFI1_ORIG__ */
+
+#define OPA_MAX_SCS                             32 // from opa_smi.h
+
 /**
  * sc_to_vlt() reverse lookup sc to vl
  * @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)
 {
-	unsigned seq;
-	u8 rval;
-
 	if (sc5 >= OPA_MAX_SCS)
 		return (u8)(0xff);
 
-	do {
-		seq = read_seqbegin(&dd->sc2vl_lock);
-		rval = *(((u8 *)dd->sc2vl) + sc5);
-	} while (read_seqretry(&dd->sc2vl_lock, seq));
-
-	return rval;
+	return *(((u8 *)dd->sc2vl) + sc5);
 }
-
+#ifdef __HFI1_ORIG__
 #define PKEY_MEMBER_MASK 0x8000
 #define PKEY_LOW_15_MASK 0x7fff
 
diff --git a/kernel/user_sdma.c b/kernel/user_sdma.c
index 607b9fae..ed207a40 100644
--- a/kernel/user_sdma.c
+++ b/kernel/user_sdma.c
@@ -909,8 +909,6 @@ int hfi1_user_sdma_process_request(void *private_data, struct iovec *iovec,
 	}
 	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.
 	 * 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;
 		goto free_req;
 	}
-
+// TODO: Enable this validation and checking
+#ifdef __HFI1_ORIG__
 	/* Checking P_KEY for requests from user-space */
 	if (egress_pkey_check(dd->pport, req->hdr.lrh, req->hdr.bth, sc,
 			      PKEY_CHECK_INVALID)) {