From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (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 63DAB1F63F9 for ; Wed, 24 Sep 2025 14:33:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758724392; cv=none; b=IkBhLhlMTAGcNGQ2XUSa/tKq18pbLPRLcBwfy5j36p4pNBzDriQH78huO2iKOdIIV+yZFOoIKn+n02HLHomw/WgJ68U5ZdS2i4N4BBWieGdd4/vHzIlyrs+zaxuHOWbqzsz6oBFqYWb6LJLF+g1a8UrY+6OQACWC2uLa1fEeIz4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758724392; c=relaxed/simple; bh=ZekXIlCHnjNzUhvgAUC9R4R1p5Dc9abTUwGR6ICwmDw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=UBHgcFDjRPjsGwhdA94fCsnYPS9+sopmngD3xXibQ1XTB+v7uEt4sn3fBAZ+Qwrz4FXO7CFfrqkHRs5JMvk1xLtKKIwcR6lLdp/qpdqU0Osapn6zCfatbeFVGzgRfs/ZTtqbpJsVL/CRRMqmo+V2pgIxcZX+Tr+7mfqiWJFIuI4= 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=vrPqVq5n; arc=none smtp.client-ip=95.215.58.173 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="vrPqVq5n" Message-ID: <98ea9a9e-bc94-4322-b210-64277c00cbe8@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1758724378; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pigf3btXJV2Qy9NfNgzlCWs0SPNMcnN6PDLn4Fh6gjU=; b=vrPqVq5n5sEHVf7WDL19ZntapmBXl1XJxD9hEy6ErKEbfJChPG3n4fRNe+a3Z+R+fUgUn4 MLUij4sNMN65dInrKz5dtuTux65+UaFThydnDBzS2q11qLYGnx7/Zqvx4xz8v1+mrAV0mr uuWbKqOuQ6Nvzt0UPvkMiA/CLOmibjQ= Date: Wed, 24 Sep 2025 07:32:47 -0700 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: linux-next: manual merge of the bpf-next tree with the net-next tree To: Mark Brown Cc: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , Amery Hung , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , Martin KaFai Lau , Paolo Abeni , bpf , Networking References: Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT On 9/24/25 4:27 AM, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > include/net/xdp.h > > between commits: > > 1827f773e4168 ("net: xdp: pass full flags to xdp_update_skb_shared_info()") > 6bffdc0f88f85 ("net: xdp: handle frags with unreadable memory") > > from the net-next tree and commit: > > 8f12d1137c238 ("bpf: Clear pfmemalloc flag when freeing all fragments") > > from the bpf-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > diff --cc include/net/xdp.h > index 6fd294fa6841d,f288c348a6c13..0000000000000 > --- a/include/net/xdp.h > +++ b/include/net/xdp.h > @@@ -126,16 -115,11 +126,21 @@@ static __always_inline void xdp_buff_se > xdp->flags |= XDP_FLAGS_FRAGS_PF_MEMALLOC; > } > > +static __always_inline void xdp_buff_set_frag_unreadable(struct xdp_buff *xdp) > +{ > + xdp->flags |= XDP_FLAGS_FRAGS_UNREADABLE; > +} > + > +static __always_inline u32 xdp_buff_get_skb_flags(const struct xdp_buff *xdp) > +{ > + return xdp->flags; > +} > + > + static __always_inline void xdp_buff_clear_frag_pfmemalloc(struct xdp_buff *xdp) > + { > + xdp->flags &= ~XDP_FLAGS_FRAGS_PF_MEMALLOC; > + } > + > static __always_inline void > xdp_init_buff(struct xdp_buff *xdp, u32 frame_sz, struct xdp_rxq_info *rxq) > { Thanks for the fix and it looks correct. I had noted that in the recent net-next pr [1]. https://lore.kernel.org/bpf/20250924050303.2466356-1-martin.lau@linux.dev/