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 BADABC433DF for ; Mon, 12 Oct 2020 12:56:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 41F2521BE5 for ; Mon, 12 Oct 2020 12:56:31 +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="a+T4jKpp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 41F2521BE5 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 C8B91940007; Mon, 12 Oct 2020 08:56:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3C02900002; Mon, 12 Oct 2020 08:56:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B2B82940007; Mon, 12 Oct 2020 08:56:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0186.hostedemail.com [216.40.44.186]) by kanga.kvack.org (Postfix) with ESMTP id 84350900002 for ; Mon, 12 Oct 2020 08:56:30 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id BFAD31EE6 for ; Mon, 12 Oct 2020 12:56:29 +0000 (UTC) X-FDA: 77363272098.30.bikes35_0910bda271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 96311180B3C85 for ; Mon, 12 Oct 2020 12:56:29 +0000 (UTC) X-HE-Tag: bikes35_0910bda271fa X-Filterd-Recvd-Size: 6229 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 12:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602507388; 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=JHR5D8sA0HIDc7HwQ6f0+KqNbCPLWQmlx+xqVzasTCw=; b=a+T4jKpph8zd/H5cZuof32n2tkc7TyFMdLplc2WBiQNY61wXPCUvzVZJgfF8p0ifKaiia8 vQUmntg1JD8BoOVC3BGfvKHhx5w2HeSihC/o+5N/QJJIX70N5mAq3y/OETMmzAylMyklrO grwjjRqTXye54q60dL8D1p8QU678hpc= 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-589-kASBXn0gPneiWH6X_Z8vZw-1; Mon, 12 Oct 2020 08:56:24 -0400 X-MC-Unique: kASBXn0gPneiWH6X_Z8vZw-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 84831802B6A; Mon, 12 Oct 2020 12:56:23 +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 B622D6198B; Mon, 12 Oct 2020 12:56:11 +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 21/29] virtio-mem: memory notifier callbacks are specific to Sub Block Mode (SBM) Date: Mon, 12 Oct 2020 14:53:15 +0200 Message-Id: <20201012125323.17509-22-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 accordingly. Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 3a772714fec9..d06c8760b337 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -589,8 +589,8 @@ static bool virtio_mem_contains_range(struct virtio_m= em *vm, uint64_t start, return start >=3D vm->addr && start + size <=3D vm->addr + vm->region_s= ize; } =20 -static int virtio_mem_notify_going_online(struct virtio_mem *vm, - unsigned long mb_id) +static int virtio_mem_sbm_notify_going_online(struct virtio_mem *vm, + unsigned long mb_id) { switch (virtio_mem_sbm_get_mb_state(vm, mb_id)) { case VIRTIO_MEM_SBM_MB_OFFLINE_PARTIAL: @@ -604,8 +604,8 @@ static int virtio_mem_notify_going_online(struct virt= io_mem *vm, return NOTIFY_BAD; } =20 -static void virtio_mem_notify_offline(struct virtio_mem *vm, - unsigned long mb_id) +static void virtio_mem_sbm_notify_offline(struct virtio_mem *vm, + unsigned long mb_id) { switch (virtio_mem_sbm_get_mb_state(vm, mb_id)) { case VIRTIO_MEM_SBM_MB_ONLINE_PARTIAL: @@ -622,7 +622,8 @@ static void virtio_mem_notify_offline(struct virtio_m= em *vm, } } =20 -static void virtio_mem_notify_online(struct virtio_mem *vm, unsigned lon= g mb_id) +static void virtio_mem_sbm_notify_online(struct virtio_mem *vm, + unsigned long mb_id) { switch (virtio_mem_sbm_get_mb_state(vm, mb_id)) { case VIRTIO_MEM_SBM_MB_OFFLINE_PARTIAL: @@ -639,8 +640,8 @@ static void virtio_mem_notify_online(struct virtio_me= m *vm, unsigned long mb_id) } } =20 -static void virtio_mem_notify_going_offline(struct virtio_mem *vm, - unsigned long mb_id) +static void virtio_mem_sbm_notify_going_offline(struct virtio_mem *vm, + unsigned long mb_id) { const unsigned long nr_pages =3D PFN_DOWN(vm->sbm.sb_size); unsigned long pfn; @@ -655,8 +656,8 @@ static void virtio_mem_notify_going_offline(struct vi= rtio_mem *vm, } } =20 -static void virtio_mem_notify_cancel_offline(struct virtio_mem *vm, - unsigned long mb_id) +static void virtio_mem_sbm_notify_cancel_offline(struct virtio_mem *vm, + unsigned long mb_id) { const unsigned long nr_pages =3D PFN_DOWN(vm->sbm.sb_size); unsigned long pfn; @@ -716,7 +717,7 @@ static int virtio_mem_memory_notifier_cb(struct notif= ier_block *nb, break; } vm->hotplug_active =3D true; - virtio_mem_notify_going_offline(vm, mb_id); + virtio_mem_sbm_notify_going_offline(vm, mb_id); break; case MEM_GOING_ONLINE: mutex_lock(&vm->hotplug_mutex); @@ -726,10 +727,10 @@ static int virtio_mem_memory_notifier_cb(struct not= ifier_block *nb, break; } vm->hotplug_active =3D true; - rc =3D virtio_mem_notify_going_online(vm, mb_id); + rc =3D virtio_mem_sbm_notify_going_online(vm, mb_id); break; case MEM_OFFLINE: - virtio_mem_notify_offline(vm, mb_id); + virtio_mem_sbm_notify_offline(vm, mb_id); =20 atomic64_add(size, &vm->offline_size); /* @@ -743,7 +744,7 @@ static int virtio_mem_memory_notifier_cb(struct notif= ier_block *nb, mutex_unlock(&vm->hotplug_mutex); break; case MEM_ONLINE: - virtio_mem_notify_online(vm, mb_id); + virtio_mem_sbm_notify_online(vm, mb_id); =20 atomic64_sub(size, &vm->offline_size); /* @@ -762,7 +763,7 @@ static int virtio_mem_memory_notifier_cb(struct notif= ier_block *nb, case MEM_CANCEL_OFFLINE: if (!vm->hotplug_active) break; - virtio_mem_notify_cancel_offline(vm, mb_id); + virtio_mem_sbm_notify_cancel_offline(vm, mb_id); vm->hotplug_active =3D false; mutex_unlock(&vm->hotplug_mutex); break; --=20 2.26.2