From patchwork Tue Jun 26 14:22:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 10489145 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 363746031B for ; Tue, 26 Jun 2018 14:22:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26671289F4 for ; Tue, 26 Jun 2018 14:22:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A64328A5E; Tue, 26 Jun 2018 14:22:56 +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 ADC3A28A58 for ; Tue, 26 Jun 2018 14:22:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 329E56B0003; Tue, 26 Jun 2018 10:22:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2D6726B0006; Tue, 26 Jun 2018 10:22:54 -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 14FF76B0007; Tue, 26 Jun 2018 10:22:54 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id C86DF6B0003 for ; Tue, 26 Jun 2018 10:22:53 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id l2-v6so8875341pff.3 for ; Tue, 26 Jun 2018 07:22:53 -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=4eMfHMwYGbdJC+Ay0MO6VCqSLwwSCTWeNbTNdE8Ww9k=; b=Z6CeTWXt6GCw/7cJxSZjyMOynVubfpHU5aUsC70vZu0cP2innff90iLX44W3wO5ojY vO8mlHgXnyzrD42JtD7FaxbDJnJhGcCp+7teTqrGcyH031fHZqfOmssJ9Lwy5u69aQX6 I4eRmVesg1tzPPynrJ4CGEfZ8lc+Vj86bHJft3vZ1mtI3tup00YEfCzLYYdYgEJvzgsE dTUulCVSq8DVQ55kzuqSjDTUDfq+ffxiI7hpfd7fpAfx1Us89Z4DYdhTCPSo/siZ1sL8 lh9G1XM7xd3kWy2QtMPJYlpxgLVAPInQFeD2YeKNGJFKoCL0ogE31v0yRdUgH5fm2k0i 9Bwg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E3K59JNd0+W/2LzumierAkduRqdArhC2fCu205bn0DCXjsOKvD6 B9DADF0nw2pklu2XXi1+oSI83+dmWnKvboxqZxOvlnx8vpepB0CwoBr/PbiajvS84sQ1l26R+1f qs8ZhDlrNLzIReP9YjZe2iNkVYA8dzwzIS1YtyQE+m2wzUNpxmiF58PEbAKWcpzAvUQ== X-Received: by 2002:a62:904c:: with SMTP id a73-v6mr1769082pfe.145.1530022973498; Tue, 26 Jun 2018 07:22:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcRvKNce/FUIC3X9M0ryuAk8KAug0zjlfNXn+8GUrIm2/Y6Xk2Ycz/0rRStP1wGGjQI3bOE X-Received: by 2002:a62:904c:: with SMTP id a73-v6mr1769031pfe.145.1530022972685; Tue, 26 Jun 2018 07:22:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530022972; cv=none; d=google.com; s=arc-20160816; b=ftb+iLQgOoA9mCnkarXotBY0+fscD2tqV+L8PoORJyHA8QoeOo/2PFc2WrbJwDhzzS k/hLHT877CDvo72nEa+c0Yc/yMVT7q8NV7XMV6wa1KtoxgXyaZetpHl7RvK6jRPERGbQ wXzfVrDwutZ37cq1HoMmPNNlbDnbFqRMmOSGi3lFShR5FxPmQR9BReK/J54S7uCZQFPO 3WQ8WqrNWKxgUTIMUBnripMYnm+vEZ2BEnPkpyPpzodUF/3BkIWbTC8pVGTYHwB7a1Uc lr3tiOI1+YY8Rb+TcX/B812z/Dx9P9UY4YHkPUdMwqUvwV7i3W7/gSbnBIv+okLMet/h 0dKA== 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=4eMfHMwYGbdJC+Ay0MO6VCqSLwwSCTWeNbTNdE8Ww9k=; b=YFv+kfz+/bwFtNpAmYOQWOh1UPzCV6SBllUd0CPMDmYyU3YTNO6le1EUv0DeWbT8vL ftSlA+op9ovxju276tpzvqzY6zC3gwBCS1/UCPr64N+eO2RHChSHoQPa5hMWu73pZAZb 5QeLRM+iiskYF5WN7qELEaY6I/TCf120uvC5n6PAbRcNX7YMKkn+9eT2j2lhx9yxPIfN up6EKGjo3sdDn0sYREl4bRCXMVMfE6R6eDApvT4zgbRdj1ko4D+1kh5eRxPYzHyWBbCv bpNx25CgAHfOsKUuLD6+HkkilLqiWRDVrKwfvSHia/NSavJ9CX/QYp7due+2kguLLly0 b0Aw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id l190-v6si1524248pgd.375.2018.06.26.07.22.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 07:22:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 as permitted sender) client-ip=134.134.136.65; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (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 fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2018 07:22:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,274,1526367600"; d="scan'208";a="240770162" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 26 Jun 2018 07:22:49 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 833B23D2; Tue, 26 Jun 2018 17:22:51 +0300 (EEST) From: "Kirill A. Shutemov" To: Ingo Molnar , x86@kernel.org, Thomas Gleixner , "H. Peter Anvin" , Tom Lendacky Cc: Dave Hansen , Kai Huang , Jacob Pan , linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Kirill A. Shutemov" Subject: [PATCHv4 02/18] mm/ksm: Do not merge pages with different KeyIDs Date: Tue, 26 Jun 2018 17:22:29 +0300 Message-Id: <20180626142245.82850-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180626142245.82850-1-kirill.shutemov@linux.intel.com> References: <20180626142245.82850-1-kirill.shutemov@linux.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 Pages encrypted with different encryption keys are not subject to KSM merge. Otherwise it would cross security boundary. Signed-off-by: Kirill A. Shutemov --- include/linux/mm.h | 7 +++++++ mm/ksm.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index ebf4bd8bd0bf..406a28cadfcf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1548,6 +1548,13 @@ static inline int vma_keyid(struct vm_area_struct *vma) } #endif +#ifndef page_keyid +static inline int page_keyid(struct page *page) +{ + return 0; +} +#endif + #ifdef CONFIG_SHMEM /* * The vma_is_shmem is not inline because it is used only by slow diff --git a/mm/ksm.c b/mm/ksm.c index a6d43cf9a982..1bd7b9710e29 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1214,6 +1214,9 @@ static int try_to_merge_one_page(struct vm_area_struct *vma, if (!PageAnon(page)) goto out; + if (page_keyid(page) != page_keyid(kpage)) + goto out; + /* * We need the page lock to read a stable PageSwapCache in * write_protect_page(). We use trylock_page() instead of