| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <Zs3BxMCNEeuBrooo@lzaremba-mobl.ger.corp.intel.com>
Date: Tue, 27 Aug 2024 14:08:36 +0200
From: Larysa Zaremba <larysa.zaremba@...el.com>
To: Brett Creeley <brett.creeley@....com>
CC: <netdev@...r.kernel.org>, <davem@...emloft.net>, <kuba@...nel.org>,
<edumazet@...gle.com>, <pabeni@...hat.com>, <shannon.nelson@....com>
Subject: Re: [PATCH v2 net-next 4/5] ionic: always use rxq_info
On Mon, Aug 26, 2024 at 11:44:21AM -0700, Brett Creeley wrote:
> From: Shannon Nelson <shannon.nelson@....com>
>
> Instead of setting up and tearing down the rxq_info only when the XDP
> program is loaded or unloaded, we will build the rxq_info whether or not
> XDP is in use. This is the more common use pattern and better supports
> future conversion to page_pool. Since the rxq_info wants the napi_id
> we re-order things slightly to tie this into the queue init and deinit
> functions where we do the add and delete of napi.
>
> Signed-off-by: Shannon Nelson <shannon.nelson@....com>
> Signed-off-by: Brett Creeley <brett.creeley@....com>
> ---
> .../net/ethernet/pensando/ionic/ionic_lif.c | 55 +++++++------------
> 1 file changed, 19 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
> index 0fba2df33915..4a7763ec061f 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
> @@ -46,8 +46,9 @@ static int ionic_start_queues(struct ionic_lif *lif);
> static void ionic_stop_queues(struct ionic_lif *lif);
> static void ionic_lif_queue_identify(struct ionic_lif *lif);
>
> -static int ionic_xdp_queues_config(struct ionic_lif *lif);
> -static void ionic_xdp_unregister_rxq_info(struct ionic_queue *q);
> +static void ionic_xdp_queues_config(struct ionic_lif *lif);
> +static int ionic_register_rxq_info(struct ionic_queue *q, unsigned int napi_id);
> +static void ionic_unregister_rxq_info(struct ionic_queue *q);
>
> static void ionic_dim_work(struct work_struct *work)
> {
> @@ -380,6 +381,7 @@ static void ionic_lif_qcq_deinit(struct ionic_lif *lif, struct ionic_qcq *qcq)
> if (!(qcq->flags & IONIC_QCQ_F_INITED))
> return;
>
> + ionic_unregister_rxq_info(&qcq->q);
> if (qcq->flags & IONIC_QCQ_F_INTR) {
> ionic_intr_mask(idev->intr_ctrl, qcq->intr.index,
> IONIC_INTR_MASK_SET);
> @@ -437,9 +439,7 @@ static void ionic_qcq_free(struct ionic_lif *lif, struct ionic_qcq *qcq)
> qcq->sg_base_pa = 0;
> }
>
> - ionic_xdp_unregister_rxq_info(&qcq->q);
> ionic_qcq_intr_free(lif, qcq);
> -
> vfree(qcq->q.info);
> qcq->q.info = NULL;
> }
> @@ -925,6 +925,11 @@ static int ionic_lif_rxq_init(struct ionic_lif *lif, struct ionic_qcq *qcq)
> netif_napi_add(lif->netdev, &qcq->napi, ionic_rx_napi);
> else
> netif_napi_add(lif->netdev, &qcq->napi, ionic_txrx_napi);
> + err = ionic_register_rxq_info(q, qcq->napi.napi_id);
> + if (err) {
> + netif_napi_del(&qcq->napi);
> + return err;
> + }
>
> qcq->flags |= IONIC_QCQ_F_INITED;
>
> @@ -2143,9 +2148,7 @@ static int ionic_txrx_enable(struct ionic_lif *lif)
> int derr = 0;
> int i, err;
>
> - err = ionic_xdp_queues_config(lif);
> - if (err)
> - return err;
> + ionic_xdp_queues_config(lif);
>
> for (i = 0; i < lif->nxqs; i++) {
> if (!(lif->rxqcqs[i] && lif->txqcqs[i])) {
> @@ -2192,8 +2195,6 @@ static int ionic_txrx_enable(struct ionic_lif *lif)
> derr = ionic_qcq_disable(lif, lif->rxqcqs[i], derr);
> }
>
> - ionic_xdp_queues_config(lif);
> -
> return err;
> }
>
> @@ -2651,7 +2652,7 @@ static void ionic_vf_attr_replay(struct ionic_lif *lif)
> ionic_vf_start(ionic);
> }
>
> -static void ionic_xdp_unregister_rxq_info(struct ionic_queue *q)
> +static void ionic_unregister_rxq_info(struct ionic_queue *q)
> {
> struct xdp_rxq_info *xi;
>
> @@ -2665,7 +2666,7 @@ static void ionic_xdp_unregister_rxq_info(struct ionic_queue *q)
> kfree(xi);
> }
>
> -static int ionic_xdp_register_rxq_info(struct ionic_queue *q, unsigned int napi_id)
> +static int ionic_register_rxq_info(struct ionic_queue *q, unsigned int napi_id)
> {
> struct xdp_rxq_info *rxq_info;
> int err;
> @@ -2698,45 +2699,27 @@ static int ionic_xdp_register_rxq_info(struct ionic_queue *q, unsigned int napi_
> return err;
> }
>
> -static int ionic_xdp_queues_config(struct ionic_lif *lif)
> +static void ionic_xdp_queues_config(struct ionic_lif *lif)
I think this function should also get a new name that would reflect the fact
that it is just updating the XDP prog on rings. Also, ionic_xdp_queues_config
sounds a little bit like configuring XDP_TX/xdp_xmit queues, but here we have rx
queues only.
> {
> struct bpf_prog *xdp_prog;
> unsigned int i;
> - int err;
>
> if (!lif->rxqcqs)
> - return 0;
> + return;
>
> - /* There's no need to rework memory if not going to/from NULL program. */
> + /* Nothing to do if not going to/from NULL program. */
> xdp_prog = READ_ONCE(lif->xdp_prog);
> if (!xdp_prog == !lif->rxqcqs[0]->q.xdp_prog)
> - return 0;
> + return;
>
> for (i = 0; i < lif->ionic->nrxqs_per_lif && lif->rxqcqs[i]; i++) {
> struct ionic_queue *q = &lif->rxqcqs[i]->q;
>
> - if (q->xdp_prog) {
> - ionic_xdp_unregister_rxq_info(q);
> + if (q->xdp_prog)
> q->xdp_prog = NULL;
> - continue;
> - }
> -
> - err = ionic_xdp_register_rxq_info(q, lif->rxqcqs[i]->napi.napi_id);
> - if (err) {
> - dev_err(lif->ionic->dev, "failed to register RX queue %d info for XDP, err %d\n",
> - i, err);
> - goto err_out;
> - }
> - q->xdp_prog = xdp_prog;
> + else
> + q->xdp_prog = xdp_prog;
> }
> -
> - return 0;
> -
> -err_out:
> - for (i = 0; i < lif->ionic->nrxqs_per_lif && lif->rxqcqs[i]; i++)
> - ionic_xdp_unregister_rxq_info(&lif->rxqcqs[i]->q);
> -
> - return err;
> }
>
> static int ionic_xdp_config(struct net_device *netdev, struct netdev_bpf *bpf)
> --
> 2.17.1
>
>
Powered by blists - more mailing lists