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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 27DBBD6B6A9 for ; Wed, 30 Oct 2024 16:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yYoXZbQ0uAqOxJs4pfuNVgj8x5cCoQnCDnibucZBWDk=; b=n9wa51ESWNh0UHA466aG4lWFZk zT5VdaPUWFvFA8QO+FgxTluBxDtIvUfV1nG/liGgSHdHyslJlUtNwuTHs1TuKXmcyb8kAaI2KcdQD DXXUaFoNOPsmieYsE5DvwA3TX36OpOb+esi0KKEcGhgMoe57YvMJpzyoFSCzTmpj9702gbpNVsSQE R4cGnZPvclkyM2xPpjpe6SqNFiBygChOA1Q6Hu1dHtyg0o4LQtlKkvMjxO807JMXe7F9jngmL+TOc 1g2l1L4W7OT9n0L3eLY3DhTOipZrSjEybGnX7enrVJDizjeJUtiqmJWrCZwCZWHS9bVECKTBNF1hv iAwo8L8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t6BZz-000000014ye-0M2U; Wed, 30 Oct 2024 16:29:55 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t6BXR-000000014Wk-3IHb for linux-arm-kernel@lists.infradead.org; Wed, 30 Oct 2024 16:27:19 +0000 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4315ee633dcso259065e9.1 for ; Wed, 30 Oct 2024 09:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730305635; x=1730910435; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=yYoXZbQ0uAqOxJs4pfuNVgj8x5cCoQnCDnibucZBWDk=; b=IH0wjCnOyQkq49BLriyGnnt16jiq7wqgrKlNB3GKtYxbLULuyrKlvs0+JVRAKQPNh8 Tz+KA4kxuwyFLAoimv058jn7UfDqAhhQ28FN9eVyPW3yvYwvd7DSn2RQ1f5P2mQMioiD AsR9KOm64u4xw2vaCsH0wV8Rdl0OA5FpuVrVL65Cm0EzWct3lrTaX8ZaxKqgjESFZLQM jlYt2dnF/VKfi4Wo4rVU5HRZcM9KrhkrvTRudzHpxRchUc/NJ5w9cAnsoOh26Vf+Nta4 4dkJTfHDRqWTQoUbGa1+eoGHgerNXhrMLexY7ZWc0O/1ADuoexfKR4HzrA76VanP52+e GdAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730305635; x=1730910435; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yYoXZbQ0uAqOxJs4pfuNVgj8x5cCoQnCDnibucZBWDk=; b=wVpcjEWTsYuI5/IFlI1uWQCzzZTepdXXiaada0v3x2PrTWds9yj18KmpFMEg9+nFB5 2gIyvP9XKJmA0XMhFMAtZLUr1xZEEAjdFRgNyB9ec5xkNN9VQ4A0NPEmOH0XiToiujeb ZpIgBRNvdJdFXP/u4H3fG0QfMg52khUk5/7GNx2QZFhWwm6msCnEAAOKZaSyXwBasxzl ir99Emv9+MrLJtqJwjSpCxBQzzYb7xIVwRm4+VTCHHqaceKOwi31XSGbV/REQzYWU5mp DBpmD4qAPMaBAUWt7FsomGFPjNHDKoWEKGeRY67opONswmNeK69XmZXxia/QwFgRJjGI 9x9g== X-Forwarded-Encrypted: i=1; AJvYcCUeOeoPkXhNEDa2cXaTGXuFvNRVWgd1GgUVaz0DZq1BmHEPGg0KoZ44ahaiZqvm1JPmUUGrMPuyFItlkYR4Mm8i@lists.infradead.org X-Gm-Message-State: AOJu0YwO5L5GO9se/PR/UHimD++DZhSDgbQy3Yb4oEt13INNY/CvwDEX Kw2TZqtlCFHMM/668/+MnmKMR+n2QSrn0zS8GVVixmtpJfvWHaePQn2DOWN1oA== X-Gm-Gg: ASbGncsMKQ6OwaR+b+TjF3XoPDOt7mdLAcEhlhDCvEt5G11ln8DKOfWNlRl7VybfsJ7 iYeRZcoT93BJjmo3c2DjsUxAg4KuvGgDa1da5y91t9zMeknPbQNy/fjNhhqn1gZ7TsMSwS25dHL EDhvJC/Y1OvwbbKnPOI83A2J+ke2SZzpLwrPP0nnodyDFtpAOXDRe00bZd81CIFqcAACZrFlijr 60bQB6YmWeRN7AJUbOXmcBXO/GfKtcaDiKKZ8YwwG0XiAYXmhxt8tLgk/zBasF+fXrwJ6Vaixch 0nBUAN1U/w== X-Google-Smtp-Source: AGHT+IEOBtDGTbd6gFd1Z2+Q52Kfzjw/j8SXp0CbEXKBAIwCsXgB74M2Jp4jqtd+Hp2Dw2dtDYw8jw== X-Received: by 2002:a05:600c:1d83:b0:42c:acd7:b59b with SMTP id 5b1f17b1804b1-431b3cdeb16mr11198215e9.6.1730305635387; Wed, 30 Oct 2024 09:27:15 -0700 (PDT) Received: from google.com (88.140.78.34.bc.googleusercontent.com. [34.78.140.88]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-431bd9ca818sm25801655e9.40.2024.10.30.09.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 09:27:08 -0700 (PDT) Date: Wed, 30 Oct 2024 16:26:59 +0000 From: Mostafa Saleh To: Jason Gunthorpe Cc: acpica-devel@lists.linux.dev, Hanjun Guo , iommu@lists.linux.dev, Joerg Roedel , Kevin Tian , kvm@vger.kernel.org, Len Brown , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Lorenzo Pieralisi , "Rafael J. Wysocki" , Robert Moore , Robin Murphy , Sudeep Holla , Will Deacon , Alex Williamson , Eric Auger , Jean-Philippe Brucker , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, "Rafael J. Wysocki" , Shameerali Kolothum Thodi Subject: Re: [PATCH v3 7/9] iommu/arm-smmu-v3: Expose the arm_smmu_attach interface Message-ID: References: <0-v3-e2e16cd7467f+2a6a1-smmuv3_nesting_jgg@nvidia.com> <7-v3-e2e16cd7467f+2a6a1-smmuv3_nesting_jgg@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7-v3-e2e16cd7467f+2a6a1-smmuv3_nesting_jgg@nvidia.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241030_092717_851106_691AD34B X-CRM114-Status: GOOD ( 21.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Oct 09, 2024 at 01:23:13PM -0300, Jason Gunthorpe wrote: > The arm-smmuv3-iommufd.c file will need to call these functions too. > Remove statics and put them in the header file. Remove the kunit > visibility protections from arm_smmu_make_abort_ste() and > arm_smmu_make_s2_domain_ste(). > > Signed-off-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh Thanks, Mostafa > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 22 ++++------------- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 27 +++++++++++++++++---- > 2 files changed, 27 insertions(+), 22 deletions(-) > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index 80847fa386fcd2..b4b03206afbf48 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -1549,7 +1549,6 @@ static void arm_smmu_write_ste(struct arm_smmu_master *master, u32 sid, > } > } > > -VISIBLE_IF_KUNIT > void arm_smmu_make_abort_ste(struct arm_smmu_ste *target) > { > memset(target, 0, sizeof(*target)); > @@ -1632,7 +1631,6 @@ void arm_smmu_make_cdtable_ste(struct arm_smmu_ste *target, > } > EXPORT_SYMBOL_IF_KUNIT(arm_smmu_make_cdtable_ste); > > -VISIBLE_IF_KUNIT > void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, > struct arm_smmu_master *master, > struct arm_smmu_domain *smmu_domain, > @@ -2505,8 +2503,8 @@ arm_smmu_get_step_for_sid(struct arm_smmu_device *smmu, u32 sid) > } > } > > -static void arm_smmu_install_ste_for_dev(struct arm_smmu_master *master, > - const struct arm_smmu_ste *target) > +void arm_smmu_install_ste_for_dev(struct arm_smmu_master *master, > + const struct arm_smmu_ste *target) > { > int i, j; > struct arm_smmu_device *smmu = master->smmu; > @@ -2671,16 +2669,6 @@ static void arm_smmu_remove_master_domain(struct arm_smmu_master *master, > spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); > } > > -struct arm_smmu_attach_state { > - /* Inputs */ > - struct iommu_domain *old_domain; > - struct arm_smmu_master *master; > - bool cd_needs_ats; > - ioasid_t ssid; > - /* Resulting state */ > - bool ats_enabled; > -}; > - > /* > * Start the sequence to attach a domain to a master. The sequence contains three > * steps: > @@ -2701,8 +2689,8 @@ struct arm_smmu_attach_state { > * new_domain can be a non-paging domain. In this case ATS will not be enabled, > * and invalidations won't be tracked. > */ > -static int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, > - struct iommu_domain *new_domain) > +int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, > + struct iommu_domain *new_domain) > { > struct arm_smmu_master *master = state->master; > struct arm_smmu_master_domain *master_domain; > @@ -2784,7 +2772,7 @@ static int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, > * completes synchronizing the PCI device's ATC and finishes manipulating the > * smmu_domain->devices list. > */ > -static void arm_smmu_attach_commit(struct arm_smmu_attach_state *state) > +void arm_smmu_attach_commit(struct arm_smmu_attach_state *state) > { > struct arm_smmu_master *master = state->master; > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > index 66261fd5bfb2d2..c9e5290e995a64 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > @@ -830,21 +830,22 @@ struct arm_smmu_entry_writer_ops { > void (*sync)(struct arm_smmu_entry_writer *writer); > }; > > +void arm_smmu_make_abort_ste(struct arm_smmu_ste *target); > +void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, > + struct arm_smmu_master *master, > + struct arm_smmu_domain *smmu_domain, > + bool ats_enabled); > + > #if IS_ENABLED(CONFIG_KUNIT) > void arm_smmu_get_ste_used(const __le64 *ent, __le64 *used_bits); > void arm_smmu_write_entry(struct arm_smmu_entry_writer *writer, __le64 *cur, > const __le64 *target); > void arm_smmu_get_cd_used(const __le64 *ent, __le64 *used_bits); > -void arm_smmu_make_abort_ste(struct arm_smmu_ste *target); > void arm_smmu_make_bypass_ste(struct arm_smmu_device *smmu, > struct arm_smmu_ste *target); > void arm_smmu_make_cdtable_ste(struct arm_smmu_ste *target, > struct arm_smmu_master *master, bool ats_enabled, > unsigned int s1dss); > -void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, > - struct arm_smmu_master *master, > - struct arm_smmu_domain *smmu_domain, > - bool ats_enabled); > void arm_smmu_make_sva_cd(struct arm_smmu_cd *target, > struct arm_smmu_master *master, struct mm_struct *mm, > u16 asid); > @@ -902,6 +903,22 @@ static inline bool arm_smmu_master_canwbs(struct arm_smmu_master *master) > IOMMU_FWSPEC_PCI_RC_CANWBS; > } > > +struct arm_smmu_attach_state { > + /* Inputs */ > + struct iommu_domain *old_domain; > + struct arm_smmu_master *master; > + bool cd_needs_ats; > + ioasid_t ssid; > + /* Resulting state */ > + bool ats_enabled; > +}; > + > +int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, > + struct iommu_domain *new_domain); > +void arm_smmu_attach_commit(struct arm_smmu_attach_state *state); > +void arm_smmu_install_ste_for_dev(struct arm_smmu_master *master, > + const struct arm_smmu_ste *target); > + > #ifdef CONFIG_ARM_SMMU_V3_SVA > bool arm_smmu_sva_supported(struct arm_smmu_device *smmu); > bool arm_smmu_master_sva_supported(struct arm_smmu_master *master); > -- > 2.46.2 >