| Message ID | 20181209194610.29727-4-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | ppc: support for the XIVE interrupt controller (POWER9) | expand |
On Sun, Dec 09, 2018 at 08:45:54PM +0100, Cédric Le Goater wrote: > The last sub-engine of the XIVE architecture is the Interrupt > Virtualization Presentation Engine (IVPE). On HW, the IVRE and the > IVPE share elements, the Power Bus interface (CQ), the routing table > descriptors, and they can be combined in the same HW logic. We do the > same in QEMU and combine both engines in the XiveRouter for > simplicity. > > When the IVRE has completed its job of matching an event source with a > Notification Virtual Target (NVT) to notify, it forwards the event > notification to the IVPE sub-engine. The IVPE scans the thread > interrupt contexts of the Notification Virtual Targets (NVT) > dispatched on the HW processor threads and if a match is found, it > signals the thread. If not, the IVPE escalates the notification to > some other targets and records the notification in a backlog queue. > > The IVPE maintains the thread interrupt context state for each of its > NVTs not dispatched on HW processor threads in the Notification > Virtual Target table (NVTT). > > The model currently only supports single NVT notifications. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Applied. I think the tctx_word2() should have the byteswap, rather than having it in the callers, but that can be fixed later. > --- > > Changes since v6 : > > - removed HW CAM line setting and use as it is only useful for PowerNV > - made use of xive_tctx_word2() helper > - made use of GETFIELD_BE32() to compare CAM lines > - fixed initialization of XiveTCTXMatch > > include/hw/ppc/xive.h | 14 +++ > include/hw/ppc/xive_regs.h | 24 +++++ > hw/intc/xive.c | 185 +++++++++++++++++++++++++++++++++++++ > 3 files changed, 223 insertions(+) > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index 1e823a4c64e9..19309d1d65d1 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -325,6 +325,10 @@ typedef struct XiveRouterClass { > XiveEND *end); > int (*write_end)(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, > XiveEND *end, uint8_t word_number); > + int (*get_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > + XiveNVT *nvt); > + int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > + XiveNVT *nvt, uint8_t word_number); > } XiveRouterClass; > > void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); > @@ -335,6 +339,11 @@ int xive_router_get_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, > XiveEND *end); > int xive_router_write_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, > XiveEND *end, uint8_t word_number); > +int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > + XiveNVT *nvt); > +int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > + XiveNVT *nvt, uint8_t word_number); > + > > /* > * XIVE END ESBs > @@ -411,4 +420,9 @@ extern const MemoryRegionOps xive_tm_ops; > > void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon); > > +static inline uint32_t xive_nvt_cam_line(uint8_t nvt_blk, uint32_t nvt_idx) > +{ > + return (nvt_blk << 19) | nvt_idx; > +} > + > #endif /* PPC_XIVE_H */ > diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h > index ede3d04c5eda..85557e730cd8 100644 > --- a/include/hw/ppc/xive_regs.h > +++ b/include/hw/ppc/xive_regs.h > @@ -186,4 +186,28 @@ typedef struct XiveEND { > #define GETFIELD_BE32(m, v) GETFIELD(m, be32_to_cpu(v)) > #define SETFIELD_BE32(m, v, val) cpu_to_be32(SETFIELD(m, be32_to_cpu(v), val)) > > +/* Notification Virtual Target (NVT) */ > +typedef struct XiveNVT { > + uint32_t w0; > +#define NVT_W0_VALID PPC_BIT32(0) > + uint32_t w1; > + uint32_t w2; > + uint32_t w3; > + uint32_t w4; > + uint32_t w5; > + uint32_t w6; > + uint32_t w7; > + uint32_t w8; > +#define NVT_W8_GRP_VALID PPC_BIT32(0) > + uint32_t w9; > + uint32_t wa; > + uint32_t wb; > + uint32_t wc; > + uint32_t wd; > + uint32_t we; > + uint32_t wf; > +} XiveNVT; > + > +#define xive_nvt_is_valid(nvt) (be32_to_cpu((nvt)->w0) & NVT_W0_VALID) > + > #endif /* PPC_XIVE_REGS_H */ > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index 2615d16b7437..3eecffe99b3a 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -983,6 +983,183 @@ int xive_router_write_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, > return xrc->write_end(xrtr, end_blk, end_idx, end, word_number); > } > > +int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > + XiveNVT *nvt) > +{ > + XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); > + > + return xrc->get_nvt(xrtr, nvt_blk, nvt_idx, nvt); > +} > + > +int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > + XiveNVT *nvt, uint8_t word_number) > +{ > + XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); > + > + return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); > +} > + > +/* > + * The thread context register words are in big-endian format. > + */ > +static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, > + uint8_t nvt_blk, uint32_t nvt_idx, > + bool cam_ignore, uint32_t logic_serv) > +{ > + uint32_t cam = xive_nvt_cam_line(nvt_blk, nvt_idx); > + uint32_t qw2w2 = xive_tctx_word2(&tctx->regs[TM_QW2_HV_POOL]); > + uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); > + uint32_t qw0w2 = xive_tctx_word2(&tctx->regs[TM_QW0_USER]); > + > + /* TODO (PowerNV): ignore mode. The low order bits of the NVT > + * identifier are ignored in the "CAM" match. > + */ > + > + if (format == 0) { > + if (cam_ignore == true) { > + /* F=0 & i=1: Logical server notification (bits ignored at > + * the end of the NVT identifier) > + */ > + qemu_log_mask(LOG_UNIMP, "XIVE: no support for LS NVT %x/%x\n", > + nvt_blk, nvt_idx); > + return -1; > + } > + > + /* F=0 & i=0: Specific NVT notification */ > + > + /* TODO (PowerNV) : PHYS ring */ > + > + /* HV POOL ring */ > + if ((be32_to_cpu(qw2w2) & TM_QW2W2_VP) && > + cam == GETFIELD_BE32(TM_QW2W2_POOL_CAM, qw2w2)) { > + return TM_QW2_HV_POOL; > + } > + > + /* OS ring */ > + if ((be32_to_cpu(qw1w2) & TM_QW1W2_VO) && > + cam == GETFIELD_BE32(TM_QW1W2_OS_CAM, qw1w2)) { > + return TM_QW1_OS; > + } > + } else { > + /* F=1 : User level Event-Based Branch (EBB) notification */ > + > + /* USER ring */ > + if ((be32_to_cpu(qw1w2) & TM_QW1W2_VO) && > + (cam == GETFIELD_BE32(TM_QW1W2_OS_CAM, qw1w2)) && > + (be32_to_cpu(qw0w2) & TM_QW0W2_VU) && > + (logic_serv == GETFIELD_BE32(TM_QW0W2_LOGIC_SERV, qw0w2))) { > + return TM_QW0_USER; > + } > + } > + return -1; > +} > + > +typedef struct XiveTCTXMatch { > + XiveTCTX *tctx; > + uint8_t ring; > +} XiveTCTXMatch; > + > +static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, > + uint8_t nvt_blk, uint32_t nvt_idx, > + bool cam_ignore, uint8_t priority, > + uint32_t logic_serv, XiveTCTXMatch *match) > +{ > + CPUState *cs; > + > + /* TODO (PowerNV): handle chip_id overwrite of block field for > + * hardwired CAM compares */ > + > + CPU_FOREACH(cs) { > + PowerPCCPU *cpu = POWERPC_CPU(cs); > + XiveTCTX *tctx = XIVE_TCTX(cpu->intc); > + int ring; > + > + /* > + * HW checks that the CPU is enabled in the Physical Thread > + * Enable Register (PTER). > + */ > + > + /* > + * Check the thread context CAM lines and record matches. We > + * will handle CPU exception delivery later > + */ > + ring = xive_presenter_tctx_match(tctx, format, nvt_blk, nvt_idx, > + cam_ignore, logic_serv); > + /* > + * Save the context and follow on to catch duplicates, that we > + * don't support yet. > + */ > + if (ring != -1) { > + if (match->tctx) { > + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: already found a thread " > + "context NVT %x/%x\n", nvt_blk, nvt_idx); > + return false; > + } > + > + match->ring = ring; > + match->tctx = tctx; > + } > + } > + > + if (!match->tctx) { > + qemu_log_mask(LOG_UNIMP, "XIVE: NVT %x/%x is not dispatched\n", > + nvt_blk, nvt_idx); > + return false; > + } > + > + return true; > +} > + > +/* > + * This is our simple Xive Presenter Engine model. It is merged in the > + * Router as it does not require an extra object. > + * > + * It receives notification requests sent by the IVRE to find one > + * matching NVT (or more) dispatched on the processor threads. In case > + * of a single NVT notification, the process is abreviated and the > + * thread is signaled if a match is found. In case of a logical server > + * notification (bits ignored at the end of the NVT identifier), the > + * IVPE and IVRE select a winning thread using different filters. This > + * involves 2 or 3 exchanges on the PowerBus that the model does not > + * support. > + * > + * The parameters represent what is sent on the PowerBus > + */ > +static void xive_presenter_notify(XiveRouter *xrtr, uint8_t format, > + uint8_t nvt_blk, uint32_t nvt_idx, > + bool cam_ignore, uint8_t priority, > + uint32_t logic_serv) > +{ > + XiveNVT nvt; > + XiveTCTXMatch match = { .tctx = NULL, .ring = 0 }; > + bool found; > + > + /* NVT cache lookup */ > + if (xive_router_get_nvt(xrtr, nvt_blk, nvt_idx, &nvt)) { > + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: no NVT %x/%x\n", > + nvt_blk, nvt_idx); > + return; > + } > + > + if (!xive_nvt_is_valid(&nvt)) { > + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: NVT %x/%x is invalid\n", > + nvt_blk, nvt_idx); > + return; > + } > + > + found = xive_presenter_match(xrtr, format, nvt_blk, nvt_idx, cam_ignore, > + priority, logic_serv, &match); > + if (found) { > + return; > + } > + > + /* If no matching NVT is dispatched on a HW thread : > + * - update the NVT structure if backlog is activated > + * - escalate (ESe PQ bits and EAS in w4-5) if escalation is > + * activated > + */ > +} > + > /* > * An END trigger can come from an event trigger (IPI or HW) or from > * another chip. We don't model the PowerBus but the END trigger > @@ -1052,6 +1229,14 @@ static void xive_router_end_notify(XiveRouter *xrtr, uint8_t end_blk, > /* > * Follows IVPE notification > */ > + xive_presenter_notify(xrtr, format, > + GETFIELD_BE32(END_W6_NVT_BLOCK, end.w6), > + GETFIELD_BE32(END_W6_NVT_INDEX, end.w6), > + GETFIELD_BE32(END_W7_F0_IGNORE, end.w7), > + priority, > + GETFIELD_BE32(END_W7_F1_LOG_SERVER_ID, end.w7)); > + > + /* TODO: Auto EOI. */ > } > > static void xive_router_notify(XiveNotifier *xn, uint32_t lisn)
On 12/10/18 5:27 AM, David Gibson wrote: > On Sun, Dec 09, 2018 at 08:45:54PM +0100, Cédric Le Goater wrote: >> The last sub-engine of the XIVE architecture is the Interrupt >> Virtualization Presentation Engine (IVPE). On HW, the IVRE and the >> IVPE share elements, the Power Bus interface (CQ), the routing table >> descriptors, and they can be combined in the same HW logic. We do the >> same in QEMU and combine both engines in the XiveRouter for >> simplicity. >> >> When the IVRE has completed its job of matching an event source with a >> Notification Virtual Target (NVT) to notify, it forwards the event >> notification to the IVPE sub-engine. The IVPE scans the thread >> interrupt contexts of the Notification Virtual Targets (NVT) >> dispatched on the HW processor threads and if a match is found, it >> signals the thread. If not, the IVPE escalates the notification to >> some other targets and records the notification in a backlog queue. >> >> The IVPE maintains the thread interrupt context state for each of its >> NVTs not dispatched on HW processor threads in the Notification >> Virtual Target table (NVTT). >> >> The model currently only supports single NVT notifications. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> > > Applied. > > I think the tctx_word2() should have the byteswap, rather than having > it in the callers, but that can be fixed later. I thought it was better to explicitly show in the code where the byteswaps were needed. Anyway, this is very localized, so, yes, we can change it later on. C. > >> --- >> >> Changes since v6 : >> >> - removed HW CAM line setting and use as it is only useful for PowerNV >> - made use of xive_tctx_word2() helper >> - made use of GETFIELD_BE32() to compare CAM lines >> - fixed initialization of XiveTCTXMatch >> >> include/hw/ppc/xive.h | 14 +++ >> include/hw/ppc/xive_regs.h | 24 +++++ >> hw/intc/xive.c | 185 +++++++++++++++++++++++++++++++++++++ >> 3 files changed, 223 insertions(+) >> >> diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h >> index 1e823a4c64e9..19309d1d65d1 100644 >> --- a/include/hw/ppc/xive.h >> +++ b/include/hw/ppc/xive.h >> @@ -325,6 +325,10 @@ typedef struct XiveRouterClass { >> XiveEND *end); >> int (*write_end)(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, >> XiveEND *end, uint8_t word_number); >> + int (*get_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> + XiveNVT *nvt); >> + int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> + XiveNVT *nvt, uint8_t word_number); >> } XiveRouterClass; >> >> void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); >> @@ -335,6 +339,11 @@ int xive_router_get_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, >> XiveEND *end); >> int xive_router_write_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, >> XiveEND *end, uint8_t word_number); >> +int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> + XiveNVT *nvt); >> +int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> + XiveNVT *nvt, uint8_t word_number); >> + >> >> /* >> * XIVE END ESBs >> @@ -411,4 +420,9 @@ extern const MemoryRegionOps xive_tm_ops; >> >> void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon); >> >> +static inline uint32_t xive_nvt_cam_line(uint8_t nvt_blk, uint32_t nvt_idx) >> +{ >> + return (nvt_blk << 19) | nvt_idx; >> +} >> + >> #endif /* PPC_XIVE_H */ >> diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h >> index ede3d04c5eda..85557e730cd8 100644 >> --- a/include/hw/ppc/xive_regs.h >> +++ b/include/hw/ppc/xive_regs.h >> @@ -186,4 +186,28 @@ typedef struct XiveEND { >> #define GETFIELD_BE32(m, v) GETFIELD(m, be32_to_cpu(v)) >> #define SETFIELD_BE32(m, v, val) cpu_to_be32(SETFIELD(m, be32_to_cpu(v), val)) >> >> +/* Notification Virtual Target (NVT) */ >> +typedef struct XiveNVT { >> + uint32_t w0; >> +#define NVT_W0_VALID PPC_BIT32(0) >> + uint32_t w1; >> + uint32_t w2; >> + uint32_t w3; >> + uint32_t w4; >> + uint32_t w5; >> + uint32_t w6; >> + uint32_t w7; >> + uint32_t w8; >> +#define NVT_W8_GRP_VALID PPC_BIT32(0) >> + uint32_t w9; >> + uint32_t wa; >> + uint32_t wb; >> + uint32_t wc; >> + uint32_t wd; >> + uint32_t we; >> + uint32_t wf; >> +} XiveNVT; >> + >> +#define xive_nvt_is_valid(nvt) (be32_to_cpu((nvt)->w0) & NVT_W0_VALID) >> + >> #endif /* PPC_XIVE_REGS_H */ >> diff --git a/hw/intc/xive.c b/hw/intc/xive.c >> index 2615d16b7437..3eecffe99b3a 100644 >> --- a/hw/intc/xive.c >> +++ b/hw/intc/xive.c >> @@ -983,6 +983,183 @@ int xive_router_write_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, >> return xrc->write_end(xrtr, end_blk, end_idx, end, word_number); >> } >> >> +int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> + XiveNVT *nvt) >> +{ >> + XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); >> + >> + return xrc->get_nvt(xrtr, nvt_blk, nvt_idx, nvt); >> +} >> + >> +int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, >> + XiveNVT *nvt, uint8_t word_number) >> +{ >> + XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); >> + >> + return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); >> +} >> + >> +/* >> + * The thread context register words are in big-endian format. >> + */ >> +static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, >> + uint8_t nvt_blk, uint32_t nvt_idx, >> + bool cam_ignore, uint32_t logic_serv) >> +{ >> + uint32_t cam = xive_nvt_cam_line(nvt_blk, nvt_idx); >> + uint32_t qw2w2 = xive_tctx_word2(&tctx->regs[TM_QW2_HV_POOL]); >> + uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); >> + uint32_t qw0w2 = xive_tctx_word2(&tctx->regs[TM_QW0_USER]); >> + >> + /* TODO (PowerNV): ignore mode. The low order bits of the NVT >> + * identifier are ignored in the "CAM" match. >> + */ >> + >> + if (format == 0) { >> + if (cam_ignore == true) { >> + /* F=0 & i=1: Logical server notification (bits ignored at >> + * the end of the NVT identifier) >> + */ >> + qemu_log_mask(LOG_UNIMP, "XIVE: no support for LS NVT %x/%x\n", >> + nvt_blk, nvt_idx); >> + return -1; >> + } >> + >> + /* F=0 & i=0: Specific NVT notification */ >> + >> + /* TODO (PowerNV) : PHYS ring */ >> + >> + /* HV POOL ring */ >> + if ((be32_to_cpu(qw2w2) & TM_QW2W2_VP) && >> + cam == GETFIELD_BE32(TM_QW2W2_POOL_CAM, qw2w2)) { >> + return TM_QW2_HV_POOL; >> + } >> + >> + /* OS ring */ >> + if ((be32_to_cpu(qw1w2) & TM_QW1W2_VO) && >> + cam == GETFIELD_BE32(TM_QW1W2_OS_CAM, qw1w2)) { >> + return TM_QW1_OS; >> + } >> + } else { >> + /* F=1 : User level Event-Based Branch (EBB) notification */ >> + >> + /* USER ring */ >> + if ((be32_to_cpu(qw1w2) & TM_QW1W2_VO) && >> + (cam == GETFIELD_BE32(TM_QW1W2_OS_CAM, qw1w2)) && >> + (be32_to_cpu(qw0w2) & TM_QW0W2_VU) && >> + (logic_serv == GETFIELD_BE32(TM_QW0W2_LOGIC_SERV, qw0w2))) { >> + return TM_QW0_USER; >> + } >> + } >> + return -1; >> +} >> + >> +typedef struct XiveTCTXMatch { >> + XiveTCTX *tctx; >> + uint8_t ring; >> +} XiveTCTXMatch; >> + >> +static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, >> + uint8_t nvt_blk, uint32_t nvt_idx, >> + bool cam_ignore, uint8_t priority, >> + uint32_t logic_serv, XiveTCTXMatch *match) >> +{ >> + CPUState *cs; >> + >> + /* TODO (PowerNV): handle chip_id overwrite of block field for >> + * hardwired CAM compares */ >> + >> + CPU_FOREACH(cs) { >> + PowerPCCPU *cpu = POWERPC_CPU(cs); >> + XiveTCTX *tctx = XIVE_TCTX(cpu->intc); >> + int ring; >> + >> + /* >> + * HW checks that the CPU is enabled in the Physical Thread >> + * Enable Register (PTER). >> + */ >> + >> + /* >> + * Check the thread context CAM lines and record matches. We >> + * will handle CPU exception delivery later >> + */ >> + ring = xive_presenter_tctx_match(tctx, format, nvt_blk, nvt_idx, >> + cam_ignore, logic_serv); >> + /* >> + * Save the context and follow on to catch duplicates, that we >> + * don't support yet. >> + */ >> + if (ring != -1) { >> + if (match->tctx) { >> + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: already found a thread " >> + "context NVT %x/%x\n", nvt_blk, nvt_idx); >> + return false; >> + } >> + >> + match->ring = ring; >> + match->tctx = tctx; >> + } >> + } >> + >> + if (!match->tctx) { >> + qemu_log_mask(LOG_UNIMP, "XIVE: NVT %x/%x is not dispatched\n", >> + nvt_blk, nvt_idx); >> + return false; >> + } >> + >> + return true; >> +} >> + >> +/* >> + * This is our simple Xive Presenter Engine model. It is merged in the >> + * Router as it does not require an extra object. >> + * >> + * It receives notification requests sent by the IVRE to find one >> + * matching NVT (or more) dispatched on the processor threads. In case >> + * of a single NVT notification, the process is abreviated and the >> + * thread is signaled if a match is found. In case of a logical server >> + * notification (bits ignored at the end of the NVT identifier), the >> + * IVPE and IVRE select a winning thread using different filters. This >> + * involves 2 or 3 exchanges on the PowerBus that the model does not >> + * support. >> + * >> + * The parameters represent what is sent on the PowerBus >> + */ >> +static void xive_presenter_notify(XiveRouter *xrtr, uint8_t format, >> + uint8_t nvt_blk, uint32_t nvt_idx, >> + bool cam_ignore, uint8_t priority, >> + uint32_t logic_serv) >> +{ >> + XiveNVT nvt; >> + XiveTCTXMatch match = { .tctx = NULL, .ring = 0 }; >> + bool found; >> + >> + /* NVT cache lookup */ >> + if (xive_router_get_nvt(xrtr, nvt_blk, nvt_idx, &nvt)) { >> + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: no NVT %x/%x\n", >> + nvt_blk, nvt_idx); >> + return; >> + } >> + >> + if (!xive_nvt_is_valid(&nvt)) { >> + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: NVT %x/%x is invalid\n", >> + nvt_blk, nvt_idx); >> + return; >> + } >> + >> + found = xive_presenter_match(xrtr, format, nvt_blk, nvt_idx, cam_ignore, >> + priority, logic_serv, &match); >> + if (found) { >> + return; >> + } >> + >> + /* If no matching NVT is dispatched on a HW thread : >> + * - update the NVT structure if backlog is activated >> + * - escalate (ESe PQ bits and EAS in w4-5) if escalation is >> + * activated >> + */ >> +} >> + >> /* >> * An END trigger can come from an event trigger (IPI or HW) or from >> * another chip. We don't model the PowerBus but the END trigger >> @@ -1052,6 +1229,14 @@ static void xive_router_end_notify(XiveRouter *xrtr, uint8_t end_blk, >> /* >> * Follows IVPE notification >> */ >> + xive_presenter_notify(xrtr, format, >> + GETFIELD_BE32(END_W6_NVT_BLOCK, end.w6), >> + GETFIELD_BE32(END_W6_NVT_INDEX, end.w6), >> + GETFIELD_BE32(END_W7_F0_IGNORE, end.w7), >> + priority, >> + GETFIELD_BE32(END_W7_F1_LOG_SERVER_ID, end.w7)); >> + >> + /* TODO: Auto EOI. */ >> } >> >> static void xive_router_notify(XiveNotifier *xn, uint32_t lisn) >
On Mon, Dec 10, 2018 at 08:15:40AM +0100, Cédric Le Goater wrote: > On 12/10/18 5:27 AM, David Gibson wrote: > > On Sun, Dec 09, 2018 at 08:45:54PM +0100, Cédric Le Goater wrote: > >> The last sub-engine of the XIVE architecture is the Interrupt > >> Virtualization Presentation Engine (IVPE). On HW, the IVRE and the > >> IVPE share elements, the Power Bus interface (CQ), the routing table > >> descriptors, and they can be combined in the same HW logic. We do the > >> same in QEMU and combine both engines in the XiveRouter for > >> simplicity. > >> > >> When the IVRE has completed its job of matching an event source with a > >> Notification Virtual Target (NVT) to notify, it forwards the event > >> notification to the IVPE sub-engine. The IVPE scans the thread > >> interrupt contexts of the Notification Virtual Targets (NVT) > >> dispatched on the HW processor threads and if a match is found, it > >> signals the thread. If not, the IVPE escalates the notification to > >> some other targets and records the notification in a backlog queue. > >> > >> The IVPE maintains the thread interrupt context state for each of its > >> NVTs not dispatched on HW processor threads in the Notification > >> Virtual Target table (NVTT). > >> > >> The model currently only supports single NVT notifications. > >> > >> Signed-off-by: Cédric Le Goater <clg@kaod.org> > > > > Applied. > > > > I think the tctx_word2() should have the byteswap, rather than having > > it in the callers, but that can be fixed later. > > I thought it was better to explicitly show in the code where the > byteswaps were needed. Anyway, this is very localized, so, yes, > we can change it later on. To clarify my thinking here; the important thing is not knowing where the byteswaps are, but being able to tell as easily as possible what endianness a given piece of data is right now. The convention I'm aiming for here - which is one I try to use most places is that structures - at least structures which map to specific in-memory things - are in the required endianness for that stuff in memory. However bare integers - uint32_t or uint64_t or whatever - are, well, numbers, in native endian.
On 12/11/18 2:37 AM, David Gibson wrote: > On Mon, Dec 10, 2018 at 08:15:40AM +0100, Cédric Le Goater wrote: >> On 12/10/18 5:27 AM, David Gibson wrote: >>> On Sun, Dec 09, 2018 at 08:45:54PM +0100, Cédric Le Goater wrote: >>>> The last sub-engine of the XIVE architecture is the Interrupt >>>> Virtualization Presentation Engine (IVPE). On HW, the IVRE and the >>>> IVPE share elements, the Power Bus interface (CQ), the routing table >>>> descriptors, and they can be combined in the same HW logic. We do the >>>> same in QEMU and combine both engines in the XiveRouter for >>>> simplicity. >>>> >>>> When the IVRE has completed its job of matching an event source with a >>>> Notification Virtual Target (NVT) to notify, it forwards the event >>>> notification to the IVPE sub-engine. The IVPE scans the thread >>>> interrupt contexts of the Notification Virtual Targets (NVT) >>>> dispatched on the HW processor threads and if a match is found, it >>>> signals the thread. If not, the IVPE escalates the notification to >>>> some other targets and records the notification in a backlog queue. >>>> >>>> The IVPE maintains the thread interrupt context state for each of its >>>> NVTs not dispatched on HW processor threads in the Notification >>>> Virtual Target table (NVTT). >>>> >>>> The model currently only supports single NVT notifications. >>>> >>>> Signed-off-by: Cédric Le Goater <clg@kaod.org> >>> >>> Applied. >>> >>> I think the tctx_word2() should have the byteswap, rather than having >>> it in the callers, but that can be fixed later. >> >> I thought it was better to explicitly show in the code where the >> byteswaps were needed. Anyway, this is very localized, so, yes, >> we can change it later on. > > To clarify my thinking here; the important thing is not knowing where > the byteswaps are, but being able to tell as easily as possible what > endianness a given piece of data is right now. > > The convention I'm aiming for here - which is one I try to use most > places is that structures - at least structures which map to specific > in-memory things - are in the required endianness for that stuff in > memory. However bare integers - uint32_t or uint64_t or whatever - > are, well, numbers, in native endian. > ok. Adding that to the TODO list. C.
diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 1e823a4c64e9..19309d1d65d1 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -325,6 +325,10 @@ typedef struct XiveRouterClass { XiveEND *end); int (*write_end)(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, XiveEND *end, uint8_t word_number); + int (*get_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, + XiveNVT *nvt); + int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, + XiveNVT *nvt, uint8_t word_number); } XiveRouterClass; void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); @@ -335,6 +339,11 @@ int xive_router_get_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, XiveEND *end); int xive_router_write_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, XiveEND *end, uint8_t word_number); +int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, + XiveNVT *nvt); +int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, + XiveNVT *nvt, uint8_t word_number); + /* * XIVE END ESBs @@ -411,4 +420,9 @@ extern const MemoryRegionOps xive_tm_ops; void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon); +static inline uint32_t xive_nvt_cam_line(uint8_t nvt_blk, uint32_t nvt_idx) +{ + return (nvt_blk << 19) | nvt_idx; +} + #endif /* PPC_XIVE_H */ diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h index ede3d04c5eda..85557e730cd8 100644 --- a/include/hw/ppc/xive_regs.h +++ b/include/hw/ppc/xive_regs.h @@ -186,4 +186,28 @@ typedef struct XiveEND { #define GETFIELD_BE32(m, v) GETFIELD(m, be32_to_cpu(v)) #define SETFIELD_BE32(m, v, val) cpu_to_be32(SETFIELD(m, be32_to_cpu(v), val)) +/* Notification Virtual Target (NVT) */ +typedef struct XiveNVT { + uint32_t w0; +#define NVT_W0_VALID PPC_BIT32(0) + uint32_t w1; + uint32_t w2; + uint32_t w3; + uint32_t w4; + uint32_t w5; + uint32_t w6; + uint32_t w7; + uint32_t w8; +#define NVT_W8_GRP_VALID PPC_BIT32(0) + uint32_t w9; + uint32_t wa; + uint32_t wb; + uint32_t wc; + uint32_t wd; + uint32_t we; + uint32_t wf; +} XiveNVT; + +#define xive_nvt_is_valid(nvt) (be32_to_cpu((nvt)->w0) & NVT_W0_VALID) + #endif /* PPC_XIVE_REGS_H */ diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 2615d16b7437..3eecffe99b3a 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -983,6 +983,183 @@ int xive_router_write_end(XiveRouter *xrtr, uint8_t end_blk, uint32_t end_idx, return xrc->write_end(xrtr, end_blk, end_idx, end, word_number); } +int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, + XiveNVT *nvt) +{ + XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); + + return xrc->get_nvt(xrtr, nvt_blk, nvt_idx, nvt); +} + +int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, + XiveNVT *nvt, uint8_t word_number) +{ + XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); + + return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); +} + +/* + * The thread context register words are in big-endian format. + */ +static int xive_presenter_tctx_match(XiveTCTX *tctx, uint8_t format, + uint8_t nvt_blk, uint32_t nvt_idx, + bool cam_ignore, uint32_t logic_serv) +{ + uint32_t cam = xive_nvt_cam_line(nvt_blk, nvt_idx); + uint32_t qw2w2 = xive_tctx_word2(&tctx->regs[TM_QW2_HV_POOL]); + uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); + uint32_t qw0w2 = xive_tctx_word2(&tctx->regs[TM_QW0_USER]); + + /* TODO (PowerNV): ignore mode. The low order bits of the NVT + * identifier are ignored in the "CAM" match. + */ + + if (format == 0) { + if (cam_ignore == true) { + /* F=0 & i=1: Logical server notification (bits ignored at + * the end of the NVT identifier) + */ + qemu_log_mask(LOG_UNIMP, "XIVE: no support for LS NVT %x/%x\n", + nvt_blk, nvt_idx); + return -1; + } + + /* F=0 & i=0: Specific NVT notification */ + + /* TODO (PowerNV) : PHYS ring */ + + /* HV POOL ring */ + if ((be32_to_cpu(qw2w2) & TM_QW2W2_VP) && + cam == GETFIELD_BE32(TM_QW2W2_POOL_CAM, qw2w2)) { + return TM_QW2_HV_POOL; + } + + /* OS ring */ + if ((be32_to_cpu(qw1w2) & TM_QW1W2_VO) && + cam == GETFIELD_BE32(TM_QW1W2_OS_CAM, qw1w2)) { + return TM_QW1_OS; + } + } else { + /* F=1 : User level Event-Based Branch (EBB) notification */ + + /* USER ring */ + if ((be32_to_cpu(qw1w2) & TM_QW1W2_VO) && + (cam == GETFIELD_BE32(TM_QW1W2_OS_CAM, qw1w2)) && + (be32_to_cpu(qw0w2) & TM_QW0W2_VU) && + (logic_serv == GETFIELD_BE32(TM_QW0W2_LOGIC_SERV, qw0w2))) { + return TM_QW0_USER; + } + } + return -1; +} + +typedef struct XiveTCTXMatch { + XiveTCTX *tctx; + uint8_t ring; +} XiveTCTXMatch; + +static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, + uint8_t nvt_blk, uint32_t nvt_idx, + bool cam_ignore, uint8_t priority, + uint32_t logic_serv, XiveTCTXMatch *match) +{ + CPUState *cs; + + /* TODO (PowerNV): handle chip_id overwrite of block field for + * hardwired CAM compares */ + + CPU_FOREACH(cs) { + PowerPCCPU *cpu = POWERPC_CPU(cs); + XiveTCTX *tctx = XIVE_TCTX(cpu->intc); + int ring; + + /* + * HW checks that the CPU is enabled in the Physical Thread + * Enable Register (PTER). + */ + + /* + * Check the thread context CAM lines and record matches. We + * will handle CPU exception delivery later + */ + ring = xive_presenter_tctx_match(tctx, format, nvt_blk, nvt_idx, + cam_ignore, logic_serv); + /* + * Save the context and follow on to catch duplicates, that we + * don't support yet. + */ + if (ring != -1) { + if (match->tctx) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: already found a thread " + "context NVT %x/%x\n", nvt_blk, nvt_idx); + return false; + } + + match->ring = ring; + match->tctx = tctx; + } + } + + if (!match->tctx) { + qemu_log_mask(LOG_UNIMP, "XIVE: NVT %x/%x is not dispatched\n", + nvt_blk, nvt_idx); + return false; + } + + return true; +} + +/* + * This is our simple Xive Presenter Engine model. It is merged in the + * Router as it does not require an extra object. + * + * It receives notification requests sent by the IVRE to find one + * matching NVT (or more) dispatched on the processor threads. In case + * of a single NVT notification, the process is abreviated and the + * thread is signaled if a match is found. In case of a logical server + * notification (bits ignored at the end of the NVT identifier), the + * IVPE and IVRE select a winning thread using different filters. This + * involves 2 or 3 exchanges on the PowerBus that the model does not + * support. + * + * The parameters represent what is sent on the PowerBus + */ +static void xive_presenter_notify(XiveRouter *xrtr, uint8_t format, + uint8_t nvt_blk, uint32_t nvt_idx, + bool cam_ignore, uint8_t priority, + uint32_t logic_serv) +{ + XiveNVT nvt; + XiveTCTXMatch match = { .tctx = NULL, .ring = 0 }; + bool found; + + /* NVT cache lookup */ + if (xive_router_get_nvt(xrtr, nvt_blk, nvt_idx, &nvt)) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: no NVT %x/%x\n", + nvt_blk, nvt_idx); + return; + } + + if (!xive_nvt_is_valid(&nvt)) { + qemu_log_mask(LOG_GUEST_ERROR, "XIVE: NVT %x/%x is invalid\n", + nvt_blk, nvt_idx); + return; + } + + found = xive_presenter_match(xrtr, format, nvt_blk, nvt_idx, cam_ignore, + priority, logic_serv, &match); + if (found) { + return; + } + + /* If no matching NVT is dispatched on a HW thread : + * - update the NVT structure if backlog is activated + * - escalate (ESe PQ bits and EAS in w4-5) if escalation is + * activated + */ +} + /* * An END trigger can come from an event trigger (IPI or HW) or from * another chip. We don't model the PowerBus but the END trigger @@ -1052,6 +1229,14 @@ static void xive_router_end_notify(XiveRouter *xrtr, uint8_t end_blk, /* * Follows IVPE notification */ + xive_presenter_notify(xrtr, format, + GETFIELD_BE32(END_W6_NVT_BLOCK, end.w6), + GETFIELD_BE32(END_W6_NVT_INDEX, end.w6), + GETFIELD_BE32(END_W7_F0_IGNORE, end.w7), + priority, + GETFIELD_BE32(END_W7_F1_LOG_SERVER_ID, end.w7)); + + /* TODO: Auto EOI. */ } static void xive_router_notify(XiveNotifier *xn, uint32_t lisn)
The last sub-engine of the XIVE architecture is the Interrupt Virtualization Presentation Engine (IVPE). On HW, the IVRE and the IVPE share elements, the Power Bus interface (CQ), the routing table descriptors, and they can be combined in the same HW logic. We do the same in QEMU and combine both engines in the XiveRouter for simplicity. When the IVRE has completed its job of matching an event source with a Notification Virtual Target (NVT) to notify, it forwards the event notification to the IVPE sub-engine. The IVPE scans the thread interrupt contexts of the Notification Virtual Targets (NVT) dispatched on the HW processor threads and if a match is found, it signals the thread. If not, the IVPE escalates the notification to some other targets and records the notification in a backlog queue. The IVPE maintains the thread interrupt context state for each of its NVTs not dispatched on HW processor threads in the Notification Virtual Target table (NVTT). The model currently only supports single NVT notifications. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- Changes since v6 : - removed HW CAM line setting and use as it is only useful for PowerNV - made use of xive_tctx_word2() helper - made use of GETFIELD_BE32() to compare CAM lines - fixed initialization of XiveTCTXMatch include/hw/ppc/xive.h | 14 +++ include/hw/ppc/xive_regs.h | 24 +++++ hw/intc/xive.c | 185 +++++++++++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+)