userspace/wrsw_rtud: fix double locking a shmem on write

Remove excessive locks from the function delete_htab_entry. Function rtu_fd_commit is always guarded with shmem lock. The function rtu_fd_commit calls rtu_hw_commit, which calls delete_htab_entry. By this function wrs_shm_write with a parameter WRS_SHM_WRITE_BEGIN was called twice before it was called twice with a parameter WRS_SHM_WRITE_END. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/wrsw_rtud: fix double locking a shmem on write
Remove excessive locks from the function delete_htab_entry. Function rtu_fd_commit is always guarded with shmem lock. The function rtu_fd_commit calls rtu_hw_commit, which calls delete_htab_entry. By this function wrs_shm_write with a parameter WRS_SHM_WRITE_BEGIN was called twice before it was called twice with a parameter WRS_SHM_WRITE_END. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
2305ff10 · Adam Wujek · 1b6788cb · 2305ff10
Commit 2305ff10 authored Sep 13, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

rtu_fd.c userspace/wrsw_rtud/rtu_fd.c +0 -3

No files found.
--- a/userspace/wrsw_rtud/rtu_fd.c
+++ b/userspace/wrsw_rtud/rtu_fd.c
@@ -674,8 +674,6 @@ static void delete_htab_entry(struct rtu_addr addr)
 {
 	int i, n_buckets = htab_count_buckets(addr);

-	wrs_shm_write(rtu_port_shmem, WRS_SHM_WRITE_BEGIN);
-
 	pr_info("Deleted entry for MAC %s : hash %03x:%d.\n",
 	      mac_to_string(rtu_htab[addr.hash][addr.bucket].mac), addr.hash,
 	      addr.bucket);
@@ -697,7 +695,6 @@ static void delete_htab_entry(struct rtu_addr addr)
 				     &rtu_htab[a.hash][a.bucket],
 				     (i == n_buckets - 1) ? 1 : 0);
 	}
-	wrs_shm_write(rtu_port_shmem, WRS_SHM_WRITE_END);
 }

 static void rtu_hw_commit(void)