From patchwork Fri Nov 1 21:42:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 178333 Delivered-To: patches@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp1071956ill; Fri, 1 Nov 2019 14:42:42 -0700 (PDT) X-Received: by 2002:a17:90a:fa81:: with SMTP id cu1mr18469928pjb.114.1572644562290; Fri, 01 Nov 2019 14:42:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572644562; cv=none; d=google.com; s=arc-20160816; b=d+xkEcYQtEz5lYRab5H2rJ+PxSg5z+UzRRyvSy4hRqrvfTuWBOvfupLIDRKT01C5zT 84PrOmFX8jnQ/jvgePOHNbp0MA5jCuAjFPf0HwivnxjhvtHpMyxnrT99mTmLJtuyvD69 PB8nMHbfMy2uEjg97E+1uLGsvVVrbaPg/0qpCqTOfV9U2Fixk0x+xGm2/9ydxB7/WapD efwYEzlZ8ylUHNIpQ3AeU89Fpp2bkweDTKGgaDtf8fOR5g/QNHiX3V+SLSrxsw9T6gAG nDYImlYrV0WrjzqOb7Dx70ER2cCSCJfHi8l5EMEUi2dKJB8dWyqSL1skIW2WjVxb1ZNI cjJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=qw73byJosffXkuqCyMjGKLHzCzbk8f/W13zIdru5UDs=; b=sX8kNs5WYWBJgtQYNnqzzABymzrXSjIuQAAiKnPn6dJEBK1+LPswoDZvWhOangmPkF +BgKs3JaV1+M1CwGN+2YlzEaN5QhnwtbGIOLFYvxtRu6GXDfzQ+sfmuqsDSVhAKaLHiT Fyik16ufCddSuSbEdnwv3ZJDaVSAx02M+zPFVuUIsHF3mc9jnnvKE1bWL3OAry6xg9yL 1d93wqUvpdTCWkcwUZdGgxk4DSejA/5Q7zGRxRi74GSDewt/oSc4Tdfn6uUZy8W/CdIC qyGEW3HfyF2hzpZWitWb9qsnJVw7n8k6zSkxyQ6utILg27JK4mk+HnLFci84JapeJEpH 6JCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U4cNJVCb; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y13sor10404461pgc.22.2019.11.01.14.42.42 for (Google Transport Security); Fri, 01 Nov 2019 14:42:42 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U4cNJVCb; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=qw73byJosffXkuqCyMjGKLHzCzbk8f/W13zIdru5UDs=; b=U4cNJVCbks5NLLHVvES6/rHnlmhJhpSMl4fcP8dWEYgRQCUF/LViLyJ+r3ZlycmBiq U61vGyoMRuhx302M6+QRUXjQcvBE4HNWxrXru+uO+01oARndC8BJr50YVp1WG45/cQiU IJvSFPRE4mNvWR1Z9i7BOkTOp0rFTtS1gsvkL74U24eAVrwEgphnDYbo0igPqVCeSdSh MvMeuNuGNFrUEYPMyMwzTYe+YmDFC2bTBhMqVytVriYjs6Axrx7ciK3b+DeQEkIWZvZr 64yYVOQqb68IRFRymdr40JyPViSmEmFS9TVzhXIL1EZcwONBU4aTh3HjJwlyrC6I31s3 4Ieg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qw73byJosffXkuqCyMjGKLHzCzbk8f/W13zIdru5UDs=; b=fH1bzbXhaBWnGaNWBakCwd/ACuMGr0srVBe/77k31CpoNNHZof7pKfTQ2by3ePz14x ExJpI7QF5c7C//RMdQWYl0KPGWJXp95CxvjBvMiGCKyJc68kzh8YjwQrVOv+MccCdsWG MxGFVFU3nxPQyKDjRft3NNkL1B9eGkalG0HArBl+54VghvpCN5lX6wn12WEKL0M35rc7 p0+Nw6Jh+klzLSmB3nsCaDjyjXhYWM5IGaC5Dq4HSdeEFGUDv46rwajhAIsJ55GYTehx Wt9bJ8L9kwx8K+jN9oaM17bn1dDZXOa6k1vQjdWk9dHNc/UmiRx5Qzpnalw03p8sCSjl bTFg== X-Gm-Message-State: APjAAAUfqn7yXs/EaDZUh4lNE7gbYbn+/cVY4ldX+WXqovpW1AhQrDnP 4r5LgguHpkvbld7AmDuPLVN9ztDq X-Google-Smtp-Source: APXvYqwPZQOJ824hOIpx+OQwUm86AFEzCF124ezoCY0dfNb/xkltqGVcYD5Tca7S+Udll9ZOgpadQQ== X-Received: by 2002:a63:6581:: with SMTP id z123mr15822936pgb.367.1572644561515; Fri, 01 Nov 2019 14:42:41 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id u36sm8299058pgn.29.2019.11.01.14.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 14:42:41 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Laura Abbott , Benjamin Gaignard , Sumit Semwal , Liam Mark , Pratik Patel , Brian Starkey , Vincent Donnefort , Sudipto Paul , "Andrew F . Davis" , Christoph Hellwig , Chenbo Feng , Alistair Strachan , Hridya Valsaraju , Sandeep Patil , Hillf Danton , Dave Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH v14 0/5] DMA-BUF Heaps (destaging ION) Date: Fri, 1 Nov 2019 21:42:33 +0000 Message-Id: <20191101214238.78015-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 This again? I know! Apologies to all who hoped I'd stop bothering them with this patch set, but I ran afoul of the DRM tree rules by not getting the userland patches properly reviewed prior to the patches landing (I mistakenly was waiting for the patches to land upstream before pushing the userland patches). Thus, these were correctly reverted from the drm-misc-next tree. My attempts to quickly fix the userland review issue didn't get very far, as the revert brought additional eyes to the patchset, and further interface changes were requested (comically, which is the exact reason I was waiting to push the userland changes :) So like groundhog day, here we are again, with v14: This patchset implements per-heap devices which can be opened directly and then an ioctl is used to allocate a dmabuf from the heap. The interface is similar, but much simpler then IONs, only providing an ALLOC ioctl (and a GET_FEATURES interface to help with any future changes to the interface). Also, I've provided relatively simple system and cma heaps. I've booted and tested these patches with AOSP on the HiKey960 using the kernel tree here: https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-buf-heap And the userspace changes here: https://android-review.googlesource.com/c/device/linaro/hikey/+/909436 Compared to ION, this patchset is missing the system-contig, carveout and chunk heaps, as I don't have a device that uses those, so I'm unable to do much useful validation there. Additionally we have no upstream users of chunk or carveout, and the system-contig has been deprecated in the common/andoid-* kernels, so this should be ok. I've also removed the stats accounting, since any such accounting should be implemented by dma-buf core or the heaps themselves. New in v14: * Reworked ioctl handler to zero fill any difference in structure size, similar to what the DRM core does, as suggested by Dave Airlie * Removed now unnecessary reserved bits in allocate_data * Added get_features ioctl as suggested by Dave Airlie * Removed pr_warn_once messages as requested by Dave Airlie * Fix missing argment to WARN() in dma_heap_buffer_destroy() found and fixed by Dan Carpenter * Add check in fault hanlder that pgoff isn't larger then pagecount, reported by Dan Carpenter * Fix "redundant assignment to variable ret" issue reported by Colin King and fixed by Andrew Davis * Fix a missing return value in kselftest * Add calls to test the GET_FEATURES ioctl in ksefltest * Build fix reported by kernel test robot and fixed by Xiao Yang for kselftest * Minor kselftest Makefile cleanups Many thanks again to the folks above who found and submitted fixes to small issues while the patches were in -next! I've folded them in to the patch set here. The ioctl rework to avoid reserved fields, was mostly duplicated from the DRM core, but it does add some complexity to the ioctl handler so I'd appreciate extra review. It felt substantial enough that I've removed the previous reviewed by and acked-by tags, but please let me know if you'd like me to re-add yours back. Apologies again for my flub and the extra noise here! I really appreciate everyone's patience with with me. thanks -john Cc: Laura Abbott Cc: Benjamin Gaignard Cc: Sumit Semwal Cc: Liam Mark Cc: Pratik Patel Cc: Brian Starkey Cc: Vincent Donnefort Cc: Sudipto Paul Cc: Andrew F. Davis Cc: Christoph Hellwig Cc: Chenbo Feng Cc: Alistair Strachan Cc: Hridya Valsaraju Cc: Sandeep Patil Cc: Hillf Danton Cc: Dave Airlie Cc: dri-devel@lists.freedesktop.org Andrew F. Davis (1): dma-buf: Add dma-buf heaps framework John Stultz (4): dma-buf: heaps: Add heap helpers dma-buf: heaps: Add system heap to dmabuf heaps dma-buf: heaps: Add CMA heap to dmabuf heaps kselftests: Add dma-heap test MAINTAINERS | 18 + drivers/dma-buf/Kconfig | 11 + drivers/dma-buf/Makefile | 2 + drivers/dma-buf/dma-heap.c | 313 ++++++++++++++++++ drivers/dma-buf/heaps/Kconfig | 14 + drivers/dma-buf/heaps/Makefile | 4 + drivers/dma-buf/heaps/cma_heap.c | 178 ++++++++++ drivers/dma-buf/heaps/heap-helpers.c | 271 +++++++++++++++ drivers/dma-buf/heaps/heap-helpers.h | 55 +++ drivers/dma-buf/heaps/system_heap.c | 124 +++++++ include/linux/dma-heap.h | 59 ++++ include/uapi/linux/dma-heap.h | 77 +++++ tools/testing/selftests/dmabuf-heaps/Makefile | 6 + .../selftests/dmabuf-heaps/dmabuf-heap.c | 255 ++++++++++++++ 14 files changed, 1387 insertions(+) create mode 100644 drivers/dma-buf/dma-heap.c create mode 100644 drivers/dma-buf/heaps/Kconfig create mode 100644 drivers/dma-buf/heaps/Makefile create mode 100644 drivers/dma-buf/heaps/cma_heap.c create mode 100644 drivers/dma-buf/heaps/heap-helpers.c create mode 100644 drivers/dma-buf/heaps/heap-helpers.h create mode 100644 drivers/dma-buf/heaps/system_heap.c create mode 100644 include/linux/dma-heap.h create mode 100644 include/uapi/linux/dma-heap.h create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c -- 2.17.1