From: Simon Horman <simon.horman@corigine•com>
To: Piotr Raczynski <piotr.raczynski@intel•com>
Cc: intel-wired-lan@osuosl•org, netdev@vger•kernel.org,
michal.swiatkowski@intel•com, shiraz.saleem@intel•com,
jacob.e.keller@intel•com, sridhar.samudrala@intel•com,
jesse.brandeburg@intel•com, aleksander.lobakin@intel•com,
lukasz.czapnik@intel•com,
Michal Swiatkowski <michal.swiatkowski@linux•intel.com>,
Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel•com>
Subject: Re: [PATCH net-next v4 6/8] ice: add individual interrupt allocation
Date: Mon, 8 May 2023 21:51:28 +0200 [thread overview]
Message-ID: <ZFlSwEyiMXMK8uxz@corigine.com> (raw)
In-Reply-To: <20230508124321.2927867-7-piotr.raczynski@intel.com>
On Mon, May 08, 2023 at 02:43:19PM +0200, Piotr Raczynski wrote:
> Currently interrupt allocations, depending on a feature are distributed
> in batches. Also, after allocation there is a series of operations that
> distributes per irq settings through that batch of interrupts.
>
> Although driver does not yet support dynamic interrupt allocation, keep
> allocated interrupts in a pool and add allocation abstraction logic to
> make code more flexible. Keep per interrupt information in the
> ice_q_vector structure, which yields ice_vsi::base_vector redundant.
> Also, as a result there are a few functions that can be removed.
>
> Reviewed-by: Jacob Keller <jacob.e.keller@intel•com>
> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux•intel.com>
> Reviewed-by: Simon Horman <simon.horman@corigine•com>
> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel•com> (A Contingent worker at Intel)
> Signed-off-by: Piotr Raczynski <piotr.raczynski@intel•com>
...
> diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
> index 1911d644dfa8..7dd7a0f32471 100644
> --- a/drivers/net/ethernet/intel/ice/ice_base.c
> +++ b/drivers/net/ethernet/intel/ice/ice_base.c
> @@ -105,8 +105,7 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx)
> struct ice_q_vector *q_vector;
>
> /* allocate q_vector */
> - q_vector = devm_kzalloc(ice_pf_to_dev(pf), sizeof(*q_vector),
> - GFP_KERNEL);
> + q_vector = kzalloc(sizeof(*q_vector), GFP_KERNEL);
> if (!q_vector)
> return -ENOMEM;
>
> @@ -118,9 +117,31 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx)
> q_vector->rx.itr_mode = ITR_DYNAMIC;
> q_vector->tx.type = ICE_TX_CONTAINER;
> q_vector->rx.type = ICE_RX_CONTAINER;
> + q_vector->irq.index = -ENOENT;
>
> - if (vsi->type == ICE_VSI_VF)
> + if (vsi->type == ICE_VSI_VF) {
> + q_vector->reg_idx = ice_calc_vf_reg_idx(vsi->vf, q_vector);
> goto out;
> + } else if (vsi->type == ICE_VSI_CTRL && vsi->vf) {
> + struct ice_vsi *ctrl_vsi = ice_get_vf_ctrl_vsi(pf, vsi);
> +
> + if (ctrl_vsi) {
> + if (unlikely(!ctrl_vsi->q_vectors))
> + return -ENOENT;
Hi Piotr,
Smatch tells me that q_vector i leaked here.
> + q_vector->irq = ctrl_vsi->q_vectors[0]->irq;
> + goto skip_alloc;
> + }
> + }
> +
> + q_vector->irq = ice_alloc_irq(pf);
> + if (q_vector->irq.index < 0) {
> + kfree(q_vector);
> + return -ENOMEM;
> + }
> +
> +skip_alloc:
> + q_vector->reg_idx = q_vector->irq.index;
> +
> /* only set affinity_mask if the CPU is online */
> if (cpu_online(v_idx))
> cpumask_set_cpu(v_idx, &q_vector->affinity_mask);
next prev parent reply other threads:[~2023-05-08 19:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-08 12:43 [PATCH net-next v4 0/8] ice: support dynamic interrupt allocation Piotr Raczynski
2023-05-08 12:43 ` [PATCH net-next v4 1/8] ice: move interrupt related code to separate file Piotr Raczynski
2023-05-08 12:43 ` [PATCH net-next v4 2/8] ice: use pci_irq_vector helper function Piotr Raczynski
2023-05-08 12:43 ` [PATCH net-next v4 3/8] ice: use preferred MSIX allocation api Piotr Raczynski
2023-05-08 12:43 ` [PATCH net-next v4 4/8] ice: refactor VF control VSI interrupt handling Piotr Raczynski
2023-05-08 19:53 ` Simon Horman
2023-05-08 12:43 ` [PATCH net-next v4 5/8] ice: remove redundant SRIOV code Piotr Raczynski
2023-05-08 12:43 ` [PATCH net-next v4 6/8] ice: add individual interrupt allocation Piotr Raczynski
2023-05-08 19:51 ` Simon Horman [this message]
2023-05-12 15:55 ` Piotr Raczynski
2023-05-08 12:43 ` [PATCH net-next v4 7/8] ice: track interrupt vectors with xarray Piotr Raczynski
2023-05-08 12:43 ` [PATCH net-next v4 8/8] ice: add dynamic interrupt allocation Piotr Raczynski
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=ZFlSwEyiMXMK8uxz@corigine.com \
--to=simon.horman@corigine$(echo .)com \
--cc=aleksander.lobakin@intel$(echo .)com \
--cc=himasekharx.reddy.pucha@intel$(echo .)com \
--cc=intel-wired-lan@osuosl$(echo .)org \
--cc=jacob.e.keller@intel$(echo .)com \
--cc=jesse.brandeburg@intel$(echo .)com \
--cc=lukasz.czapnik@intel$(echo .)com \
--cc=michal.swiatkowski@intel$(echo .)com \
--cc=michal.swiatkowski@linux$(echo .)intel.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=piotr.raczynski@intel$(echo .)com \
--cc=shiraz.saleem@intel$(echo .)com \
--cc=sridhar.samudrala@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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