From nobody Fri Apr 1 21:22:35 2022 X-Original-To: dev-commits-src-main@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 8E50E1A65247; Fri, 1 Apr 2022 21:22:35 +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 4KVY6M3cKfz3wPF; Fri, 1 Apr 2022 21:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648848155; 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=5xxE2RVVNP58YozbfyQE9aawUrdxQ3iuAUDtBgCFA4I=; b=SYYbqejoaLTQwQWLTQalAcJ2WLjHIQZjM1SXnW4zX/yS8pNZ5Q6UYAidzNJOfyWJxueCyy 8G4Q7h5DvSZMfCNIkeeBn9FmmMHhGu1vR74K7etyx3VtMeLnqI9EGp0Ad8Uv47zv0OC/hQ MolY0jOtYkNULLTmcvMg9uECMygmAykes8LS/sQTQn0G9ZnDztADCtXTGLu5E60Qgqfh0p QdaH18EE4mEtoazmQnjQ1f8mOw0dWFjvsxMAb1sTZUnuutF/fAL6dm6uc0zsIWFTRsTgVK fLgB5cH4H+b6olI5yJNbnb+2dG5rgw0r3pNyY2gxXpGX7C8lTiw4kL6tDa06CQ== 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 5BECF1C284; Fri, 1 Apr 2022 21:22:35 +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 231LMZmW076833; Fri, 1 Apr 2022 21:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231LMZwk076832; Fri, 1 Apr 2022 21:22:35 GMT (envelope-from git) Date: Fri, 1 Apr 2022 21:22:35 GMT Message-Id: <202204012122.231LMZwk076832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: d6226d6adb3a - main - cxgbe/iw_cxgbe: Initialize the vma correctly in c4iw_mmap. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6226d6adb3aab73438e5a7d13e79c532e7b4062 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648848155; 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=5xxE2RVVNP58YozbfyQE9aawUrdxQ3iuAUDtBgCFA4I=; b=T6t6iE749k4wjdXknV2ZDg8ICYfnzu3+bLZFUvIKLgHkjtH7AGzEU6lt5n1UQVPNT3Rytr rzexj9pyUXys/6XKTETg0DwySzna8TcW5uYtsGkrZcMqdL81oWTlwHkOl2yJmmA6EQnlRE i599YyjjkXd/LAAhMPjGSh/EU1qipscnxFaKjokoLDZ1U73zgKwa1fmqjtBLEpwv3Pqnac gbvRmYeMf9Jqph8roYw82qxFM41/DIpVcMJ8ZqpwJs5w1IbAKUD2Op5nwj9wxjVhsr9XGe 1jQ1Xu1QbxK5FxTMVY5GwGcNQabsKduyUOZmB1MDP5M/QCfRp207gMZgl8yRbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648848155; a=rsa-sha256; cv=none; b=m0Ac8DcQt7jiOwlqvUz4Y92WdPDvNUKqtVss5IT/aW1z0CxPyQa2bFfv+iRWaqS+rWXLoC WdHRlStpD9wuYRo9fSpSTcKuWgPfScMoLyjJkifgOehUy8qIvpR7XfWZBmsx6rrmiSuV5l v2GNEDaNhc9cOc6y/hJ5OWEhHsUjRseK3MPvSNy4RbhACXpiWNQtdn4zvC+ZRWbea39mf9 t38ItequOtXsblS3/eJd81EbdyV99tidr41Wujmm/SW8wVoOYot+YRL9G7tXMZcTO+DDKz +9fjUvLO5g4hPr9wau2bSPweySdZs36JZt6yeKuhl4ob25v3VTWv854pOLtgjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=d6226d6adb3aab73438e5a7d13e79c532e7b4062 commit d6226d6adb3aab73438e5a7d13e79c532e7b4062 Author: Navdeep Parhar AuthorDate: 2022-04-01 19:58:14 +0000 Commit: Navdeep Parhar CommitDate: 2022-04-01 20:09:40 +0000 cxgbe/iw_cxgbe: Initialize the vma correctly in c4iw_mmap. This fixes userspace RDMA applications that would fail due to mmap failure. The driver's mmap routine would succeed but later the linux_compat.c mmap routine would fail because vma->vm_private_data wasn't set properly. This is catch-up with b633e08c705fe43180567eae26923d6f6f98c8d9. Reported by: Veeresh @ Chelsio Sponsored by: Chelsio Communications --- sys/dev/cxgbe/iw_cxgbe/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/provider.c b/sys/dev/cxgbe/iw_cxgbe/provider.c index 10b990e21f98..bfa00bb4c658 100644 --- a/sys/dev/cxgbe/iw_cxgbe/provider.c +++ b/sys/dev/cxgbe/iw_cxgbe/provider.c @@ -201,8 +201,8 @@ static int c4iw_mmap(struct ib_ucontext *context, struct vm_area_struct *vma) addr < rdev->bar2_pa + rdev->bar2_len) vma->vm_page_prot = t4_pgprot_wc(vma->vm_page_prot); - ret = io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT, - len, vma->vm_page_prot); + ret = rdma_user_mmap_io(context, vma, addr >> PAGE_SHIFT, len, + vma->vm_page_prot, NULL); CTR4(KTR_IW_CXGBE, "%s:4 ctx %p vma %p ret %u", __func__, context, vma, ret); return ret;