From patchwork Thu Jul 13 14:55:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13312326 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D35AFC001DD for ; Thu, 13 Jul 2023 14:56:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 776B06B0075; Thu, 13 Jul 2023 10:56:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 72758900035; Thu, 13 Jul 2023 10:56:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 615D790001C; Thu, 13 Jul 2023 10:56:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 552016B0075 for ; Thu, 13 Jul 2023 10:56:06 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BC1C6C02F3 for ; Thu, 13 Jul 2023 14:56:04 +0000 (UTC) X-FDA: 81006888648.25.62FB7C7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 438A7160011 for ; Thu, 13 Jul 2023 14:56:01 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Sq8VJqeM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689260162; a=rsa-sha256; cv=none; b=gBr34+raLEHdJzT2iOAzay888jWvCE+OVNYNfy6GDyY85eydP7s2aKQjzRgbxRefF545IA I8X/0RMXy9AINPYok0AwrIARl6FtiB++pEsINOvKfjWvvXpGc59yBgJrEu8vU+BlaAnmuo fTkSlJTkJC/UBacuLUQbVcrTqqRye2c= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Sq8VJqeM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689260162; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tvagZqP7r7JhOH2HSmKVW5dMeNgJcBr/tywkzsCuQEE=; b=yM5SGsbQd3wBjTxRjXDFyjWf8hXa3h5BjNaSUdEL1o1MKFAQL69QkbEwqRNMoWxNITeRVE kjlKTzknPvHTbmNB9UtTcYBS7Uvis/gx5I0KPo7Gn4Gu9xJ2EK7BLwcI/kqx0dVpmXtrvS WxVrWuuqYz1LzW/aNDysSwiu+xI38UU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689260161; 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=tvagZqP7r7JhOH2HSmKVW5dMeNgJcBr/tywkzsCuQEE=; b=Sq8VJqeMMVAW+HhHwmBoefB78zv3aqKFmtPLTQfZW+DSOI2fQaxueB5f/URpV48EWmHOdh 0TCOX/fr0GvyVOUGrvdu2WVHIedS02RJ++mOMa96JOnY6PtTwC+JBijtPVGHcW2JmSdl1a p/nxtP7O+TnkD+2s8PNxa5nkeyvXT+A= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-13-nm4gKlnDNE-L9galCwEr3g-1; Thu, 13 Jul 2023 10:55:59 -0400 X-MC-Unique: nm4gKlnDNE-L9galCwEr3g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 640A63815F7E; Thu, 13 Jul 2023 14:55:59 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0225F66D7; Thu, 13 Jul 2023 14:55:57 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtualization@lists.linux-foundation.org, David Hildenbrand , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo Subject: [PATCH v1 2/4] virtio-mem: convert most offline_and_remove_memory() errors to -EBUSY Date: Thu, 13 Jul 2023 16:55:49 +0200 Message-ID: <20230713145551.2824980-3-david@redhat.com> In-Reply-To: <20230713145551.2824980-1-david@redhat.com> References: <20230713145551.2824980-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 438A7160011 X-Stat-Signature: su1hu5njrxxkdfr4yws4qccuz71r3sje X-HE-Tag: 1689260161-590143 X-HE-Meta: U2FsdGVkX18MVlDJmLtqIu6/s6e53AzGQTGNq4XHresrF9m9Gg3zIk6D0I0yf3uDfLbhKkdKYb/p02qv4Zq7+HoNc+5WLJKMJWVfd4UUgJTWVbHOTluIPxb1rCkWjAolFtnKXR8n46Nwu978Hc8Z1qRaV1e9P4/2JU5r0vVEd5TeLbHeAWOoTz2ZX432G4m7pbdopI5/xonL0l3qX7AKRbzT2/e8Dj4h462+jFz7wH/Zw/8MngCHkwg4mk4cfyWXX/x3epLVDchWdQVv9umI8oFIGGoWWkGtke9G0HKe9nM1fotp4hMQ8KefP9Lnq45HlcnZW69zGVb/o1+VUTA7gW/q+4vayQ1JeNAmMhh9QFSI0FhmYO8ZEtAPdgTZx+3EkS6Ck64f9kXFXsrgrhqlboPB7gSEKhxR8YCP53pyaz15Fk7MaSpFQYAcIxulMhLrhRf/ZDX6oMGRal6QxfE8GAZt14hwt6D27xnHMfqAjGbOt+AVOY+1INFbKpRKUaACzZ4JZYObQOIN33jlAnp5Kr3HodxA+Oxp5AAsjx6EL9KClsG9j5PyCrGmfbnTYaLEG5v2FkD5NzsByvS3AMOlYjuuS2XKm1/fEGGqQynxyc2okC9tt4L7h46E9f3T254h8accu5H7DJ7sBhriCbQMxjk4vNMFtrWeVl99+sOedWOnMzSUVywmtBAzhhpBFbMXAPaOQqTYOBnBk+rSb2SVHogKhpXJU2kXSu2K4TJ3YfIclmb9vIQexO6Brv3ihFSCwfpUo8fXpYNZc9VFBO4zCJQ2ulqfn3NF+QBOfTZJqXYTPYdej8kKvadrWlbETeWjld5G3CZTo4QW/+pXQM1WGRDWU1l6SMFOJNhNZ60ywfFWYlpZnX1GZgjiWCaaY0HwQ9Y5t5vH3NNJH0Qev9uSpqmglJ6S1P15eFyK7sW3g4VbfPtehg6b+gEBarKRkg0d7ZzS5gL2Yr1Hfo5le8W KgJiNAVm B2CQNUzrcn69hiU9oNzTYL7Wa7eU0wAOnnDBewh9ey57Gh1SslKcqiEyhoxmoAUY8gWAoZITwT/xQnqdMQSbp1+7b4BZZJoO9xfVAn5OGMT4kYuCO858m635OcqbpieSxKZSXrCwRx4uFfc7fwgGUzv63mNbGBMcPirNvIQs3O3WYDmXYGpXum4YhcfOn3wjo8gQp3iNsteLZbcnNtod9obk0zA== 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: Just like we do with alloc_contig_range(), let's convert all unknown errors to -EBUSY, but WARN so we can look into the issue. For example, offline_pages() could fail with -EINTR, which would be unexpected in our case. Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index ed15d2a4bd96..1a76ba2bc118 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -741,11 +741,15 @@ static int virtio_mem_offline_and_remove_memory(struct virtio_mem *vm, * immediately instead of waiting. */ virtio_mem_retry(vm); - } else { - dev_dbg(&vm->vdev->dev, - "offlining and removing memory failed: %d\n", rc); + return 0; } - return rc; + dev_dbg(&vm->vdev->dev, "offlining and removing memory failed: %d\n", rc); + /* + * We don't really expect this to fail, because we fake-offlined all + * memory already. But it could fail in corner cases. + */ + WARN_ON_ONCE(rc != -ENOMEM && rc != -EBUSY); + return rc == -ENOMEM ? -ENOMEM : -EBUSY; } /*