Skip to content

Split struct irq_data into common part and per-chip part

Jiang Liu linux-acpi linux-alpha linux-arm-kernel linux-gpio linux-ia64 linux-metag linux-mips linux-parisc linux-pci linux-sh linuxppc-dev lkml netdev sparclinux xen-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest36 patches 15 repliesIn review
  2. v214 patches 6 repliesSuperseded
  3. v1 RFC11 patches 16 repliesSuperseded

Changes in v3 from the cover letter

1) Add patch 1-2 to fix a regression revealed by this patch set. It caused me about ten days to shoot down this bug, and it also proves that this patch set is the right thing to do.
2) Split changes into per-arch slices
3) Kill the last direct reference to data->common->handler_data from file drivers/sh/intc/virq.c.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/36genirq: Enhance irq_data_to_desc() to support hierarchy irqdomaininclude/linux/irqdesc.h kernel/irq/internals.h+9 -20 replies
2/36genirq: Fix crash caused by irq_move_irq() when hierarch irqdomain is enabledkernel/irq/migration.c+8 -13 replies
3/36genirq: Introduce struct irq_common_data to host shared irq datainclude/linux/irq.h include/linux/irqdesc.h kernel/irq/internals.h +2 more+41 -280 replies
4/36genirq: Introduce helper function irq_data_get_node()include/linux/irq.h kernel/irq/internals.h kernel/irq/irqdesc.c +3 more+15 -100 replies
5/36x86, irq: Use accessor irq_data_get_node() to hide struct irq_data detailarch/x86/kernel/apic/vector.c arch/x86/platform/uv/uv_irq.c+5 -50 replies
6/36sh, irq: Use accessor irq_data_get_node() to hide struct irq_data detailarch/sh/kernel/irq.c+1 -10 replies
7/36genirq: Move field 'node' from struct irq_data into struct irq_common_datainclude/linux/irq.h kernel/irq/internals.h kernel/irq/irqdesc.c +1 more+18 -60 replies
8/36sparc, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc detailsarch/sparc/kernel/irq_64.c arch/sparc/kernel/sun4d_irq.c arch/sparc/kernel/sun4m_irq.c+15 -100 replies
9/36x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc detailsarch/x86/kernel/apic/msi.c arch/x86/kernel/hpet.c+3 -30 replies
10/36x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc detailsdrivers/gpio/gpio-davinci.c+1 -10 replies
11/36sh, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc detailsdrivers/sh/intc/virq.c+7 -52 replies
12/36genirq: Move field 'handler_data' from struct irq_data into struct irq_common_datainclude/linux/irq.h include/linux/irqdesc.h kernel/irq/chip.c +1 more+8 -70 replies
13/36mn10300: Fix incorrect use of data->affinityarch/mn10300/kernel/irq.c+3 -30 replies
14/36genirq: Introduce helper function irq_data_get_affinity_mask()include/linux/irq.h+12 -00 replies
15/36alpha, irq: Use access helper irq_data_get_affinity_mask()arch/alpha/kernel/irq.c+1 -10 replies
16/36ARM, irq: Use access helper irq_data_get_affinity_mask()arch/arm/kernel/irq.c+2 -20 replies
17/36ARM64, irq: Use access helper irq_data_get_affinity_mask()arch/arm64/kernel/irq.c+2 -21 reply
18/36blackfin, irq: Use access helper irq_data_get_affinity_mask()arch/blackfin/mach-common/ints-priority.c+2 -10 replies
19/36IA64, irq: Use access helper irq_data_get_affinity_mask()arch/ia64/kernel/iosapic.c arch/ia64/kernel/irq.c arch/ia64/kernel/msi_ia64.c +1 more+7 -70 replies
20/36metag, irq: Use access helper irq_data_get_affinity_mask()arch/metag/kernel/irq.c+6 -40 replies
21/36mips, irq: Use access helper irq_data_get_affinity_mask()arch/mips/bcm63xx/irq.c arch/mips/cavium-octeon/octeon-irq.c arch/mips/pmcs-msp71xx/msp_irq_cic.c+11 -81 reply
22/36mn10300, irq: Use access helper irq_data_get_affinity_mask()arch/mn10300/kernel/cevt-mn10300.c arch/mn10300/kernel/irq.c+8 -70 replies
23/36parisc, irq: Use access helper irq_data_get_affinity_mask()arch/parisc/kernel/irq.c drivers/parisc/iosapic.c+7 -70 replies
24/36powerpc, irq: Use access helper irq_data_get_affinity_mask()arch/powerpc/kernel/irq.c arch/powerpc/sysdev/xics/ics-opal.c arch/powerpc/sysdev/xics/ics-rtas.c+3 -30 replies
25/36sh, irq: Use access helper irq_data_get_affinity_mask()arch/sh/kernel/irq.c drivers/sh/intc/chip.c+7 -60 replies
26/36sparc, irq: Use access helper irq_data_get_affinity_mask()arch/sparc/kernel/irq_64.c arch/sparc/kernel/leon_kernel.c+10 -80 replies
27/36x86, irq: Use access helper irq_data_get_affinity_mask()arch/x86/kernel/apic/io_apic.c arch/x86/kernel/apic/vector.c arch/x86/kernel/irq.c +1 more+8 -84 replies
27/36x86, irq: Use access helper irq_data_get_affinity_mask()arch/x86/kernel/apic/io_apic.c arch/x86/kernel/apic/vector.c arch/x86/kernel/irq.c +1 more+8 -80 replies
27/36x86, irq: Use access helper irq_data_get_affinity_mask()arch/x86/kernel/apic/io_apic.c arch/x86/kernel/apic/vector.c arch/x86/kernel/irq.c +1 more+8 -60 replies
27/36x86, irq: Use access helper irq_data_get_affinity_mask()arch/x86/kernel/apic/io_apic.c arch/x86/kernel/apic/vector.c arch/x86/kernel/irq.c +1 more+8 -60 replies
28/36xtensa, irq: Use access helper irq_data_get_affinity_mask()arch/xtensa/kernel/irq.c+6 -40 replies
29/36irqchip, irq: Use access helper irq_data_get_affinity_mask()drivers/irqchip/irq-mips-gic.c+1 -10 replies
30/36net/mlx4: Cache irq_desc->affinity instead of irq_descdrivers/net/ethernet/mellanox/mlx4/en_cq.c drivers/net/ethernet/mellanox/mlx4/en_rx.c drivers/net/ethernet/mellanox/mlx4/mlx4_en.h+5 -80 replies
31/36genirq: Move field 'affinity' from struct irq_data into struct irq_common_datainclude/linux/irq.h kernel/irq/irqdesc.c kernel/irq/manage.c +1 more+18 -170 replies
31/36genirq: Move field 'affinity' from struct irq_data into struct irq_common_dataarch/x86/kernel/apic/vector.c include/linux/irq.h kernel/irq/irqdesc.c +2 more+19 -200 replies
32/36genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()drivers/pci/host/pcie-designware.c drivers/pci/msi.c include/linux/irq.h+3 -30 replies
33/36genirq: Use helper function to access irq_data->msi_descarch/ia64/kernel/msi_ia64.c arch/ia64/sn/kernel/msi_sn.c arch/powerpc/sysdev/xics/ics-opal.c +3 more+6 -63 replies
34/36genirq: Move field 'msi_desc' from struct irq_data into struct irq_common_datainclude/linux/irq.h include/linux/irqdesc.h kernel/irq/chip.c +1 more+7 -70 replies
35/36genirq: Pass irq_data to helper function __irq_set_chip_handler_name_locked()arch/ia64/kernel/iosapic.c arch/mips/alchemy/common/irq.c drivers/gpio/gpio-zynq.c +3 more+18 -241 reply
36/36genirq: Optimize irq_data_to_desc() to avoid irq_to_desc() lookupinclude/linux/irqdesc.h+1 -10 replies

