public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, namjain@linux.microsoft.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] uio_hv_generic: Fix sysfs creation path for ring buffer
Date: Wed, 14 May 2025 16:14:01 -0400	[thread overview]
Message-ID: <20250514102003-1e96340cfdda0d0f@stable.kernel.org> (raw)
In-Reply-To: <20250513130426.1636-1-namjain@linux.microsoft.com>

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it

Found matching upstream commit: f31fe8165d365379d858c53bef43254c7d6d1cfd

Status in newer kernel trees:
6.14.y | Present (different SHA1: 419663d2d8f5)
6.12.y | Present (different SHA1: 5235de792838)

Note: The patch differs from the upstream commit:
---
1:  f31fe8165d365 ! 1:  655fda9f47dce uio_hv_generic: Fix sysfs creation path for ring buffer
    @@ Commit message
         Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
         Link: https://lore.kernel.org/r/20250502074811.2022-2-namjain@linux.microsoft.com
         Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    +    (cherry picked from commit f31fe8165d365379d858c53bef43254c7d6d1cfd)
     
      ## drivers/hv/hyperv_vmbus.h ##
     @@ drivers/hv/hyperv_vmbus.h: static inline int hv_debug_add_dev_dir(struct hv_device *dev)
    @@ drivers/hv/vmbus_drv.c: static ssize_t subchannel_id_show(struct vmbus_channel *
      static VMBUS_CHAN_ATTR_RO(subchannel_id);
      
     +static int hv_mmap_ring_buffer_wrapper(struct file *filp, struct kobject *kobj,
    -+				       const struct bin_attribute *attr,
    ++				       struct bin_attribute *attr,
     +				       struct vm_area_struct *vma)
     +{
     +	struct vmbus_channel *channel = container_of(kobj, struct vmbus_channel, kobj);
    @@ drivers/hv/vmbus_drv.c: static umode_t vmbus_chan_attr_is_visible(struct kobject
      }
      
     +static umode_t vmbus_chan_bin_attr_is_visible(struct kobject *kobj,
    -+					      const struct bin_attribute *attr, int idx)
    ++					      struct bin_attribute *attr, int idx)
     +{
     +	const struct vmbus_channel *channel =
     +		container_of(kobj, struct vmbus_channel, kobj);
    @@ drivers/hv/vmbus_drv.c: static umode_t vmbus_chan_attr_is_visible(struct kobject
     +	return attr->attr.mode;
     +}
     +
    - static const struct attribute_group vmbus_chan_group = {
    + static struct attribute_group vmbus_chan_group = {
      	.attrs = vmbus_chan_attrs,
     -	.is_visible = vmbus_chan_attr_is_visible
     +	.bin_attrs = vmbus_chan_bin_attrs,
    @@ drivers/hv/vmbus_drv.c: static umode_t vmbus_chan_attr_is_visible(struct kobject
     +	.is_bin_visible = vmbus_chan_bin_attr_is_visible,
      };
      
    - static const struct kobj_type vmbus_chan_ktype = {
    -@@ drivers/hv/vmbus_drv.c: static const struct kobj_type vmbus_chan_ktype = {
    + static struct kobj_type vmbus_chan_ktype = {
    +@@ drivers/hv/vmbus_drv.c: static struct kobj_type vmbus_chan_ktype = {
      	.release = vmbus_chan_release,
      };
      
    @@ drivers/uio/uio_hv_generic.c: static void hv_uio_rescind(struct vmbus_channel *c
       * The ring buffer is allocated as contiguous memory by vmbus_open
       */
     -static int hv_uio_ring_mmap(struct file *filp, struct kobject *kobj,
    --			    const struct bin_attribute *attr,
    +-			    struct bin_attribute *attr,
     -			    struct vm_area_struct *vma)
     +static int
     +hv_uio_ring_mmap(struct vmbus_channel *channel, struct vm_area_struct *vma)
    @@ drivers/uio/uio_hv_generic.c: static int hv_uio_ring_mmap(struct file *filp, str
     -		.name = "ring",
     -		.mode = 0600,
     -	},
    --	.size = 2 * SZ_2M,
    +-	.size = 2 * HV_RING_SIZE * PAGE_SIZE,
     -	.mmap = hv_uio_ring_mmap,
     -};
     -
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y        |  Success    |  Success   |

      reply	other threads:[~2025-05-14 20:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-12  9:03 FAILED: patch "[PATCH] uio_hv_generic: Fix sysfs creation path for ring buffer" failed to apply to 6.6-stable tree gregkh
2025-05-13 13:04 ` [PATCH 6.6.y] uio_hv_generic: Fix sysfs creation path for ring buffer Naman Jain
2025-05-14 20:14   ` Sasha Levin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250514102003-1e96340cfdda0d0f@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=namjain@linux.microsoft.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox