From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BC2FCA90AF for ; Wed, 13 May 2020 13:24:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9ED48204EC for ; Wed, 13 May 2020 13:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733104AbgEMNYc (ORCPT ); Wed, 13 May 2020 09:24:32 -0400 Received: from foss.arm.com ([217.140.110.172]:45904 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726001AbgEMNYc (ORCPT ); Wed, 13 May 2020 09:24:32 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4D34C30E; Wed, 13 May 2020 06:24:31 -0700 (PDT) Received: from [10.57.36.85] (unknown [10.57.36.85]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9C35C3F71E; Wed, 13 May 2020 06:24:27 -0700 (PDT) Subject: Re: [PATCH v4 02/38] scatterlist: add generic wrappers for iterating over sgtable objects To: Marek Szyprowski , dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Christoph Hellwig , Bartlomiej Zolnierkiewicz , linux-arm-kernel@lists.infradead.org, David Airlie , Daniel Vetter References: <20200512085710.14688-1-m.szyprowski@samsung.com> <20200512090058.14910-1-m.szyprowski@samsung.com> <20200512090058.14910-2-m.szyprowski@samsung.com> From: Robin Murphy Message-ID: <4f9f747a-9bce-90f4-9ca7-ab851f29d758@arm.com> Date: Wed, 13 May 2020 14:24:25 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200512090058.14910-2-m.szyprowski@samsung.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-05-12 10:00 am, Marek Szyprowski wrote: > struct sg_table is a common structure used for describing a memory > buffer. It consists of a scatterlist with memory pages and DMA addresses > (sgl entry), as well as the number of scatterlist entries: CPU pages > (orig_nents entry) and DMA mapped pages (nents entry). > > It turned out that it was a common mistake to misuse nents and orig_nents > entries, calling the scatterlist iterating functions with a wrong number > of the entries. > > To avoid such issues, lets introduce a common wrappers operating directly > on the struct sg_table objects, which take care of the proper use of > the nents and orig_nents entries. > > While touching this, lets clarify some ambiguities in the comments for > the existing for_each helpers. Reviewed-by: Robin Murphy > Signed-off-by: Marek Szyprowski > --- > For more information, see '[PATCH v4 00/38] DRM: fix struct sg_table nents > vs. orig_nents misuse' thread: > https://lore.kernel.org/dri-devel/20200512085710.14688-1-m.szyprowski@samsung.com/T/ > --- > include/linux/scatterlist.h | 50 ++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 47 insertions(+), 3 deletions(-) > > diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h > index 6eec50f..4f922af 100644 > --- a/include/linux/scatterlist.h > +++ b/include/linux/scatterlist.h > @@ -151,6 +151,20 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf, > #define for_each_sg(sglist, sg, nr, __i) \ > for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg)) > > +/* > + * Loop over each sg element in the given sg_table object. > + */ > +#define for_each_sgtable_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->orig_nents, i) > + > +/* > + * Loop over each sg element in the given *DMA mapped* sg_table object. > + * Please use sg_dma_address(sg) and sg_dma_len(sg) to extract DMA addresses > + * of the each element. > + */ > +#define for_each_sgtable_dma_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->nents, i) > + > /** > * sg_chain - Chain two sglists together > * @prv: First scatterlist > @@ -401,9 +415,10 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > * @sglist: sglist to iterate over > * @piter: page iterator to hold current page, sg, sg_pgoffset > * @nents: maximum number of sg entries to iterate over > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_page() to get each page pointer. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_page(sglist, piter, nents, pgoffset) \ > for (__sg_page_iter_start((piter), (sglist), (nents), (pgoffset)); \ > @@ -412,18 +427,47 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > /** > * for_each_sg_dma_page - iterate over the pages of the given sg list > * @sglist: sglist to iterate over > - * @dma_iter: page iterator to hold current page > + * @dma_iter: DMA page iterator to hold current page > * @dma_nents: maximum number of sg entries to iterate over, this is the value > * returned from dma_map_sg > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_dma_address() to get each page's DMA address. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_dma_page(sglist, dma_iter, dma_nents, pgoffset) \ > for (__sg_page_iter_start(&(dma_iter)->base, sglist, dma_nents, \ > pgoffset); \ > __sg_page_iter_dma_next(dma_iter);) > > +/** > + * for_each_sgtable_page - iterate over all pages in the sg_table object > + * @sgt: sg_table object to iterate over > + * @piter: page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all memory pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_page(). In each loop it operates on PAGE_SIZE unit. > + */ > +#define for_each_sgtable_page(sgt, piter, pgoffset) \ > + for_each_sg_page(sgt->sgl, piter, sgt->orig_nents, pgoffset) > + > +/** > + * for_each_sgtable_dma_page - iterate over the DMA mapped sg_table object > + * @sgt: sg_table object to iterate over > + * @dma_iter: DMA page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all DMA mapped pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_dma_page(). In each loop it operates on PAGE_SIZE > + * unit. > + */ > +#define for_each_sgtable_dma_page(sgt, dma_iter, pgoffset) \ > + for_each_sg_dma_page(sgt->sgl, dma_iter, sgt->nents, pgoffset) > + > + > /* > * Mapping sg iterator > * > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2595CA90AF for ; Wed, 13 May 2020 13:26:43 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79594204EF for ; Wed, 13 May 2020 13:26:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79594204EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5A4E02047B; Wed, 13 May 2020 13:26:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cfMxTjvD6VXC; Wed, 13 May 2020 13:26:41 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id B47A821F76; Wed, 13 May 2020 13:26:41 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9EBCCC0178; Wed, 13 May 2020 13:26:41 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id AF7C9C016F for ; Wed, 13 May 2020 13:26:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 99BD52047B for ; Wed, 13 May 2020 13:26:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B5cWrg1khnW1 for ; Wed, 13 May 2020 13:24:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by silver.osuosl.org (Postfix) with ESMTP id D59CF2045A for ; Wed, 13 May 2020 13:24:31 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4D34C30E; Wed, 13 May 2020 06:24:31 -0700 (PDT) Received: from [10.57.36.85] (unknown [10.57.36.85]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9C35C3F71E; Wed, 13 May 2020 06:24:27 -0700 (PDT) Subject: Re: [PATCH v4 02/38] scatterlist: add generic wrappers for iterating over sgtable objects To: Marek Szyprowski , dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org References: <20200512085710.14688-1-m.szyprowski@samsung.com> <20200512090058.14910-1-m.szyprowski@samsung.com> <20200512090058.14910-2-m.szyprowski@samsung.com> From: Robin Murphy Message-ID: <4f9f747a-9bce-90f4-9ca7-ab851f29d758@arm.com> Date: Wed, 13 May 2020 14:24:25 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200512090058.14910-2-m.szyprowski@samsung.com> Content-Language: en-GB Cc: David Airlie , Daniel Vetter , Christoph Hellwig , linux-arm-kernel@lists.infradead.org, Bartlomiej Zolnierkiewicz X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On 2020-05-12 10:00 am, Marek Szyprowski wrote: > struct sg_table is a common structure used for describing a memory > buffer. It consists of a scatterlist with memory pages and DMA addresses > (sgl entry), as well as the number of scatterlist entries: CPU pages > (orig_nents entry) and DMA mapped pages (nents entry). > > It turned out that it was a common mistake to misuse nents and orig_nents > entries, calling the scatterlist iterating functions with a wrong number > of the entries. > > To avoid such issues, lets introduce a common wrappers operating directly > on the struct sg_table objects, which take care of the proper use of > the nents and orig_nents entries. > > While touching this, lets clarify some ambiguities in the comments for > the existing for_each helpers. Reviewed-by: Robin Murphy > Signed-off-by: Marek Szyprowski > --- > For more information, see '[PATCH v4 00/38] DRM: fix struct sg_table nents > vs. orig_nents misuse' thread: > https://lore.kernel.org/dri-devel/20200512085710.14688-1-m.szyprowski@samsung.com/T/ > --- > include/linux/scatterlist.h | 50 ++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 47 insertions(+), 3 deletions(-) > > diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h > index 6eec50f..4f922af 100644 > --- a/include/linux/scatterlist.h > +++ b/include/linux/scatterlist.h > @@ -151,6 +151,20 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf, > #define for_each_sg(sglist, sg, nr, __i) \ > for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg)) > > +/* > + * Loop over each sg element in the given sg_table object. > + */ > +#define for_each_sgtable_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->orig_nents, i) > + > +/* > + * Loop over each sg element in the given *DMA mapped* sg_table object. > + * Please use sg_dma_address(sg) and sg_dma_len(sg) to extract DMA addresses > + * of the each element. > + */ > +#define for_each_sgtable_dma_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->nents, i) > + > /** > * sg_chain - Chain two sglists together > * @prv: First scatterlist > @@ -401,9 +415,10 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > * @sglist: sglist to iterate over > * @piter: page iterator to hold current page, sg, sg_pgoffset > * @nents: maximum number of sg entries to iterate over > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_page() to get each page pointer. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_page(sglist, piter, nents, pgoffset) \ > for (__sg_page_iter_start((piter), (sglist), (nents), (pgoffset)); \ > @@ -412,18 +427,47 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > /** > * for_each_sg_dma_page - iterate over the pages of the given sg list > * @sglist: sglist to iterate over > - * @dma_iter: page iterator to hold current page > + * @dma_iter: DMA page iterator to hold current page > * @dma_nents: maximum number of sg entries to iterate over, this is the value > * returned from dma_map_sg > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_dma_address() to get each page's DMA address. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_dma_page(sglist, dma_iter, dma_nents, pgoffset) \ > for (__sg_page_iter_start(&(dma_iter)->base, sglist, dma_nents, \ > pgoffset); \ > __sg_page_iter_dma_next(dma_iter);) > > +/** > + * for_each_sgtable_page - iterate over all pages in the sg_table object > + * @sgt: sg_table object to iterate over > + * @piter: page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all memory pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_page(). In each loop it operates on PAGE_SIZE unit. > + */ > +#define for_each_sgtable_page(sgt, piter, pgoffset) \ > + for_each_sg_page(sgt->sgl, piter, sgt->orig_nents, pgoffset) > + > +/** > + * for_each_sgtable_dma_page - iterate over the DMA mapped sg_table object > + * @sgt: sg_table object to iterate over > + * @dma_iter: DMA page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all DMA mapped pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_dma_page(). In each loop it operates on PAGE_SIZE > + * unit. > + */ > +#define for_each_sgtable_dma_page(sgt, dma_iter, pgoffset) \ > + for_each_sg_dma_page(sgt->sgl, dma_iter, sgt->nents, pgoffset) > + > + > /* > * Mapping sg iterator > * > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E763CA90AF for ; Wed, 13 May 2020 13:37:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA8C022363 for ; Wed, 13 May 2020 13:37:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Gx7HouVC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA8C022363 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JbMCmSeRK//QaV7vNRjUW3ij1/LdFF3ZTw+dvVULgVE=; b=Gx7HouVCDv3ywCFPS4mn64Tky tmAJyugWUWA5ImyWbyMKrxkf9AH0kVrA9xqkCK5R4HrSfwG8ybroAi2o1VajUMH93OvfrkrKE40vS /Qs0TR3+iaFJotjLbC73bCAlOhm4lae4CcEs0rxCTa/7ClEFZXFWkob6KJMQN6qRH1wQ8Hds37FQO hxTyh0Gn8rd5fYYdSOir3krR0x/zFZhuFI1+9biEB50aQAJXn86yZJzK1d6huL+PuHaou3ioJkcyB tt5h75NCqKwI+cItVcYvT4lUaGaOHRNyQyM9MhX+Zdy7iQqpY3OxiNut6p3vkMH22y3/Z1qcMIjyD kax+rheAA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jYrNC-0001tb-OX; Wed, 13 May 2020 13:24:34 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jYrNA-0001sk-11 for linux-arm-kernel@lists.infradead.org; Wed, 13 May 2020 13:24:33 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4D34C30E; Wed, 13 May 2020 06:24:31 -0700 (PDT) Received: from [10.57.36.85] (unknown [10.57.36.85]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9C35C3F71E; Wed, 13 May 2020 06:24:27 -0700 (PDT) Subject: Re: [PATCH v4 02/38] scatterlist: add generic wrappers for iterating over sgtable objects To: Marek Szyprowski , dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org References: <20200512085710.14688-1-m.szyprowski@samsung.com> <20200512090058.14910-1-m.szyprowski@samsung.com> <20200512090058.14910-2-m.szyprowski@samsung.com> From: Robin Murphy Message-ID: <4f9f747a-9bce-90f4-9ca7-ab851f29d758@arm.com> Date: Wed, 13 May 2020 14:24:25 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200512090058.14910-2-m.szyprowski@samsung.com> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200513_062432_160283_7ABC408E X-CRM114-Status: GOOD ( 22.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Christoph Hellwig , linux-arm-kernel@lists.infradead.org, Bartlomiej Zolnierkiewicz Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2020-05-12 10:00 am, Marek Szyprowski wrote: > struct sg_table is a common structure used for describing a memory > buffer. It consists of a scatterlist with memory pages and DMA addresses > (sgl entry), as well as the number of scatterlist entries: CPU pages > (orig_nents entry) and DMA mapped pages (nents entry). > > It turned out that it was a common mistake to misuse nents and orig_nents > entries, calling the scatterlist iterating functions with a wrong number > of the entries. > > To avoid such issues, lets introduce a common wrappers operating directly > on the struct sg_table objects, which take care of the proper use of > the nents and orig_nents entries. > > While touching this, lets clarify some ambiguities in the comments for > the existing for_each helpers. Reviewed-by: Robin Murphy > Signed-off-by: Marek Szyprowski > --- > For more information, see '[PATCH v4 00/38] DRM: fix struct sg_table nents > vs. orig_nents misuse' thread: > https://lore.kernel.org/dri-devel/20200512085710.14688-1-m.szyprowski@samsung.com/T/ > --- > include/linux/scatterlist.h | 50 ++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 47 insertions(+), 3 deletions(-) > > diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h > index 6eec50f..4f922af 100644 > --- a/include/linux/scatterlist.h > +++ b/include/linux/scatterlist.h > @@ -151,6 +151,20 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf, > #define for_each_sg(sglist, sg, nr, __i) \ > for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg)) > > +/* > + * Loop over each sg element in the given sg_table object. > + */ > +#define for_each_sgtable_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->orig_nents, i) > + > +/* > + * Loop over each sg element in the given *DMA mapped* sg_table object. > + * Please use sg_dma_address(sg) and sg_dma_len(sg) to extract DMA addresses > + * of the each element. > + */ > +#define for_each_sgtable_dma_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->nents, i) > + > /** > * sg_chain - Chain two sglists together > * @prv: First scatterlist > @@ -401,9 +415,10 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > * @sglist: sglist to iterate over > * @piter: page iterator to hold current page, sg, sg_pgoffset > * @nents: maximum number of sg entries to iterate over > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_page() to get each page pointer. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_page(sglist, piter, nents, pgoffset) \ > for (__sg_page_iter_start((piter), (sglist), (nents), (pgoffset)); \ > @@ -412,18 +427,47 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > /** > * for_each_sg_dma_page - iterate over the pages of the given sg list > * @sglist: sglist to iterate over > - * @dma_iter: page iterator to hold current page > + * @dma_iter: DMA page iterator to hold current page > * @dma_nents: maximum number of sg entries to iterate over, this is the value > * returned from dma_map_sg > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_dma_address() to get each page's DMA address. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_dma_page(sglist, dma_iter, dma_nents, pgoffset) \ > for (__sg_page_iter_start(&(dma_iter)->base, sglist, dma_nents, \ > pgoffset); \ > __sg_page_iter_dma_next(dma_iter);) > > +/** > + * for_each_sgtable_page - iterate over all pages in the sg_table object > + * @sgt: sg_table object to iterate over > + * @piter: page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all memory pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_page(). In each loop it operates on PAGE_SIZE unit. > + */ > +#define for_each_sgtable_page(sgt, piter, pgoffset) \ > + for_each_sg_page(sgt->sgl, piter, sgt->orig_nents, pgoffset) > + > +/** > + * for_each_sgtable_dma_page - iterate over the DMA mapped sg_table object > + * @sgt: sg_table object to iterate over > + * @dma_iter: DMA page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all DMA mapped pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_dma_page(). In each loop it operates on PAGE_SIZE > + * unit. > + */ > +#define for_each_sgtable_dma_page(sgt, dma_iter, pgoffset) \ > + for_each_sg_dma_page(sgt->sgl, dma_iter, sgt->nents, pgoffset) > + > + > /* > * Mapping sg iterator > * > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9BA5C2D0FC for ; Wed, 13 May 2020 13:24:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65E012065C for ; Wed, 13 May 2020 13:24:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65E012065C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 07B7A6E20C; Wed, 13 May 2020 13:24:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by gabe.freedesktop.org (Postfix) with ESMTP id A7D7A6E20C for ; Wed, 13 May 2020 13:24:31 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4D34C30E; Wed, 13 May 2020 06:24:31 -0700 (PDT) Received: from [10.57.36.85] (unknown [10.57.36.85]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9C35C3F71E; Wed, 13 May 2020 06:24:27 -0700 (PDT) Subject: Re: [PATCH v4 02/38] scatterlist: add generic wrappers for iterating over sgtable objects To: Marek Szyprowski , dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org References: <20200512085710.14688-1-m.szyprowski@samsung.com> <20200512090058.14910-1-m.szyprowski@samsung.com> <20200512090058.14910-2-m.szyprowski@samsung.com> From: Robin Murphy Message-ID: <4f9f747a-9bce-90f4-9ca7-ab851f29d758@arm.com> Date: Wed, 13 May 2020 14:24:25 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200512090058.14910-2-m.szyprowski@samsung.com> Content-Language: en-GB X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Christoph Hellwig , linux-arm-kernel@lists.infradead.org, Bartlomiej Zolnierkiewicz Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2020-05-12 10:00 am, Marek Szyprowski wrote: > struct sg_table is a common structure used for describing a memory > buffer. It consists of a scatterlist with memory pages and DMA addresses > (sgl entry), as well as the number of scatterlist entries: CPU pages > (orig_nents entry) and DMA mapped pages (nents entry). > > It turned out that it was a common mistake to misuse nents and orig_nents > entries, calling the scatterlist iterating functions with a wrong number > of the entries. > > To avoid such issues, lets introduce a common wrappers operating directly > on the struct sg_table objects, which take care of the proper use of > the nents and orig_nents entries. > > While touching this, lets clarify some ambiguities in the comments for > the existing for_each helpers. Reviewed-by: Robin Murphy > Signed-off-by: Marek Szyprowski > --- > For more information, see '[PATCH v4 00/38] DRM: fix struct sg_table nents > vs. orig_nents misuse' thread: > https://lore.kernel.org/dri-devel/20200512085710.14688-1-m.szyprowski@samsung.com/T/ > --- > include/linux/scatterlist.h | 50 ++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 47 insertions(+), 3 deletions(-) > > diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h > index 6eec50f..4f922af 100644 > --- a/include/linux/scatterlist.h > +++ b/include/linux/scatterlist.h > @@ -151,6 +151,20 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf, > #define for_each_sg(sglist, sg, nr, __i) \ > for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg)) > > +/* > + * Loop over each sg element in the given sg_table object. > + */ > +#define for_each_sgtable_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->orig_nents, i) > + > +/* > + * Loop over each sg element in the given *DMA mapped* sg_table object. > + * Please use sg_dma_address(sg) and sg_dma_len(sg) to extract DMA addresses > + * of the each element. > + */ > +#define for_each_sgtable_dma_sg(sgt, sg, i) \ > + for_each_sg(sgt->sgl, sg, sgt->nents, i) > + > /** > * sg_chain - Chain two sglists together > * @prv: First scatterlist > @@ -401,9 +415,10 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > * @sglist: sglist to iterate over > * @piter: page iterator to hold current page, sg, sg_pgoffset > * @nents: maximum number of sg entries to iterate over > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_page() to get each page pointer. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_page(sglist, piter, nents, pgoffset) \ > for (__sg_page_iter_start((piter), (sglist), (nents), (pgoffset)); \ > @@ -412,18 +427,47 @@ static inline struct page *sg_page_iter_page(struct sg_page_iter *piter) > /** > * for_each_sg_dma_page - iterate over the pages of the given sg list > * @sglist: sglist to iterate over > - * @dma_iter: page iterator to hold current page > + * @dma_iter: DMA page iterator to hold current page > * @dma_nents: maximum number of sg entries to iterate over, this is the value > * returned from dma_map_sg > - * @pgoffset: starting page offset > + * @pgoffset: starting page offset (in pages) > * > * Callers may use sg_page_iter_dma_address() to get each page's DMA address. > + * In each loop it operates on PAGE_SIZE unit. > */ > #define for_each_sg_dma_page(sglist, dma_iter, dma_nents, pgoffset) \ > for (__sg_page_iter_start(&(dma_iter)->base, sglist, dma_nents, \ > pgoffset); \ > __sg_page_iter_dma_next(dma_iter);) > > +/** > + * for_each_sgtable_page - iterate over all pages in the sg_table object > + * @sgt: sg_table object to iterate over > + * @piter: page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all memory pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_page(). In each loop it operates on PAGE_SIZE unit. > + */ > +#define for_each_sgtable_page(sgt, piter, pgoffset) \ > + for_each_sg_page(sgt->sgl, piter, sgt->orig_nents, pgoffset) > + > +/** > + * for_each_sgtable_dma_page - iterate over the DMA mapped sg_table object > + * @sgt: sg_table object to iterate over > + * @dma_iter: DMA page iterator to hold current page > + * @pgoffset: starting page offset (in pages) > + * > + * Iterates over the all DMA mapped pages in the buffer described by > + * a scatterlist stored in the given sg_table object. > + * See also for_each_sg_dma_page(). In each loop it operates on PAGE_SIZE > + * unit. > + */ > +#define for_each_sgtable_dma_page(sgt, dma_iter, pgoffset) \ > + for_each_sg_dma_page(sgt->sgl, dma_iter, sgt->nents, pgoffset) > + > + > /* > * Mapping sg iterator > * > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel