| Message ID | 20240801203008.11224-10-kowal@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | XIVE2 changes for TIMA operations | expand |
On 8/1/24 22:30, Michael Kowal wrote: > From: Glenn Miles <milesg@linux.vnet.ibm.com> > > Adds support for single byte writes to offset 0xC38 of the TIMA address > space. When this offset is written to, the hardware disables the thread > context and copies the current state information to the odd cache line of > the pair specified by the NVT structure indexed by the THREAD CAM entry. > > Note that this operation is almost identical to what we are already doing > for the "Pull OS Context to Odd Thread Reporting Line" operation except > that it also invalidates the Pool and Thread Contexts. In order to reuse > this code, this commit also changes those existing functions to be able > to handle any context/ring (OS, Pool, or Thread) that is passed in. > > Signed-off-by: Glenn Miles <milesg@linux.vnet.ibm.com> > Signed-off-by: Michael Kowal <kowal@linux.ibm.com> > --- > include/hw/ppc/xive.h | 2 +- > include/hw/ppc/xive2.h | 2 + > include/hw/ppc/xive_regs.h | 1 + > hw/intc/xive.c | 15 +++---- > hw/intc/xive2.c | 83 ++++++++++++++++++++++++++------------ > 5 files changed, 69 insertions(+), 34 deletions(-) > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index 28c181faa2..31242f0406 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -533,7 +533,7 @@ Object *xive_tctx_create(Object *cpu, XivePresenter *xptr, Error **errp); > void xive_tctx_reset(XiveTCTX *tctx); > void xive_tctx_destroy(XiveTCTX *tctx); > void xive_tctx_ipb_update(XiveTCTX *tctx, uint8_t ring, uint8_t ipb); > -void xive_tctx_reset_os_signal(XiveTCTX *tctx); > +void xive_tctx_reset_signal(XiveTCTX *tctx, uint8_t ring); Could you please extract in a separate patch all the changes adding a "uint8_t ring" parameter ? > > /* > * KVM XIVE device helpers > diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h > index 36bd0e747f..5bccf41159 100644 > --- a/include/hw/ppc/xive2.h > +++ b/include/hw/ppc/xive2.h > @@ -123,5 +123,7 @@ void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, > hwaddr offset, uint64_t value, unsigned size); > void xive2_tm_set_hv_target(XivePresenter *xptr, XiveTCTX *tctx, > hwaddr offset, uint64_t value, unsigned size); > +void xive2_tm_pull_phys_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, unsigned size); > > #endif /* PPC_XIVE2_H */ > diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h > index 558a5ae742..5b11463777 100644 > --- a/include/hw/ppc/xive_regs.h > +++ b/include/hw/ppc/xive_regs.h > @@ -138,6 +138,7 @@ > #define TM_SPC_ACK_HV_POOL_EL 0xc20 /* Store8 ack HV evt pool to even */ > /* line */ > #define TM_SPC_ACK_HV_EL 0xc30 /* Store8 ack HV irq to even line */ > +#define TM_SPC_PULL_PHYS_CTX_OL 0xc38 /* Pull phys ctx to odd cache line */ > /* XXX more... */ > > /* NSR fields for the various QW ack types */ > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index 5b66a3aec5..9d85da0999 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -114,15 +114,14 @@ static void xive_tctx_notify(XiveTCTX *tctx, uint8_t ring) > } > } > > -void xive_tctx_reset_os_signal(XiveTCTX *tctx) > +void xive_tctx_reset_signal(XiveTCTX *tctx, uint8_t ring) > { > /* > - * Lower the External interrupt. Used when pulling an OS > - * context. It is necessary to avoid catching it in the hypervisor > - * context. It should be raised again when re-pushing the OS > - * context. > + * Lower the External interrupt. Used when pulling a context. It is > + * necessary to avoid catching it in the higher privilege context. It > + * should be raised again when re-pushing the lower privilege context. > */ > - qemu_irq_lower(xive_tctx_output(tctx, TM_QW1_OS)); > + qemu_irq_lower(xive_tctx_output(tctx, ring)); > } > > static void xive_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, uint8_t cppr) > @@ -424,7 +423,7 @@ static uint64_t xive_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, > qw1w2_new = xive_set_field32(TM_QW1W2_VO, qw1w2, 0); > xive_tctx_set_os_cam(tctx, qw1w2_new); > > - xive_tctx_reset_os_signal(tctx); > + xive_tctx_reset_signal(tctx, TM_QW1_OS); > return qw1w2; > } > > @@ -581,6 +580,8 @@ static const XiveTmOp xive2_tm_operations[] = { > NULL }, > { XIVE_TM_HV_PAGE, TM_SPC_PULL_PHYS_CTX, 1, NULL, > xive_tm_pull_phys_ctx }, > + { XIVE_TM_HV_PAGE, TM_SPC_PULL_PHYS_CTX_OL, 1, xive2_tm_pull_phys_ctx_ol, > + NULL }, > }; > > static const XiveTmOp *xive_tm_find_op(XivePresenter *xptr, hwaddr offset, > diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c > index eed0cc9c3c..af9699ec88 100644 > --- a/hw/intc/xive2.c > +++ b/hw/intc/xive2.c > @@ -295,13 +295,14 @@ static void xive2_end_enqueue(Xive2End *end, uint32_t data) > * the NVP by changing the H bit while the context is enabled > */ > > -static void xive2_tctx_save_os_ctx(Xive2Router *xrtr, XiveTCTX *tctx, > - uint8_t nvp_blk, uint32_t nvp_idx) > +static void xive2_tctx_save_ctx(Xive2Router *xrtr, XiveTCTX *tctx, > + uint8_t nvp_blk, uint32_t nvp_idx, > + uint8_t ring) > { > CPUPPCState *env = &POWERPC_CPU(tctx->cs)->env; > uint32_t pir = env->spr_cb[SPR_PIR].default_value; > Xive2Nvp nvp; > - uint8_t *regs = &tctx->regs[TM_QW1_OS]; > + uint8_t *regs = &tctx->regs[ring]; > > if (xive2_router_get_nvp(xrtr, nvp_blk, nvp_idx, &nvp)) { > qemu_log_mask(LOG_GUEST_ERROR, "XIVE: No NVP %x/%x\n", > @@ -346,13 +347,13 @@ static void xive2_tctx_save_os_ctx(Xive2Router *xrtr, XiveTCTX *tctx, > xive2_router_write_nvp(xrtr, nvp_blk, nvp_idx, &nvp, 1); > } > > -static void xive2_os_cam_decode(uint32_t cam, uint8_t *nvp_blk, > - uint32_t *nvp_idx, bool *vo, bool *ho) > +static void xive2_cam_decode(uint32_t cam, uint8_t *nvp_blk, > + uint32_t *nvp_idx, bool *valid, bool *hw) > { > *nvp_blk = xive2_nvp_blk(cam); > *nvp_idx = xive2_nvp_idx(cam); > - *vo = !!(cam & TM2_QW1W2_VO); > - *ho = !!(cam & TM2_QW1W2_HO); > + *valid = !!(cam & TM2_QW1W2_VO); > + *hw = !!(cam & TM2_QW1W2_HO); > } This doesn't seem like a useful change. Thanks, C. > > @@ -376,35 +377,52 @@ static uint32_t xive2_tctx_hw_cam_line(XivePresenter *xptr, XiveTCTX *tctx) > return xive2_nvp_cam_line(blk, 1 << tid_shift | (pir & tid_mask)); > } > > -uint64_t xive2_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, > - hwaddr offset, unsigned size) > +static uint64_t xive2_tm_pull_ctx(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, unsigned size, uint8_t ring) > { > Xive2Router *xrtr = XIVE2_ROUTER(xptr); > - uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); > - uint32_t qw1w2_new; > - uint32_t cam = be32_to_cpu(qw1w2); > + uint32_t target_ringw2 = xive_tctx_word2(&tctx->regs[ring]); > + uint32_t cam = be32_to_cpu(target_ringw2); > uint8_t nvp_blk; > uint32_t nvp_idx; > - bool vo; > + uint8_t cur_ring; > + bool valid; > bool do_save; > > - xive2_os_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_save); > + xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &valid, &do_save); > > - if (!vo) { > + if (!valid) { > qemu_log_mask(LOG_GUEST_ERROR, "XIVE: pulling invalid NVP %x/%x !?\n", > nvp_blk, nvp_idx); > } > > - /* Invalidate CAM line */ > - qw1w2_new = xive_set_field32(TM2_QW1W2_VO, qw1w2, 0); > - memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2_new, 4); > + /* Invalidate CAM line of requested ring and all lower rings */ > + for (cur_ring = TM_QW0_USER; cur_ring <= ring; > + cur_ring += XIVE_TM_RING_SIZE) { > + uint32_t ringw2 = xive_tctx_word2(&tctx->regs[cur_ring]); > + uint32_t ringw2_new = xive_set_field32(TM2_QW1W2_VO, ringw2, 0); > + memcpy(&tctx->regs[cur_ring + TM_WORD2], &ringw2_new, 4); > + } > > if (xive2_router_get_config(xrtr) & XIVE2_VP_SAVE_RESTORE && do_save) { > - xive2_tctx_save_os_ctx(xrtr, tctx, nvp_blk, nvp_idx); > + xive2_tctx_save_ctx(xrtr, tctx, nvp_blk, nvp_idx, ring); > } > > - xive_tctx_reset_os_signal(tctx); > - return qw1w2; > + /* > + * Lower external interrupt line of requested ring and below except for > + * USER, which doesn't exist. > + */ > + for (cur_ring = TM_QW1_OS; cur_ring <= ring; > + cur_ring += XIVE_TM_RING_SIZE) { > + xive_tctx_reset_signal(tctx, cur_ring); > + } > + return target_ringw2; > +} > + > +uint64_t xive2_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, unsigned size) > +{ > + return xive2_tm_pull_ctx(xptr, tctx, offset, size, TM_QW1_OS); > } > > #define REPORT_LINE_GEN1_SIZE 16 > @@ -449,8 +467,9 @@ static void xive2_tm_report_line_gen1(XiveTCTX *tctx, uint8_t *data, > } > } > > -void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, > - hwaddr offset, uint64_t value, unsigned size) > +static void xive2_tm_pull_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, > + unsigned size, uint8_t ring) > { > Xive2Router *xrtr = XIVE2_ROUTER(xptr); > uint32_t hw_cam, nvp_idx, xive2_cfg, reserved; > @@ -488,8 +507,20 @@ void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, > cpu_physical_memory_write(phys_addr + 12, &reserved, 4); > } > > - /* the rest is similar to pull OS context to registers */ > - xive2_tm_pull_os_ctx(xptr, tctx, offset, size); > + /* the rest is similar to pull context to registers */ > + xive2_tm_pull_ctx(xptr, tctx, offset, size, ring); > +} > + > +void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, unsigned size) > +{ > + xive2_tm_pull_ctx_ol(xptr, tctx, offset, value, size, TM_QW1_OS); > +} > + > +void xive2_tm_pull_phys_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, > + hwaddr offset, uint64_t value, unsigned size) > +{ > + xive2_tm_pull_ctx_ol(xptr, tctx, offset, value, size, TM_QW3_HV_PHYS); > } > > static uint8_t xive2_tctx_restore_os_ctx(Xive2Router *xrtr, XiveTCTX *tctx, > @@ -588,7 +619,7 @@ void xive2_tm_push_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, > bool vo; > bool do_restore; > > - xive2_os_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_restore); > + xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_restore); > > /* First update the thead context */ > memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2, 4);
On 8/29/2024 7:08 AM, Cédric Le Goater wrote: > On 8/1/24 22:30, Michael Kowal wrote: >> From: Glenn Miles <milesg@linux.vnet.ibm.com> >> >> Adds support for single byte writes to offset 0xC38 of the TIMA address >> space. When this offset is written to, the hardware disables the thread >> context and copies the current state information to the odd cache >> line of >> the pair specified by the NVT structure indexed by the THREAD CAM entry. >> >> Note that this operation is almost identical to what we are already >> doing >> for the "Pull OS Context to Odd Thread Reporting Line" operation except >> that it also invalidates the Pool and Thread Contexts. In order to >> reuse >> this code, this commit also changes those existing functions to be able >> to handle any context/ring (OS, Pool, or Thread) that is passed in. >> >> Signed-off-by: Glenn Miles <milesg@linux.vnet.ibm.com> >> Signed-off-by: Michael Kowal <kowal@linux.ibm.com> >> --- >> include/hw/ppc/xive.h | 2 +- >> include/hw/ppc/xive2.h | 2 + >> include/hw/ppc/xive_regs.h | 1 + >> hw/intc/xive.c | 15 +++---- >> hw/intc/xive2.c | 83 ++++++++++++++++++++++++++------------ >> 5 files changed, 69 insertions(+), 34 deletions(-) >> >> diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h >> index 28c181faa2..31242f0406 100644 >> --- a/include/hw/ppc/xive.h >> +++ b/include/hw/ppc/xive.h >> @@ -533,7 +533,7 @@ Object *xive_tctx_create(Object *cpu, >> XivePresenter *xptr, Error **errp); >> void xive_tctx_reset(XiveTCTX *tctx); >> void xive_tctx_destroy(XiveTCTX *tctx); >> void xive_tctx_ipb_update(XiveTCTX *tctx, uint8_t ring, uint8_t ipb); >> -void xive_tctx_reset_os_signal(XiveTCTX *tctx); >> +void xive_tctx_reset_signal(XiveTCTX *tctx, uint8_t ring); > > Could you please extract in a separate patch all the changes adding a > "uint8_t ring" parameter ? > Will do.... >> /* >> * KVM XIVE device helpers >> diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h >> index 36bd0e747f..5bccf41159 100644 >> --- a/include/hw/ppc/xive2.h >> +++ b/include/hw/ppc/xive2.h >> @@ -123,5 +123,7 @@ void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, >> XiveTCTX *tctx, >> hwaddr offset, uint64_t value, >> unsigned size); >> void xive2_tm_set_hv_target(XivePresenter *xptr, XiveTCTX *tctx, >> hwaddr offset, uint64_t value, unsigned >> size); >> +void xive2_tm_pull_phys_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, >> + hwaddr offset, uint64_t value, >> unsigned size); >> #endif /* PPC_XIVE2_H */ >> diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h >> index 558a5ae742..5b11463777 100644 >> --- a/include/hw/ppc/xive_regs.h >> +++ b/include/hw/ppc/xive_regs.h >> @@ -138,6 +138,7 @@ >> #define TM_SPC_ACK_HV_POOL_EL 0xc20 /* Store8 ack HV evt pool >> to even */ >> /* >> line */ >> #define TM_SPC_ACK_HV_EL 0xc30 /* Store8 ack HV irq to >> even line */ >> +#define TM_SPC_PULL_PHYS_CTX_OL 0xc38 /* Pull phys ctx to odd >> cache line */ >> /* XXX more... */ >> /* NSR fields for the various QW ack types */ >> diff --git a/hw/intc/xive.c b/hw/intc/xive.c >> index 5b66a3aec5..9d85da0999 100644 >> --- a/hw/intc/xive.c >> +++ b/hw/intc/xive.c >> @@ -114,15 +114,14 @@ static void xive_tctx_notify(XiveTCTX *tctx, >> uint8_t ring) >> } >> } >> -void xive_tctx_reset_os_signal(XiveTCTX *tctx) >> +void xive_tctx_reset_signal(XiveTCTX *tctx, uint8_t ring) >> { >> /* >> - * Lower the External interrupt. Used when pulling an OS >> - * context. It is necessary to avoid catching it in the hypervisor >> - * context. It should be raised again when re-pushing the OS >> - * context. >> + * Lower the External interrupt. Used when pulling a context. It is >> + * necessary to avoid catching it in the higher privilege >> context. It >> + * should be raised again when re-pushing the lower privilege >> context. >> */ >> - qemu_irq_lower(xive_tctx_output(tctx, TM_QW1_OS)); >> + qemu_irq_lower(xive_tctx_output(tctx, ring)); >> } >> static void xive_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, >> uint8_t cppr) >> @@ -424,7 +423,7 @@ static uint64_t xive_tm_pull_os_ctx(XivePresenter >> *xptr, XiveTCTX *tctx, >> qw1w2_new = xive_set_field32(TM_QW1W2_VO, qw1w2, 0); >> xive_tctx_set_os_cam(tctx, qw1w2_new); >> - xive_tctx_reset_os_signal(tctx); >> + xive_tctx_reset_signal(tctx, TM_QW1_OS); >> return qw1w2; >> } >> @@ -581,6 +580,8 @@ static const XiveTmOp xive2_tm_operations[] = { >> NULL }, >> { XIVE_TM_HV_PAGE, TM_SPC_PULL_PHYS_CTX, 1, NULL, >> xive_tm_pull_phys_ctx }, >> + { XIVE_TM_HV_PAGE, TM_SPC_PULL_PHYS_CTX_OL, 1, >> xive2_tm_pull_phys_ctx_ol, >> + NULL }, >> }; >> static const XiveTmOp *xive_tm_find_op(XivePresenter *xptr, >> hwaddr offset, >> diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c >> index eed0cc9c3c..af9699ec88 100644 >> --- a/hw/intc/xive2.c >> +++ b/hw/intc/xive2.c >> @@ -295,13 +295,14 @@ static void xive2_end_enqueue(Xive2End *end, >> uint32_t data) >> * the NVP by changing the H bit while the context is enabled >> */ >> -static void xive2_tctx_save_os_ctx(Xive2Router *xrtr, XiveTCTX *tctx, >> - uint8_t nvp_blk, uint32_t nvp_idx) >> +static void xive2_tctx_save_ctx(Xive2Router *xrtr, XiveTCTX *tctx, >> + uint8_t nvp_blk, uint32_t nvp_idx, >> + uint8_t ring) >> { >> CPUPPCState *env = &POWERPC_CPU(tctx->cs)->env; >> uint32_t pir = env->spr_cb[SPR_PIR].default_value; >> Xive2Nvp nvp; >> - uint8_t *regs = &tctx->regs[TM_QW1_OS]; >> + uint8_t *regs = &tctx->regs[ring]; >> if (xive2_router_get_nvp(xrtr, nvp_blk, nvp_idx, &nvp)) { >> qemu_log_mask(LOG_GUEST_ERROR, "XIVE: No NVP %x/%x\n", >> @@ -346,13 +347,13 @@ static void xive2_tctx_save_os_ctx(Xive2Router >> *xrtr, XiveTCTX *tctx, >> xive2_router_write_nvp(xrtr, nvp_blk, nvp_idx, &nvp, 1); >> } >> -static void xive2_os_cam_decode(uint32_t cam, uint8_t *nvp_blk, >> - uint32_t *nvp_idx, bool *vo, bool *ho) >> +static void xive2_cam_decode(uint32_t cam, uint8_t *nvp_blk, >> + uint32_t *nvp_idx, bool *valid, bool *hw) >> { >> *nvp_blk = xive2_nvp_blk(cam); >> *nvp_idx = xive2_nvp_idx(cam); >> - *vo = !!(cam & TM2_QW1W2_VO); >> - *ho = !!(cam & TM2_QW1W2_HO); >> + *valid = !!(cam & TM2_QW1W2_VO); >> + *hw = !!(cam & TM2_QW1W2_HO); >> } > > > This doesn't seem like a useful change. Ah, yes. The valid and hardware bits are the same for each line. I will add a generic valid/hardware bit defines, but maybe in a separate patch set since it will cause additional changes. > > > Thanks, > > C. > > >> @@ -376,35 +377,52 @@ static uint32_t >> xive2_tctx_hw_cam_line(XivePresenter *xptr, XiveTCTX *tctx) >> return xive2_nvp_cam_line(blk, 1 << tid_shift | (pir & tid_mask)); >> } >> -uint64_t xive2_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, >> - hwaddr offset, unsigned size) >> +static uint64_t xive2_tm_pull_ctx(XivePresenter *xptr, XiveTCTX *tctx, >> + hwaddr offset, unsigned size, uint8_t ring) >> { >> Xive2Router *xrtr = XIVE2_ROUTER(xptr); >> - uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); >> - uint32_t qw1w2_new; >> - uint32_t cam = be32_to_cpu(qw1w2); >> + uint32_t target_ringw2 = xive_tctx_word2(&tctx->regs[ring]); >> + uint32_t cam = be32_to_cpu(target_ringw2); >> uint8_t nvp_blk; >> uint32_t nvp_idx; >> - bool vo; >> + uint8_t cur_ring; >> + bool valid; >> bool do_save; >> - xive2_os_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_save); >> + xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &valid, &do_save); >> - if (!vo) { >> + if (!valid) { >> qemu_log_mask(LOG_GUEST_ERROR, "XIVE: pulling invalid NVP >> %x/%x !?\n", >> nvp_blk, nvp_idx); >> } >> - /* Invalidate CAM line */ >> - qw1w2_new = xive_set_field32(TM2_QW1W2_VO, qw1w2, 0); >> - memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2_new, 4); >> + /* Invalidate CAM line of requested ring and all lower rings */ >> + for (cur_ring = TM_QW0_USER; cur_ring <= ring; >> + cur_ring += XIVE_TM_RING_SIZE) { >> + uint32_t ringw2 = xive_tctx_word2(&tctx->regs[cur_ring]); >> + uint32_t ringw2_new = xive_set_field32(TM2_QW1W2_VO, ringw2, >> 0); >> + memcpy(&tctx->regs[cur_ring + TM_WORD2], &ringw2_new, 4); >> + } >> if (xive2_router_get_config(xrtr) & XIVE2_VP_SAVE_RESTORE && >> do_save) { >> - xive2_tctx_save_os_ctx(xrtr, tctx, nvp_blk, nvp_idx); >> + xive2_tctx_save_ctx(xrtr, tctx, nvp_blk, nvp_idx, ring); >> } >> - xive_tctx_reset_os_signal(tctx); >> - return qw1w2; >> + /* >> + * Lower external interrupt line of requested ring and below >> except for >> + * USER, which doesn't exist. >> + */ >> + for (cur_ring = TM_QW1_OS; cur_ring <= ring; >> + cur_ring += XIVE_TM_RING_SIZE) { >> + xive_tctx_reset_signal(tctx, cur_ring); >> + } >> + return target_ringw2; >> +} >> + >> +uint64_t xive2_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, >> + hwaddr offset, unsigned size) >> +{ >> + return xive2_tm_pull_ctx(xptr, tctx, offset, size, TM_QW1_OS); >> } >> #define REPORT_LINE_GEN1_SIZE 16 >> @@ -449,8 +467,9 @@ static void xive2_tm_report_line_gen1(XiveTCTX >> *tctx, uint8_t *data, >> } >> } >> -void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, >> - hwaddr offset, uint64_t value, unsigned >> size) >> +static void xive2_tm_pull_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, >> + hwaddr offset, uint64_t value, >> + unsigned size, uint8_t ring) >> { >> Xive2Router *xrtr = XIVE2_ROUTER(xptr); >> uint32_t hw_cam, nvp_idx, xive2_cfg, reserved; >> @@ -488,8 +507,20 @@ void xive2_tm_pull_os_ctx_ol(XivePresenter >> *xptr, XiveTCTX *tctx, >> cpu_physical_memory_write(phys_addr + 12, &reserved, 4); >> } >> - /* the rest is similar to pull OS context to registers */ >> - xive2_tm_pull_os_ctx(xptr, tctx, offset, size); >> + /* the rest is similar to pull context to registers */ >> + xive2_tm_pull_ctx(xptr, tctx, offset, size, ring); >> +} >> + >> +void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, >> + hwaddr offset, uint64_t value, unsigned >> size) >> +{ >> + xive2_tm_pull_ctx_ol(xptr, tctx, offset, value, size, TM_QW1_OS); >> +} >> + >> +void xive2_tm_pull_phys_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, >> + hwaddr offset, uint64_t value, >> unsigned size) >> +{ >> + xive2_tm_pull_ctx_ol(xptr, tctx, offset, value, size, >> TM_QW3_HV_PHYS); >> } >> static uint8_t xive2_tctx_restore_os_ctx(Xive2Router *xrtr, >> XiveTCTX *tctx, >> @@ -588,7 +619,7 @@ void xive2_tm_push_os_ctx(XivePresenter *xptr, >> XiveTCTX *tctx, >> bool vo; >> bool do_restore; >> - xive2_os_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_restore); >> + xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_restore); >> /* First update the thead context */ >> memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2, 4); >
diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 28c181faa2..31242f0406 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -533,7 +533,7 @@ Object *xive_tctx_create(Object *cpu, XivePresenter *xptr, Error **errp); void xive_tctx_reset(XiveTCTX *tctx); void xive_tctx_destroy(XiveTCTX *tctx); void xive_tctx_ipb_update(XiveTCTX *tctx, uint8_t ring, uint8_t ipb); -void xive_tctx_reset_os_signal(XiveTCTX *tctx); +void xive_tctx_reset_signal(XiveTCTX *tctx, uint8_t ring); /* * KVM XIVE device helpers diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h index 36bd0e747f..5bccf41159 100644 --- a/include/hw/ppc/xive2.h +++ b/include/hw/ppc/xive2.h @@ -123,5 +123,7 @@ void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, hwaddr offset, uint64_t value, unsigned size); void xive2_tm_set_hv_target(XivePresenter *xptr, XiveTCTX *tctx, hwaddr offset, uint64_t value, unsigned size); +void xive2_tm_pull_phys_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, + hwaddr offset, uint64_t value, unsigned size); #endif /* PPC_XIVE2_H */ diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h index 558a5ae742..5b11463777 100644 --- a/include/hw/ppc/xive_regs.h +++ b/include/hw/ppc/xive_regs.h @@ -138,6 +138,7 @@ #define TM_SPC_ACK_HV_POOL_EL 0xc20 /* Store8 ack HV evt pool to even */ /* line */ #define TM_SPC_ACK_HV_EL 0xc30 /* Store8 ack HV irq to even line */ +#define TM_SPC_PULL_PHYS_CTX_OL 0xc38 /* Pull phys ctx to odd cache line */ /* XXX more... */ /* NSR fields for the various QW ack types */ diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 5b66a3aec5..9d85da0999 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -114,15 +114,14 @@ static void xive_tctx_notify(XiveTCTX *tctx, uint8_t ring) } } -void xive_tctx_reset_os_signal(XiveTCTX *tctx) +void xive_tctx_reset_signal(XiveTCTX *tctx, uint8_t ring) { /* - * Lower the External interrupt. Used when pulling an OS - * context. It is necessary to avoid catching it in the hypervisor - * context. It should be raised again when re-pushing the OS - * context. + * Lower the External interrupt. Used when pulling a context. It is + * necessary to avoid catching it in the higher privilege context. It + * should be raised again when re-pushing the lower privilege context. */ - qemu_irq_lower(xive_tctx_output(tctx, TM_QW1_OS)); + qemu_irq_lower(xive_tctx_output(tctx, ring)); } static void xive_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, uint8_t cppr) @@ -424,7 +423,7 @@ static uint64_t xive_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, qw1w2_new = xive_set_field32(TM_QW1W2_VO, qw1w2, 0); xive_tctx_set_os_cam(tctx, qw1w2_new); - xive_tctx_reset_os_signal(tctx); + xive_tctx_reset_signal(tctx, TM_QW1_OS); return qw1w2; } @@ -581,6 +580,8 @@ static const XiveTmOp xive2_tm_operations[] = { NULL }, { XIVE_TM_HV_PAGE, TM_SPC_PULL_PHYS_CTX, 1, NULL, xive_tm_pull_phys_ctx }, + { XIVE_TM_HV_PAGE, TM_SPC_PULL_PHYS_CTX_OL, 1, xive2_tm_pull_phys_ctx_ol, + NULL }, }; static const XiveTmOp *xive_tm_find_op(XivePresenter *xptr, hwaddr offset, diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c index eed0cc9c3c..af9699ec88 100644 --- a/hw/intc/xive2.c +++ b/hw/intc/xive2.c @@ -295,13 +295,14 @@ static void xive2_end_enqueue(Xive2End *end, uint32_t data) * the NVP by changing the H bit while the context is enabled */ -static void xive2_tctx_save_os_ctx(Xive2Router *xrtr, XiveTCTX *tctx, - uint8_t nvp_blk, uint32_t nvp_idx) +static void xive2_tctx_save_ctx(Xive2Router *xrtr, XiveTCTX *tctx, + uint8_t nvp_blk, uint32_t nvp_idx, + uint8_t ring) { CPUPPCState *env = &POWERPC_CPU(tctx->cs)->env; uint32_t pir = env->spr_cb[SPR_PIR].default_value; Xive2Nvp nvp; - uint8_t *regs = &tctx->regs[TM_QW1_OS]; + uint8_t *regs = &tctx->regs[ring]; if (xive2_router_get_nvp(xrtr, nvp_blk, nvp_idx, &nvp)) { qemu_log_mask(LOG_GUEST_ERROR, "XIVE: No NVP %x/%x\n", @@ -346,13 +347,13 @@ static void xive2_tctx_save_os_ctx(Xive2Router *xrtr, XiveTCTX *tctx, xive2_router_write_nvp(xrtr, nvp_blk, nvp_idx, &nvp, 1); } -static void xive2_os_cam_decode(uint32_t cam, uint8_t *nvp_blk, - uint32_t *nvp_idx, bool *vo, bool *ho) +static void xive2_cam_decode(uint32_t cam, uint8_t *nvp_blk, + uint32_t *nvp_idx, bool *valid, bool *hw) { *nvp_blk = xive2_nvp_blk(cam); *nvp_idx = xive2_nvp_idx(cam); - *vo = !!(cam & TM2_QW1W2_VO); - *ho = !!(cam & TM2_QW1W2_HO); + *valid = !!(cam & TM2_QW1W2_VO); + *hw = !!(cam & TM2_QW1W2_HO); } @@ -376,35 +377,52 @@ static uint32_t xive2_tctx_hw_cam_line(XivePresenter *xptr, XiveTCTX *tctx) return xive2_nvp_cam_line(blk, 1 << tid_shift | (pir & tid_mask)); } -uint64_t xive2_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, - hwaddr offset, unsigned size) +static uint64_t xive2_tm_pull_ctx(XivePresenter *xptr, XiveTCTX *tctx, + hwaddr offset, unsigned size, uint8_t ring) { Xive2Router *xrtr = XIVE2_ROUTER(xptr); - uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]); - uint32_t qw1w2_new; - uint32_t cam = be32_to_cpu(qw1w2); + uint32_t target_ringw2 = xive_tctx_word2(&tctx->regs[ring]); + uint32_t cam = be32_to_cpu(target_ringw2); uint8_t nvp_blk; uint32_t nvp_idx; - bool vo; + uint8_t cur_ring; + bool valid; bool do_save; - xive2_os_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_save); + xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &valid, &do_save); - if (!vo) { + if (!valid) { qemu_log_mask(LOG_GUEST_ERROR, "XIVE: pulling invalid NVP %x/%x !?\n", nvp_blk, nvp_idx); } - /* Invalidate CAM line */ - qw1w2_new = xive_set_field32(TM2_QW1W2_VO, qw1w2, 0); - memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2_new, 4); + /* Invalidate CAM line of requested ring and all lower rings */ + for (cur_ring = TM_QW0_USER; cur_ring <= ring; + cur_ring += XIVE_TM_RING_SIZE) { + uint32_t ringw2 = xive_tctx_word2(&tctx->regs[cur_ring]); + uint32_t ringw2_new = xive_set_field32(TM2_QW1W2_VO, ringw2, 0); + memcpy(&tctx->regs[cur_ring + TM_WORD2], &ringw2_new, 4); + } if (xive2_router_get_config(xrtr) & XIVE2_VP_SAVE_RESTORE && do_save) { - xive2_tctx_save_os_ctx(xrtr, tctx, nvp_blk, nvp_idx); + xive2_tctx_save_ctx(xrtr, tctx, nvp_blk, nvp_idx, ring); } - xive_tctx_reset_os_signal(tctx); - return qw1w2; + /* + * Lower external interrupt line of requested ring and below except for + * USER, which doesn't exist. + */ + for (cur_ring = TM_QW1_OS; cur_ring <= ring; + cur_ring += XIVE_TM_RING_SIZE) { + xive_tctx_reset_signal(tctx, cur_ring); + } + return target_ringw2; +} + +uint64_t xive2_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, + hwaddr offset, unsigned size) +{ + return xive2_tm_pull_ctx(xptr, tctx, offset, size, TM_QW1_OS); } #define REPORT_LINE_GEN1_SIZE 16 @@ -449,8 +467,9 @@ static void xive2_tm_report_line_gen1(XiveTCTX *tctx, uint8_t *data, } } -void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, - hwaddr offset, uint64_t value, unsigned size) +static void xive2_tm_pull_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, + hwaddr offset, uint64_t value, + unsigned size, uint8_t ring) { Xive2Router *xrtr = XIVE2_ROUTER(xptr); uint32_t hw_cam, nvp_idx, xive2_cfg, reserved; @@ -488,8 +507,20 @@ void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, cpu_physical_memory_write(phys_addr + 12, &reserved, 4); } - /* the rest is similar to pull OS context to registers */ - xive2_tm_pull_os_ctx(xptr, tctx, offset, size); + /* the rest is similar to pull context to registers */ + xive2_tm_pull_ctx(xptr, tctx, offset, size, ring); +} + +void xive2_tm_pull_os_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, + hwaddr offset, uint64_t value, unsigned size) +{ + xive2_tm_pull_ctx_ol(xptr, tctx, offset, value, size, TM_QW1_OS); +} + +void xive2_tm_pull_phys_ctx_ol(XivePresenter *xptr, XiveTCTX *tctx, + hwaddr offset, uint64_t value, unsigned size) +{ + xive2_tm_pull_ctx_ol(xptr, tctx, offset, value, size, TM_QW3_HV_PHYS); } static uint8_t xive2_tctx_restore_os_ctx(Xive2Router *xrtr, XiveTCTX *tctx, @@ -588,7 +619,7 @@ void xive2_tm_push_os_ctx(XivePresenter *xptr, XiveTCTX *tctx, bool vo; bool do_restore; - xive2_os_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_restore); + xive2_cam_decode(cam, &nvp_blk, &nvp_idx, &vo, &do_restore); /* First update the thead context */ memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2, 4);