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=-7.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FAKE_REPLY_C,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,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 82409C33CA9 for ; Mon, 13 Jan 2020 18:01:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5437F2075B for ; Mon, 13 Jan 2020 18:01:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578938478; bh=UIXix8sSz2A4LAi4I1FNAxhjk52vcTmK42i8w3F6uSA=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=D0w26UjGkYcdGfInFGHwiZpF+zG+JbnurLLhuTlic7pJaAGs6oHEuLILR00FAAnWW jLmFNHv18t++0pK/G2zBAOjAIv5tPsnRCbGSOK6OSD84xCyRi+3UpJMXq6U/bUSBjI G7ApkQzwrzV9/l1eb53nggYvaVvyd0UbSnuFlnjc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727331AbgAMSBR (ORCPT ); Mon, 13 Jan 2020 13:01:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:59052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726985AbgAMSBR (ORCPT ); Mon, 13 Jan 2020 13:01:17 -0500 Received: from localhost (mobile-166-170-223-177.mycingular.net [166.170.223.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8F28920678; Mon, 13 Jan 2020 18:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578938476; bh=UIXix8sSz2A4LAi4I1FNAxhjk52vcTmK42i8w3F6uSA=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=YGV53wO0yGZxwUAkp3oVEc+x5sG6kIaHKu32l/iBJhnheT4QvuPaq71cYOMo+pICK vXZVP4CQSIIf45g0lTLLN67y6Bfl4Ja+D3JG5KPCcY8aAMoCuxgXlc8nKCLbQwFUeH fiVMls+OQz9UH8d1vERNAdYEkPdCzH8WvDe+zQM4= Date: Mon, 13 Jan 2020 12:01:13 -0600 From: Bjorn Helgaas To: "Derrick, Jonathan" Cc: "lorenzo.pieralisi@arm.com" , "hch@lst.de" , "baolu.lu@linux.intel.com" , "joro@8bytes.org" , "iommu@lists.linux-foundation.org" , "kbusch@kernel.org" , "dwmw2@infradead.org" , "linux-pci@vger.kernel.org" Subject: Re: [PATCH v3 0/5] Clean up VMD DMA Map Ops Message-ID: <20200113180113.GA76810@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7b55519959391b7102c54341c6f6f23b2d24dabb.camel@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Mon, Jan 13, 2020 at 05:13:38PM +0000, Derrick, Jonathan wrote: > On Mon, 2020-01-13 at 12:08 +0000, Lorenzo Pieralisi wrote: > > On Fri, Jan 10, 2020 at 10:21:08AM -0700, Jon Derrick wrote: > > > v2 Set: https://lore.kernel.org/linux-iommu/1578580256-3483-1-git-send-email-jonathan.derrick@intel.com/T/#t > > > v1 Set: https://lore.kernel.org/linux-iommu/20200107134125.GD30750@8bytes.org/T/#t > > > > > > VMD currently works with VT-d enabled by pointing DMA and IOMMU actions at the > > > VMD endpoint. The problem with this approach is that the VMD endpoint's > > > device-specific attributes, such as the DMA Mask Bits, are used instead. > > > > > > This set cleans up VMD by removing the override that redirects DMA map > > > operations to the VMD endpoint. Instead it introduces a new DMA alias mechanism > > > into the existing DMA alias infrastructure. > > > > > > v1 added a pointer in struct pci_dev that pointed to the DMA alias' struct > > > pci_dev and did the necessary DMA alias and IOMMU modifications. > > > > > > v2 introduced a new weak function to reference the 'Direct DMA Alias', and > > > removed the need to add a pointer in struct device or pci_dev. Weak functions > > > are generally frowned upon when it's a single architecture implementation, so I > > > am open to alternatives. > > > > > > v3 references the pci_dev rather than the struct device for the PCI > > > 'Direct DMA Alias' (pci_direct_dma_alias()). This revision also allows > > > pci_for_each_dma_alias() to call any DMA aliases for the Direct DMA alias > > > device, though I don't expect the VMD endpoint to need intra-bus DMA aliases. > > > > > > Changes from v2: > > > Uses struct pci_dev for PCI Device 'Direct DMA aliasing' (pci_direct_dma_alias) > > > Allows pci_for_each_dma_alias to iterate over the alias mask of the 'Direct DMA alias' > > > > > > Changes from v1: > > > Removed 1/5 & 2/5 misc fix patches that were merged > > > Uses Christoph's staging/cleanup patches > > > Introduce weak function rather than including pointer in struct device or pci_dev. > > > > > > Based on Joerg's next: > > > https://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git/ > > > > > > Jon Derrick (5): > > > x86/pci: Add a to_pci_sysdata helper > > > x86/PCI: Expose VMD's PCI Device in pci_sysdata > > > PCI: Introduce pci_direct_dma_alias() > > > PCI: vmd: Stop overriding dma_map_ops > > > x86/pci: Remove X86_DEV_DMA_OPS > > > > > > arch/x86/Kconfig | 3 - > > > arch/x86/include/asm/device.h | 10 --- > > > arch/x86/include/asm/pci.h | 31 ++++----- > > > arch/x86/pci/common.c | 45 ++---------- > > > drivers/iommu/intel-iommu.c | 18 +++-- > > > drivers/pci/controller/Kconfig | 1 - > > > drivers/pci/controller/vmd.c | 152 +---------------------------------------- > > > drivers/pci/pci.c | 19 +++++- > > > drivers/pci/search.c | 7 ++ > > > include/linux/pci.h | 1 + > > > 10 files changed, 61 insertions(+), 226 deletions(-) > > > > Jon, Christoph, > > > > AFAICS this series supersedes/overrides: > > > > https://patchwork.kernel.org/patch/11114831/ > > > > Please let me know if that's correct, actually I was waiting to > > see consensus on the patch above but if this series supersedes > > it I would drop it from the PCI review queue. > > > > Thanks, > > Lorenzo > > It does supercede it (with Christoph's blessing). By the way, I have > been basing on Joerg's repo due to the v1/RFC IOMMU modifcations. As > there's more pci work at this point, should I base it on Bjorn's repo > instead? In general if I'm going to apply something, I prefer it based on my "master" branch unless there's a reason to the contrary. I think Lorenzo works pretty much the same way. Lorenzo will probably handle this series, but I applied it experimentally to check out the brace thing, and it applied fine to my "master" branch. So I think everything's fine as-is. Bjorn