From patchwork Wed Feb 28 18:03:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 207954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3515036dyb; Wed, 28 Feb 2024 10:04:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVukEuUs7rQIthoxbVyx+82lG1y9r9akLa+xsrjnmvvHFM79AC+Dir1Pz6fmlX9QgE6Lu5lEj5kaL9xzCcRAIPhk9IesQ== X-Google-Smtp-Source: AGHT+IG7vlCu21Pbwn+Ex9Debz1pUZlcopMbdGuY1zeEn4007Fn4zq3AlpHdmtTh31OooOrWmkMF X-Received: by 2002:a05:6214:27ef:b0:68f:4154:cc6b with SMTP id jt15-20020a05621427ef00b0068f4154cc6bmr6953007qvb.27.1709143448096; Wed, 28 Feb 2024 10:04:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709143448; cv=pass; d=google.com; s=arc-20160816; b=ZQFC/Exv+eb4Jw482Azg5K7WwOtfQA/P/2rehMKMSMV1n2wafhjxTWowQlg65tTGzX F+Wz0lMxVU8gdNfMWVD6uE3t3MWcewbc4DOxxkSSjF+eZMniGYuoxTB23MIZpF4hkD6T CpDN+4ZI8nrgBmz7Vh7IcewuqeMHFC09xtm2l+cFjDb5qSs5zstk2GB9+obUdsDiruTY gOZ+u8c3nUhpwXvDHM5kdwgzb2vgatR9cbneqpHVyqLT6rwS0BmmHBYfd5i2+Gnb/xgt EUFunsuYHnUZqVfxjNQzlPap4dzLbGneuw9uVhWfKirvBpzBpbrHLUMcSiAlqJmdwPPl fISg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=KMYCuXLMtP2VJuQAB3ZBbvwXsoOBDrgan9aFbDVxFnk=; fh=L/8BJqNeinK1wFYZ5aKN11xwDx1/V/o/hSIgbuVv+6k=; b=vwlhnCkIo1KN4JxuyJbnp2ZOlMBjWDHVimpOBTlW+//XLfv/t9/kRxmVuE8vCSF+sg PqwyJ9UfL1jiSEYaiZD6spQrX1+i1zvuCWl/jOKC7/3emJRP/Wlzl161aP4siDBAyCcd qr+IiaedY73hi/V48dQnDBU0c8DPG6Xre6Mfb9uTTdEbMMNkztcGtUoRZ/9AGPY0yyt7 JxIz1CKswNE+izsZivOiM/160RT3nGQbrtPctUA6qDVW8ngTDA9BrqtbkYPYbznxtLwM smL67nV+23TIfrPSc37mQJKjorwSCZ1aDsmbp1apVnDMwkep3vLulRsdtf49W5ewdPDX Ezhw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-85499-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85499-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id r3-20020a0562140c4300b0068fcb3c55eesi17062qvj.479.2024.02.28.10.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 10:04:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-85499-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-85499-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85499-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id ADD131C21F81 for ; Wed, 28 Feb 2024 18:04:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3B38A3FBB3; Wed, 28 Feb 2024 18:03:52 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 E366479B66; Wed, 28 Feb 2024 18:03:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709143430; cv=none; b=JH2/9lJ6hGr8GdmoHCV1M9qMzvV/tr9l6QxIN7j/rtdgSCP1waZekJFti6X0xfyyIj63p3nC+xE6o8hr1cjnKIYaj0fof7J84kWTPa+dayjm1TGzNZJImLZ0XtBM2AqF5X/2qgh6rdFQjLqKDEX3PIVnLKqITgk6JYNOJ36ITSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709143430; c=relaxed/simple; bh=uLUoeG2p5PBWHl4cb3f0GiMwfiXFa/nQ44dA6pnXfrs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=iz37D0crGbeX0eGwCv/s+obpvNYaHVSOZbAjJv+IYVV2TpUDk+fKyTVaBcFcv9I50SzZl2ZbNdsD04AOA8EDKEqUc8pbY6AX8ToaZREJTMYCIvskQ0HRZG1+DY4pN/Vdwz49y4EIkBxHBXscXgz20YtrB0vLuuj6SXW87KT0C6s= 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.51 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-f51.google.com with SMTP id 5b1f17b1804b1-412b68d1a42so323945e9.0; Wed, 28 Feb 2024 10:03:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709143427; x=1709748227; 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=KMYCuXLMtP2VJuQAB3ZBbvwXsoOBDrgan9aFbDVxFnk=; b=PjUjBSZvlIJnNw8ppZnrnwztVA16Sh32y3hGhQCV3lcmC0Rk+kRFY4rXL5+HfsIVR8 QpIlEnj2A8tXtCGyGxNL397VZPfPSKn6WzlLShG/NdK5qaDi/4Rfv3eKQ/6n/JyNozKx t/AxTJG9071GFkyI4GduEzVDhJ5BNV3SIQLOMItId5a6YHtd9EMFV1DIiRygKm8404UN V4oY90FXQYek4g6xbom8K7tYimJo2sP3SHIbb5zjTfOFAQi8sG37mLiHzr2UM8ingKql UgZ5zP95vP00rXudZgqK0O0TCRVt9o2RjsEDg7s0Izz4Lj4ggJPE29j1rrt85VSNjpDr lMrg== X-Forwarded-Encrypted: i=1; AJvYcCX1nDY88PH+cr8RtXAK3z82UFood8qJIokfpMYvZJNEL941/Gf+viXFao4xjuQML/8paDlgLihUTUDDe+RyTu7MVJCq3o8/7WXSpCOJ X-Gm-Message-State: AOJu0Yx3PER3soykVAgK/96rc+vbaaE0L9ZWFwPOtoXHJczgnBNJosbO E4TqzVMhADLLc55+gAZ9zIIVAgut0SdXV2LYhpG2O9l6W4jrwSta/2P0Ixm/ X-Received: by 2002:a05:600c:46c7:b0:412:b4c:58da with SMTP id q7-20020a05600c46c700b004120b4c58damr2047wmo.9.1709143427108; Wed, 28 Feb 2024 10:03:47 -0800 (PST) Received: from localhost (fwdproxy-lla-007.fbsv.net. [2a03:2880:30ff:7::face:b00c]) by smtp.gmail.com with ESMTPSA id y16-20020a05600c365000b00412656ba919sm2692111wmq.20.2024.02.28.10.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 10:03:46 -0800 (PST) From: Breno Leitao To: kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com, David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, horms@kernel.org Subject: [PATCH net-next] net: ip6_tunnel: Leverage core stats allocator Date: Wed, 28 Feb 2024 10:03:17 -0800 Message-ID: <20240228180318.1650988-1-leitao@debian.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792166800243686258 X-GMAIL-MSGID: 1792166800243686258 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 in 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 ip6_tunnel driver and leverage the network core allocation instead. Signed-off-by: Breno Leitao --- net/ipv6/ip6_tunnel.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 5fd07581efaf..e9cc315832cb 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -247,7 +247,6 @@ static void ip6_dev_free(struct net_device *dev) gro_cells_destroy(&t->gro_cells); dst_cache_destroy(&t->dst_cache); - free_percpu(dev->tstats); } static int ip6_tnl_create2(struct net_device *dev) @@ -1848,6 +1847,7 @@ static void ip6_tnl_dev_setup(struct net_device *dev) dev->flags |= IFF_NOARP; dev->addr_len = sizeof(struct in6_addr); dev->features |= NETIF_F_LLTX; + dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS; netif_keep_dst(dev); dev->features |= IPXIPX_FEATURES; @@ -1873,13 +1873,10 @@ ip6_tnl_dev_init_gen(struct net_device *dev) t->dev = dev; t->net = dev_net(dev); - dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); - if (!dev->tstats) - return -ENOMEM; ret = dst_cache_init(&t->dst_cache, GFP_KERNEL); if (ret) - goto free_stats; + return ret; ret = gro_cells_init(&t->gro_cells, dev); if (ret) @@ -1903,9 +1900,6 @@ ip6_tnl_dev_init_gen(struct net_device *dev) destroy_dst: dst_cache_destroy(&t->dst_cache); -free_stats: - free_percpu(dev->tstats); - dev->tstats = NULL; return ret; }