Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
From:   Suman Ghosh <sumang@marvell.com>
To:     Mike Pattrick <mkp@redhat.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>
CC:     "willemdebruijn.kernel@gmail.com" <willemdebruijn.kernel@gmail.com>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "edumazet@google.com" <edumazet@google.com>,
        "kuba@kernel.org" <kuba@kernel.org>,
        "pabeni@redhat.com" <pabeni@redhat.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [EXT] [PATCH net-next] packet: Account for VLAN_HLEN in
 csum_start when virtio_net_hdr is enabled
Thread-Topic: [EXT] [PATCH net-next] packet: Account for VLAN_HLEN in
 csum_start when virtio_net_hdr is enabled
Thread-Index: AQHaHjxzzgojo5B0vUaN5yVYVOFhPbCIuVMg
Date:   Fri, 24 Nov 2023 02:12:53 +0000
Message-ID: <SJ0PR18MB5216960DD7420BBBAFA6B238DBB8A@SJ0PR18MB5216.namprd18.prod.outlook.com>
References: <20231123183835.635210-1-mkp@redhat.com>
In-Reply-To: <20231123183835.635210-1-mkp@redhat.com>
Accept-Language: en-IN, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?8oKDN6LrjVYmppK4WX/QkeRIDqT2n2wFqrBARnQlVuK7D+n6xm3rv+t83J4T?=
 =?us-ascii?Q?5e1yLPFoqzo94ZQT6hbbQy/vpmKOqwZO9vSs0cK5IVnMXAQ+uA4Eavew00TH?=
 =?us-ascii?Q?vAnUAXV5d00tXJQMUZKZ+8oUxj1qg7TpssnF0tRdku9yHoqwJreFVU0wC7el?=
 =?us-ascii?Q?w5HMzz5PowXHw+W4dF8dJlTKvpDmo1lx/T8QXoAFAVqd4G8VlyyqPLxrcBYJ?=
 =?us-ascii?Q?rYT3l6Gb+io+IKwZPSDkIsi2Cslem6sECLt2Wudwdi078OUaPFKlSAx4mwtb?=
 =?us-ascii?Q?KXcLIoLvClo/qqxVMEdc6ToH0qVRVOePorWse6UjDz4L2IfFfF2dpcdXb+cd?=
 =?us-ascii?Q?+SV1FJ5JJf1xOreDCoffsIo+5BURdwm69k2L4zFKq+klfACC6KFZd+5fP3uy?=
 =?us-ascii?Q?mSewfW88k2BIwgQMMVAsi4DGnkHYRk/8OZGLs3yO+UmYH9hBRoRXxsnq9Ax4?=
 =?us-ascii?Q?IByAcyM8xUzb6RmMMQ2HzIwwL7QFXFbrTqk8oh1Gcc5Sw1NHmfK3MPxNkW3Z?=
 =?us-ascii?Q?ULXpw2FTkW70v3dAGHhLRf4VfbZPmXAaHg7j/UCvmHlRd70M4kIP2/9rtW0m?=
 =?us-ascii?Q?H8FWjHxIbOzBXUGmcKWrkdkOjBTYg8OgxRniLymaKAUuJ3kcwewabNKmxrLY?=
 =?us-ascii?Q?zVcO7/G8MGtpYLwoe6JuOnYmArvA1EeEkfR9Iqo3cb0e9mWZ4+cw7uYvShpy?=
 =?us-ascii?Q?uheQRAO14J8McavB8qWqF6k/2IYo6ZmMZPTG8UbCRgDYQNccIXldQqYqHGJM?=
 =?us-ascii?Q?x5xZuOZGuP3tpZxNJf3hM9SOAa1RRsctcz82ybVXA1G61ehgxwUStldZnqni?=
 =?us-ascii?Q?ttD2YGgObCEnj8OMi/1M6Z3tbnNw+0EztlxL/lBWnkpNnfB+do1dSbSxY/P7?=
 =?us-ascii?Q?3TALpkjk2fvHNRBWweXqoDoomKxNFY2bCn5RTyjiFUhSMdbqGlXHZ5m91Wmn?=
 =?us-ascii?Q?plBrK90p0u0K7SeQ8nr3x6SiekdnzrztoR9cnqIPNoIdGshb//YG0JhNIEAE?=
 =?us-ascii?Q?FMdHzYF6op3LQ1Rb9H3fEIzjGMNIhv+siEidM9tONqVnfRLt2TBZvVS8YVRs?=
 =?us-ascii?Q?Wrrg1MvSe4RdjMsMT1mmI28QaUoDIB1lwhNAWKc96GwXoGOJEU1wTD+wUAWV?=
 =?us-ascii?Q?F2RSvNB0dFaqSzMMb1hrIzqWdRrTjdTURgTJrr2omatlgXnw6lf9H8VGOvkW?=
 =?us-ascii?Q?tECkTifNRiU86sAoFJP/7egAZRrxoMa3G0M28gacq7sLQTx1zuRKRMRXTUft?=
 =?us-ascii?Q?odOuKf6e50wlKpcYoTGFJXCsntihYpDr5oyO1NrAXH4g7Vk+ZnWjmW/ItmW2?=
 =?us-ascii?Q?TM6KzSo4Ur2kJR7HICQyoWtG5V7HZdw3bO/Us4Lg5oNRI/QlWs26vbvL1SWL?=
 =?us-ascii?Q?ou436R3BtWiGw3WloLsMDP/1pRRH01PW0gKsnm5Xiq9v7LdSLP3J/F7+Ac7b?=
 =?us-ascii?Q?fh0SgWgSdr8Iw+ZkdCctQvt4JYzTgREg5Kfatov4eLyYf2VkAoeA1YTU/YOa?=
 =?us-ascii?Q?fZ7bmkvguDSSKINSU7g+55LDVMts2T6CW7eUej+TnD4donDkPMUn4rSpvIDZ?=
 =?us-ascii?Q?N4GQXFwI2sYfX+R8OI0=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR18MB5216.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7801e452-be3e-4925-ed77-08dbec92ddc2
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Nov 2023 02:12:53.2397
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: J+pfGMmKgMIe6FatR3eyDO2zKMP4d1ZJc6Q161X8aZZnJsbMi4lRiUOM9f1EBlG1Sqfl1tebuBfWAeNQiZ/Ffw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR18MB4196
X-Proofpoint-ORIG-GUID: _Q7dbhygCHGTG1kshZkwthpMS1nYuOfq
X-Proofpoint-GUID: _Q7dbhygCHGTG1kshZkwthpMS1nYuOfq
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-11-23_15,2023-11-22_01,2023-05-22_02
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 23 Nov 2023 18:13:21 -0800 (PST)

