Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp1626709rdb; Thu, 7 Dec 2023 04:49:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0winUTdQraXgi5JNu1suQRL9gtrUnnCY8TBFnZ6Fvukrq1qOuPrIAUEXlH2xpghRIkRRf X-Received: by 2002:a05:6870:558a:b0:1fa:fa54:1b83 with SMTP id qj10-20020a056870558a00b001fafa541b83mr2612361oac.53.1701953357973; Thu, 07 Dec 2023 04:49:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701953357; cv=none; d=google.com; s=arc-20160816; b=X+mHEptxZSHHCZYqKrMzfzlQA6tj0laHhBipHQNmOZVdU1W2fOsp+2DusMI+MT4YQE vXq39O9KvM7E8ypxyBvw16TBqcAJ+BxahktHSBVchpGDRGV4cugjy3zIGhL4H6LzB+cy ZWrTyNXHvnpzqmHkwAinhsYrA2CrH2ScwnEZl1K/iSzs/ALCTS4iWsjGfXPKjUnh3wBH 9plofpARk1+vujL20Y9fCZ+2X3VPYChsTp6JDrBVr2afBsikvd/MTmqwwUm9t+e7ztOs XBuy/kw/h0vR7PMgP7UgO9aBthGRH6e8FbfnklXf1SRTd39ng89QAh1UhM3clk0Ssjvz pqyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=8rOWXHXcE/bl3GnAmoX8Mz2P8oxpbxVD71OVPuO+AYA=; fh=UYWXbum+wLoPmmjP2Wvb67P3pQ4DvvTZTp1RHG55Tus=; b=Ezp9CFtb4B7Wcqyaj38wi1RcMkw68EwaKBD93Lhqx5w3JLQ6gV4+lZhusnSp6TEXI2 h8irPqmMLiw4K8WGjEPtQFd1JLbKCnfYv4VRt2ZzwGHk/8wQwuZHFesHv+7EZWqY6EAF iUxLA1zAhbXDr+lXJ6R5OtH1342uHEEGgvrTQH2CisrLDa7/k1cIqhmvKgYs7r3Zb0jq gb0ALXDhIyj4XzB+OQJ8XLwhwUKo+OmjdplVBidVhc/WbJ3FIvfmkINBEwwlH8CuEeT4 NLCThJiLamyuOdyYZcxuLsgbh+owaIgNBy2ZlOAXUSQ0D2+mVUVXLfXPbez9HSGIZjwl z6QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="QXt/W1Qp"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id n30-20020a634d5e000000b005be007363a4si1109401pgl.669.2023.12.07.04.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:49:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="QXt/W1Qp"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 9CBB88073841; Thu, 7 Dec 2023 04:49:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379458AbjLGMtA (ORCPT + 99 others); Thu, 7 Dec 2023 07:49:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232583AbjLGMs7 (ORCPT ); Thu, 7 Dec 2023 07:48:59 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 916E5122 for ; Thu, 7 Dec 2023 04:49:05 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-50bed6c1716so4174e87.0 for ; Thu, 07 Dec 2023 04:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701953344; x=1702558144; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=8rOWXHXcE/bl3GnAmoX8Mz2P8oxpbxVD71OVPuO+AYA=; b=QXt/W1Qp51lyrQ4PEje7CGArUBuPVOOrjaOEIu8n1UXRV2j2AqY7P8gH2X/Cke1uin 421p2d/SwK0IxDJYgHKsnUrJ2aUnEIjPLSJeT08aCSD6GDTPK4GzFy6gWzCueqKb6504 LTlRwgMywH7fO+aecSihYQf3Mko57gFg+DPN6Kd90EqxVbaWDRTWpVpPDkJTajevAyqP njSRsB1dA+pFaKcAKx+zVApwl3B5KV51AxCeMsD3pH3HquZ4t9ahX6bC0hGrZwK0Vvq6 lTfYbBqlHHqpG70fZvks19yD5yZVXELYkIm50t9E0dzYf3LPe8kCFm4CAlmBIhRQch6J lI8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701953344; x=1702558144; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8rOWXHXcE/bl3GnAmoX8Mz2P8oxpbxVD71OVPuO+AYA=; b=RcYH4MFX9R8Dhr7RCjNcQozTkZNuMczAmK+WBS0nHijL3jB7RbdtVxxnB8JJHfyqKD emHRmGivqvqOGJiCGkDrk8q7Uvl6dCys91VczqEAVJ/vUU0f7FQKU1zBjxl+0Am2Qen3 mX2K0mGm7hcBbWrnQrO3RGU6oAoX4vgqdMa4Fg2UE9WChhKTxo8AALXZ7bW9STRo/yfp CG7EdPewMqb7Qk8rD6AYqAodlysaHUr172my0ICxfufG3w1eadJfLDn0Q+vCef3ryoPu bwfe2Q35D+tlwyjeGKzHyUkgDIo7tnSv9FHmXDqOzsonFghSH8RXypuggTgNX5DE6GaY uL4w== X-Gm-Message-State: AOJu0YxLETCftGRVlVpJ8k4mc+ADPO3NROVw83gA7Q63C+Zj9PmQbpb/ pxFcE4QDrtxvtoMxzw4PEw3zzucjijJMxU5bsyn/sg== X-Received: by 2002:ac2:4439:0:b0:50b:fced:ca9b with SMTP id w25-20020ac24439000000b0050bfcedca9bmr87733lfl.7.1701953343451; Thu, 07 Dec 2023 04:49:03 -0800 (PST) MIME-Version: 1.0 References: <20231201143821.1091005-1-aleksander.lobakin@intel.com> <20231207115751.GG50400@kernel.org> In-Reply-To: <20231207115751.GG50400@kernel.org> From: Eric Dumazet Date: Thu, 7 Dec 2023 13:48:52 +0100 Message-ID: Subject: Re: [PATCH iwl] idpf: fix corrupted frames and skb leaks in singleq mode To: Simon Horman Cc: Alexander Lobakin , intel-wired-lan@lists.osuosl.org, Michal Kubiak , Przemek Kitszel , Maciej Fijalkowski , "David S. Miller" , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 07 Dec 2023 04:49:15 -0800 (PST) On Thu, Dec 7, 2023 at 12:58=E2=80=AFPM Simon Horman wro= te: > > On Fri, Dec 01, 2023 at 03:38:21PM +0100, Alexander Lobakin wrote: > > idpf_ring::skb serves only for keeping an incomplete frame between > > several NAPI Rx polling cycles, as one cycle may end up before > > processing the end of packet descriptor. The pointer is taken from > > the ring onto the stack before entering the loop and gets written > > there after the loop exits. When inside the loop, only the onstack > > pointer is used. > > For some reason, the logics is broken in the singleq mode, where the > > pointer is taken from the ring each iteration. This means that if a > > frame got fragmented into several descriptors, each fragment will have > > its own skb, but only the last one will be passed up the stack > > (containing garbage), leaving the rest leaked. > > Just don't touch the ring skb field inside the polling loop, letting > > the onstack skb pointer work as expected: build a new skb if it's the > > first frame descriptor and attach a frag otherwise. > > > > Fixes: a5ab9ee0df0b ("idpf: add singleq start_xmit and napi poll") > > Reviewed-by: Przemek Kitszel > > Reviewed-by: Michal Kubiak > > Signed-off-by: Alexander Lobakin > > Reviewed-by: Simon Horman It seems singlequeue mode is not really used on idpf :) Reviewed-by: Eric Dumazet