From patchwork Fri Nov 2 09:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 992209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42mbdC3WJHzB4Ts; Fri, 2 Nov 2018 20:00:31 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gIVJZ-0005Yr-08; Fri, 02 Nov 2018 09:00:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gIVJX-0005YK-Tp for kernel-team@lists.canonical.com; Fri, 02 Nov 2018 09:00:23 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gIVJX-0003Lq-HQ for kernel-team@lists.canonical.com; Fri, 02 Nov 2018 09:00:23 +0000 Received: by mail-qk1-f197.google.com with SMTP id d196so2740650qkb.6 for ; Fri, 02 Nov 2018 02:00:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=iM8viHy45lT2anrrhzC9QxUoLLgb03jsDjAp4bi49QI=; b=OcJ3ynUckSyt8DfRwaEajfsgaa6WkoXn/ufow9V2pvYwzRZDDUp3911SP0BMQKtv5/ 4upYHlJjUDeLp4JXps6/rVpBNJTAuAX4M90eTIi6okpMIeyNg2NFT0bHZVKfr4NgtC1V n+hdbNXCpAzcB6tSH8HTp6FDCEpffCeNr0dMdfkS3/GJnSRb6TN1N+UUIrO+RImCR5zK XTUS4kqgslaDsND5zJxozbQCgYNrMfZtslpaaqKvjK6t1vYfGeIt0rEPIMqRt2Bi+jQc rN94O1n2e6SE+WJ5pVPOCzr6fC1h1XYBBUF+s4QrWfjuowe42t6vV/0Gj3ruU16mL81O 6nmg== X-Gm-Message-State: AGRZ1gLwjrKHseoVbgDKkRW/Qfh2BUHWCzAUwbV52Mz44z1dXi4vjHau VOSRzEPInFmCLW9YIV74TqHHFMPP2DSGx6d70XyO2RaIkMWfdROmQYx4rR7H7jXTvY6QrwodcNg dczVYUM5b3aFHVrJTm2Tv7jn/89d0qg8ZC0oshUNpjg5+/QGs X-Received: by 2002:a37:ef07:: with SMTP id j7mr4756433qkk.35.1541149222499; Fri, 02 Nov 2018 02:00:22 -0700 (PDT) X-Google-Smtp-Source: AJdET5eyyTgzOMOvOiagbKn6CoNL13AMp9x5b8XfgliHujc5jh00OXMSg9c9gHPcmcgdXhYz2ai80A== X-Received: by 2002:a37:ef07:: with SMTP id j7mr4756426qkk.35.1541149222335; Fri, 02 Nov 2018 02:00:22 -0700 (PDT) Received: from linkitivity.iinet.net.au ([2001:67c:1562:8007::aac:4356]) by smtp.gmail.com with ESMTPSA id a4-v6sm23521783qkb.62.2018.11.02.02.00.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 02:00:21 -0700 (PDT) From: Daniel Axtens To: kernel-team@lists.canonical.com Subject: [SRU bionic-aws][PATCH 2/6] xen/manage: introduce helper function to know the on-going suspend mode Date: Fri, 2 Nov 2018 20:00:06 +1100 Message-Id: <20181102090010.2643-3-daniel.axtens@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181102090010.2643-1-daniel.axtens@canonical.com> References: <20181102090010.2643-1-daniel.axtens@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Munehisa Kamata BugLink: https://bugs.launchpad.net/bugs/1801305 Introduce simple functions which help to know the on-going suspend mode so that other Xen-related code can behave differently according to the current suspend mode. Signed-off-by: Munehisa Kamata Signed-off-by: Anchal Agarwal Reviewed-by: Alakesh Haloi Reviewed-by: Sebastian Biemueller Reviewed-by: Munehisa Kamata Reviewed-by: Eduardo Valentin CR: https://cr.amazon.com/r/8273190/ (cherry-picked from 0014-xen-manage-introduce-helper-function-to-know-the-on-.patch in AWS 4.14 kernel SRPM) Signed-off-by: Daniel Axtens --- drivers/xen/manage.c | 15 +++++++++++++++ include/xen/xen-ops.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 8f9ea87ba93e..326631d9b80a 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -50,6 +50,21 @@ enum suspend_modes { /* Protected by pm_mutex */ static enum suspend_modes suspend_mode = NO_SUSPEND; +bool xen_suspend_mode_is_xen_suspend(void) +{ + return suspend_mode == XEN_SUSPEND; +} + +bool xen_suspend_mode_is_pm_suspend(void) +{ + return suspend_mode == PM_SUSPEND; +} + +bool xen_suspend_mode_is_pm_hibernation(void) +{ + return suspend_mode == PM_HIBERNATION; +} + struct suspend_info { int cancelled; }; diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index fd23e42c6024..be78f6f29f32 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -39,6 +39,10 @@ u64 xen_steal_clock(int cpu); int xen_setup_shutdown_event(void); +bool xen_suspend_mode_is_xen_suspend(void); +bool xen_suspend_mode_is_pm_suspend(void); +bool xen_suspend_mode_is_pm_hibernation(void); + extern unsigned long *xen_contiguous_bitmap; #ifdef CONFIG_XEN_PV