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 62119C43387 for ; Fri, 18 Jan 2019 13:03:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E27E20823 for ; Fri, 18 Jan 2019 13:03:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="G6SJUsYk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727304AbfARNDz (ORCPT ); Fri, 18 Jan 2019 08:03:55 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:45746 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726810AbfARNDz (ORCPT ); Fri, 18 Jan 2019 08:03:55 -0500 Received: by mail-pl1-f195.google.com with SMTP id a14so6330069plm.12 for ; Fri, 18 Jan 2019 05:03:54 -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=Q6UbneBFpTHJNb0L7Yhev5QIcbfaJD4MQpO6+hKgNb8=; b=G6SJUsYkoegerdiUlSegQh0mQxT5v2ga1BkP1Q77dPGptGeeISHIpXuQxwrl2WoNms bfW9xYeM8395YzAvhsv/UqWe7x1UzFySYpLrhZuKea2Z4HEpL+dyvx09JfJkBzVa/STG jr446ZgoLZdRd7Sp58c+Wc9gh7QIIkCuquEk826vCdtoqV9kWYyskEPfj76CS0d9Ccqg vRY9hHI+SJIMWv17rNmumqmwJjFmOET11fxd9NOpKiCuGqjc1yt7cjC9tJUTNobcUFdd XJ4oxR6lZYOt9PG4dKMZZgJCaA3PuRLMH3F5OU/81hHhM4Q/YGPQTECpQMgNRsPMyETT e/aQ== 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=Q6UbneBFpTHJNb0L7Yhev5QIcbfaJD4MQpO6+hKgNb8=; b=pVKc3h7OZ+j7uqCcRqnwmElkT1G4GAApZHCDKFgtgqCABtcOLvfMBdNp7ae/CtlgNV l1d0g58TUMblm2sMnIJYj970lCH25WLcq7FDbh7IJLZJjLKr3VaCjRibLUV+1+x2YWVl bkrzuGBZIkWJ6E/83wcCh8MbB/SlF/SXk2Yiwg1O1iGzYSoI04u3wCyGVau49BfWJ0Lm PWyzXeFmzcUTIYFO0UtcS8id9sDQSxTipd3mJLREkjryZVjKlUO++0JV2oyBy8wd6eSI /twy2mebZRqATtlx3w4A/bfsHtg/6aaCwtDOr76PVNC4OKX/k05RaAiAE27Jynvmiu4R 3Wzg== X-Gm-Message-State: AJcUukfeZlyaXogc5plApAuNbhEOC7szSNoSuR8JIU26qCO/efnV0SZw cAFoghOeoUg8zDaWRlUQ98E= X-Google-Smtp-Source: ALg8bN54YKQ4Y0rmYFLsKeWZ+ifjqrLJxR+p2BgdCuQgFov8V1Je79u19EOfLdiK+nGzzUFWB7oFAQ== X-Received: by 2002:a17:902:2a66:: with SMTP id i93mr18811064plb.113.1547816633988; Fri, 18 Jan 2019 05:03:53 -0800 (PST) Received: from btopel-mobl.ger.intel.com (fmdmzpr04-ext.fm.intel.com. [192.55.54.39]) by smtp.gmail.com with ESMTPSA id 84sm12418712pfa.115.2019.01.18.05.03.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 05:03:53 -0800 (PST) From: bjorn.topel@gmail.com 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 Subject: [PATCH bpf-next 2/3] xsk: add id to umem Date: Fri, 18 Jan 2019 14:03:04 +0100 Message-Id: <20190118130305.11504-3-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190118130305.11504-1-bjorn.topel@gmail.com> References: <20190118130305.11504-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 This commit adds an id to the umem structure. The id uniquely identifies a umem instance, and will be exposed to user-space via the socket monitoring interface. Signed-off-by: Björn Töpel --- include/net/xdp_sock.h | 1 + net/xdp/xdp_umem.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h index 13acb9803a6d..61cf7dbb6782 100644 --- a/include/net/xdp_sock.h +++ b/include/net/xdp_sock.h @@ -42,6 +42,7 @@ struct xdp_umem { struct work_struct work; struct page **pgs; u32 npgs; + int id; struct net_device *dev; struct xdp_umem_fq_reuse *fq_reuse; u16 queue_id; diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index a264cf2accd0..eabdb0f59031 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -13,12 +13,15 @@ #include #include #include +#include #include "xdp_umem.h" #include "xsk_queue.h" #define XDP_UMEM_MIN_CHUNK_SIZE 2048 +static DEFINE_IDA(umem_ida); + void xdp_add_sk_umem(struct xdp_umem *umem, struct xdp_sock *xs) { unsigned long flags; @@ -183,6 +186,8 @@ static void xdp_umem_release(struct xdp_umem *umem) xdp_umem_clear_dev(umem); + ida_simple_remove(&umem_ida, umem->id); + if (umem->fq) { xskq_destroy(umem->fq); umem->fq = NULL; @@ -389,8 +394,16 @@ struct xdp_umem *xdp_umem_create(struct xdp_umem_reg *mr) if (!umem) return ERR_PTR(-ENOMEM); + err = ida_simple_get(&umem_ida, 0, 0, GFP_KERNEL); + if (err < 0) { + kfree(umem); + return ERR_PTR(err); + } + umem->id = err; + err = xdp_umem_reg(umem, mr); if (err) { + ida_simple_remove(&umem_ida, umem->id); kfree(umem); return ERR_PTR(err); } -- 2.19.1