Commit 6c9589aa authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/zcrx: resolve netdev before area creation 



Some area types will require a valid struct device to be created, so
resolve netdev and struct device before creating an area.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/ac8c1482be22acfe9ca788d2c3ce31b7451ce488.1746097431.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d760d3f5

io_uring/zcrx.c

+11 −10
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, 
	ifq = io_zcrx_ifq_alloc(ctx);

	if (!ifq)

		return -ENOMEM;

	ifq->rq_entries = reg.rq_entries;



	scoped_guard(mutex, &ctx->mmap_lock) {

		/* preallocate id */
@@ -407,24 +408,24 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, 
	if (ret)

		goto err;



	ret = io_zcrx_create_area(ifq, &ifq->area, &area);

	if (ret)

		goto err;



	ifq->rq_entries = reg.rq_entries;



	ret = -ENODEV;

	ifq->netdev = netdev_get_by_index(current->nsproxy->net_ns, reg.if_idx,

					  &ifq->netdev_tracker, GFP_KERNEL);

	if (!ifq->netdev)

	if (!ifq->netdev) {

		ret = -ENODEV;

		goto err;

	}



	ifq->dev = ifq->netdev->dev.parent;

	if (!ifq->dev) {

		ret = -EOPNOTSUPP;

	if (!ifq->dev)

		goto err;

	}

	get_device(ifq->dev);



	ret = io_zcrx_create_area(ifq, &ifq->area, &area);

	if (ret)

		goto err;



	mp_param.mp_ops = &io_uring_pp_zc_ops;

	mp_param.mp_priv = ifq;

	ret = net_mp_open_rxq(ifq->netdev, reg.if_rxq, &mp_param);