From patchwork Fri Jul 20 08:33:05 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: 10536273 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 2E3CA6029B for ; Fri, 20 Jul 2018 09:00:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 255CB29147 for ; Fri, 20 Jul 2018 09:00:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1942A29158; Fri, 20 Jul 2018 09:00:54 +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 93D7329147 for ; Fri, 20 Jul 2018 09:00:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1059B6B026D; Fri, 20 Jul 2018 05:00:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 00D6E6B0271; Fri, 20 Jul 2018 05:00:44 -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 E3E056B0272; Fri, 20 Jul 2018 05:00:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id A253D6B026D for ; Fri, 20 Jul 2018 05:00:44 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id w1-v6so6823441ply.12 for ; Fri, 20 Jul 2018 02:00:44 -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=d8ZhYJ07kkApg1ESbFUOYem1bK1Eo60ZQL8qY1tdWXY=; b=k6ijx4+TNX/idoGBLByfYPXkyEiqfA5tgRIl1Rj1n2B/LbdmyaW9o5Vk8KRWnxD5iK Rplpb4HtCP2hHv2YcIW/6UGAwzVbNoMxLnsOgUvb9ZASCFxv7G3ys6L4Tmtzr4mMB4RO afaaUrQ5ZtCuyzh+rbAEyCWdZReiP7GV+rKJAGf89dOZRKNEpPQ6UgdO03vS0QhmDuY9 iFdDWf+A+EM3Yxdni5HKaERtuzJfPL5CEZIicX+Fud5BpGOMzOIMVmhjRIlqeJe1xpeb LDdIldIeJVIPDN/WYyQOzZtopBwU6mGsfa48QcpQGYBdK45nLM2fqdkk/JvHrGwaGorX AfKQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 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: AOUpUlHfxD50r3tL40ggrtLGyEcxkyOQ/Xx/Ot+J//TE2zHSqUrzvUcQ zD6uTJroi0yfE73QUevV0Tt9WPZi3ZNSeXVx7aygwSqUcwX14VizgZ23d7PwnAE/UsEskU4nKO+ blsnc1tA+FzTmdnkRXYU8C5eV/CU3OfG/G2LhE/busAFE1N3RO4Skj4k8Vj04tMQY1w== X-Received: by 2002:a17:902:20c2:: with SMTP id v2-v6mr1332651plg.22.1532077244341; Fri, 20 Jul 2018 02:00:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcf2d6fHjo7F1emKTBDLxGxNBtcEwJeD3VmTwMzSPqVWS9zsyiGUsMRzp2fpVKiIWN6rijP X-Received: by 2002:a17:902:20c2:: with SMTP id v2-v6mr1332555plg.22.1532077243307; Fri, 20 Jul 2018 02:00:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532077243; cv=none; d=google.com; s=arc-20160816; b=MbJP9v2As4Q0/tfGOQIXbJ4WNyApzC6326xQXM+0FFfuzno1GJEbcHproGqyYxzKD9 PzalkX4YMAzrF0+BPEJv+FWIfcq+G2HEVyXwdzyC7xXxoisonUrGsPbNgznrITO5T3xM hQCNfIc0fBRWoCvlYHRCccPqnOgvwzKHFQByk3UkV8sDVK8UoecOjHosktOyj5bQleaY tWnDYBpktMXQx4xpCX45JxGntAWvNmjHjtXvd0DZ9fCk8mjfJmzf7QBfFIKh22NT4OJS DeNCPuI9kD1IV/recV1nIuGYtRDEo79nhjG7mHH7tKRfqw7v2I8O1/wQZkLEYzzbGMue cNqw== 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=d8ZhYJ07kkApg1ESbFUOYem1bK1Eo60ZQL8qY1tdWXY=; b=EmQBONq6gU6W/9JMAUbAliqOYrVW9aY0D+5j5P+dekXdwoDgqxg0mV7aYcUqFM9m4v 3+OyQpaaGu0p3SnJbfyMkLN3LKsmqNQjDXB6URZpl/pPx0WhjS2JsRk0U2h9tvPvSBCS Z0xBpHiXGwtzLWXnEPU5PllFzaZi6OISm9F8RnmHHLsuj2w0b7ALbQ95uTMnJ9q2EffJ sZlnairWgEThQCUuW7RSSPucpxXOFs4sC/rCzQ0KP6Oa9YH/FkDsbCk1G0KIb+ccGNf2 RJImRNpFSF+xEXxIME+x93AE6i5ruVFSrFEnFGw6Gt89Zl8Yn5YT0vwkaBi1bEx6K7mR Etpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id 196-v6si1455917pgg.588.2018.07.20.02.00.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Jul 2018 02:00:43 -0700 (PDT) Received-SPF: pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.120 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 fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jul 2018 02:00:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,378,1526367600"; d="scan'208";a="66141368" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by FMSMGA003.fm.intel.com with ESMTP; 20 Jul 2018 02:00:35 -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, torvalds@linux-foundation.org Cc: 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 v36 5/5] virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON Date: Fri, 20 Jul 2018 16:33:05 +0800 Message-Id: <1532075585-39067-6-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532075585-39067-1-git-send-email-wei.w.wang@intel.com> References: <1532075585-39067-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 82cd497..6340cc1 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -814,6 +814,7 @@ static int virtio_balloon_register_shrinker(struct virtio_balloon *vb) static int virtballoon_probe(struct virtio_device *vdev) { struct virtio_balloon *vb; + __u32 poison_val; int err; if (!vdev->config->get) { @@ -883,6 +884,11 @@ static int virtballoon_probe(struct virtio_device *vdev) VIRTIO_BALLOON_CMD_ID_STOP); spin_lock_init(&vb->free_page_list_lock); INIT_LIST_HEAD(&vb->free_page_list); + 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); + } } err = virtio_balloon_register_shrinker(vb); @@ -979,6 +985,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; } @@ -988,6 +997,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 18ee430..80a7b7e 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; }; #define VIRTIO_BALLOON_S_SWAP_IN 0 /* Amount of memory swapped in */