From patchwork Fri Sep 25 16:18:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Gonda X-Patchwork-Id: 263445 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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 27171C4727C for ; Fri, 25 Sep 2020 16:20:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C77D620809 for ; Fri, 25 Sep 2020 16:20:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JnoZJeTK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729577AbgIYQUL (ORCPT ); Fri, 25 Sep 2020 12:20:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729575AbgIYQUK (ORCPT ); Fri, 25 Sep 2020 12:20:10 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2AB1C0613CE for ; Fri, 25 Sep 2020 09:20:10 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id 205so2332344qkd.2 for ; Fri, 25 Sep 2020 09:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=akC9fS9hfa1g5J4aF13FcmNLCU553fW6aB4jLeCPAgo=; b=JnoZJeTK9FdxutyNiGss8AJS2y073pDqaM65POu5LWEhZ7wYjMpc7yRHWdTnwGvNTN xifVm3Yeo3kJvXEOJqgs0dy6xEsG0MQS8i9DjNkwDe9kzTaE7xaLiejlNudEoHZUyaWy mt75Jc65i4OP1dozCX5ZVWU1JN/3SLFRNUFKHLFrw5228cU7B40yHmKDGHAc6ugy9NLy gnXO/sOP3Maeio0wFwFVqUiwQ7gMq4P35fkIBCwBwiNCnzaGcde0pG1b55MX/SaHyuun xgRDdhHGpYNAYk6D9NZo3ku0cmouIsxW1MT9OkLRqllhbuPOt7MD49vfesPt60AITEL7 D3oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=akC9fS9hfa1g5J4aF13FcmNLCU553fW6aB4jLeCPAgo=; b=hCkN2cj1fxMwlcRWyUoNYfv1qOcwZNyAQX5zZYcKEBU/GkCxXX9GnzAT4PVMe3ahLE Y4GZN14w/3SqsA+6kRbLZG6ssP3EWr6nJ7e8pQsL1vBKXgD4wH5aSMusCO1Pxt9OpOV5 FCirbZ7WbYIRM80w2iGcXugURQT/7w75bKrEh1V6U3yBntDy4x+yRmH91cf9LGMI7wkj zKqK3gvDG/tcvMdoXwqy36KW/zqiwDFas5jqx1DIWaPCFLI9/c3bRfTzRn9yn417v8Ml HZmaBNOEevv1Usg+UfSmu+x16oeGm21Ill7KNFDO9Jz5mADLlm32QEkJ5jvs+5SgECqu YARg== X-Gm-Message-State: AOAM532c6cX4DcWmF8s13krYn5K5rGb0CX6f+MaUZ3w5M/DRwocApe5E XICPaqlj4lLKtBfZYViIq5XF6uDwlbo5Et7s5x6p/OfRrPPMoSDTgrA5KyZ5amYPU39Ye4KtoaG rKhLd7rEF++VyOgWF/yWHnfpFszgghGawrZj0XoZIXhbFyxuAsRjYebJ3KcgMzQ== X-Google-Smtp-Source: ABdhPJxOiQtqUDdD7+sbKkjme5nhzOeiXuYPU+Q9U0mgJYvBVekChAnWS2uEZM1W7PQU4ia9H1u3ErX+da0= Sender: "pgonda via sendgmr" X-Received: from pgonda1.kir.corp.google.com ([2620:0:1008:1101:f693:9fff:fef4:e3a2]) (user=pgonda job=sendgmr) by 2002:a0c:c446:: with SMTP id t6mr143634qvi.55.1601050809857; Fri, 25 Sep 2020 09:20:09 -0700 (PDT) Date: Fri, 25 Sep 2020 09:18:57 -0700 In-Reply-To: <20200925161916.204667-1-pgonda@google.com> Message-Id: <20200925161916.204667-12-pgonda@google.com> Mime-Version: 1.0 References: <20200925161916.204667-1-pgonda@google.com> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH 11/30 for 5.4] x86/mm: unencrypted non-blocking DMA allocations use coherent pools From: Peter Gonda To: stable@vger.kernel.org Cc: Peter Gonda , David Rientjes , Christoph Hellwig Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Rientjes upstream 82fef0ad811fb5976cf36ccc3d2c3bc0195dfb72 commit. When CONFIG_AMD_MEM_ENCRYPT is enabled and a device requires unencrypted DMA, all non-blocking allocations must originate from the atomic DMA coherent pools. Select CONFIG_DMA_COHERENT_POOL for CONFIG_AMD_MEM_ENCRYPT. Signed-off-by: David Rientjes Signed-off-by: Christoph Hellwig Signed-off-by: Peter Gonda --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8ef85139553f..be8746e9d864 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1530,6 +1530,7 @@ config X86_CPA_STATISTICS config AMD_MEM_ENCRYPT bool "AMD Secure Memory Encryption (SME) support" depends on X86_64 && CPU_SUP_AMD + select DMA_COHERENT_POOL select DYNAMIC_PHYSICAL_MASK select ARCH_USE_MEMREMAP_PROT select ARCH_HAS_FORCE_DMA_UNENCRYPTED