From patchwork Thu Jan 10 21:09:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Aziz X-Patchwork-Id: 10756883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 85F1417E1 for ; Thu, 10 Jan 2019 21:10:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74B7629B85 for ; Thu, 10 Jan 2019 21:10:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6880A29BCE; Thu, 10 Jan 2019 21:10:36 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY 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 C97AD29B9C for ; Thu, 10 Jan 2019 21:10:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 215698E0006; Thu, 10 Jan 2019 16:10:34 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 19FDD8E0001; Thu, 10 Jan 2019 16:10:34 -0500 (EST) 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 0417A8E0006; Thu, 10 Jan 2019 16:10:33 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id B65FF8E0001 for ; Thu, 10 Jan 2019 16:10:33 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id t2so8661081pfj.15 for ; Thu, 10 Jan 2019 13:10:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:in-reply-to:references; bh=65bJHm+xMDUqKLWlJszEVdy7uVRxf98qoGoZGFoK+HQ=; b=lWeNqww2hsoW4+GgpVi0n3/63LknkStkdf7gs3v0RUfbBzbFez67CYSbV31QKS32zO 5DB6SdAX6JzoBsHyyjsU0BY1UEprdm9IvlXz1kBhCSdTXAdneGQcMLOzxF6jhJoekX4X zCOo1ydsauJ8BK/Br1uuivGZaWCfCqpfQPfHpOGnzRfLMmnwt402kYcM+Uhi1FUQoROV KWPm/cak8EyLupr1zC6XdyFaUxRskyRlaYo2dNj/sxj5A+gnpksZgMJTRytVYrn2tL0W +6PfaI8InsXo46DIjLuFSMLmW62GwzPvp/WrPTR5ArLKYeZlgRfrOprrd6Z6CN3Hs6pD hcrw== X-Gm-Message-State: AJcUukdVC2CuSJLVLW5uRtvjUZncWrvWKDhlLFAvn1x7JGIcBmpch/4q nQNPxkd1iMOyiHFcyOdHv8RA42YL8CmILZyXxArhrS4amQDpsM55+V2ZBnnbZu+HIJgThSw/hbW KXn9k7kB6bRbi2k9jRd0axPJCRx68c+7LzIHkWuh9dRNVl2pjYDM6i9e9UzJynCl++g== X-Received: by 2002:a63:e344:: with SMTP id o4mr7872463pgj.158.1547154633403; Thu, 10 Jan 2019 13:10:33 -0800 (PST) X-Google-Smtp-Source: ALg8bN6GHBwit4rsCN7ReK4yzvfTixUvS0Tht1Kwaa1WwE5LekgIF61Vr5+PUm2ZrGzLkAuxoQ6K X-Received: by 2002:a63:e344:: with SMTP id o4mr7872429pgj.158.1547154632654; Thu, 10 Jan 2019 13:10:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547154632; cv=none; d=google.com; s=arc-20160816; b=KkAIdDaPvrWheGNh5zSneZAVaictOMJ+nRJ8lNlu0vIpeP2gCfWg67azjDTVhsWSRj BSvNoME61vvS4h+f3Vb0zfnHA9fOolxnicH2Ll8M7OrsuHO1fUMyXR6HubVopEsgdJe2 V06nYRNAq4zkMMzEY7a5/D30rs5QHkELiDkcRpZQuqpuUx2krteZIGMybOMS4eb5yAL6 0TXGkhZGfyCRXMo0Im4eU0pD9TotNGD9katRKCTbxnsxj+njg4OV22J3QiT9J9HlU9SC rj42UkbV2KTG1XDajG3iPGzy+CFUyOd83jhpvVARY2qlTA20oi4+uy3BYmRXeRuIM2kv 2CFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=65bJHm+xMDUqKLWlJszEVdy7uVRxf98qoGoZGFoK+HQ=; b=H76xy+Tn/lLzz0ApKnI7DQT7y/eMeHW6r++kjpC9e3yB2pgE86pYeTYs+CMkhfztW7 gnxBTqmrel6ejnBz/6VjyGHv7DJR24eMWreaBkwKvt9uWPOgSuITnUgpO9YShiy6a5hP 53TneTo9dAeGVt5GENy0H1wk7aWsbUZUnEKuliGJkAtXSuPJCBMllop0WMOkFVnDAQci 9EQ6Tp3ZyWuzfTpzNRXIm75LuynqzXRSy2kagV1HB+uniEzpN4uWCSBoZ6EgxWaqgtAF 4xHhqyaveO+VkOK/DaemasuTbKEwyH0KWK3F4KR7pxv1mK62qsgglcu5Wohk6gSpbykK kHJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=QOSqm8Zv; spf=pass (google.com: domain of khalid.aziz@oracle.com designates 156.151.31.86 as permitted sender) smtp.mailfrom=khalid.aziz@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2130.oracle.com (userp2130.oracle.com. [156.151.31.86]) by mx.google.com with ESMTPS id b89si9544153pfj.207.2019.01.10.13.10.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 13:10:32 -0800 (PST) Received-SPF: pass (google.com: domain of khalid.aziz@oracle.com designates 156.151.31.86 as permitted sender) client-ip=156.151.31.86; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=QOSqm8Zv; spf=pass (google.com: domain of khalid.aziz@oracle.com designates 156.151.31.86 as permitted sender) smtp.mailfrom=khalid.aziz@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0AL8vZq041442; Thu, 10 Jan 2019 21:10:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : in-reply-to : references; s=corp-2018-07-02; bh=65bJHm+xMDUqKLWlJszEVdy7uVRxf98qoGoZGFoK+HQ=; b=QOSqm8Zv7K4bMlhX/bbVjgLCNRTn/vGcgXRjPQDdCQ2rFWjC1jE5LPhpr0gENIIpwgu4 sz7a/UkbO23yDajdO+GXR034Mh5eIOQRKEWxMBO/MAWFMXDnD44/asxTyfBHnplQOl0/ xM03rfATk55d2MsnRnzeazoyMfZVlBG4lqi/QcaOe1G7JZs0hWiPGt4/F0RYcVJehdPd uFq1W6pfDY2BTLS1yXN5jW84mKURQytSbef5qWfTdzHCQRpyD5+DDzP6AlTYUpdvzBB5 J6YveHf8bzwo5ZZ7E9OElu46qdWTWUcuaaJLnoelH74Dj/mMvWz23RVaHcEkpd6Hf45P yg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2ptm0uhnu3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jan 2019 21:10:22 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0ALALtI011630 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jan 2019 21:10:21 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0ALAK3i021200; Thu, 10 Jan 2019 21:10:20 GMT Received: from concerto.internal (/24.9.64.241) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 10 Jan 2019 13:10:20 -0800 From: Khalid Aziz To: juergh@gmail.com, tycho@tycho.ws, jsteckli@amazon.de, ak@linux.intel.com, torvalds@linux-foundation.org, liran.alon@oracle.com, keescook@google.com, konrad.wilk@oracle.com Cc: Juerg Haefliger , deepa.srinivasan@oracle.com, chris.hyser@oracle.com, tyhicks@canonical.com, dwmw@amazon.co.uk, andrew.cooper3@citrix.com, jcm@redhat.com, boris.ostrovsky@oracle.com, kanth.ghatraju@oracle.com, joao.m.martins@oracle.com, jmattson@google.com, pradeep.vincent@oracle.com, john.haxby@oracle.com, tglx@linutronix.de, kirill.shutemov@linux.intel.com, hch@lst.de, steven.sistare@oracle.com, kernel-hardening@lists.openwall.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tycho Andersen , Khalid Aziz Subject: [RFC PATCH v7 04/16] swiotlb: Map the buffer if it was unmapped by XPFO Date: Thu, 10 Jan 2019 14:09:36 -0700 Message-Id: <98f9b9be522d694d5a52640dd1dfbdd14ca6f8e5.1547153058.git.khalid.aziz@oracle.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9132 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=868 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901100164 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 From: Juerg Haefliger v6: * guard against lookup_xpfo() returning NULL CC: Konrad Rzeszutek Wilk Signed-off-by: Juerg Haefliger Signed-off-by: Tycho Andersen Signed-off-by: Khalid Aziz Reviewed-by: Konrad Rzeszutek Wilk --- include/linux/xpfo.h | 4 ++++ kernel/dma/swiotlb.c | 3 ++- mm/xpfo.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/linux/xpfo.h b/include/linux/xpfo.h index a39259ce0174..e38b823f44e3 100644 --- a/include/linux/xpfo.h +++ b/include/linux/xpfo.h @@ -35,6 +35,8 @@ void xpfo_kunmap(void *kaddr, struct page *page); void xpfo_alloc_pages(struct page *page, int order, gfp_t gfp); void xpfo_free_pages(struct page *page, int order); +bool xpfo_page_is_unmapped(struct page *page); + #else /* !CONFIG_XPFO */ static inline void xpfo_kmap(void *kaddr, struct page *page) { } @@ -42,6 +44,8 @@ static inline void xpfo_kunmap(void *kaddr, struct page *page) { } static inline void xpfo_alloc_pages(struct page *page, int order, gfp_t gfp) { } static inline void xpfo_free_pages(struct page *page, int order) { } +static inline bool xpfo_page_is_unmapped(struct page *page) { return false; } + #endif /* CONFIG_XPFO */ #endif /* _LINUX_XPFO_H */ diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 045930e32c0e..820a54b57491 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -396,8 +396,9 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr, { unsigned long pfn = PFN_DOWN(orig_addr); unsigned char *vaddr = phys_to_virt(tlb_addr); + struct page *page = pfn_to_page(pfn); - if (PageHighMem(pfn_to_page(pfn))) { + if (PageHighMem(page) || xpfo_page_is_unmapped(page)) { /* The buffer does not have a mapping. Map it in and copy */ unsigned int offset = orig_addr & ~PAGE_MASK; char *buffer; diff --git a/mm/xpfo.c b/mm/xpfo.c index bff24afcaa2e..cdbcbac582d5 100644 --- a/mm/xpfo.c +++ b/mm/xpfo.c @@ -220,3 +220,18 @@ void xpfo_kunmap(void *kaddr, struct page *page) spin_unlock(&xpfo->maplock); } EXPORT_SYMBOL(xpfo_kunmap); + +bool xpfo_page_is_unmapped(struct page *page) +{ + struct xpfo *xpfo; + + if (!static_branch_unlikely(&xpfo_inited)) + return false; + + xpfo = lookup_xpfo(page); + if (unlikely(!xpfo) && !xpfo->inited) + return false; + + return test_bit(XPFO_PAGE_UNMAPPED, &xpfo->flags); +} +EXPORT_SYMBOL(xpfo_page_is_unmapped);