Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 24 Mar 2023 13:19:02 +0100
From:   Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To:     Nuno =?iso-8859-1?Q?Gon=E7alves?= <nunog@fr24.com>
CC:     =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Jonathan Lemon <jonathan.lemon@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        "Christian Brauner" <brauner@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        "Daniel Borkmann" <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        <netdev@vger.kernel.org>, <bpf@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH bpf-next V4] xsk: allow remap of fill and/or completion
 rings
Message-ID: <ZB2VNg7yVxAjJEMV@boxer>
References: <20230324100222.13434-1-nunog@fr24.com>
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20230324100222.13434-1-nunog@fr24.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?jG9gboowZyd+jL0U2EsRXxuuBPY5lqvnRKjVxwrMaHtvfBGOy0IK31NLPX?=
 =?iso-8859-1?Q?A9fF+aHHNdfxFbZboV4Cvj0kQtBXafQnaynPXWRCQeluum0jo9t5dOImqc?=
 =?iso-8859-1?Q?O+lc1hFe5CM0DKO65xT7Y8gi0TjAue6+bmJJqxLoZ2u0JKWVNz1f3baTMI?=
 =?iso-8859-1?Q?DVi5nZxjUieoZTinjK2ULoYOHUp/1cKzWK8AHJegZ/BNulLMLpFqb0v0Xq?=
 =?iso-8859-1?Q?8ebCpAQi599J20GrB7/Ds38Q8qeYfwPV1q5oyse+SNerGW5A7FJzOn2ms3?=
 =?iso-8859-1?Q?e9CvdwE7XBsUdfFjmLxFiWQptPZsl9ZYy/NMFr1T2HJixOuAvUiGIVhEWw?=
 =?iso-8859-1?Q?LX7nZY73ON9EkolmdP1LqVbWKZ/bL7ft0Wkz0olJAnFVNJ0G/hgxT6K6Bl?=
 =?iso-8859-1?Q?qEkBEx2duBWX9PYcxcIBuSrldiiBXNDFx7UCwM3jRzpqe1K6Eyql814wTH?=
 =?iso-8859-1?Q?eKbf5StDxTZ/AKWXytJ3/g4i7eE9hsgK60GAb1xl/6cTBGGU9z0yEWYsQz?=
 =?iso-8859-1?Q?eJ0wZQncWnwArrNpTYaz4S2ZFnK4IA3ZU6v8nCkP6HWh26/O5AG6kmYsT3?=
 =?iso-8859-1?Q?rzWLHfkAsBP3gQ8UZKV0EKdX07h8fibkiRlsVSJhtTSJd67ORjHtCNTTi9?=
 =?iso-8859-1?Q?5lSBFQUp4exiBulbxGLMebVCr+UKvQ7FuuXrObpeJKa473C9nLKNvRgW/h?=
 =?iso-8859-1?Q?CEVvC2oGCDJ48N/7c7HqGBXfjUwHttchPScOgLyBc4p3uycVej8nhI+jOu?=
 =?iso-8859-1?Q?Ud8isX4ls8CWxO8lPzGTMIfwfyk7nHnecPdhs4pkGuKCj1jpbvZrqCI2Fv?=
 =?iso-8859-1?Q?Zoimtne+Z/4YXa9CK1rMuVYVv62GLTnjFnb4MdmSHTCWNwPsDDLoWN0vaB?=
 =?iso-8859-1?Q?Qcj2XvhGpl2g/asLG2P1zELNsHFkHiIswxmKQ1jjAl7LlQXL6j6hnm+N0/?=
 =?iso-8859-1?Q?0WXfR9MfvslSwXIg+OVqt7tFMT1cgMSVCVJbPyDGIDo3VD5Y6RAryYP/2R?=
 =?iso-8859-1?Q?z9ii+eoIJWiVkVJXwk3hAbSOO1ZJphlcuEOvb+kWBa6YoQFnqTuBFs1v+P?=
 =?iso-8859-1?Q?Yu3/V6JMfPBW9RXC1oMql9akAi1N80JMHVVrm2A36Gqzuk+NGR5FTfDuyf?=
 =?iso-8859-1?Q?W3Jta11OO+ansh389eh4oGYAHx8HuxhqjnwcE3aKEJupE2FhBHCgQuw5AX?=
 =?iso-8859-1?Q?/BGGy2BYQ3LYDzxzCxG1YSM/CRnNuQOBoFZABeYpb9z0ABs0WxstnvMxbl?=
 =?iso-8859-1?Q?2E6ItaggWuab6sbQ00eik+IzO57TICPFpkZ+5iBb9jIfIPWP5Qb7MCvZR9?=
 =?iso-8859-1?Q?CJGukKZzoRAY2dcaFt/3NJ1liqXZwigvYIZVKiHQtlQuSAGr0ypNvjac8X?=
 =?iso-8859-1?Q?7cSohToR7viKUaFWY2Os2TQgoC0s5CE6K2VQeOLMETIi6a0nhJYxAmF81p?=
 =?iso-8859-1?Q?RxQgnICMMgpBeEvHEuIMeH3SsvIamEn0ghGSfYv9BGm8Ji9r97kZ9OYVxc?=
 =?iso-8859-1?Q?05aVHBtSe6RmrpmjlArIIcjy6CRHcpDwBwmzfWGKBUxdU5UV1c/M3Gfo54?=
 =?iso-8859-1?Q?BhF9M0irhDRlVlvlT8Elw1IMa/v0/CSsfv6LFUb09jKitV79kcmXGgV5xS?=
 =?iso-8859-1?Q?0luVHT88frY6LvB9jrv+ekWDUo57al/LPKB8xQMJqJ1zou+yJj3/4WyGbr?=
 =?iso-8859-1?Q?d1oJONzmSb9Iqd3Qgqw=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e4a0abae-a96d-4fa8-bca9-08db2c61f8a3
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6117.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2023 12:19:09.9549
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2nkX2/ZNR9WMJ4hyD2QDGBcdf1qi17sHWRPEdJLTB+ubaxNW0itA+YuCOM+e1HVFiye0Buiy0cx24+3wlJ2OaVSbG4h3VH52NKzxnf35HgM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7661
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Mar 24, 2023 at 10:02:22AM +0000, Nuno Gon?alves wrote:
> The remap of fill and completion rings was frowned upon as they
> control the usage of UMEM which does not support concurrent use.
> At the same time this would disallow the remap of these rings
> into another process.
> 
> A possible use case is that the user wants to transfer the socket/
> UMEM ownership to another process (via SYS_pidfd_getfd) and so
> would need to also remap these rings.
> 
> This will have no impact on current usages and just relaxes the
> remap limitation.
> 
> Signed-off-by: Nuno Gon?alves <nunog@fr24.com>
> ---
> V3 -> V4: Remove undesired format changes
> V2 -> V3: Call READ_ONCE for each variable and not for the ternary operator
> V1 -> V2: Format and comment changes

