From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aM4Mr-0001Jq-6e for qemu-devel@nongnu.org; Wed, 20 Jan 2016 20:48:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aM4Mn-0008Ig-0I for qemu-devel@nongnu.org; Wed, 20 Jan 2016 20:48:57 -0500 Received: from mail-pf0-x22e.google.com ([2607:f8b0:400e:c00::22e]:35732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aM4Mm-0008I6-Q0 for qemu-devel@nongnu.org; Wed, 20 Jan 2016 20:48:52 -0500 Received: by mail-pf0-x22e.google.com with SMTP id 65so14219650pff.2 for ; Wed, 20 Jan 2016 17:48:52 -0800 (PST) References: <1453340463-7654-1-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <56A038FE.4060700@ozlabs.ru> Date: Thu, 21 Jan 2016 12:48:46 +1100 MIME-Version: 1.0 In-Reply-To: <1453340463-7654-1-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] pseries: Allow TCG h_enter to work with hotplugged memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , bharata@linux.vnet.ibm.com, pbonzini@redhat.com Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 01/21/2016 12:41 PM, David Gibson wrote: > The implementation of the H_ENTER hypercall for PAPR guests needs to > enforce correct access attributes on the inserted HPTE. This means > determining if the HPTE's real address is a regular RAM address (which > requires attributes for coherent access) or an IO address (which requires > attributes for cache-inhibited access). > > At the moment this check is implemented with (raddr < machine->ram_size), > but that only handles addresses in the base RAM area, not any hotplugged > RAM. > > This patch corrects the problem with a new helper. > > Signed-off-by: David Gibson Reviewed-by: Alexey Kardashevskiy > --- > hw/ppc/spapr_hcall.c | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index cebceea..ea33bc7 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -84,10 +84,25 @@ static inline bool valid_pte_index(CPUPPCState *env, target_ulong pte_index) > return true; > } > > +static bool is_ram_address(sPAPRMachineState *spapr, hwaddr addr) > +{ > + MachineState *machine = MACHINE(spapr); > + MemoryHotplugState *hpms = &spapr->hotplug_memory; > + > + if (addr < machine->ram_size) { > + return true; > + } > + if ((addr >= hpms->base) > + && ((addr - hpms->base) < memory_region_size(&hpms->mr))) { > + return true; > + } > + > + return false; > +} > + > static target_ulong h_enter(PowerPCCPU *cpu, sPAPRMachineState *spapr, > target_ulong opcode, target_ulong *args) > { > - MachineState *machine = MACHINE(spapr); > CPUPPCState *env = &cpu->env; > target_ulong flags = args[0]; > target_ulong pte_index = args[1]; > @@ -119,7 +134,7 @@ static target_ulong h_enter(PowerPCCPU *cpu, sPAPRMachineState *spapr, > > raddr = (ptel & HPTE64_R_RPN) & ~((1ULL << page_shift) - 1); > > - if (raddr < machine->ram_size) { > + if (is_ram_address(spapr, raddr)) { > /* Regular RAM - should have WIMG=0010 */ > if ((ptel & HPTE64_R_WIMG) != HPTE64_R_M) { > return H_PARAMETER; > -- Alexey