From patchwork Tue Dec 11 07:21:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Duan X-Patchwork-Id: 10723129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B890214E2 for ; Tue, 11 Dec 2018 07:21:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99D082A515 for ; Tue, 11 Dec 2018 07:21:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D1562A520; Tue, 11 Dec 2018 07:21:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A03C02A515 for ; Tue, 11 Dec 2018 07:21:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 494D88E005A; Tue, 11 Dec 2018 02:21:09 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 444AB8E004D; Tue, 11 Dec 2018 02:21:09 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E5E88E005A; Tue, 11 Dec 2018 02:21:09 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by kanga.kvack.org (Postfix) with ESMTP id C61E78E004D for ; Tue, 11 Dec 2018 02:21:08 -0500 (EST) Received: by mail-wr1-f70.google.com with SMTP id l16so392258wre.6 for ; Mon, 10 Dec 2018 23:21:08 -0800 (PST) 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:accept-language:content-language :spamdiagnosticoutput:spamdiagnosticmetadata :content-transfer-encoding:mime-version; bh=i9W6YDUkOGViybiB1fQRXiCQyPGNKpwgxJWWBGWfWIM=; b=gLa4oDCO0KaVIG9iqHP7ZcOzrxldvTwcSj5koAoRr81AMmgMVWIYeOHao7zUUHtKmr GILInug2T79pEI5rz3v71Munn4dhQkRb2kaF1cz47e7khopOf9huMr8vep1l50peBQVt 7T8BPnWXdc4uLbNNJdASWN9fZmxhdlGwDZtMDqcMlokRRsKkFy4jaWm5kyoXaat+F3be mmzZaO6MDnrq62cL4qoWbGEA8ZpXh/QGl36dLGVQdxslmoNHLEzA+2Id6Uv5g/QCtabp 9sx1cA0yMkee1cF5NHZZAkvJuDzMrvH2se98iMlClp8Ftx2aLmtpgwpsNP7fVFikfo6S 1urQ== X-Gm-Message-State: AA+aEWZH+u2ZoWDG1eSSbyjiePowg8c8rT0MBBNuyb+VCDvYrth0q93X aZk4kx861olrcZTug7vnIPD85DkA2h9OXzvD7j3P1aEVfxqlxkD3xF+E1MyaSC10fCQ7Jj/ZC5n //QZmpCvc0lqYJU9R+OutdNGt407L+6PXC8kzZomYcLJFSG2xFm2ewvr6Yu4zz8CO/w== X-Received: by 2002:a1c:f8f:: with SMTP id 137mr1189787wmp.96.1544512868064; Mon, 10 Dec 2018 23:21:08 -0800 (PST) X-Google-Smtp-Source: AFSGD/UzO8239WER9ZmmxwPWsGIZclyi4Xo8UGUQ3jWpYpgpEOnLyK/+mC/36V/5uki0OKYoOg/y X-Received: by 2002:a1c:f8f:: with SMTP id 137mr1189736wmp.96.1544512866754; Mon, 10 Dec 2018 23:21:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544512866; cv=none; d=google.com; s=arc-20160816; b=QU2ngzS/rMcEUtIoRYy+8V+3FHNnnYI7wUpWF24waT5JEuU3Pmk3qIQZMEKo6bpUpO 2dav3tELNSTRQPYXUuQKkXUoT8HwAIuh84Db7Pq1YKtu1X3zSzqRW08zTQIQvDojLEKy WqeorBNDiCTfRuPTUkAL/QKDW0w/3SRhwoib1KGQXepn8CiirmYsIDWvdUCDeYZwZxow cNpv0irH7hu1eI3KI0dxOCtCBa2W3/vzTFsdIQje2Fy30yftejtRebrDbKlnFrAZ8xha KqsyXQfl7mZ+quKgwdMsEp190LEGiFiKHgZ24FQqBam9zRYWvpSXs/mV1YTtdCSrhz6D 6vSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature; bh=i9W6YDUkOGViybiB1fQRXiCQyPGNKpwgxJWWBGWfWIM=; b=IJTjX5pSfg1aP1js3TqTAqPv0xqhWTwsUVnnr20uEYtLheVpWsF9lJEG9jBhKFVjza MiAXgwO0hlFEDuoYywxY0rgAJhpsWzJb+WmqPTfAfrf1QIpF5PSDk2W2OdXtn4ugA/U5 CeIYhcjiLraRH5Xlb/ZDnenv+zkk/fS8T09tgeCiBtAkhxVld8hb/3YhdlMcipmHxZAN jiMziRZbzYNDmEseWIKemp2z+miVv7CBFqbjPL/tqjp6CrGHywszdBsvxZuuLTTZMhH3 rr8UWrQuaIAxidIiqGuEr+5fgnRcMjmnUhBmkAtlr19PrBDXADaMWQRVwc44lDIN3kys yEyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector1 header.b=ipzwVj32; spf=pass (google.com: domain of fugang.duan@nxp.com designates 40.107.15.80 as permitted sender) smtp.mailfrom=fugang.duan@nxp.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150080.outbound.protection.outlook.com. [40.107.15.80]) by mx.google.com with ESMTPS id h9si801759wmf.10.2018.12.10.23.21.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Dec 2018 23:21:06 -0800 (PST) Received-SPF: pass (google.com: domain of fugang.duan@nxp.com designates 40.107.15.80 as permitted sender) client-ip=40.107.15.80; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector1 header.b=ipzwVj32; spf=pass (google.com: domain of fugang.duan@nxp.com designates 40.107.15.80 as permitted sender) smtp.mailfrom=fugang.duan@nxp.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i9W6YDUkOGViybiB1fQRXiCQyPGNKpwgxJWWBGWfWIM=; b=ipzwVj321ILvuNWMDSsOZVNA3qszp+vvStWvUqHRF2Mq9PWg9Wy8kF1HZ0yeVL32JJG/+oKBfwyAltrqSbDb9Zoe3zikrXqI+j62b6RcAGZirk0cdPjV6FV4j4hmjfMXLaiVf64MhOkP8vmJ5b9XNAovajG1v79NcAvOWBULX+c= Received: from VI1PR0402MB3600.eurprd04.prod.outlook.com (52.134.5.23) by VI1PR0402MB3758.eurprd04.prod.outlook.com (52.134.15.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.22; Tue, 11 Dec 2018 07:21:04 +0000 Received: from VI1PR0402MB3600.eurprd04.prod.outlook.com ([fe80::e101:27fc:e3fd:a1c4]) by VI1PR0402MB3600.eurprd04.prod.outlook.com ([fe80::e101:27fc:e3fd:a1c4%2]) with mapi id 15.20.1404.026; Tue, 11 Dec 2018 07:21:04 +0000 From: Andy Duan To: "bjorn.andersson@linaro.org" , "ohad@wizery.com" CC: "linux-remoteproc@vger.kernel.org" , "linux-mm@kvack.org" , "anup@brainfault.org" , "loic.pallardy@st.com" , "ard.biesheuvel@linaro.org" , Andy Duan Subject: [PATCH rpmsg 1/1] rpmsg: virtio_rpmsg_bus: fix unexpected huge vmap mappings Thread-Topic: [PATCH rpmsg 1/1] rpmsg: virtio_rpmsg_bus: fix unexpected huge vmap mappings Thread-Index: AQHUkSIT1Q3U8JbzekCIgtx00d/4Xw== Date: Tue, 11 Dec 2018 07:21:04 +0000 Message-ID: <1544512623-15090-1-git-send-email-fugang.duan@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 1.9.1 x-clientproxiedby: HK0PR03CA0054.apcprd03.prod.outlook.com (2603:1096:203:52::18) To VI1PR0402MB3600.eurprd04.prod.outlook.com (2603:10a6:803:a::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=fugang.duan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VI1PR0402MB3758;6:EMsBvHzrWcoArQ6v5exJ5Gq7djLaSBIrpiKPlxH2TpqvqBAEow8JyafrhXScIda4xRKLJK09QBwTk+/LU8WEqHWewvftb9tCdRKbu4n3077YGe7rpl1MGOWhHImGPw26eseJrsTT1GaSeAaZtyg9eo/4dpcsxDHqZGnvZzHIhvs59r0PH5qiGRuDonap8woVYOGJVLmFJcUwXY/u7SNUV+O36SaMex3WnfDQ7f8HDReLDsO4aQVjLl4Jrw53nb+RMfF9DFZvlAbOlVToJTr51ZnyLfTqiN+kex3U44w66rqDMfA+3pCy6nUtfc8kgKoB+o2BdN0BByNgkyjtDaM1a9NguNc7QYmIkV0kXA4Ph5Dm0TXHNF6JnXOTwA3BuHqvFj47FggUzf8fQwetsfbZfv1AzeiZXOAA1OqCZMo1xLPDcslNwDetX/HrfpvcXWnu6gvJuJlFIdOZeocAGIOHdg==;5:vEnvdEJAxEJwpdZHBJupn6F4ndCd3BXsGroJmPuzHunqlGOXlBiDdY4l/CNYdfJ9xHGRpsjY0geLYeHm8aNaZ78gUaQg8Eux9bq9+8ydVAnediCeXCtMViXOUpHa7H9IA267j0Sp+1AYThhcmdQrasjBhtglXol9g3LxGq3GLtI=;7:knKhb82mzW4EggRTiGZS+gvo+y88GTUt5PFTfs80RajKQgVE+uA3+CbZ48KDhQfwosm9TQwqYHH3WiZfGKVvHQ0np2CmQboB7oQwP6MSqZyV372P/Ai20wp28GQEJGuUKKyY4+JYVu/pAFD+hs+ubQ== x-ms-office365-filtering-correlation-id: df97b60c-1841-414b-2d86-08d65f3935b8 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:VI1PR0402MB3758; x-ms-traffictypediagnostic: VI1PR0402MB3758: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(3230017)(999002)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231472)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:VI1PR0402MB3758;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0402MB3758; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(376002)(396003)(136003)(366004)(346002)(189003)(199004)(4326008)(71190400001)(105586002)(5660300001)(2906002)(71200400001)(45080400002)(52116002)(25786009)(575784001)(66066001)(6506007)(110136005)(316002)(386003)(86362001)(106356001)(186003)(54906003)(2501003)(478600001)(102836004)(97736004)(14454004)(5024004)(99286004)(14444005)(256004)(26005)(6486002)(36756003)(6116002)(81166006)(6512007)(68736007)(6436002)(3846002)(476003)(8936002)(81156014)(8676002)(486006)(53936002)(7736002)(50226002)(2616005)(305945005)(14583001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0402MB3758;H:VI1PR0402MB3600.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: /0Q4IUIZr3+lrKeEkhPyHS3GoPVVLDJT6X4dd8p3NSfz8AiMJkaMcCvS5XVCm3t7lCqiWifBh3jo52j+/YU+2h64XiBC50PbR9NoyJJ/OBkgaRhMdNhRwaduEtf174s1ZqP9lZOyhU8uBe+Fn38C69Gc27qY7aY7kBGgnMblClzgpQiC/UMtHowthxFD1hk7cFmc5PvtGknPxyvUkZu6HkJiB364PWtiTTcpmOYYaJwJLqmgtnMN7QpoR6h99hF9eAfxKvRtSl9L7tK0ijZGmleAGftJXqEV8FyucxsX8mzfJhmwjoC1qU+XujEbQPFA spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: df97b60c-1841-414b-2d86-08d65f3935b8 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 07:21:04.3697 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3758 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Fugang Duan If RPMSG dma memory allocate from per-device mem pool by calling .dma_alloc_coherent(), the size is bigger than 2M bytes and alignment with 2M (PMD_SIZE), then kernel dump by calling .vmalloc_to_page(). Since per-device dma pool do vmap mappings by __ioremap(), __ioremap() might use the hugepage mapping, which in turn will cause the vmalloc_page failed to return the correct page due to the PTE not setup. For exp, when reserve 8M bytes per-device dma mem pool, __ioremap() will use hugepage mapping: __ioremap ioremap_page_range ioremap_pud_range ioremap_pmd_range pmd_set_huge(pmd, phys_addr + addr, prot) Commit:029c54b09599 ("mm/vmalloc.c: huge-vmap: fail gracefully on unexpected huge vmap mapping") ensure that vmalloc_to_page() does not go off into the weeds trying to dereference huge PUDs or PMDs as table entries: rpmsg_sg_init -> vmalloc_to_page-> WARN_ON_ONCE(pmd_bad(*pmd)); In generally, .dma_alloc_coherent() allocate memory from CMA pool/DMA pool/atomic_pool, or swiotlb slabs pool, the virt address mapping to physical address should be lineal, so for the rpmsg scatterlist initialization can use physical address to find the page by calling .phys_to_page(), which can avoid to use .vmalloc_to_page(). Kernel dump: [ 0.881722] WARNING: CPU: 0 PID: 1 at mm/vmalloc.c:301 vmalloc_to_page+0xbc/0xc8 [ 0.889094] Modules linked in: [ 0.892139] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.14.78-05581-gc61a572 #206 [ 0.899604] Hardware name: Freescale i.MX8QM MEK (DT) [ 0.904643] task: ffff8008f6c98000 task.stack: ffff000008068000 [ 0.910549] PC is at vmalloc_to_page+0xbc/0xc8 [ 0.914987] LR is at rpmsg_sg_init+0x70/0xcc [ 0.919238] pc : [] lr : [] pstate: 40000045 [ 0.926619] sp : ffff00000806b8b0 [ 0.929923] x29: ffff00000806b8b0 x28: ffff00000961cdf0 [ 0.935220] x27: ffff00000961cdf0 x26: 0000000000000000 [ 0.940519] x25: 0000000000040000 x24: ffff00000961ce40 [ 0.945819] x23: ffff00000f000000 x22: ffff00000961ce30 [ 0.951118] x21: 0000000000000000 x20: ffff00000806b950 [ 0.956417] x19: 0000000000000000 x18: 000000000000000e [ 0.961717] x17: 0000000000000001 x16: 0000000000000019 [ 0.967016] x15: 0000000000000033 x14: 616d64202c303030 [ 0.972316] x13: 3030306630303030 x12: 3066666666206176 [ 0.977615] x11: 203a737265666675 x10: 62203334394c203a [ 0.982914] x9 : 000000000000009f x8 : ffff00000806b970 [ 0.988214] x7 : 0000000000000000 x6 : ffff000009690712 [ 0.993513] x5 : 0000000000000000 x4 : 0000000080000000 [ 0.998812] x3 : 00e8000090800f0d x2 : ffff8008ffffd3c0 [ 1.004112] x1 : 0000000000000000 x0 : ffff00000f000000 [ 1.009416] Call trace: [ 1.011849] Exception stack(0xffff00000806b770 to 0xffff00000806b8b0) [ 1.018279] b760: ffff00000f000000 0000000000000000 [ 1.026094] b780: ffff8008ffffd3c0 00e8000090800f0d 0000000080000000 0000000000000000 [ 1.033915] b7a0: ffff000009690712 0000000000000000 ffff00000806b970 000000000000009f [ 1.041731] b7c0: 62203334394c203a 203a737265666675 3066666666206176 3030306630303030 [ 1.049550] b7e0: 616d64202c303030 0000000000000033 0000000000000019 0000000000000001 [ 1.057368] b800: 000000000000000e 0000000000000000 ffff00000806b950 0000000000000000 [ 1.065188] b820: ffff00000961ce30 ffff00000f000000 ffff00000961ce40 0000000000040000 [ 1.073008] b840: 0000000000000000 ffff00000961cdf0 ffff00000961cdf0 ffff00000806b8b0 [ 1.080825] b860: ffff000008ac471c ffff00000806b8b0 ffff0000081c80d4 0000000040000045 [ 1.088646] b880: ffff0000092c8528 ffff00000806b890 ffffffffffffffff ffff000008ac4710 [ 1.096461] b8a0: ffff00000806b8b0 ffff0000081c80d4 [ 1.101327] [] vmalloc_to_page+0xbc/0xc8 [ 1.106800] [] rpmsg_probe+0x1f0/0x49c [ 1.112107] [] virtio_dev_probe+0x198/0x210 [ 1.117839] [] driver_probe_device+0x220/0x2d4 [ 1.123829] [] __device_attach_driver+0x98/0xc8 [ 1.129913] [] bus_for_each_drv+0x54/0x94 [ 1.135470] [] __device_attach+0xc4/0x12c [ 1.141029] [] device_initial_probe+0x10/0x18 [ 1.146937] [] bus_probe_device+0x90/0x98 [ 1.152501] [] device_add+0x3f4/0x570 [ 1.157709] [] device_register+0x1c/0x28 [ 1.163182] [] register_virtio_device+0xb8/0x114 [ 1.169353] [] imx_rpmsg_probe+0x3a0/0x5d0 [ 1.175003] [] platform_drv_probe+0x50/0xbc [ 1.180730] [] driver_probe_device+0x220/0x2d4 [ 1.186725] [] __driver_attach+0xa4/0xa8 [ 1.192199] [] bus_for_each_dev+0x58/0x98 [ 1.197759] [] driver_attach+0x20/0x28 [ 1.203058] [] bus_add_driver+0x1c0/0x224 [ 1.208619] [] driver_register+0x68/0x108 [ 1.214178] [] __platform_driver_register+0x4c/0x54 [ 1.220614] [] imx_rpmsg_init+0x1c/0x50 [ 1.225999] [] do_one_initcall+0x38/0x124 [ 1.231560] [] kernel_init_freeable+0x18c/0x228 [ 1.237640] [] kernel_init+0x10/0x100 [ 1.242849] [] ret_from_fork+0x10/0x18 [ 1.248154] ---[ end trace bcc95d4e07033434 ]--- Signed-off-by: Fugang Duan --- drivers/rpmsg/virtio_rpmsg_bus.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 664f957..dfe3ebe 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -196,16 +196,16 @@ static int virtio_rpmsg_trysend_offchannel(struct rpmsg_endpoint *ept, u32 src, * location (in vmalloc or in kernel). */ static void -rpmsg_sg_init(struct scatterlist *sg, void *cpu_addr, unsigned int len) +rpmsg_sg_init(struct virtproc_info *vrp, struct scatterlist *sg, + void *cpu_addr, unsigned int len) { - if (is_vmalloc_addr(cpu_addr)) { - sg_init_table(sg, 1); - sg_set_page(sg, vmalloc_to_page(cpu_addr), len, - offset_in_page(cpu_addr)); - } else { - WARN_ON(!virt_addr_valid(cpu_addr)); - sg_init_one(sg, cpu_addr, len); - } + unsigned int offset; + dma_addr_t dev_add = vrp->bufs_dma + (cpu_addr - vrp->rbufs); + struct page *page = phys_to_page(dma_to_phys(vrp->bufs_dev, dev_add)); + + offset = offset_in_page(cpu_addr); + sg_init_table(sg, 1); + sg_set_page(sg, page, len, offset); } /** @@ -626,7 +626,7 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, msg, sizeof(*msg) + msg->len, true); #endif - rpmsg_sg_init(&sg, msg, sizeof(*msg) + len); + rpmsg_sg_init(vrp, &sg, msg, sizeof(*msg) + len); mutex_lock(&vrp->tx_lock); @@ -750,7 +750,7 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, dev_warn(dev, "msg received with no recipient\n"); /* publish the real size of the buffer */ - rpmsg_sg_init(&sg, msg, vrp->buf_size); + rpmsg_sg_init(vrp, &sg, msg, vrp->buf_size); /* add the buffer back to the remote processor's virtqueue */ err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, msg, GFP_KERNEL); @@ -934,7 +934,7 @@ static int rpmsg_probe(struct virtio_device *vdev) struct scatterlist sg; void *cpu_addr = vrp->rbufs + i * vrp->buf_size; - rpmsg_sg_init(&sg, cpu_addr, vrp->buf_size); + rpmsg_sg_init(vrp, &sg, cpu_addr, vrp->buf_size); err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, cpu_addr, GFP_KERNEL);