Skip to contentSkip to conversation

remoteproc: qcom: q6v5-mss: Use common error handling code in q6v5_mpss_load()

PATCH In review Markus Elfring 2 participants 2 messages Sep 24, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remoteproc: qcom: q6v5-mss: Use common error handling code in q6v5_mpss_load()

From: Markus Elfring <[email protected]>
Date: Tue, 24 Sep 2024 15:55:06 +0200

Add jump targets so that a bit of exception handling can be better reused at the end of this function implementation.

---
 drivers/remoteproc/qcom_q6v5_mss.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +9 -8
index 2a42215ce8e0..b398ae3083a1 100644
@@ -1451,9 +1451,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
 				dev_err(qproc->dev,
 					"failed to load segment %d from truncated file %s\n",
 					i, fw_name);
-				ret = -EINVAL;
-				memunmap(ptr);
-				goto release_firmware;
+				goto e_inval_unmap;
 			}
 
 			memcpy(ptr, fw->data + phdr->p_offset, phdr->p_filesz);
@@ -1464,18 +1462,15 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
 							ptr, phdr->p_filesz);
 			if (ret) {
 				dev_err(qproc->dev, "failed to load %s\n", fw_name);
-				memunmap(ptr);
-				goto release_firmware;
+				goto unmap_mem;
 			}
 
 			if (seg_fw->size != phdr->p_filesz) {
 				dev_err(qproc->dev,
 					"failed to load segment %d from truncated file %s\n",
 					i, fw_name);
-				ret = -EINVAL;
 				release_firmware(seg_fw);
-				memunmap(ptr);
-				goto release_firmware;
+				goto e_inval_unmap;
 			}
 
 			release_firmware(seg_fw);
@@ -1528,6 +1523,12 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
 	kfree(fw_name);
 
 	return ret < 0 ? ret : 0;
+
+e_inval_unmap:
+	ret = -EINVAL;
+unmap_mem:
+	memunmap(ptr);
+	goto release_firmware;
 }
 
 static void qcom_q6v5_dump_segment(struct rproc *rproc,

--
2.46.1

#1 lore raw
Quoted 16 lines · Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 24 Sep 2024 15:55:06 +0200

Add jump targets so that a bit of exception handling can be better reused at the end of this function implementation.

---
 drivers/remoteproc/qcom_q6v5_mss.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/remoteproc/qcom_q6v5_mss.c +0 -0
index 2a42215ce8e0..b398ae3083a1 100644

drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1454

Quoted 4 lines
drivers/remoteproc/qcom_q6v5_mss.c +0 -1
@@ -1451,9 +1451,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
 				dev_err(qproc->dev,
 					"failed to load segment %d from truncated file %s\n",
 					i, fw_name);
-				ret = -EINVAL;

Please keep error assignment where it is. It is much cleaner to read it this way, rather than checking the error-handling basement.

Quoted 28 lines
drivers/remoteproc/qcom_q6v5_mss.c +3 -7
-				memunmap(ptr);
-				goto release_firmware;
+				goto e_inval_unmap;
 			}
 
 			memcpy(ptr, fw->data + phdr->p_offset, phdr->p_filesz);
@@ -1464,18 +1462,15 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
 							ptr, phdr->p_filesz);
 			if (ret) {
 				dev_err(qproc->dev, "failed to load %s\n", fw_name);
-				memunmap(ptr);
-				goto release_firmware;
+				goto unmap_mem;
 			}
 
 			if (seg_fw->size != phdr->p_filesz) {
 				dev_err(qproc->dev,
 					"failed to load segment %d from truncated file %s\n",
 					i, fw_name);
-				ret = -EINVAL;
 				release_firmware(seg_fw);
-				memunmap(ptr);
-				goto release_firmware;
+				goto e_inval_unmap;
 			}
 
 			release_firmware(seg_fw);

drivers/remoteproc/qcom_q6v5_mss.c static int q6v5_mpss_load(struct q6v5 *qproc) · line 1531

Quoted 9 lines
drivers/remoteproc/qcom_q6v5_mss.c +6 -0
@@ -1528,6 +1523,12 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
 	kfree(fw_name);
 
 	return ret < 0 ? ret : 0;
+
+e_inval_unmap:
+	ret = -EINVAL;
+unmap_mem:
+	memunmap(ptr);
+	goto release_firmware;

Ugh. No. ptr should be a variable that is declared inside the loop. Calling memunmap outside of the for loop is incorrect. And goto just complicates things by adding non-linearity.

Quoted 6 lines
drivers/remoteproc/qcom_q6v5_mss.c +0 -1
 }
 
 static void qcom_q6v5_dump_segment(struct rproc *rproc,
--

2.46.1

Signature · 2 lines
With best wishes
Dmitry