From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DC5119992E; Wed, 21 Aug 2024 14:05:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724249130; cv=none; b=YeFb2LsTcbTr6E+MEwuqtJnRrmDjC2Jh/BI8RhtYMibyy+FXkHCG4LjeM5BeaWA4jBCz1vk3eTrEKFxz6u3RWDAC6UnE75HuudtvfzCNuq2sbprj1viIXSCLAxfhIr6FTTuB3cKyebiwv8WuMCepUM5e/r5woy+kVLKPxHZ8UCQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724249130; c=relaxed/simple; bh=3qQFyXAWi9BA6zTGMeLTr7gI4YHzoN6OU5PpClQonHM=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=j6XUomFtXT7KTFr7RvslwT/38m+DaKwaOSi7hXPYwNAGJmjA+IJeIAzSlaI5k/069CXEbI4qnQCbV9uqc9oWF7I1s58WtosCMpA3c0GHIu8Xb3nonBtlDaQMUQA1FikbZrO2nUagFgqC8lH/sIQM6rpW3e3gvp61C6OsetqOdk4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IxmCPib1; arc=none smtp.client-ip=209.85.219.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IxmCPib1" Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6c159151013so3225366d6.3; Wed, 21 Aug 2024 07:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724249127; x=1724853927; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=fN4YJkNsiA5cBzIHKP1gu1fWJlmOWyJm4B0nMxoX820=; b=IxmCPib1iOX/J2c/D67A8pwFlQapEEEXWv/6Ns+0Po2DtK/mUSw19kWh/PnuTJGAqy XidFosAV6YWbZiiMkfxEsiaAjY6X25Y7ECM77n3+20HDmY2Q5dND9QuAF5Ld7NUtvn1V /2Qx0hDo/LTeuEFrvbPYplzpmQv10BSNP5wUAtYWECU24O97sFdelDWffh0zaMXWbnKX 2j6RYfG2nVGEKsHoTvfbzqnVfMU4SzJ2SK77hoSoQ6L0+Y3TN3hJeIHwcazPRWcvuJpa XmltDzYcSMkeX6nj68BathtVU+KVTLNHjfohgymRC8RGWV2AKpuzJjC0JKlGSGOlT0UJ hYdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724249127; x=1724853927; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=fN4YJkNsiA5cBzIHKP1gu1fWJlmOWyJm4B0nMxoX820=; b=SXP+6XOwL8C32dz1iCra+BN89lbTwJZMulkPjRIZ0enD/z39UQXOfQXdmuWIuoEUKu wdI2gM8VC2X89Kek3H4PuGM3fj1fakta5pbUtBeOE+HEFG5srOGfyMST+z0V+1c+I+9X E0WjNBR3qBXYo7MNTk69FkUzrMaGTwwwp4g8qFqMTiQIsGWFn0aV5VdOQ2moKesN5JJs yvhtdnHJrxI7q/t/nVbfRONjkMYl7MoVJUFHf2XAGFO5MvDoHKBM489ASOt4BzCbaki1 Ui7YaZU8X4waOHLLkli3AU/uUD6ucWAJlc7GkdeyEgcJaJIZgD3U+L8kEWEfVQjF/vbn zKGQ== X-Forwarded-Encrypted: i=1; AJvYcCVC4ke9VdO2qHhyNI/6c5+uqEWx8979pNmXI2oCSM2tR1+D0yquRWrSc8pjMZuVAf7Ey+qh1ZVy@vger.kernel.org, AJvYcCW0pXubz5VY/Em9OrpwITMkTaDtNfQx8ngA6EStWSJm9IoaYKzpinZHViFYrQjVWs3myIFj7lo=@vger.kernel.org X-Gm-Message-State: AOJu0YweCMsZjxOJxkjFQ86KkAUtpDSxGQGDfYxh0YP7QA7cXD8mRlGH JWeMry8+pugqpThHYW8rDlc48+vCK4CWxykedUUfGQg09DzshW0V X-Google-Smtp-Source: AGHT+IEFETWqaRrGa4osaJCinLoV2tBEtUd7FpTCWAuWzdefV/2detzXaXFZ//Bm1Pdul4NYn2NnRQ== X-Received: by 2002:a05:6214:5a0a:b0:6bf:940d:286f with SMTP id 6a1803df08f44-6c155e1f98fmr32497436d6.50.1724249127257; Wed, 21 Aug 2024 07:05:27 -0700 (PDT) Received: from localhost (193.132.150.34.bc.googleusercontent.com. [34.150.132.193]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6bf6fe115absm61625666d6.38.2024.08.21.07.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 07:05:18 -0700 (PDT) Date: Wed, 21 Aug 2024 10:05:12 -0400 From: Willem de Bruijn To: Vitaly Chikunov , Willem de Bruijn Cc: Christian Heusel , Adrian Vladu , "Michael S. Tsirkin" , Greg KH , "alexander.duyck@gmail.com" , "arefev@swemel.ru" , "davem@davemloft.net" , "edumazet@google.com" , "jasowang@redhat.com" , "kuba@kernel.org" , "netdev@vger.kernel.org" , "pabeni@redhat.com" , "stable@vger.kernel.org" , "willemb@google.com" , "regressions@lists.linux.dev" Message-ID: <66c5f41884850_da1e7294d2@willemb.c.googlers.com.notmuch> In-Reply-To: References: <2024080703-unafraid-chastise-acf0@gregkh> <146d2c9f-f2c3-4891-ac48-a3e50c863530@heusel.eu> <2024080857-contusion-womb-aae1@gregkh> <60bc20c5-7512-44f7-88cb-abc540437ae1@heusel.eu> <0d897b58-f4b8-4814-b3f9-5dce0540c81d@heusel.eu> <20240814055408-mutt-send-email-mst@kernel.org> <66bcb6f68172f_adbf529471@willemb.c.googlers.com.notmuch> Subject: Re: [PATCH net] net: drop bad gso csum_start and offset in virtio_net_hdr Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Vitaly Chikunov wrote: > Willem, > > On Wed, Aug 14, 2024 at 09:53:58AM GMT, Willem de Bruijn wrote: > > Christian Heusel wrote: > > > On 24/08/14 10:10AM, Adrian Vladu wrote: > > > > Hello, > > > > > > > > The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor. > > > > > > > > Thanks, Adrian. > > > > > > Yeah it's also queued up for 6.10, which I both missed (sorry for that!). > > > If I'm able to properly backport the patch for 6.1 I'll send that one, > > > but my hopes are not too high that this will work .. > > > > There are two conflicts. > > > > The one in include/linux/virtio_net.h is resolved by first backporting > > commit fc8b2a6194693 ("net: more strict VIRTIO_NET_HDR_GSO_UDP_L4 > > validation") > > > > We did not backport that to stable because there was some slight risk > > that applications might be affected. This has not surfaced. > > > > The conflict in net/ipv4/udp_offload.c is not so easy to address. > > There were lots of patches between v6.1 and linus/master, with far > > fewer of these betwee v6.1 and linux-stable/linux-6.1.y. > > BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in > ALT, and there is no reported problems as of yet. > > 89add40066f9 ("net: drop bad gso csum_start and offset in virtio_net_hdr") > fc8b2a619469 ("net: more strict VIRTIO_NET_HDR_GSO_UDP_L4 validation") > 9840036786d9 ("gso: fix dodgy bit handling for GSO_UDP_L4") > > [1] https://lore.kernel.org/all/2024081147-altitude-luminous-19d1@gregkh/ That's good to hear. These are all fine to go to 6.1 stable.