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 88AE5C282CA for ; Tue, 12 Feb 2019 07:51:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57A34206BA for ; Tue, 12 Feb 2019 07:51:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i6wK7q29" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728070AbfBLHvn (ORCPT ); Tue, 12 Feb 2019 02:51:43 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:34759 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726095AbfBLHvm (ORCPT ); Tue, 12 Feb 2019 02:51:42 -0500 Received: by mail-pl1-f194.google.com with SMTP id w4so920675plz.1 for ; Mon, 11 Feb 2019 23:51:42 -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=SgIOWXInDHTzseQQNeYr/lwiaW9v2feFcf46Qd1ijBA=; b=i6wK7q29TDJ+Is50AYh5TQ4itkV1lDPaDBgNQu4jUrtXBUQ/LadnPKPjyndf62deDs BMYNn017QKltXWklaUpkAwjRBVIqt+uzuAouJDuw9PbPAV1xblOK/Seb5OSxalCSCMn3 gFbzobQz2UNmxVvlPuhYh7g4i1xfYsHgq7q8wVgBaTTxW7iWbTl8LNg1AB8+wujbTIRB rzFZpeSrwDyO5QrLfW5CJ23RrgLhftJcnJyLpZiy6hPKsAeXpybZ4h4rnBdIHyDFOneI WIAql/M60rkgyPvEfvZs/diTNC4ACGfhOv0WayRGQG6xWsM3mqicFy3oiUFzU2+n0qHF 6ueA== 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=SgIOWXInDHTzseQQNeYr/lwiaW9v2feFcf46Qd1ijBA=; b=mmMgt7acOMMiESCjCvJGRXKtJMjwvhUBjC25fwc+BgmIt+JBcZsFKaFODLySTNZ0wT 8wiKzEGT68Nf4Cn44cj8F6P1Ux1xyZIYQTSXkPOLa5EB4DvRMdOJW3CofZze3JiFvRWG OpBuh9MsFh6myBggUX6y+A2huYs72y8bm5HgKwa8edzFZDIWRN7q0fOPsNSacxsLFEFM +qtaaU9HwDnUqOx5YydJ28AEnI/Pv7GBGRsJIvEn+KnTkKprI4QFRbOCrO72sZjAPfrX P3TKPlZDGWiF5wYoVenjq6AUFrwxJS7oYHqsK5V51r22fpdUMaP+mylZ6/d3xyfx4QBZ YHmg== X-Gm-Message-State: AHQUAua7nP4dAUd7iKPTAQksAXy0yJ/8ddWkT4luktI+4NMKM1iktAjt 1/VoFMz43L2F9KZCesvtZm8= X-Google-Smtp-Source: AHgI3IZEL9uSU88dkGSE7VjG+Yn9HTZegmCRF8nPeirgtoA6/npiv4U4kePbwNSytdkxNJU7sxahYA== X-Received: by 2002:a17:902:b402:: with SMTP id x2mr2677323plr.53.1549957902058; Mon, 11 Feb 2019 23:51:42 -0800 (PST) Received: from btopel-mobl.ger.intel.com ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id t86sm2073239pfi.158.2019.02.11.23.51.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Feb 2019 23:51:41 -0800 (PST) From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , magnus.karlsson@intel.com, magnus.karlsson@gmail.com, jan.sokolowski@intel.com Subject: [PATCH bpf] xsk: do not remove umem from netdevice on fall-back to copy-mode Date: Tue, 12 Feb 2019 08:51:14 +0100 Message-Id: <20190212075114.6628-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 From: Björn Töpel Commit c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id") stores the umem into the netdev._rx struct. However, the patch incorrectly removed the umem from the netdev._rx struct when user-space passed "best-effort" mode (i.e. select the fastest possible option available), and zero-copy mode was not available. This commit fixes that. Fixes: c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id") Signed-off-by: Björn Töpel --- net/xdp/xdp_umem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 597866e7c441..37e1fe180769 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -125,9 +125,10 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev, return 0; err_unreg_umem: - xdp_clear_umem_at_qid(dev, queue_id); if (!force_zc) err = 0; /* fallback to copy mode */ + if (err) + xdp_clear_umem_at_qid(dev, queue_id); out_rtnl_unlock: rtnl_unlock(); return err; -- 2.19.1