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=-17.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,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 DCCC9C43460 for ; Sun, 2 May 2021 22:44:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7361961245 for ; Sun, 2 May 2021 22:44:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7361961245 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E4F0E6B0036; Sun, 2 May 2021 18:44:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DEBE36B006E; Sun, 2 May 2021 18:44:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC94F6B0070; Sun, 2 May 2021 18:44:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0021.hostedemail.com [216.40.44.21]) by kanga.kvack.org (Postfix) with ESMTP id 9D4696B0036 for ; Sun, 2 May 2021 18:44:13 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 495E58136 for ; Sun, 2 May 2021 22:44:13 +0000 (UTC) X-FDA: 78097770786.20.AF73018 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2043.outbound.protection.outlook.com [40.107.94.43]) by imf23.hostedemail.com (Postfix) with ESMTP id 6BD82A0003BF for ; Sun, 2 May 2021 22:44:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=faQ5fyVxSuTKAAhS3hWhwTDeaAmAV0JJRMyk4hWsZIy73jJzhzlow0NzAoviHgpLft9UcHcZkOH3hwWOElg8QxpFIN3pY5gF8qYMAGyle8StwkM9YW+mOGDfx/YjMFlFgHzWRNi+6n3j8EfnXelEXJdCSxZNHjLepHUkm0Owri1tl/u7sEaOiSdJXGGq4n6YgOzxMLejLII1pYEcvUzevBVvOih58e2ozjLIWHtgCNhxs922Ibegxlgmlbqt0FJOldWfL7xbmpyACgqMGoPD/pPEH26Bv3GA7NWEJ6bwFcaVyQD/IbjGCkpP+C1Lvuz16qo2p3NG0wi18kF1u9e4bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u1HmLh1Qq4QaallYKPWBKuHrgDty2mcLs90FONusoM4=; b=LJfeOA759WvyOLK05BXC1tjLilYbPwCIfxW3I7CcY6Wvax/LKXWmtRe3Reyti1thC2UDQeedl3y1+Gku6q6YaebCAbByt9QGjIYkTSAkaAWCqOSerayr4XnBOXoqjn5dv2F9B0H7zqJTttgCbO7Eq0ZtDbMhyqhoCFHYXf7jxdSeksSWe6psTpzFdzTha672NcQIJeRHnjo33LmRBx9KNqn3d2hRlq2/Re08OkvphsEZH4N0DO9/reLp7dAUbaxhC9Od5iv60sXB4evIFTIM2XBYTUc2q66bW3KDDy2QuIt3JhwDNNX/EAnDk4BUh2lOIl78X0euQnBkFoyx4hok/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=raithlin.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u1HmLh1Qq4QaallYKPWBKuHrgDty2mcLs90FONusoM4=; b=PWyVgJTOhIAZZDqsFQska/Vb7caAFlC2487QztZR321Je2WXxckM09AFaVOkFV+gNYnbhOgqi2sL2uurD1Q4uoKBuG7X7Bhj7aZkAWXZqREno2IlaCnE5nL2ymVgdhJrmqnHz3gHkqH2p9Uz4OVMp/KWNi8drA1I3p3CPsNNuBm3cXcnxCs9v/5Ghkm8rxlV94F3YQrSMlsMCrp3MY6wX0TW+uYoESMKiboztP6xkYNpXKOMpQqU6bhDqbrIY0hMsHv/pwjPB5UH9e1elDVtQfE0GpPES4OC+SR4Eege+T27t7xY3EY/LJs4m7oalDMekVTnFiU89jqo3efyJ+Y+GA== Received: from MW2PR16CA0056.namprd16.prod.outlook.com (2603:10b6:907:1::33) by DM6PR12MB4450.namprd12.prod.outlook.com (2603:10b6:5:28e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.40; Sun, 2 May 2021 22:44:10 +0000 Received: from CO1NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::fb) by MW2PR16CA0056.outlook.office365.com (2603:10b6:907:1::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25 via Frontend Transport; Sun, 2 May 2021 22:44:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; raithlin.com; dkim=none (message not signed) header.d=none;raithlin.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT034.mail.protection.outlook.com (10.13.174.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4087.27 via Frontend Transport; Sun, 2 May 2021 22:44:09 +0000 Received: from [10.2.50.162] (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 2 May 2021 22:44:07 +0000 Subject: Re: [PATCH 07/16] PCI/P2PDMA: Make pci_p2pdma_map_type() non-static To: Logan Gunthorpe , , , , , , CC: Stephen Bates , Christoph Hellwig , Dan Williams , Jason Gunthorpe , =?UTF-8?Q?Christian_K=c3=b6nig?= , Don Dutile , Matthew Wilcox , Daniel Vetter , Jakowski Andrzej , Minturn Dave B , Jason Ekstrand , Dave Hansen , Xiong Jianxin , Bjorn Helgaas , Ira Weiny , Robin Murphy References: <20210408170123.8788-1-logang@deltatee.com> <20210408170123.8788-8-logang@deltatee.com> From: John Hubbard Message-ID: Date: Sun, 2 May 2021 15:44:06 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210408170123.8788-8-logang@deltatee.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 24c147a1-08d6-4069-2ce0-08d90dbbcd08 X-MS-TrafficTypeDiagnostic: DM6PR12MB4450: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6mWJ0cgwj8hLLViPSgAuVFcDKClp1ha40VHCug/NRhfw954qItd9q9Md1Jni52LpWze0epTOQLJA9O1tEceRUEHI4S9nT58WAc7AkZdJDlqNyC2GWSOAoswpOUXf6wT5Mi9nS8yVdzsl8zbs25B+Rv0IEO89/m9A67snpnqnaRlbgs05AOm9JKkuGimS0usViw5BrMYO4AelclH9fIsRTot3qLsDFbUC8D/MVn0YQn4epFkIsv1ZI10jp9xVdgHI0dF3d9J+QQ8Zf36+a528fWGvof+Obp5rrJFpj1WbHLoe0tg2aLbtduEXIE2OA4RbW4CH20PYaR502CZtFb7fYCFtWItQd9PcybJS0ocsVTV8XVX+q/M6VsnRS7VWRNMB6YvqXqJlC1V06mGq2l6Q14e9+/BV5fzH7Y7nN79T2a7fBib0Q9ZDt85Bw9yzhEYzfRO5t6p2H5CVxAnGL+qMAqkgcY29vxjETwK1pSqy0SPAp7nQ/xdWQbafDYrPfLK9+z3Q3Xld+r67aftAlnSWdlLzsONJDJxU/JfBJp9xf7GV8t6QFXAKpLWVGI3XWmMrgZAtZbd1FeNqvwu8OGXfvv/jkQ3Cn0JWBB2qlh4H+yCcUQoJSotoPsnfAHAKHzQy2qEHXw4ks6sqAjFUKLd8IYzgfP9v9MwmXI4d2quoAYJVc/MAuF/4jjL1mNVRWHAF6QhT/kRzhrASWL76xj/Asw== X-Forefront-Antispam-Report: CIP:216.228.112.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:schybrid03.nvidia.com;CAT:NONE;SFS:(4636009)(136003)(346002)(39860400002)(396003)(376002)(36840700001)(46966006)(110136005)(8936002)(36756003)(26005)(36860700001)(16576012)(54906003)(83380400001)(31696002)(356005)(82310400003)(82740400003)(31686004)(7636003)(70206006)(316002)(5660300002)(47076005)(53546011)(36906005)(70586007)(4326008)(86362001)(336012)(478600001)(426003)(186003)(2906002)(7416002)(16526019)(2616005)(8676002)(2101003)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2021 22:44:09.8546 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 24c147a1-08d6-4069-2ce0-08d90dbbcd08 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4450 Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=PWyVgJTO; dmarc=pass (policy=none) header.from=nvidia.com; spf=none (imf23.hostedemail.com: domain of jhubbard@nvidia.com has no SPF policy when checking 40.107.94.43) smtp.mailfrom=jhubbard@nvidia.com X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 6BD82A0003BF X-Stat-Signature: 19s1fhmb4ofebrnsn9j9gcfudhfzidaa Received-SPF: none (nvidia.com>: No applicable sender policy available) receiver=imf23; identity=mailfrom; envelope-from=""; helo=NAM10-MW2-obe.outbound.protection.outlook.com; client-ip=40.107.94.43 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619995446-467292 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 4/8/21 10:01 AM, Logan Gunthorpe wrote: > pci_p2pdma_map_type() will be needed by the dma-iommu map_sg > implementation because it will need to determine the mapping type > ahead of actually doing the mapping to create the actual iommu mapping. > > Signed-off-by: Logan Gunthorpe > --- > drivers/pci/p2pdma.c | 34 +++++++++++++++++++++++----------- > include/linux/pci-p2pdma.h | 15 +++++++++++++++ > 2 files changed, 38 insertions(+), 11 deletions(-) > > diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c > index bcb1a6d6119d..38c93f57a941 100644 > --- a/drivers/pci/p2pdma.c > +++ b/drivers/pci/p2pdma.c > @@ -20,13 +20,6 @@ > #include > #include > > -enum pci_p2pdma_map_type { > - PCI_P2PDMA_MAP_UNKNOWN = 0, > - PCI_P2PDMA_MAP_NOT_SUPPORTED, > - PCI_P2PDMA_MAP_BUS_ADDR, > - PCI_P2PDMA_MAP_THRU_HOST_BRIDGE, > -}; > - > struct pci_p2pdma { > struct gen_pool *pool; > bool p2pmem_published; > @@ -822,13 +815,30 @@ void pci_p2pmem_publish(struct pci_dev *pdev, bool publish) > } > EXPORT_SYMBOL_GPL(pci_p2pmem_publish); > > -static enum pci_p2pdma_map_type pci_p2pdma_map_type(struct dev_pagemap *pgmap, > - struct device *dev) > +/** > + * pci_p2pdma_map_type - return the type of mapping that should be used for > + * a given device and pgmap > + * @pgmap: the pagemap of a page to determine the mapping type for > + * @dev: device that is mapping the page > + * @dma_attrs: the attributes passed to the dma_map operation -- > + * this is so they can be checked to ensure P2PDMA pages were not > + * introduced into an incorrect interface (like dma_map_sg). * > + * > + * Returns one of: > + * PCI_P2PDMA_MAP_NOT_SUPPORTED - The mapping should not be done > + * PCI_P2PDMA_MAP_BUS_ADDR - The mapping should use the PCI bus address > + * PCI_P2PDMA_MAP_THRU_HOST_BRIDGE - The mapping should be done directly > + */ > +enum pci_p2pdma_map_type pci_p2pdma_map_type(struct dev_pagemap *pgmap, > + struct device *dev, unsigned long dma_attrs) > { > struct pci_dev *provider = to_p2p_pgmap(pgmap)->provider; > enum pci_p2pdma_map_type ret; > struct pci_dev *client; > > + WARN_ONCE(!(dma_attrs & __DMA_ATTR_PCI_P2PDMA), > + "PCI P2PDMA pages were mapped with dma_map_sg!"); This really ought to also return -EINVAL, assuming that my review suggestions about return types, in earlier patches, are acceptable. > + > if (!provider->p2pdma) > return PCI_P2PDMA_MAP_NOT_SUPPORTED; > > @@ -879,7 +889,8 @@ int pci_p2pdma_map_sg_attrs(struct device *dev, struct scatterlist *sg, > struct pci_p2pdma_pagemap *p2p_pgmap = > to_p2p_pgmap(sg_page(sg)->pgmap); > > - switch (pci_p2pdma_map_type(sg_page(sg)->pgmap, dev)) { > + switch (pci_p2pdma_map_type(sg_page(sg)->pgmap, dev, > + __DMA_ATTR_PCI_P2PDMA)) { > case PCI_P2PDMA_MAP_THRU_HOST_BRIDGE: > return dma_map_sg_attrs(dev, sg, nents, dir, attrs); > case PCI_P2PDMA_MAP_BUS_ADDR: > @@ -904,7 +915,8 @@ void pci_p2pdma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, > { > enum pci_p2pdma_map_type map_type; > > - map_type = pci_p2pdma_map_type(sg_page(sg)->pgmap, dev); > + map_type = pci_p2pdma_map_type(sg_page(sg)->pgmap, dev, > + __DMA_ATTR_PCI_P2PDMA); These areas might end up looking a bit different, if my suggestion about applying pci_dev type safety throughout are accepted. The patch looks generally correct, aside from these details. thanks, -- John Hubbard NVIDIA > > if (map_type == PCI_P2PDMA_MAP_THRU_HOST_BRIDGE) > dma_unmap_sg_attrs(dev, sg, nents, dir, attrs); > diff --git a/include/linux/pci-p2pdma.h b/include/linux/pci-p2pdma.h > index 8318a97c9c61..a06072ac3a52 100644 > --- a/include/linux/pci-p2pdma.h > +++ b/include/linux/pci-p2pdma.h > @@ -16,6 +16,13 @@ > struct block_device; > struct scatterlist; > > +enum pci_p2pdma_map_type { > + PCI_P2PDMA_MAP_UNKNOWN = 0, > + PCI_P2PDMA_MAP_NOT_SUPPORTED, > + PCI_P2PDMA_MAP_BUS_ADDR, > + PCI_P2PDMA_MAP_THRU_HOST_BRIDGE, > +}; > + > #ifdef CONFIG_PCI_P2PDMA > int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size, > u64 offset); > @@ -30,6 +37,8 @@ struct scatterlist *pci_p2pmem_alloc_sgl(struct pci_dev *pdev, > unsigned int *nents, u32 length); > void pci_p2pmem_free_sgl(struct pci_dev *pdev, struct scatterlist *sgl); > void pci_p2pmem_publish(struct pci_dev *pdev, bool publish); > +enum pci_p2pdma_map_type pci_p2pdma_map_type(struct dev_pagemap *pgmap, > + struct device *dev, unsigned long dma_attrs); > int pci_p2pdma_map_sg_attrs(struct device *dev, struct scatterlist *sg, > int nents, enum dma_data_direction dir, unsigned long attrs); > void pci_p2pdma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, > @@ -83,6 +92,12 @@ static inline void pci_p2pmem_free_sgl(struct pci_dev *pdev, > static inline void pci_p2pmem_publish(struct pci_dev *pdev, bool publish) > { > } > +static inline enum pci_p2pdma_map_type pci_p2pdma_map_type( > + struct dev_pagemap *pgmap, struct device *dev, > + unsigned long dma_attrs) > +{ > + return PCI_P2PDMA_MAP_NOT_SUPPORTED; > +} > static inline int pci_p2pdma_map_sg_attrs(struct device *dev, > struct scatterlist *sg, int nents, enum dma_data_direction dir, > unsigned long attrs) >