From: Alexandru Elisei <alexandru.elisei@arm.com> To: Andre Przywara <andre.przywara@arm.com>, Andrew Jones <drjones@redhat.com>, Paolo Bonzini <pbonzini@redhat.com> Cc: Marc Zyngier <maz@kernel.org>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Subject: Re: [kvm-unit-tests PATCH 16/17] arm: gic: Prepare interrupt statistics for both groups Date: Wed, 13 Nov 2019 10:44:00 +0000 Message-ID: <90acc4bd-22e6-38f5-c52f-c789e0996690@arm.com> (raw) In-Reply-To: <20191108144240.204202-17-andre.przywara@arm.com> Hi, On 11/8/19 2:42 PM, Andre Przywara wrote: > The arrays storing information about received interrupts need to > differentiate between IRQs and FIQs, to detect interrupts firing in the > wrong group. > > Extend the acked, spurious, bad_sender and bad_irq arrays to get another > dimension, so that we can check the kind of interrupt easily. > The fiq_handler marks its result using index 0, the irq_handler uses > index 1. > Also we add a group parameter to check_acked() and friends, to let them > use the right group. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > arm/gic.c | 78 ++++++++++++++++++++++++++++++------------------------- > 1 file changed, 42 insertions(+), 36 deletions(-) > > diff --git a/arm/gic.c b/arm/gic.c > index 6756850..43a272b 100644 > --- a/arm/gic.c > +++ b/arm/gic.c > @@ -33,8 +33,8 @@ struct gic { > }; > > static struct gic *gic; > -static int acked[NR_CPUS], spurious[NR_CPUS]; > -static int bad_sender[NR_CPUS], bad_irq[NR_CPUS]; > +static int acked[2][NR_CPUS], spurious[2][NR_CPUS]; > +static int bad_sender[2][NR_CPUS], bad_irq[2][NR_CPUS]; > static cpumask_t ready; > > static void nr_cpu_check(int nr) > @@ -55,14 +55,17 @@ static void stats_reset(void) > int i; > > for (i = 0; i < nr_cpus; ++i) { > - acked[i] = 0; > - bad_sender[i] = -1; > - bad_irq[i] = -1; > + acked[0][i] = 0; > + acked[1][i] = 0; > + bad_sender[0][i] = -1; > + bad_sender[1][i] = -1; > + bad_irq[0][i] = -1; > + bad_irq[1][i] = -1; How about we use defines for the groups instead of 0/1? bad_irq[GIC_GROUP0][i] (or whatever name you choose) looks more readable to me than bad_irq[0][i]. Thanks, Alex > } > smp_wmb(); > } > > -static int check_acked(const char *testname, cpumask_t *mask) > +static int check_acked(const char *testname, cpumask_t *mask, int group) > { > int missing = 0, extra = 0, unexpected = 0; > int nr_pass, cpu, i; > @@ -76,17 +79,17 @@ static int check_acked(const char *testname, cpumask_t *mask) > for_each_present_cpu(cpu) { > smp_rmb(); > nr_pass += cpumask_test_cpu(cpu, mask) ? > - acked[cpu] == 1 : acked[cpu] == 0; > + acked[group][cpu] == 1 : acked[group][cpu] == 0; > > - if (bad_sender[cpu] != -1) { > + if (bad_sender[group][cpu] != -1) { > printf("cpu%d received IPI from wrong sender %d\n", > - cpu, bad_sender[cpu]); > + cpu, bad_sender[group][cpu]); > bad = true; > } > > - if (bad_irq[cpu] != -1) { > + if (bad_irq[group][cpu] != -1) { > printf("cpu%d received wrong irq %d\n", > - cpu, bad_irq[cpu]); > + cpu, bad_irq[group][cpu]); > bad = true; > } > } > @@ -109,12 +112,12 @@ static int check_acked(const char *testname, cpumask_t *mask) > > for_each_present_cpu(cpu) { > if (cpumask_test_cpu(cpu, mask)) { > - if (!acked[cpu]) > + if (!acked[group][cpu]) > ++missing; > - else if (acked[cpu] > 1) > + else if (acked[group][cpu] > 1) > ++extra; > } else { > - if (acked[cpu]) > + if (acked[group][cpu]) > ++unexpected; > } > } > @@ -132,9 +135,12 @@ static void check_spurious(void) > > smp_rmb(); > for_each_present_cpu(cpu) { > - if (spurious[cpu]) > - report_info("WARN: cpu%d got %d spurious interrupts", > - cpu, spurious[cpu]); > + if (spurious[0][cpu]) > + report_info("WARN: cpu%d got %d spurious FIQs", > + cpu, spurious[0][cpu]); > + if (spurious[1][cpu]) > + report_info("WARN: cpu%d got %d spurious IRQs", > + cpu, spurious[1][cpu]); > } > } > > @@ -144,14 +150,14 @@ static void check_ipi_sender(u32 irqstat) > int src = (irqstat >> 10) & 7; > > if (src != IPI_SENDER) > - bad_sender[smp_processor_id()] = src; > + bad_sender[1][smp_processor_id()] = src; > } > } > > -static void check_irqnr(u32 irqnr, int expected) > +static void check_irqnr(u32 irqnr, int expected, int group) > { > if (irqnr != expected) > - bad_irq[smp_processor_id()] = irqnr; > + bad_irq[group][smp_processor_id()] = irqnr; > } > > static void irq_handler(struct pt_regs *regs __unused) > @@ -160,7 +166,7 @@ static void irq_handler(struct pt_regs *regs __unused) > u32 irqnr = gic_iar_irqnr(irqstat); > > if (irqnr == GICC_INT_SPURIOUS) { > - ++spurious[smp_processor_id()]; > + ++spurious[1][smp_processor_id()]; > smp_wmb(); > return; > } > @@ -168,12 +174,12 @@ static void irq_handler(struct pt_regs *regs __unused) > gic_write_eoir(irqstat, 1); > > smp_rmb(); /* pairs with wmb in stats_reset */ > - ++acked[smp_processor_id()]; > + ++acked[1][smp_processor_id()]; > if (irqnr < GIC_NR_PRIVATE_IRQS) { > check_ipi_sender(irqstat); > - check_irqnr(irqnr, IPI_IRQ); > + check_irqnr(irqnr, IPI_IRQ, 1); > } else { > - check_irqnr(irqnr, SPI_IRQ); > + check_irqnr(irqnr, SPI_IRQ, 1); > } > smp_wmb(); /* pairs with rmb in check_acked */ > } > @@ -184,7 +190,7 @@ static inline void fiq_handler(struct pt_regs *regs __unused) > u32 irqnr = gic_iar_irqnr(irqstat); > > if (irqnr == GICC_INT_SPURIOUS) { > - ++spurious[smp_processor_id()]; > + ++spurious[0][smp_processor_id()]; > smp_wmb(); > return; > } > @@ -192,12 +198,12 @@ static inline void fiq_handler(struct pt_regs *regs __unused) > gic_write_eoir(irqstat, 0); > > smp_rmb(); /* pairs with wmb in stats_reset */ > - ++acked[smp_processor_id()]; > + ++acked[0][smp_processor_id()]; > if (irqnr < GIC_NR_PRIVATE_IRQS) { > check_ipi_sender(irqstat); > - check_irqnr(irqnr, IPI_IRQ); > + check_irqnr(irqnr, IPI_IRQ, 0); > } else { > - check_irqnr(irqnr, SPI_IRQ); > + check_irqnr(irqnr, SPI_IRQ, 0); > } > smp_wmb(); /* pairs with rmb in check_acked */ > } > @@ -232,7 +238,7 @@ static void ipi_test_self(void) > cpumask_clear(&mask); > cpumask_set_cpu(smp_processor_id(), &mask); > gic->ipi.send_self(); > - check_acked("IPI: self", &mask); > + check_acked("IPI: self", &mask, 1); > report_prefix_pop(); > } > > @@ -247,7 +253,7 @@ static void ipi_test_smp(void) > for (i = smp_processor_id() & 1; i < nr_cpus; i += 2) > cpumask_clear_cpu(i, &mask); > gic_ipi_send_mask(IPI_IRQ, &mask); > - check_acked("IPI: directed", &mask); > + check_acked("IPI: directed", &mask, 1); > report_prefix_pop(); > > report_prefix_push("broadcast"); > @@ -255,7 +261,7 @@ static void ipi_test_smp(void) > cpumask_copy(&mask, &cpu_present_mask); > cpumask_clear_cpu(smp_processor_id(), &mask); > gic->ipi.send_broadcast(); > - check_acked("IPI: broadcast", &mask); > + check_acked("IPI: broadcast", &mask, 1); > report_prefix_pop(); > } > > @@ -327,11 +333,11 @@ static void ipi_clear_active_handler(struct pt_regs *regs __unused) > writel(val, base + GICD_ICACTIVER); > > smp_rmb(); /* pairs with wmb in stats_reset */ > - ++acked[smp_processor_id()]; > - check_irqnr(irqnr, IPI_IRQ); > + ++acked[1][smp_processor_id()]; > + check_irqnr(irqnr, IPI_IRQ, 1); > smp_wmb(); /* pairs with rmb in check_acked */ > } else { > - ++spurious[smp_processor_id()]; > + ++spurious[1][smp_processor_id()]; > smp_wmb(); > } > } > @@ -617,7 +623,7 @@ static bool trigger_and_check_spi(const char *test_name, > break; > } > > - ret = (check_acked(test_name, &cpumask) >= 0); > + ret = (check_acked(test_name, &cpumask, 1) >= 0); > > /* Clean up pending bit in case this IRQ wasn't taken. */ > if (!(irq_stat & IRQ_STAT_NO_CLEAR)) > @@ -643,7 +649,7 @@ static void spi_test_single(void) > cpumask_clear(&cpumask); > cpumask_set_cpu(cpu, &cpumask); > gic_enable_irq(SPI_IRQ); > - check_acked("now enabled SPI fires", &cpumask); > + check_acked("now enabled SPI fires", &cpumask, 1); > } > > static void spi_test_smp(void) _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply index Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-08 14:42 [kvm-unit-tests PATCH 00/17] arm: gic: Test SPIs and interrupt groups Andre Przywara 2019-11-08 14:42 ` [kvm-unit-tests PATCH 01/17] arm: gic: Enable GIC MMIO tests for GICv3 as well Andre Przywara 2019-11-08 17:28 ` Alexandru Elisei 2019-11-12 12:49 ` Auger Eric 2019-11-08 14:42 ` [kvm-unit-tests PATCH 02/17] arm: gic: Generalise function names Andre Przywara 2019-11-12 11:11 ` Alexandru Elisei 2019-11-12 12:49 ` Auger Eric 2019-11-08 14:42 ` [kvm-unit-tests PATCH 03/17] arm: gic: Provide per-IRQ helper functions Andre Przywara 2019-11-12 12:51 ` Alexandru Elisei 2019-11-12 15:53 ` Auger Eric 2019-11-12 16:53 ` Alexandru Elisei 2019-11-12 13:49 ` Auger Eric 2019-11-08 14:42 ` [kvm-unit-tests PATCH 04/17] arm: gic: Support no IRQs test case Andre Przywara 2019-11-12 13:26 ` Alexandru Elisei 2019-11-12 21:14 ` Auger Eric 2019-11-08 14:42 ` [kvm-unit-tests PATCH 05/17] arm: gic: Prepare IRQ handler for handling SPIs Andre Przywara 2019-11-12 13:36 ` Alexandru Elisei 2019-11-12 20:56 ` Auger Eric 2019-11-08 14:42 ` [kvm-unit-tests PATCH 06/17] arm: gic: Add simple shared IRQ test Andre Przywara 2019-11-12 13:54 ` Alexandru Elisei 2019-11-08 14:42 ` [kvm-unit-tests PATCH 07/17] arm: gic: Extend check_acked() to allow silent call Andre Przywara 2019-11-12 15:23 ` Alexandru Elisei 2019-11-14 12:32 ` Andrew Jones 2019-11-15 11:32 ` Alexandru Elisei 2019-11-08 14:42 ` [kvm-unit-tests PATCH 08/17] arm: gic: Add simple SPI MP test Andre Przywara 2019-11-12 15:41 ` Alexandru Elisei 2019-11-08 14:42 ` [kvm-unit-tests PATCH 09/17] arm: gic: Add test for flipping GICD_CTLR.DS Andre Przywara 2019-11-12 16:42 ` Alexandru Elisei 2019-11-14 13:39 ` Vladimir Murzin 2019-11-14 14:17 ` Andre Przywara 2019-11-14 14:50 ` Vladimir Murzin 2019-11-14 15:21 ` Alexandru Elisei 2019-11-14 15:27 ` Peter Maydell 2019-11-14 15:47 ` Alexandru Elisei 2019-11-14 15:56 ` Peter Maydell 2019-11-08 14:42 ` [kvm-unit-tests PATCH 10/17] arm: gic: Check for writable IGROUPR registers Andre Przywara 2019-11-12 16:51 ` Alexandru Elisei 2019-11-08 14:42 ` [kvm-unit-tests PATCH 11/17] arm: gic: Check for validity of both group enable bits Andre Przywara 2019-11-12 16:58 ` Alexandru Elisei 2019-11-08 14:42 ` [kvm-unit-tests PATCH 12/17] arm: gic: Change gic_read_iar() to take group parameter Andre Przywara 2019-11-12 17:19 ` Alexandru Elisei 2019-11-14 12:50 ` Andrew Jones 2019-11-08 14:42 ` [kvm-unit-tests PATCH 13/17] arm: gic: Change write_eoir() " Andre Przywara 2019-11-08 14:42 ` [kvm-unit-tests PATCH 14/17] arm: gic: Prepare for receiving GIC group 0 interrupts via FIQs Andre Przywara 2019-11-12 17:30 ` Alexandru Elisei 2019-11-08 14:42 ` [kvm-unit-tests PATCH 15/17] arm: gic: Provide FIQ handler Andre Przywara 2019-11-13 10:14 ` Alexandru Elisei 2019-11-08 14:42 ` [kvm-unit-tests PATCH 16/17] arm: gic: Prepare interrupt statistics for both groups Andre Przywara 2019-11-13 10:44 ` Alexandru Elisei [this message] 2019-11-08 14:42 ` [kvm-unit-tests PATCH 17/17] arm: gic: Test Group0 SPIs Andre Przywara 2019-11-13 11:26 ` Alexandru Elisei
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=90acc4bd-22e6-38f5-c52f-c789e0996690@arm.com \ --to=alexandru.elisei@arm.com \ --cc=andre.przywara@arm.com \ --cc=drjones@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=maz@kernel.org \ --cc=pbonzini@redhat.com \ /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: link
KVM ARM Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kvmarm/0 kvmarm/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kvmarm kvmarm/ https://lore.kernel.org/kvmarm \ kvmarm@lists.cs.columbia.edu public-inbox-index kvmarm Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/edu.columbia.cs.lists.kvmarm AGPL code for this site: git clone https://public-inbox.org/public-inbox.git