From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:50796 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751356AbbGMNyo (ORCPT ); Mon, 13 Jul 2015 09:54:44 -0400 Subject: Re: [added to the 3.18 stable tree] can: fix loss of CAN frames in raw_rcv To: Sasha Levin , stable@vger.kernel.org, stable-commits@vger.kernel.org References: <1436795065-27444-1-git-send-email-sasha.levin@oracle.com> <1436795065-27444-9-git-send-email-sasha.levin@oracle.com> Cc: Oliver Hartkopp From: Marc Kleine-Budde Message-ID: <55A3C31C.1000603@pengutronix.de> Date: Mon, 13 Jul 2015 15:54:36 +0200 MIME-Version: 1.0 In-Reply-To: <1436795065-27444-9-git-send-email-sasha.levin@oracle.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GJQlVsucWLv6KPTTNIDoanaCHpOdRjkTE" Sender: stable-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --GJQlVsucWLv6KPTTNIDoanaCHpOdRjkTE Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 07/13/2015 03:43 PM, Sasha Levin wrote: > From: Oliver Hartkopp >=20 > This patch has been added to the 3.18 stable tree. If you have any > objections, please let us know. >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > [ Upstream commit 36c01245eb8046c16eee6431e7dbfbb302635fa8 ] >=20 > As reported by Manfred Schlaegl here >=20 > http://marc.info/?l=3Dlinux-netdev&m=3D143482089824232&w=3D2 >=20 > commit 514ac99c64b "can: fix multiple delivery of a single CAN frame fo= r > overlapping CAN filters" requires the skb->tstamp to be set to check fo= r > identical CAN skbs. >=20 > As net timestamping is influenced by several players (netstamp_needed a= nd > netdev_tstamp_prequeue) Manfred missed a proper timestamp which leads t= o > CAN frame loss. >=20 > As skb timestamping became now mandatory for CAN related skbs this patc= h > makes sure that received CAN skbs always have a proper timestamp set. > Maybe there's a better solution in the future but this patch fixes the > CAN frame loss so far. >=20 > Reported-by: Manfred Schlaegl > Signed-off-by: Oliver Hartkopp > Cc: linux-stable > Signed-off-by: Marc Kleine-Budde > Signed-off-by: Sasha Levin You and Oliver decided that this is not relevant for 3.18...See Oliver's mail: > this patch fixes commit 514ac99c64b "can: fix multiple delivery of a si= ngle=20 > CAN frame for overlapping CAN filters" which is currently not on your l= ist for=20 > 3.18. >=20 > Indeed I would suggest to omit either commit 514ac99c64b and the patch = below=20 > for 3.18 stable. >=20 > Commit 514ac99c64b changes the number of returned frames in some cases = and by=20 > now developers can trust on the fact that this behaviour change comes w= ith=20 > Linux 4.1. >=20 > So nothing breaks when we omit commit 514ac99c64b and 36c01245eb804 for= 3.18. >=20 > The fact that the patch below emerged on the stable ML is that it is re= levant=20 > for 4.1 which was released in this phase. Or have I missed something? Marc --=20 Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | --GJQlVsucWLv6KPTTNIDoanaCHpOdRjkTE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJVo8McAAoJEP5prqPJtc/HWgUH/30J7GRYh0NlC/hIuivsQEon VbofxOQoLxafE40gi26y5DldZ5ViC/uZgihKoMEYlzjY5NMzp3brPiYtvjxvE+/r vY9Nuq0smXs1qqHWG9qw++KAItjmMG9RW1Wt5l+c5L2l8Zf9Yx4ee4qAvYnaiSZX NYcTED1oevjWo5Uedq6aTA16U7Q9cqMGHCYzNKMMf1iA2knIb4cpSGCfzODvqYYX zXVL306M+keJzHTjdrnwkp68taB27BqMJFzDs2rQgaR1qO86r/GrZf0X2ZQ1HyyU HQ+juW5DJvKUtHOYJ5QOCZv1sieo9NW3boYANFQjA1nQkY4/npKZcpsAVpK11OA= =25q4 -----END PGP SIGNATURE----- --GJQlVsucWLv6KPTTNIDoanaCHpOdRjkTE--