From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84B3D34C806 for ; Mon, 27 Apr 2026 22:40:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.185 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777329633; cv=none; b=RMKIhmfDwHmNtvxmYEZl14/2RCJrPRknBKCl1UB7jXG/t4N3bVZoDGghcLBkAjcStwYYH0mdyn3hTWRv97CBxoYulOdO24eLwC3Ge0kNsfRPuUHCozbwh43Llmu9BbP4alQj7CNg0wmcj4ak8y7/iyy+xJzhUwgths3fzbjytwo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777329633; c=relaxed/simple; bh=d5GAfifer7UhwpqXfJzxG4VAbQdW+fQHcgwzYkW70Mg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=JILfvGxizZINkPzwfR9YaIc/P4rqVa47/eK16vVqWAhB6Rkxxnz3Ix7+qsUCZaFwp1czpfTISSrEVcRavrscya8/VSYNueVqCtq0s3iRKvxHDGNLpqfnAccfUHaDLAJZuciKsCGucFxK8oNY2Wr+aNAlB/xPc3zLG76tWnrUi48= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=XJLizVjH; arc=none smtp.client-ip=91.218.175.185 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="XJLizVjH" Date: Mon, 27 Apr 2026 15:40:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1777329620; 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=WzrZN74GVBZokC1ryglYdW2bR4JGJX0G4YAAV4itqnE=; b=XJLizVjHfNvoYMow1Gn+PESNu7GTFZH7JoiHLokhkU7NgzjoW4JfgkCkROS113iawSgOdc ScOEwT8TqT+nbYw5BviqAr6mlCrLzc9pExN5zvd9cXgh17qOnmbyO2gNZA79M10CW8CkUY Omj6sAtmd/uqwZgrobjziByoinoh4vk= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau To: Nick Hudson Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Willem de Bruijn , Max Tottenham , Anna Glasgall , Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 2/6] bpf: refactor masks for ADJ_ROOM flags and encap validation Message-ID: <2026427223629.lOYH.martin.lau@linux.dev> References: <20260420104051.1528843-1-nhudson@akamai.com> <20260420104051.1528843-3-nhudson@akamai.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260420104051.1528843-3-nhudson@akamai.com> X-Migadu-Flow: FLOW_OUT On Mon, Apr 20, 2026 at 11:40:47AM +0100, Nick Hudson wrote: > @@ -3618,8 +3623,8 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff, > { > int ret; > > - if (unlikely(flags & ~(BPF_F_ADJ_ROOM_FIXED_GSO | > - BPF_F_ADJ_ROOM_DECAP_L3_MASK | > + if (unlikely(flags & ~(BPF_F_ADJ_ROOM_DECAP_MASK | > + BPF_F_ADJ_ROOM_FIXED_GSO | > BPF_F_ADJ_ROOM_NO_CSUM_RESET))) It has conflict with a recent change. Please rebase with bpf-next/net. pw-bot: cr