From patchwork Fri Sep 8 06:26:45 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: 137712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp436952vqo; Fri, 8 Sep 2023 03:08:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQdMBYw7z2hSxiwAfq9QmW+2izeoAEFJi0WanbPmi3McA4tn78E4ytY5kCEWZmztBqel0q X-Received: by 2002:aa7:c3d4:0:b0:51e:309:2e11 with SMTP id l20-20020aa7c3d4000000b0051e03092e11mr1408881edr.36.1694167717936; Fri, 08 Sep 2023 03:08:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694167717; cv=none; d=google.com; s=arc-20160816; b=XXJZGOMbIFvHt7DsEGRwJsxt/NuYDEH6Hkv+M6kkMGrdjH6jhtB6i6rYZAhHLIYlHx 2Y0+RNgw6eir70jw8XWAaH4JRxeuQQFSelh8f+wlr3r1GcNcnvMpxppBxw+5QD/Dmlqf OTHrphAeBuneQBveYN91nq6e8KwkxSrDuODCCRwUhNy7ishQIv1VixhnTnT1a1g3F1eK TOO51whLhFvix9MU1JVzvMfEUpWTy4KiPhVk/rSB5ZMdSuakNqVyKrl9mBwFHNbbTfZh CY89XESiTu92oz0f3HbtcZZS7yyCvQ7hKY5IeTLVKy4FiviSuZ2E0dG2wVo81x9rdhh0 aVIQ== 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=dn7cj38k2G3mpStNC1hI53nQLMRoJcjBgYLrJpf4Wd4=; fh=Kza5GnIpHUYQ1cZy2y92CPl6XrzN03vBDGjf8wFwAS8=; b=ZaTHa9VKJiZ4+khXg/cL735OJV2KVLA5J5l/UZvFz/L+S7WwmLE3cXf51IATAJu3U0 KTSUlAMGblPZcj4bj/p2i5yKzYC1XNKvzsVN/zHwQs0rn5XweDhotgXzbMjhjq33xdru XjD/jlpOfSpUaCHycbRtLO1796REtIx7jLfg6UsRjkpUoZCDC/SUWv5j7SIa08YmShQe BNb5pvJNS2CvVSIqS8Q/2iFjROXqLaWt758jo64NiLKqS4baxedbJ48rvUy5Sbaytgvw EtOWMoghWPDq39Lkb0V1lYip37Pzw1QTwdyrOBpGsp4AEsTmi9hEo9zI51/F0LJMmTy1 UfKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h15-20020aa7de0f000000b0052e8d878e95si1232690edv.476.2023.09.08.03.08.25; Fri, 08 Sep 2023 03:08:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242001AbjIHG1S (ORCPT + 42 others); Fri, 8 Sep 2023 02:27:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239031AbjIHG1P (ORCPT ); Fri, 8 Sep 2023 02:27:15 -0400 Received: from esa7.hc1455-7.c3s2.iphmx.com (esa7.hc1455-7.c3s2.iphmx.com [139.138.61.252]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A6071BFF; Thu, 7 Sep 2023 23:27:10 -0700 (PDT) X-IronPort-AV: E=McAfee;i="6600,9927,10826"; a="110091217" X-IronPort-AV: E=Sophos;i="6.02,236,1688396400"; d="scan'208";a="110091217" Received: from unknown (HELO yto-r2.gw.nic.fujitsu.com) ([218.44.52.218]) by esa7.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2023 15:27:07 +0900 Received: from yto-m4.gw.nic.fujitsu.com (yto-nat-yto-m4.gw.nic.fujitsu.com [192.168.83.67]) by yto-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 3BB69C68EA; Fri, 8 Sep 2023 15:27:04 +0900 (JST) Received: from m3002.s.css.fujitsu.com (msm3.b.css.fujitsu.com [10.128.233.104]) by yto-m4.gw.nic.fujitsu.com (Postfix) with ESMTP id 7E66BE0C26; Fri, 8 Sep 2023 15:27:03 +0900 (JST) Received: from localhost.localdomain (unknown [10.118.237.107]) by m3002.s.css.fujitsu.com (Postfix) with ESMTP id 4B5A3200537C; Fri, 8 Sep 2023 15:27:03 +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 v6 4/7] RDMA/rxe: Add page invalidation support Date: Fri, 8 Sep 2023 15:26:45 +0900 Message-Id: <1566fd3c63e4dac66717731e2c7a80039244e3af.1694153251.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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776463609468400871 X-GMAIL-MSGID: 1776463609468400871 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 | 64 +++++++++++++++++++++++++++++ 2 files changed, 66 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..834fb1a84800 --- /dev/null +++ b/drivers/infiniband/sw/rxe/rxe_odp.c @@ -0,0 +1,64 @@ +// 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 lower = rxe_mr_iova_to_index(mr, start); + unsigned long upper = rxe_mr_iova_to_index(mr, end - 1); + void *entry; + + XA_STATE(xas, &mr->page_list, lower); + + /* make elements in xarray NULL */ + xas_lock(&xas); + while (true) { + xas_store(&xas, NULL); + + entry = xas_next(&xas); + if (xas_retry(&xas, entry) || (xas.xa_index <= upper)) + continue; + + break; + } + 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, +};