From patchwork Wed Dec 4 17:21:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13894121 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 6F364214A75 for ; Wed, 4 Dec 2024 17:22:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733332977; cv=none; b=WN0MBC3F+78WE4xX0OHXgoKbOkH2t6B9yySNp71nWxBjnZbE1QVAmJr+wXrmFHfDcX1UBxLO499b+YsdgV0yDtHs5vX7hFaHuh8fUgGNHN4ZH/VpN0yGLWc39HXNIXgGx6AROz1dOVq8SUtjBcAtS32sSGN//mn041wPBwrqfZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733332977; c=relaxed/simple; bh=+5zZnzySyKjY5FRXuqhU2gF3FaGaQHlkyYzGIZAsyQ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nMm3QQ5TNLdNb1N8mR6Gdt5hZB8qWZLMSsArMBJqAxV6FwcAXbBfR7wC370jSUX2xd9iTrSlhkVyMoBARiyD5cMRQrGmt//DlDJvu24GI32C+HY8UnerjTj1fs3DgBUWwtIbx9y2Bui6+TvoZuaYZddRf0+386TzX+lo1gGGxaQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk; spf=none smtp.mailfrom=davidwei.uk; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b=VGPg/tOQ; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b="VGPg/tOQ" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-724e5fb3f9dso45828b3a.3 for ; Wed, 04 Dec 2024 09:22:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1733332975; x=1733937775; 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=9eW3RY+rkgbVN3oi+45jX+ajyTy+70cXpyds41HL1l8=; b=VGPg/tOQ5oURAwA84XqKzJnw565AxCLSwAjvvrAIES8DCHoovvG3j+oArms/DDh51T iNzvFLpXMnu2zy7HI4FdmKW/PIx2yNMwwQi5ZYh8cl6gCULNvNuOZ0A1U8GkhcoySYTD P8SMYzFC1B5KkBezNqqaJHck6LbrSzV/2tlyFSRByyF2Ny3Bde2cVHG+rDpnn5pxnH6B EgzpP2SmvEWcb8EE3E48ZSAGuwKD13ZMkj1JVU1DbOj/XHeIAi/FZyUGoQ2rQ9dsgCCa NVFUQeTvfPY5LNzE0JDERDTeL4Cmpr/t1s4NTEFahHicApSYpY8Zl7nhsjqVNOrkiqSx MFlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733332975; x=1733937775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9eW3RY+rkgbVN3oi+45jX+ajyTy+70cXpyds41HL1l8=; b=U3W6fBlUh6Vn7sW/2oF7wCAzYKXvvcT5EIPAxnPSk3C8EFx+syEllm937Zz88HBvC/ 1SR/X4ksD9X2rpJko82Fwyx0TuCj2vfNSuPr7xGqZYeABtzjvjyypFv7eJckiNPtTi5E llyxbjnKvoAeqwNtcQe4Q2GKWMhKhFmMwJF4kTKtwjPALSIQ/fgTf0+UyG5pOJPOlC3D D0k1r8bhlXbp2HCElm1NshRjWtacOYnIs17YXd3nTe8+5Nv8dir2eDgHfEOFCwbod+dY 7avqmcEp+N51decoTFXanLF5zSvVHQVbq2B6Ue8synmzgF6QthtpxHC6Sd112MsEqxqE ev6g== X-Gm-Message-State: AOJu0YxzZhwnV7WPk7u+Hnffd3Xmg+EacdrImbft8M/hE9dHV/+gA9ED 2ttuqrFBJnqVshtmN0ceGYslBOnlU2ycPBLGVC2P5hKEuRCfx6lYe/VDLcpcFuPr6ehvH68Woqh t X-Gm-Gg: ASbGncv9huTsCXxhneBPnyyvKSQQGwEjlssaPplExYQl8nsb3t+T8h/Sz7DerktT/57 csUS5WylJynVxvDsAwSI8CL1zTiKFjdzZkKmpj2xPR509iDgXfJWk7CzzrJZILAf5YXAagv9/MF WwxyHk7oHZtkvJozeE3fO4Tg/CVwAVg3Jv6tHBjoiwwsLTkIcWSleDgLLvIWNLBdJT648O6WpWR /prNMerztdQQxublh4bqhdmCJVvw5SiZw== X-Google-Smtp-Source: AGHT+IHf0rf3CKqV4bulbAZAaa4Zetqh7IjrIKbWMv8AWOquhksshr66cX2RAdIJ7xMTZhPbVQAlGw== X-Received: by 2002:a05:6a00:7089:b0:725:8c0f:6fa3 with SMTP id d2e1a72fcca58-7258c0f78efmr4356379b3a.22.1733332974807; Wed, 04 Dec 2024 09:22:54 -0800 (PST) Received: from localhost ([2a03:2880:ff:f::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72590f9f93dsm1487364b3a.87.2024.12.04.09.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Dec 2024 09:22:54 -0800 (PST) From: David Wei To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: Jens Axboe , Pavel Begunkov , Jakub Kicinski , Paolo Abeni , "David S. Miller" , Eric Dumazet , Jesper Dangaard Brouer , David Ahern , Mina Almasry , Stanislav Fomichev , Joe Damato , Pedro Tammela Subject: [PATCH net-next v8 10/17] io_uring/zcrx: add io_zcrx_area Date: Wed, 4 Dec 2024 09:21:49 -0800 Message-ID: <20241204172204.4180482-11-dw@davidwei.uk> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241204172204.4180482-1-dw@davidwei.uk> References: <20241204172204.4180482-1-dw@davidwei.uk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: David Wei Add io_zcrx_area that represents a region of userspace memory that is used for zero copy. During ifq registration, userspace passes in the uaddr and len of userspace memory, which is then pinned by the kernel. Each net_iov is mapped to one of these pages. The freelist is a spinlock protected list that keeps track of all the net_iovs/pages that aren't used. For now, there is only one area per ifq and area registration happens implicitly as part of ifq registration. There is no API for adding/removing areas yet. The struct for area registration is there for future extensibility once we support multiple areas and TCP devmem. Reviewed-by: Jens Axboe Signed-off-by: Pavel Begunkov Signed-off-by: David Wei --- include/uapi/linux/io_uring.h | 9 ++++ io_uring/rsrc.c | 2 +- io_uring/rsrc.h | 1 + io_uring/zcrx.c | 93 ++++++++++++++++++++++++++++++++++- io_uring/zcrx.h | 16 ++++++ 5 files changed, 118 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 552377a1e496..7d72de92378d 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -978,6 +978,15 @@ struct io_uring_zcrx_offsets { __u64 __resv[2]; }; +struct io_uring_zcrx_area_reg { + __u64 addr; + __u64 len; + __u64 rq_area_token; + __u32 flags; + __u32 __resv1; + __u64 __resv2[2]; +}; + /* * Argument for IORING_REGISTER_ZCRX_IFQ */ diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index adaae8630932..0d05e9944b0e 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -77,7 +77,7 @@ static int io_account_mem(struct io_ring_ctx *ctx, unsigned long nr_pages) return 0; } -static int io_buffer_validate(struct iovec *iov) +int io_buffer_validate(struct iovec *iov) { unsigned long tmp, acct_len = iov->iov_len + (PAGE_SIZE - 1); diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 7a4668deaa1a..bd23387c1549 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -65,6 +65,7 @@ int io_register_rsrc_update(struct io_ring_ctx *ctx, void __user *arg, unsigned size, unsigned type); int io_register_rsrc(struct io_ring_ctx *ctx, void __user *arg, unsigned int size, unsigned int type); +int io_buffer_validate(struct iovec *iov); static inline struct io_rsrc_node *io_rsrc_node_lookup(struct io_rsrc_data *data, int index) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 3e5644718f54..8f838add94a4 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -10,6 +10,7 @@ #include "kbuf.h" #include "memmap.h" #include "zcrx.h" +#include "rsrc.h" #define IO_RQ_MAX_ENTRIES 32768 @@ -43,6 +44,83 @@ static void io_free_rbuf_ring(struct io_zcrx_ifq *ifq) ifq->rqes = NULL; } +static void io_zcrx_free_area(struct io_zcrx_area *area) +{ + if (area->freelist) + kvfree(area->freelist); + if (area->nia.niovs) + kvfree(area->nia.niovs); + if (area->pages) { + unpin_user_pages(area->pages, area->nia.num_niovs); + kvfree(area->pages); + } + kfree(area); +} + +static int io_zcrx_create_area(struct io_ring_ctx *ctx, + struct io_zcrx_ifq *ifq, + struct io_zcrx_area **res, + struct io_uring_zcrx_area_reg *area_reg) +{ + struct io_zcrx_area *area; + int i, ret, nr_pages; + struct iovec iov; + + if (area_reg->flags || area_reg->rq_area_token) + return -EINVAL; + if (area_reg->__resv1 || area_reg->__resv2[0] || area_reg->__resv2[1]) + return -EINVAL; + if (area_reg->addr & ~PAGE_MASK || area_reg->len & ~PAGE_MASK) + return -EINVAL; + + iov.iov_base = u64_to_user_ptr(area_reg->addr); + iov.iov_len = area_reg->len; + ret = io_buffer_validate(&iov); + if (ret) + return ret; + + ret = -ENOMEM; + area = kzalloc(sizeof(*area), GFP_KERNEL); + if (!area) + goto err; + + area->pages = io_pin_pages((unsigned long)area_reg->addr, area_reg->len, + &nr_pages); + if (IS_ERR(area->pages)) { + ret = PTR_ERR(area->pages); + area->pages = NULL; + goto err; + } + area->nia.num_niovs = nr_pages; + + area->nia.niovs = kvmalloc_array(nr_pages, sizeof(area->nia.niovs[0]), + GFP_KERNEL | __GFP_ZERO); + if (!area->nia.niovs) + goto err; + + area->freelist = kvmalloc_array(nr_pages, sizeof(area->freelist[0]), + GFP_KERNEL | __GFP_ZERO); + if (!area->freelist) + goto err; + + for (i = 0; i < nr_pages; i++) { + area->freelist[i] = i; + } + + area->free_count = nr_pages; + area->ifq = ifq; + /* we're only supporting one area per ifq for now */ + area->area_id = 0; + area_reg->rq_area_token = (u64)area->area_id << IORING_ZCRX_AREA_SHIFT; + spin_lock_init(&area->freelist_lock); + *res = area; + return 0; +err: + if (area) + io_zcrx_free_area(area); + return ret; +} + static struct io_zcrx_ifq *io_zcrx_ifq_alloc(struct io_ring_ctx *ctx) { struct io_zcrx_ifq *ifq; @@ -58,6 +136,9 @@ static struct io_zcrx_ifq *io_zcrx_ifq_alloc(struct io_ring_ctx *ctx) static void io_zcrx_ifq_free(struct io_zcrx_ifq *ifq) { + if (ifq->area) + io_zcrx_free_area(ifq->area); + io_free_rbuf_ring(ifq); kfree(ifq); } @@ -65,6 +146,7 @@ static void io_zcrx_ifq_free(struct io_zcrx_ifq *ifq) int io_register_zcrx_ifq(struct io_ring_ctx *ctx, struct io_uring_zcrx_ifq_reg __user *arg) { + struct io_uring_zcrx_area_reg area; struct io_uring_zcrx_ifq_reg reg; struct io_uring_region_desc rd; struct io_zcrx_ifq *ifq; @@ -99,7 +181,7 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, } reg.rq_entries = roundup_pow_of_two(reg.rq_entries); - if (!reg.area_ptr) + if (copy_from_user(&area, u64_to_user_ptr(reg.area_ptr), sizeof(area))) return -EFAULT; ifq = io_zcrx_ifq_alloc(ctx); @@ -110,6 +192,10 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, if (ret) goto err; + ret = io_zcrx_create_area(ctx, ifq, &ifq->area, &area); + if (ret) + goto err; + ifq->rq_entries = reg.rq_entries; ifq->if_rxq = reg.if_rxq; @@ -124,7 +210,10 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, ret = -EFAULT; goto err; } - + if (copy_to_user(u64_to_user_ptr(reg.area_ptr), &area, sizeof(area))) { + ret = -EFAULT; + goto err; + } ctx->ifq = ifq; return 0; err: diff --git a/io_uring/zcrx.h b/io_uring/zcrx.h index 178c515fea04..07742c0cfcf3 100644 --- a/io_uring/zcrx.h +++ b/io_uring/zcrx.h @@ -3,10 +3,26 @@ #define IOU_ZC_RX_H #include +#include + +struct io_zcrx_area { + struct net_iov_area nia; + struct io_zcrx_ifq *ifq; + + u16 area_id; + struct page **pages; + + /* freelist */ + spinlock_t freelist_lock ____cacheline_aligned_in_smp; + u32 free_count; + u32 *freelist; +}; struct io_zcrx_ifq { struct io_ring_ctx *ctx; struct net_device *dev; + struct io_zcrx_area *area; + struct io_uring *rq_ring; struct io_uring_zcrx_rqe *rqes; u32 rq_entries;