Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1419988pxk; Fri, 25 Sep 2020 14:28:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSTY23QAtQmVhQfRdKpDmtkAnBhYtMub7kTsYbdDxusii37IcZ9BgAqM12RRz8fVL2ytkV X-Received: by 2002:a17:906:7143:: with SMTP id z3mr4558204ejj.361.1601069322194; Fri, 25 Sep 2020 14:28:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601069322; cv=none; d=google.com; s=arc-20160816; b=ImYGXle2jzVkyVxNeT7JI9jbuEW/NjoXDdZCMrhPfcW8WfZRIm2sE/ScYVErOacdH3 5aGB4WGfhtfomMIfx1p2BIeFp3t42DpDV7C6WOFMnOzaEzX31TLMGQFs21n9cvZk6TPE ahAG4eKcFaf3nvZlI8uJ2mA1+khzRerRg127Cto+lkARdQvZQ7z2wcr1AyKm4hWcHIYA TiIcXOQ2WF0XLJrmMIkTk75KjBNUHcrVvbQ42PkP7h7mTw7oGX2DqIihpWrpUnAf02oA K/rn8ALmtVQWz7gnRon5v4+jOKdG22hz0KsjAmvjYNDWPr4s9Py4JGGnauz84ailGmMn onZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=xu3WUdYX5svcbV4xrw1b6YX5aAbNB7AgpH2Adx4jZFo=; b=Y+SJQKna+dwOmLkdHEE+ZprUpxnlKZo7hezleFGDGaAzqF5HTOW6Z4bOy2Df128bj6 8Z9tzPTqDRCvLR7naKLQGoedv71HEjpaD3nGAYgLhFak/sXJH0Y0gF3EP6XEh8s2pqgW U21R9WZwY3gauU2ZDdxqsmWm4oThiidUFiFBtqWMACOlGyuYr9S0fyERzWFu99YEriyf vqS/U8mWR40XcDfdNkKuPqw80rB6FwtyERfm81z3gRPI3pAucmyBZqNxYhtnJKu4dpXZ e9i7aaOFCmB9dO2t46I0DDlsqE6EgOu96AhJSGerS2oTcOMubZa2SpKxNPSvo8Id4/jY bSMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="Oh/rOaeX"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y22si2740583edo.147.2020.09.25.14.28.19; Fri, 25 Sep 2020 14:28:42 -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=@gmail.com header.s=20161025 header.b="Oh/rOaeX"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729543AbgIYVYo (ORCPT + 99 others); Fri, 25 Sep 2020 17:24:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729117AbgIYVX0 (ORCPT ); Fri, 25 Sep 2020 17:23:26 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63B18C0613CE for ; Fri, 25 Sep 2020 14:23:26 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id j2so5367220wrx.7 for ; Fri, 25 Sep 2020 14:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xu3WUdYX5svcbV4xrw1b6YX5aAbNB7AgpH2Adx4jZFo=; b=Oh/rOaeXFzcu9qSAmCq/rolkH8P14hud6p8K5BfNI2WFG5a9+CDyEGSSQhX2ckSOFm zhaUJj91cpSE7fjOgEU1lXwLJ+IWz8fvIt0d9ZLig66lfafGswbdX3HjuUIetLcvXIRK iTH/uLltlOJ4fw+ePue65S94O7opuSVXxQHSpsONmulokYemM7SGq9yQ+hWEmXvhV86F z03M9NhNkvuyYCe3g7sBFrF7SAacgZVx0Vpqiomtz+6y2XL78RtnxnguoI2dZ69jA0P6 sb1aT7CbUe0tNayEoXajWXtZalCNyj5M83zbwKR5M/a2WvCpOpF2gPQoaJNqY08mROL1 4Blg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xu3WUdYX5svcbV4xrw1b6YX5aAbNB7AgpH2Adx4jZFo=; b=tiVp0QFSts2PbuA/lpTQhx0Ig5eEYyJ8KMYtHYQA0QKghFXqvvpzfpDTHH3nY84aP/ mnfrxF7YsfxvZIjcsP3Pvka8Htj+YbfseI+w7qKMaCd0v22DMnk6IIUVEMXF8roGRDLN JhbKS2KcyGj0K2qdQp5cfEEfP37+8zGWhvDbIqE/OnVsvDgEjlkHlJ4Id3LatZ372ywH otCrgofpdmBws/+Y3ZbJnmstxYstHWNE5XvcQ6b+5uPykF7N1XguWROcZMNYU7G7pljT mpHED9XlK5ZaE2iVSmFo7JRsMhp5v2zE/V6HZVGeryRsaQikP1I+TZvVu9yepoI9I+Z6 qalQ== X-Gm-Message-State: AOAM531MmHfLJ7+olRRE25jqnxCJTKcwr7pQjZ2jmCLhX4D5wfHzkrCP A+ldh0F1GjplxfSER47Nw8B/L1eszJ9BOL/qfo0= X-Received: by 2002:adf:fc0a:: with SMTP id i10mr6384708wrr.111.1601069005049; Fri, 25 Sep 2020 14:23:25 -0700 (PDT) MIME-Version: 1.0 References: <20200513132114.6046-1-m.szyprowski@samsung.com> <20200513133245.6408-1-m.szyprowski@samsung.com> <20200513133245.6408-5-m.szyprowski@samsung.com> In-Reply-To: From: Alex Deucher Date: Fri, 25 Sep 2020 17:23:14 -0400 Message-ID: Subject: Re: [Linaro-mm-sig] [PATCH v5 05/38] drm: prime: use sgtable iterators in drm_prime_sg_to_page_addr_arrays() To: Marek Szyprowski Cc: Alex Goins , Bartlomiej Zolnierkiewicz , David Airlie , LKML , Maling list - DRI developers , "moderated list:DMA BUFFER SHARING FRAMEWORK" , "list@263.net:IOMMU DRIVERS , Joerg Roedel ," , Thomas Zimmermann , Robin Murphy , Christoph Hellwig , linux-arm-kernel Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 22, 2020 at 2:28 AM Marek Szyprowski wrote: > > Hi Alex, > > On 22.09.2020 01:15, Alex Goins wrote: > > Tested-by: Alex Goins > > > > 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/ > > > 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? Dave: would it be okay that way? I think this should go into drm-misc for 5.9 since it's an update to drm_prime.c. Is that patch ready to merge? Acked-by: Alex Deucher Alex > > Best regards > -- > Marek Szyprowski, PhD > Samsung R&D Institute Poland > > _______________________________________________ > Linaro-mm-sig mailing list > Linaro-mm-sig@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/linaro-mm-sig