From patchwork Tue Jan 31 03:33:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael Kelley (LINUX)" X-Patchwork-Id: 50581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2540512wrn; Mon, 30 Jan 2023 19:48:15 -0800 (PST) X-Google-Smtp-Source: AK7set9F1ACzN+JTUsk1qZhUYMSS0aoPl63O19IgXP5UK4KS4DouzOtWSLj6093NIntB3J50FZjG X-Received: by 2002:a05:6a20:3d8f:b0:be:b4ae:eae5 with SMTP id s15-20020a056a203d8f00b000beb4aeeae5mr3708600pzi.20.1675136895176; Mon, 30 Jan 2023 19:48:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675136895; cv=pass; d=google.com; s=arc-20160816; b=Iyvoz5d5hp/DpLSmopyA80xtioNu0zQFqZIEznR+sFy1rLvtFbzmNB/RGRgY24p7UL RDmNVGLWijAjzuUG5vGt6EWg1QEuT72/lsTm09VBvUfsJxgnClZUtiZgoE2JCjt0v0xG OTKBjNACmad+oO1QjbKPr+t5veTbsTUtsBS06eQTexi00QNcoIEemXfpU7Gv8tFl6jfX OAOndueKkeCb+KcbaGdE7jnP/qDzMtMftdet0SZnbGf5iTnqe1rUYlYqaUqH4ZbnnzbP go9V4E8nSAtJ25ak7aECh964b8pIl/JUZsumk3CEm3dNOn+JmDoKOZ///t72pIJu7T3O +eWA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=B1TN/soyJxcEfUdF7pZ8jHLorMgnT7s4953SnsHBXLw=; b=h1xjWzCW9Wus3ZVg0dMcSfMtHkofM3u/tZA6fZIOjYD3YAXVs7q/B6k18P51DJGeSf WeMhUi0BBO4GRPDn+JAh1xUKl8BvsqIec12QjKQ+NfcG9nIXcnbOY9odKaQsy802legJ exPZIAuqQ6LnER1ZQD0msUJGlDmBwmLMOnemZAizgsfnrpyjSJfyADReqhIOfAfsS66D JxiTvFIE4xfBEHq4ak6V4F8eEkNneqz+vbNqW20F3iDyZ1X9jAli/sWjq+TU2puTV8mR jZaI/dyV/Dh9saSx88+ZmgPR2a66RiiVRnEv7eElcCNoLonGsZasEE36WE1co14+Ffos Zupw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector2 header.b=ECT57UyB; arc=pass (i=1 spf=pass spfdomain=microsoft.com dkim=pass dkdomain=microsoft.com dmarc=pass fromdomain=microsoft.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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t4-20020a637804000000b00476f3facb4csi14921969pgc.221.2023.01.30.19.48.01; Mon, 30 Jan 2023 19:48:15 -0800 (PST) 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; dkim=pass header.i=@microsoft.com header.s=selector2 header.b=ECT57UyB; arc=pass (i=1 spf=pass spfdomain=microsoft.com dkim=pass dkdomain=microsoft.com dmarc=pass fromdomain=microsoft.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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230342AbjAaDeW (ORCPT + 99 others); Mon, 30 Jan 2023 22:34:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbjAaDeU (ORCPT ); Mon, 30 Jan 2023 22:34:20 -0500 Received: from DM5PR00CU002-vft-obe.outbound.protection.outlook.com (mail-centralusazon11021022.outbound.protection.outlook.com [52.101.62.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3931B2D6E; Mon, 30 Jan 2023 19:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hzNhfaoESEqEC/LgvaikcW1VCkl2TWaNPiOv3jgzlEAqKFiwkJ+ricQ0jX6+mRC6mzp+YVKjVbjTNPs8Ts2mwQ5KouoiL/RZUf2LW8PK1iHtWqkCEKDNon+zM0AIpzrrVPzBvu0hPCZnwRq/hGBUqsLuijZbdDaFGocM3MTcH83wcmr241eBLPGCGZF/4kuE6rX80cQyHcu7C09mIS2EXldqGeRKNVIi7gE/mWn38R/XXX3Wii8EJz016R7thCfTU5Up6F2/X7E/4KrrvF31SyO365Vk0VbP/9Df7ztPmrY1RRobsXcWCEkyqS31PUX3HWl342zSOBf9sR5iYPYbXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B1TN/soyJxcEfUdF7pZ8jHLorMgnT7s4953SnsHBXLw=; b=YvRo8HWlNy23+L+mKK2HQIqAAdkKr4tpeIBL7UwpDWffNQJm1PyPlBLoa+CHb2lvn5rhF/16Yq8y0HiKyINYLzG/1/FywZoOKPGsyhnDU9oRTu6qx5SUPgJtBf5i2zdl69jVrLZiUgBqL8gBQFWRcQWoTu0U2O4zhyS+ojPWlfryKRcA6zV5/YGqA4m0YuM7VjLhvhg6z695BBk0doP5jrv337kNDBfNrg9Kzl22VuEQwV8j+IhoOYMQR1ShwRFEmJSxVusQNkQ5wVhQ/QbSotEGWUTDaMOU2K9cJoc3aI9yP1OsHKJGcgmEGjA3qEwD472Vs1tT/Q0Ol/7QDuLySg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B1TN/soyJxcEfUdF7pZ8jHLorMgnT7s4953SnsHBXLw=; b=ECT57UyBpU+8uOoSDD+GXCxfubz2EB9ymLZ88avioO2UJTV/HZE140GAxkZGA6wve3SVa47GwWS4U3qTd2JrHJB7Qs0C9K8HNpHQUg1cRIl+PkPTODQEhCoF/Jz4EehgCMB2jrOQNkUVnkDL7nq53bH/2RyxrjAXVi2z0PQP4dE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; Received: from DM6PR21MB1370.namprd21.prod.outlook.com (2603:10b6:5:16b::28) by DS7PR21MB3150.namprd21.prod.outlook.com (2603:10b6:8:7a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.3; Tue, 31 Jan 2023 03:34:17 +0000 Received: from DM6PR21MB1370.namprd21.prod.outlook.com ([fe80::ef06:2e2c:3620:46a7]) by DM6PR21MB1370.namprd21.prod.outlook.com ([fe80::ef06:2e2c:3620:46a7%7]) with mapi id 15.20.6086.004; Tue, 31 Jan 2023 03:34:17 +0000 From: Michael Kelley To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Cc: mikelley@microsoft.com, stable@vger.kernel.org Subject: [PATCH net 1/1] hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap() Date: Mon, 30 Jan 2023 19:33:06 -0800 Message-Id: <1675135986-254490-1-git-send-email-mikelley@microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-ClientProxiedBy: MW4PR04CA0055.namprd04.prod.outlook.com (2603:10b6:303:6a::30) To DM6PR21MB1370.namprd21.prod.outlook.com (2603:10b6:5:16b::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR21MB1370:EE_|DS7PR21MB3150:EE_ X-MS-Office365-Filtering-Correlation-Id: 8048df16-08c4-40be-4952-08db033c07cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hj9+g3hDK9DIjRkx95hYfZqpi8e7Uf2cCfatALXy1t/3Ha0ZHW4BWS494/tIqUGVnm6A13n+MzKj6Zk85cWtTv3tVWheFJuSLudEuF7UYBfx3qoiN2xWEUBkl+QOWr11VkQCCwxPE4jwOnILsTycX1bHA3dGhTFGFoqkcqGujAJdLbULHHiGFaaBAVpH1euu3OQtUCHb7tibK2MorUY3QzM7QqIxx5ToWqBjekdeMmWaqzeNwfOK45olOoGLECDECT3tyQieB9yE9IrxKyFTNOj47MYe0D2+7uQBRbEXFtU1KkPY1bTBWQIh1XK+suYrd5/hhh5TYvXybpLzYXBLCa5o3wgl/1sqpUMnED2IRpxwVQRPLHNrKdd7yUtWjpctejSaur9LxWNjwDLGzUJjwu/93Pii0jlSiVrwqVYAzsdzKHBYJUSnDCmmH+iBpOLC2J/hvTqXgKOxmbHA+IYOLHpGcgpasZkc1DQ6rCxxBXpW6EvkhcJ3FtNprLWG0P3unhU+XHI7m3ImXYWSBLgl9BktUMeJ8GD2DfFrAFY5r6EBf/RVcD09JeiCVyJrKthWKSCqmlSqWwCN9HOE3T2dD4KKQe8o8Id4Y86a2o2sN4/R6c/OiT7iXdX/zDmJyzlc45C6Tg/aqSrHmK/2tcHNiylHm1mkfgp0LyF189p8u7d7iU5xaju5ls9LEouEY5+g2HTv7wAu/S7xARM6SPNle2nS7+xI/LzigfZlL66yzX/gjMcwBBAoUpTikPh/O6uLPi2V7xHI9AzEl1mQJBAgwQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR21MB1370.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(376002)(366004)(136003)(396003)(346002)(451199018)(82950400001)(36756003)(38100700002)(38350700002)(82960400001)(86362001)(6512007)(316002)(52116002)(6506007)(186003)(83380400001)(6666004)(478600001)(26005)(10290500003)(66556008)(5660300002)(4326008)(2616005)(41300700001)(921005)(6486002)(66476007)(66946007)(8676002)(2906002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?9ndGXo6Anq71xf1EcjmpnTzXgjIw?= =?utf-8?q?xyo9s4Xf2A9gZL5rnBafFLgJFn5er9kkLKxB5KDqOsia3OP/8D4/92SKoa8tA+iWI?= =?utf-8?q?ySxFIzk7Ky0hFNCiOgtU5rFy0Sjl92h+nF/OQyuceyVDcq9MC/iLmdg94bSoP9pM0?= =?utf-8?q?+urqg73wxLWfbEA7J8ZOBZkVSVejtKN778JsEdORpD2mhhteiNSnkXNibf1uTWwR7?= =?utf-8?q?8rguJTRjsAuCh63PMpQqFcexy3auYSjmPXBlBEwjuSBvLLhgVsi92TjNcjvJO+Tki?= =?utf-8?q?mTC43YsJ7INnsJRP47EtsnHwX8C1n8Df6tj52f5fOPuZdMnlgat7gbvWXaSkBPB9g?= =?utf-8?q?fBf9iq1rN/QK8lwkuIt5cBWFRHMK76LDpI9a0zFr4DvTotXQxgsyPBamRrH+kaMT9?= =?utf-8?q?Ee+wHDvfvzn0/vK3p6OxPiICT0HhWHKSQznGMC9NkMjugcjfG/xBdD/ewyVW1gp8m?= =?utf-8?q?WSSEod/sBb66QdBakych1MPm6Csjw2u49LcmDAsyBs//9uDjpYSj8K6kOSslU9Ql9?= =?utf-8?q?dqzpPi8L4UWOYXRteQNfije4bEKUaUdavQhRoIp7j8z+kSxqJ7Erv1mjl3Tep3EQp?= =?utf-8?q?VOuzNXcLQ5UisFRZY7bX/FhjbVaHNcBJ289XcQ9injIj0wnnofGGz9FVNII6pcw+Q?= =?utf-8?q?Bc5VvWE51vGqpRMH16A4wpjXM88Fbg8yoUIFFPD6ts/Amx8d8iPe8knhzyBWkkAlB?= =?utf-8?q?exeK11FVqhFW9I2bBiPXu8iHUkXBpTkcwVO7SBZ/PNsSUPJpxQi8XANOw91qTSRQF?= =?utf-8?q?9DiaMDShgCxG5XRrcU8FI1xQcyH6vuhyGvq6ovtuN61pNyWjWqFCy4NbnGwShNV3S?= =?utf-8?q?2yjn34x2gaTypzgOvarrJHpmsMW+7l/kfSPbADdRlnj5gGrv+8c9UNgzXW+8vHJWy?= =?utf-8?q?3Xw8DVgRozipIhmLo1UwKnttG6d+/9pNT4f/PNbxHKMMGxyXz9uHZ90BM63n14i7O?= =?utf-8?q?4GPorJEAI/n/mGoGLt6X/mvxrUa3wcTLnb56qcIYGQpaocE1JehT8rmHXDTFBD8to?= =?utf-8?q?dRzo5QMp+sys5tnUFGlrDm9Uk9R5ZAHGiZBdTuOwyqXiCjbrHBq2m1ogMrvGk/3KS?= =?utf-8?q?/GRu4q9nfn1I4TAhbOS8Nv943LjC0YiTPbLBgqwLydoTHqBAgY2Rrkzy70cZK5m2s?= =?utf-8?q?Soa2Id0dmOxVUyAiOOULZTRzvlLkQKpZbBYWybWg9WyDb2fv1T/jsSYVYLejXxWYI?= =?utf-8?q?Rq4LfGBCYMk5HhappdLbqVk0NqAQLRNLPfsekSIWVCM/Yb59btiykk5H3FwV30ctN?= =?utf-8?q?X0UATj+PT5PHNh0nEN9Rg+kwq7ZKX411NjoUp79mTcwCIoDmS5mYBYo/YlFzwAtJ4?= =?utf-8?q?gPAErLzGEkdHidzrG0APB/+lkQjzXwfMndRtBVRaKpdZ5B7b18QVrGoQWzd2GO/xP?= =?utf-8?q?kvElRjxpFlVX7pbSp3iLIKK8coZw7zGksNJMDN9O7OSOtiCwudy1Ul21OP72v09Kv?= =?utf-8?q?qWM+GbiegWZ0y9swKzj9lJAaAV1HOv0+jXEAVW0CWvx/sLIzT/8eZIcss/X06zbvZ?= =?utf-8?q?3oDLbMBGRfov?= X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8048df16-08c4-40be-4952-08db033c07cb X-MS-Exchange-CrossTenant-AuthSource: DM6PR21MB1370.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 03:34:16.8459 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JlUXHo4QxcCxrQ83Nq5hJ5n9lodjLUNsQ+H4Y2igZms5YpKH85m/Dij2wEc/Nl6ph7S4h63K4/JP3Y3mZIroYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR21MB3150 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_NONE autolearn=no 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?1756508345161106009?= X-GMAIL-MSGID: =?utf-8?q?1756508345161106009?= netvsc_dma_map() and netvsc_dma_unmap() currently check the cp_partial flag and adjust the page_count so that pagebuf entries for the RNDIS portion of the message are skipped when it has already been copied into a send buffer. But this adjustment has already been made by code in netvsc_send(). The duplicate adjustment causes some pagebuf entries to not be mapped. In a normal VM, this doesn't break anything because the mapping doesn’t change the PFN. But in a Confidential VM, dma_map_single() does bounce buffering and provides a different PFN. Failing to do the mapping causes the wrong PFN to be passed to Hyper-V, and various errors ensue. Fix this by removing the duplicate adjustment in netvsc_dma_map() and netvsc_dma_unmap(). Fixes: 846da38de0e8 ("net: netvsc: Add Isolation VM support for netvsc driver") Cc: stable@vger.kernel.org Signed-off-by: Michael Kelley Reviewed-by: Haiyang Zhang --- drivers/net/hyperv/netvsc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 661bbe6..8acfa40 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -949,9 +949,6 @@ static void netvsc_copy_to_send_buf(struct netvsc_device *net_device, void netvsc_dma_unmap(struct hv_device *hv_dev, struct hv_netvsc_packet *packet) { - u32 page_count = packet->cp_partial ? - packet->page_buf_cnt - packet->rmsg_pgcnt : - packet->page_buf_cnt; int i; if (!hv_is_isolation_supported()) @@ -960,7 +957,7 @@ void netvsc_dma_unmap(struct hv_device *hv_dev, if (!packet->dma_range) return; - for (i = 0; i < page_count; i++) + for (i = 0; i < packet->page_buf_cnt; i++) dma_unmap_single(&hv_dev->device, packet->dma_range[i].dma, packet->dma_range[i].mapping_size, DMA_TO_DEVICE); @@ -990,9 +987,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev, struct hv_netvsc_packet *packet, struct hv_page_buffer *pb) { - u32 page_count = packet->cp_partial ? - packet->page_buf_cnt - packet->rmsg_pgcnt : - packet->page_buf_cnt; + u32 page_count = packet->page_buf_cnt; dma_addr_t dma; int i;