From patchwork Tue Dec 17 16:20:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 1211625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="eImyKBFl"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47cmfj40xFz9sRC for ; Wed, 18 Dec 2019 05:21:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E8CD122621; Tue, 17 Dec 2019 18:20:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6KJbWdjlkaq7; Tue, 17 Dec 2019 18:20:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2EE15221AB; Tue, 17 Dec 2019 18:20:57 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9635D1BF2B3 for ; Tue, 17 Dec 2019 16:54:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 90B2E2013C for ; Tue, 17 Dec 2019 16:54:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4hHXEumxx3R3 for ; Tue, 17 Dec 2019 16:54:07 +0000 (UTC) X-Greylist: delayed 00:18:54 by SQLgrey-1.7.6 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30061.outbound.protection.outlook.com [40.107.3.61]) by silver.osuosl.org (Postfix) with ESMTPS id 9825E2002C for ; Tue, 17 Dec 2019 16:54:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TVT181hVC4wEFV5pPpYm7O76Qpj3HnEIJQ6wFXN/6ovOysNKgwLkOQrsnGHn03TGyUT/IyQwiLoapOEDc0lII0d/pqDCWLRFmfrOECM05DC3Pi2NtWDrzu8jRevCVnW4t/Zx13dTprnKiZOQ5R3+0MI+5TSr13c1XrZoo22eci6w/fRlRzOSy2r2etog+XqyfIUuhOw0IXe6YC2hOQNxdcx0eY8oZzIk1cJn6VB+BnZBdsWtK5Zf6alJI613yPcdkvUTSEAdMG8wsD3Cb087kkxXvZGrDOw1uVaZxbQAt+zxppW5ZjGH2ERo9ZrOsAt9DafOR0oLUS56/+M1c29YMA== 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-SenderADCheck; bh=4KlWAfKbih8P3/+2oUMH/tWItKTWaFXue9vNnQ7rL/w=; b=OB3FRsstsnMs7/3JOD/HW9NqNYLG7i6KgruvNlJhalk34vx5v7hvuO2HEUzmux6RweutKmKfw2e8LmMSVEl+MYIFsliXtzaVw40mv3wPMXorQ+Voa1nqEe8vQpgotTDWFRMouwXoIbodvRlLAHaymWpP2F6K9DkK48C1W7nCnRjTmZkxXCXQgpwuEehmrMmXTdT0WSGIAiUL59n2Slkl61d4mo8S1XY9SDcZLEEUJuNcFihncL2XvXTeF0E2nR6OEgt7Iv5MbyW5dAWz2UghtUEHtd7tBsTKozaqWmDI30lO9c6jl37qy73aSpSkNIUruGztnqL8YSDcIasHj+oAuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4KlWAfKbih8P3/+2oUMH/tWItKTWaFXue9vNnQ7rL/w=; b=eImyKBFlGEC4Z5XncqYHDSqiY8OQL0rfDaqwN6y++KDClkbnqkSGEPVKrUo3pRXFr2fyH9AZpQmq8MVY3Ip6eGnEBrZgdLDybNOvPKqy2KSJFQsoR2oIkQg8JJUpSudJNfYz7IWO9vPt5CW4K9V64x3C+Wj1tBV4t/tKeXwQvJ0= Received: from AM0PR05MB5875.eurprd05.prod.outlook.com (20.178.119.159) by AM0PR05MB4259.eurprd05.prod.outlook.com (52.134.126.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18; Tue, 17 Dec 2019 16:20:45 +0000 Received: from AM0PR05MB5875.eurprd05.prod.outlook.com ([fe80::259f:70b4:dab1:8f2]) by AM0PR05MB5875.eurprd05.prod.outlook.com ([fe80::259f:70b4:dab1:8f2%5]) with mapi id 15.20.2538.019; Tue, 17 Dec 2019 16:20:45 +0000 From: Maxim Mikityanskiy To: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Magnus Karlsson , Jeff Kirsher Thread-Topic: [PATCH bpf v2 3/4] net/i40e: Fix concurrency issues between config flow and XSK Thread-Index: AQHVtPXvYaIGaoLTAkO9XurGqw6UTQ== Date: Tue, 17 Dec 2019 16:20:45 +0000 Message-ID: <20191217162023.16011-4-maximmi@mellanox.com> References: <20191217162023.16011-1-maximmi@mellanox.com> In-Reply-To: <20191217162023.16011-1-maximmi@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR02CA0106.eurprd02.prod.outlook.com (2603:10a6:208:154::47) To AM0PR05MB5875.eurprd05.prod.outlook.com (2603:10a6:208:12d::31) authentication-results: spf=none (sender IP is ) smtp.mailfrom=maximmi@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [94.188.199.18] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: dd6eaf22-2b0c-4aa9-f473-08d7830d11e0 x-ms-traffictypediagnostic: AM0PR05MB4259:|AM0PR05MB4259: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2958; x-forefront-prvs: 02543CD7CD x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(136003)(366004)(346002)(396003)(39860400002)(199004)(189003)(54906003)(26005)(66556008)(6506007)(110136005)(66476007)(2906002)(7416002)(64756008)(186003)(5660300002)(66446008)(36756003)(52116002)(1076003)(8676002)(81166006)(71200400001)(86362001)(81156014)(6486002)(107886003)(2616005)(478600001)(316002)(66946007)(6512007)(8936002)(4326008)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4259; H:AM0PR05MB5875.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: BCL:0; x-microsoft-antispam-message-info: rHv0mdZTbgNfRAJqUgqjZU9mkeQ2JJXVeBDS26Sy9pueCr9fQ4oB1tCjiuvVOGcX3GUaBnxaaNn6mpGRs3OvICg1lKTFQcXbOuHcH6OgAyaq9yyr20cLeHQbS/qkRAymq5zbD1AScnhLTpyFn8+JTVyR8tujTqJTXptHrdnUJUYjl0Fwy84pIEbEnAJKzTG/7BWs7RME52s+4WV5xDIxQ7ta4y1Uwq7ahRuqm95R20Tg0xToxYwmwsUQA1HTdn2VopNluv2xj+qAfEct3KZBFTHNP38hDANPFVOHOkzmwHK8KeNAAjktEXxEOrC78Zcf2hpxLrPLSmAV6dW9uGP53TFoKIknmvB5z3UmcADlug3tpBYWNQkSRex19uzqF6Ptk31EwhDzo/9E2jRsrZQa1rizVVY7/GcUEQoOcz067Ay9ANooBKjJa45btmt96JnP8LU7oliz8czrGoq1LShjBRLzPyLnn7sLTAf7rCcDqK0VD3ffrd6HmVqsdcwzsgar Content-ID: MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd6eaf22-2b0c-4aa9-f473-08d7830d11e0 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2019 16:20:45.5892 (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: jXYWSqLL3EU95j104HSIzEM+LAzaL7SyScJ86+nJl/ZjMlJhTsdHFM0qMHlpg2DXp4lkRuLwvO1Ls25WU5rM9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4259 X-Mailman-Approved-At: Tue, 17 Dec 2019 18:20:49 +0000 Subject: [Intel-wired-lan] [PATCH bpf v2 3/4] net/i40e: Fix concurrency issues between config flow and XSK X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Mikityanskiy , Jakub Kicinski , Jesper Dangaard Brouer , Daniel Borkmann , "netdev@vger.kernel.org" , Alexei Starovoitov , Saeed Mahameed , "intel-wired-lan@lists.osuosl.org" , Jonathan Lemon , "bpf@vger.kernel.org" , "David S. Miller" Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Use synchronize_rcu to wait until the XSK wakeup function finishes before destroying the resources it uses: 1. i40e_down already calls synchronize_rcu. On i40e_down either __I40E_VSI_DOWN or __I40E_CONFIG_BUSY is set. Check the latter in i40e_xsk_wakeup (the former is already checked there). 2. After switching the XDP program, call synchronize_rcu to let i40e_xsk_wakeup exit before the XDP program is freed. 3. Changing the number of channels brings the interface down (see i40e_prep_for_reset and i40e_pf_quiesce_all_vsi). 4. Disabling UMEM sets __I40E_CONFIG_BUSY, too. Signed-off-by: Maxim Mikityanskiy Signed-off-by: Björn Töpel --- drivers/net/ethernet/intel/i40e/i40e.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++++++--- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index cb6367334ca7..4833187bd259 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -1152,7 +1152,7 @@ void i40e_set_fec_in_flags(u8 fec_cfg, u32 *flags); static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi) { - return !!vsi->xdp_prog; + return !!READ_ONCE(vsi->xdp_prog); } int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch); diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 1ccabeafa44c..2c5af6d4a6b1 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -6823,8 +6823,8 @@ void i40e_down(struct i40e_vsi *vsi) for (i = 0; i < vsi->num_queue_pairs; i++) { i40e_clean_tx_ring(vsi->tx_rings[i]); if (i40e_enabled_xdp_vsi(vsi)) { - /* Make sure that in-progress ndo_xdp_xmit - * calls are completed. + /* Make sure that in-progress ndo_xdp_xmit and + * ndo_xsk_wakeup calls are completed. */ synchronize_rcu(); i40e_clean_tx_ring(vsi->xdp_rings[i]); @@ -12546,8 +12546,12 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi, old_prog = xchg(&vsi->xdp_prog, prog); - if (need_reset) + if (need_reset) { + if (!prog) + /* Wait until ndo_xsk_wakeup completes. */ + synchronize_rcu(); i40e_reset_and_rebuild(pf, true, true); + } for (i = 0; i < vsi->num_queue_pairs; i++) WRITE_ONCE(vsi->rx_rings[i]->xdp_prog, vsi->xdp_prog); diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c index d07e1a890428..f73cd917c44f 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c @@ -787,8 +787,12 @@ int i40e_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) { struct i40e_netdev_priv *np = netdev_priv(dev); struct i40e_vsi *vsi = np->vsi; + struct i40e_pf *pf = vsi->back; struct i40e_ring *ring; + if (test_bit(__I40E_CONFIG_BUSY, pf->state)) + return -ENETDOWN; + if (test_bit(__I40E_VSI_DOWN, vsi->state)) return -ENETDOWN;