From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D09323EDAD4 for ; Thu, 7 May 2026 12:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778158362; cv=none; b=SU0vrPYt9ZWiKgZmH2CirjkbXV1hP60UtDfsEVEX+w40V8I9Lw6KKu5BMx+iKiVUihohJUMeiWdmid+DPZLCtSfnpVLQyfAeaU4TRCJ0cXwhB6OcSMCpNFiyI9gQ+Ui0PLaTY3ErDtB9ahyJ4FRb7rGSnU+f1qgc0FNEML7vr7I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778158362; c=relaxed/simple; bh=gpwUTivOAkPlpfTU5eDAQVukFzQBQsuP++jUtUaRZYs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mpe/0MV/WjX4RQVC+rdC+9d/59hcA3Rr0QVz1HTNup/Oymr5JDpkDygUvxiDrWMPYI1cgbTv5S0n9fczdqfVJUJigpmeMFDOuXaphkFlgeX56Kg3+jRJfB60unxuHI4GUlSDqncnDP/tLnq8weowWpxFbkVruCiDH4X/cdgqVJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=resnulli.us; spf=none smtp.mailfrom=resnulli.us; dkim=pass (2048-bit key) header.d=resnulli-us.20251104.gappssmtp.com header.i=@resnulli-us.20251104.gappssmtp.com header.b=n1uYT0sE; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=resnulli.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20251104.gappssmtp.com header.i=@resnulli-us.20251104.gappssmtp.com header.b="n1uYT0sE" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-488d2079582so9054325e9.2 for ; Thu, 07 May 2026 05:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20251104.gappssmtp.com; s=20251104; t=1778158359; x=1778763159; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qyyQRbmfJCZMZCZShQ4Wd+YjYUNfOACW5Shv6l9NOqo=; b=n1uYT0sEWTsMdZP6pTrIsbQ8XiUJBMfVXOKWqX0uPcA8Z+V/5N1nz5M1dvhH94/Hv6 UPzDhdAZzbI7z017YS8PMszxA2Q2ZBeALmXvLy0wFmpgDqp61sQcjn/iKx6ks3bNq40z Pjbqq/DfGtnZgwRuI2ECqDZLZDz7WZQByZCHlrbtSjclRQNQrnqW5JV79WsMSmvqshl8 0Djrf1QRNPGG416P3ilOjpq7eTdqoaQs6vRl4PyM00W3b0qNIvKDNd/S3FufnFu0CK1i xBsqRbUVAPvx7OUib3kls5HqfydUEJe5rfscJEO/geSOECJ/RqtQQLHkMrQ1kEf133tu Typg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778158359; x=1778763159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qyyQRbmfJCZMZCZShQ4Wd+YjYUNfOACW5Shv6l9NOqo=; b=Z8xTB5bVQypsCbZRPnN742foNp72a4EExuGZgqhemkEPYfcsFTMb6T3Piu5SnrW7g9 PG1xGYBvJAo69ZlevbNu5oKQRgLOKVLKXsAtr2dS4O5/7fkjrisPNH1p8NAcJRxpGGTl fqvqpsncvbb5heZ5AYLOmT/Wl1zCclIPrAmkJvYWlFCDifuIbo3XTRVDcAviNbLjFW5q 6Kt81/5hMysUey5iNZr9wDbWO8HZq094gY5lrh+i6KnpzWCss9dx51ppygOBB1KnqDpW JFSEJD14PH95H3ybwCzk3y13eWna5S5QdfI9bCHxrZY9zOBhQkNUjHKrbVnkTuqczrf6 cSBg== X-Gm-Message-State: AOJu0YzO5V6vKEp0TdYVphg+rPAfTlgsb/VmKkb8c2xEh3QqGUOBnBVV J4IumOwyUJoT8uXCX1paL/JVH0NaVBK54Q8YfYFRB6fbDYoK2H0l9qsbeNvUedEztKAU2JtLK1C kmPPi X-Gm-Gg: AeBDieu4dzTVLwvy8e7WXn4iPlx87X5gHj/gC0C0/4LDEgPKLDzmP/aJVfoeL74fGyN dEpCN9XaYihatTHKMd1jI6geEUk0NHJ1yWWI50BKvaWLDQj9YiAifdNrcE0tiquyqRCchgzat7C APc+zAZw4MJQhGQMaekdI5Ek5mbtbjD/7mTNJo6UPbOl81+2uJ2qUR0aSWMhkwwm18rjhhPp1WA /nwKH4HTnhNuSNkjoOyXHQGz8wuKSDQ4Q89mvClGM+O8Z9PmesOnG2FH8PnDxXpYHZ4fev5maG0 i+hnsauqc/LM1fRMUqk91xKwN3lnTK0sofB11m3c2IwXsYex3BGS69qQ+AhJrveiwXPEnsBC/9N 056yhK6INhGAhWphXgLHnz8ZfIhbyH3zhl7LOsyBkCPpLExSpHq6rG30mg6XDy2Jphf/zYIhLTL WpvFuZwaw9oY/3+JcNZTW/AARMu4sIy9hMUzhiS+N/4/vMMwkNYpRb448E X-Received: by 2002:a05:600c:470a:b0:488:a639:b772 with SMTP id 5b1f17b1804b1-48e51e15485mr131329965e9.7.1778158359044; Thu, 07 May 2026 05:52:39 -0700 (PDT) Received: from localhost (46-13-72-179.customers.tmcz.cz. [46.13.72.179]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fb1a7sm214799805e9.9.2026.05.07.05.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 05:52:38 -0700 (PDT) From: Jiri Pirko To: linux-rdma@vger.kernel.org Cc: jgg@ziepe.ca, leon@kernel.org, mrgolin@amazon.com, gal.pressman@linux.dev, sleybo@amazon.com, parav@nvidia.com, mbloch@nvidia.com, yanjun.zhu@linux.dev, marco.crivellari@suse.com, roman.gushchin@linux.dev, phaddad@nvidia.com, lirongqing@baidu.com, ynachum@amazon.com, huangjunxian6@hisilicon.com, kalesh-anakkur.purayil@broadcom.com, ohartoov@nvidia.com, michaelgur@nvidia.com, shayd@nvidia.com, edwards@nvidia.com, sriharsha.basavapatna@broadcom.com, andrew.gospodarek@broadcom.com, selvin.xavier@broadcom.com Subject: [PATCH rdma-next v4 06/16] RDMA/uverbs: Push out CQ buffer umem processing into a helper Date: Thu, 7 May 2026 14:52:21 +0200 Message-ID: <20260507125231.2950751-7-jiri@resnulli.us> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260507125231.2950751-1-jiri@resnulli.us> References: <20260507125231.2950751-1-jiri@resnulli.us> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jiri Pirko Extract the UVERBS_ATTR_CREATE_CQ_BUFFER_* parser from the CQ create handler into uverbs_create_cq_get_buffer_desc(), and wrap it in ib_umem_get_cq_tmp(), the umem-producing helper the cq_create handler now calls. ib_umem_get_cq_tmp() is temporary; subsequent patches replace it with driver-owned ib_umem_get_cq_buf*() wrappers built on the same parser, and remove it once all CQ drivers have switched. Signed-off-by: Jiri Pirko --- v2->v3: - renamed uverbs_create_cq_get_umem() to ib_umem_get_cq_tmp() and moved to umem.c - split legacy attr parser into uverbs_create_cq_get_buffer_desc() for upcoming ib_umem_get_cq_buf*() reuse - rebased on top of "RDMA/core: Fix user CQ creation for drivers without create_cq" --- drivers/infiniband/core/umem.c | 79 +++++++++++++++++++ drivers/infiniband/core/uverbs_std_types_cq.c | 60 +------------- include/rdma/ib_umem.h | 7 ++ 3 files changed, 89 insertions(+), 57 deletions(-) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 6617af4f739f..d36b61436c3c 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -370,6 +370,85 @@ struct ib_umem *ib_umem_get(struct ib_device *device, struct ib_udata *udata, } EXPORT_SYMBOL(ib_umem_get); +static int uverbs_create_cq_get_buffer_desc(struct uverbs_attr_bundle *attrs, + struct ib_uverbs_buffer_desc *desc) +{ + struct ib_device *ib_dev = attrs->context->device; + int ret; + + if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_VA)) { + ret = uverbs_copy_from(&desc->addr, attrs, + UVERBS_ATTR_CREATE_CQ_BUFFER_VA); + if (ret) + return ret; + ret = uverbs_copy_from(&desc->length, attrs, + UVERBS_ATTR_CREATE_CQ_BUFFER_LENGTH); + if (ret) + return ret; + if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_FD) || + uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_OFFSET) || + !ib_dev->ops.create_user_cq) + return -EINVAL; + desc->type = IB_UVERBS_BUFFER_TYPE_VA; + return 0; + } + + if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_FD)) { + ret = uverbs_get_raw_fd(&desc->fd, attrs, + UVERBS_ATTR_CREATE_CQ_BUFFER_FD); + if (ret) + return ret; + + ret = uverbs_copy_from(&desc->addr, attrs, + UVERBS_ATTR_CREATE_CQ_BUFFER_OFFSET); + if (ret) + return ret; + ret = uverbs_copy_from(&desc->length, attrs, + UVERBS_ATTR_CREATE_CQ_BUFFER_LENGTH); + if (ret) + return ret; + if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_VA) || + !ib_dev->ops.create_user_cq) + return -EINVAL; + desc->type = IB_UVERBS_BUFFER_TYPE_DMABUF; + return 0; + } + + if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_OFFSET) || + uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_LENGTH)) + return -EINVAL; + return -ENODATA; +} + +/** + * ib_umem_get_cq_tmp - Temporary CQ buffer umem getter. + * @device: IB device. + * @attrs: uverbs attribute bundle. + * + * Pins a CQ buffer described by the legacy CQ buffer attributes. + * Returns NULL when none are supplied. + * + * Will be removed once all CQ drivers have switched to get + * their buffer directly. + * + * Return: caller-owned umem on success; NULL when no legacy attribute + * is supplied; ERR_PTR(...) on error. + */ +struct ib_umem *ib_umem_get_cq_tmp(struct ib_device *device, + struct uverbs_attr_bundle *attrs) +{ + struct ib_uverbs_buffer_desc desc = {}; + int ret; + + ret = uverbs_create_cq_get_buffer_desc(attrs, &desc); + if (ret == -ENODATA) + return NULL; + if (ret) + return ERR_PTR(ret); + return ib_umem_get_desc(device, &desc, IB_ACCESS_LOCAL_WRITE); +} +EXPORT_SYMBOL(ib_umem_get_cq_tmp); + /** * ib_umem_release - release pinned memory * @umem: umem struct to release diff --git a/drivers/infiniband/core/uverbs_std_types_cq.c b/drivers/infiniband/core/uverbs_std_types_cq.c index 1a6bc8baa52b..711bad0aa8a3 100644 --- a/drivers/infiniband/core/uverbs_std_types_cq.c +++ b/drivers/infiniband/core/uverbs_std_types_cq.c @@ -66,16 +66,11 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)( typeof(*obj), uevent.uobject); struct ib_uverbs_completion_event_file *ev_file = NULL; struct ib_device *ib_dev = attrs->context->device; - struct ib_umem_dmabuf *umem_dmabuf; struct ib_cq_init_attr attr = {}; struct ib_uobject *ev_file_uobj; struct ib_umem *umem = NULL; - u64 buffer_length; - u64 buffer_offset; struct ib_cq *cq; u64 user_handle; - u64 buffer_va; - int buffer_fd; int ret; if ((!ib_dev->ops.create_cq && !ib_dev->ops.create_user_cq) || @@ -122,58 +117,9 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)( INIT_LIST_HEAD(&obj->comp_list); INIT_LIST_HEAD(&obj->uevent.event_list); - if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_VA)) { - - ret = uverbs_copy_from(&buffer_va, attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_VA); - if (ret) - goto err_event_file; - - ret = uverbs_copy_from(&buffer_length, attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_LENGTH); - if (ret) - goto err_event_file; - - if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_FD) || - uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_OFFSET) || - !ib_dev->ops.create_user_cq) { - ret = -EINVAL; - goto err_event_file; - } - - umem = ib_umem_get_va(ib_dev, buffer_va, buffer_length, IB_ACCESS_LOCAL_WRITE); - if (IS_ERR(umem)) { - ret = PTR_ERR(umem); - goto err_event_file; - } - } else if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_FD)) { - - ret = uverbs_get_raw_fd(&buffer_fd, attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_FD); - if (ret) - goto err_event_file; - - ret = uverbs_copy_from(&buffer_offset, attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_OFFSET); - if (ret) - goto err_event_file; - - ret = uverbs_copy_from(&buffer_length, attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_LENGTH); - if (ret) - goto err_event_file; - - if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_VA) || - !ib_dev->ops.create_user_cq) { - ret = -EINVAL; - goto err_event_file; - } - - umem_dmabuf = ib_umem_dmabuf_get_pinned(ib_dev, buffer_offset, buffer_length, - buffer_fd, IB_ACCESS_LOCAL_WRITE); - if (IS_ERR(umem_dmabuf)) { - ret = PTR_ERR(umem_dmabuf); - goto err_event_file; - } - umem = &umem_dmabuf->umem; - } else if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_OFFSET) || - uverbs_attr_is_valid(attrs, UVERBS_ATTR_CREATE_CQ_BUFFER_LENGTH)) { - ret = -EINVAL; + umem = ib_umem_get_cq_tmp(ib_dev, attrs); + if (IS_ERR(umem)) { + ret = PTR_ERR(umem); goto err_event_file; } diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h index fd45162eb017..afe12a1bedb0 100644 --- a/include/rdma/ib_umem.h +++ b/include/rdma/ib_umem.h @@ -92,6 +92,8 @@ struct ib_umem *ib_umem_get(struct ib_device *device, struct ib_udata *udata, u16 attr_id, ib_umem_buf_desc_filler_t legacy_filler, bool va_fallback, u64 addr, size_t size, int access); +struct ib_umem *ib_umem_get_cq_tmp(struct ib_device *device, + struct uverbs_attr_bundle *attrs); static inline struct ib_umem *ib_umem_get_va(struct ib_device *device, unsigned long addr, size_t size, @@ -206,6 +208,11 @@ ib_umem_get(struct ib_device *device, struct ib_udata *udata, u16 attr_id, { return ERR_PTR(-EOPNOTSUPP); } +static inline struct ib_umem * +ib_umem_get_cq_tmp(struct ib_device *device, struct uverbs_attr_bundle *attrs) +{ + return ERR_PTR(-EOPNOTSUPP); +} static inline struct ib_umem *ib_umem_get_va(struct ib_device *device, unsigned long addr, size_t size, int access) -- 2.53.0