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 D3066C433DF for ; Mon, 12 Oct 2020 12:56:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 59C4821D7F for ; Mon, 12 Oct 2020 12:56:54 +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="GhoA/Uuy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59C4821D7F 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 E116194000E; Mon, 12 Oct 2020 08:56:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC12E900002; Mon, 12 Oct 2020 08:56:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD8CC94000E; Mon, 12 Oct 2020 08:56:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0067.hostedemail.com [216.40.44.67]) by kanga.kvack.org (Postfix) with ESMTP id A0978900002 for ; Mon, 12 Oct 2020 08:56:53 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3A94F8249980 for ; Mon, 12 Oct 2020 12:56:53 +0000 (UTC) X-FDA: 77363273106.22.rod23_3414f88271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 1B79A18038E68 for ; Mon, 12 Oct 2020 12:56:53 +0000 (UTC) X-HE-Tag: rod23_3414f88271fa X-Filterd-Recvd-Size: 6358 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 12:56:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602507412; 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=0W8H+Eppwo/SCQzkVeDdbAcVbZKbYgif5wttVSOP2BA=; b=GhoA/UuyfXs/uMVZPKWSDPvd1+UqkJwFzHCsxvkAEcSWWgPIDU1E8PvoUBXRWhAjQ8lRtp 32Eaug4x7mAwkxyTZZeAqof0o9wgRZUbRIGnCIfGa3fwIDFP/6SrbInLMRNtvAOj9km12l ImvzIkyyifq+E/2rb5ebNdoqGgAgxUk= 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-2-T0HyHURqNQS580ecS-Y9RA-1; Mon, 12 Oct 2020 08:56:48 -0400 X-MC-Unique: T0HyHURqNQS580ecS-Y9RA-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 18060107465A; Mon, 12 Oct 2020 12:56:47 +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 EED4A60C07; Mon, 12 Oct 2020 12:56:42 +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 24/29] virtio-mem: print debug messages from virtio_mem_send_*_request() Date: Mon, 12 Oct 2020 14:53:18 +0200 Message-Id: <20201012125323.17509-25-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 the existing dev_dbg() into the functions, print if something went wrong, and also print for virtio_mem_send_unplug_all_request(). Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 50 ++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index eb2ad31a8d8a..e68d0d99590c 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -1053,23 +1053,33 @@ static int virtio_mem_send_plug_request(struct vi= rtio_mem *vm, uint64_t addr, .u.plug.addr =3D cpu_to_virtio64(vm->vdev, addr), .u.plug.nb_blocks =3D cpu_to_virtio16(vm->vdev, nb_vm_blocks), }; + int rc =3D -ENOMEM; =20 if (atomic_read(&vm->config_changed)) return -EAGAIN; =20 + dev_dbg(&vm->vdev->dev, "plugging memory: 0x%llx - 0x%llx\n", addr, + addr + size - 1); + switch (virtio_mem_send_request(vm, &req)) { case VIRTIO_MEM_RESP_ACK: vm->plugged_size +=3D size; return 0; case VIRTIO_MEM_RESP_NACK: - return -EAGAIN; + rc =3D -EAGAIN; + break; case VIRTIO_MEM_RESP_BUSY: - return -ETXTBSY; + rc =3D -ETXTBSY; + break; case VIRTIO_MEM_RESP_ERROR: - return -EINVAL; + rc =3D -EINVAL; + break; default: - return -ENOMEM; + break; } + + dev_dbg(&vm->vdev->dev, "plugging memory failed: %d\n", rc); + return rc; } =20 static int virtio_mem_send_unplug_request(struct virtio_mem *vm, uint64_= t addr, @@ -1081,21 +1091,30 @@ static int virtio_mem_send_unplug_request(struct = virtio_mem *vm, uint64_t addr, .u.unplug.addr =3D cpu_to_virtio64(vm->vdev, addr), .u.unplug.nb_blocks =3D cpu_to_virtio16(vm->vdev, nb_vm_blocks), }; + int rc =3D -ENOMEM; =20 if (atomic_read(&vm->config_changed)) return -EAGAIN; =20 + dev_dbg(&vm->vdev->dev, "unplugging memory: 0x%llx - 0x%llx\n", addr, + addr + size - 1); + switch (virtio_mem_send_request(vm, &req)) { case VIRTIO_MEM_RESP_ACK: vm->plugged_size -=3D size; return 0; case VIRTIO_MEM_RESP_BUSY: - return -ETXTBSY; + rc =3D -ETXTBSY; + break; case VIRTIO_MEM_RESP_ERROR: - return -EINVAL; + rc =3D -EINVAL; + break; default: - return -ENOMEM; + break; } + + dev_dbg(&vm->vdev->dev, "unplugging memory failed: %d\n", rc); + return rc; } =20 static int virtio_mem_send_unplug_all_request(struct virtio_mem *vm) @@ -1103,6 +1122,9 @@ static int virtio_mem_send_unplug_all_request(struc= t virtio_mem *vm) const struct virtio_mem_req req =3D { .type =3D cpu_to_virtio16(vm->vdev, VIRTIO_MEM_REQ_UNPLUG_ALL), }; + int rc =3D -ENOMEM; + + dev_dbg(&vm->vdev->dev, "unplugging all memory"); =20 switch (virtio_mem_send_request(vm, &req)) { case VIRTIO_MEM_RESP_ACK: @@ -1112,10 +1134,14 @@ static int virtio_mem_send_unplug_all_request(str= uct virtio_mem *vm) atomic_set(&vm->config_changed, 1); return 0; case VIRTIO_MEM_RESP_BUSY: - return -ETXTBSY; + rc =3D -ETXTBSY; + break; default: - return -ENOMEM; + break; } + + dev_dbg(&vm->vdev->dev, "unplugging all memory failed: %d\n", rc); + return rc; } =20 /* @@ -1130,9 +1156,6 @@ static int virtio_mem_sbm_plug_sb(struct virtio_mem= *vm, unsigned long mb_id, 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= , - sb_id, sb_id + count - 1); - rc =3D virtio_mem_send_plug_request(vm, addr, size); if (!rc) virtio_mem_sbm_set_sb_plugged(vm, mb_id, sb_id, count); @@ -1151,9 +1174,6 @@ static int virtio_mem_sbm_unplug_sb(struct virtio_m= em *vm, unsigned long mb_id, 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", - mb_id, sb_id, sb_id + count - 1); - rc =3D virtio_mem_send_unplug_request(vm, addr, size); if (!rc) virtio_mem_sbm_set_sb_unplugged(vm, mb_id, sb_id, count); --=20 2.26.2