thanks, it now looks good to me, i applied this locally and it builds, so:
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>

but i am giving a last call to Magnus since he was acking this before.

> 
>  net/xdp/xsk.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> index 2ac58b282b5eb..cc1e7f15fa731 100644
> --- a/net/xdp/xsk.c
> +++ b/net/xdp/xsk.c
> @@ -1301,9 +1301,10 @@ static int xsk_mmap(struct file *file, struct socket *sock,
>  	loff_t offset = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
>  	unsigned long size = vma->vm_end - vma->vm_start;
>  	struct xdp_sock *xs = xdp_sk(sock->sk);
> +	int state = READ_ONCE(xs->state);
>  	struct xsk_queue *q = NULL;
> 
> -	if (READ_ONCE(xs->state) != XSK_READY)
> +	if (state != XSK_READY && state != XSK_BOUND)
>  		return -EBUSY;
> 
>  	if (offset == XDP_PGOFF_RX_RING) {
> @@ -1314,9 +1315,11 @@ static int xsk_mmap(struct file *file, struct socket *sock,
>  		/* Matches the smp_wmb() in XDP_UMEM_REG */
>  		smp_rmb();
>  		if (offset == XDP_UMEM_PGOFF_FILL_RING)
> -			q = READ_ONCE(xs->fq_tmp);
> +			q = state == XSK_READY ? READ_ONCE(xs->fq_tmp) :
> +						 READ_ONCE(xs->pool->fq);
>  		else if (offset == XDP_UMEM_PGOFF_COMPLETION_RING)
> -			q = READ_ONCE(xs->cq_tmp);
> +			q = state == XSK_READY ? READ_ONCE(xs->cq_tmp) :
> +						 READ_ONCE(xs->pool->cq);
>  	}
> 
>  	if (!q)
> --
> 2.40.0
>