From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Date: Thu, 08 Apr 2021 02:58:56 +0000 Subject: Re: [PATCH v3] ppc/spapr: Add support for implement support for H_SCM_HEALTH Message-Id: MIME-Version: 1 Content-Type: multipart/mixed; boundary="vllbt3Jqk6rt+UYs" List-Id: References: <20210402102128.213943-1-vaibhav@linux.ibm.com> In-Reply-To: <20210402102128.213943-1-vaibhav@linux.ibm.com> To: Vaibhav Jain Cc: xiaoguangrong.eric@gmail.com, mst@redhat.com, aneesh.kumar@linux.ibm.com, qemu-devel@nongnu.org, kvm-ppc@vger.kernel.org, groug@kaod.org, shivaprasadbhat@gmail.com, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, imammedo@redhat.com, ehabkost@redhat.com --vllbt3Jqk6rt+UYs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 02, 2021 at 03:51:28PM +0530, Vaibhav Jain wrote: > Add support for H_SCM_HEALTH hcall described at [1] for spapr > nvdimms. This enables guest to detect the 'unarmed' status of a > specific spapr nvdimm identified by its DRC and if its unarmed, mark > the region backed by the nvdimm as read-only. >=20 > The patch adds h_scm_health() to handle the H_SCM_HEALTH hcall which > returns two 64-bit bitmaps (health bitmap, health bitmap mask) derived > from 'struct nvdimm->unarmed' member. >=20 > Linux kernel side changes to enable handling of 'unarmed' nvdimms for > ppc64 are proposed at [2]. >=20 > References: > [1] "Hypercall Op-codes (hcalls)" > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tr= ee/Documentation/powerpc/papr_hcalls.rst#n220 > [2] "powerpc/papr_scm: Mark nvdimm as unarmed if needed during probe" > https://lore.kernel.org/linux-nvdimm/20210329113103.476760-1-vaibhav@= linux.ibm.com/ >=20 > Signed-off-by: Vaibhav Jain Applied to ppc-for-6.1, thanks. > --- > Changelog >=20 > v3: > * Switched to PPC_BIT macro for definitions of the health bits. [ Greg, D= avid ] > * Updated h_scm_health() to use a const uint64_t to denote supported > bits in 'hbitmap_mask'. > * Fixed an error check for drc->dev to return H_PARAMETER in case nvdimm > is not yet plugged in [ Greg ] > * Fixed an wrong error check for ensuring drc and drc-type are correct > [ Greg ] >=20 > v2: > * Added a check for drc->dev to ensure that the dimm is plugged in > when servicing H_SCM_HEALTH. [ Shiva ] > * Instead of accessing the 'nvdimm->unarmed' member directly use the > object_property_get_bool accessor to fetch it. [ Shiva ] > * Update the usage of PAPR_PMEM_UNARMED* macros [ Greg ] > * Updated patch description reference#1 to point appropriate section > in the documentation. [ Greg ] > --- > hw/ppc/spapr_nvdimm.c | 36 ++++++++++++++++++++++++++++++++++++ > include/hw/ppc/spapr.h | 3 ++- > 2 files changed, 38 insertions(+), 1 deletion(-) >=20 > diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c > index b46c36917c..252204e25f 100644 > --- a/hw/ppc/spapr_nvdimm.c > +++ b/hw/ppc/spapr_nvdimm.c > @@ -31,6 +31,10 @@ > #include "qemu/range.h" > #include "hw/ppc/spapr_numa.h" > =20 > +/* DIMM health bitmap bitmap indicators. Taken from kernel's papr_scm.c = */ > +/* SCM device is unable to persist memory contents */ > +#define PAPR_PMEM_UNARMED PPC_BIT(0) > + > bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nv= dimm, > uint64_t size, Error **errp) > { > @@ -467,6 +471,37 @@ static target_ulong h_scm_unbind_all(PowerPCCPU *cpu= , SpaprMachineState *spapr, > return H_SUCCESS; > } > =20 > +static target_ulong h_scm_health(PowerPCCPU *cpu, SpaprMachineState *spa= pr, > + target_ulong opcode, target_ulong *args) > +{ > + > + NVDIMMDevice *nvdimm; > + uint64_t hbitmap =3D 0; > + uint32_t drc_index =3D args[0]; > + SpaprDrc *drc =3D spapr_drc_by_index(drc_index); > + const uint64_t hbitmap_mask =3D PAPR_PMEM_UNARMED; > + > + > + /* Ensure that the drc is valid & is valid PMEM dimm and is plugged = in */ > + if (!drc || !drc->dev || > + spapr_drc_type(drc) !=3D SPAPR_DR_CONNECTOR_TYPE_PMEM) { > + return H_PARAMETER; > + } > + > + nvdimm =3D NVDIMM(drc->dev); > + > + /* Update if the nvdimm is unarmed and send its status via health bi= tmaps */ > + if (object_property_get_bool(OBJECT(nvdimm), NVDIMM_UNARMED_PROP, NU= LL)) { > + hbitmap |=3D PAPR_PMEM_UNARMED; > + } > + > + /* Update the out args with health bitmap/mask */ > + args[0] =3D hbitmap; > + args[1] =3D hbitmap_mask; > + > + return H_SUCCESS; > +} > + > static void spapr_scm_register_types(void) > { > /* qemu/scm specific hcalls */ > @@ -475,6 +510,7 @@ static void spapr_scm_register_types(void) > spapr_register_hypercall(H_SCM_BIND_MEM, h_scm_bind_mem); > spapr_register_hypercall(H_SCM_UNBIND_MEM, h_scm_unbind_mem); > spapr_register_hypercall(H_SCM_UNBIND_ALL, h_scm_unbind_all); > + spapr_register_hypercall(H_SCM_HEALTH, h_scm_health); > } > =20 > type_init(spapr_scm_register_types) > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 47cebaf3ac..6e1eafb05d 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -538,8 +538,9 @@ struct SpaprMachineState { > #define H_SCM_BIND_MEM 0x3EC > #define H_SCM_UNBIND_MEM 0x3F0 > #define H_SCM_UNBIND_ALL 0x3FC > +#define H_SCM_HEALTH 0x400 > =20 > -#define MAX_HCALL_OPCODE H_SCM_UNBIND_ALL > +#define MAX_HCALL_OPCODE H_SCM_HEALTH > =20 > /* The hcalls above are standardized in PAPR and implemented by pHyp > * as well. --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --vllbt3Jqk6rt+UYs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmBucW8ACgkQbDjKyiDZ s5LB2Q//UmqKPYnV8TvyJ5l4Cwqwlh+ov9YxeJUNnyqCYhwX8SWpx8xWvcMPhBbK hjeArKMjBFtsarNgTivi0D7BdNEkh41fTcllZjq9I2rItciXbjh8bh6E8aYvCcyS nYYVjEqidDaIuRcqsXDC75ZvPD42vtfI22ES60Ma3A4BZfop79G9hnkQhD52Wpcp tE6jvmXQ0kGLD+hjV5TcNTKeJoF45PBCrrwWqNfnwTsjUT7Hv7e9+b25fet8FVnE qYLsP6ogtVpjJbYJx3Z8wUY+btGyCyYJoM9SQT41JkcMpkF+JiWHZby85ISi9qoN lKM+HuFy8lCTR49yJAMJzdyu6g95F0jz7k0GJldX/1i8Fy6aLPwQRp0y/5eiCb+8 I99QLvSZsjxnPkkfMHRhzd8leaAW+xWsOgs9F5ahfYk/MVlls//4I43MECgukXGb SfzQGpvd8yLCER4dmegZpTl/FL/9PsThRuD2HA463+oTLot/ELUyd5nBMTKcG4rf Oo+Q58p4hjESoa82Unz8Zg1NV6alKoxjO1BKtb6/V+2preWZ5WbipsZms4XTs5EY 1tMkeHEZl3o/gGvU0L753y92F62e2XQj9Iv52J8Ph2HbuVBr7tjBmo3LNfuuHyAs RiZTCfY2eM9WegeL1Bksyd0DLp74tM+z1ZdImDZtINT0Bjcjpyo= =Ea03 -----END PGP SIGNATURE----- --vllbt3Jqk6rt+UYs--