From patchwork Wed Dec 26 20:27:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1018735 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EYogZ3VY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Q4LD3F7Nz9sCr for ; Thu, 27 Dec 2018 07:28:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727859AbeLZU2f (ORCPT ); Wed, 26 Dec 2018 15:28:35 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:44809 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727676AbeLZU2X (ORCPT ); Wed, 26 Dec 2018 15:28:23 -0500 Received: by mail-pg1-f196.google.com with SMTP id t13so7907296pgr.11 for ; Wed, 26 Dec 2018 12:28:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=pFiWK5NTUhS+xzWXgght5NgoJ++lA1LDOOXLe9Bk4kc=; b=EYogZ3VYI8TVRf5KIoo0hkrwLUiDVxj9n0CYUEU4ie2IdyZXAvi3zWFEpVQme0leBc 0zm/bTqPor203+JBLT3Gfhs/rBku24d0SE8r6NeqVh6aEBVcsm/2viX+xRJLKDjmaf6+ 0cu099XmzAw4a64b5vuCb+IYC3wYVB/YCHKmFtTlOqC2qAvh83zjsHXPWxnLWGvp7HlC pY3e2dae0FeiqU2f1GRMkzngDbZoCPuJ/9bvy97ovlFXWY3STbH5xyNPoZG73FCbQuz+ QNyK/ojxklQkICZlJDrdJ2/9HkWSF125BGQpwV3aCu5qV0AOOD7i30PGjGyWZl2U/aRf 43pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pFiWK5NTUhS+xzWXgght5NgoJ++lA1LDOOXLe9Bk4kc=; b=B/H5sKvZs7uruv0cnmIosQV+0mcO7P1jLEogKStDdch3RCg3qbOr/UtRJQ/yv51E0y ckEO2Z1bMSEhNMSc0rNCbwntPHlvLOMutLTKpBLpSXNmtIv4v6AmMGVQ8Z4wdo84jG46 z4VQYR4Va9VTiQ0o+oyMMjK175Nzz9UmST6gQV9JhTM33NKNSoNig2RUzzjRDAXTwxvM mfv68Nw+eE0dF2tKG9OK0PAQsU+E+quuWgRnvuIrIWbPRb6sVpb4vcyxsDFldQrE9pha TJuGB1R8f627MiQ8O1ykGLDEEkmIl6LN0gk9EudiTTk4pa7pkSNx5xDgQm8MoDRowVZ2 cbow== X-Gm-Message-State: AJcUukdUFqDRXDaGc2i8GvTJMReEcOkexe6gY3bZ6X6/0MRlM3j6Uarh 8fSrcglF53hnYb56I0z/XOA= X-Google-Smtp-Source: ALg8bN501HUYJsbjAlbJzPOUu7ESc2yABhmX6CEzParyUGJETpdp2q+zuJ4pqbmbN40lzlWvw7ppmQ== X-Received: by 2002:a63:78cd:: with SMTP id t196mr20270427pgc.62.1545856102292; Wed, 26 Dec 2018 12:28:22 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id t90sm72712460pfj.23.2018.12.26.12.28.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Dec 2018 12:28:21 -0800 (PST) From: William Tu To: bjorn.topel@gmail.com, magnus.karlsson@gmail.com, ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org, makita.toshiaki@lab.ntt.co.jp, yihung.wei@gmail.com, magnus.karlsson@intel.com Subject: [PATCH bpf-next RFCv3 3/6] xsk: add new MEM type for virtual device. Date: Wed, 26 Dec 2018 12:27:50 -0800 Message-Id: <1545856073-8680-4-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545856073-8680-1-git-send-email-u9012063@gmail.com> References: <1545856073-8680-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add MEM_TYPE_ZERO_COPY_VDEV for supporting the veth AF_XDP. For zero-copy veth, the memory comes from userspace and does not need to be freed at kernel. Thus, when xdp returns the frame, detecting this type and doing nothing. Signed-off-by: William Tu --- include/net/xdp.h | 1 + net/core/xdp.c | 1 + net/xdp/xsk.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/net/xdp.h b/include/net/xdp.h index 0f25b3675c5c..010cb9efca90 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -38,6 +38,7 @@ enum xdp_mem_type { MEM_TYPE_PAGE_ORDER0, /* Orig XDP full page model */ MEM_TYPE_PAGE_POOL, MEM_TYPE_ZERO_COPY, + MEM_TYPE_ZERO_COPY_VDEV, MEM_TYPE_MAX, }; diff --git a/net/core/xdp.c b/net/core/xdp.c index 4b2b194f4f1f..d47f003714c4 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -355,6 +355,7 @@ static void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct, xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params); xa->zc_alloc->free(xa->zc_alloc, handle); rcu_read_unlock(); + case MEM_TYPE_ZERO_COPY_VDEV: default: /* Not possible, checked in xdp_rxq_info_reg_mem_model() */ break; diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 0e252047f55f..3d151d64fc79 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -109,7 +109,8 @@ int xsk_rcv(struct xdp_sock *xs, struct xdp_buff *xdp) len = xdp->data_end - xdp->data; - return (xdp->rxq->mem.type == MEM_TYPE_ZERO_COPY) ? + return (xdp->rxq->mem.type == MEM_TYPE_ZERO_COPY || + xdp->rxq->mem.type == MEM_TYPE_ZERO_COPY_VDEV) ? __xsk_rcv_zc(xs, xdp, len) : __xsk_rcv(xs, xdp, len); }