From patchwork Fri Mar 21 10:38:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pranjal Shrivastava X-Patchwork-Id: 14025209 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 CFC911F4C9B for ; Fri, 21 Mar 2025 10:38:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742553536; cv=none; b=eIFjsBOVjz/31jqqOwodEB3c/H3S8QXJMqszi0hGbclDABTVURwMmY+yj6F115JfgeNQTg0piXu79Qhff640wIwq07rTCEwK/giXe60EgH0B52LQiKJatMhjmIYHnyfWFD+3MzScOm+wDLNqyySnHGZ9DEBo9GOBXSTVmnl/6YU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742553536; c=relaxed/simple; bh=MTWqH0QQeN8BAJKCv6QLRpebs5XpSpSjpTCrE8UCWOQ=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=I2xRXxAumD8gEfdW8earfeGpJ86+/zIX0TTu4YpTmDFCd03b+7p6Os6ARDBrTztIavFyXJueXqCwHGNX24f0kOw+OiWSwAWsUAs8c0FMMN+tsNp5OpY7zgWc2ETd0D5Fb2/9OBli2GRFYCzQpm5hk1hWJ7uUggooZkJ1JrqQaJA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=OmPDfar7; arc=none smtp.client-ip=209.85.214.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--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="OmPDfar7" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2262051205aso19677795ad.3 for ; Fri, 21 Mar 2025 03:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742553534; x=1743158334; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=wTXIzt5fOwRSNBhSHeFNg/2q6INGK9Me+w4LkNIlpHM=; b=OmPDfar7Id/sf/HUm8xmG5XOpl0bVf+pb7TUeB5wUwX+HR81y6a1K8qJWzBk0fNltd OXyQ72W7ywtnlWjySErK4a9Q7+X3gryRu/ueKXBTCS9brxEdCRAOtudzyV3C/FH+Vgq2 BpGV0Z62QV2x1cxdB6Oa0pHoQm9InHcek8HzppuVuqrwYe6xzGwWLcqzspXa8AjoZhaO 0zKPULRGgct/fJM5kyharxMUr4D78qsP/CkLpTESWHIO2sXFPSfFamC8pWn3LbzQJoRo HQY+DMdnuUlcXIMbu8HduoGSDW60NxO4Adcn+uv2oP8iJo65UQgUlHWq/w2R5lbuHF4D siKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742553534; x=1743158334; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wTXIzt5fOwRSNBhSHeFNg/2q6INGK9Me+w4LkNIlpHM=; b=sqfYsdAda4788YRK8698Y6lVlWqFotM9/f/F2UlUlP3+oI7VbUM5o7s5IKLPYuybuJ huPO+fW9hocZLE1vvnaRU9ecsFmlGLn14JBEy5Bs5BVELrtdHq45jV/j37ivbK5qPBmr ffMmBVL9w5Gf5Nxeu220B6UfIBaiItq2ynBlPU4l+6NDvJRJsYhRt4H/XRQmIyTq/MJ1 E2t19C3ifbDK4LBovAwuXF0hB6ywQ/epZljdcsZkBmd9KoDm193AWWcnp4caX4VNlo4i xL+6dO7rcJMAIXhaXRydvg1+2HdfPZw2p1OGM09ZJ6nPkPCwAIiRWzsiz7BgM1N9CV3S oMeA== X-Gm-Message-State: AOJu0YyS1kuhPGj5rtuKcBxEqDpKJ+R4aSROBuFgnY/QlqMvbk6tLWHs Cxpbx9gjoHIqGBLePW2vUsGaB7KVkwz8AVxN+A+PRbRPVjL9ej8Grhkq1BHiXAKFkkdXKH9e7Q= = X-Google-Smtp-Source: AGHT+IFBrPoh2xXBTLa37t7TLzk40CglNhwirrSlQoobmf2JjKUeSxL1XGZLKhnam/vZlx/gaxOnf/h6yA== X-Received: from plky1.prod.google.com ([2002:a17:902:7001:b0:223:4e55:d29a]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:46d0:b0:220:fe50:5b44 with SMTP id d9443c01a7336-22780da4559mr46020505ad.31.1742553534138; Fri, 21 Mar 2025 03:38:54 -0700 (PDT) Date: Fri, 21 Mar 2025 10:38:48 +0000 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250321103848.550689-1-praan@google.com> Subject: [PATCH] net: Fix the devmem sock opts and msgs for parisc From: Pranjal Shrivastava To: "David S . Miller" , Eric Dumazet , Jakub Kicinski Cc: netdev@vger.kernel.org, linux-parisc@vger.kernel.org, Willem de Bruijn , Mina Almasry , Pranjal Shrivastava The devmem socket options and socket control message definitions introduced in the TCP devmem series[1] incorrectly continued the socket definitions for arch/parisc. The UAPI change seems safe as there are currently no drivers that declare support for devmem TCP RX via PP_FLAG_ALLOW_UNREADABLE_NETMEM. Hence, fixing this UAPI should be safe. Fix the devmem socket options and socket control message definitions to reflect the series followed by arch/parisc. [1] https://lore.kernel.org/lkml/20240910171458.219195-10-almasrymina@google.com/ Fixes: 8f0b3cc9a4c10 ("tcp: RX path for devmem TCP") Signed-off-by: Pranjal Shrivastava Reviewed-by: Jason Xing --- arch/parisc/include/uapi/asm/socket.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h index aa9cd4b951fe..96831c988606 100644 --- a/arch/parisc/include/uapi/asm/socket.h +++ b/arch/parisc/include/uapi/asm/socket.h @@ -132,16 +132,16 @@ #define SO_PASSPIDFD 0x404A #define SO_PEERPIDFD 0x404B -#define SO_DEVMEM_LINEAR 78 -#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR -#define SO_DEVMEM_DMABUF 79 -#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF -#define SO_DEVMEM_DONTNEED 80 - #define SCM_TS_OPT_ID 0x404C #define SO_RCVPRIORITY 0x404D +#define SO_DEVMEM_LINEAR 0x404E +#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR +#define SO_DEVMEM_DMABUF 0x404F +#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF +#define SO_DEVMEM_DONTNEED 0x4050 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64