Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4243620pxk;
        Tue, 22 Sep 2020 14:16:55 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJxLzH0m63mrImpbdNnzLGcGEN+x8zL36vbNkxc5EtLe7s4ULQgxe6MNuhjzevkY8fnDbYkO
X-Received: by 2002:a05:6402:515:: with SMTP id m21mr6183400edv.348.1600809415419;
        Tue, 22 Sep 2020 14:16:55 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1600809415; cv=none;
        d=google.com; s=arc-20160816;
        b=G4l3xj6WNQAiISQ/aoymBovoR1P3AwlHiUrkRUpFvPfeUsOQrXOsVJiXLdmBXav5/R
         tgmu5SgwekOykpe40xl+HB8MPmjsaqCtkjf7/yA2RsCISVpPY2nc9M9mkiDTxxyyRkYJ
         Gh2H8tX6gkEUrpNi0+K57zB3IbHphxjieqvea2N/R/01hMlc1vgIJYrQjqiZo1PJnSSA
         N/ouy15soczXrHLJK/s568iJ5+RNLQZ/g7xC5xM3JFsW4BcuB6+MF1TlJOLW0myQa5HU
         bzRI/zFTcC6a2acUVPenKcz81wknY+DrdDGg7t4IMnmi3ylGoSRrxPDcSrXosI731RFv
         hmzQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:dkim-signature:mime-version:user-agent
         :references:message-id:in-reply-to:subject:cc:to:from:date;
        bh=eDw/Y+WvGisaFJLGeLDL1cgx4wGsvRwxMR3w6+tFJgE=;
        b=Qv0l8h+NRiKeeN9tWTBGsainFVPQv3Lgm8gyTQ4/FvmEG1k9JffbzO9GXPwrl7Yx7R
         TC3IOqvLFFftHvklS4oZIA7oohDHNtkuPn3Is8qin7MooEPYRl1B3ehmcDeSOg8NoxfW
         9rTAXMT8/EeDBGk1Vax0veq/q6Uz/LZBGpDwMBVgMxEn9BFXFmgLievtHZR0j6KQXhks
         a9tUwwmmUF6SO2oq3coUn2E+WhSi/jYNNdNAY8B3JW9Jg+Qe//qYXRuyr1U+e8ttf8zF
         B/2tL9lXe+bkcuseZM95ovhpbR+PmHmunJhDt3dcfDHcRRg9mEa374JONBVQxJkbInz9
         JSDA==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=Eo9od3Yg;
       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=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id cb13si11378920edb.153.2020.09.22.14.16.30;
        Tue, 22 Sep 2020 14:16:55 -0700 (PDT)
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=@nvidia.com header.s=n1 header.b=Eo9od3Yg;
       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=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726674AbgIVVNG (ORCPT <rfc822;hackukernel@gmail.com>
        + 99 others); Tue, 22 Sep 2020 17:13:06 -0400
Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:7983 "EHLO
        hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726650AbgIVVNF (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 22 Sep 2020 17:13:05 -0400
Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA)
        id <B5f6a68b20000>; Tue, 22 Sep 2020 14:12:18 -0700
Received: from [10.20.170.18] (10.124.1.5) by HQMAIL107.nvidia.com
 (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 22 Sep
 2020 21:12:54 +0000
Date:   Tue, 22 Sep 2020 16:12:49 -0500
From:   Alex Goins <agoins@nvidia.com>
X-X-Sender: agoins@agoins-DiGiTS
To:     Marek Szyprowski <m.szyprowski@samsung.com>
CC:     <dri-devel@lists.freedesktop.org>,
        <iommu@lists.linux-foundation.org>,
        <linaro-mm-sig@lists.linaro.org>, <linux-kernel@vger.kernel.org>,
        "Thomas Zimmermann" <tzimmermann@suse.de>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        David Airlie <airlied@linux.ie>,
        Robin Murphy <robin.murphy@arm.com>,
        Christoph Hellwig <hch@lst.de>,
        <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v5 05/38] drm: prime: use sgtable iterators in
 drm_prime_sg_to_page_addr_arrays()
