From patchwork Sat Aug 31 11:32:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13786066 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.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 CF33117ADF1 for ; Sat, 31 Aug 2024 11:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725103949; cv=none; b=krgyaTx3JgU9xDA4D1Eg95iQVhaGmPzdnxNWw4znwLNxeuGL4HUa4aWnED0VSZKDLN28AQiqarEulX2uNk04+F9TbMK8iaIWf2LTswd5wKID6M8ghz2g12dLTeTfnKmBCe5yde/5Hut3oHvflNAkL7hP2IMq5BeaCrXl+tnustg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725103949; c=relaxed/simple; bh=MfpzBkUI2SIjf1Ij8cczj9zf7DOV9/vZ1Hj7VLFx2i8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=P6sXjVVZNiB5hgwRAvYlpTfaEMp+NqgFSOm0LPoGimipolG6LJ7K/hoPJzx7/tcMW6NxyZG/WETrv6mKPf4e3b+sX9zj/0hUy7dW9VR5DqRF63zAmAh9pr/rVO7iBlDuhk9V3wIx9xBBeRrfM8Z2x472ZAtxBgM+75s03Mq3+As= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=KlsZPfhF; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="KlsZPfhF" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2d87f34a650so827519a91.1 for ; Sat, 31 Aug 2024 04:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1725103947; x=1725708747; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=uGCk/6hTDajNFc2rj7m9UG3Rk2A6Wg+d9O29FknHW3o=; b=KlsZPfhFG93XpmjNlBtFGOkGIMmgYPgCkObkph7St4nUSQY9JR23S9OGiDEt+Moykq xnA5WlbCfXuIHtHlc/YgJnXhZySyPfGEu02gWUI2Kupl5IdAQFWPiS1e7A8HvMHF/qtO h89uoTgsXPlypOy2NTJ8by5JzhqwQgzRoSrkE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725103947; x=1725708747; 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=uGCk/6hTDajNFc2rj7m9UG3Rk2A6Wg+d9O29FknHW3o=; b=wngyGVUiT+G/a49xRPnMfJzzsHZhNYOGn8CdXydqlnfinHhzgbtceYKw73vxBeisbX Jzm1MrmjOKeBCbyJnf40wfRnM4TyxTF9WBAmdo6kMcvlRPiUfKYWifB+mhYh2FNwhzya aDJaEL0WJKhtC9OfkrH4HF78A0Kxpqh3w9YLHysZge2L6OYY1nHM0C/LJT35r08MItM1 8Y9oe/H84lAZfRcumjiBiRgSOmkJLJbJ+fNW1idZZHIFpZ4pT/vDkUAgUNPCJF/8u9vU 4X/JngEXs8nYbVWXXilqFBSM2jiMPstCycqItyJv2kTugJb/851tsBk78FY1Mc84gB4e 0TuQ== X-Gm-Message-State: AOJu0YycaG0guMe4aWAwAKjnIznbu3Mdtju5iZwI3Z0evFYDszoAqNRH qLMQypGStxJQwY4V6noLrkRocn/wQMlMOgoc+jnzf2TwVqqZo6gcImpPFzClj4uKDd7zMOIfUNr ACJiUm23/lfx/QXv6SJXQHfPpd09E8BT6OBi8PuDbUInzDNrD4V6G7DwkwXPV3KT7Jg4omatlV1 kCVq79eVAofaubzs9GijPIpDCER7FMpghTwLiqGQ== X-Google-Smtp-Source: AGHT+IGCh4g056FK7rVO6rKm6NZb2AutNP/iyfBJ35us76roXsVhFBcLl2jn+M8T/9RNvfrH0rJ51Q== X-Received: by 2002:a17:90b:690:b0:2c9:5a71:1500 with SMTP id 98e67ed59e1d1-2d86a9175c0mr8100961a91.0.1725103946400; Sat, 31 Aug 2024 04:32:26 -0700 (PDT) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d8445d5e91sm8139112a91.7.2024.08.31.04.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Aug 2024 04:32:25 -0700 (PDT) From: Joe Damato To: netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, Joe Damato , stable@kernel.org, Eric Dumazet , Jakub Kicinski , "David S. Miller" , Paolo Abeni , Jonathan Corbet , Breno Leitao , Johannes Berg , Heiner Kallweit , Alexander Lobakin , linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net] net: napi: Make napi_defer_irqs u32 Date: Sat, 31 Aug 2024 11:32:21 +0000 Message-Id: <20240831113223.9627-1-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 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 In commit 6f8b12d661d0 ("net: napi: add hard irqs deferral feature") napi_defer_irqs was added to net_device and napi_defer_irqs_count was added to napi_struct, both as type int. This value never goes below zero. Change the type for both from int to u32, and add an overflow check to sysfs to limit the value to S32_MAX. Before this patch: $ sudo bash -c 'echo 2147483649 > /sys/class/net/eth4/napi_defer_hard_irqs' $ cat /sys/class/net/eth4/napi_defer_hard_irqs -2147483647 After this patch: $ sudo bash -c 'echo 2147483649 > /sys/class/net/eth4/napi_defer_hard_irqs' bash: line 0: echo: write error: Numerical result out of range Fixes: 6f8b12d661d0 ("net: napi: add hard irqs deferral feature") Cc: stable@kernel.org Cc: Eric Dumazet Suggested-by: Jakub Kicinski Signed-off-by: Joe Damato --- Documentation/networking/net_cachelines/net_device.rst | 2 +- include/linux/netdevice.h | 4 ++-- net/core/net-sysfs.c | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/networking/net_cachelines/net_device.rst b/Documentation/networking/net_cachelines/net_device.rst index 70c4fb9d4e5c..d68f37f5b1f8 100644 --- a/Documentation/networking/net_cachelines/net_device.rst +++ b/Documentation/networking/net_cachelines/net_device.rst @@ -98,7 +98,7 @@ unsigned_int num_rx_queues unsigned_int real_num_rx_queues - read_mostly get_rps_cpu struct_bpf_prog* xdp_prog - read_mostly netif_elide_gro() unsigned_long gro_flush_timeout - read_mostly napi_complete_done -int napi_defer_hard_irqs - read_mostly napi_complete_done +u32 napi_defer_hard_irqs - read_mostly napi_complete_done unsigned_int gro_max_size - read_mostly skb_gro_receive unsigned_int gro_ipv4_max_size - read_mostly skb_gro_receive rx_handler_func_t* rx_handler read_mostly - __netif_receive_skb_core diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 607009150b5f..39eafd2e2368 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -356,7 +356,7 @@ struct napi_struct { unsigned long state; int weight; - int defer_hard_irqs_count; + u32 defer_hard_irqs_count; unsigned long gro_bitmask; int (*poll)(struct napi_struct *, int); #ifdef CONFIG_NETPOLL @@ -2091,7 +2091,7 @@ struct net_device { unsigned int real_num_rx_queues; struct netdev_rx_queue *_rx; unsigned long gro_flush_timeout; - int napi_defer_hard_irqs; + u32 napi_defer_hard_irqs; unsigned int gro_max_size; unsigned int gro_ipv4_max_size; rx_handler_func_t __rcu *rx_handler; diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 444f23e74f8e..b34d731524d5 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -32,6 +32,7 @@ #ifdef CONFIG_SYSFS static const char fmt_hex[] = "%#x\n"; static const char fmt_dec[] = "%d\n"; +static const char fmt_uint[] = "%u\n"; static const char fmt_ulong[] = "%lu\n"; static const char fmt_u64[] = "%llu\n"; @@ -425,6 +426,9 @@ NETDEVICE_SHOW_RW(gro_flush_timeout, fmt_ulong); static int change_napi_defer_hard_irqs(struct net_device *dev, unsigned long val) { + if (val > S32_MAX) + return -ERANGE; + WRITE_ONCE(dev->napi_defer_hard_irqs, val); return 0; } @@ -438,7 +442,7 @@ static ssize_t napi_defer_hard_irqs_store(struct device *dev, return netdev_store(dev, attr, buf, len, change_napi_defer_hard_irqs); } -NETDEVICE_SHOW_RW(napi_defer_hard_irqs, fmt_dec); +NETDEVICE_SHOW_RW(napi_defer_hard_irqs, fmt_uint); static ssize_t ifalias_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len)