Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2258327ybg; Sun, 27 Oct 2019 14:34:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqyMD8mSx4r1iBq62uxWTOcOgggxno9fQD23KTuTFK7HUUpONVopabtA0TmRyWnpIr4urQSH X-Received: by 2002:a50:97af:: with SMTP id e44mr16165778edb.3.1572212075136; Sun, 27 Oct 2019 14:34:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572212075; cv=none; d=google.com; s=arc-20160816; b=vCubp6MajtyF0Ma0XsPEfiUcPBUPcbxIvYj8wmd6QoJotZq8k791CxH4GPMYrtnhUT w8FNHweiH4vUITCPf9rwZzbUJmUn1RjnRq97wwUTpORQ6FZMfS5LZrd4N5qHQwBeihQr hrtTxChW4AcCtH2wpf7Wrt+nzL0cN9kVb5jm8E39OumaBVYuzCh9T3SqOskrwybFW09O NZIyn2v6r2ovod5rNI4Ag3g3pmsmW6iLR/OXpPYjnrWT7UtlfMwKVtDV/z3l//lPUyL7 LsjUZxvOfs4izfsVkmTXIsOaW3TtRXBx3LVnj35jXs9160vhPk6yFjhCr2ObahEfjtNG 3KDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ArpOLmVUelZitKR6zbMfWVOouzaa4yRYA4vq2wXdza8=; b=MebDAPe/4bsye3jqBif/n6s/Ixh+DWzUivpeWaMtC9xLzzqOIahJK50cASlXD+r08u jZohQuf+9Qeo2xnS6+6Bbvlemy9gI3pN5Tpm70OipLg/k2b4cqlzUQXAbpVnN2Phlzfc uQlttcjuDpNiq78rF12Oah3AFTRvfKro9SdT6Vmm6dJGVoHoWu9v5NWMjO2XQZu5jFmG JkYO3IlYiwG6zg012jJk8da75dzRGBa5YAcXhA18MGa/JM+xG/wKc+guKo8KNlDmltCX 5uTyyJhZZeNW/W13COWpMkXrfFpRBPNytOHLNEIq9TbQo8i0QTV9hLMW07i4zJR/fq0H upaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Nv6pS26+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b50si6169522ede.28.2019.10.27.14.34.11; Sun, 27 Oct 2019 14:34:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Nv6pS26+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732827AbfJ0Vas (ORCPT + 99 others); Sun, 27 Oct 2019 17:30:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:38490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731260AbfJ0VSU (ORCPT ); Sun, 27 Oct 2019 17:18:20 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 88E6D2070B; Sun, 27 Oct 2019 21:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211100; bh=nuMeF0mmWX2+7vy9v0d20cokk40O9na7paeUBzG/SfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nv6pS26+n27MpwBnbHASg2YdLpYKc4AkEg6stM73qNdvBl6i1vykgl5io7ZglmWbi rqEXTpAKdTwEXunyNK1Qs+ydT5Ne6X7kyF68ev9NORjuiDAbbJW3+jdp1V2alCEVvL WVeYTexTl1m8GBZ+83wbAKBePqhm1Pg3HFajTU7o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ross Lagerwall , Juergen Gross , Sasha Levin Subject: [PATCH 5.3 031/197] xen/efi: Set nonblocking callbacks Date: Sun, 27 Oct 2019 21:59:09 +0100 Message-Id: <20191027203353.421401516@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ross Lagerwall [ Upstream commit df359f0d09dc029829b66322707a2f558cb720f7 ] Other parts of the kernel expect these nonblocking EFI callbacks to exist and crash when running under Xen. Since the implementations of xen_efi_set_variable() and xen_efi_query_variable_info() do not take any locks, use them for the nonblocking callbacks too. Signed-off-by: Ross Lagerwall Reviewed-by: Juergen Gross Signed-off-by: Juergen Gross Signed-off-by: Sasha Levin --- arch/arm/xen/efi.c | 2 ++ arch/x86/xen/efi.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/xen/efi.c b/arch/arm/xen/efi.c index d687a73044bfa..cb2aaf98e243d 100644 --- a/arch/arm/xen/efi.c +++ b/arch/arm/xen/efi.c @@ -19,7 +19,9 @@ void __init xen_efi_runtime_setup(void) efi.get_variable = xen_efi_get_variable; efi.get_next_variable = xen_efi_get_next_variable; efi.set_variable = xen_efi_set_variable; + efi.set_variable_nonblocking = xen_efi_set_variable; efi.query_variable_info = xen_efi_query_variable_info; + efi.query_variable_info_nonblocking = xen_efi_query_variable_info; efi.update_capsule = xen_efi_update_capsule; efi.query_capsule_caps = xen_efi_query_capsule_caps; efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count; diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c index 0d3365cb64de0..7e3eb70f411ab 100644 --- a/arch/x86/xen/efi.c +++ b/arch/x86/xen/efi.c @@ -65,7 +65,9 @@ static efi_system_table_t __init *xen_efi_probe(void) efi.get_variable = xen_efi_get_variable; efi.get_next_variable = xen_efi_get_next_variable; efi.set_variable = xen_efi_set_variable; + efi.set_variable_nonblocking = xen_efi_set_variable; efi.query_variable_info = xen_efi_query_variable_info; + efi.query_variable_info_nonblocking = xen_efi_query_variable_info; efi.update_capsule = xen_efi_update_capsule; efi.query_capsule_caps = xen_efi_query_capsule_caps; efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count; -- 2.20.1