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 9B980C433E7 for ; Mon, 12 Oct 2020 12:56:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 23CAF21D7F for ; Mon, 12 Oct 2020 12:56:39 +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="DP5GQz2F" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23CAF21D7F 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 AB83C940008; Mon, 12 Oct 2020 08:56:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A8E4A900002; Mon, 12 Oct 2020 08:56:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92EF0940008; Mon, 12 Oct 2020 08:56:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0107.hostedemail.com [216.40.44.107]) by kanga.kvack.org (Postfix) with ESMTP id 63C4C900002 for ; Mon, 12 Oct 2020 08:56:38 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id E9C791EE6 for ; Mon, 12 Oct 2020 12:56:37 +0000 (UTC) X-FDA: 77363272434.08.sheet67_560474d271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id C38701819E769 for ; Mon, 12 Oct 2020 12:56:37 +0000 (UTC) X-HE-Tag: sheet67_560474d271fa X-Filterd-Recvd-Size: 8300 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 12:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602507396; 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=Bn9fCb6fZ4KA6uOiGes/b5bfUtnB7n7KXeu5adGa1hM=; b=DP5GQz2FIR03joJTcks7YwloEZbV+wXOSOyRKfvTx4Q0Ew+h6bei6OsSdE0x9z3plufyx7 UOSaFHGMptkEQ5/sU94YN3rJKIXlatAGuiBkIFDUWkYxLOhk7FSKKX3DWUs/chCxLRW0aV s1wWAmnrOPzRiKFr6OompfqQKUKdAEY= 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-56-jNoDXg7wOOSswd3UsbdfqA-1; Mon, 12 Oct 2020 08:56:34 -0400 X-MC-Unique: jNoDXg7wOOSswd3UsbdfqA-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 441D510074D9; Mon, 12 Oct 2020 12:56:33 +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 854A660C13; Mon, 12 Oct 2020 12:56:24 +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 22/29] virtio-mem: memory block ids are specific to Sub Block Mode (SBM) Date: Mon, 12 Oct 2020 14:53:16 +0200 Message-Id: <20201012125323.17509-23-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: Let's move first_mb_id/next_mb_id/last_usable_mb_id accordingly. Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 44 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index d06c8760b337..d3ab04f655ee 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -96,13 +96,6 @@ struct virtio_mem { /* Maximum region size in bytes. */ uint64_t region_size; =20 - /* Id of the first memory block of this device. */ - unsigned long first_mb_id; - /* Id of the last usable memory block of this device. */ - unsigned long last_usable_mb_id; - /* Id of the next memory bock to prepare when needed. */ - unsigned long next_mb_id; - /* The parent resource for all memory added via this device. */ struct resource *parent_resource; /* @@ -121,6 +114,13 @@ struct virtio_mem { uint64_t offline_threshold; =20 struct { + /* Id of the first memory block of this device. */ + unsigned long first_mb_id; + /* Id of the last usable memory block of this device. */ + unsigned long last_usable_mb_id; + /* Id of the next memory bock to prepare when needed. */ + unsigned long next_mb_id; + /* The subblock size. */ uint64_t sb_size; /* The number of subblocks per Linux memory block. */ @@ -265,7 +265,7 @@ static unsigned long virtio_mem_phys_to_sb_id(struct = virtio_mem *vm, static void virtio_mem_sbm_set_mb_state(struct virtio_mem *vm, unsigned long mb_id, uint8_t state) { - const unsigned long idx =3D mb_id - vm->first_mb_id; + const unsigned long idx =3D mb_id - vm->sbm.first_mb_id; uint8_t old_state; =20 old_state =3D vm->sbm.mb_states[idx]; @@ -282,7 +282,7 @@ static void virtio_mem_sbm_set_mb_state(struct virtio= _mem *vm, static uint8_t virtio_mem_sbm_get_mb_state(struct virtio_mem *vm, unsigned long mb_id) { - const unsigned long idx =3D mb_id - vm->first_mb_id; + const unsigned long idx =3D mb_id - vm->sbm.first_mb_id; =20 return vm->sbm.mb_states[idx]; } @@ -292,7 +292,7 @@ static uint8_t virtio_mem_sbm_get_mb_state(struct vir= tio_mem *vm, */ static int virtio_mem_sbm_mb_states_prepare_next_mb(struct virtio_mem *v= m) { - unsigned long old_bytes =3D vm->next_mb_id - vm->first_mb_id; + unsigned long old_bytes =3D vm->sbm.next_mb_id - vm->sbm.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); @@ -316,14 +316,14 @@ static int virtio_mem_sbm_mb_states_prepare_next_mb= (struct virtio_mem *vm) } =20 #define virtio_mem_sbm_for_each_mb(_vm, _mb_id, _state) \ - for (_mb_id =3D _vm->first_mb_id; \ - _mb_id < _vm->next_mb_id && _vm->sbm.mb_count[_state]; \ + for (_mb_id =3D _vm->sbm.first_mb_id; \ + _mb_id < _vm->sbm.next_mb_id && _vm->sbm.mb_count[_state]; \ _mb_id++) \ if (virtio_mem_sbm_get_mb_state(_vm, _mb_id) =3D=3D _state) =20 #define virtio_mem_sbm_for_each_mb_rev(_vm, _mb_id, _state) \ - for (_mb_id =3D _vm->next_mb_id - 1; \ - _mb_id >=3D _vm->first_mb_id && _vm->sbm.mb_count[_state]; \ + for (_mb_id =3D _vm->sbm.next_mb_id - 1; \ + _mb_id >=3D _vm->sbm.first_mb_id && _vm->sbm.mb_count[_state]; \ _mb_id--) \ if (virtio_mem_sbm_get_mb_state(_vm, _mb_id) =3D=3D _state) =20 @@ -334,7 +334,7 @@ static int virtio_mem_sbm_mb_states_prepare_next_mb(s= truct virtio_mem *vm) static int virtio_mem_sbm_sb_state_bit_nr(struct virtio_mem *vm, unsigned long mb_id, int sb_id) { - return (mb_id - vm->first_mb_id) * vm->sbm.sbs_per_mb + sb_id; + return (mb_id - vm->sbm.first_mb_id) * vm->sbm.sbs_per_mb + sb_id; } =20 /* @@ -414,7 +414,7 @@ static int virtio_mem_sbm_first_unplugged_sb(struct v= irtio_mem *vm, */ static int virtio_mem_sbm_sb_states_prepare_next_mb(struct virtio_mem *v= m) { - const unsigned long old_nb_mb =3D vm->next_mb_id - vm->first_mb_id; + const unsigned long old_nb_mb =3D vm->sbm.next_mb_id - vm->sbm.first_mb= _id; const unsigned long old_nb_bits =3D old_nb_mb * vm->sbm.sbs_per_mb; const unsigned long new_nb_bits =3D (old_nb_mb + 1) * vm->sbm.sbs_per_m= b; int old_pages =3D PFN_UP(BITS_TO_LONGS(old_nb_bits) * sizeof(long)); @@ -1177,7 +1177,7 @@ static int virtio_mem_sbm_prepare_next_mb(struct vi= rtio_mem *vm, { int rc; =20 - if (vm->next_mb_id > vm->last_usable_mb_id) + if (vm->sbm.next_mb_id > vm->sbm.last_usable_mb_id) return -ENOSPC; =20 /* Resize the state array if required. */ @@ -1191,7 +1191,7 @@ static int virtio_mem_sbm_prepare_next_mb(struct vi= rtio_mem *vm, return rc; =20 vm->sbm.mb_count[VIRTIO_MEM_SBM_MB_UNUSED]++; - *mb_id =3D vm->next_mb_id++; + *mb_id =3D vm->sbm.next_mb_id++; return 0; } =20 @@ -1622,7 +1622,7 @@ static void virtio_mem_refresh_config(struct virtio= _mem *vm) usable_region_size, &usable_region_size); end_addr =3D vm->addr + usable_region_size; end_addr =3D min(end_addr, phys_limit); - vm->last_usable_mb_id =3D virtio_mem_phys_to_mb_id(end_addr) - 1; + vm->sbm.last_usable_mb_id =3D virtio_mem_phys_to_mb_id(end_addr) - 1; =20 /* see if there is a request to change the size */ virtio_cread_le(vm->vdev, struct virtio_mem_config, requested_size, @@ -1813,9 +1813,9 @@ static int virtio_mem_init(struct virtio_mem *vm) vm->sbm.sbs_per_mb =3D memory_block_size_bytes() / vm->sbm.sb_size; =20 /* Round up to the next full memory block */ - vm->first_mb_id =3D virtio_mem_phys_to_mb_id(vm->addr - 1 + - memory_block_size_bytes()); - vm->next_mb_id =3D vm->first_mb_id; + vm->sbm.first_mb_id =3D virtio_mem_phys_to_mb_id(vm->addr - 1 + + memory_block_size_bytes()); + vm->sbm.next_mb_id =3D vm->sbm.first_mb_id; =20 /* Prepare the offline threshold - make sure we can add two blocks. */ vm->offline_threshold =3D max_t(uint64_t, 2 * memory_block_size_bytes()= , --=20 2.26.2