netdev - Re: [PATCH net 3/5] gve: guard XSK operations on the existence of queues

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <Z2RZPOpPa29z9buo@lzaremba-mobl.ger.corp.intel.com>
Date: Thu, 19 Dec 2024 18:34:52 +0100
From: Larysa Zaremba <larysa.zaremba@...el.com>
To: Praveen Kaligineedi <pkaligineedi@...gle.com>
CC: <netdev@...r.kernel.org>, <jeroendb@...gle.com>, <shailend@...gle.com>,
	<willemb@...gle.com>, <andrew+netdev@...n.ch>, <davem@...emloft.net>,
	<edumazet@...gle.com>, <kuba@...nel.org>, <pabeni@...hat.com>,
	<ast@...nel.org>, <daniel@...earbox.net>, <hawk@...nel.org>,
	<john.fastabend@...il.com>, <horms@...nel.org>, <hramamurthy@...gle.com>,
	<joshwash@...gle.com>, <ziweixiao@...gle.com>,
	<linux-kernel@...r.kernel.org>, <bpf@...r.kernel.org>,
	<stable@...r.kernel.org>
Subject: Re: [PATCH net 3/5] gve: guard XSK operations on the existence of
 queues

On Wed, Dec 18, 2024 at 05:34:13AM -0800, Praveen Kaligineedi wrote:
> From: Joshua Washington <joshwash@...gle.com>
> 
> This patch predicates the enabling and disabling of XSK pools on the
> existence of queues. As it stands, if the interface is down, disabling
> or enabling XSK pools would result in a crash, as the RX queue pointer
> would be NULL. XSK pool registration will occur as part of the next
> interface up.
> 
> Similarly, xsk_wakeup needs be guarded against queues disappearing
> while the function is executing, so a check against the
> GVE_PRIV_FLAGS_NAPI_ENABLED flag is added to synchronize with the
> disabling of the bit and the synchronize_net() in gve_turndown.
> 
> Fixes: fd8e40321a12 ("gve: Add AF_XDP zero-copy support for GQI-QPL format")
> Cc: stable@...r.kernel.org
> Signed-off-by: Joshua Washington <joshwash@...gle.com>
> Signed-off-by: Praveen Kaligineedi <pkaligineedi@...gle.com>
> Reviewed-by: Praveen Kaligineedi <pkaligineedi@...gle.com>
> Reviewed-by: Shailend Chand <shailend@...gle.com>
> Reviewed-by: Willem de Bruijn <willemb@...gle.com>

I think the sender's SoB still should be last, but otherwise looks good.

Reviewed-by: Larysa Zaremba <larysa.zaremba@...el.com>

> ---
>  drivers/net/ethernet/google/gve/gve_main.c | 22 ++++++++++------------
>  1 file changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
> index 5d7b0cc59959..e4e8ff4f9f80 100644
> --- a/drivers/net/ethernet/google/gve/gve_main.c
> +++ b/drivers/net/ethernet/google/gve/gve_main.c
> @@ -1623,8 +1623,8 @@ static int gve_xsk_pool_enable(struct net_device *dev,
>  	if (err)
>  		return err;
>  
> -	/* If XDP prog is not installed, return */
> -	if (!priv->xdp_prog)
> +	/* If XDP prog is not installed or interface is down, return. */
> +	if (!priv->xdp_prog || !netif_running(dev))
>  		return 0;
>  
>  	rx = &priv->rx[qid];
> @@ -1669,21 +1669,16 @@ static int gve_xsk_pool_disable(struct net_device *dev,
>  	if (qid >= priv->rx_cfg.num_queues)
>  		return -EINVAL;
>  
> -	/* If XDP prog is not installed, unmap DMA and return */
> -	if (!priv->xdp_prog)
> +	/* If XDP prog is not installed or interface is down, unmap DMA and
> +	 * return.
> +	 */
> +	if (!priv->xdp_prog || !netif_running(dev))
>  		goto done;
>  
> -	tx_qid = gve_xdp_tx_queue_id(priv, qid);
> -	if (!netif_running(dev)) {
> -		priv->rx[qid].xsk_pool = NULL;
> -		xdp_rxq_info_unreg(&priv->rx[qid].xsk_rxq);
> -		priv->tx[tx_qid].xsk_pool = NULL;
> -		goto done;
> -	}
> -
>  	napi_rx = &priv->ntfy_blocks[priv->rx[qid].ntfy_id].napi;
>  	napi_disable(napi_rx); /* make sure current rx poll is done */
>  
> +	tx_qid = gve_xdp_tx_queue_id(priv, qid);
>  	napi_tx = &priv->ntfy_blocks[priv->tx[tx_qid].ntfy_id].napi;
>  	napi_disable(napi_tx); /* make sure current tx poll is done */
>  
> @@ -1711,6 +1706,9 @@ static int gve_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags)
>  	struct gve_priv *priv = netdev_priv(dev);
>  	int tx_queue_id = gve_xdp_tx_queue_id(priv, queue_id);
>  
> +	if (!gve_get_napi_enabled(priv))
> +		return -ENETDOWN;
> +
>  	if (queue_id >= priv->rx_cfg.num_queues || !priv->xdp_prog)
>  		return -EINVAL;
>  
> -- 
> 2.47.1.613.gc27f4b7a9f-goog
> 
>