Received-SPF: pass (google.com: domain of linux-kernel+bounces-97020-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Juntong Deng <juntong.deng@outlook.com>
To: willemdebruijn.kernel@gmail.com,
	davem@davemloft.net,
	edumazet@google.com,
	kuba@kernel.org,
	pabeni@redhat.com
Cc: netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2] net/packet: Add getsockopt support for PACKET_COPY_THRESH
Date: Fri,  8 Mar 2024 12:42:39 +0000
Message-ID:
 <AM6PR03MB58483266DF047DA017C540CD99272@AM6PR03MB5848.eurprd03.prod.outlook.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AM6PR03MB5848:EE_|DU0PR03MB9519:EE_
X-MS-Office365-Filtering-Correlation-Id: 9dd3085e-f47e-4d37-16a6-08dc3f6d63e8
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	ZUz+3gqNR0MRghj5XQFHuDsH6aeaQa91g2mNGD3mtkRSmK5/lWLCBJosxKs7PUJMha62Vza4+ToehkrydaeT7lNKXjnrpTuhptRpR3bh85lN09EnmK6wxl3gukmfu765h7Kd5QqjsLh2lQ98VpOX4okLkEmrmwR3dJ3yPKneO3med/NzzN1ddBSYifIbsKh5A4JWJVZmH+0QaxfIPNhg0+Rt/mlHtpPyxPKjUMHHl5KbjtlQvxv4nCpwkVrbNyFkGJEG6AYqxl/NBkatdBlrsCaEReHjiwUWTXhDFDkS75BalfI+4reCCFvO5vOnxav2aHB3FC6AZtV0bs0sLEDeonfIhn1bTpci5syIByp8ODdESYmYcNo8rha4Kq5xJMUBClwZlXNx9PLlNp0euFQzcfTsdoSoOPQGiXd46jPqD5F5rqwu+OurKldmOZbviAKU9t/qpsYG+M65YV2VvS2H3WgH+RcHwPpFs4g1HnLkHjvFeiw53rtMGY0YGqiGzWC6FAj4FLdcWVuoShebjYzanhsjH+AbtOL/BsCD3hWKg4UPNBV4c43a3BNWgZXs/1QQ
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?0SASB5ag/fRlH09INkmINEmjuavBIsvKZyB2Zlxk+bM494CS0wrVq8hVLKn+?=
 =?us-ascii?Q?gzw5WuXfMz1i3Ug0LdI/m/L+drMOtxInEoJcf1VqQJOYO6AdjSMARtGUyA1M?=
 =?us-ascii?Q?5ZkO0qX8bufrbN2Q+tHJZB6ToPqX4A0ylGXjxAFCLoFIfJa8so91ixzFGstb?=
 =?us-ascii?Q?uTk4syOKPYqHTQGzuky8EPQt0SZLSGAJw9d8uHio0U88xL27bzsWJsADeazT?=
 =?us-ascii?Q?MV9mRZlJn7pNdhGdhW27Lp7qlLihkk+u5W9Hfu639Ri8lZT/PJXRjodohsvh?=
 =?us-ascii?Q?sPNu8xtLdRTZoh3el29peC4EeaDH+TdgYebpEGicZKoS6WPg5n+B84glZwmS?=
 =?us-ascii?Q?aBb0zejvmCyYIGtssntKfBXZ/lWxgu9o7gGmrbBXx5S1aJAJhvR7XL3pzVqf?=
 =?us-ascii?Q?bH4pdZtzYGjq+oIFwSkCMzRDOB0C2gz2yM3m2OOyxJ0fmYOVdD3KLnya3M51?=
 =?us-ascii?Q?GkxbU99qp4Q6wcXIsYACnLA6uCj/uNWNXYwxH8Y6hzyoQYCDb2Mds/AOmYA5?=
 =?us-ascii?Q?lfiyCBmc04Nkw39J4amsRA/c7sYDLQlHz8vrIj8GT9cyiavMYUitX77qfBb+?=
 =?us-ascii?Q?5cMQxNpw7OtcpDIzmEK9sfXv0EylhTdWeNlPNCRb+93yrPhVGm2krmfR1Ns4?=
 =?us-ascii?Q?IX6JHo2CFLrdT5kpGUc431uOnCXxX8bGi2QzwQzp3h3aMEOZYGgOEp4FIxGR?=
 =?us-ascii?Q?RH5iSO88N9r95PpnfNoFVMdpXBvDvi5VA9a5Fu0sc3AU1c/82lKePYo45hxw?=
 =?us-ascii?Q?0ZDBTFGrhKQSEtKD4SINQDsks63nFX3WLyaFLj0Ka+PV8jHq+G2NVRCkuqwn?=
 =?us-ascii?Q?PQBPCvrGeQe1iZfGQ7DP1L+f2UuzO6frQdfFEz6kztA+/mlxOiE+o76uOWyS?=
 =?us-ascii?Q?d9UewJCpMiK4RkH4RgCSCQLuZLOMNXacHD7BALQJJnm+iynnO8H1DU+cv0tz?=
 =?us-ascii?Q?fI9phMj80cbzLUUoMSdAn1+H2hCZ4rNEKXD54swRPHQgfDElLevHno9Uuwlf?=
 =?us-ascii?Q?V0KD+/XLbKiYkMo0Wq0lmj+qk/E09d728sm9/+c3Ec2QkeCKsUDIwJ6poID5?=
 =?us-ascii?Q?ZdlX3zovoK5HzekN8R1PNRQx83llwg3nToPfILgn5JhaOMyYCJ3si2FDws3V?=
 =?us-ascii?Q?EmUukjKYp+KxcceTw08i+m7nIFgULKD16gZg+SiXJSuLTM81jIbQ2OV3+6o1?=
 =?us-ascii?Q?G32Ew6pvl9ktNveYMDyS81grB4SlfzF8/nhIaFG9ACLncIxCGLACjNnapE/5?=
 =?us-ascii?Q?p/cm5v4xQeZAKLJNwU7R?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9dd3085e-f47e-4d37-16a6-08dc3f6d63e8
