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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY 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 5CC28C433DF for ; Fri, 16 Oct 2020 09:07:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D4B8D20789 for ; Fri, 16 Oct 2020 09:07:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4B8D20789 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E6E88940007; Fri, 16 Oct 2020 05:07:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E1F4F900002; Fri, 16 Oct 2020 05:07:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D0CFF940007; Fri, 16 Oct 2020 05:07:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0147.hostedemail.com [216.40.44.147]) by kanga.kvack.org (Postfix) with ESMTP id B8034900002 for ; Fri, 16 Oct 2020 05:07:39 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 780B31EE6 for ; Fri, 16 Oct 2020 09:07:39 +0000 (UTC) X-FDA: 77377210638.07.thumb66_130a60f2721b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 5EE111803F9AB for ; Fri, 16 Oct 2020 09:07:39 +0000 (UTC) X-HE-Tag: thumb66_130a60f2721b X-Filterd-Recvd-Size: 5890 Received: from out30-54.freemail.mail.aliyun.com (out30-54.freemail.mail.aliyun.com [115.124.30.54]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Fri, 16 Oct 2020 09:07:36 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R151e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04357;MF=richard.weiyang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0UCB9zIn_1602839249; Received: from localhost(mailfrom:richard.weiyang@linux.alibaba.com fp:SMTPD_---0UCB9zIn_1602839249) by smtp.aliyun-inc.com(127.0.0.1); Fri, 16 Oct 2020 17:07:29 +0800 Date: Fri, 16 Oct 2020 17:07:29 +0800 From: Wei Yang To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, virtualization@lists.linux-foundation.org, Andrew Morton , "Michael S . Tsirkin" , Jason Wang , Pankaj Gupta Subject: Re: [PATCH v1 24/29] virtio-mem: print debug messages from virtio_mem_send_*_request() Message-ID: <20201016090729.GG44269@L-31X9LVDL-1304.local> Reply-To: Wei Yang References: <20201012125323.17509-1-david@redhat.com> <20201012125323.17509-25-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201012125323.17509-25-david@redhat.com> 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: On Mon, Oct 12, 2020 at 02:53:18PM +0200, David Hildenbrand wrote: >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 Reviewed-by: Wei Yang >--- > 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 virtio_mem *vm, uint64_t addr, > .u.plug.addr = cpu_to_virtio64(vm->vdev, addr), > .u.plug.nb_blocks = cpu_to_virtio16(vm->vdev, nb_vm_blocks), > }; >+ int rc = -ENOMEM; > > if (atomic_read(&vm->config_changed)) > return -EAGAIN; > >+ 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 += size; > return 0; > case VIRTIO_MEM_RESP_NACK: >- return -EAGAIN; >+ rc = -EAGAIN; >+ break; > case VIRTIO_MEM_RESP_BUSY: >- return -ETXTBSY; >+ rc = -ETXTBSY; >+ break; > case VIRTIO_MEM_RESP_ERROR: >- return -EINVAL; >+ rc = -EINVAL; >+ break; > default: >- return -ENOMEM; >+ break; > } >+ >+ dev_dbg(&vm->vdev->dev, "plugging memory failed: %d\n", rc); >+ return rc; > } > > 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 = cpu_to_virtio64(vm->vdev, addr), > .u.unplug.nb_blocks = cpu_to_virtio16(vm->vdev, nb_vm_blocks), > }; >+ int rc = -ENOMEM; > > if (atomic_read(&vm->config_changed)) > return -EAGAIN; > >+ 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 -= size; > return 0; > case VIRTIO_MEM_RESP_BUSY: >- return -ETXTBSY; >+ rc = -ETXTBSY; >+ break; > case VIRTIO_MEM_RESP_ERROR: >- return -EINVAL; >+ rc = -EINVAL; >+ break; > default: >- return -ENOMEM; >+ break; > } >+ >+ dev_dbg(&vm->vdev->dev, "unplugging memory failed: %d\n", rc); >+ return rc; > } > > static int virtio_mem_send_unplug_all_request(struct virtio_mem *vm) >@@ -1103,6 +1122,9 @@ static int virtio_mem_send_unplug_all_request(struct virtio_mem *vm) > const struct virtio_mem_req req = { > .type = cpu_to_virtio16(vm->vdev, VIRTIO_MEM_REQ_UNPLUG_ALL), > }; >+ int rc = -ENOMEM; >+ >+ dev_dbg(&vm->vdev->dev, "unplugging all memory"); > > switch (virtio_mem_send_request(vm, &req)) { > case VIRTIO_MEM_RESP_ACK: >@@ -1112,10 +1134,14 @@ static int virtio_mem_send_unplug_all_request(struct virtio_mem *vm) > atomic_set(&vm->config_changed, 1); > return 0; > case VIRTIO_MEM_RESP_BUSY: >- return -ETXTBSY; >+ rc = -ETXTBSY; >+ break; > default: >- return -ENOMEM; >+ break; > } >+ >+ dev_dbg(&vm->vdev->dev, "unplugging all memory failed: %d\n", rc); >+ return rc; > } > > /* >@@ -1130,9 +1156,6 @@ static int virtio_mem_sbm_plug_sb(struct virtio_mem *vm, unsigned long mb_id, > const uint64_t size = count * vm->sbm.sb_size; > int rc; > >- dev_dbg(&vm->vdev->dev, "plugging memory block: %lu : %i - %i\n", mb_id, >- sb_id, sb_id + count - 1); >- > rc = 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_mem *vm, unsigned long mb_id, > const uint64_t size = count * vm->sbm.sb_size; > int rc; > >- dev_dbg(&vm->vdev->dev, "unplugging memory block: %lu : %i - %i\n", >- mb_id, sb_id, sb_id + count - 1); >- > rc = virtio_mem_send_unplug_request(vm, addr, size); > if (!rc) > virtio_mem_sbm_set_sb_unplugged(vm, mb_id, sb_id, count); >-- >2.26.2 -- Wei Yang Help you, Help me