Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp1150332pxb; Fri, 21 Jan 2022 10:56:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyT2Afg7jgZHXRjPZiT7q42F5drhwerc+Uc2V1FfB/gndEBXiJ/zv9WsiizGwpVcEnXDnal X-Received: by 2002:a05:6a00:cc6:b0:4c3:b9cd:f088 with SMTP id b6-20020a056a000cc600b004c3b9cdf088mr4717442pfv.48.1642791376470; Fri, 21 Jan 2022 10:56:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642791376; cv=none; d=google.com; s=arc-20160816; b=rSPOJjJs+6xzfi52Z0qq14Gpy7qyf9CXhnSFje3BEyA51fodIyU0VwXjNGkcddml7t hqu3Y45RgtHonODVTDeW/3ouTIPPtzrQ3K0dfZEA/GPHY2QsQQPX7OPmR3vxa/pkZrRw p09iIfkflGNGMQf8WUF1t3alyaV7/Q8NtrMBPEEpgyyizSxdSjW8c2XdiZutrMllcWba b+z3Vd/GNWhzMAcP512ZjVdE+Oz1JHWaJ2PV9XwZ0gm/vFdowtIXRorBaY9kA9QLwziu hcg6qSYuWuKm99dgoLYh+7BgbQrkpa5wCqwNubSKdnxeb5L6+vVoxKpu/VGp87P+XgkD 1ReQ== 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=nq/jKaSRe1/bkQM30U4aQy+RmE3rXa2zMWjbS6Sz4No=; b=mFVHHWH+0JFKmzbsyYTgDgRGIozGwezz62YHaRrl4SH1qpDwaS5TqvDU5Y69J6p4QJ fG6z/infPFf7u9AOsstUP7GjGvTvcSRvNxzSAxd9BpRrsD5ZDm6JUw/5M99vayKUOVu/ OB2U6JG5dfZD51BDywlEoQFMB/qPRScBPkA0JbABSMyuD83RI0iKrMvF1SVk1jKt/Gkd +FrOq+dZRywCAFyd2zZSeKXqa+DfReN4O52COVHeF5tonYEohr4H8/Ot3sY6HgF2Mcq+ BgJwqf4GQx+zoFqyJwugNlZwVuf7ntI36b9VuhtylH1Ydcfd0F8bLRnn+M5CyGgRtym5 oR6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BasuHzcz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u14si8392160ple.464.2022.01.21.10.56.04; Fri, 21 Jan 2022 10:56:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BasuHzcz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352254AbiASIOY (ORCPT + 99 others); Wed, 19 Jan 2022 03:14:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351847AbiASIOX (ORCPT ); Wed, 19 Jan 2022 03:14:23 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C126C06161C for ; Wed, 19 Jan 2022 00:14:23 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id d12-20020a17090a628c00b001b4f47e2f51so2487861pjj.3 for ; Wed, 19 Jan 2022 00:14:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nq/jKaSRe1/bkQM30U4aQy+RmE3rXa2zMWjbS6Sz4No=; b=BasuHzcz+xsL2EYzisN5MTFI5/39w44WqD8D57AnJbipJHEtataULAmhjBn0OIV1AU dMRoZ8R7bu40V0220L0PiLJYIehoIFXH4cVl/SW+tHoSWgk/EX/3/0pZZY3GFSQUz8pX lHb+TA3+kGT5DJze04wdiLHtfBZLczseuCwjA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nq/jKaSRe1/bkQM30U4aQy+RmE3rXa2zMWjbS6Sz4No=; b=Gk/ymnEyIkh3iVevgaUD8O/vLEAuMZFZIc45QAAuuWLmxSHfS2jQnjobseH5qDeOPy jnLEmitWrPb3imqVs8J9oPeT2u/H4ypDeSS8d6TAc58yKLIm2p6aBiwJYWD7Hk+a8Wb/ xtX2wsta6ySUlhXCAfRhtMQIE4j6GCW9MubofnqunDIMestbo3GVviqnEhWkPXVNncoX Et6azGpZ8sBRH1aicavmg0a6mimxjCb0a2xAiwWzJ/aILejy+6exYQISjZec2TMxct91 L8oot+nrkbTBS2ilRWpCNjOrEDWnhEwVlIe6dbX4dVDiIWdr33wBYCCJ/mcf9wMdme0f iaFQ== X-Gm-Message-State: AOAM5314KnlDVxJXrP3j0lZ/srGPFRvC48RSRoalYHjQhnv2KM2l/SGG thPR1Wi4AEiS5l4WrwZw4I8X3g== X-Received: by 2002:a17:90b:4b47:: with SMTP id mi7mr2943908pjb.79.1642580063062; Wed, 19 Jan 2022 00:14:23 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:3343:314a:558d:5df7]) by smtp.gmail.com with ESMTPSA id nl3sm5128635pjb.36.2022.01.19.00.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 00:14:22 -0800 (PST) From: Sergey Senozhatsky To: Tomasz Figa , Marek Szyprowski , Hans Verkuil Cc: Christoph Hellwig , Dafna Hirschfeld , Ricardo Ribalda , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH] media: videobuf2-dma-contig: Invalidate vmap range before DMA range Date: Wed, 19 Jan 2022 17:14:17 +0900 Message-Id: <20220119081417.20604-1-senozhatsky@chromium.org> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Christoph suggests [1] that invalidating vmap range before direct mapping range makes more sense. [1]: https://lore.kernel.org/all/20220111085958.GA22795@lst.de/ Signed-off-by: Sergey Senozhatsky --- .../media/common/videobuf2/videobuf2-dma-contig.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c index 7c4096e62173..0e3f264122af 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c @@ -132,12 +132,12 @@ static void vb2_dc_prepare(void *buf_priv) if (!buf->non_coherent_mem) return; - /* For both USERPTR and non-coherent MMAP */ - dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir); - /* Non-coherent MMAP only */ if (buf->vaddr) flush_kernel_vmap_range(buf->vaddr, buf->size); + + /* For both USERPTR and non-coherent MMAP */ + dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir); } static void vb2_dc_finish(void *buf_priv) @@ -152,12 +152,12 @@ static void vb2_dc_finish(void *buf_priv) if (!buf->non_coherent_mem) return; - /* For both USERPTR and non-coherent MMAP */ - dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir); - /* Non-coherent MMAP only */ if (buf->vaddr) invalidate_kernel_vmap_range(buf->vaddr, buf->size); + + /* For both USERPTR and non-coherent MMAP */ + dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir); } /*********************************************/ -- 2.34.1.703.g22d0c6ccf7-goog