From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 E9B69347BBA for ; Wed, 22 Oct 2025 12:51:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761137518; cv=none; b=OyYxXM3RiCKjlbxct1JHfRWgP1Ggquf56OIY7Vwtzjm0RkhSEPKXfOtCp3lpvI/xDDZ2w712IOx6CvDx7br46i+jW+0iclGrpZmvCxkHyLyAQLydImSj+PLcjvNmxJ6sK6GMYi2wP8IGKRl6yAsJMNUT3/z/7G7yEHupwnUPpPM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761137518; c=relaxed/simple; bh=mzrVBGSngClRb9VIP/ej4j6oFQp5mVzc748Ppxzbeys=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=OUMQSx6aa2p3p/JJJHS1mNU9sfqR1p8RQ8rYrK0hrAYqFGDG27PqBN14a0bZ31AXEii8s9iJVGg7ZiMR05LeQEnJXBvWF1ZmePYN9cOTZcpCnDFEX1hxz9ZfEiXfc6bDd7CCu4NK3wAujeqq+eQrVs5zRacqxC45BHdz0UrUcYw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org; spf=none smtp.mailfrom=blackwall.org; dkim=pass (2048-bit key) header.d=blackwall.org header.i=@blackwall.org header.b=lAVCRzdS; arc=none smtp.client-ip=209.85.208.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=blackwall.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=blackwall.org header.i=@blackwall.org header.b="lAVCRzdS" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-63c489f1e6cso1742348a12.1 for ; Wed, 22 Oct 2025 05:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall.org; s=google; t=1761137508; x=1761742308; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=O6rGYgkFqZMyeKkM9CWxrN6/zkNVAr0RwTWj6Y0/e+E=; b=lAVCRzdSQbjclst11IUwOwVzzDCxhou24aWRDQGxAAyrY8b9bR0LT5THj97ZdmAWj1 gpQSbqOCmd9MHOaOt+A3QymqmE4xewg7NAqR9GFsMqZmFQbZnMMNLTbqIZeumtBwX2Aa skA4LqUNh+H1yoZtu7MZ6dwUT5EZLuiLfTXRxn9Nx43CyulvySYZxTmPhCApAZ/QH6Ju 0AWOucMCZTxu1646zuIDjs8v9b11br/X7GcfFTYiyvSV66o4eDE/EcwPQNOMW4FK+pJJ hmGvrlOQxxwIOZV+wrn5VzDfLHHHTGBD8Tz0xmCiruVmOfhssPSfCQg8hiCn4qRehc/f 6yxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761137508; x=1761742308; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O6rGYgkFqZMyeKkM9CWxrN6/zkNVAr0RwTWj6Y0/e+E=; b=PkeNqCi5Iyrlo02LB7RvgKIoR6nVmH3mDkN7fUpnOW0J/e7HBXTHflaF3L/ThmY9Og Le/61TVQIDffz2OalZZ3JYTI0sHV+nAvpBDeHIJZrcYT42m2LtAUouGLOzcLOZO1td1N lm+EtPn30KduaBs62toR1qMkAIH0i095FpWgpKiFHx9bRVu6kUbs4rGAx3rLoDi5UVq2 sGSVx8tM0hfwpXhgLcjGFGuJu944CNukulPWRIosqdxRSdGeEU2JtlIYvF8La3+f6kC6 40SFXUid79pZgl5Af7MNYALxwiS0hyzFc1m8yNbIOTjK+aUpdnxtbTRlUXBhYBxvNTRa BVZA== X-Gm-Message-State: AOJu0Ywue58sXJcw672REhD/iGCgCCWDn4fN8i5I4s5p2P6C2N7F4V4I I2FrnPFcsqAuuWQZK8cmjzdvp+ie1Vu49/pHE24YM+JuZQVBPA5DSubhnC7K/HnZTNI= X-Gm-Gg: ASbGncsjDYlgCyYh3FCytHRKy6SVaiWnzKqHY8jtpQiynZD7oqjJzmX+YjoMwA9zylg BbkIWvpUEoQ27NbnqiIHx1D4DVD6rgtqQg69VL2qhjE789/5WyaxxYlqFUGzKAXTtJUlpG74wro SCtb6HqHeW1AGkhG0MySJ1OtfxUhKyIgnrhisFB8blt77oKqdw4LURY+F4JeqJINPQMNPuWgVFB cK9plHvWl7c861VC3sMD0Y5JEyzS8XjPLwXK/HgZ/tyDXTi3feDddTFc1WPm9wlSO0VUr1jlvFs /L2knV9BJxNyVPsdf0Zhre0sjIHQAnhZKSSj8uswFLG6No0nyfIfvE/IeaXNf5SpCQ0XtfdP38m qqqQsiqyTUjiw+V02LfW+FqEL7aJSfLG8Q/2F5u2xVShmu2dh6X+7euX7kHufP1rfcGjo8lWhrM /wY9wpYxhkwpkJVO+PQNIbZoCVyJKiSqLr X-Google-Smtp-Source: AGHT+IGEvaj2arhMJNqpkIacGCGSpwCCmyDSBkx64VqNMr6Y6jMdC3l4n7s/h6EMTkg7OkTdvHLrtQ== X-Received: by 2002:a05:6402:460d:20b0:63c:12dc:59e3 with SMTP id 4fb4d7f45d1cf-63e173d315cmr2980332a12.19.1761137508048; Wed, 22 Oct 2025 05:51:48 -0700 (PDT) Received: from [192.168.0.205] (78-154-15-142.ip.btc-net.bg. [78.154.15.142]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-63c48a93998sm11636602a12.4.2025.10.22.05.51.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Oct 2025 05:51:47 -0700 (PDT) Message-ID: Date: Wed, 22 Oct 2025 15:51:46 +0300 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v3 06/15] xsk: Move NETDEV_XDP_ACT_ZC into generic header To: Daniel Borkmann , netdev@vger.kernel.org Cc: bpf@vger.kernel.org, kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, willemb@google.com, sdf@fomichev.me, john.fastabend@gmail.com, martin.lau@kernel.org, jordan@jrife.io, maciej.fijalkowski@intel.com, magnus.karlsson@intel.com, dw@davidwei.uk, toke@redhat.com, yangzhenze@bytedance.com, wangdongdong.6@bytedance.com References: <20251020162355.136118-1-daniel@iogearbox.net> <20251020162355.136118-7-daniel@iogearbox.net> Content-Language: en-US From: Nikolay Aleksandrov In-Reply-To: <20251020162355.136118-7-daniel@iogearbox.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 10/20/25 19:23, Daniel Borkmann wrote: > Move NETDEV_XDP_ACT_ZC into xdp_sock_drv.h header such that external code > can reuse it, and rename it into more generic NETDEV_XDP_ACT_XSK. > > Signed-off-by: Daniel Borkmann > Co-developed-by: David Wei > Signed-off-by: David Wei > Reviewed-by: Maciej Fijalkowski > --- > include/net/xdp_sock_drv.h | 4 ++++ > net/xdp/xsk_buff_pool.c | 6 +----- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h > index 4f2d3268a676..242e34f771cc 100644 > --- a/include/net/xdp_sock_drv.h > +++ b/include/net/xdp_sock_drv.h > @@ -12,6 +12,10 @@ > #define XDP_UMEM_MIN_CHUNK_SHIFT 11 > #define XDP_UMEM_MIN_CHUNK_SIZE (1 << XDP_UMEM_MIN_CHUNK_SHIFT) > > +#define NETDEV_XDP_ACT_XSK (NETDEV_XDP_ACT_BASIC | \ > + NETDEV_XDP_ACT_REDIRECT | \ > + NETDEV_XDP_ACT_XSK_ZEROCOPY) > + > struct xsk_cb_desc { > void *src; > u8 off; > diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c > index aa9788f20d0d..26165baf99f4 100644 > --- a/net/xdp/xsk_buff_pool.c > +++ b/net/xdp/xsk_buff_pool.c > @@ -158,10 +158,6 @@ static void xp_disable_drv_zc(struct xsk_buff_pool *pool) > } > } > > -#define NETDEV_XDP_ACT_ZC (NETDEV_XDP_ACT_BASIC | \ > - NETDEV_XDP_ACT_REDIRECT | \ > - NETDEV_XDP_ACT_XSK_ZEROCOPY) > - > int xp_assign_dev(struct xsk_buff_pool *pool, > struct net_device *netdev, u16 queue_id, u16 flags) > { > @@ -203,7 +199,7 @@ int xp_assign_dev(struct xsk_buff_pool *pool, > /* For copy-mode, we are done. */ > return 0; > > - if ((netdev->xdp_features & NETDEV_XDP_ACT_ZC) != NETDEV_XDP_ACT_ZC) { > + if ((netdev->xdp_features & NETDEV_XDP_ACT_XSK) != NETDEV_XDP_ACT_XSK) { > err = -EOPNOTSUPP; > goto err_unreg_pool; > } Reviewed-by: Nikolay Aleksandrov