From nobody Wed Jan 18 16:24:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nxrh51YNXz2yJRS; Wed, 18 Jan 2023 16:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nxrh513QHz3DvS; Wed, 18 Jan 2023 16:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxvtHQqoLS1JgOGS2D0v3fEWUm5ufwO/iKutEyUIWv4=; b=bfq3VkzmSXJnVnV/XQ/yEOh6uCSnduxMfuLsxiNObXvOjjdzDUxkt66nqodl74ZdnWAvkP lCHKbE/9GiKt8WsExI4EfzGliw6NZAPu1I5LwAS5UDjeUqWgI3mex1N55g9JUZ1+vx1pso FvQHvSsowPk9/aV93kNadIbxJmtIYNVgLzdE1oUNC7pyjJdXf1shqZtLGcz4BordxB4KeT zNtzQqdyDgrksC3n0Lfk9Lo8l2W8aW1nWMhBcOjr+B6QVlxTzGtg34C8Fj8G7/A3+Unt0W LYL9QRYOj78ZZgoJL/QXG+gE5hwQEKgRSZ1HfMAWyhPB2L+8PJM7lEgSbTtwZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxvtHQqoLS1JgOGS2D0v3fEWUm5ufwO/iKutEyUIWv4=; b=QvlmUMBr0yzjxaWc5ADvpVvXTJfP62NPAFHxSiuLnXSWgz+Ugr5elnd7Rz4BV7BG0/BX5F c8rB6mVZqHQ2bVqy1PZT5UMUk2u7Ha2DtadNzvne7oikZ+PBUfweiS4Ho3OpIJUmYjXXB9 XSl7vu0yY6CCnpx0UnEQEH0XE8guvwI5gVkl8uQ2ybZcbB0sgKl+Q/ZymIfdGO4WwbePeo ArmKfj7rpiGtRUqtOg4khQgCx5fUBqNxvXuXlcjG0TcBmqR2l+hSr0s9zwTVTXuCtxfvfW ZBus+ylZukhfGfaZ0HZ57KL6HjBVJXKvCLZ6ksXNR7kLuogdfcE+9p7aMWWPxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059093; a=rsa-sha256; cv=none; b=FpxNM0r1n+CsZqMlRWk1kYr+SyDoSgP7XrOY6BAifldwtMEKPmCzl5RwPQhGCsUICgNk5L 7aJEYvIjkpmjbTQ/IpOp4LFtXj12+IZvHv1JizI6Yd3EV7JU0lui9V98/vxxtiE4Ig0NZE obnfrdNTXi61quxF7nWRxoVwzb5q+/60i4TI2OK8aaBBTrNaXc1sJ/GJEss96LKTnsgWdX PRUrY2ktBDl0st00FEorvnXZRukMHUZ5enCIoECZ1yhdvH/v2lqTsqkx3p0cQRi6EgCV2q K1ZfdeFHq306950t/vUebarfQpKCTVcrIB/kUJ+x2s5nmXYwNpUMiVZB7DvaLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nxrh506LZzJDD; Wed, 18 Jan 2023 16:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30IGOq3Z038011; Wed, 18 Jan 2023 16:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOqNO038010; Wed, 18 Jan 2023 16:24:52 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:52 GMT Message-Id: <202301181624.30IGOqNO038010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9bf3a5616c51 - stable/13 - LinuxKPI: add simplified version of page_frag_cache List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9bf3a5616c51081b221cbb794f559a5aab07aabc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9bf3a5616c51081b221cbb794f559a5aab07aabc commit 9bf3a5616c51081b221cbb794f559a5aab07aabc Author: Bjoern A. Zeeb AuthorDate: 2022-12-03 00:33:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:25:11 +0000 LinuxKPI: add simplified version of page_frag_cache For the moment and the currently only consumer (mt76) add a simplified version of the page_frag_cache. We will only accept fragement sizes up to 1 PAGE_SIZE (KASSERT) and we will always return a full page. Should we add more consumers or small (or large) objects would become a problem we can always add a more elaborate version. Discussed with: markj Reviewed by: markj (,hselasky commented as well) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D37595 (cherry picked from commit 55038a6306a570c9f2df89f5ad076de0f7d98152) LinuxKPI: fix possible NULL dereference in linuxkpi_page_frag_alloc() Reported by: Coverity via emaste Coverity ID: 1502345 Sponsored by: The FreeBSD Foundation (cherry picked from commit 51e94a4658d23016dd0ae67c189a89f53281cbcd) --- sys/compat/linuxkpi/common/include/linux/gfp.h | 29 ++++++++++++++++ sys/compat/linuxkpi/common/src/linux_page.c | 47 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index 6273fa969db8..7657e78b0950 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -80,6 +80,11 @@ CTASSERT((__GFP_DMA32 & GFP_NATIVE_MASK) == 0); CTASSERT((__GFP_BITS_MASK & GFP_NATIVE_MASK) == GFP_NATIVE_MASK); +struct page_frag_cache { + void *va; + int pagecnt_bias; +}; + /* * Resolve a page into a virtual address: * @@ -94,6 +99,9 @@ extern void *linux_page_address(struct page *); */ extern vm_page_t linux_alloc_pages(gfp_t flags, unsigned int order); extern void linux_free_pages(vm_page_t page, unsigned int order); +void *linuxkpi_page_frag_alloc(struct page_frag_cache *, size_t, gfp_t); +void linuxkpi_page_frag_free(void *); +void linuxkpi__page_frag_cache_drain(struct page *, size_t); static inline struct page * alloc_page(gfp_t flags) @@ -175,6 +183,27 @@ free_page(uintptr_t addr) linux_free_kmem(addr, 0); } +static inline void * +page_frag_alloc(struct page_frag_cache *pfc, size_t fragsz, gfp_t gfp) +{ + + return (linuxkpi_page_frag_alloc(pfc, fragsz, gfp)); +} + +static inline void +page_frag_free(void *addr) +{ + + linuxkpi_page_frag_free(addr); +} + +static inline void +__page_frag_cache_drain(struct page *page, size_t count) +{ + + linuxkpi__page_frag_cache_drain(page, count); +} + static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags) { diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index df4a124cf3e2..5fa370147045 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -429,3 +429,50 @@ lkpi_arch_phys_wc_del(int reg) free(mrdesc, M_LKMTRR); #endif } + +/* + * This is a highly simplified version of the Linux page_frag_cache. + * We only support up-to 1 single page as fragment size and we will + * always return a full page. This may be wasteful on small objects + * but the only known consumer (mt76) is either asking for a half-page + * or a full page. If this was to become a problem we can implement + * a more elaborate version. + */ +void * +linuxkpi_page_frag_alloc(struct page_frag_cache *pfc, + size_t fragsz, gfp_t gfp) +{ + vm_page_t pages; + + if (fragsz == 0) + return (NULL); + + KASSERT(fragsz <= PAGE_SIZE, ("%s: fragsz %zu > PAGE_SIZE not yet " + "supported", __func__, fragsz)); + + pages = alloc_pages(gfp, flsl(howmany(fragsz, PAGE_SIZE) - 1)); + if (pages == NULL) + return (NULL); + pfc->va = linux_page_address(pages); + + /* Passed in as "count" to __page_frag_cache_drain(). Unused by us. */ + pfc->pagecnt_bias = 0; + + return (pfc->va); +} + +void +linuxkpi_page_frag_free(void *addr) +{ + vm_page_t page; + + page = PHYS_TO_VM_PAGE(vtophys(addr)); + linux_free_pages(page, 0); +} + +void +linuxkpi__page_frag_cache_drain(struct page *page, size_t count __unused) +{ + + linux_free_pages(page, 0); +}