From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966209AbeAJQ3E (ORCPT + 1 other); Wed, 10 Jan 2018 11:29:04 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:53945 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965714AbeAJQ3D (ORCPT ); Wed, 10 Jan 2018 11:29:03 -0500 From: Arnd Bergmann To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Arnd Bergmann , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, David Hildenbrand , Wanpeng Li , Junaid Shahid , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86: kvm: propagate register_shrinker return code Date: Wed, 10 Jan 2018 17:26:59 +0100 Message-Id: <20180110162730.400337-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:pUHLlP73E/7owVfUvgrp23dhz20IEujRf5FxYyeZRxmO/8Iw3gh rQhDJj7WXHETZ4CNZvAtEDzghJWNbRNLZDE8ajZXzPpAUWJHhYvoyqu9+E5mGPdgv6wwHJr acWrlZ6sXs2etj/iFuNrUtdM7i4awxF9LzZUpqz60w8hBAjVOo025dpKnX3RmilSeK7A04t V//OrqSvAbyNnLZsQX+Mw== X-UI-Out-Filterresults: notjunk:1;V01:K0:9ekKfj2hpv8=:eUTkWA/ocTsmo85zP45v+1 SheRiTnl5z7wLa05c6ImlG0Axw0oJJeJL0Mqj3HKYV17AZ6chzDyb0qdjOaAd68tHaYzCknrv pxkAFgS9i/XPq2LtmnHe8OH1d3fZIXg8anZfeNtX+ssP+jckEUaWqteDrxK407v1gAvtv9iIe RbIQe5JhMKuiGU2Bnk8GZ1qqvRGeeEvg2NJfsVofl3Hhl4AhPk5YSof8y5uO/w+YWxaAbivs3 IYvLA0CIWlRrGrYlyIUk2sQd67IES1E50wg3IzWUhTwlYJIlGNpxlb1WLc5yYuGPL6msVdKvi m2o/Bg3EUtIx/B5gthycGcXwYL6uFQC9A9537T/2tPR63eLiqqFvwJzRzFEuxzmxOTLSZ9ueJ YJ/fx3d/ggkyRgZ/eJ+91OdEZ3au9pgrSNAOJqALgOvt7MTcTpWgUtrAO4xboZnnQPB/FmRc5 R+AEm7ive9L0mQqqSGhus9onMezryRUIeKeLJq1VWSocv4ktay5BmCH3A8UPUVClnGvAjpCkS iHPvjeBNruGdVAYe2/YV2XonLddSaCqTc4baz4zBSi7S5c9zOK6ObEyWhoXhsln1xkBHWMpbW 7yQZMzBE/HiXjpPYsNmiuw2CFeCPzPiliYH18bxMrsWuKBEWL5tHLScOACErXEgezN++jRBxr OrFGllGOixkU8ZnRy5hDfsjmLjEp/DVnjPO8OrjkDzRaZbwkwEcPpOm3/RAiqoU+hyPhohCQc x8DBt1ZgL8RjjGYeZBaeG30skAIDMDHL9iz7FQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Patch "mm,vmscan: mark register_shrinker() as __must_check" is queued for 4.16 in linux-mm and adds a warning about the unchecked call to register_shrinker: arch/x86/kvm/mmu.c:5485:2: warning: ignoring return value of 'register_shrinker', declared with attribute warn_unused_result [-Wunused-result] This changes the kvm_mmu_module_init() function to fail itself when the call to register_shrinker fails. Signed-off-by: Arnd Bergmann --- arch/x86/kvm/mmu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 89da688784fa..765c8e9df5d9 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -5465,30 +5465,34 @@ static void mmu_destroy_caches(void) int kvm_mmu_module_init(void) { + int ret = -ENOMEM; + kvm_mmu_clear_all_pte_masks(); pte_list_desc_cache = kmem_cache_create("pte_list_desc", sizeof(struct pte_list_desc), 0, SLAB_ACCOUNT, NULL); if (!pte_list_desc_cache) - goto nomem; + goto out; mmu_page_header_cache = kmem_cache_create("kvm_mmu_page_header", sizeof(struct kvm_mmu_page), 0, SLAB_ACCOUNT, NULL); if (!mmu_page_header_cache) - goto nomem; + goto out; if (percpu_counter_init(&kvm_total_used_mmu_pages, 0, GFP_KERNEL)) - goto nomem; + goto out; - register_shrinker(&mmu_shrinker); + ret = register_shrinker(&mmu_shrinker); + if (ret) + goto out; return 0; -nomem: +out: mmu_destroy_caches(); - return -ENOMEM; + return ret; } /* -- 2.9.0