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=-3.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,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 711C1C282C4 for ; Tue, 12 Feb 2019 08:52:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BF5820675 for ; Tue, 12 Feb 2019 08:52:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eHpNRkVZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728580AbfBLIwa (ORCPT ); Tue, 12 Feb 2019 03:52:30 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:43603 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727234AbfBLIwa (ORCPT ); Tue, 12 Feb 2019 03:52:30 -0500 Received: by mail-pf1-f194.google.com with SMTP id q17so969891pfh.10 for ; Tue, 12 Feb 2019 00:52:30 -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:mime-version :content-transfer-encoding; bh=F6fxo9K/Tx8CYgqIa9FfGLNNwY3MyB0wszmqmcanFXQ=; b=eHpNRkVZwVlpmyHkkXYuxLzWOit/gy6mt2wkpa4T0R+tScE7pSdMy2fBcrh8ZeUGlY hcp1PZXV7CFPQ8F6vJEWTkCV2OMXd1Mb1lGP1fbGwQ2hjhit47GJ5q0eV7oG2oQ11il1 giR1vhD6zlkedKla5UeLraURziG0k/o6zm7UkIOTmi8+ZD7M6VMsE/VkbOaJO/YoIZcd GwcMljGiPV6gg+143bDWOPmSzyTi25v8qByJ/Ty9L5JMr3AMqJgVB5lw/lkqd2vMOmbC KqHQEm+ORgm14mO4iHL+wjUwxG8nuksavArCdhs4Sk8Ewby/1xr//7DZUj/K8YHME75b twdA== 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:mime-version :content-transfer-encoding; bh=F6fxo9K/Tx8CYgqIa9FfGLNNwY3MyB0wszmqmcanFXQ=; b=FQy52sETfs17ogWz+6yDZIUh8ykx06HYXu/JyE0CXcZQxieFvfQEcvGn4gsTQshra8 vjdE+2uhuKLhGzFvApsKTKnV+p7OC8vkImjgkjiW/yhvkBb/+sGIgFbUKnN5/vL8eQiI BKDHsRSKy9InfRtUHKdNHPv0Ajwmwv9lI0uKGhaH1fE+5WR1dFPEb1FkUdDDaWoOPuvU ChL1E3n0nyoQoqsCRlc+ZuDGv61B+16RW9FX7NbJs+ZUeLNsJjkBZU1+7+2CVYmoLiFr jFDHwX+skH36EI2BXk0hc9THD/AJuRis0QVnV35mX1WHnGJWbupHKYL1IrW+Le4Iv6pq AxKA== X-Gm-Message-State: AHQUAuZd9nI9S1cMeLi0AWAZxslSEAlmKp5BlxskUJv0KYIkBSoIoV6f 0gZk+W1o/JDD/V0wC9KG6r4= X-Google-Smtp-Source: AHgI3IZ6D7jlOL4ZN+4L1pxkiLIaCysbLixWEg182zeuCWDi0aWlfbNMhcFsPXwWepfHcWpn//Jlmw== X-Received: by 2002:a63:3541:: with SMTP id c62mr2621525pga.191.1549961549979; Tue, 12 Feb 2019 00:52:29 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 00:52:29 -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 0/2] i40e: fix regression that enables AF_XDP ZC unconditionally Date: Tue, 12 Feb 2019 09:52:03 +0100 Message-Id: <20190212085205.7848-1-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 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 This series addresses a recent AF_XDP zero-copy regression. 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. Thanks, Björn Björn Töpel (2): i40e: move i40e_xsk_umem function i40e: add tracking of AF_XDP ZC state for each queue pair drivers/net/ethernet/intel/i40e/i40e.h | 16 ++---------- drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +++++++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 3 +++ 3 files changed, 33 insertions(+), 14 deletions(-) -- 2.19.1