From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXZJW-0006Pu-Ax for qemu-devel@nongnu.org; Mon, 05 Dec 2011 09:14:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXZJN-0007we-4V for qemu-devel@nongnu.org; Mon, 05 Dec 2011 09:14:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXZJM-0007wW-Lf for qemu-devel@nongnu.org; Mon, 05 Dec 2011 09:14:29 -0500 Message-ID: <4EDCD1BC.7060109@redhat.com> Date: Mon, 05 Dec 2011 16:14:20 +0200 From: Avi Kivity MIME-Version: 1.0 References: <1323082897-15249-1-git-send-email-peter.maydell@linaro.org> <4EDCC9D3.7040800@redhat.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] exec.c: Allow memory region start_addr and region_offset to vary in low bits List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paul Brook , qemu-devel@nongnu.org, patches@linaro.org On 12/05/2011 04:01 PM, Peter Maydell wrote: > On 5 December 2011 13:40, Avi Kivity wrote: > > On 12/05/2011 01:01 PM, Peter Maydell wrote: > >> @@ -2677,7 +2674,11 @@ void cpu_register_physical_memory_log(target_phys_addr_t start_addr, > >> if (phys_offset == IO_MEM_UNASSIGNED) { > >> region_offset = start_addr; > >> } > >> - region_offset &= TARGET_PAGE_MASK; > >> + /* Adjust the region offset to account for the start_addr possibly > >> + * not being page aligned, so we end up passing the IO functions > >> + * the true offset from the start of the region. > >> + */ > >> + region_offset -= (start_addr & ~TARGET_PAGE_MASK); > >> size = (size + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK; > >> end_addr = start_addr + (target_phys_addr_t)size; > >> > > > > region_offset is added to iotlb in tlb_set_page(), smashing the low bits > > with your change. It's safe in subpage, since that doesn't happen there. > > OK, but we only need to avoid trashing the bottom 5 bits, right? All TARGET_PAGE_BITS of them. > So we could do > region_offset -= (start_addr & ~TARGET_PAGE_MASK); > if (size >= TARGET_PAGE_SIZE) { > region_offset &= ~0x1F; /* can make this a #define IO_MEM_MASK */ > } > > which would allow regions to start on 0x20 granularity, or byte granularity > if they're less than a page in size (and so guaranteed to be subpages only). > An alternative is to stash region_offset somewhere else. There's CPUTLBEntry::addend, see comment above its definition. -- error compiling committee.c: too many arguments to function