From patchwork Tue Jul 10 09:31:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 10516745 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CC482600CA for ; Tue, 10 Jul 2018 09:56:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB12E284D1 for ; Tue, 10 Jul 2018 09:56:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF131285BD; Tue, 10 Jul 2018 09:56:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 409B7284D1 for ; Tue, 10 Jul 2018 09:56:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 886C96B026A; Tue, 10 Jul 2018 05:56:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 815D06B026B; Tue, 10 Jul 2018 05:56:55 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6358C6B026D; Tue, 10 Jul 2018 05:56:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 117AD6B026A for ; Tue, 10 Jul 2018 05:56:55 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id t20-v6so841327pgu.9 for ; Tue, 10 Jul 2018 02:56:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=jdQbwOElpst5tFR0essw5ps0fc44HG3T8y5KNS06yoc=; b=Ldv15QMA8r8bvYP96jK9/TYw9aukCZ0I1W/fW+QHvZ+6OGBrAZjr8iCN16jrVX0JFn yiBt/YZwRi2Q5pExhH0rrqHEDkDut2opwNbpUYQGVT7LrlE1XmeWV7mbH31lU9uGbWvZ YdnCKQ0Gc4sjfmi4u5Sps9if+P8+SaJUXjwEV6Jm7fqzaTAMXTxn83TaeaOJW8cmaTTd FnZ5sadrWbB/Cr9iqPYvhyN6iflupeBCOdYmaDu5ixalUbXCt58TOFBffoIbvifF/GLZ SiQsIZPhnXaz6w6LiTdfNwcRU0kKiIFqJHTBpKEg8ltAP68P4a7cGhL5OJoHYMM6XX2c k2jA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E1VEjN1JMPm8H6V11L4OVMZKTY4yi0tfxK/+z66pCnuZbJlW4sk KOVVmgx7Y58jGLMORjAql4YN2AG/1530jfDX1o3qR5SY7nDm+66s6Y8GuNxRfMBctXXeFoWxsf/ 7YgBEKYoItSmXmMIqk9mIwHCdKMwVAInVnic2O9jtrS6l1ARxpzve4yDkKsvhh2htuw== X-Received: by 2002:a65:4c41:: with SMTP id l1-v6mr22504227pgr.310.1531216614747; Tue, 10 Jul 2018 02:56:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeV/3uxnOVeiI0fz6nb5IJvYDgwmcSMOrY3cisXw02wTaK8f7KmIFpMWfBkKxR8/FgJGDXu X-Received: by 2002:a65:4c41:: with SMTP id l1-v6mr22504203pgr.310.1531216614076; Tue, 10 Jul 2018 02:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531216614; cv=none; d=google.com; s=arc-20160816; b=08xx3oUgyOyPk8jmi/ZUsbAIr+V2jAOVZFWwM/JMFw+bg6XF81wJ1RM4nBpUJffDha ZJtbQBL5WOPnkfvWCC3advnqnBk6lfXMloeYkL70prtBIltbEQKZF5FCusdjExCYQ5tC Lq06AuVvMhKXWYe2iUsVjkEc+b7yj4vWP0JZLm33zZrrxMY8S9gq06zl763CLq2x0yNg pWVc1EDXbSs+vsnQe82pJL3EIdREJSM0fRcQTCcoScjSc18ACI7bk26Zb2RNtXhCIvVW ksGEZyZTqlnb37/Ym+3cNjVG9rmeuSQsieBNm+KIkUrA6ZcXOpjydVwS5O8/M/NQKizG WfYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=jdQbwOElpst5tFR0essw5ps0fc44HG3T8y5KNS06yoc=; b=GR4YwDIu3IXRxPiY/pw5BTTg2DJ8HuRPwgjUc9YXAxUF365NZGayggo8eBxBXNgmKm Kz9N5fAbV31unxPn3f2w341TqnE6ZV7D7dwqvXfuVtIfUOieY1a9fIqoPb8BODPV1K+D zy4eeQPno4/hVszParkMQNUGa1Nwzg4fLm02MztarBhPnPEtdkCpWzOLO0hoA14TvAF4 HOCU7MDovobbZtEbPoi27j2q1lJyQSh0c0YPN7+6L4RUoeV6k6qhJRIQbhEgnAD77+QO nZFIwUKE3s/pqJK73ur/LO9ann6QXV2yiQwyfSgCOlqPnTYsL0Mab2ca9Cq104wM7LME peLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga18.intel.com (mga18.intel.com. [134.134.136.126]) by mx.google.com with ESMTPS id r3-v6si15637780pgo.606.2018.07.10.02.56.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 02:56:54 -0700 (PDT) Received-SPF: pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 as permitted sender) client-ip=134.134.136.126; Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 02:56:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,334,1526367600"; d="scan'208";a="73598589" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by orsmga002.jf.intel.com with ESMTP; 10 Jul 2018 02:56:40 -0700 From: Wei Wang To: virtio-dev@lists.oasis-open.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, linux-mm@kvack.org, mst@redhat.com, mhocko@kernel.org, akpm@linux-foundation.org Cc: torvalds@linux-foundation.org, pbonzini@redhat.com, wei.w.wang@intel.com, liliang.opensource@gmail.com, yang.zhang.wz@gmail.com, quan.xu0@gmail.com, nilal@redhat.com, riel@redhat.com, peterx@redhat.com Subject: [PATCH v35 5/5] virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON Date: Tue, 10 Jul 2018 17:31:07 +0800 Message-Id: <1531215067-35472-6-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531215067-35472-1-git-send-email-wei.w.wang@intel.com> References: <1531215067-35472-1-git-send-email-wei.w.wang@intel.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: X-Virus-Scanned: ClamAV using ClamSMTP The VIRTIO_BALLOON_F_PAGE_POISON feature bit is used to indicate if the guest is using page poisoning. Guest writes to the poison_val config field to tell host about the page poisoning value that is in use. Suggested-by: Michael S. Tsirkin Signed-off-by: Wei Wang Cc: Michael S. Tsirkin Cc: Michal Hocko Cc: Andrew Morton --- drivers/virtio/virtio_balloon.c | 10 ++++++++++ include/uapi/linux/virtio_balloon.h | 3 +++ 2 files changed, 13 insertions(+) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 8754154..dd61660 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -869,6 +869,7 @@ static struct file_system_type balloon_fs = { static int virtballoon_probe(struct virtio_device *vdev) { struct virtio_balloon *vb; + __u32 poison_val; int err; if (!vdev->config->get) { @@ -916,6 +917,11 @@ static int virtballoon_probe(struct virtio_device *vdev) INIT_WORK(&vb->report_free_page_work, report_free_page_func); vb->cmd_id_received = VIRTIO_BALLOON_FREE_PAGE_REPORT_STOP_ID; vb->cmd_id_active = VIRTIO_BALLOON_FREE_PAGE_REPORT_STOP_ID; + if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON)) { + memset(&poison_val, PAGE_POISON, sizeof(poison_val)); + virtio_cwrite(vb->vdev, struct virtio_balloon_config, + poison_val, &poison_val); + } } vb->nb.notifier_call = virtballoon_oom_notify; @@ -1034,6 +1040,9 @@ static int virtballoon_restore(struct virtio_device *vdev) static int virtballoon_validate(struct virtio_device *vdev) { + if (!page_poisoning_enabled()) + __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_PAGE_POISON); + __virtio_clear_bit(vdev, VIRTIO_F_IOMMU_PLATFORM); return 0; } @@ -1043,6 +1052,7 @@ static unsigned int features[] = { VIRTIO_BALLOON_F_STATS_VQ, VIRTIO_BALLOON_F_DEFLATE_ON_OOM, VIRTIO_BALLOON_F_FREE_PAGE_HINT, + VIRTIO_BALLOON_F_PAGE_POISON, }; static struct virtio_driver virtio_balloon_driver = { diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h index b77919b..97415ba 100644 --- a/include/uapi/linux/virtio_balloon.h +++ b/include/uapi/linux/virtio_balloon.h @@ -35,6 +35,7 @@ #define VIRTIO_BALLOON_F_STATS_VQ 1 /* Memory Stats virtqueue */ #define VIRTIO_BALLOON_F_DEFLATE_ON_OOM 2 /* Deflate balloon on OOM */ #define VIRTIO_BALLOON_F_FREE_PAGE_HINT 3 /* VQ to report free pages */ +#define VIRTIO_BALLOON_F_PAGE_POISON 4 /* Guest is using page poisoning */ /* Size of a PFN in the balloon interface. */ #define VIRTIO_BALLOON_PFN_SHIFT 12 @@ -47,6 +48,8 @@ struct virtio_balloon_config { __u32 actual; /* Free page report command id, readonly by guest */ __u32 free_page_report_cmd_id; + /* Stores PAGE_POISON if page poisoning is in use */ + __u32 poison_val; }; struct virtio_balloon_free_page_hints_cmd {