Skip to contentSkip to conversation

ath11k: Clean ups in ath11k_ce_rx_buf_enqueue_pipe() error path

PATCH In review Vasanthakumar Thiagarajan 2 participants 6 messages Sep 25, 2019 – Sep 27, 2019 Qualcomm Atheros ATH11K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ath11k: Clean ups in ath11k_ce_rx_buf_enqueue_pipe() error path

Unify the unlock/ring_access_end calls with error path in ath11k_ce_rx_buf_enqueue_pipe(). Update to ce_pipe->rx_buf_needed is done inside srng->lock before ath11k_hal_srng_access_end(). Also rename the goto label from err to exit.

---
 drivers/net/wireless/ath/ath11k/ce.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath11k/ce.c +4 -9
index c1b170c..205f28e 100644
@@ -131,13 +131,13 @@ static int ath11k_ce_rx_buf_enqueue_pipe(struct ath11k_ce_pipe *pipe,
 
 	if (unlikely(ath11k_hal_srng_src_num_free(ab, srng, false) < 1)) {
 		ret = -ENOSPC;
-		goto err;
+		goto exit;
 	}
 
 	desc = ath11k_hal_srng_src_get_next_entry(ab, srng);
 	if (!desc) {
 		ret = -ENOSPC;
-		goto err;
+		goto exit;
 	}
 
 	ath11k_hal_ce_dst_set_desc(desc, paddr);
@@ -146,15 +146,10 @@ static int ath11k_ce_rx_buf_enqueue_pipe(struct ath11k_ce_pipe *pipe,
 	write_index = CE_RING_IDX_INCR(nentries_mask, write_index);
 	ring->write_index = write_index;
 
-	ath11k_hal_srng_access_end(ab, srng);
-
-	spin_unlock_bh(&srng->lock);
-
 	pipe->rx_buf_needed--;
 
-	return 0;
-
-err:
+	ret = 0;
+exit:
 	ath11k_hal_srng_access_end(ab, srng);
 
 	spin_unlock_bh(&srng->lock);
Signature · 7 lines
1.9.1


_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#1 lore raw

PATCH 2/3 ath11k: Clean up parameter list in ath11k_ce_completed_send_next()

Make ath11k_ce_completed_send_next() to return skb instead of through a double pointer argument of type sk_buff.

---
 drivers/net/wireless/ath/ath11k/ce.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath11k/ce.c +6 -7
index 205f28e..03e7cf0 100644
@@ -296,15 +296,14 @@ static void ath11k_ce_recv_process_cb(struct ath11k_ce_pipe *pipe)
 	}
 }
 
