From patchwork Thu Nov 9 05:44:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daisuke Matsuda (Fujitsu)" X-Patchwork-Id: 163229 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp235424vqs; Wed, 8 Nov 2023 21:47:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IFKIdooMGQAqdr6p8r/boBptKIHPvTsDLnKFgBakYi/Q/X1LM9XPThqo4os7EbgEU7JbQXx X-Received: by 2002:a05:6a21:7748:b0:181:44c:d59 with SMTP id bc8-20020a056a21774800b00181044c0d59mr5209400pzc.31.1699508840816; Wed, 08 Nov 2023 21:47:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699508840; cv=none; d=google.com; s=arc-20160816; b=0S8AJnW2t0gcsDThN6Rolb40EUZJoOuvmc0+kQAPARUM6zaDoxkpH1HeemJk3yYX0k SsCiWoWfCZlJateLcbScTt4beVpbII8BhBID92nD5Nv14gkoonYrtOzQI5b2I/6AtDbv 9c+Uk0G//gZAO2R+0sYnxu07pe6NpTBBJ89FqxLBOwdzcLCYOEFq6UTxVXhMuJuEuk+k 181ggBRrcVm4ETZONXVM/5dz7A7ipp4RfX1VtNhuoHQLMypydzElCcJEQW4QLWcZSbEI Cne3YQ2EPPi8ElenmlMHMRnoY7veHwPh1jW75PBWK6pB5Yj4/AD7Vx+eEkG3dMZYKusb Blsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=L40jHUu+0KpWnqHhETcT/MQdmSkNU4vnkVLoDMCnl50=; fh=Kza5GnIpHUYQ1cZy2y92CPl6XrzN03vBDGjf8wFwAS8=; b=OBW8CoacubbGsP85D/SxsSQzbLOtTQe2YWplvp38GTQ0xDuOJy4UH6+hOHoMyI3OfE 1DvZNpbQt0C3H5IUkLMzjPxyEerqGErKrWc4eJNOvehUnPdMhn8wcwA92rpxVBByZxtD egWJHh9/axCdrwGVGLL6A19VMZiJHe+iFzMSyioc5YCb4hJTY7SBZOpDyPxo3o6W2lQV OuMD6/vAXWB2pAllIJnSOH73oXQxndzgZao8IH/KgOFV/bx5Fi0B0Qs8Ei92fA2NzzAs kAXRTaoBpDOreYmnyBJI9icdYL74tSKeGQ+/qGjpn5PKhTwGXtIT69dCdNaJPydpYP+T vGvA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id s8-20020a170902ea0800b001c62e2ce6a7si4419147plg.445.2023.11.08.21.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 21:47:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 1424D80FCBC8; Wed, 8 Nov 2023 21:46:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232521AbjKIFps (ORCPT + 32 others); Thu, 9 Nov 2023 00:45:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232462AbjKIFpp (ORCPT ); Thu, 9 Nov 2023 00:45:45 -0500 Received: from esa8.hc1455-7.c3s2.iphmx.com (esa8.hc1455-7.c3s2.iphmx.com [139.138.61.253]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8780426AF; Wed, 8 Nov 2023 21:45:42 -0800 (PST) X-IronPort-AV: E=McAfee;i="6600,9927,10888"; a="127068098" X-IronPort-AV: E=Sophos;i="6.03,288,1694703600"; d="scan'208";a="127068098" Received: from unknown (HELO oym-r1.gw.nic.fujitsu.com) ([210.162.30.89]) by esa8.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2023 14:45:39 +0900 Received: from oym-m1.gw.nic.fujitsu.com (oym-nat-oym-m1.gw.nic.fujitsu.com [192.168.87.58]) by oym-r1.gw.nic.fujitsu.com (Postfix) with ESMTP id A1870C14A1; Thu, 9 Nov 2023 14:45:37 +0900 (JST) Received: from m3003.s.css.fujitsu.com (sqmail-3003.b.css.fujitsu.com [10.128.233.114]) by oym-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id D9B34D9C60; Thu, 9 Nov 2023 14:45:36 +0900 (JST) Received: from localhost.localdomain (unknown [10.118.237.107]) by m3003.s.css.fujitsu.com (Postfix) with ESMTP id 94AAE2005323; Thu, 9 Nov 2023 14:45:36 +0900 (JST) From: Daisuke Matsuda To: linux-rdma@vger.kernel.org, leon@kernel.org, jgg@ziepe.ca, zyjzyj2000@gmail.com Cc: linux-kernel@vger.kernel.org, rpearsonhpe@gmail.com, yangx.jy@fujitsu.com, lizhijian@fujitsu.com, y-goto@fujitsu.com, Daisuke Matsuda Subject: [PATCH for-next v7 4/7] RDMA/rxe: Add page invalidation support Date: Thu, 9 Nov 2023 14:44:49 +0900 Message-Id: <94f8aa4a634936295ae5772d6df6978c3b5de268.1699503619.git.matsuda-daisuke@fujitsu.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 08 Nov 2023 21:46:32 -0800 (PST) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782064182285009598 X-GMAIL-MSGID: 1782064182285009598 On page invalidation, an MMU notifier callback is invoked to unmap DMA addresses and update the driver page table(umem_odp->dma_list). It also sets the corresponding entries in MR xarray to NULL to prevent any access. The callback is registered when an ODP-enabled MR is created. Signed-off-by: Daisuke Matsuda --- drivers/infiniband/sw/rxe/Makefile | 2 + drivers/infiniband/sw/rxe/rxe_odp.c | 57 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 drivers/infiniband/sw/rxe/rxe_odp.c diff --git a/drivers/infiniband/sw/rxe/Makefile b/drivers/infiniband/sw/rxe/Makefile index 5395a581f4bb..93134f1d1d0c 100644 --- a/drivers/infiniband/sw/rxe/Makefile +++ b/drivers/infiniband/sw/rxe/Makefile @@ -23,3 +23,5 @@ rdma_rxe-y := \ rxe_task.o \ rxe_net.o \ rxe_hw_counters.o + +rdma_rxe-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += rxe_odp.o diff --git a/drivers/infiniband/sw/rxe/rxe_odp.c b/drivers/infiniband/sw/rxe/rxe_odp.c new file mode 100644 index 000000000000..ea55b79be0c6 --- /dev/null +++ b/drivers/infiniband/sw/rxe/rxe_odp.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB +/* + * Copyright (c) 2022-2023 Fujitsu Ltd. All rights reserved. + */ + +#include + +#include + +#include "rxe.h" + +static void rxe_mr_unset_xarray(struct rxe_mr *mr, unsigned long start, + unsigned long end) +{ + unsigned long upper = rxe_mr_iova_to_index(mr, end - 1); + unsigned long lower = rxe_mr_iova_to_index(mr, start); + void *entry; + + XA_STATE(xas, &mr->page_list, lower); + + /* make elements in xarray NULL */ + xas_lock(&xas); + xas_for_each(&xas, entry, upper) + xas_store(&xas, NULL); + xas_unlock(&xas); +} + +static bool rxe_ib_invalidate_range(struct mmu_interval_notifier *mni, + const struct mmu_notifier_range *range, + unsigned long cur_seq) +{ + struct ib_umem_odp *umem_odp = + container_of(mni, struct ib_umem_odp, notifier); + struct rxe_mr *mr = umem_odp->private; + unsigned long start, end; + + if (!mmu_notifier_range_blockable(range)) + return false; + + mutex_lock(&umem_odp->umem_mutex); + mmu_interval_set_seq(mni, cur_seq); + + start = max_t(u64, ib_umem_start(umem_odp), range->start); + end = min_t(u64, ib_umem_end(umem_odp), range->end); + + rxe_mr_unset_xarray(mr, start, end); + + /* update umem_odp->dma_list */ + ib_umem_odp_unmap_dma_pages(umem_odp, start, end); + + mutex_unlock(&umem_odp->umem_mutex); + return true; +} + +const struct mmu_interval_notifier_ops rxe_mn_ops = { + .invalidate = rxe_ib_invalidate_range, +};