Received-SPF: pass (google.com: domain of linux-kernel+bounces-97032-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <AM6PR03MB58483266DF047DA017C540CD99272@AM6PR03MB5848.eurprd03.prod.outlook.com>
In-Reply-To: <AM6PR03MB58483266DF047DA017C540CD99272@AM6PR03MB5848.eurprd03.prod.outlook.com>
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 8 Mar 2024 13:56:11 +0100
Message-ID: <CANn89i+TboBh3S3tegSqZJvjTCCi_Sa+o3iwETygFw5GqjJPsw@mail.gmail.com>
Subject: Re: [PATCH net-next v2] net/packet: Add getsockopt support for PACKET_COPY_THRESH
To: Juntong Deng <juntong.deng@outlook.com>
Cc: willemdebruijn.kernel@gmail.com, davem@davemloft.net, kuba@kernel.org, 
	pabeni@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Mar 8, 2024 at 1:43=E2=80=AFPM Juntong Deng <juntong.deng@outlook.c=
om> wrote:
>
> 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 <=3D 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_rcvb=
uf) {
>                                 if (skb_shared(skb)) {
>                                         copy_skb =3D skb_clone(skb, GFP_A=
TOMIC);
> @@ -3836,7 +3836,7 @@ packet_setsockopt(struct socket *sock, int level, i=
nt optname, sockptr_t optval,
>                 if (copy_from_sockptr(&val, optval, sizeof(val)))
>                         return -EFAULT;
>
> -               pkt_sk(sk)->copy_thresh =3D 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, i=
nt level, int optname,
>         case PACKET_VNET_HDR_SZ:
>                 val =3D READ_ONCE(po->vnet_hdr_sz);
>                 break;
> +       case PACKET_COPY_THRESH:
> +               val =3D READ_ONCE(pkt_sk(sk)->copy_thresh);
> +               break;
>         case PACKET_VERSION:
>                 val =3D po->tp_version;
>                 break;
> --
> 2.39.2
>

I think you forgot to change net/packet/diag.c pdiag_put_info()