From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> To: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Joerg Roedel <joro@8bytes.org>, tglx@linutronix.de, Sebastian Andrzej Siewior <bigeasy@linutronix.de> Subject: [PATCH 07/10] iommu/amd: factor out setting the remap table for a devid Date: Fri, 23 Feb 2018 23:27:33 +0100 [thread overview] Message-ID: <20180223222736.18542-8-bigeasy@linutronix.de> (raw) In-Reply-To: <20180223222736.18542-1-bigeasy@linutronix.de> Setting the IRQ remap table for a specific devid (or its alias devid) includes three steps. Those three steps are always repeated each time this is done. Introduce a new helper function, move those steps there and use that function instead. The compiler can still decide if it is worth to inline. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/iommu/amd_iommu.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index d3a05d794218..b763fcbd790d 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3588,6 +3588,14 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table) amd_iommu_dev_table[devid].data[2] = dte; } +static void set_remap_table_entry(struct amd_iommu *iommu, u16 devid, + struct irq_remap_table *table) +{ + irq_lookup_table[devid] = table; + set_dte_irq_entry(devid, table); + iommu_flush_dte(iommu, devid); +} + static struct irq_remap_table *get_irq_table(u16 devid) { struct irq_remap_table *table = NULL; @@ -3608,9 +3616,7 @@ static struct irq_remap_table *get_irq_table(u16 devid) alias = amd_iommu_alias_table[devid]; table = irq_lookup_table[alias]; if (table) { - irq_lookup_table[devid] = table; - set_dte_irq_entry(devid, table); - iommu_flush_dte(iommu, devid); + set_remap_table_entry(iommu, devid, table); goto out; } @@ -3637,14 +3643,9 @@ static struct irq_remap_table *get_irq_table(u16 devid) (MAX_IRQS_PER_TABLE * (sizeof(u64) * 2))); - irq_lookup_table[devid] = table; - set_dte_irq_entry(devid, table); - iommu_flush_dte(iommu, devid); - if (devid != alias) { - irq_lookup_table[alias] = table; - set_dte_irq_entry(alias, table); - iommu_flush_dte(iommu, alias); - } + set_remap_table_entry(iommu, devid, table); + if (devid != alias) + set_remap_table_entry(iommu, alias, table); out: iommu_completion_wait(iommu); -- 2.16.1
WARNING: multiple messages have this Message-ID (diff)
From: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Subject: [PATCH 07/10] iommu/amd: factor out setting the remap table for a devid Date: Fri, 23 Feb 2018 23:27:33 +0100 [thread overview] Message-ID: <20180223222736.18542-8-bigeasy@linutronix.de> (raw) In-Reply-To: <20180223222736.18542-1-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Setting the IRQ remap table for a specific devid (or its alias devid) includes three steps. Those three steps are always repeated each time this is done. Introduce a new helper function, move those steps there and use that function instead. The compiler can still decide if it is worth to inline. Signed-off-by: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> --- drivers/iommu/amd_iommu.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index d3a05d794218..b763fcbd790d 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3588,6 +3588,14 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table) amd_iommu_dev_table[devid].data[2] = dte; } +static void set_remap_table_entry(struct amd_iommu *iommu, u16 devid, + struct irq_remap_table *table) +{ + irq_lookup_table[devid] = table; + set_dte_irq_entry(devid, table); + iommu_flush_dte(iommu, devid); +} + static struct irq_remap_table *get_irq_table(u16 devid) { struct irq_remap_table *table = NULL; @@ -3608,9 +3616,7 @@ static struct irq_remap_table *get_irq_table(u16 devid) alias = amd_iommu_alias_table[devid]; table = irq_lookup_table[alias]; if (table) { - irq_lookup_table[devid] = table; - set_dte_irq_entry(devid, table); - iommu_flush_dte(iommu, devid); + set_remap_table_entry(iommu, devid, table); goto out; } @@ -3637,14 +3643,9 @@ static struct irq_remap_table *get_irq_table(u16 devid) (MAX_IRQS_PER_TABLE * (sizeof(u64) * 2))); - irq_lookup_table[devid] = table; - set_dte_irq_entry(devid, table); - iommu_flush_dte(iommu, devid); - if (devid != alias) { - irq_lookup_table[alias] = table; - set_dte_irq_entry(alias, table); - iommu_flush_dte(iommu, alias); - } + set_remap_table_entry(iommu, devid, table); + if (devid != alias) + set_remap_table_entry(iommu, alias, table); out: iommu_completion_wait(iommu); -- 2.16.1
next prev parent reply other threads:[~2018-02-23 22:29 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-23 22:27 iommu/amd: lock splitting & GFP_KERNEL allocation Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-02-23 22:27 ` [PATCH 01/10] iommu/amd: take into account that alloc_dev_data() may return NULL Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-02-23 22:27 ` [PATCH 02/10] iommu/amd: turn dev_data_list into a lock less list Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-02-23 22:27 ` [PATCH 03/10] iommu/amd: split domain id out of amd_iommu_devtable_lock Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-02-23 22:27 ` [PATCH 04/10] iommu/amd: split irq_lookup_table out of the amd_iommu_devtable_lock Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-03-15 12:54 ` Joerg Roedel 2018-03-15 12:54 ` Joerg Roedel 2018-02-23 22:27 ` [PATCH 05/10] iommu/amd: remove the special case from get_irq_table() Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-03-15 12:53 ` Joerg Roedel 2018-03-15 13:01 ` Sebastian Andrzej Siewior 2018-03-15 13:01 ` Sebastian Andrzej Siewior 2018-03-15 13:07 ` Joerg Roedel 2018-03-15 13:07 ` Joerg Roedel 2018-03-15 14:15 ` Sebastian Andrzej Siewior 2018-03-15 14:15 ` Sebastian Andrzej Siewior 2018-03-15 15:19 ` Joerg Roedel 2018-03-15 15:19 ` Joerg Roedel 2018-03-15 15:25 ` Sebastian Andrzej Siewior 2018-03-15 15:25 ` Sebastian Andrzej Siewior 2018-02-23 22:27 ` [PATCH 06/10] iommu/amd: use `table' instead `irt' as variable name in amd_iommu_update_ga() Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior [this message] 2018-02-23 22:27 ` [PATCH 07/10] iommu/amd: factor out setting the remap table for a devid Sebastian Andrzej Siewior 2018-02-23 22:27 ` [PATCH 08/10] iommu/amd: drop the lock while allocating new irq remap table Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-03-15 12:58 ` Joerg Roedel 2018-03-15 12:58 ` Joerg Roedel 2018-02-23 22:27 ` [PATCH 09/10] iommu/amd: declare irq_remap_table's and amd_iommu's lock as a raw_spin_lock Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-02-23 22:27 ` [PATCH 10/10] iommu/amd: make amd_iommu_devtable_lock a spin_lock Sebastian Andrzej Siewior 2018-02-23 22:27 ` Sebastian Andrzej Siewior 2018-03-15 13:01 ` iommu/amd: lock splitting & GFP_KERNEL allocation Joerg Roedel 2018-03-15 13:01 ` Joerg Roedel 2018-03-22 15:22 [PATCH 00/10 v3] " Sebastian Andrzej Siewior 2018-03-22 15:22 ` [PATCH 07/10] iommu/amd: factor out setting the remap table for a devid Sebastian Andrzej Siewior
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180223222736.18542-8-bigeasy@linutronix.de \ --to=bigeasy@linutronix.de \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.