From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.18 156/168] iommu/amd: Clear memory encryption mask from physical address Date: Mon, 8 Oct 2018 20:32:16 +0200 Message-ID: <20181008175625.978463772@linuxfoundation.org> References: <20181008175620.043587728@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181008175620.043587728-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Tom Lendacky , Joerg Roedel , Brijesh Singh , kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Greg Kroah-Hartman , stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Paolo Bonzini , Boris Ostrovsky , Borislav Petkov List-Id: iommu@lists.linux-foundation.org NC4xOC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBTaW5naCwgQnJp amVzaCA8YnJpamVzaC5zaW5naEBhbWQuY29tPgoKY29tbWl0IGIzZTliNTE1YjA4ZTQwN2FiM2Ew MjZkYzJlNGQ5MzVjNDhkMDVmNjkgdXBzdHJlYW0uCgpCb3JpcyBPc3Ryb3Zza3kgcmVwb3J0ZWQg YSBtZW1vcnkgbGVhayB3aXRoIGRldmljZSBwYXNzdGhyb3VnaCB3aGVuIFNNRQppcyBhY3RpdmUu CgpUaGUgVkZJTyBkcml2ZXIgdXNlcyBpb21tdV9pb3ZhX3RvX3BoeXMoKSB0byBnZXQgdGhlIHBo eXNpY2FsIGFkZHJlc3MgZm9yCmFuIGlvdmEuIFRoaXMgcGh5c2ljYWwgYWRkcmVzcyBpcyBsYXRl ciBwYXNzZWQgaW50byB2ZmlvX3VubWFwX3VucGluKCkgdG8KdW5waW4gdGhlIG1lbW9yeS4gVGhl IHZmaW9fdW5tYXBfdW5waW4oKSB1c2VzIHBmbl92YWxpZCgpIGJlZm9yZSB1bnBpbm5pbmcKdGhl IG1lbW9yeS4gVGhlIHBmbl92YWxpZCgpIGNoZWNrIHdhcyBmYWlsaW5nIGJlY2F1c2UgZW5jcnlw dGlvbiBtYXNrIHdhcwpwYXJ0IG9mIHRoZSBwaHlzaWNhbCBhZGRyZXNzIHJldHVybmVkLiBUaGlz IHJlc3VsdGVkIGluIHRoZSBtZW1vcnkgbm90CmJlaW5nIHVucGlubmVkIGFuZCB0aGVyZWZvcmUg bGVha2VkIGFmdGVyIHRoZSBndWVzdCB0ZXJtaW5hdGVzLgoKVGhlIG1lbW9yeSBlbmNyeXB0aW9u IG1hc2sgbXVzdCBiZSBjbGVhcmVkIGZyb20gdGhlIHBoeXNpY2FsIGFkZHJlc3MgaW4KaW9tbXVf aW92YV90b19waHlzKCkuCgpGaXhlczogMjU0M2E3ODZhYTI1ICgiaW9tbXUvYW1kOiBBbGxvdyB0 aGUgQU1EIElPTU1VIHRvIHdvcmsgd2l0aCBtZW1vcnkgZW5jcnlwdGlvbiIpClJlcG9ydGVkLWJ5 OiBCb3JpcyBPc3Ryb3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgpDYzogVG9tIExl bmRhY2t5IDx0aG9tYXMubGVuZGFja3lAYW1kLmNvbT4KQ2M6IEpvZXJnIFJvZWRlbCA8am9yb0A4 Ynl0ZXMub3JnPgpDYzogPGlvbW11QGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnPgpDYzogQm9y aXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgpDYzogUGFvbG8gQm9uemluaSA8cGJvbnppbmlAcmVk aGF0LmNvbT4KQ2M6IFJhZGltIEtyxI1tw6HFmSA8cmtyY21hckByZWRoYXQuY29tPgpDYzoga3Zt QHZnZXIua2VybmVsLm9yZwpDYzogQm9yaXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zza3lAb3Jh Y2xlLmNvbT4KQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiAjIDQuMTQrClNpZ25lZC1vZmYt Ynk6IEJyaWplc2ggU2luZ2ggPGJyaWplc2guc2luZ2hAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTog Sm9lcmcgUm9lZGVsIDxqcm9lZGVsQHN1c2UuZGU+ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgt SGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+CgotLS0KIGRyaXZlcnMvaW9tbXUv YW1kX2lvbW11LmMgfCAgICAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEg ZGVsZXRpb24oLSkKCi0tLSBhL2RyaXZlcnMvaW9tbXUvYW1kX2lvbW11LmMKKysrIGIvZHJpdmVy cy9pb21tdS9hbWRfaW9tbXUuYwpAQCAtMzA3Myw3ICszMDczLDcgQEAgc3RhdGljIHBoeXNfYWRk cl90IGFtZF9pb21tdV9pb3ZhX3RvX3BoeQogCQlyZXR1cm4gMDsKIAogCW9mZnNldF9tYXNrID0g cHRlX3Bnc2l6ZSAtIDE7Ci0JX19wdGUJICAgID0gKnB0ZSAmIFBNX0FERFJfTUFTSzsKKwlfX3B0 ZQkgICAgPSBfX3NtZV9jbHIoKnB0ZSAmIFBNX0FERFJfTUFTSyk7CiAKIAlyZXR1cm4gKF9fcHRl ICYgfm9mZnNldF9tYXNrKSB8IChpb3ZhICYgb2Zmc2V0X21hc2spOwogfQoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlvbW11IG1haWxpbmcgbGlzdApp b21tdUBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4Zm91bmRh dGlvbi5vcmcvbWFpbG1hbi9saXN0aW5mby9pb21tdQ== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 145BCC677D4 for ; Mon, 8 Oct 2018 18:53:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C988F21479 for ; Mon, 8 Oct 2018 18:53:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="HyMzOWLQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C988F21479 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732710AbeJICGX (ORCPT ); Mon, 8 Oct 2018 22:06:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:56692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729253AbeJICGW (ORCPT ); Mon, 8 Oct 2018 22:06:22 -0400 Received: from localhost (ip-213-127-77-176.ip.prioritytelecom.net [213.127.77.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3B38D204FD; Mon, 8 Oct 2018 18:53:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539024793; bh=2PRRWKqD93nto6N2HRIpBvTazSvuUJsboEHXb3NKU7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HyMzOWLQfDxxSRDhnMz36i5tIp1hHo35xsWlcDTzVH9Zs1TaRjvW4/FraK3OvlJjR J3kNorYCmYrRb5pNPHkkpzmyl9fcATaUs+APBd9RrR/z7u5rfRlIugkZ23nHD6X6Fx /p6c6vnMJ+M275hOZhH/QMOYzpteQlaCtEAO3X+0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Boris Ostrovsky , Tom Lendacky , Joerg Roedel , iommu@lists.linux-foundation.org, Borislav Petkov , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , kvm@vger.kernel.org, Brijesh Singh , Joerg Roedel Subject: [PATCH 4.18 156/168] iommu/amd: Clear memory encryption mask from physical address Date: Mon, 8 Oct 2018 20:32:16 +0200 Message-Id: <20181008175625.978463772@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181008175620.043587728@linuxfoundation.org> References: <20181008175620.043587728@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Singh, Brijesh commit b3e9b515b08e407ab3a026dc2e4d935c48d05f69 upstream. Boris Ostrovsky reported a memory leak with device passthrough when SME is active. The VFIO driver uses iommu_iova_to_phys() to get the physical address for an iova. This physical address is later passed into vfio_unmap_unpin() to unpin the memory. The vfio_unmap_unpin() uses pfn_valid() before unpinning the memory. The pfn_valid() check was failing because encryption mask was part of the physical address returned. This resulted in the memory not being unpinned and therefore leaked after the guest terminates. The memory encryption mask must be cleared from the physical address in iommu_iova_to_phys(). Fixes: 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption") Reported-by: Boris Ostrovsky Cc: Tom Lendacky Cc: Joerg Roedel Cc: Cc: Borislav Petkov Cc: Paolo Bonzini Cc: Radim Krčmář Cc: kvm@vger.kernel.org Cc: Boris Ostrovsky Cc: # 4.14+ Signed-off-by: Brijesh Singh Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3073,7 +3073,7 @@ static phys_addr_t amd_iommu_iova_to_phy return 0; offset_mask = pte_pgsize - 1; - __pte = *pte & PM_ADDR_MASK; + __pte = __sme_clr(*pte & PM_ADDR_MASK); return (__pte & ~offset_mask) | (iova & offset_mask); }