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 5552BC43457 for ; Mon, 12 Oct 2020 12:56:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C3B2521BE5 for ; Mon, 12 Oct 2020 12:56:15 +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="hI0K3SGi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3B2521BE5 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 5D75A94000D; Mon, 12 Oct 2020 08:56:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 586CD940007; Mon, 12 Oct 2020 08:56:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4747C94000D; Mon, 12 Oct 2020 08:56:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0113.hostedemail.com [216.40.44.113]) by kanga.kvack.org (Postfix) with ESMTP id 1758D940007 for ; Mon, 12 Oct 2020 08:56:15 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id BAE0F3622 for ; Mon, 12 Oct 2020 12:56:14 +0000 (UTC) X-FDA: 77363271468.13.salt50_3e0103d271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 8DF9818140B74 for ; Mon, 12 Oct 2020 12:56:14 +0000 (UTC) X-HE-Tag: salt50_3e0103d271fa X-Filterd-Recvd-Size: 15247 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 12:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602507373; 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=O4bvkUxyyKzISGghN4M2iQ9MP3vmYfGeztwF7KWUS3c=; b=hI0K3SGii+hfMx/c+0e6yVPTn1A5tj5jABSU0Pv/Phg6DdYsy0zTcOB48a40ZdA7Q+DMLX hFWUCv7yXxbSfPAe4LYVm6LtGX8fZdvbYnua2TCE07GspinWx1/upX0UAenSA0HHmm6HfY bWzW0AyygEIwZY+oFpXNBKZuBhr5yj0= 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-580-33XV-UWMNZG0T9QX1F77UQ-1; Mon, 12 Oct 2020 08:56:12 -0400 X-MC-Unique: 33XV-UWMNZG0T9QX1F77UQ-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 B5B67835B49; Mon, 12 Oct 2020 12:56:10 +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 87CF660C07; Mon, 12 Oct 2020 12:56:03 +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 20/29] virtio-mem: nb_sb_per_mb and subblock_size are specific to Sub Block Mode (SBM) Date: Mon, 12 Oct 2020 14:53:14 +0200 Message-Id: <20201012125323.17509-21-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 rename to "sbs_per_mb" and "sb_size" and move accordingly. Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 96 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index fc2b1ff3beed..3a772714fec9 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -96,11 +96,6 @@ struct virtio_mem { /* Maximum region size in bytes. */ uint64_t region_size; =20 - /* The subblock size. */ - uint64_t subblock_size; - /* The number of subblocks per memory block. */ - uint32_t nb_sb_per_mb; - /* Id of the first memory block of this device. */ unsigned long first_mb_id; /* Id of the last usable memory block of this device. */ @@ -126,6 +121,11 @@ struct virtio_mem { uint64_t offline_threshold; =20 struct { + /* The subblock size. */ + uint64_t sb_size; + /* The number of subblocks per Linux memory block. */ + uint32_t sbs_per_mb; + /* Summary of all memory block states. */ unsigned long mb_count[VIRTIO_MEM_SBM_MB_COUNT]; =20 @@ -256,7 +256,7 @@ static unsigned long virtio_mem_phys_to_sb_id(struct = virtio_mem *vm, const unsigned long mb_id =3D virtio_mem_phys_to_mb_id(addr); const unsigned long mb_addr =3D virtio_mem_mb_id_to_phys(mb_id); =20 - return (addr - mb_addr) / vm->subblock_size; + return (addr - mb_addr) / vm->sbm.sb_size; } =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->nb_sb_per_mb + sb_id; + return (mb_id - vm->first_mb_id) * vm->sbm.sbs_per_mb + sb_id; } =20 /* @@ -397,7 +397,7 @@ static bool virtio_mem_sbm_test_sb_unplugged(struct v= irtio_mem *vm, } =20 /* - * Find the first unplugged subblock. Returns vm->nb_sb_per_mb in case t= here is + * Find the first unplugged subblock. Returns vm->sbm.sbs_per_mb in case= there is * none. */ static int virtio_mem_sbm_first_unplugged_sb(struct virtio_mem *vm, @@ -406,7 +406,7 @@ static int virtio_mem_sbm_first_unplugged_sb(struct v= irtio_mem *vm, const int bit =3D virtio_mem_sbm_sb_state_bit_nr(vm, mb_id, 0); =20 return find_next_zero_bit(vm->sbm.sb_states, - bit + vm->nb_sb_per_mb, bit) - bit; + bit + vm->sbm.sbs_per_mb, bit) - bit; } =20 /* @@ -415,8 +415,8 @@ 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_bits =3D old_nb_mb * vm->nb_sb_per_mb; - const unsigned long new_nb_bits =3D (old_nb_mb + 1) * vm->nb_sb_per_mb; + 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)); int new_pages =3D PFN_UP(BITS_TO_LONGS(new_nb_bits) * sizeof(long)); unsigned long *new_bitmap, *old_bitmap; @@ -642,15 +642,15 @@ static void virtio_mem_notify_online(struct virtio_= mem *vm, unsigned long mb_id) static void virtio_mem_notify_going_offline(struct virtio_mem *vm, unsigned long mb_id) { - const unsigned long nr_pages =3D PFN_DOWN(vm->subblock_size); + const unsigned long nr_pages =3D PFN_DOWN(vm->sbm.sb_size); unsigned long pfn; int sb_id; =20 - for (sb_id =3D 0; sb_id < vm->nb_sb_per_mb; sb_id++) { + for (sb_id =3D 0; sb_id < vm->sbm.sbs_per_mb; sb_id++) { if (virtio_mem_sbm_test_sb_plugged(vm, mb_id, sb_id, 1)) continue; pfn =3D PFN_DOWN(virtio_mem_mb_id_to_phys(mb_id) + - sb_id * vm->subblock_size); + sb_id * vm->sbm.sb_size); virtio_mem_fake_offline_going_offline(pfn, nr_pages); } } @@ -658,15 +658,15 @@ static void virtio_mem_notify_going_offline(struct = virtio_mem *vm, static void virtio_mem_notify_cancel_offline(struct virtio_mem *vm, unsigned long mb_id) { - const unsigned long nr_pages =3D PFN_DOWN(vm->subblock_size); + const unsigned long nr_pages =3D PFN_DOWN(vm->sbm.sb_size); unsigned long pfn; int sb_id; =20 - for (sb_id =3D 0; sb_id < vm->nb_sb_per_mb; sb_id++) { + for (sb_id =3D 0; sb_id < vm->sbm.sbs_per_mb; sb_id++) { if (virtio_mem_sbm_test_sb_plugged(vm, mb_id, sb_id, 1)) continue; pfn =3D PFN_DOWN(virtio_mem_mb_id_to_phys(mb_id) + - sb_id * vm->subblock_size); + sb_id * vm->sbm.sb_size); virtio_mem_fake_offline_cancel_offline(pfn, nr_pages); } } @@ -1079,8 +1079,8 @@ static int virtio_mem_sbm_plug_sb(struct virtio_mem= *vm, unsigned long mb_id, int sb_id, int count) { const uint64_t addr =3D virtio_mem_mb_id_to_phys(mb_id) + - sb_id * vm->subblock_size; - const uint64_t size =3D count * vm->subblock_size; + sb_id * vm->sbm.sb_size; + const uint64_t size =3D count * vm->sbm.sb_size; int rc; =20 dev_dbg(&vm->vdev->dev, "plugging memory block: %lu : %i - %i\n", mb_id= , @@ -1100,8 +1100,8 @@ static int virtio_mem_sbm_unplug_sb(struct virtio_m= em *vm, unsigned long mb_id, int sb_id, int count) { const uint64_t addr =3D virtio_mem_mb_id_to_phys(mb_id) + - sb_id * vm->subblock_size; - const uint64_t size =3D count * vm->subblock_size; + sb_id * vm->sbm.sb_size; + const uint64_t size =3D count * vm->sbm.sb_size; int rc; =20 dev_dbg(&vm->vdev->dev, "unplugging memory block: %lu : %i - %i\n", @@ -1128,7 +1128,7 @@ static int virtio_mem_sbm_unplug_any_sb(struct virt= io_mem *vm, int sb_id, count; int rc; =20 - sb_id =3D vm->nb_sb_per_mb - 1; + sb_id =3D vm->sbm.sbs_per_mb - 1; while (*nb_sb) { /* Find the next candidate subblock */ while (sb_id >=3D 0 && @@ -1163,7 +1163,7 @@ static int virtio_mem_sbm_unplug_any_sb(struct virt= io_mem *vm, */ static int virtio_mem_sbm_unplug_mb(struct virtio_mem *vm, unsigned long= mb_id) { - uint64_t nb_sb =3D vm->nb_sb_per_mb; + uint64_t nb_sb =3D vm->sbm.sbs_per_mb; =20 return virtio_mem_sbm_unplug_any_sb(vm, mb_id, &nb_sb); } @@ -1203,7 +1203,7 @@ static int virtio_mem_sbm_prepare_next_mb(struct vi= rtio_mem *vm, static int virtio_mem_sbm_plug_and_add_mb(struct virtio_mem *vm, unsigned long mb_id, uint64_t *nb_sb) { - const int count =3D min_t(int, *nb_sb, vm->nb_sb_per_mb); + const int count =3D min_t(int, *nb_sb, vm->sbm.sbs_per_mb); int rc; =20 if (WARN_ON_ONCE(!count)) @@ -1221,7 +1221,7 @@ static int virtio_mem_sbm_plug_and_add_mb(struct vi= rtio_mem *vm, * Mark the block properly offline before adding it to Linux, * so the memory notifiers will find the block in the right state. */ - if (count =3D=3D vm->nb_sb_per_mb) + if (count =3D=3D vm->sbm.sbs_per_mb) virtio_mem_sbm_set_mb_state(vm, mb_id, VIRTIO_MEM_SBM_MB_OFFLINE); else @@ -1271,11 +1271,11 @@ static int virtio_mem_sbm_plug_any_sb(struct virt= io_mem *vm, =20 while (*nb_sb) { sb_id =3D virtio_mem_sbm_first_unplugged_sb(vm, mb_id); - if (sb_id >=3D vm->nb_sb_per_mb) + if (sb_id >=3D vm->sbm.sbs_per_mb) break; count =3D 1; while (count < *nb_sb && - sb_id + count < vm->nb_sb_per_mb && + sb_id + count < vm->sbm.sbs_per_mb && !virtio_mem_sbm_test_sb_plugged(vm, mb_id, sb_id + count, 1)) count++; =20 @@ -1288,12 +1288,12 @@ static int virtio_mem_sbm_plug_any_sb(struct virt= io_mem *vm, =20 /* fake-online the pages if the memory block is online */ pfn =3D PFN_DOWN(virtio_mem_mb_id_to_phys(mb_id) + - sb_id * vm->subblock_size); - nr_pages =3D PFN_DOWN(count * vm->subblock_size); + sb_id * vm->sbm.sb_size); + nr_pages =3D PFN_DOWN(count * vm->sbm.sb_size); virtio_mem_fake_online(pfn, nr_pages); } =20 - if (virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->nb_sb_per_mb)) { + if (virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->sbm.sbs_per_mb)) { if (online) virtio_mem_sbm_set_mb_state(vm, mb_id, VIRTIO_MEM_SBM_MB_ONLINE); @@ -1310,7 +1310,7 @@ static int virtio_mem_sbm_plug_any_sb(struct virtio= _mem *vm, */ static int virtio_mem_plug_request(struct virtio_mem *vm, uint64_t diff) { - uint64_t nb_sb =3D diff / vm->subblock_size; + uint64_t nb_sb =3D diff / vm->sbm.sb_size; unsigned long mb_id; int rc; =20 @@ -1393,13 +1393,13 @@ static int virtio_mem_sbm_unplug_any_sb_offline(s= truct virtio_mem *vm, rc =3D virtio_mem_sbm_unplug_any_sb(vm, mb_id, nb_sb); =20 /* some subblocks might have been unplugged even on failure */ - if (!virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->nb_sb_per_mb)) + if (!virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->sbm.sbs_per_mb)) virtio_mem_sbm_set_mb_state(vm, mb_id, VIRTIO_MEM_SBM_MB_OFFLINE_PARTIAL); if (rc) return rc; =20 - if (virtio_mem_sbm_test_sb_unplugged(vm, mb_id, 0, vm->nb_sb_per_mb)) { + if (virtio_mem_sbm_test_sb_unplugged(vm, mb_id, 0, vm->sbm.sbs_per_mb))= { /* * Remove the block from Linux - this should never fail. * Hinder the block from getting onlined by marking it @@ -1426,12 +1426,12 @@ static int virtio_mem_sbm_unplug_sb_online(struct= virtio_mem *vm, unsigned long mb_id, int sb_id, int count) { - const unsigned long nr_pages =3D PFN_DOWN(vm->subblock_size) * count; + const unsigned long nr_pages =3D PFN_DOWN(vm->sbm.sb_size) * count; unsigned long start_pfn; int rc; =20 start_pfn =3D PFN_DOWN(virtio_mem_mb_id_to_phys(mb_id) + - sb_id * vm->subblock_size); + sb_id * vm->sbm.sb_size); =20 rc =3D virtio_mem_fake_offline(start_pfn, nr_pages); if (rc) @@ -1467,19 +1467,19 @@ static int virtio_mem_sbm_unplug_any_sb_online(st= ruct virtio_mem *vm, int rc, sb_id; =20 /* If possible, try to unplug the complete block in one shot. */ - if (*nb_sb >=3D vm->nb_sb_per_mb && - virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->nb_sb_per_mb)) { + if (*nb_sb >=3D vm->sbm.sbs_per_mb && + virtio_mem_sbm_test_sb_plugged(vm, mb_id, 0, vm->sbm.sbs_per_mb)) { rc =3D virtio_mem_sbm_unplug_sb_online(vm, mb_id, 0, - vm->nb_sb_per_mb); + vm->sbm.sbs_per_mb); if (!rc) { - *nb_sb -=3D vm->nb_sb_per_mb; + *nb_sb -=3D vm->sbm.sbs_per_mb; goto unplugged; } else if (rc !=3D -EBUSY) return rc; } =20 /* Fallback to single subblocks. */ - for (sb_id =3D vm->nb_sb_per_mb - 1; sb_id >=3D 0 && *nb_sb; sb_id--) { + for (sb_id =3D vm->sbm.sbs_per_mb - 1; sb_id >=3D 0 && *nb_sb; sb_id--)= { /* Find the next candidate subblock */ while (sb_id >=3D 0 && !virtio_mem_sbm_test_sb_plugged(vm, mb_id, sb_id, 1)) @@ -1501,7 +1501,7 @@ static int virtio_mem_sbm_unplug_any_sb_online(stru= ct virtio_mem *vm, * remove it. This will usually not fail, as no memory is in use * anymore - however some other notifiers might NACK the request. */ - if (virtio_mem_sbm_test_sb_unplugged(vm, mb_id, 0, vm->nb_sb_per_mb)) { + if (virtio_mem_sbm_test_sb_unplugged(vm, mb_id, 0, vm->sbm.sbs_per_mb))= { mutex_unlock(&vm->hotplug_mutex); rc =3D virtio_mem_mb_offline_and_remove(vm, mb_id); mutex_lock(&vm->hotplug_mutex); @@ -1518,7 +1518,7 @@ static int virtio_mem_sbm_unplug_any_sb_online(stru= ct virtio_mem *vm, */ static int virtio_mem_unplug_request(struct virtio_mem *vm, uint64_t dif= f) { - uint64_t nb_sb =3D diff / vm->subblock_size; + uint64_t nb_sb =3D diff / vm->sbm.sb_size; unsigned long mb_id; int rc; =20 @@ -1805,11 +1805,11 @@ static int virtio_mem_init(struct virtio_mem *vm) * - Is required for now for alloc_contig_range() to work reliably - * it doesn't properly handle smaller granularity on ZONE_NORMAL. */ - vm->subblock_size =3D max_t(uint64_t, MAX_ORDER_NR_PAGES, - pageblock_nr_pages) * PAGE_SIZE; - vm->subblock_size =3D max_t(uint64_t, vm->device_block_size, - vm->subblock_size); - vm->nb_sb_per_mb =3D memory_block_size_bytes() / vm->subblock_size; + vm->sbm.sb_size =3D max_t(uint64_t, MAX_ORDER_NR_PAGES, + pageblock_nr_pages) * PAGE_SIZE; + vm->sbm.sb_size =3D max_t(uint64_t, vm->device_block_size, + vm->sbm.sb_size); + 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 + @@ -1827,7 +1827,7 @@ static int virtio_mem_init(struct virtio_mem *vm) dev_info(&vm->vdev->dev, "memory block size: 0x%lx", memory_block_size_bytes()); dev_info(&vm->vdev->dev, "subblock size: 0x%llx", - (unsigned long long)vm->subblock_size); + (unsigned long long)vm->sbm.sb_size); if (vm->nid !=3D NUMA_NO_NODE && IS_ENABLED(CONFIG_NUMA)) dev_info(&vm->vdev->dev, "nid: %d", vm->nid); =20 --=20 2.26.2