In-Reply-To: <afb59d1b-1fcf-fd6d-2b48-e078e129f1eb@samsung.com>
Message-ID: <alpine.DEB.2.20.2009221610450.27953@agoins-DiGiTS>
References: <20200513132114.6046-1-m.szyprowski@samsung.com> <20200513133245.6408-1-m.szyprowski@samsung.com> <CGME20200513133259eucas1p273f0e05005b7b1158d884295d35745fd@eucas1p2.samsung.com> <20200513133245.6408-5-m.szyprowski@samsung.com>
 <alpine.DEB.2.20.2009211803580.19454@agoins-DiGiTS> <afb59d1b-1fcf-fd6d-2b48-e078e129f1eb@samsung.com>
User-Agent: Alpine 2.20 (DEB 67 2015-01-07)
X-NVConfidentiality: public
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
X-Originating-IP: [10.124.1.5]
X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To
 HQMAIL107.nvidia.com (172.20.187.13)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1600809138; bh=eDw/Y+WvGisaFJLGeLDL1cgx4wGsvRwxMR3w6+tFJgE=;
        h=Date:From:X-X-Sender:To:CC:Subject:In-Reply-To:Message-ID:
         References:User-Agent:X-NVConfidentiality:MIME-Version:
         Content-Type:X-Originating-IP:X-ClientProxiedBy;
        b=Eo9od3YgFzrokUrlC+GkylUgaEM6H3/JoZ8VAsxxdIl9L1k7fmfTTeaMtcSVONyNe
         ugVp5jMHoqMBBnEgkhlJLszfUZYtSl8RQ5G3uRlXt7zoCgIY/0h6XX4FNuiH8Kb0S7
         WyRCcKI/bgFvn3zgzEfYD2tAqDxNiPDV/Dq3tjbte0g6Nhf4/YhF6akfbfcy/Styf4
         bUNbi2Zb7AFaWAuZBIsbRGocbT6iAy6lQbVA6v2eMw6KTlEKdB+PzvydytW5YeufYd
         t70q9gBMMRUD1C9tRuLLmMiYDa1OQo3J792HaY7U0hejkWFXmjlraDz1/kB/W6H1mV
         4/CT5hDoP5xiQ==
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Marek,

On Tue, 22 Sep 2020, Marek Szyprowski wrote:

> External email: Use caution opening links or attachments
> 
> 
> Hi Alex,
> 
> On 22.09.2020 01:15, Alex Goins wrote:
> > Tested-by: Alex Goins <agoins@nvidia.com>
> >
> > This change fixes a regression with drm_prime_sg_to_page_addr_arrays() and
> > AMDGPU in v5.9.
> 
> Thanks for testing!
> 
> > Commit 39913934 similarly revamped AMDGPU to use sgtable helper functions. When
> > it changed from dma_map_sg_attrs() to dma_map_sgtable(), as a side effect it
> > started correctly updating sgt->nents to the return value of dma_map_sg_attrs().
> > However, drm_prime_sg_to_page_addr_arrays() incorrectly uses sgt->nents to
> > iterate over pages, rather than sgt->orig_nents, resulting in it now returning
> > the incorrect number of pages on AMDGPU.
> >
> > I had written a patch that changes drm_prime_sg_to_page_addr_arrays() to use
> > for_each_sgtable_sg() instead of for_each_sg(), iterating using sgt->orig_nents:
> >
> > -       for_each_sg(sgt->sgl, sg, sgt->nents, count) {
> > +       for_each_sgtable_sg(sgt, sg, count) {
> >
> > This patch takes it further, but still has the effect of fixing the number of
> > pages that drm_prime_sg_to_page_addr_arrays() returns. Something like this
> > should be included in v5.9 to prevent a regression with AMDGPU.
> 
> Probably the easiest way to handle a fix for v5.9 would be to simply
> merge the latest version of this patch also to v5.9-rcX:
> https://lore.kernel.org/dri-devel/20200904131711.12950-3-m.szyprowski@samsung.com/

Tested-by: Alex Goins <agoins@nvidia.com> that version too.

> 
> This way we would get it fixed and avoid possible conflict in the -next.

> Do you have any AMDGPU fixes for v5.9 in the queue? Maybe you can add that
> patch to the queue? 

I don't have any more AMDGPU fixes, just want to ensure that this makes it in.

Thanks,
Alex

> Dave: would it be okay that way?
> 
> Best regards
> --
> Marek Szyprowski, PhD
> Samsung R&D Institute Poland
> 
>