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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2234BC5B578 for ; Thu, 4 Jul 2019 02:01:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BCE27218A6 for ; Thu, 4 Jul 2019 02:01:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="GvToemLt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCE27218A6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5AE2E6B0006; Wed, 3 Jul 2019 22:01:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 55D318E0003; Wed, 3 Jul 2019 22:01:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 425348E0001; Wed, 3 Jul 2019 22:01:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id E74346B0006 for ; Wed, 3 Jul 2019 22:01:17 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id s7so2823078edb.19 for ; Wed, 03 Jul 2019 19:01:17 -0700 (PDT) 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:thread-topic :thread-index:date:message-id:references:in-reply-to:accept-language :content-language:content-id:content-transfer-encoding:mime-version; bh=KDOKUcnSBzVhEWWGoxyNSaiwC3cSjRI+ryccklVbwVA=; b=Wcx9F5XlVvu6fgW1LeVixdoxAx7t1PdDsrEkHnopMMbydjP7w+wEbLyuPI6jPdbjDs YkafuKL3uwWdgSFmuDHpT+SYTf6YoMUaxRY7FT/krj1jAVicG3Alo10KIM9dm/VIM0/D w3jQNCoYgnv9mMX4Gp6b9M1WyWKnphWm/f7wGL9y4TKwoJu0FRg2M+RrET+Zg+Kc/mo+ 7+YPXRpqf/9cz8U8p8tx6avo3BdJmHb0bwsIBF9/EN3n+uZmiOYZ9jyZ9steD6jJ8YpP 7R8RtlpJ769R1CiE//jnQXmGpIHxcuJVZK+WCxPaRl1pAPbE01hb9y0OrWg1GGScrPuT e1qg== X-Gm-Message-State: APjAAAX1ikzzv4P4bPQ3VhS9u5YJD7EzrUMpzcCSYFRPInGLvGkRNHj+ VBiygYAMkDI4USbbtoezPzV+2Ufgiq841rwog+01u2YgfrCQ6ZYENywPyHv7v9//3oMC0oFDJ1F L5KpfyLdOsTvxB7k2oPdbia+Hbl18su+mINOghKlHl2LA1cEuK8r7rpKa7Wlk85E1tg== X-Received: by 2002:a17:906:310c:: with SMTP id 12mr5350728ejx.259.1562205677507; Wed, 03 Jul 2019 19:01:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdnqz1jk5J1id3+MV2sI+g13dSYzAKBAdy5fqs+joMRn7z3Pbn8N4WI7FrvBXZtjZ49du9 X-Received: by 2002:a17:906:310c:: with SMTP id 12mr5350669ejx.259.1562205676321; Wed, 03 Jul 2019 19:01:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562205676; cv=none; d=google.com; s=arc-20160816; b=zICr7kRZQos5gpeCf3aIcYpDBEp18d5vP+rYimL2MBpPTQewru2U/hZl44QAIFC57t JWKWNUiASb/cTGS/6+VnVWlU47diIY3srJinF4wSDSI1meJklNiV9KMxQgjpgGjjdcyD Hd2ZlihPzzqn1oDXjyRJA7jCA/Y0KJSCCbIhgh0G0Q83rIzs1WqJUW6UecKxU6EfZcrM VrY/lQFcS0ww6fBjbVkf/V5kLrvF4IJnyFlGZVyP6woUAthg4pRYlysB5FD/9Bs4YjgM NmY+VDKlOUqcHKxcW+ANAouiNpyB0gTITVJ48WpYzVWKl3hB6aeENuyXa6NtBe7IGXIt dlsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-id:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=KDOKUcnSBzVhEWWGoxyNSaiwC3cSjRI+ryccklVbwVA=; b=lehQ/HFmgHHByf4LgjioR7VWiXHkvt8xsBIblaRc94JV3ki29YLUVWEoz8cXY99EkZ dxX5L75R/1vJUmWTHOGiH/oMhiUzkkuBdaW/3lSyTy18dn5HG7WojcgfvM42RqVB+5p4 ftMpQgpyMHOJ2Gzd8QiOSzMo6TBFfbw8V+aihtIC2wxcd47GZo1czcGxlrcaAA0i/5Ix sueSEL5VypDajaGo3yqveyY0GG+B0+bZdEODF/XlymbW/ghsjEjxmHJ7acrtTlMTbnEB xtacOWSdifWozvXFOLMikiUkzRHGtMSQyMS0sPDNRNQTDugq5Fgpo6T+bCBBnEsjzCyD WS3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@Mellanox.com header.s=selector2 header.b=GvToemLt; spf=pass (google.com: domain of jgg@mellanox.com designates 40.107.7.48 as permitted sender) smtp.mailfrom=jgg@mellanox.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mellanox.com Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70048.outbound.protection.outlook.com. [40.107.7.48]) by mx.google.com with ESMTPS id x15si3013656ejv.41.2019.07.03.19.01.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jul 2019 19:01:16 -0700 (PDT) Received-SPF: pass (google.com: domain of jgg@mellanox.com designates 40.107.7.48 as permitted sender) client-ip=40.107.7.48; Authentication-Results: mx.google.com; dkim=pass header.i=@Mellanox.com header.s=selector2 header.b=GvToemLt; spf=pass (google.com: domain of jgg@mellanox.com designates 40.107.7.48 as permitted sender) smtp.mailfrom=jgg@mellanox.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mellanox.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KDOKUcnSBzVhEWWGoxyNSaiwC3cSjRI+ryccklVbwVA=; b=GvToemLtmEl5ObY9GAGcxPwGsXk3LWEfPSsERXuCD+t1APFzhCxw84bjpmvFoAHDRiYBnSFEuInB1xW3jh5t5sVmxe40fKpPn1KRFTLPV8Ei+6jnWftcB94Vf+D5XV0ejwndb1ALVi4oaN/eE/NuAGi4Bb9lhzzGkKQpyK1gC1E= Received: from VI1PR05MB4141.eurprd05.prod.outlook.com (10.171.182.144) by VI1PR05MB5390.eurprd05.prod.outlook.com (20.177.63.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2032.20; Thu, 4 Jul 2019 02:01:15 +0000 Received: from VI1PR05MB4141.eurprd05.prod.outlook.com ([fe80::f5d8:df9:731:682e]) by VI1PR05MB4141.eurprd05.prod.outlook.com ([fe80::f5d8:df9:731:682e%5]) with mapi id 15.20.2032.019; Thu, 4 Jul 2019 02:01:15 +0000 From: Jason Gunthorpe To: Alex Deucher CC: "Kuehling, Felix" , Stephen Rothwell , "Yang, Philip" , Dave Airlie , "dri-devel@lists.freedesktop.org" , "linux-mm@kvack.org" , "linux-next@vger.kernel.org" , "Deucher, Alexander" Subject: Re: [PATCH 1/1] drm/amdgpu: adopt to hmm_range_register API change Thread-Topic: [PATCH 1/1] drm/amdgpu: adopt to hmm_range_register API change Thread-Index: AQHVMUJXWs8sf5cAOUS0d/4NvIH/Saa473yAgABzhwCAAAGdAIAAUY2A Date: Thu, 4 Jul 2019 02:01:14 +0000 Message-ID: <20190704020109.GB32502@mellanox.com> References: <20190703015442.11974-1-Felix.Kuehling@amd.com> <20190703141001.GH18688@mellanox.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: YQXPR0101CA0034.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::47) To VI1PR05MB4141.eurprd05.prod.outlook.com (2603:10a6:803:4d::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [156.34.55.100] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 447cb622-f93d-45ea-7154-08d700237eca x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:VI1PR05MB5390; x-ms-traffictypediagnostic: VI1PR05MB5390: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4714; x-forefront-prvs: 0088C92887 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(346002)(396003)(39860400002)(366004)(136003)(199004)(189003)(966005)(53936002)(86362001)(256004)(71190400001)(68736007)(6306002)(478600001)(6916009)(8676002)(99286004)(5660300002)(25786009)(4326008)(14454004)(6512007)(71200400001)(2906002)(81156014)(81166006)(14444005)(2616005)(1411001)(8936002)(6506007)(316002)(1076003)(6246003)(66946007)(7736002)(6486002)(66446008)(54906003)(53546011)(229853002)(66556008)(64756008)(26005)(76176011)(66476007)(73956011)(6436002)(11346002)(476003)(66066001)(446003)(33656002)(386003)(36756003)(3846002)(486006)(305945005)(52116002)(6116002)(102836004)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR05MB5390;H:VI1PR05MB4141.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: zA7Cm54Tj+HFs7usxkeRLZ/ZLlyx5Mfu3zGOb2C9ORYKhrJ2rWO4dy6spq+b+l1nFD5vgOeZTrPyaVWdFKLRp2xjf+z4UyUUs8IogdOdbK8kWC+LjC6sZ3c16WmsSstu8pJMQCPnUjiuhOUNeNjK8gIr9YiSVzMI/YCtEQRAWqQwKNL7fEfvitl51EgY3nO1vvr6c6yVfU+vQT6OPGALCgHyneL7w/SB+mXtu9p1OCFNLn0dmIGFusERM8l2Q4sol+fmUHablgcYI5yJxrj3CtXUcWo2gvEajtd3/Jpsec7RwpzYRlPZraxXxHdKQKQWdJx5/c/fdzPwG2g8gmma+RtnwwzwvuJsXxf+5Ysyka0hedYTLwGckLWYo+rQevRBA5vpu4GYXqwRlB1YYoth2pYtzetHRhDij628nuEPzig= Content-Type: text/plain; charset="us-ascii" Content-ID: <783845738F0FFF45A9FA38B1C43749D6@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 447cb622-f93d-45ea-7154-08d700237eca X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jul 2019 02:01:14.9475 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jgg@mellanox.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5390 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: On Wed, Jul 03, 2019 at 05:09:16PM -0400, Alex Deucher wrote: > On Wed, Jul 3, 2019 at 5:03 PM Kuehling, Felix w= rote: > > > > On 2019-07-03 10:10 a.m., Jason Gunthorpe wrote: > > > On Wed, Jul 03, 2019 at 01:55:08AM +0000, Kuehling, Felix wrote: > > >> From: Philip Yang > > >> > > >> In order to pass mirror instead of mm to hmm_range_register, we need > > >> pass bo instead of ttm to amdgpu_ttm_tt_get_user_pages because mirro= r > > >> is part of amdgpu_mn structure, which is accessible from bo. > > >> > > >> Signed-off-by: Philip Yang > > >> Reviewed-by: Felix Kuehling > > >> Signed-off-by: Felix Kuehling > > >> CC: Stephen Rothwell > > >> CC: Jason Gunthorpe > > >> CC: Dave Airlie > > >> CC: Alex Deucher > > >> drivers/gpu/drm/Kconfig | 1 - > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 ++--- > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +-- > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 8 ++++++++ > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 5 +++++ > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 ++++++++++-- > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 +++-- > > >> 8 files changed, 30 insertions(+), 11 deletions(-) > > > This is too big to use as a conflict resolution, what you could do is > > > apply the majority of the patch on top of your tree as-is (ie keep > > > using the old hmm_range_register), then the conflict resolution for > > > the updated AMD GPU tree can be a simple one line change: > > > > > > - hmm_range_register(range, mm, start, > > > + hmm_range_register(range, mirror, start, > > > start + ttm->num_pages * PAGE_SIZE, PAGE_SHI= FT); > > > > > > Which is trivial for everone to deal with, and solves the problem. > > > > Good idea. > > > > > > > > > > This is probably a much better option than rebasing the AMD gpu tree. > > > > I think Alex is planning to merge hmm.git into an updated drm-next and > > then rebase amd-staging-drm-next on top of that. Rebasing our > > amd-staging-drm-next is something we do every month or two anyway. > > >=20 > Go ahead and respin your patch as per the suggestion above. then I > can apply it I can either merge hmm into amd's drm-next or we can just > provide the conflict fix patch whichever is easier. Which hmm branch > is for 5.3? > https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/?h=3Dhmm Yes, anything for 5.2 should go to Andrew. Jason