Skip to contentSkip to conversation

ice: Change type for queue counts

PATCH Superseded Tony Nguyen 3 participants 3 messages Jun 28, 2019 – Jul 4, 2019

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Tony Nguyen

author maintainer
#0 lore raw

PATCH v2 14/15 ice: Change type for queue counts

From: Pawel Kaminski <[email protected]>

A negative queue count should never exist, change the type to unsigned to convey that.

---
v2: Change type from u16 to unsigned int
Reword commit message

 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +7 -7
index f2ebbe83ae4c..b8fc08c1d365 100644
@@ -2339,11 +2339,11 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
 	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
 	struct virtchnl_vf_res_request *vfres =
 		(struct virtchnl_vf_res_request *)msg;
-	int req_queues = vfres->num_queue_pairs;
+	unsigned int req_queues = vfres->num_queue_pairs;
+	unsigned int max_allowed_vf_queues;
+	unsigned int tx_rx_queue_left;
 	struct ice_pf *pf = vf->pf;
-	int max_allowed_vf_queues;
-	int tx_rx_queue_left;
-	int cur_queues;
+	unsigned int cur_queues;
 
 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
 		v_ret = VIRTCHNL_STATUS_ERR_PARAM;
@@ -2353,10 +2353,10 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
 	cur_queues = vf->num_vf_qs;
 	tx_rx_queue_left = min_t(int, pf->q_left_tx, pf->q_left_rx);
 	max_allowed_vf_queues = tx_rx_queue_left + cur_queues;
-	if (req_queues <= 0) {
+	if (!req_queues) {
 		dev_err(&pf->pdev->dev,
-			"VF %d tried to request %d queues. Ignoring.\n",
-			vf->vf_id, req_queues);
+			"VF %d tried to request 0 queues. Ignoring.\n",
+			vf->vf_id);
 	} else if (req_queues > ICE_MAX_BASE_QS_PER_VF) {
 		dev_err(&pf->pdev->dev,
 			"VF %d tried to request more than %d queues.\n",
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 14/15 ice: Change type for queue counts

Quoted 14 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, June 28, 2019 8:04 AM
To: intel-wired-lan at lists.osuosl.org
Cc: pmenzel at molgen.mpg.de
Subject: [Intel-wired-lan] [PATCH S23 v2 14/15] ice: Change type for queue counts

From: Pawel Kaminski <[email protected]>

A negative queue count should never exist, change the type to unsigned to convey that.

Quoted 7 lines

---
v2: Change type from u16 to unsigned int
Reword commit message

 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
#2 lore raw

PATCH v2 14/15 ice: Change type for queue counts

In reply to Tony Nguyen

Dear Tony, dear Pawel,

Quoted 9 lines · Tony Nguyen

From: Pawel Kaminski <[email protected]>

A negative queue count should never exist, change the type to unsigned to convey that.

---
v2: Change type from u16 to unsigned int
Reword commit message

Thank you.

Also suggestion for a more specific commit message summary.

Quoted 10 lines

ice: Use unsigned types for queue counts

 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +0 -0
index f2ebbe83ae4c..b8fc08c1d365 100644

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg) · line 2342

Quoted 5 lines
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +1 -1
@@ -2339,11 +2339,11 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
 	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
 	struct virtchnl_vf_res_request *vfres =
 		(struct virtchnl_vf_res_request *)msg;
-	int req_queues = vfres->num_queue_pairs;
+	unsigned int req_queues = vfres->num_queue_pairs;

Looking at the struct definition again, there actually u16 is used.

    /* VF resource request */
    struct virtchnl_vf_res_request {
            u16 num_queue_pairs;
    };

So only for req_queues it might be indeed good to match the type. Sorry for not checking that before, and I do not know if it is important, as I am not a C expert.

Quoted 14 lines
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +3 -3
+	unsigned int max_allowed_vf_queues;
+	unsigned int tx_rx_queue_left;
 	struct ice_pf *pf = vf->pf;
-	int max_allowed_vf_queues;
-	int tx_rx_queue_left;
-	int cur_queues;
+	unsigned int cur_queues;
 
 	if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
 		v_ret = VIRTCHNL_STATUS_ERR_PARAM;
@@ -2353,10 +2353,10 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
 	cur_queues = vf->num_vf_qs;
 	tx_rx_queue_left = min_t(int, pf->q_left_tx, pf->q_left_rx);
 	max_allowed_vf_queues = tx_rx_queue_left + cur_queues;

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg) · line 2362

Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +3 -3
-	if (req_queues <= 0) {
+	if (!req_queues) {
 		dev_err(&pf->pdev->dev,
-			"VF %d tried to request %d queues. Ignoring.\n",
-			vf->vf_id, req_queues);
+			"VF %d tried to request 0 queues. Ignoring.\n",
+			vf->vf_id);
 	} else if (req_queues > ICE_MAX_BASE_QS_PER_VF) {
 		dev_err(&pf->pdev->dev,
 			"VF %d tried to request more than %d queues.\n",

There are more messages where the value of req_queues is printed. Do the format specifiers need to be changed from %d to %u?

Kind regards,

Paul

Quoted 1 line

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5174 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20190704/48a90efc/attachment.p7s>