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,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 D339FC282CA for ; Tue, 12 Feb 2019 08:52:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A368121773 for ; Tue, 12 Feb 2019 08:52:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kEG77YXe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728426AbfBLIwi (ORCPT ); Tue, 12 Feb 2019 03:52:38 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:38095 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727234AbfBLIwi (ORCPT ); Tue, 12 Feb 2019 03:52:38 -0500 Received: by mail-pl1-f194.google.com with SMTP id e5so980378plb.5 for ; Tue, 12 Feb 2019 00:52:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x3H3dvcVPzIeaeu47sYZtsBs/Rjy1TgqKkKpqTtk0XQ=; b=kEG77YXen8pPuOjwre5suhtxR87f5E1p7BUg6Nz+U1YAfMaJPMTmzKL74/0RzuLHGp FathksUCtEGlS126A3y8QpqIwigtgUAVH9ElMF0zhGu2Gw7UiYKWWGcA6osKYgz8Lfm5 pvrTTSVp4daz45YE70uMZyK8hFEtDWzT8+zw1YsciX9WHQGgDw5tSLe5BTT1kv4WEhZe c1KoG75BAHbcNo9Og5ikuACmX0/pnMAcCZBvANYslfEtdbCzhJvxuT01K4Dztpxi+6IF M2a1XZf4A2kW1T7YCFQGmZsQbagBNugz8TKVP3udSQq8/OLLX2owQtCdCZ6lkQinMwZF khLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x3H3dvcVPzIeaeu47sYZtsBs/Rjy1TgqKkKpqTtk0XQ=; b=jOBCep+dSnZWrfnrZmdJKlE0HezhsfzYOldF5ueNs4KFGrHKNeNNC5mD0kYk2TcBLp fjEadlAYIXq9PXlm4htR5qtyPA5C/pBjTHVEkXtdZTlw9qmMPMKrzEtKvn6W1X4U9MdJ qTBxpVky2Ebix5GykmTEqa2CzinvbX/JGaWuN8qv8jdQ5JC0kkYOMYxHtgUeB1JJgWMy tMbOzZrbh3cybgYvTkz8x6AURz1Cpvu0fqktiHSNysH9jFCOHFjlPr9pua4RhE3LIUVv xqeQM9D7JEAnkE+qg4Lqa0corLQophRNoqG2iT4tCeiWPOqdHwl1eLsj3H4x+iDXlVQp NhIw== X-Gm-Message-State: AHQUAubtGNcDMUNMQX0/X/SRcGvevcNXgkl0PB7hHatgfEusbUGu8af4 18CuJrKLJJ+6rujKZ4yqnS0= X-Google-Smtp-Source: AHgI3IZofi1S9Qoc/NlNtPsXJjxc+fGxbXJ9eZV5vyQS1lw5DsP4IhQ/GGZA2MwHP/mvse3mut8oTg== X-Received: by 2002:a17:902:ba8b:: with SMTP id k11mr2883424pls.177.1549961557334; Tue, 12 Feb 2019 00:52:37 -0800 (PST) Received: from btopel-mobl.ger.intel.com ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id u73sm24461606pfa.169.2019.02.12.00.52.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 00:52:36 -0800 (PST) From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: intel-wired-lan@lists.osuosl.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , magnus.karlsson@intel.com, magnus.karlsson@gmail.com, netdev@vger.kernel.org, jan.sokolowski@intel.com Subject: [PATCH 2/2] i40e: add tracking of AF_XDP ZC state for each queue pair Date: Tue, 12 Feb 2019 09:52:05 +0100 Message-Id: <20190212085205.7848-3-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190212085205.7848-1-bjorn.topel@gmail.com> References: <20190212085205.7848-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Björn Töpel In commit f3fef2b6e1cc ("i40e: Remove umem from VSI") a regression was introduced; When the VSI was reset, the setup code would try to enable AF_XDP ZC unconditionally (as long as there was a umem placed in the netdev._rx struct). Here, we add a bitmap to the VSI that tracks if a certain queue pair has been "zero-copy enabled" via the ndo_bpf. The bitmap is used in i40e_xsk_umem, and enables zero-copy if and only if XDP is enabled, the corresponding qid in the bitmap is set and the umem is non-NULL. Fixes: f3fef2b6e1cc ("i40e: Remove umem from VSI") 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 | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index cc583ad5236b..d3cc3427caad 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -790,6 +790,8 @@ struct i40e_vsi { /* VSI specific handlers */ irqreturn_t (*irq_handler)(int irq, void *data); + + unsigned long *af_xdp_zc_qps; /* tracks AF_XDP ZC enabled qps */ } ____cacheline_internodealigned_in_smp; struct i40e_netdev_priv { diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index ba1a84a2c8e5..0dd00d58c524 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -3077,7 +3077,7 @@ static struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring) if (ring_is_xdp(ring)) qid -= ring->vsi->alloc_queue_pairs; - if (!xdp_on) + if (!xdp_on || !test_bit(qid, ring->vsi->af_xdp_zc_qps)) return NULL; return xdp_get_umem_from_qid(ring->vsi->netdev, qid); @@ -10076,6 +10076,12 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type) hash_init(vsi->mac_filter_hash); vsi->irqs_ready = false; + if (type == I40E_VSI_MAIN) { + vsi->af_xdp_zc_qps = bitmap_zalloc(pf->num_lan_qps, GFP_KERNEL); + if (!vsi->af_xdp_zc_qps) + goto err_rings; + } + ret = i40e_set_num_rings_in_vsi(vsi); if (ret) goto err_rings; @@ -10094,6 +10100,7 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type) goto unlock_pf; err_rings: + bitmap_free(vsi->af_xdp_zc_qps); pf->next_vsi = i - 1; kfree(vsi); unlock_pf: @@ -10174,6 +10181,7 @@ static int i40e_vsi_clear(struct i40e_vsi *vsi) i40e_put_lump(pf->qp_pile, vsi->base_queue, vsi->idx); i40e_put_lump(pf->irq_pile, vsi->base_vector, vsi->idx); + bitmap_free(vsi->af_xdp_zc_qps); i40e_vsi_free_arrays(vsi, true); i40e_clear_rss_config_user(vsi); diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c index 96d849460d9b..2737fee338c4 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c @@ -102,6 +102,8 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem, if (err) return err; + set_bit(qid, vsi->af_xdp_zc_qps); + if_running = netif_running(vsi->netdev) && i40e_enabled_xdp_vsi(vsi); if (if_running) { @@ -143,6 +145,7 @@ static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid) return err; } + clear_bit(qid, vsi->af_xdp_zc_qps); i40e_xsk_umem_dma_unmap(vsi, umem); if (if_running) { -- 2.19.1