-static int ath11k_ce_completed_send_next(struct ath11k_ce_pipe *pipe,
-					 struct sk_buff **skb)
+static struct sk_buff *ath11k_ce_completed_send_next(struct ath11k_ce_pipe *pipe)
 {
 	struct ath11k_base *ab = pipe->ab;
 	struct hal_srng *srng;
 	unsigned int sw_index;
 	unsigned int nentries_mask;
+	struct sk_buff *skb;
 	u32 *desc;
-	int ret = 0;
 
 	spin_lock_bh(&ab->ce.ce_lock);
 
@@ -319,11 +318,11 @@ static int ath11k_ce_completed_send_next(struct ath11k_ce_pipe *pipe,
 
 	desc = ath11k_hal_srng_src_reap_next(ab, srng);
 	if (!desc) {
-		ret = -EIO;
+		skb = ERR_PTR(-EIO);
 		goto err_unlock;
 	}
 
-	*skb = pipe->src_ring->skb[sw_index];
+	skb = pipe->src_ring->skb[sw_index];
 
 	pipe->src_ring->skb[sw_index] = NULL;
 
@@ -335,7 +334,7 @@ static int ath11k_ce_completed_send_next(struct ath11k_ce_pipe *pipe,
 
 	spin_unlock_bh(&ab->ce.ce_lock);
 
-	return ret;
+	return skb;
 }
 
 static void ath11k_ce_send_done_cb(struct ath11k_ce_pipe *pipe)
@@ -343,7 +342,7 @@ static void ath11k_ce_send_done_cb(struct ath11k_ce_pipe *pipe)
 	struct ath11k_base *ab = pipe->ab;
 	struct sk_buff *skb;
 
-	while (ath11k_ce_completed_send_next(pipe, &skb) == 0) {
+	while (!IS_ERR(skb = ath11k_ce_completed_send_next(pipe))) {
 		if (!skb)
 			continue;
 
Signature · 7 lines
1.9.1


_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#2 lore raw

PATCH 3/3 ath11k: Use struct_size() to get the structure size with trailing array

In reply to Vasanthakumar Thiagarajan

The size calculation of struct ath11k_ce_ring with trailing skb array got simplified with struct_size() kernel macro.

---
 drivers/net/wireless/ath/ath11k/ce.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/ce.c +1 -2
index 03e7cf0..daeab0f 100644
@@ -406,8 +406,7 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab,
 	struct ath11k_ce_ring *ce_ring;
 	dma_addr_t base_addr;
 
-	ce_ring = kzalloc(sizeof(*ce_ring) + (nentries * sizeof(*ce_ring->skb)),
-			  GFP_KERNEL);
+	ce_ring = kzalloc(struct_size(ce_ring, skb, nentries), GFP_KERNEL);
 	if (ce_ring == NULL)
 		return ERR_PTR(-ENOMEM);
 
Signature · 7 lines
1.9.1


_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#3 lore raw
In reply to Vasanthakumar Thiagarajan
Quoted 7 lines · Vasanthakumar Thiagarajan

Unify the unlock/ring_access_end calls with error path in ath11k_ce_rx_buf_enqueue_pipe(). Update to ce_pipe->rx_buf_needed is done inside srng->lock before ath11k_hal_srng_access_end(). Also rename the goto label from err to exit.

3 patches applied to ath11k-post-bringup branch of ath.git, thanks.

d28909b5a9ac ath11k: Clean ups in ath11k_ce_rx_buf_enqueue_pipe() error path 759b5305b0bc ath11k: Clean up parameter list in ath11k_ce_completed_send_next() 51725f95094a ath11k: Use struct_size() to get the structure size with trailing array

Signature · 9 lines
https://patchwork.kernel.org/patch/11160007/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#4 lore raw
Quoted 7 lines · Kalle Valo
Quoted 5 lines · Vasanthakumar Thiagarajan

Unify the unlock/ring_access_end calls with error path in ath11k_ce_rx_buf_enqueue_pipe(). Update to ce_pipe->rx_buf_needed is done inside srng->lock before ath11k_hal_srng_access_end(). Also rename the goto label from err to exit.

Quoted 8 lines
Quoted 2 lines

3 patches applied to ath11k-post-bringup branch of ath.git, thanks.

d28909b5a9ac ath11k: Clean ups in ath11k_ce_rx_buf_enqueue_pipe() error path 759b5305b0bc ath11k: Clean up parameter list in ath11k_ce_completed_send_next() 51725f95094a ath11k: Use struct_size() to get the structure size with trailing array

Please disregard, I applied to a wrong branch.

Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#5 lore raw
In reply to Vasanthakumar Thiagarajan
Quoted 7 lines · Vasanthakumar Thiagarajan

Unify the unlock/ring_access_end calls with error path in ath11k_ce_rx_buf_enqueue_pipe(). Update to ce_pipe->rx_buf_needed is done inside srng->lock before ath11k_hal_srng_access_end(). Also rename the goto label from err to exit.

3 patches applied to ath11k-bringup branch of ath.git, thanks.

8cc72b480777 ath11k: Clean ups in ath11k_ce_rx_buf_enqueue_pipe() error path 9f55e5658237 ath11k: Clean up parameter list in ath11k_ce_completed_send_next() 3dcb3e76a260 ath11k: Use struct_size() to get the structure size with trailing array

Signature · 9 lines
https://patchwork.kernel.org/patch/11160007/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k