Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org
Cc:     Paolo Bonzini <pbonzini@redhat.com>,
        Sean Christopherson <sean.j.christopherson@intel.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        "H . Peter Anvin" <hpa@zytor.com>, Ira Weiny <ira.weiny@intel.com>,
        Mike Marshall <hubcap@omnibond.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Brijesh Singh <brijesh.singh@amd.com>,
        Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
Subject: [PATCH] KVM: SVM: Change flag passed to GUP fast in sev_pin_memory()
Date:   Thu, 23 Apr 2020 10:24:19 -0500
Message-Id: <20200423152419.87202-1-Janakarajan.Natarajan@amd.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from jubuntu.amd.com (165.204.78.2) by DM5PR1401CA0016.namprd14.prod.outlook.com (2603:10b6:4:4a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Thu, 23 Apr 2020 15:24:31 +0000
X-Mailer: git-send-email 2.17.1
X-Originating-IP: [165.204.78.2]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: bbcb5e80-e49c-4142-ca1a-08d7e79a6c56
X-MS-TrafficTypeDiagnostic: DM5PR12MB2391:|DM5PR12MB2391:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DM5PR12MB2391C32D9953D7C50905E1A5E7D30@DM5PR12MB2391.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:972;
X-Forefront-PRVS: 03827AF76E
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1226.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(376002)(136003)(346002)(39860400002)(396003)(366004)(36756003)(66556008)(66476007)(66946007)(2616005)(5660300002)(1076003)(956004)(6486002)(8936002)(81156014)(8676002)(7416002)(478600001)(6666004)(7696005)(52116002)(26005)(16526019)(186003)(86362001)(2906002)(4326008)(316002)(54906003);DIR:OUT;SFP:1101;
Received-SPF: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 7ng6LnkN1MSQRpHnsMtgu5kcSVkrCaEghyJxXYMrDxcnz/qzru1EXJ7YDvcl5qeOXJSJxx0tnEINoGj1IuH8aVd+tRO54u4NIa0bp4XpJ2fof+FdcxYFU7zK7/IQ/G60+MK9iPR54IbYtsoH/akKfv8khaBZ4qgisM+zyaENclNPLTYoobOUN25s6XiTT0QWMKO/RjEBs6ODPoMywvrE8/SpsGVgqBtL6kKn0rf29EjVDjSvjdpYomaX6eQThv1DNXqxKgvzeduzhT+XVAsIaZN38+e2fbflCOxT8ed8n9rqVLpvC4osi550FMwZ6F2rpAGs8dljYmJuoXNTZJbk0rAWvcKcfrW719eQvtI7LUoVTuPx7/sbprGl1qQT69eAa5610pPn+VGfc37Jt+HkonqctykwewX+TYf9gbXSk632ItZG1kJvPzqOrSIqHGM/
X-MS-Exchange-AntiSpam-MessageData: GUke2vFzBervHXdyj2Pb3QAtsEu78nTUrffjC2ttL9VJLIzYGRR9xk1264E1P8VgmCUmyRxNOnJcV1jLR87MfkXzA+zGIaWJ91ezVgEUoWV+IQUwgjWaOvfrxNgDlvJoxPvdJFzi3S313Yp+2+qLGw==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bbcb5e80-e49c-4142-ca1a-08d7e79a6c56
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2020 15:24:32.8260
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5g0mtvCpLeGLc2fc/3rzqfbAi8P5Tb15YRO42aYd9OZ5gv4fUkNddM++7l3N7HWfLd73ibOly2MHT4h9okKFWQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2391
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When trying to lock read-only pages, sev_pin_memory() fails because FOLL_WRITE
is used as the flag for get_user_pages_fast().

Commit 73b0140bf0fe ("mm/gup: change GUP fast to use flags rather than a write
'bool'") updated the get_user_pages_fast() call sites to use flags, but
incorrectly updated the call in sev_pin_memory(). As the original coding of this
call was correct, revert the change made by that commit.

Fixes: 73b0140bf0fe ("mm/gup: change GUP fast to use flags rather than a write 'bool'")
Signed-off-by: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
---
 arch/x86/kvm/svm/sev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index cf912b4aaba8..89f7f3aebd31 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -345,7 +345,7 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr,
 		return NULL;
 
 	/* Pin the user virtual address. */
-	npinned = get_user_pages_fast(uaddr, npages, FOLL_WRITE, pages);
+	npinned = get_user_pages_fast(uaddr, npages, write ? FOLL_WRITE : 0, pages);
 	if (npinned != npages) {
 		pr_err("SEV: Failure locking %lu pages.\n", npages);
 		goto err;
-- 
2.17.1