From patchwork Thu Feb 29 17:04:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 13577438 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99D17160636; Thu, 29 Feb 2024 17:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709226297; cv=none; b=pBPNk/BA1L58cOusmqkHAzLWQ+K5KoRqsHfJXuOoadoZCLbGiaWPEUE0UA9zmm03/xEvpAjvp12LbroNKuygUAB3nAC/Vv4/gxuyDbKKJZFZx2HGFWzkJgcWBLhet/Mp2ZhqmWQJzCB00aRQLlFFzC8WVwtcouFJh9mGbThcwns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709226297; c=relaxed/simple; bh=tTf5DGA4/EdGbxqRxWUdMDKOzj/3epteLSgwhMqPiA4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=POAuBOu6rUa2fJVeEGfVdAM0DtGH24OmVZjI8OiZ2XgvJDF2U/F/VMgS0WO0UhMBx82/QKyHffJRBYKnyMz7quUeFwJlI3X7sxaVO3bhHIUqHWOO9V0++lHrAiz8P+OPeFC9H3S1uHrwMxRnbftbGGsB2s9CJlwMOx23K8qNuas= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2d2fad80eacso11622911fa.2; Thu, 29 Feb 2024 09:04:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709226294; x=1709831094; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=C7eSu5LAngYuG4yyZo6XzjOmxDsHUKU5MZ0QDXjzOq8=; b=hnqgUKFqH7cbMuRutH5//i0o1Mym0Vf++S1Zf+x8nmZPdLdGq4TkO9aWtgFWAW3vpf hPlcjLQvAIVb9DAn1yBwQpjGrvzQaocDaEPzioFYmrf4+w3bzVvFfjT4o21NexDRo3op Ml1DaiP1veK4iW8aQETg/kunJjduuir1oM6sR+d3rtfqpEoX/c4pEX5WZwhxFtWkuMXP Hn+6icMQDB5k7vh9t7fLaNu6sU+EswADkdfzzUbusU9oXytCVQccsmsRCCqnDiswcgpJ P1HYRMmE2+iVxB1JxkVcavlofhqyTYv9+foy56IKt6y71it1HOthsbp6Cztq28U5Bmfw UP7w== X-Forwarded-Encrypted: i=1; AJvYcCV7UUdIlJBuvkqSy8Jkqy6u2NDm6cM7nuI8BPr4HG7vK/UBjoj1h/1fCIlZFtwCfnOdvjJiKWJYHRVr70dieOre8NIbxyhnY0+188gt X-Gm-Message-State: AOJu0Yx1D7ccwsgJmyTnF63ZLdp3oa2d/wIiNv/czPLocl4iDpN/wT2x PW+JhI7qWMLo7xQ+PXwJcalc17S3a2r6ciUsCs6n6qhWzL0Xu+0a X-Google-Smtp-Source: AGHT+IHVvv37XKBHxeMbPUTK+oooXHJhgULZY/r3t3cWxLlVISuKpQHZmbVYY3b2qOjj9jRkkqXl1A== X-Received: by 2002:a2e:8194:0:b0:2d2:c937:6fea with SMTP id e20-20020a2e8194000000b002d2c9376feamr1960270ljg.6.1709226293467; Thu, 29 Feb 2024 09:04:53 -0800 (PST) Received: from localhost (fwdproxy-lla-118.fbsv.net. [2a03:2880:30ff:76::face:b00c]) by smtp.gmail.com with ESMTPSA id y16-20020a05600c365000b00412656ba919sm5599122wmq.20.2024.02.29.09.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 09:04:53 -0800 (PST) From: Breno Leitao To: kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, horms@kernel.org, dsahern@kernel.org Subject: [PATCH net-next 1/2] net: bareudp: Do not allocate stats in the driver Date: Thu, 29 Feb 2024 09:04:23 -0800 Message-ID: <20240229170425.3895238-1-leitao@debian.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and convert veth & vrf"), stats allocation could be done on net core instead of this driver. With this new approach, the driver doesn't have to bother with error handling (allocation failure checking, making sure free happens in the right spot, etc). This is core responsibility now. Remove the allocation in the bareudp driver and leverage the network core allocation. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/bareudp.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index 4db6122c9b43..27408f0b93d6 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -194,15 +194,10 @@ static int bareudp_init(struct net_device *dev) struct bareudp_dev *bareudp = netdev_priv(dev); int err; - dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); - if (!dev->tstats) - return -ENOMEM; - err = gro_cells_init(&bareudp->gro_cells, dev); - if (err) { - free_percpu(dev->tstats); + if (err) return err; - } + return 0; } @@ -211,7 +206,6 @@ static void bareudp_uninit(struct net_device *dev) struct bareudp_dev *bareudp = netdev_priv(dev); gro_cells_destroy(&bareudp->gro_cells); - free_percpu(dev->tstats); } static struct socket *bareudp_create_sock(struct net *net, __be16 port) @@ -567,6 +561,7 @@ static void bareudp_setup(struct net_device *dev) netif_keep_dst(dev); dev->priv_flags |= IFF_NO_QUEUE; dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; + dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS; } static int bareudp_validate(struct nlattr *tb[], struct nlattr *data[], From patchwork Thu Feb 29 17:04:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 13577439 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 602CC67E64; Thu, 29 Feb 2024 17:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709226299; cv=none; b=INX+YEEDEe3NY263G9kVG/YcrCJhjOJWx9fEG0bFZJlihIYIySds3to10RDCw3EgvlyA622JRobW/QJc0jtxT2JjDd8hUeOnwA+YKBJyLRPMPqvbO2qUexchyKualSHSckhggKUjl3M99rJFbUbIDT5MxDXenMpFJMh/cleUNLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709226299; c=relaxed/simple; bh=NG0jFr87ijT5BYSsGI9lSmaYhaA9rtZkHHR8E7Yobbg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aXg/QZRNaYPYoBlpmoltdQFpyGxK3/KoSbpltRjz78Ds+IeyQE9O40zThXJGDkv9wCIbO6/25xaYjdrILi05aACyAZ02wQe5H3fJ0xt/h8btCZb0zwtiR6YMZ9Q/XuhVu55fgKz4J10WJUO+mk3DAzvin9FOvdykiW4f9nusQnE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-412c286be35so3081065e9.0; Thu, 29 Feb 2024 09:04:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709226296; x=1709831096; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=umXmCN0wcxBj+OX5iM/0dix7BhHHVWXFpQt8h8LpQuM=; b=DvwtbSf8fmDZZmViiYwaCM0iwuKUutEOwY4Z+NHSrV9Xnppu0erIhmgZzs1UO12CcU 7pJYqbnkutDtR46WA+GbRgCJhQXEpXzGktTuNSUwbupR79/PaJwwV9xOpD3o4ZVqRJbh gpr51Blr6Fw1O79V6m0CcUaO33yhWbYbIXm7PmAuoq3k0bIaTiN7OFBz60TRirQdBxXq 9/1kAInPTvSL/YKd6dkMgyKm3MdcrteFa93Md9UDlDWkuOPIsfDYtuFd4uXf4VcgmPTK Vp839w1riF0doSjao2xfZK6O0Maczp+NJGtx13cago6ngWtK8NfB5LKog5ymka1wlVmQ sPvg== X-Forwarded-Encrypted: i=1; AJvYcCWELUtkIfAnT/PbzMtVtUkVVj3RD/YvnW433oN2CS+jcOQCe1IqVsxVdVBs/LYH8t/yGN74PfSaUFYMIeGDw5i7Y5Z0jbINqxvKkUnU X-Gm-Message-State: AOJu0YxsqpxA+6c8E3uIp3dlBSqt/J0j4Cn2jvi4ilGhNtBdkneSvt6c 4Spv3aIhBVdt2B/k6CWhsPBluvJVgdr664Phg16jG3PNA9DOB7r5 X-Google-Smtp-Source: AGHT+IHvKKZ7GqiGM4f2qtzBGgJKbkraOZ+yYZ++KZ7cZ9NJD3RaUijXEZBljdzr+6+V2U1AZf+vTA== X-Received: by 2002:a05:600c:1e86:b0:412:beb8:841e with SMTP id be6-20020a05600c1e8600b00412beb8841emr1928346wmb.13.1709226295504; Thu, 29 Feb 2024 09:04:55 -0800 (PST) Received: from localhost (fwdproxy-lla-009.fbsv.net. [2a03:2880:30ff:9::face:b00c]) by smtp.gmail.com with ESMTPSA id g8-20020a05600c310800b00412b0ef22basm2654717wmo.10.2024.02.29.09.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 09:04:54 -0800 (PST) From: Breno Leitao To: kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, horms@kernel.org, dsahern@kernel.org Subject: [PATCH net-next 2/2] net: bareudp: Remove generic .ndo_get_stats64 Date: Thu, 29 Feb 2024 09:04:24 -0800 Message-ID: <20240229170425.3895238-2-leitao@debian.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240229170425.3895238-1-leitao@debian.org> References: <20240229170425.3895238-1-leitao@debian.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit 3e2f544dd8a33 ("net: get stats64 if device if driver is configured") moved the callback to dev_get_tstats64() to net core, so, unless the driver is doing some custom stats collection, it does not need to set .ndo_get_stats64. Since this driver is now relying in NETDEV_PCPU_STAT_TSTATS, then, it doesn't need to set the dev_get_tstats64() generic .ndo_get_stats64 function pointer. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/bareudp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index 27408f0b93d6..339db6e4a1d5 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -523,7 +523,6 @@ static const struct net_device_ops bareudp_netdev_ops = { .ndo_open = bareudp_open, .ndo_stop = bareudp_stop, .ndo_start_xmit = bareudp_xmit, - .ndo_get_stats64 = dev_get_tstats64, .ndo_fill_metadata_dst = bareudp_fill_metadata_dst, };