From: Michal Schmidt <mschmidt@redhat.com>
To: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Karol Kolacinski <karol.kolacinski@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
Simon Horman <simon.horman@corigine.com>,
Michal Michalik <michal.michalik@intel.com>,
Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>,
Petr Oros <poros@redhat.com>, Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH net-next v2 5/6] ice: remove unused buffer copy code in ice_sq_send_cmd_retry()
Date: Wed, 12 Apr 2023 10:19:28 +0200 [thread overview]
Message-ID: <20230412081929.173220-6-mschmidt@redhat.com> (raw)
In-Reply-To: <20230412081929.173220-1-mschmidt@redhat.com>
The 'buf_cpy'-related code in ice_sq_send_cmd_retry() looks broken.
'buf' is nowhere copied into 'buf_cpy'.
The reason this does not cause problems is that all commands for which
'is_cmd_for_retry' is true go with a NULL buf.
Let's remove 'buf_cpy'. Add a WARN_ON in case the assumption no longer
holds in the future.
Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
---
drivers/net/ethernet/intel/ice/ice_common.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 3638598d732b..c6200564304e 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -1619,7 +1619,6 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
{
struct ice_aq_desc desc_cpy;
bool is_cmd_for_retry;
- u8 *buf_cpy = NULL;
u8 idx = 0;
u16 opcode;
int status;
@@ -1629,11 +1628,8 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
memset(&desc_cpy, 0, sizeof(desc_cpy));
if (is_cmd_for_retry) {
- if (buf) {
- buf_cpy = kzalloc(buf_size, GFP_KERNEL);
- if (!buf_cpy)
- return -ENOMEM;
- }
+ /* All retryable cmds are direct, without buf. */
+ WARN_ON(buf);
memcpy(&desc_cpy, desc, sizeof(desc_cpy));
}
@@ -1645,17 +1641,12 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
hw->adminq.sq_last_status != ICE_AQ_RC_EBUSY)
break;
- if (buf_cpy)
- memcpy(buf, buf_cpy, buf_size);
-
memcpy(desc, &desc_cpy, sizeof(desc_cpy));
mdelay(ICE_SQ_SEND_DELAY_TIME_MS);
} while (++idx < ICE_SQ_SEND_MAX_EXECUTE);
- kfree(buf_cpy);
-
return status;
}
--
2.39.2
next prev parent reply other threads:[~2023-04-12 8:21 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 8:19 [PATCH net-next v2 0/6] ice: lower CPU usage with GNSS Michal Schmidt
2023-04-12 8:19 ` [PATCH net-next v2 1/6] ice: do not busy-wait to read GNSS data Michal Schmidt
2023-04-14 17:29 ` Kubalewski, Arkadiusz
2023-04-17 11:58 ` Simon Horman
2023-04-20 20:59 ` [Intel-wired-lan] " Mekala, SunithaX D
2023-04-12 8:19 ` [PATCH net-next v2 2/6] ice: increase the GNSS data polling interval to 20 ms Michal Schmidt
2023-04-14 17:28 ` Kubalewski, Arkadiusz
2023-04-17 11:58 ` Simon Horman
2023-04-20 20:59 ` [Intel-wired-lan] " Mekala, SunithaX D
2023-04-12 8:19 ` [PATCH net-next v2 3/6] ice: remove ice_ctl_q_info::sq_cmd_timeout Michal Schmidt
2023-04-14 17:29 ` Kubalewski, Arkadiusz
2023-04-17 11:52 ` Simon Horman
2023-04-20 20:59 ` [Intel-wired-lan] " Mekala, SunithaX D
2023-04-12 8:19 ` [PATCH net-next v2 4/6] ice: sleep, don't busy-wait, for ICE_CTL_Q_SQ_CMD_TIMEOUT Michal Schmidt
2023-04-14 17:29 ` Kubalewski, Arkadiusz
2023-04-17 12:01 ` Simon Horman
2023-04-20 21:07 ` [Intel-wired-lan] " Mekala, SunithaX D
2023-04-12 8:19 ` Michal Schmidt [this message]
2023-04-14 17:29 ` [PATCH net-next v2 5/6] ice: remove unused buffer copy code in ice_sq_send_cmd_retry() Kubalewski, Arkadiusz
2023-04-17 12:02 ` Simon Horman
2023-04-20 20:59 ` [Intel-wired-lan] " Mekala, SunithaX D
2023-04-12 8:19 ` [PATCH net-next v2 6/6] ice: sleep, don't busy-wait, in the SQ send retry loop Michal Schmidt
2023-04-14 17:29 ` Kubalewski, Arkadiusz
2023-04-17 12:03 ` Simon Horman
2023-04-20 20:59 ` [Intel-wired-lan] " Mekala, SunithaX D
2023-04-14 17:29 ` [PATCH net-next v2 0/6] ice: lower CPU usage with GNSS Kubalewski, Arkadiusz
2023-04-20 20:59 ` [Intel-wired-lan] " Mekala, SunithaX D
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230412081929.173220-6-mschmidt@redhat.com \
--to=mschmidt@redhat.com \
--cc=andrew@lunn.ch \
--cc=anthony.l.nguyen@intel.com \
--cc=arkadiusz.kubalewski@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=karol.kolacinski@intel.com \
--cc=michal.michalik@intel.com \
--cc=netdev@vger.kernel.org \
--cc=poros@redhat.com \
--cc=simon.horman@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).