X-MS-Exchange-CrossTenant-AuthSource: AM6PR03MB5848.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 12:43:44.2355
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR03MB9519

Currently getsockopt does not support PACKET_COPY_THRESH,
and we are unable to get the value of PACKET_COPY_THRESH
socket option through getsockopt.

This patch adds getsockopt support for PACKET_COPY_THRESH.

In addition, this patch converts access to copy_thresh to
READ_ONCE/WRITE_ONCE.

Signed-off-by: Juntong Deng <juntong.deng@outlook.com>
---
V1 -> V2: Use READ_ONCE/WRITE_ONCE.

 net/packet/af_packet.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 0db31ca4982d..61270826b9ac 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2318,7 +2318,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
 	}
 	if (po->tp_version <= TPACKET_V2) {
 		if (macoff + snaplen > po->rx_ring.frame_size) {
-			if (po->copy_thresh &&
+			if (READ_ONCE(po->copy_thresh) &&
 			    atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf) {
 				if (skb_shared(skb)) {
 					copy_skb = skb_clone(skb, GFP_ATOMIC);
@@ -3836,7 +3836,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval,
 		if (copy_from_sockptr(&val, optval, sizeof(val)))
 			return -EFAULT;
 
-		pkt_sk(sk)->copy_thresh = val;
+		WRITE_ONCE(pkt_sk(sk)->copy_thresh, val);
 		return 0;
 	}
 	case PACKET_VERSION:
@@ -4090,6 +4090,9 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 	case PACKET_VNET_HDR_SZ:
 		val = READ_ONCE(po->vnet_hdr_sz);
 		break;
+	case PACKET_COPY_THRESH:
+		val = READ_ONCE(pkt_sk(sk)->copy_thresh);
+		break;
 	case PACKET_VERSION:
 		val = po->tp_version;
 		break;
-- 
2.39.2