Reviews trailers per patch

6 of 40 patches have a Reviewed-by or Acked-by.

PatchRussell KingBjorn HelgaasMichael EllermanHanjun GuoRalf Baechle
1/36
2/36
3/36
4/36
5/36
6/36
7/36
8/36
9/36
10/36
11/36
12/36
13/36
14/36A-b
15/36
16/36
17/36R-b
18/36
19/36
20/36
21/36A-b
22/36
23/36
24/36
25/36
26/36
27/36
27/36
27/36
27/36
28/36
29/36
30/36
31/36
31/36
32/36A-b
33/36A-b
34/36
35/36A-b
36/36

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v3 thread

Cover letter [Patch v3 00/36] Split struct irq_data into common part and per-chip part

Hi all,
Now the irq core supports hierarchy irq and stacked irqchips,
so there may be multiple irq_datas associated with the same irq. But some fields in struct irq_data are per-irq instance and duplicating those fields into multiple irq_data may cause troubles.
So this patch introduces a new data structure 'struct
irq_common_data' to host per-irq instance data fields, and struct irq_data will only host per-chip data fields after the conversion.

It's based on tip/x86/apic.

And it passes Fengguang's zeroday test suite.

V2->V3:
1) Add patch 1-2 to fix a regression revealed by this patch set. It caused me about ten days to shoot down this bug, and it also proves that this patch set is the right thing to do.
2) Split changes into per-arch slices
3) Kill the last direct reference to data->common->handler_data from file drivers/sh/intc/virq.c.