> static int packet_rcv_vnet(struct msghdr *msg, const struct sk_buff
>*skb,
>-			   size_t *len, int vnet_hdr_sz)
>+			   size_t *len, int vnet_hdr_sz,
>+			   const struct sock *sk)
> {
> 	struct virtio_net_hdr_mrg_rxbuf vnet_hdr =3D { .num_buffers =3D 0 };
>+	int vlan_hlen;
>
> 	if (*len < vnet_hdr_sz)
> 		return -EINVAL;
> 	*len -=3D vnet_hdr_sz;
>
>-	if (virtio_net_hdr_from_skb(skb, (struct virtio_net_hdr
>*)&vnet_hdr, vio_le(), true, 0))
>+	if (sk->sk_type =3D=3D SOCK_RAW && skb_vlan_tag_present(skb))
>+		vlan_hlen =3D VLAN_HLEN;
>+	else
>+		vlan_hlen =3D 0;
[Suman] A minor nit. You can initialize vlan_hdr =3D 0 and get rid of the e=
lse.
>+
>+	if (virtio_net_hdr_from_skb(skb, (struct virtio_net_hdr
>*)&vnet_hdr,
>+				    vio_le(), true, vlan_hlen))
> 		return -EINVAL;
>
> 	return memcpy_to_msg(msg, (void *)&vnet_hdr, vnet_hdr_sz); @@ -
>2368,13 +2376,21 @@ static int tpacket_rcv(struct sk_buff *skb, struct
>net_device *dev,
> 		__set_bit(slot_id, po->rx_ring.rx_owner_map);
> 	}
>
>-	if (vnet_hdr_sz &&
>-	    virtio_net_hdr_from_skb(skb, h.raw + macoff -
>-				    sizeof(struct virtio_net_hdr),
>-				    vio_le(), true, 0)) {
>-		if (po->tp_version =3D=3D TPACKET_V3)
>-			prb_clear_blk_fill_status(&po->rx_ring);
>-		goto drop_n_account;
>+	if (vnet_hdr_sz) {
>+		int vlan_hlen;
>+
>+		if (sk->sk_type =3D=3D SOCK_RAW && skb_vlan_tag_present(skb))
>+			vlan_hlen =3D VLAN_HLEN;
>+		else
>+			vlan_hlen =3D 0;
[Suman] Same as previous comment.
>+
>+		if (virtio_net_hdr_from_skb(skb, h.raw + macoff -
>+					    sizeof(struct virtio_net_hdr),
>+					    vio_le(), true, vlan_hlen)) {
>+			if (po->tp_version =3D=3D TPACKET_V3)
>+				prb_clear_blk_fill_status(&po->rx_ring);
>+			goto drop_n_account;
>+		}
> 	}
>
> 	if (po->tp_version <=3D TPACKET_V2) {
>@@ -3464,7 +3480,7 @@ static int packet_recvmsg(struct socket *sock,
>struct msghdr *msg, size_t len,
> 	packet_rcv_try_clear_pressure(pkt_sk(sk));
>
> 	if (vnet_hdr_len) {
>-		err =3D packet_rcv_vnet(msg, skb, &len, vnet_hdr_len);
>+		err =3D packet_rcv_vnet(msg, skb, &len, vnet_hdr_len, sk);
> 		if (err)
> 			goto out_free;
> 	}
>--
>2.40.1
>