RE: [PATCH v2 net-next 10/13] net: enetc: extract enetc_int_vector_init/destroy() from enetc_alloc_msix()

From: Wei Fang
Date: Wed Oct 16 2024 - 01:34:50 EST


> > +static int enetc_int_vector_init(struct enetc_ndev_priv *priv, int i,
> > + int v_tx_rings)
> > +{
> > + struct enetc_int_vector *v __free(kfree);
> > + struct enetc_bdr *bdr;
> > + int j, err;
> > +
> > + v = kzalloc(struct_size(v, tx_ring, v_tx_rings), GFP_KERNEL);
> > + if (!v)
> > + return -ENOMEM;
> > +
> > + bdr = &v->rx_ring;
> > + bdr->index = i;
> > + bdr->ndev = priv->ndev;
> > + bdr->dev = priv->dev;
> > + bdr->bd_count = priv->rx_bd_count;
> > + bdr->buffer_offset = ENETC_RXB_PAD;
> > + priv->rx_ring[i] = bdr;
> > +
> > + err = xdp_rxq_info_reg(&bdr->xdp.rxq, priv->ndev, i, 0);
> > + if (err)
> > + return err;
> > +
> > + err = xdp_rxq_info_reg_mem_model(&bdr->xdp.rxq,
> > + MEM_TYPE_PAGE_SHARED, NULL);
> > + if (err) {
> > + xdp_rxq_info_unreg(&bdr->xdp.rxq);
> > + return err;
> > + }
> > +
> > + /* init defaults for adaptive IC */
> > + if (priv->ic_mode & ENETC_IC_RX_ADAPTIVE) {
> > + v->rx_ictt = 0x1;
> > + v->rx_dim_en = true;
> > + }
> > +
> > + INIT_WORK(&v->rx_dim.work, enetc_rx_dim_work);
> > + netif_napi_add(priv->ndev, &v->napi, enetc_poll);
> > + v->count_tx_rings = v_tx_rings;
> > +
> > + for (j = 0; j < v_tx_rings; j++) {
> > + int idx;
> > +
> > + /* default tx ring mapping policy */
> > + idx = priv->bdr_int_num * j + i;
> > + __set_bit(idx, &v->tx_rings_map);
> > + bdr = &v->tx_ring[j];
> > + bdr->index = idx;
> > + bdr->ndev = priv->ndev;
> > + bdr->dev = priv->dev;
> > + bdr->bd_count = priv->tx_bd_count;
> > + priv->tx_ring[idx] = bdr;
> > + }
> > +
> > + priv->int_vector[i] = no_free_ptr(v);
>
> This is new, and looks like it's a fix on its own. It's fixing a dangling reference in
> int_vectror[i],
> if I'm not wrong.

This is slightly different from the original code, using cleanup to manage
dynamically allocated memory resources.

>
> Other than that, like for the original patch:
> Reviewed-by: Claudiu Manoil <claudiu.manoil@xxxxxxx>