V1->V2:
1) Patch "net/mlx4: Cache irq_desc->affinity instead of irq_desc" is still kept to avoid build failure. It may be dropped if Amir Vadai changed related code.
2) Reorganize patches according to Thomas's suggestion.
3) Rename irq_data_get_msi() as irq_data_get_msi_desc().

Thanks!
Gerry

Jiang Liu (36):
genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
genirq: Fix crash caused by irq_move_irq() when hierarch irqdomain is
enabled
genirq: Introduce struct irq_common_data to host shared irq data
genirq: Introduce helper function irq_data_get_node()
x86, irq: Use accessor irq_data_get_node() to hide struct irq_data
detail
sh, irq: Use accessor irq_data_get_node() to hide struct irq_data
detail
genirq: Move field 'node' from struct irq_data into struct
irq_common_data
sparc, irq: Use helper irq_data_get_irq_handler_data() to hide
irq_desc details
x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc
details
x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc
details
sh, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc
details
genirq: Move field 'handler_data' from struct irq_data into struct
irq_common_data
mn10300: Fix incorrect use of data->affinity
genirq: Introduce helper function irq_data_get_affinity_mask() alpha, irq: Use access helper irq_data_get_affinity_mask() ARM, irq: Use access helper irq_data_get_affinity_mask() ARM64, irq: Use access helper irq_data_get_affinity_mask() blackfin, irq: Use access helper irq_data_get_affinity_mask() IA64, irq: Use access helper irq_data_get_affinity_mask() metag, irq: Use access helper irq_data_get_affinity_mask() mips, irq: Use access helper irq_data_get_affinity_mask() mn10300, irq: Use access helper irq_data_get_affinity_mask() parisc, irq: Use access helper irq_data_get_affinity_mask() powerpc, irq: Use access helper irq_data_get_affinity_mask() sh, irq: Use access helper irq_data_get_affinity_mask() sparc, irq: Use access helper irq_data_get_affinity_mask() x86, irq: Use access helper irq_data_get_affinity_mask() xtensa, irq: Use access helper irq_data_get_affinity_mask() irqchip, irq: Use access helper irq_data_get_affinity_mask() net/mlx4: Cache irq_desc->affinity instead of irq_desc
genirq: Move field 'affinity' from struct irq_data into struct
irq_common_data
genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
genirq: Use helper function to access irq_data->msi_desc
genirq: Move field 'msi_desc' from struct irq_data into struct
irq_common_data
genirq: Pass irq_data to helper function
__irq_set_chip_handler_name_locked()
genirq: Optimize irq_data_to_desc() to avoid irq_to_desc() lookup

 arch/alpha/kernel/irq.c                      |    2 +-
 arch/arm/kernel/irq.c                        |    4 +-
 arch/arm64/kernel/irq.c                      |    4 +-
 arch/blackfin/mach-common/ints-priority.c    |    3 +-
 arch/ia64/kernel/iosapic.c                   |    8 +-
 arch/ia64/kernel/irq.c                       |    6 +-
 arch/ia64/kernel/msi_ia64.c                  |    6 +-
 arch/ia64/sn/kernel/msi_sn.c                 |    4 +-
 arch/metag/kernel/irq.c                      |   10 ++-
 arch/mips/alchemy/common/irq.c               |    4 +-
 arch/mips/bcm63xx/irq.c                      |    2 +-
 arch/mips/cavium-octeon/octeon-irq.c         |   14 ++--
 arch/mips/pmcs-msp71xx/msp_irq_cic.c         |    3 +-
 arch/mn10300/kernel/cevt-mn10300.c           |    2 +-
 arch/mn10300/kernel/irq.c                    |   13 +--
 arch/parisc/kernel/irq.c                     |   12 +--
 arch/powerpc/kernel/irq.c                    |    2 +-
 arch/powerpc/sysdev/xics/ics-opal.c          |    4 +-
 arch/powerpc/sysdev/xics/ics-rtas.c          |    4 +-
 arch/sh/kernel/irq.c                         |    9 ++-
 arch/sparc/kernel/irq_64.c                   |   27 ++++---
 arch/sparc/kernel/leon_kernel.c              |    6 +-
 arch/sparc/kernel/sun4d_irq.c                |    4 +-
 arch/sparc/kernel/sun4m_irq.c                |    6 +-
 arch/tile/kernel/pci_gx.c                    |    2 +-
 arch/x86/kernel/apic/io_apic.c               |    2 +-
 arch/x86/kernel/apic/msi.c                   |    2 +-
 arch/x86/kernel/apic/vector.c                |   13 ++-
 arch/x86/kernel/hpet.c                       |    4 +-
 arch/x86/kernel/irq.c                        |    5 +-
 arch/x86/platform/uv/uv_irq.c                |    2 +-
 arch/xtensa/kernel/irq.c                     |   10 ++-
 drivers/gpio/gpio-davinci.c                  |    2 +-
 drivers/gpio/gpio-zynq.c                     |    9 +--
 drivers/irqchip/irq-metag-ext.c              |    5 +-
 drivers/irqchip/irq-mips-gic.c               |   13 ++-
 drivers/net/ethernet/mellanox/mlx4/en_cq.c   |    6 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c   |    5 +-
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h |    2 +-
 drivers/parisc/iosapic.c                     |    2 +-
 drivers/pci/host/pcie-designware.c           |    2 +-
 drivers/pci/msi.c                            |    4 +-
 drivers/sh/intc/chip.c                       |    6 +-
 drivers/sh/intc/virq.c                       |   12 +--
 drivers/xen/events/events_base.c             |    4 +-
 include/linux/irq.h                          |  112 +++++++++++++++++---------
 include/linux/irqdesc.h                      |   23 ++++--
 kernel/irq/chip.c                            |    4 +-
 kernel/irq/internals.h                       |   17 ++--
 kernel/irq/irqdesc.c                         |   27 +++----
 kernel/irq/irqdomain.c                       |    5 +-
 kernel/irq/manage.c                          |   14 ++--
 kernel/irq/migration.c                       |    9 ++-
 kernel/irq/proc.c                            |    4 +-
 54 files changed, 277 insertions(+), 209 deletions(-)
Signature · 1 line
1.7.10.4