From patchwork Thu Nov 17 17:18:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Wiecaszek X-Patchwork-Id: 21853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp522733wrr; Thu, 17 Nov 2022 09:21:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf7XO+HwQXfbGzHiXOz34dRw/CrUQUtt2CtsHmZPgsOUOIhwXvBva9CB4FPZkrlCwKyF27hh X-Received: by 2002:a17:906:cd10:b0:7ad:c0e7:7a99 with SMTP id oz16-20020a170906cd1000b007adc0e77a99mr2810365ejb.689.1668705701644; Thu, 17 Nov 2022 09:21:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668705701; cv=none; d=google.com; s=arc-20160816; b=mEb9A/hRLz7h1oqy8B++2Y+d477OXDeYTPbULAqse0Z4Y3hmsOqWUEXUwL570PRI3k PdEMq5TKPtJadthEwG1ZXr8Ua+aPa/WocUfyJ8s4WDzN4D4u2x4GKRemsIuF7JKfFQhP SniadaQTRDUNVr1AEso41YUMFP6irjo8Nx4mesXywcIeFLfamffNwPhXDoLKSySFKh7i nBCiy6ztWbbYyZW0wJEXcHa95Y94LrLCVWKsCUg6D7TocB2O91KS2l8QqXRwzMyyJdhW h+yRnL0OE0uQ81iZEe+VvSRZtQjqDb14FjqkWbD6RTVI/lJhhaFQNKBR4wxTEiOXOAXC 57yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vQyLviGauL30ZeO1VGGTeRWRAcWIrY0ASAZn99FKrKk=; b=wbknJc0J8ZuB9QTlSVZ9Vr2dl9eQ3ro7Ef9+3pOWHl7Iets8NF/liqUixQjTcbgKRM 4WlJMmCOxImWq5FaRpPRV4ouzccu1d116yAm9AyznWH16eoBpdnzqMkD/ZJqNd6HxqdK wk2ccmRZBvWb1yZuCtN7aKn83IrziYFJO/+0d+Mt/bONgrNs601AJGHCIfpEa+tpi0o4 F38ZPb2egH9zO5ViBH3VTSiyvFZXMOw+odZ+j74xxcQklaXEFv3+j51pKBuWnYSJ/M8f X+sDoOAuhN5HdRrQ6aQ9qHlBqJ6FcnImxXiOOrS4PJof5AYhmZLKJbrBJvaTo6xBEsqN iWBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@googlemail.com header.s=20210112 header.b=fy3Tzc3S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g10-20020a1709067c4a00b007aebd20575fsi837756ejp.466.2022.11.17.09.21.16; Thu, 17 Nov 2022 09:21:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@googlemail.com header.s=20210112 header.b=fy3Tzc3S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234932AbiKQRUJ (ORCPT + 99 others); Thu, 17 Nov 2022 12:20:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240009AbiKQRTo (ORCPT ); Thu, 17 Nov 2022 12:19:44 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19DCB30F70; Thu, 17 Nov 2022 09:19:43 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id ft34so6656086ejc.12; Thu, 17 Nov 2022 09:19:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vQyLviGauL30ZeO1VGGTeRWRAcWIrY0ASAZn99FKrKk=; b=fy3Tzc3SpdWc06CoKx7g1QwwPHkHOB52LAGG2x0xRXgBBRgB+lhzB4dijn+MMgvCeo +5REjnoYlMAIGg9muDOehuGTyb3yMonp7FWDWMeDx+kccf8/GI9w7Gb37iOlCByty0Io gAEBG+4wDRyCNpGARhe8IWVrC34XHmo8N2d/bzPgnmD/e573rG5YdA0eYNnJM9TNaP0J 7TqYmvcQfO0ReBOxz+w820/rvEZB03wQ6CleZceh6xToQnloUYi5RF3I6CHeY/Y9q/ws SCeMehGPWjpATVnss7nV36hcQp+q6iM8X81Uuqd8taY5/ezLJqtp5750TZJKQHOhUNAP X7jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vQyLviGauL30ZeO1VGGTeRWRAcWIrY0ASAZn99FKrKk=; b=wN+VCoHt/PQMFMWODTY+KttQV0pjPT6o61I7BDRhyLLcfr4w7AVUfBCBmTCe2yxxeE 39Xkr+QWiVkTatybCaB6lDIjwJG6gn40r5Ndaqti2E7BGICPRiEaFBRfMPZeVZV0O/8F pUB8CpunFwEgzag8Tz8h7uyWuATo+wOb57yInYeMUQvZ4G+pBXbhwfYI/QKGl8K2a1Mv L5nF9Kg9EcWWT41j8Z8G7hqFtBvgM5EUIxpGeku7+8TLvG6bSrM9y10nQB5Lfh5Bh8TO p+5lYpED+Uwbvsr/G9ycR/Y/1Itr5DuPvTYvx7HLUojv3uH1LLb0JiY3JjUYNAvAYWeO YEiQ== X-Gm-Message-State: ANoB5pk5jedR1/uIsIOMTQWv0EaLCMqz9vGK+DK0R3wu0Nn6up6bR+Jo QeHPwpOFY3+fI5i7XGYlPFA= X-Received: by 2002:a17:906:1585:b0:7ad:84c7:502d with SMTP id k5-20020a170906158500b007ad84c7502dmr2879660ejd.177.1668705582464; Thu, 17 Nov 2022 09:19:42 -0800 (PST) Received: from localhost.localdomain (user-5-173-65-115.play-internet.pl. [5.173.65.115]) by smtp.googlemail.com with ESMTPSA id h5-20020a0564020e8500b00458a03203b1sm777561eda.31.2022.11.17.09.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:19:42 -0800 (PST) From: Lukasz Wiecaszek X-Google-Original-From: Lukasz Wiecaszek To: Gerd Hoffmann Cc: Dmitry Osipenko , Lukasz Wiecaszek , =?utf-8?q?Christian_K=C3=B6n?= =?utf-8?q?ig?= , Sumit Semwal , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH v5] udmabuf: add vmap and vunmap methods to udmabuf_ops Date: Thu, 17 Nov 2022 18:18:09 +0100 Message-Id: <20221117171810.75637-1-lukasz.wiecaszek@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749594020901766981?= X-GMAIL-MSGID: =?utf-8?q?1749764750052092046?= The reason behind that patch is associated with videobuf2 subsystem (or more genrally with v4l2 framework) and user created dma buffers (udmabuf). In some circumstances when dealing with V4L2_MEMORY_DMABUF buffers videobuf2 subsystem wants to use dma_buf_vmap() method on the attached dma buffer. As udmabuf does not have .vmap operation implemented, such dma_buf_vmap() natually fails. videobuf2_common: __vb2_queue_alloc: allocated 3 buffers, 1 plane(s) each videobuf2_common: __prepare_dmabuf: buffer for plane 0 changed videobuf2_common: __prepare_dmabuf: failed to map dmabuf for plane 0 videobuf2_common: __buf_prepare: buffer preparation failed: -14 The patch itself seems to be strighforward. It adds implementation of .vmap and .vunmap methods to 'struct dma_buf_ops udmabuf_ops'. .vmap method itself uses vm_map_ram() to map pages linearly into the kernel virtual address space. .vunmap removes mapping created earlier by .vmap. All locking and 'vmapping counting' is done in dma_buf.c so it seems to be redundant/unnecessary in .vmap/.vunmap. Reviewed-by: Dmitry Osipenko Acked-by: Christian König Signed-off-by: Lukasz Wiecaszek --- v1: https://lore.kernel.org/linux-media/202211120352.G7WPASoP-lkp@intel.com/T/#t v2: https://lore.kernel.org/linux-media/20221114052944.GA7264@thinkpad-p72/T/#t v3: https://lore.kernel.org/linux-media/4f92e95f-a0dc-4eac-4c08-0df85de78ae7@collabora.com/T/#t v4: https://lore.kernel.org/linux-media/970e798d-ea26-5e1e-ace8-7915a866f7c7@collabora.com/T/#t v4 -> v5: Added Acked-by and Reviewed-by to the commit message v3 -> v4: Removed line/info 'reported by kernel test robot' v2 -> v3: Added .vunmap to 'struct dma_buf_ops udmabuf_ops' v1 -> v2: Patch prepared and tested against 6.1.0-rc2+ drivers/dma-buf/udmabuf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 283816fbd72f..740d6e426ee9 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include static int list_limit = 1024; module_param(list_limit, int, 0644); @@ -60,6 +62,30 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) return 0; } +static int vmap_udmabuf(struct dma_buf *buf, struct iosys_map *map) +{ + struct udmabuf *ubuf = buf->priv; + void *vaddr; + + dma_resv_assert_held(buf->resv); + + vaddr = vm_map_ram(ubuf->pages, ubuf->pagecount, -1); + if (!vaddr) + return -EINVAL; + + iosys_map_set_vaddr(map, vaddr); + return 0; +} + +static void vunmap_udmabuf(struct dma_buf *buf, struct iosys_map *map) +{ + struct udmabuf *ubuf = buf->priv; + + dma_resv_assert_held(buf->resv); + + vm_unmap_ram(map->vaddr, ubuf->pagecount); +} + static struct sg_table *get_sg_table(struct device *dev, struct dma_buf *buf, enum dma_data_direction direction) { @@ -162,6 +188,8 @@ static const struct dma_buf_ops udmabuf_ops = { .unmap_dma_buf = unmap_udmabuf, .release = release_udmabuf, .mmap = mmap_udmabuf, + .vmap = vmap_udmabuf, + .vunmap = vunmap_udmabuf, .begin_cpu_access = begin_cpu_udmabuf, .end_cpu_access = end_cpu_udmabuf, };