From: Wei Yang <richardw.yang@linux.intel.com> To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, quintela@redhat.com, dgilbert@redhat.com, Wei Yang <richardw.yang@linux.intel.com> Subject: [Qemu-devel] [PATCH 3/3] ram: RAMBlock->offset is always aligned to a word Date: Tue, 30 Apr 2019 11:44:12 +0800 [thread overview] Message-ID: <20190430034412.12935-4-richardw.yang@linux.intel.com> (raw) In-Reply-To: <20190430034412.12935-1-richardw.yang@linux.intel.com> RAMBlock->offset is calculated by find_ram_offset, which makes sure the offset is aligned to a word. This patch removes the alignment check on offset and unnecessary variable *word*. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- include/exec/ram_addr.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3dfb2d52fb..a7c81bdb32 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -413,18 +413,21 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb, uint64_t *real_dirty_pages) { ram_addr_t addr; - unsigned long word = BIT_WORD(rb->offset >> TARGET_PAGE_BITS); uint64_t num_dirty = 0; unsigned long *dest = rb->bmap; - /* offset and length is aligned at the start of a word? */ - if (((word * BITS_PER_LONG) << TARGET_PAGE_BITS) == (rb->offset) && - !(length & ((BITS_PER_LONG << TARGET_PAGE_BITS) - 1))) { + /* + * Since RAMBlock->offset is guaranteed to be aligned to a word by + * find_ram_offset(), if length is aligned at the start of a word, go the + * fast path. + */ + if (!(length & ((BITS_PER_LONG << TARGET_PAGE_BITS) - 1))) { int k; int nr = BITS_TO_LONGS(length >> TARGET_PAGE_BITS); unsigned long * const *src; - unsigned long idx = (word * BITS_PER_LONG) / DIRTY_MEMORY_BLOCK_SIZE; - unsigned long offset = BIT_WORD((word * BITS_PER_LONG) % + unsigned long idx = (rb->offset >> TARGET_PAGE_BITS) / + DIRTY_MEMORY_BLOCK_SIZE; + unsigned long offset = BIT_WORD((rb->offset >> TARGET_PAGE_BITS) % DIRTY_MEMORY_BLOCK_SIZE); rcu_read_lock(); -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Wei Yang <richardw.yang@linux.intel.com> To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Wei Yang <richardw.yang@linux.intel.com>, dgilbert@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 3/3] ram: RAMBlock->offset is always aligned to a word Date: Tue, 30 Apr 2019 11:44:12 +0800 [thread overview] Message-ID: <20190430034412.12935-4-richardw.yang@linux.intel.com> (raw) Message-ID: <20190430034412.sI2P0Ov4Tupq6kV30zytGPP8uTek6mfaGhfbS-02KA4@z> (raw) In-Reply-To: <20190430034412.12935-1-richardw.yang@linux.intel.com> RAMBlock->offset is calculated by find_ram_offset, which makes sure the offset is aligned to a word. This patch removes the alignment check on offset and unnecessary variable *word*. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- include/exec/ram_addr.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3dfb2d52fb..a7c81bdb32 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -413,18 +413,21 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb, uint64_t *real_dirty_pages) { ram_addr_t addr; - unsigned long word = BIT_WORD(rb->offset >> TARGET_PAGE_BITS); uint64_t num_dirty = 0; unsigned long *dest = rb->bmap; - /* offset and length is aligned at the start of a word? */ - if (((word * BITS_PER_LONG) << TARGET_PAGE_BITS) == (rb->offset) && - !(length & ((BITS_PER_LONG << TARGET_PAGE_BITS) - 1))) { + /* + * Since RAMBlock->offset is guaranteed to be aligned to a word by + * find_ram_offset(), if length is aligned at the start of a word, go the + * fast path. + */ + if (!(length & ((BITS_PER_LONG << TARGET_PAGE_BITS) - 1))) { int k; int nr = BITS_TO_LONGS(length >> TARGET_PAGE_BITS); unsigned long * const *src; - unsigned long idx = (word * BITS_PER_LONG) / DIRTY_MEMORY_BLOCK_SIZE; - unsigned long offset = BIT_WORD((word * BITS_PER_LONG) % + unsigned long idx = (rb->offset >> TARGET_PAGE_BITS) / + DIRTY_MEMORY_BLOCK_SIZE; + unsigned long offset = BIT_WORD((rb->offset >> TARGET_PAGE_BITS) % DIRTY_MEMORY_BLOCK_SIZE); rcu_read_lock(); -- 2.19.1
next prev parent reply other threads:[~2019-04-30 3:46 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-30 3:44 [Qemu-devel] [PATCH 0/3] Cleanup migration/ram.c Wei Yang 2019-04-30 3:44 ` Wei Yang 2019-04-30 3:44 ` [Qemu-devel] [PATCH 1/3] migration/ram.c: start of migration_bitmap_sync_range is always 0 Wei Yang 2019-04-30 3:44 ` Wei Yang 2019-05-14 14:15 ` Dr. David Alan Gilbert 2019-05-14 14:27 ` Dr. David Alan Gilbert 2019-05-15 6:41 ` Wei Yang 2019-05-15 8:04 ` Dr. David Alan Gilbert 2019-05-15 8:54 ` Wei Yang 2019-04-30 3:44 ` [Qemu-devel] [PATCH 2/3] migration/ram.c: start of cpu_physical_memory_sync_dirty_bitmap " Wei Yang 2019-04-30 3:44 ` Wei Yang 2019-05-14 14:21 ` Dr. David Alan Gilbert 2019-05-31 0:54 ` Wei Yang 2019-06-21 7:43 ` Wei Yang 2019-07-17 1:13 ` Wei Yang 2019-07-17 9:16 ` Paolo Bonzini 2019-07-18 1:07 ` Wei Yang 2019-04-30 3:44 ` Wei Yang [this message] 2019-04-30 3:44 ` [Qemu-devel] [PATCH 3/3] ram: RAMBlock->offset is always aligned to a word Wei Yang 2019-07-17 9:17 ` Paolo Bonzini 2019-07-18 1:11 ` Wei Yang 2019-05-01 22:53 ` [Qemu-devel] [PATCH 0/3] Cleanup migration/ram.c no-reply 2019-05-01 22:53 ` no-reply 2019-05-02 0:10 ` Wei Yang 2019-05-02 0:10 ` Wei Yang 2019-05-02 4:24 ` no-reply 2019-05-02 4:24 ` no-reply 2019-05-02 5:32 ` Wei Yang 2019-05-02 5:32 ` Wei Yang 2019-05-02 8:35 ` Dr. David Alan Gilbert 2019-05-02 8:35 ` Dr. David Alan Gilbert 2019-05-02 22:34 ` Wei Yang 2019-05-02 22:34 ` Wei Yang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190430034412.12935-4-richardw.yang@linux.intel.com \ --to=richardw.yang@linux.intel.com \ --cc=dgilbert@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=quintela@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.