From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F4EBC433E7 for ; Mon, 12 Oct 2020 12:54:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D66DD21BE5 for ; Mon, 12 Oct 2020 12:54:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Qe77R6En" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D66DD21BE5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5B49E940009; Mon, 12 Oct 2020 08:54:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 58BBB900002; Mon, 12 Oct 2020 08:54:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C902940009; Mon, 12 Oct 2020 08:54:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0092.hostedemail.com [216.40.44.92]) by kanga.kvack.org (Postfix) with ESMTP id 2247D900002 for ; Mon, 12 Oct 2020 08:54:14 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B6DF0180AD817 for ; Mon, 12 Oct 2020 12:54:13 +0000 (UTC) X-FDA: 77363266386.05.frogs02_0d03879271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 9C42E18001C15 for ; Mon, 12 Oct 2020 12:54:13 +0000 (UTC) X-HE-Tag: frogs02_0d03879271fa X-Filterd-Recvd-Size: 3364 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 12:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602507252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GQSN1K5g95DC9GPkuy2aYWb/TZKagXTQDHHDwbyQIac=; b=Qe77R6EnIy9z/FLmaY6/Da86Xjk6oTRs782VQ99dIMZl/wAwbCnjDHciTM1Dv0U+K+Mjsj yq8dyRun6jgOkEzC2GoF6dg3yCC/WaeJhzh2tsDR7ouoxvtUmmlO9M/8tTWc9V/bUSBvQI 2GhKEa/vXZyqby2fXaNeRMqO8CgGSpo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-XCpsU2AHO8uyoDpfRyDN_g-1; Mon, 12 Oct 2020 08:54:07 -0400 X-MC-Unique: XCpsU2AHO8uyoDpfRyDN_g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6EB81018F7F; Mon, 12 Oct 2020 12:54:05 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-251.ams2.redhat.com [10.36.113.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 040AF672C0; Mon, 12 Oct 2020 12:53:53 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtualization@lists.linux-foundation.org, Andrew Morton , "Michael S . Tsirkin" , David Hildenbrand , Jason Wang , Pankaj Gupta Subject: [PATCH v1 02/29] virtio-mem: simplify calculation in virtio_mem_mb_state_prepare_next_mb() Date: Mon, 12 Oct 2020 14:52:56 +0200 Message-Id: <20201012125323.17509-3-david@redhat.com> In-Reply-To: <20201012125323.17509-1-david@redhat.com> References: <20201012125323.17509-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: We actually need one byte less (next_mb_id is exclusive, first_mb_id is inclusive). Simplify. Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index a1f5bf7a571a..670b3faf412d 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -257,8 +257,8 @@ static enum virtio_mem_mb_state virtio_mem_mb_get_sta= te(struct virtio_mem *vm, */ static int virtio_mem_mb_state_prepare_next_mb(struct virtio_mem *vm) { - unsigned long old_bytes =3D vm->next_mb_id - vm->first_mb_id + 1; - unsigned long new_bytes =3D vm->next_mb_id - vm->first_mb_id + 2; + unsigned long old_bytes =3D vm->next_mb_id - vm->first_mb_id; + unsigned long new_bytes =3D old_bytes + 1; int old_pages =3D PFN_UP(old_bytes); int new_pages =3D PFN_UP(new_bytes); uint8_t *new_mb_state; --=20 2.26.2