From patchwork Wed Apr 19 05:51:57 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: 85189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp134314vqo; Tue, 18 Apr 2023 22:58:20 -0700 (PDT) X-Google-Smtp-Source: AKy350YeQoVcwcjs91Iq2NI981AYMRNWG6AbLA43OUbDZEHYfHYMKdAObQGUR7WDDqbiaBnImoZG X-Received: by 2002:a05:6830:1d4d:b0:6a4:fab4:56a6 with SMTP id p13-20020a0568301d4d00b006a4fab456a6mr2503198oth.24.1681883900759; Tue, 18 Apr 2023 22:58:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681883900; cv=none; d=google.com; s=arc-20160816; b=NXBIXkppeZF0dv2EAVrnJBoZhjDLsHVLxfBBxivTV8NRjV6yF6eEIIfk5XK/M6nel3 okk0mv9gKSzY108TCn7HjfIFhD3UUFHF81y6hPc8AceSmM+OcUIyl7+8IUIol8Jj1nFI wd9nyjmdBW1U4e/x6XyczOfKKKSNr1/Jr+cH4BNiFVPW/O92o8GAD1tM5d01/mDOOOTx v4kStSK/Jz1ERw5mbyWbeDyMnljMmNh30YkNJIvDqQzXxcwTzDR2n/yUwGudcVRRdtQ2 fslw/Amu9rfYCHFGdaCmt81ywZz8sHQdXsLOroUKmtCLMP0MThckdTLqeYFDwWG6TX2z QYfg== 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=/d/gKhpixQ0HVmDOvua8D34bbXr8rQNaqkp6usVN8CQ=; b=Ybt/HbXsB20IuA9n0uhB05c84gKPlhWMW8LXOVq8HwErAGloNCACQWwHa1R6QzAQEk PvPSNNesJQ9iz5uEP6XLjN1PablJIFRr8jKzvSOz/NKeB6eZ3IuQSTXJxzTRRrH9QIGZ CEwnC5CSbB7OWoaKBZFGw2N3H7LH3PBVxhEhb3kxqxOm5+62TU5KGN7NHXo2vmXgmEB6 oJMCm680LYwjHkQeDQ1SjrP12s5VgzW/4unOGpJjHwh2XVQ9IU4BsGEyeTV3TezCM+hw kRjKbU5nfuCKdJyywiGhYCwBjvZDVzLH5yaAGxi6JUpzpXSJ13qLfnr9KTGb93q+d2Fu r+Cw== 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 n17-20020a0568300a9100b006a44e58168asi1286950otu.10.2023.04.18.22.58.08; Tue, 18 Apr 2023 22:58:20 -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 S231891AbjDSFxW (ORCPT + 99 others); Wed, 19 Apr 2023 01:53:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231684AbjDSFxI (ORCPT ); Wed, 19 Apr 2023 01:53:08 -0400 Received: from esa9.hc1455-7.c3s2.iphmx.com (esa9.hc1455-7.c3s2.iphmx.com [139.138.36.223]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B65D57282; Tue, 18 Apr 2023 22:53:05 -0700 (PDT) X-IronPort-AV: E=McAfee;i="6600,9927,10684"; a="102241777" X-IronPort-AV: E=Sophos;i="5.99,208,1677510000"; d="scan'208";a="102241777" Received: from unknown (HELO oym-r4.gw.nic.fujitsu.com) ([210.162.30.92]) by esa9.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2023 14:53:04 +0900 Received: from oym-m2.gw.nic.fujitsu.com (oym-nat-oym-m2.gw.nic.fujitsu.com [192.168.87.59]) by oym-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id 4FBB0DDA7D; Wed, 19 Apr 2023 14:53:02 +0900 (JST) Received: from m3003.s.css.fujitsu.com (m3003.s.css.fujitsu.com [10.128.233.114]) by oym-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id 2AA3723754; Wed, 19 Apr 2023 14:52:56 +0900 (JST) Received: from localhost.localdomain (unknown [10.118.237.106]) by m3003.s.css.fujitsu.com (Postfix) with ESMTP id DE0DA2005334; Wed, 19 Apr 2023 14:52:55 +0900 (JST) From: Daisuke Matsuda To: linux-rdma@vger.kernel.org, leonro@nvidia.com, jgg@nvidia.com, zyjzyj2000@gmail.com Cc: linux-kernel@vger.kernel.org, rpearsonhpe@gmail.com, yangx.jy@fujitsu.com, lizhijian@fujitsu.com, Daisuke Matsuda Subject: [PATCH for-next v4 5/8] RDMA/rxe: Add page invalidation support Date: Wed, 19 Apr 2023 14:51:57 +0900 Message-Id: <6746c75a554639ce5473c03c80d7582cca6bf2eb.1681882651.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=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763583092787546860?= X-GMAIL-MSGID: =?utf-8?q?1763583092787546860?= 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 set 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 | 56 +++++++++++++++++++++++++++++ 2 files changed, 58 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..b69b25e0fef6 --- /dev/null +++ b/drivers/infiniband/sw/rxe/rxe_odp.c @@ -0,0 +1,56 @@ +// 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, upper, idx; + + lower = rxe_mr_iova_to_index(mr, start); + upper = rxe_mr_iova_to_index(mr, end); + + /* make elements in xarray NULL */ + spin_lock(&mr->page_list.xa_lock); + for (idx = lower; idx <= upper; idx++) + __xa_erase(&mr->page_list, idx); + spin_unlock(&mr->page_list.xa_lock); +} + +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, +};