From patchwork Sat Feb 6 05:47:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 377643 Delivered-To: patches@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp2897685jah; Fri, 5 Feb 2021 21:47:53 -0800 (PST) X-Received: by 2002:a17:902:8349:b029:df:d13d:bf83 with SMTP id z9-20020a1709028349b02900dfd13dbf83mr7443054pln.69.1612590473055; Fri, 05 Feb 2021 21:47:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612590473; cv=none; d=google.com; s=arc-20160816; b=PG1UZJHH3D9l+IKBv3gtkkSppMGj7xc97tjziltgKMdX5JlP25FaQvZgiM+jMPeszK iUSj7GV9KuG6u5Xa2YD6g0SbZJAHZ3JwSYaZA3KTx7ZjiQOP+4sInBoJOBSZT8zBiG/Z 8yP+D4DWulVGIVdKKnypru3SIAimZtvpyPeqAm29TB3oiiCgnBAYHpxXPGt/gmvwIh8D 8JWySHzp7PH5Nqu/Qi+UsrX0hWIvfQKMDdVeWFluw/BarWU7zfO+eWRsghkCcQ6OOVbT ED1FBK9XYsoTLL5R1AMzfiaMOXon7O3ckqpoq5yrrduoe8fnbNnIm5TconFv1yoU8ITd PVUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=BAE/HnEoeH/I6AsDCMIiIUVtpfPBxI4oEAjjMlMZGXc=; b=V7zSwCmu3ZzslX3H4ZX18fn773zwj9EtmTlZCbVnyvAw7kXGpRdNoYhYm+enFMGhb+ hgh5E8y1NuD5hjDRBlF8oH6uhWdI/+mAa3bzWaXful05ZPedDqVfTXHDsMg9JChabzg4 LLT8U1EJbli3rK5MOxtI9H5+wVHOBHJ1UQXRa1E8L11U+IDcGKXcce1/QAHBmft//wrv fsHQ3DturbAr6QB4zZljPQoLgs+9LyBwFFf52cwmaAwnNgAC7Wr1d28mZ17WhRi0WCy2 eXR+DyKWj3l9QXPH3o1pkPSPyZwdpc5H+4hDTJBjC+s34vpJQdSR30oSu/ALJgFJBL3q dXVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZfBYm49e; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 41sor6076289pjo.23.2021.02.05.21.47.52 for (Google Transport Security); Fri, 05 Feb 2021 21:47:52 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZfBYm49e; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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:mime-version :content-transfer-encoding; bh=BAE/HnEoeH/I6AsDCMIiIUVtpfPBxI4oEAjjMlMZGXc=; b=ZfBYm49eLFIQVfzYokXITH5vfeUno9/jvuNet9pJQuW3syR/+XH3/YZk7qYsGlaarI Av8bjd9ybfZ2NrBbkKoH6TkHKgDOozMgh5AfXNz2vBQO/CjBCUCqnALvXpYGfT4saEch /9wCs2JEHatTpiiTbSS0/jeDneToQGX/UbC/riRDR9KDRuze2GzoJovxK+sDxxU3D58G e6dBr1bcw9JY0uhHo7cPlIcQKBZT5TBvifUlt8hsQ+C5nQX5APkE6jPwT6fKeY5Wkcw1 Cy44UKqKF6aOMe5F/BWJyDL454r9LYEwH4Vtz9CEhfiKHMks6kN+2bQt3ndo/gu0Myi9 yXZA== 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:mime-version :content-transfer-encoding; bh=BAE/HnEoeH/I6AsDCMIiIUVtpfPBxI4oEAjjMlMZGXc=; b=pCCsbaA/X+69GU+F9rCNXn/lgVWwQbEDa9odFnWg2IjH4h2zgr7HBCFNqhm52OxvHw Zu8qYiDR9JQPLEOWdPNLuD6uhtC1MtKyih1XteGK2lLSDe9IPFzIqpncTtzyxBdb9hoX B5JNPlatxYoOGQ576jETr98jpI7GJp+xmynadbyp/ZIhVQztDwIaJEEPLiVaYd6c+YQ2 cAwgvAYhK/yOU+1pbfoNIYftMINKbM/nqraz/3RXKVqtUF2NpiH15I9B6Lp8PYdX5S8n 4nNWN1NiPggfo8dYQMhr9xa1JrB4C3NKyrFx1DnlkSEaCBOHYYMBl9YKSVpzXKkND0at C7ZA== X-Gm-Message-State: AOAM5329U5+xUoY4/se0tvA9keDJFVROR3bucwNIjjnJ6hccgFyR/QmS +85AIcGUF/jwkFVIfD9AYAcBUuah X-Google-Smtp-Source: ABdhPJy2np2futESbWx4VSlBPWGsf9xnPAKiXfTrc46U4XfKehlJZOZJ93yJOyYV7fxA8/jLvmM9vw== X-Received: by 2002:a17:90b:4d09:: with SMTP id mw9mr7553358pjb.199.1612590472244; Fri, 05 Feb 2021 21:47:52 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id ob6sm9200211pjb.30.2021.02.05.21.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 21:47:51 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Daniel Vetter , Sumit Semwal , Liam Mark , Chris Goldsworthy , Laura Abbott , Brian Starkey , Hridya Valsaraju , Suren Baghdasaryan , Sandeep Patil , Daniel Mentz , =?utf-8?q?=C3=98rjan_Eide?= , Robin Murphy , Ezequiel Garcia , Simon Ser , James Jones , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [RFC][PATCH 1/2] dma-buf: dma-heap: Provide accessor to get heap name Date: Sat, 6 Feb 2021 05:47:47 +0000 Message-Id: <20210206054748.378300-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 It can be useful to access the name for the heap, so provide an accessor to do so. Cc: Daniel Vetter Cc: Sumit Semwal Cc: Liam Mark Cc: Chris Goldsworthy Cc: Laura Abbott Cc: Brian Starkey Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Daniel Mentz Cc: Ørjan Eide Cc: Robin Murphy Cc: Ezequiel Garcia Cc: Simon Ser Cc: James Jones Cc: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- drivers/dma-buf/dma-heap.c | 13 +++++++++++++ include/linux/dma-heap.h | 9 +++++++++ 2 files changed, 22 insertions(+) -- 2.25.1 diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c index afd22c9dbdcf..6c746ea67676 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -190,6 +190,19 @@ void *dma_heap_get_drvdata(struct dma_heap *heap) return heap->priv; } + +/** + * dma_heap_get_name() - get heap name + * @heap: DMA-Heap to retrieve private data for + * + * Returns: + * The char* for the heap name. + */ +char *dma_heap_get_name(struct dma_heap *heap) +{ + return heap->name; +} + struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) { struct dma_heap *heap, *h, *err_ret; diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h index 454e354d1ffb..b91778291fb1 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -50,6 +50,15 @@ struct dma_heap_export_info { */ void *dma_heap_get_drvdata(struct dma_heap *heap); +/** + * dma_heap_get_name() - get heap name + * @heap: DMA-Heap to retrieve private data for + * + * Returns: + * The char* for the heap name. + */ +char *dma_heap_get_name(struct dma_heap *heap); + /** * dma_heap_add - adds a heap to dmabuf heaps * @exp_info: information needed to register this heap From patchwork Sat Feb 6 05:47:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 377644 Delivered-To: patches@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp2897702jah; Fri, 5 Feb 2021 21:47:55 -0800 (PST) X-Received: by 2002:a63:235b:: with SMTP id u27mr7751528pgm.129.1612590474983; Fri, 05 Feb 2021 21:47:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612590474; cv=none; d=google.com; s=arc-20160816; b=ljEfbmZ5IygiSBFUwTUJr0Yn8IYftx049p9eMKdOoBcpGD8IhznoKcbYHKoI0k+QaS n9x0wpyDOdNKNQmrOpGE9xBkLXx5gSR+O4Epcojkp17UiQ+d84ItWCz2/ZKeDh8cvwCM qRwAHrX1pS6eOQ4ukIWY/C8reql1qcy6/uIByTAvWPamKk9UX+r0AoYE6YsDyrf0r8mi 72f85kg8RR9V5k1/eMpGw/eD/C6xNsm6eyFMW6F55BdkC/2x4VflPl1LosWWsGBqD28o 5EzQ93OKUbpTy6iKlTl6cgzfSTQio3vyNCnH8SYooSN2dK370CmEw8a6Bukj3wUSSNN1 2Vug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ysXoxmHGWekWNyITP0f9QwT2Iyo77pJXB4WoqmtP4Co=; b=hk9UMZp8pD0Cyl7ixgWygdp8Zi94tSF4OCmKGV6ia6e79Vb/bR222IsCoUjCMyvy7V gYmXHSgHLP4aAoKcuKz5wi7DmSasq8wX59k1k4s8it6tU0buQFstTqx3CaX+MlpmVVWU /BGrL+7s9BSronA/zFubZbNmmR/cnD9ail7qDYlCIWtptRqSRxokkMfVDgv2+TZChKdh uFSz1Q279IzLlvQYuDobxQFeA4qO0E0IZUQBNnuOFWWqWtVskbFz4w2zyBZtZwmEUCdH wt3NzNYn9B+JusgcaP9xZ9kMvvp/3Q1nMCYsanyoDGdglFEx57DXQlU3WHIWf+e+F5gC dqnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MLL+lNMZ; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id v33sor6147128pjv.13.2021.02.05.21.47.54 for (Google Transport Security); Fri, 05 Feb 2021 21:47:54 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MLL+lNMZ; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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:in-reply-to:references :mime-version:content-transfer-encoding; bh=ysXoxmHGWekWNyITP0f9QwT2Iyo77pJXB4WoqmtP4Co=; b=MLL+lNMZWZo9tRRfPkaLmM7dZ/6WNlE+hPWt8/xKtrnExLFYxkcpBZnolJqOVe3y2r RoCyhZ01Av+Cj2obyhiM3Aq29N4MBK5Q9cXxb9QZt6FCd8QUu2wfgzR4U/A1x6CxPHvs enRyhpFs8icHd/u53gN54C31eGfENGEDLoSz6X6BcJFl39I9Hs7ODAewm8PFf66AotKD 51L2HrkgbHGQjJG09XzKFPq58sEPDQd98Rn7kcGJpTmTYTkzWOFB/N5S0YZ1sK7KOBRK TbHzs2ONwl6u+jm3zgWj6ylyiBm4oHVJa0z6iKOyg7KuSQ89+15gS84yDDM7ohuJ0B8n pLmA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ysXoxmHGWekWNyITP0f9QwT2Iyo77pJXB4WoqmtP4Co=; b=hyiXCkO6Atu3CKMHu8Ra4i7bwrUp3Hq5PJlv2uweeoHvT6g8bN9ub0K9AdXX3n4GSz KJnyJv7iIBuYcpynXpnUJY6OjK6t26JS4QD8ZN+bnudMpLyOdXNmE+ky9Lr2mzp1EAs+ AFu2S1Pwc9kFPaS92WUKcb4nUpIukFMvwo9KInrgq95+6JvhNN5K99kgezznOjwuLw1L hlBXwmOLPngxt9s8c7IDCu3ZzigHN2+OJyRg0cRxvLiV35Jr7MMT+VvF5vUihGMOUTPa ysAFDkTAhq3YgGzL++cGjIdqqx4BUxaucB/jLJaV9k7/vUFhR6DqVuPgOtHsCm6KYamS QM5Q== X-Gm-Message-State: AOAM531b0Tl6KC/8o4o7Rnw+ElTFoFJM7I1bqSt2kyuLLLrS/2DB043T ZSDIAN+R1lnG7D221kLricJjw8Gw X-Google-Smtp-Source: ABdhPJzmd8A00mIxv5h6tiX3iJxykxthFlYvrr/Jc67oyFQ7FQBCfqGGUdNmJMiuKKMKjea51Dr8ww== X-Received: by 2002:a17:90b:4c10:: with SMTP id na16mr7320475pjb.49.1612590474659; Fri, 05 Feb 2021 21:47:54 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id ob6sm9200211pjb.30.2021.02.05.21.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 21:47:53 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Daniel Vetter , Sumit Semwal , Liam Mark , Chris Goldsworthy , Laura Abbott , Brian Starkey , Hridya Valsaraju , Suren Baghdasaryan , Sandeep Patil , Daniel Mentz , =?utf-8?q?=C3=98rjan_Eide?= , Robin Murphy , Ezequiel Garcia , Simon Ser , James Jones , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [RFC][PATCH 2/2] dma-buf: heaps: Fix the name used when exporting dmabufs to be the actual heap name Date: Sat, 6 Feb 2021 05:47:48 +0000 Message-Id: <20210206054748.378300-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210206054748.378300-1-john.stultz@linaro.org> References: <20210206054748.378300-1-john.stultz@linaro.org> MIME-Version: 1.0 By default dma_buf_export() sets the exporter name to be KBUILD_MODNAME. Unfortunately this may not be identical to the string used as the heap name (ie: "system" vs "system_heap"). This can cause some minor confusion with tooling, and there is the future potential where multiple heap types may be exported by the same module (but would all have the same name). So to avoid all this, set the exporter exp_name to the heap name. Cc: Daniel Vetter Cc: Sumit Semwal Cc: Liam Mark Cc: Chris Goldsworthy Cc: Laura Abbott Cc: Brian Starkey Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Daniel Mentz Cc: Ørjan Eide Cc: Robin Murphy Cc: Ezequiel Garcia Cc: Simon Ser Cc: James Jones Cc: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- drivers/dma-buf/heaps/cma_heap.c | 1 + drivers/dma-buf/heaps/system_heap.c | 1 + 2 files changed, 2 insertions(+) -- 2.25.1 diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 364fc2f3e499..62465d61ccc7 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -339,6 +339,7 @@ static int cma_heap_allocate(struct dma_heap *heap, buffer->pagecount = pagecount; /* create the dmabuf */ + exp_info.exp_name = dma_heap_get_name(heap); exp_info.ops = &cma_heap_buf_ops; exp_info.size = buffer->len; exp_info.flags = fd_flags; diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 17e0e9a68baf..2d4afc79c700 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -388,6 +388,7 @@ static int system_heap_allocate(struct dma_heap *heap, } /* create the dmabuf */ + exp_info.exp_name = dma_heap_get_name(heap); exp_info.ops = &system_heap_buf_ops; exp_info.size = buffer->len; exp_info.flags = fd_flags;