From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4193AC433ED for ; Thu, 15 Apr 2021 12:20:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11CD061222 for ; Thu, 15 Apr 2021 12:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232223AbhDOMUW (ORCPT ); Thu, 15 Apr 2021 08:20:22 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:59736 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbhDOMUV (ORCPT ); Thu, 15 Apr 2021 08:20:21 -0400 From: Kurt Kanzenbach DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618489197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BMbOvheSsOknaamptk4bilePbxHfJjQDO8qYoDp5N4I=; b=tDV80DqYhwfGCxUK5pbLFv6e0FzxvMQVUbQo3ZwUc0ufmhbXjYUb4sOHQ7fWY1cRB2c2Wu 4vL9NI0ttW0K9OeFJaN39C2ctqVtd5LTGzLhEkpndjqhTlO4lQvLX1UgMW3xcjWOtrPVFo dg+rzBxVGWr9xlku3Bu8HRBymsQMPo4/BRl2D1lhVIEKCrQlkzOjqeAYwxKbMOlSw1zUxX KgFT6FdA8+sftqEjQykhGmIDE7gjjAjiw3eEotDsX+i8Bkq85WQyJARKZN1Vu9jM3ryWnK nYtDWQFehKqvXR3SHyJYjX1xQWYjH/z+DmL3Zvsou2zQECRwUChF/jjwrHALOw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618489197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BMbOvheSsOknaamptk4bilePbxHfJjQDO8qYoDp5N4I=; b=QKOPL7EPIF9GfHnmB2VbsPfPlSTmQAiP36KJxphlUzGla2GAXIS/sYqzS0If2D+yr603B6 pb8sCUYgd7NWoYCA== To: Lorenzo Bianconi Cc: Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Sven Auhagen , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, bpf@vger.kernel.org, Ilias Apalodimas , Lorenzo Bianconi , Sebastian Andrzej Siewior , Richard Cochran Subject: Re: [PATCH net] igb: Fix XDP with PTP enabled In-Reply-To: References: <20210415092145.27322-1-kurt@linutronix.de> Date: Thu, 15 Apr 2021 14:19:55 +0200 Message-ID: <871rbbhh90.fsf@kurt> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Thu Apr 15 2021, Lorenzo Bianconi wrote: > [...] >> @@ -8683,7 +8676,10 @@ static int igb_clean_rx_irq(struct igb_q_vector *= q_vector, const int budget) >> while (likely(total_packets < budget)) { >> union e1000_adv_rx_desc *rx_desc; >> struct igb_rx_buffer *rx_buffer; >> + ktime_t timestamp =3D 0; >> + int pkt_offset =3D 0; >> unsigned int size; >> + void *pktbuf; >>=20=20 >> /* return some buffers to hardware, one at a time is too slow */ >> if (cleaned_count >=3D IGB_RX_BUFFER_WRITE) { >> @@ -8703,15 +8699,22 @@ static int igb_clean_rx_irq(struct igb_q_vector = *q_vector, const int budget) >> dma_rmb(); >>=20=20 >> rx_buffer =3D igb_get_rx_buffer(rx_ring, size, &rx_buf_pgcnt); >> + pktbuf =3D page_address(rx_buffer->page) + rx_buffer->page_offset; >> + >> + /* pull rx packet timestamp if available */ >> + if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP)) { >> + timestamp =3D igb_ptp_rx_pktstamp(rx_ring->q_vector, >> + pktbuf); >> + pkt_offset +=3D IGB_TS_HDR_LEN; >> + size -=3D IGB_TS_HDR_LEN; >> + } >>=20=20 >> /* retrieve a buffer from the ring */ >> if (!skb) { >> - unsigned int offset =3D igb_rx_offset(rx_ring); >> - unsigned char *hard_start; >> - >> - hard_start =3D page_address(rx_buffer->page) + >> - rx_buffer->page_offset - offset; >> - xdp_prepare_buff(&xdp, hard_start, offset, size, true); >> + xdp.data =3D pktbuf + pkt_offset; >> + xdp.data_end =3D xdp.data + size; >> + xdp.data_meta =3D xdp.data; >> + xdp.data_hard_start =3D pktbuf - igb_rx_offset(rx_ring); > > in order to keep it aligned with other xdp drivers, I guess you can do so= mething like: > > unsigned char *hard_start =3D pktbuf - igb_rx_offset(rx_ring); > unsigned int offset =3D pkt_offset + igb_rx_offset(rx_ring); > > xdp_prepare_buff(&xdp, hard_start, offset, size, true); This should work as well. I just kept it in sync with the igc driver, because it doesn't use xdp_prepare_buff() either. > > Probably the compiler will optimize it. Most likely. Thanks, Kurt --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEooWgvezyxHPhdEojeSpbgcuY8KYFAmB4L2sACgkQeSpbgcuY 8KaS9A/+OHp/1uZIOitP04uK8NHdGEgU6woimHvvC3CrFIHC+GDx1NiPZJhKWi2b LRsAe8kPJuYIRNX7D67LQK1ZaRh7pVzc2fRyDbyZACag5jHyX1pUHhVykSiX8b67 yepBMiUG01KB3p/UIliLhuRG/v+QOht9XH5QtH2YLtPTy0KE+81Z5ZHTss/wcaqX aFrdhwjVakQNXNbVnrNBQdrdcQv9kidIIeRNFgsftkLPz4agoULLF590yZSTqt+m uAJTBceAc+TviLxr7wNcDEGkQaRNIK3QhcLinRsfodI3OcI5AfNulIE4H8xX14aU oKLMLsHcN2BXt5GS7E4oPz5nr4Bqgcjq7m5pPTpUaFhO8konyY2JhQL/B5O9EtKR BdT5uC321drrl8ZeweF5p/veLnDNWEsnBVHc+oKNQR1vDRXyIX30QXRqkKQ1EFKB iR7jE0OK7joG78ik0Vt66PweAfRphX2wrCNyNef4BrsCgrd3aNiLTbeeTkwoSCWs nZci29OrJUKpA9HVC6Skq75RpvyGhXxr+aBRxJuz5bch9+hunk8RqZHjEVmkac17 tirlZ9vffyYnw1nim4wN3pjV/VpLGZE7HqCyAhOelAiEbXJ5nIp/ghcI3qzcgQfD 5KiKgBu0fWoyxQWykXHaewfY/tCMFwYDKiY/jJpUk+XOaAydHIg= =bJH5 -----END PGP SIGNATURE----- --=-=-=--