From nobody Sat Feb 7 15:10:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556596243; cv=none; d=zoho.com; s=zohoarc; b=I5nMErNTMX1r2PrBpKZjtUA10qzeQmJRXjmKL3o93VrE/VVw2/IMh76H8UeXmKdipax9KNm+r94rFUcecE6YHoRUj4mmtP/fdAaQuSZugGKhEkoCOSRdTJ3q3UdXJUodunxc0/dyUZ5v8+sQqf6mqGGkCgHhZCtd9HOkGEwkZtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556596243; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+6vGT/GZPSZX3X5usw+hxFV4hRt8obXJtPYVlui/BN0=; b=Covz6FzCzppKCChjAgj4WmQrylAt3MJ4zHkUCJMBIaFCSECk5ULjwKL3O+WAhEHhswdP6d7QR+Wo0mDKFCVewbMpMADVJQePVaLUY1ryQbkobNkXKNfMPYCivXbKfEoRcvmzte74BEOneYQphrimo/bDm0BYMohU5AZU9sSRHD0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556596243622284.99780083136955; Mon, 29 Apr 2019 20:50:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:38634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLJmw-0007eG-Lg for importer@patchew.org; Mon, 29 Apr 2019 23:50:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLJj9-0005XH-22 for qemu-devel@nongnu.org; Mon, 29 Apr 2019 23:46:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLJj7-000352-6N for qemu-devel@nongnu.org; Mon, 29 Apr 2019 23:46:43 -0400 Received: from mga12.intel.com ([192.55.52.136]:44784) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLJj5-00032B-AZ for qemu-devel@nongnu.org; Mon, 29 Apr 2019 23:46:39 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 20:46:34 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by FMSMGA003.fm.intel.com with ESMTP; 29 Apr 2019 20:46:33 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,412,1549958400"; d="scan'208";a="153455310" From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 30 Apr 2019 11:44:12 +0800 Message-Id: <20190430034412.12935-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190430034412.12935-1-richardw.yang@linux.intel.com> References: <20190430034412.12935-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.136 Subject: [Qemu-devel] [PATCH 3/3] ram: RAMBlock->offset is always aligned to a word X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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(RAMBlo= ck *rb, uint64_t *real_dirty_pages) { ram_addr_t addr; - unsigned long word =3D BIT_WORD(rb->offset >> TARGET_PAGE_BITS); uint64_t num_dirty =3D 0; unsigned long *dest =3D rb->bmap; =20 - /* offset and length is aligned at the start of a word? */ - if (((word * BITS_PER_LONG) << TARGET_PAGE_BITS) =3D=3D (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 =3D BITS_TO_LONGS(length >> TARGET_PAGE_BITS); unsigned long * const *src; - unsigned long idx =3D (word * BITS_PER_LONG) / DIRTY_MEMORY_BLOCK_= SIZE; - unsigned long offset =3D BIT_WORD((word * BITS_PER_LONG) % + unsigned long idx =3D (rb->offset >> TARGET_PAGE_BITS) / + DIRTY_MEMORY_BLOCK_SIZE; + unsigned long offset =3D BIT_WORD((rb->offset >> TARGET_PAGE_BITS)= % DIRTY_MEMORY_BLOCK_SIZE); =20 rcu_read_lock(); --=20 2.19.1