From patchwork Wed Apr 23 03:11:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 883667 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 8C621267B61 for ; Wed, 23 Apr 2025 03:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745377898; cv=none; b=pSWNzePqzCkP+5es/qVsYGu2u/ViMwAn4c7AaI5JcV8uD8+kdol1KcxDmYoc30o9w6/dQ5nVPaacj7JlAmxnBIfHel6HKMA2T0CaZBTycoqT8GBUIAyVkicUydrQdpEt62NJrOMMvikP8csAWLINOmG2d/SPDlOu9Sp9aNmOm+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745377898; c=relaxed/simple; bh=7NgBY2/M7RX3ZWIExGTnoM9nMea+0yUh7UHHWuhJ4Bk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EYeaIOatbgJagoEmWpdNGdvEu4W+06/Ap70lwyr3+X8CO4NeQkoCj9w7aogDm8AMHsv6A2li7N7fzkOvMOYv8huvOM2a/W1/tSy8mXhveYyspWd6+El/VPGXK/F5TvxrlqcIDD2bPT1fn9rjMIg46HU4Bp8/mqcGWPY/aT5knHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=EGaqsG5v; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EGaqsG5v" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-af547d725e8so2417280a12.1 for ; Tue, 22 Apr 2025 20:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745377895; x=1745982695; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Dm+KUe9Ww/e6Vyl6aeeJ+DObwsjW8ys4qGoTcP5xOok=; b=EGaqsG5vWidGv4rsXVCHRSZbHizRtNQAFDxvniO4rf0BluOWPsVw2tvXL9+c2D5KHK b4CzxFtZlMXG0Grf1BAwjGerI2cRbog6C6QJ1X7P5psJM1ZfNeqFv9Ida6+a35uhUjtH h4doUAaeSH5FcKApej4T+G9cdxVnfas6edNnbgy9XxKQyCriJJZNU0+Xb0r5KEzgESgv gni5r/6YOQFwVRqd2w/FKUcnfjCY3hehwU7uVLObLpl/y+O69ngddZa0OlZeqX3fldG3 5smzlzdnHMemY/GsuHfIW2yHeqbsLpH3vPMX9WDfSDDRVWjeCma2EyD5gz6iX5TTfdXM lwmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745377895; x=1745982695; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Dm+KUe9Ww/e6Vyl6aeeJ+DObwsjW8ys4qGoTcP5xOok=; b=Bb4V3T1QcQicVrfO5zeC++3utPYaD1yryj8uZVsJ+g4iHtGewsGWkDavZ0cPs28Egi hKAviNtVMvUMjf30vjNa520a5xFbu28qDOxRp2CzmMCZrmpbW/lp4qn1FB6MeW9c7RT2 zZQrqJEgDJokuH/3XfRgy3uG5BWr0GBehOTs+JC1DwPuPl8GFbhw0DZPWZwaJIhD8jtx jnTgjhXcBCrXc0lDFzr8iKrFDTx+c+l1goWLQgtaLCEudquXVdTl1yqF6QVCZEBXkyAx +tZHCjSwVDj2DfnYLAOA9QFXVyqY5XioAPyCdA9tCzeIRto5WuXal2PM5D5+wCD+WFlN ZMZg== X-Forwarded-Encrypted: i=1; AJvYcCUr6HjPSj02uhHV4v3qcWMwpRvR/wtirbwg+RY7XxBs8KbkD7gBTquqQtT0mzXwcXQ09SwZ8PTRkLlxaip9ctg=@vger.kernel.org X-Gm-Message-State: AOJu0YyE2RKYIRrzyrZw4z2BDKT3EpZGLwk9bqohF68+YTWi/3EOyIqd 95fSweQ7pk3KrQdrrUwn5klShujy0vwFiuwlNamSl54JSa2amxfbCL7GusY04YX7lt2uEgAjBXq tpiQ8pwG6rWtWv8PpR9/5Pg== X-Google-Smtp-Source: AGHT+IHcL6V0wyIgxVPnSh9oujNfZm6xJMeeDAKJGJjxgwUzV9Gxqtp5X/qnGnjnB3+ge4ifRPfAJCgtsn2xzhI6TA== X-Received: from pjvv13.prod.google.com ([2002:a17:90b:588d:b0:2fc:aac:e580]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2411:b0:2f9:d9fe:e72e with SMTP id 98e67ed59e1d1-3087bb6ba95mr25794082a91.16.1745377894793; Tue, 22 Apr 2025 20:11:34 -0700 (PDT) Date: Wed, 23 Apr 2025 03:11:15 +0000 In-Reply-To: <20250423031117.907681-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250423031117.907681-1-almasrymina@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250423031117.907681-9-almasrymina@google.com> Subject: [PATCH net-next v10 8/9] net: check for driver support in netmem TX From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, io-uring@vger.kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Mina Almasry , Donald Hunter , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Andrew Lunn , Jeroen de Borst , Harshitha Ramamurthy , Kuniyuki Iwashima , Willem de Bruijn , Jens Axboe , Pavel Begunkov , David Ahern , Neal Cardwell , Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , " =?utf-8?q?Eugenio_P=C3=A9rez?= " , Shuah Khan , sdf@fomichev.me, dw@davidwei.uk, Jamal Hadi Salim , Victor Nogueira , Pedro Tammela , Samiullah Khawaja We should not enable netmem TX for drivers that don't declare support. Check for driver netmem TX support during devmem TX binding and fail if the driver does not have the functionality. Check for driver support in validate_xmit_skb as well. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- v8: - Rebase on latest net-next and resolve conflict. - Remove likely (Paolo) v5: https://lore.kernel.org/netdev/20250227041209.2031104-8-almasrymina@google.com/ - Check that the dmabuf mappings belongs to the specific device the TX is being sent from (Jakub) v4: - New patch --- net/core/dev.c | 34 ++++++++++++++++++++++++++++++++-- net/core/devmem.h | 6 ++++++ net/core/netdev-genl.c | 7 +++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index d1a8cad0c99c4..66f0c122de80e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3896,12 +3896,42 @@ int skb_csum_hwoffload_help(struct sk_buff *skb, } EXPORT_SYMBOL(skb_csum_hwoffload_help); +static struct sk_buff *validate_xmit_unreadable_skb(struct sk_buff *skb, + struct net_device *dev) +{ + struct skb_shared_info *shinfo; + struct net_iov *niov; + + if (likely(skb_frags_readable(skb))) + goto out; + + if (!dev->netmem_tx) + goto out_free; + + shinfo = skb_shinfo(skb); + + if (shinfo->nr_frags > 0) { + niov = netmem_to_net_iov(skb_frag_netmem(&shinfo->frags[0])); + if (net_is_devmem_iov(niov) && + net_devmem_iov_binding(niov)->dev != dev) + goto out_free; + } + +out: + return skb; + +out_free: + kfree_skb(skb); + return NULL; +} + static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev, bool *again) { netdev_features_t features; - if (!skb_frags_readable(skb)) - goto out_kfree_skb; + skb = validate_xmit_unreadable_skb(skb, dev); + if (unlikely(!skb)) + goto out_null; features = netif_skb_features(skb); skb = validate_xmit_vlan(skb, features); diff --git a/net/core/devmem.h b/net/core/devmem.h index 67168aae5e5b3..919e6ed28fdcd 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -229,6 +229,12 @@ net_devmem_get_niov_at(struct net_devmem_dmabuf_binding *binding, size_t addr, { return NULL; } + +static inline struct net_devmem_dmabuf_binding * +net_devmem_iov_binding(const struct net_iov *niov) +{ + return NULL; +} #endif #endif /* _NET_DEVMEM_H */ diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c index 292606df834de..84c033574eb16 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -979,6 +979,13 @@ int netdev_nl_bind_tx_doit(struct sk_buff *skb, struct genl_info *info) goto err_unlock_netdev; } + if (!netdev->netmem_tx) { + err = -EOPNOTSUPP; + NL_SET_ERR_MSG(info->extack, + "Driver does not support netmem TX"); + goto err_unlock_netdev; + } + binding = net_devmem_bind_dmabuf(netdev, DMA_TO_DEVICE, dmabuf_fd, info->extack); if (IS_ERR(binding)) {