From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerome Glisse Subject: Re: [PATCH hmm 04/15] mm/hmm: define the pre-processor related parts of hmm.h even if disabled Date: Mon, 21 Oct 2019 14:31:41 -0400 Message-ID: <20191021183141.GB3177@redhat.com> References: <20191015181242.8343-1-jgg@ziepe.ca> <20191015181242.8343-5-jgg@ziepe.ca> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191015181242.8343-5-jgg-uk2M96/98Pc@public.gmane.org> Content-Disposition: inline List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: Jason Gunthorpe Cc: Andrea Arcangeli , Ralph Campbell , linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, John Hubbard , Felix.Kuehling-5C7GfCeVMHo@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, Jason Gunthorpe , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Ben Skeggs T24gVHVlLCBPY3QgMTUsIDIwMTkgYXQgMDM6MTI6MzFQTSAtMDMwMCwgSmFzb24gR3VudGhvcnBl IHdyb3RlOgo+IEZyb206IEphc29uIEd1bnRob3JwZSA8amdnQG1lbGxhbm94LmNvbT4KPiAKPiBP bmx5IHRoZSBmdW5jdGlvbiBjYWxscyBhcmUgc3R1YmJlZCBvdXQgd2l0aCBzdGF0aWMgaW5saW5l cyB0aGF0IGFsd2F5cwo+IGZhaWwuIFRoaXMgaXMgdGhlIHN0YW5kYXJkIHdheSB0byB3cml0ZSBh IGhlYWRlciBmb3IgYW4gb3B0aW9uYWwgY29tcG9uZW50Cj4gYW5kIG1ha2VzIGl0IGVhc2llciBm b3IgZHJpdmVycyB0aGF0IG9ubHkgb3B0aW9uYWxseSBuZWVkIEhNTV9NSVJST1IuCj4gCj4gU2ln bmVkLW9mZi1ieTogSmFzb24gR3VudGhvcnBlIDxqZ2dAbWVsbGFub3guY29tPgoKUmV2aWV3ZWQt Ynk6IErDqXLDtG1lIEdsaXNzZSA8amdsaXNzZUByZWRoYXQuY29tPgoKPiAtLS0KPiAgaW5jbHVk ZS9saW51eC9obW0uaCB8IDU5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLQo+ICBrZXJuZWwvZm9yay5jICAgICAgIHwgIDEgLQo+ICAyIGZpbGVzIGNoYW5nZWQs IDQ3IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9pbmNs dWRlL2xpbnV4L2htbS5oIGIvaW5jbHVkZS9saW51eC9obW0uaAo+IGluZGV4IDhhYzFmZDZhODFh ZjhmLi4yNjY2ZWIwOGE0MDYxNSAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2xpbnV4L2htbS5oCj4g KysrIGIvaW5jbHVkZS9saW51eC9obW0uaAo+IEBAIC02Miw4ICs2Miw2IEBACj4gICNpbmNsdWRl IDxsaW51eC9rY29uZmlnLmg+Cj4gICNpbmNsdWRlIDxhc20vcGd0YWJsZS5oPgo+ICAKPiAtI2lm ZGVmIENPTkZJR19ITU1fTUlSUk9SCj4gLQo+ICAjaW5jbHVkZSA8bGludXgvZGV2aWNlLmg+Cj4g ICNpbmNsdWRlIDxsaW51eC9taWdyYXRlLmg+Cj4gICNpbmNsdWRlIDxsaW51eC9tZW1yZW1hcC5o Pgo+IEBAIC0zNzQsNiArMzcyLDE1IEBAIHN0cnVjdCBobW1fbWlycm9yIHsKPiAgCXN0cnVjdCBs aXN0X2hlYWQJCWxpc3Q7Cj4gIH07Cj4gIAo+ICsvKgo+ICsgKiBSZXRyeSBmYXVsdCBpZiBub24t YmxvY2tpbmcsIGRyb3AgbW1hcF9zZW0gYW5kIHJldHVybiAtRUFHQUlOIGluIHRoYXQgY2FzZS4K PiArICovCj4gKyNkZWZpbmUgSE1NX0ZBVUxUX0FMTE9XX1JFVFJZCQkoMSA8PCAwKQo+ICsKPiAr LyogRG9uJ3QgZmF1bHQgaW4gbWlzc2luZyBQVEVzLCBqdXN0IHNuYXBzaG90IHRoZSBjdXJyZW50 IHN0YXRlLiAqLwo+ICsjZGVmaW5lIEhNTV9GQVVMVF9TTkFQU0hPVAkJKDEgPDwgMSkKPiArCj4g KyNpZmRlZiBDT05GSUdfSE1NX01JUlJPUgo+ICBpbnQgaG1tX21pcnJvcl9yZWdpc3RlcihzdHJ1 Y3QgaG1tX21pcnJvciAqbWlycm9yLCBzdHJ1Y3QgbW1fc3RydWN0ICptbSk7Cj4gIHZvaWQgaG1t X21pcnJvcl91bnJlZ2lzdGVyKHN0cnVjdCBobW1fbWlycm9yICptaXJyb3IpOwo+ICAKPiBAQCAt MzgzLDE0ICszOTAsNiBAQCB2b2lkIGhtbV9taXJyb3JfdW5yZWdpc3RlcihzdHJ1Y3QgaG1tX21p cnJvciAqbWlycm9yKTsKPiAgaW50IGhtbV9yYW5nZV9yZWdpc3RlcihzdHJ1Y3QgaG1tX3Jhbmdl ICpyYW5nZSwgc3RydWN0IGhtbV9taXJyb3IgKm1pcnJvcik7Cj4gIHZvaWQgaG1tX3JhbmdlX3Vu cmVnaXN0ZXIoc3RydWN0IGhtbV9yYW5nZSAqcmFuZ2UpOwo+ICAKPiAtLyoKPiAtICogUmV0cnkg ZmF1bHQgaWYgbm9uLWJsb2NraW5nLCBkcm9wIG1tYXBfc2VtIGFuZCByZXR1cm4gLUVBR0FJTiBp biB0aGF0IGNhc2UuCj4gLSAqLwo+IC0jZGVmaW5lIEhNTV9GQVVMVF9BTExPV19SRVRSWQkJKDEg PDwgMCkKPiAtCj4gLS8qIERvbid0IGZhdWx0IGluIG1pc3NpbmcgUFRFcywganVzdCBzbmFwc2hv dCB0aGUgY3VycmVudCBzdGF0ZS4gKi8KPiAtI2RlZmluZSBITU1fRkFVTFRfU05BUFNIT1QJCSgx IDw8IDEpCj4gLQo+ICBsb25nIGhtbV9yYW5nZV9mYXVsdChzdHJ1Y3QgaG1tX3JhbmdlICpyYW5n ZSwgdW5zaWduZWQgaW50IGZsYWdzKTsKPiAgCj4gIGxvbmcgaG1tX3JhbmdlX2RtYV9tYXAoc3Ry dWN0IGhtbV9yYW5nZSAqcmFuZ2UsCj4gQEAgLTQwMSw2ICs0MDAsNDQgQEAgbG9uZyBobW1fcmFu Z2VfZG1hX3VubWFwKHN0cnVjdCBobW1fcmFuZ2UgKnJhbmdlLAo+ICAJCQkgc3RydWN0IGRldmlj ZSAqZGV2aWNlLAo+ICAJCQkgZG1hX2FkZHJfdCAqZGFkZHJzLAo+ICAJCQkgYm9vbCBkaXJ0eSk7 Cj4gKyNlbHNlCj4gK2ludCBobW1fbWlycm9yX3JlZ2lzdGVyKHN0cnVjdCBobW1fbWlycm9yICpt aXJyb3IsIHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQo+ICt7Cj4gKwlyZXR1cm4gLUVPUE5PVFNVUFA7 Cj4gK30KPiArCj4gK3ZvaWQgaG1tX21pcnJvcl91bnJlZ2lzdGVyKHN0cnVjdCBobW1fbWlycm9y ICptaXJyb3IpCj4gK3sKPiArfQo+ICsKPiAraW50IGhtbV9yYW5nZV9yZWdpc3RlcihzdHJ1Y3Qg aG1tX3JhbmdlICpyYW5nZSwgc3RydWN0IGhtbV9taXJyb3IgKm1pcnJvcikKPiArewo+ICsJcmV0 dXJuIC1FT1BOT1RTVVBQOwo+ICt9Cj4gKwo+ICt2b2lkIGhtbV9yYW5nZV91bnJlZ2lzdGVyKHN0 cnVjdCBobW1fcmFuZ2UgKnJhbmdlKQo+ICt7Cj4gK30KPiArCj4gK3N0YXRpYyBpbmxpbmUgbG9u ZyBobW1fcmFuZ2VfZmF1bHQoc3RydWN0IGhtbV9yYW5nZSAqcmFuZ2UsIHVuc2lnbmVkIGludCBm bGFncykKPiArewo+ICsJcmV0dXJuIC1FT1BOT1RTVVBQOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW5s aW5lIGxvbmcgaG1tX3JhbmdlX2RtYV9tYXAoc3RydWN0IGhtbV9yYW5nZSAqcmFuZ2UsCj4gKwkJ CQkgICAgIHN0cnVjdCBkZXZpY2UgKmRldmljZSwgZG1hX2FkZHJfdCAqZGFkZHJzLAo+ICsJCQkJ ICAgICB1bnNpZ25lZCBpbnQgZmxhZ3MpCj4gK3sKPiArCXJldHVybiAtRU9QTk9UU1VQUDsKPiAr fQo+ICsKPiArc3RhdGljIGlubGluZSBsb25nIGhtbV9yYW5nZV9kbWFfdW5tYXAoc3RydWN0IGht bV9yYW5nZSAqcmFuZ2UsCj4gKwkJCQkgICAgICAgc3RydWN0IGRldmljZSAqZGV2aWNlLAo+ICsJ CQkJICAgICAgIGRtYV9hZGRyX3QgKmRhZGRycywgYm9vbCBkaXJ0eSkKPiArewo+ICsJcmV0dXJu IC1FT1BOT1RTVVBQOwo+ICt9Cj4gKyNlbmRpZgo+ICAKPiAgLyoKPiAgICogSE1NX1JBTkdFX0RF RkFVTFRfVElNRU9VVCAtIGRlZmF1bHQgdGltZW91dCAobXMpIHdoZW4gd2FpdGluZyBmb3IgYSBy YW5nZQo+IEBAIC00MTEsNiArNDQ4LDQgQEAgbG9uZyBobW1fcmFuZ2VfZG1hX3VubWFwKHN0cnVj dCBobW1fcmFuZ2UgKnJhbmdlLAo+ICAgKi8KPiAgI2RlZmluZSBITU1fUkFOR0VfREVGQVVMVF9U SU1FT1VUIDEwMDAKPiAgCj4gLSNlbmRpZiAvKiBJU19FTkFCTEVEKENPTkZJR19ITU1fTUlSUk9S KSAqLwo+IC0KPiAgI2VuZGlmIC8qIExJTlVYX0hNTV9IICovCj4gZGlmZiAtLWdpdCBhL2tlcm5l bC9mb3JrLmMgYi9rZXJuZWwvZm9yay5jCj4gaW5kZXggZjk1NzJmNDE2MTI2MjguLjQ1NjFhNjVk MTlkYjg4IDEwMDY0NAo+IC0tLSBhL2tlcm5lbC9mb3JrLmMKPiArKysgYi9rZXJuZWwvZm9yay5j Cj4gQEAgLTQwLDcgKzQwLDYgQEAKPiAgI2luY2x1ZGUgPGxpbnV4L2JpbmZtdHMuaD4KPiAgI2lu Y2x1ZGUgPGxpbnV4L21tYW4uaD4KPiAgI2luY2x1ZGUgPGxpbnV4L21tdV9ub3RpZmllci5oPgo+ IC0jaW5jbHVkZSA8bGludXgvaG1tLmg+Cj4gICNpbmNsdWRlIDxsaW51eC9mcy5oPgo+ICAjaW5j bHVkZSA8bGludXgvbW0uaD4KPiAgI2luY2x1ZGUgPGxpbnV4L3ZtYWNhY2hlLmg+Cj4gLS0gCj4g Mi4yMy4wCj4gCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZng= From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.3 required=3.0 tests=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_SANE_1 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 2B5A1CA9EAF for ; Mon, 21 Oct 2019 18:31:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1E9E2084C for ; Mon, 21 Oct 2019 18:31:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BxoDEIgL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727110AbfJUSbv (ORCPT ); Mon, 21 Oct 2019 14:31:51 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:26558 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726955AbfJUSbv (ORCPT ); Mon, 21 Oct 2019 14:31:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571682709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WlG+wz+lkBtRxzyiEF0b2PvSL0je5jeFY5DxP5d4mNY=; b=BxoDEIgLHEnu4ihEaZARN9zGTr30xTs7klouN3B3EqkwUz/AML6REqqseTLNvpm2HBobBD Q/+e8GDbdJd+Uq7OyCE+WTBMw6X9lvXP0fJdVxsSwK+PQit+R82CKjY/jYCDgxVd5rD57j RUW5nt60Ep4M0y1sTTFvmAMz6ST+9OM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-212-zS_LJt_qP3K6LOvuvx91fA-1; Mon, 21 Oct 2019 14:31:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89D4A800D41; Mon, 21 Oct 2019 18:31:44 +0000 (UTC) Received: from redhat.com (unknown [10.20.6.178]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80CE95DA2C; Mon, 21 Oct 2019 18:31:43 +0000 (UTC) Date: Mon, 21 Oct 2019 14:31:41 -0400 From: Jerome Glisse To: Jason Gunthorpe Cc: Ralph Campbell , John Hubbard , Felix.Kuehling@amd.com, linux-rdma@vger.kernel.org, linux-mm@kvack.org, Andrea Arcangeli , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Ben Skeggs , Jason Gunthorpe Subject: Re: [PATCH hmm 04/15] mm/hmm: define the pre-processor related parts of hmm.h even if disabled Message-ID: <20191021183141.GB3177@redhat.com> References: <20191015181242.8343-1-jgg@ziepe.ca> <20191015181242.8343-5-jgg@ziepe.ca> MIME-Version: 1.0 In-Reply-To: <20191015181242.8343-5-jgg@ziepe.ca> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: zS_LJt_qP3K6LOvuvx91fA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Tue, Oct 15, 2019 at 03:12:31PM -0300, Jason Gunthorpe wrote: > From: Jason Gunthorpe >=20 > Only the function calls are stubbed out with static inlines that always > fail. This is the standard way to write a header for an optional componen= t > and makes it easier for drivers that only optionally need HMM_MIRROR. >=20 > Signed-off-by: Jason Gunthorpe Reviewed-by: J=E9r=F4me Glisse > --- > include/linux/hmm.h | 59 ++++++++++++++++++++++++++++++++++++--------- > kernel/fork.c | 1 - > 2 files changed, 47 insertions(+), 13 deletions(-) >=20 > diff --git a/include/linux/hmm.h b/include/linux/hmm.h > index 8ac1fd6a81af8f..2666eb08a40615 100644 > --- a/include/linux/hmm.h > +++ b/include/linux/hmm.h > @@ -62,8 +62,6 @@ > #include > #include > =20 > -#ifdef CONFIG_HMM_MIRROR > - > #include > #include > #include > @@ -374,6 +372,15 @@ struct hmm_mirror { > =09struct list_head=09=09list; > }; > =20 > +/* > + * Retry fault if non-blocking, drop mmap_sem and return -EAGAIN in that= case. > + */ > +#define HMM_FAULT_ALLOW_RETRY=09=09(1 << 0) > + > +/* Don't fault in missing PTEs, just snapshot the current state. */ > +#define HMM_FAULT_SNAPSHOT=09=09(1 << 1) > + > +#ifdef CONFIG_HMM_MIRROR > int hmm_mirror_register(struct hmm_mirror *mirror, struct mm_struct *mm)= ; > void hmm_mirror_unregister(struct hmm_mirror *mirror); > =20 > @@ -383,14 +390,6 @@ void hmm_mirror_unregister(struct hmm_mirror *mirror= ); > int hmm_range_register(struct hmm_range *range, struct hmm_mirror *mirro= r); > void hmm_range_unregister(struct hmm_range *range); > =20 > -/* > - * Retry fault if non-blocking, drop mmap_sem and return -EAGAIN in that= case. > - */ > -#define HMM_FAULT_ALLOW_RETRY=09=09(1 << 0) > - > -/* Don't fault in missing PTEs, just snapshot the current state. */ > -#define HMM_FAULT_SNAPSHOT=09=09(1 << 1) > - > long hmm_range_fault(struct hmm_range *range, unsigned int flags); > =20 > long hmm_range_dma_map(struct hmm_range *range, > @@ -401,6 +400,44 @@ long hmm_range_dma_unmap(struct hmm_range *range, > =09=09=09 struct device *device, > =09=09=09 dma_addr_t *daddrs, > =09=09=09 bool dirty); > +#else > +int hmm_mirror_register(struct hmm_mirror *mirror, struct mm_struct *mm) > +{ > +=09return -EOPNOTSUPP; > +} > + > +void hmm_mirror_unregister(struct hmm_mirror *mirror) > +{ > +} > + > +int hmm_range_register(struct hmm_range *range, struct hmm_mirror *mirro= r) > +{ > +=09return -EOPNOTSUPP; > +} > + > +void hmm_range_unregister(struct hmm_range *range) > +{ > +} > + > +static inline long hmm_range_fault(struct hmm_range *range, unsigned int= flags) > +{ > +=09return -EOPNOTSUPP; > +} > + > +static inline long hmm_range_dma_map(struct hmm_range *range, > +=09=09=09=09 struct device *device, dma_addr_t *daddrs, > +=09=09=09=09 unsigned int flags) > +{ > +=09return -EOPNOTSUPP; > +} > + > +static inline long hmm_range_dma_unmap(struct hmm_range *range, > +=09=09=09=09 struct device *device, > +=09=09=09=09 dma_addr_t *daddrs, bool dirty) > +{ > +=09return -EOPNOTSUPP; > +} > +#endif > =20 > /* > * HMM_RANGE_DEFAULT_TIMEOUT - default timeout (ms) when waiting for a r= ange > @@ -411,6 +448,4 @@ long hmm_range_dma_unmap(struct hmm_range *range, > */ > #define HMM_RANGE_DEFAULT_TIMEOUT 1000 > =20 > -#endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */ > - > #endif /* LINUX_HMM_H */ > diff --git a/kernel/fork.c b/kernel/fork.c > index f9572f41612628..4561a65d19db88 100644 > --- a/kernel/fork.c > +++ b/kernel/fork.c > @@ -40,7 +40,6 @@ > #include > #include > #include > -#include > #include > #include > #include > --=20 > 2.23.0 >=20